Fix UpdateWaitWindow.axaml windows being too big

There is currently an issue where to windows where it says "Installing firmware..." has no rounded corners
2024-11-24 22:38:11 +01:00
165 changed files with 1053 additions and 2749 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,9 +64,14 @@ jobs:
        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx --self-contained 
        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'

+      - name: Publish Ryujinx.Headless.SDL2
+        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER src/Ryujinx.Headless.SDL2 --self-contained
+        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
+
      - name: Set executable bit
        run: |
          chmod +x ./publish/Ryujinx ./publish/Ryujinx.sh
+          chmod +x ./publish_sdl2_headless/Ryujinx.Headless.SDL2 ./publish_sdl2_headless/Ryujinx.sh
        if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'

      - name: Build AppImage
@@ -114,6 +119,13 @@ jobs:
          name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}-AppImage
          path: publish_appimage

+      - name: Upload Ryujinx.Headless.SDL2 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nogui-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.platform.zip_os_name }}
+          path: publish_sdl2_headless
+        if: github.event_name == 'pull_request' && matrix.platform.os != 'macos-13'
+
  build_macos:
    name: macOS Universal (${{ matrix.configuration }})
    runs-on: ubuntu-latest
@@ -159,9 +171,20 @@ jobs:
        run: |
          ./distribution/macos/create_macos_build_ava.sh . publish_tmp publish ./distribution/macos/entitlements.xml "${{ env.RYUJINX_BASE_VERSION }}" "${{ steps.git_short_hash.outputs.result }}" "${{ matrix.configuration }}" "-p:ExtraDefineConstants=DISABLE_UPDATER"

+      - name: Publish macOS Ryujinx.Headless.SDL2
+        run: |
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ env.RYUJINX_BASE_VERSION }}" "${{ steps.git_short_hash.outputs.result }}" "${{ matrix.configuration }}" "-p:ExtraDefineConstants=DISABLE_UPDATER"
+
      - name: Upload Ryujinx artifact
        uses: actions/upload-artifact@v4
        with:
          name: ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
          path: "publish/*.tar.gz"
        if: github.event_name == 'pull_request'
+
+      - name: Upload Ryujinx.Headless.SDL2 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nogui-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-macos_universal
+          path: "publish_headless/*.tar.gz"
+        if: github.event_name == 'pull_request'
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -104,6 +104,7 @@ jobs:
      - name: Publish
        run: |
          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained

      - name: Packing Windows builds
        if: matrix.platform.os == 'windows-latest'
@@ -112,6 +113,11 @@ jobs:
          rm publish/libarmeilleure-jitsupport.dylib
          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
          popd
+
+          pushd publish_sdl2_headless
+          rm publish/libarmeilleure-jitsupport.dylib
+          7z a ../release_output/nogui-ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip publish
+          popd
        shell: bash

      - name: Packing Linux builds
@@ -122,6 +128,12 @@ jobs:
          chmod +x publish/Ryujinx.sh publish/Ryujinx
          tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
          popd
+
+          pushd publish_sdl2_headless
+          rm publish/libarmeilleure-jitsupport.dylib
+          chmod +x publish/Ryujinx.sh publish/Ryujinx.Headless.SDL2
+          tar -czvf ../release_output/nogui-ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz publish
+          popd
        shell: bash
      
      #- name: Build AppImage (Linux)
@@ -167,7 +179,7 @@ jobs:
        with:
          name: ${{ steps.version_info.outputs.build_version }}
          artifacts: "release_output/*.tar.gz,release_output/*.zip"
-          #artifacts: "release_output/*.tar.gz,release_output/*.zip,release_output/*AppImage*"
+          #artifacts: "release_output/*.tar.gz,release_output/*.zip/*AppImage*"
          tag: ${{ steps.version_info.outputs.build_version }}
          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
@@ -226,11 +238,15 @@ jobs:
        run: |
          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish_ava ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1

+      - name: Publish macOS Ryujinx.Headless.SDL2
+        run: |
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 1
+
      - name: Pushing new release
        uses: ncipollo/release-action@v1
        with:
          name: "Canary ${{ steps.version_info.outputs.build_version }}"
-          artifacts: "publish_ava/*.tar.gz"
+          artifacts: "publish_ava/*.tar.gz, publish_headless/*.tar.gz"
          tag: ${{ steps.version_info.outputs.build_version }}
          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
--- a/.github/workflows/nightly_pr_comment.yml
+++ b/.github/workflows/nightly_pr_comment.yml
@@ -38,15 +38,20 @@ jobs:
              return core.error(`No artifacts found`);
            }
            let body = `Download the artifacts for this pull request:\n`;
+            let hidden_headless_artifacts = `\n\n <details><summary>GUI-less</summary>\n`;
            let hidden_debug_artifacts = `\n\n <details><summary>Only for Developers</summary>\n`;
            for (const art of artifacts) {
              if(art.name.includes('Debug')) {
                hidden_debug_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
+              } else if(art.name.includes('nogui-ryujinx')) {
+                hidden_headless_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
              } else {
                body += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
              }
            }
+            hidden_headless_artifacts += `\n</details>`;
            hidden_debug_artifacts += `\n</details>`;
+            body += hidden_headless_artifacts;
            body += hidden_debug_artifacts;

            const {data: comments} = await github.rest.issues.listComments({repo, owner, issue_number});
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -103,6 +103,7 @@ jobs:
      - name: Publish
        run: |
          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx --self-contained
+          dotnet publish -c Release -r "${{ matrix.platform.name }}" -o ./publish_sdl2_headless -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded src/Ryujinx.Headless.SDL2 --self-contained

      - name: Packing Windows builds
        if: matrix.platform.os == 'windows-latest'
@@ -111,6 +112,11 @@ jobs:
          rm libarmeilleure-jitsupport.dylib
          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd
+
+          pushd publish_sdl2_headless
+          rm libarmeilleure-jitsupport.dylib
+          7z a ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
+          popd
        shell: bash
      
      - name: Build AppImage (Linux)
@@ -157,6 +163,11 @@ jobs:
          chmod +x Ryujinx.sh Ryujinx
          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
          popd
+
+          pushd publish_sdl2_headless
+          chmod +x Ryujinx.sh Ryujinx.Headless.SDL2
+          tar -czvf ../release_output/nogui-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
+          popd
        shell: bash

      - name: Pushing new release
@@ -222,11 +233,15 @@ jobs:
        run: |
          ./distribution/macos/create_macos_build_ava.sh . publish_tmp_ava publish ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0

+      - name: Publish macOS Ryujinx.Headless.SDL2
+        run: |
+          ./distribution/macos/create_macos_build_headless.sh . publish_tmp_headless publish_headless ./distribution/macos/entitlements.xml "${{ steps.version_info.outputs.build_version }}" "${{ steps.version_info.outputs.git_short_hash }}" Release 0
+
      - name: Pushing new release
        uses: ncipollo/release-action@v1
        with:
          name: ${{ steps.version_info.outputs.build_version }}
-          artifacts: "publish/*.tar.gz"
+          artifacts: "publish/*.tar.gz, publish_headless/*.tar.gz"
          tag: ${{ steps.version_info.outputs.build_version }}
          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
          omitBodyDuringUpdate: true
--- a/.gitignore
+++ b/.gitignore
@@ -175,6 +175,3 @@ PublishProfiles/

 # Glade backup files
 *.glade~
-
-# Ignore MacOS Attribute Files
-._*
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -38,7 +38,7 @@
    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
    <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.6.8" />
+    <PackageVersion Include="Gommon" Version="2.6.6" />
    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
    <PackageVersion Include="shaderc.net" Version="0.1.0" />
    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -57,6 +57,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.SDL2.Common", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio.Backends.SDL2", "src\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj", "{D99A395A-8569-4DB0-B336-900647890052}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Headless.SDL2", "src\Ryujinx.Headless.SDL2\Ryujinx.Headless.SDL2.csproj", "{390DC343-5CB4-4C79-A5DD-E3ED235E4C49}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec.FFmpeg", "src\Ryujinx.Graphics.Nvdec.FFmpeg\Ryujinx.Graphics.Nvdec.FFmpeg.csproj", "{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "src\Ryujinx\Ryujinx.csproj", "{7C1B2721-13DA-4B62-B046-C626605ECCE6}"
@@ -202,6 +204,10 @@ Global
 		{D99A395A-8569-4DB0-B336-900647890052}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D99A395A-8569-4DB0-B336-900647890052}.Release|Any CPU.Build.0 = Release|Any CPU
+		{390DC343-5CB4-4C79-A5DD-E3ED235E4C49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{390DC343-5CB4-4C79-A5DD-E3ED235E4C49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{390DC343-5CB4-4C79-A5DD-E3ED235E4C49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{390DC343-5CB4-4C79-A5DD-E3ED235E4C49}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BEE1C184-C9A4-410B-8DFC-FB74D5C93AEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
--- a/distribution/linux/Ryujinx.sh
+++ b/distribution/linux/Ryujinx.sh
@@ -14,7 +14,7 @@ if [ -z "$RYUJINX_BIN" ]; then
    exit 1
 fi

-COMMAND="env LANG=C.UTF-8 DOTNET_EnableAlternateStackCheck=1"
+COMMAND="env DOTNET_EnableAlternateStackCheck=1"

 if command -v gamemoderun > /dev/null 2>&1; then
    COMMAND="$COMMAND gamemoderun"
--- a/distribution/macos/Info.plist
+++ b/distribution/macos/Info.plist
@@ -40,11 +40,11 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
-    <string>1.2</string>
+    <string>1.1</string>
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>CFBundleVersion</key>
-    <string>1.2.0</string>
+    <string>1.1.0</string>
    <key>NSHighResolutionCapable</key>
    <true/>
    <key>CSResourcesFileMapped</key>
--- a/distribution/macos/updater.sh
+++ b/distribution/macos/updater.sh
@@ -17,7 +17,7 @@ error_handler() {
    set the button_pressed to the button returned of the result

    if the button_pressed is \"Open Download Page\" then
-        open location \"https://ryujinx.app/download\"
+        open location \"https://ryujinx.org/download\"
    end if
    """

@@ -54,4 +54,4 @@ if [ "$#" -le 3 ]; then
    open -a "$INSTALL_DIRECTORY"
 else
    open -a "$INSTALL_DIRECTORY" --args "${APP_ARGUMENTS[@]}"
-fi
+fi
--- a/src/ARMeilleure/ARMeilleure.csproj
+++ b/src/ARMeilleure/ARMeilleure.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/ARMeilleure/Common/AddressTableLevel.cs
+++ b/src/ARMeilleure/Common/AddressTableLevel.cs
@@ -36,9 +36,9 @@ namespace ARMeilleure.Common
        /// </summary>
        /// <param name="address">Guest address</param>
        /// <returns>Value of the <see cref="AddressTableLevel"/> from the specified guest <paramref name="address"/></returns>
-        public long GetValue(ulong address)
+        public int GetValue(ulong address)
        {
-            return (long)((address & Mask) >> Index);
+            return (int)((address & Mask) >> Index);
        }
    }
 }
--- a/src/ARMeilleure/Instructions/InstEmitSystem.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSystem.cs
@@ -88,7 +88,7 @@ namespace ARMeilleure.Instructions
                    EmitSetTpidrEl0(context);
                    return;
                case 0b11_011_1101_0000_101:
-                    EmitSetTpidr2El0(context);
+                    EmitGetTpidr2El0(context);
                    return;

                default:
@@ -291,16 +291,5 @@ namespace ARMeilleure.Instructions

            context.Store(context.Add(nativeContext, Const((ulong)NativeContext.GetTpidrEl0Offset())), value);
        }
-
-        private static void EmitSetTpidr2El0(ArmEmitterContext context)
-        {
-            OpCodeSystem op = (OpCodeSystem)context.CurrOp;
-
-            Operand value = GetIntOrZR(context, op.Rt);
-
-            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
-
-            context.Store(context.Add(nativeContext, Const((ulong)NativeContext.GetTpidr2El0Offset())), value);
-        }
    }
 }
--- a/src/ARMeilleure/Translation/PTC/Ptc.cs
+++ b/src/ARMeilleure/Translation/PTC/Ptc.cs
@@ -30,7 +30,7 @@ namespace ARMeilleure.Translation.PTC
        private const string OuterHeaderMagicString = "PTCohd\0\0";
        private const string InnerHeaderMagicString = "PTCihd\0\0";

-        private const uint InternalVersion = 6997; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 6992; //! To be incremented manually for each change to the ARMeilleure project.

        private const string ActualDir = "0";
        private const string BackupDir = "1";
--- a/src/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj
+++ b/src/Ryujinx.Audio.Backends.OpenAL/Ryujinx.Audio.Backends.OpenAL.csproj
@@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Audio.Backends.SDL2/Ryujinx.Audio.Backends.SDL2.csproj
+++ b/src/Ryujinx.Audio.Backends.SDL2/Ryujinx.Audio.Backends.SDL2.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj
+++ b/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj
@@ -4,7 +4,6 @@
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Audio/Ryujinx.Audio.csproj
+++ b/src/Ryujinx.Audio/Ryujinx.Audio.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/Controller/JoyconConfigControllerStick.cs
@@ -1,8 +1,6 @@
 namespace Ryujinx.Common.Configuration.Hid.Controller
 {
-    public class JoyconConfigControllerStick<TButton, TStick> 
-        where TButton : unmanaged 
-        where TStick : unmanaged
+    public class JoyconConfigControllerStick<TButton, TStick> where TButton : unmanaged where TStick : unmanaged
    {
        public TStick Joystick { get; set; }
        public bool InvertStickX { get; set; }
--- a/src/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs
@@ -2,7 +2,7 @@ namespace Ryujinx.Common.Configuration.Hid
 {
    public class KeyboardHotkeys
    {
-        public Key ToggleVSyncMode { get; set; }
+        public Key ToggleVsync { get; set; }
        public Key Screenshot { get; set; }
        public Key ShowUI { get; set; }
        public Key Pause { get; set; }
@@ -11,7 +11,5 @@ namespace Ryujinx.Common.Configuration.Hid
        public Key ResScaleDown { get; set; }
        public Key VolumeUp { get; set; }
        public Key VolumeDown { get; set; }
-        public Key CustomVSyncIntervalIncrement { get; set; }
-        public Key CustomVSyncIntervalDecrement { get; set; }
    }
 }
--- a/src/Ryujinx.Common/Configuration/VSyncMode.cs
+++ b/src/Ryujinx.Common/Configuration/VSyncMode.cs
@@ -1,9 +0,0 @@
-namespace Ryujinx.Common.Configuration
-{
-    public enum VSyncMode
-    {
-        Switch,
-        Unbounded,
-        Custom
-    }
-}
--- a/src/Ryujinx.Common/Logging/Logger.cs
+++ b/src/Ryujinx.Common/Logging/Logger.cs
@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;

@@ -158,16 +157,21 @@ namespace Ryujinx.Common.Logging
            _time.Restart();
        }

-        private static ILogTarget GetTarget(string targetName) 
-            => _logTargets.FirstOrDefault(target => target.Name.Equals(targetName));
+        private static ILogTarget GetTarget(string targetName)
+        {
+            foreach (var target in _logTargets)
+            {
+                if (target.Name.Equals(targetName))
+                {
+                    return target;
+                }
+            }
+
+            return null;
+        }

        public static void AddTarget(ILogTarget target)
        {
-            if (_logTargets.Any(t => t.Name == target.Name))
-            {
-                return;
-            }
-
            _logTargets.Add(target);

            Updated += target.Log;
--- a/src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs
+++ b/src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs
@@ -27,7 +27,11 @@ namespace Ryujinx.Common.Logging.Targets

        private readonly int _overflowTimeout;

-        string ILogTarget.Name => _target.Name;
+        string ILogTarget.Name { get => _target.Name; }
+
+        public AsyncLogTargetWrapper(ILogTarget target)
+            : this(target, -1)
+        { }

        public AsyncLogTargetWrapper(ILogTarget target, int queueLimit = -1, AsyncLogTargetOverflowAction overflowAction = AsyncLogTargetOverflowAction.Block)
        {
--- a/src/Ryujinx.Common/Ryujinx.Common.csproj
+++ b/src/Ryujinx.Common/Ryujinx.Common.csproj
@@ -4,7 +4,6 @@
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Cpu/AddressTable.cs
+++ b/src/Ryujinx.Cpu/AddressTable.cs
@@ -238,7 +238,7 @@ namespace ARMeilleure.Common
            {
                TEntry* page = GetPage(address);

-                long index = Levels[^1].GetValue(address);
+                int index = Levels[^1].GetValue(address);

                EnsureMapped((IntPtr)(page + index));

--- a/src/Ryujinx.Cpu/Ryujinx.Cpu.csproj
+++ b/src/Ryujinx.Cpu/Ryujinx.Cpu.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.Device/Ryujinx.Graphics.Device.csproj
+++ b/src/Ryujinx.Graphics.Device/Ryujinx.Graphics.Device.csproj
@@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.GAL/IWindow.cs
+++ b/src/Ryujinx.Graphics.GAL/IWindow.cs
@@ -8,7 +8,7 @@ namespace Ryujinx.Graphics.GAL

        void SetSize(int width, int height);

-        void ChangeVSyncMode(VSyncMode vSyncMode);
+        void ChangeVSyncMode(bool vsyncEnabled);

        void SetAntiAliasing(AntiAliasing antialiasing);
        void SetScalingFilter(ScalingFilter type);
--- a/src/Ryujinx.Graphics.GAL/Multithreading/ThreadedWindow.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/ThreadedWindow.cs
@@ -31,7 +31,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
            _impl.Window.SetSize(width, height);
        }

-        public void ChangeVSyncMode(VSyncMode vSyncMode) { }
+        public void ChangeVSyncMode(bool vsyncEnabled) { }

        public void SetAntiAliasing(AntiAliasing effect) { }

--- a/src/Ryujinx.Graphics.GAL/Ryujinx.Graphics.GAL.csproj
+++ b/src/Ryujinx.Graphics.GAL/Ryujinx.Graphics.GAL.csproj
@@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
--- a/src/Ryujinx.Graphics.GAL/VSyncMode.cs
+++ b/src/Ryujinx.Graphics.GAL/VSyncMode.cs
@@ -1,9 +0,0 @@
-namespace Ryujinx.Graphics.GAL
-{
-    public enum VSyncMode
-    {
-        Switch,
-        Unbounded,
-        Custom
-    }
-}
--- a/src/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj
+++ b/src/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.Host1x/Ryujinx.Graphics.Host1x.csproj
+++ b/src/Ryujinx.Graphics.Host1x/Ryujinx.Graphics.Host1x.csproj
@@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Ryujinx.Graphics.Nvdec.FFmpeg.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.Nvdec.Vp9/Ryujinx.Graphics.Nvdec.Vp9.csproj
+++ b/src/Ryujinx.Graphics.Nvdec.Vp9/Ryujinx.Graphics.Nvdec.Vp9.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj
+++ b/src/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj
+++ b/src/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.OpenGL/Window.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Window.cs
@@ -54,7 +54,7 @@ namespace Ryujinx.Graphics.OpenGL
            GL.PixelStore(PixelStoreParameter.UnpackAlignment, 4);
        }

-        public void ChangeVSyncMode(VSyncMode vSyncMode) { }
+        public void ChangeVSyncMode(bool vsyncEnabled) { }

        public void SetSize(int width, int height)
        {
--- a/src/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj
+++ b/src/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj
@@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj
+++ b/src/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj
@@ -2,7 +2,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.Vic/Ryujinx.Graphics.Vic.csproj
+++ b/src/Ryujinx.Graphics.Vic/Ryujinx.Graphics.Vic.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.Video/Ryujinx.Graphics.Video.csproj
+++ b/src/Ryujinx.Graphics.Video/Ryujinx.Graphics.Video.csproj
@@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj
+++ b/src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj
@@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
--- a/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
+++ b/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
@@ -182,16 +182,6 @@ namespace Ryujinx.Graphics.Vulkan
                    return false;
                }
            }
-            
-            //Prevent the sum of descriptors from exceeding MaxPushDescriptors
-            int totalDescriptors = 0;
-            foreach (ResourceDescriptor desc in layout.Sets.First().Descriptors)
-            {
-                if (!reserved.Contains(desc.Binding))
-                    totalDescriptors += desc.Count;
-            }
-            if (totalDescriptors > gd.Capabilities.MaxPushDescriptors)
-                return false;

            return true;
        }
--- a/src/Ryujinx.Graphics.Vulkan/Window.cs
+++ b/src/Ryujinx.Graphics.Vulkan/Window.cs
@@ -29,7 +29,7 @@ namespace Ryujinx.Graphics.Vulkan

        private int _width;
        private int _height;
-        private VSyncMode _vSyncMode;
+        private bool _vsyncEnabled;
        private bool _swapchainIsDirty;
        private VkFormat _format;
        private AntiAliasing _currentAntiAliasing;
@@ -139,7 +139,7 @@ namespace Ryujinx.Graphics.Vulkan
                ImageArrayLayers = 1,
                PreTransform = capabilities.CurrentTransform,
                CompositeAlpha = ChooseCompositeAlpha(capabilities.SupportedCompositeAlpha),
-                PresentMode = ChooseSwapPresentMode(presentModes, _vSyncMode),
+                PresentMode = ChooseSwapPresentMode(presentModes, _vsyncEnabled),
                Clipped = true,
            };

@@ -279,9 +279,9 @@ namespace Ryujinx.Graphics.Vulkan
            }
        }

-        private static PresentModeKHR ChooseSwapPresentMode(PresentModeKHR[] availablePresentModes, VSyncMode vSyncMode)
+        private static PresentModeKHR ChooseSwapPresentMode(PresentModeKHR[] availablePresentModes, bool vsyncEnabled)
        {
-            if (vSyncMode == VSyncMode.Unbounded && availablePresentModes.Contains(PresentModeKHR.ImmediateKhr))
+            if (!vsyncEnabled && availablePresentModes.Contains(PresentModeKHR.ImmediateKhr))
            {
                return PresentModeKHR.ImmediateKhr;
            }
@@ -634,10 +634,9 @@ namespace Ryujinx.Graphics.Vulkan
            _swapchainIsDirty = true;
        }

-        public override void ChangeVSyncMode(VSyncMode vSyncMode)
+        public override void ChangeVSyncMode(bool vsyncEnabled)
        {
-            _vSyncMode = vSyncMode;
-            //present mode may change, so mark the swapchain for recreation
+            _vsyncEnabled = vsyncEnabled;
            _swapchainIsDirty = true;
        }

--- a/src/Ryujinx.Graphics.Vulkan/WindowBase.cs
+++ b/src/Ryujinx.Graphics.Vulkan/WindowBase.cs
@@ -10,7 +10,7 @@ namespace Ryujinx.Graphics.Vulkan
        public abstract void Dispose();
        public abstract void Present(ITexture texture, ImageCrop crop, Action swapBuffersCallback);
        public abstract void SetSize(int width, int height);
-        public abstract void ChangeVSyncMode(VSyncMode vSyncMode);
+        public abstract void ChangeVSyncMode(bool vsyncEnabled);
        public abstract void SetAntiAliasing(AntiAliasing effect);
        public abstract void SetScalingFilter(ScalingFilter scalerType);
        public abstract void SetScalingFilterLevel(float scale);
--- a/src/Ryujinx.HLE.Generators/Ryujinx.HLE.Generators.csproj
+++ b/src/Ryujinx.HLE.Generators/Ryujinx.HLE.Generators.csproj
@@ -6,7 +6,6 @@
        <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
        <CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
        <IsRoslynComponent>true</IsRoslynComponent>
-        <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
    </PropertyGroup>

    <ItemGroup>
--- a/src/Ryujinx.HLE/FileSystem/ContentManager.cs
+++ b/src/Ryujinx.HLE/FileSystem/ContentManager.cs
@@ -21,7 +21,6 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using Path = System.IO.Path;

 namespace Ryujinx.HLE.FileSystem
@@ -475,74 +474,6 @@ namespace Ryujinx.HLE.FileSystem
            FinishInstallation(temporaryDirectory, registeredDirectory);
        }

-        public void InstallKeys(string keysSource, string installDirectory)
-        {
-            if (Directory.Exists(keysSource))
-            {
-                foreach (var filePath in Directory.EnumerateFiles(keysSource, "*.keys"))
-                {
-                    VerifyKeysFile(filePath);
-                    File.Copy(filePath, Path.Combine(installDirectory, Path.GetFileName(filePath)), true);
-                }
-
-                return;
-            }
-
-            if (!File.Exists(keysSource))
-            {
-                throw new FileNotFoundException("Keys file does not exist.");
-            }
-
-            FileInfo info = new(keysSource);
-
-            using FileStream file = File.OpenRead(keysSource);
-
-            switch (info.Extension)
-            {
-                case ".zip":
-                    using (ZipArchive archive = ZipFile.OpenRead(keysSource))
-                    {
-                        InstallKeysFromZip(archive, installDirectory);
-                    }
-                    break;
-                case ".keys":
-                    VerifyKeysFile(keysSource);
-                    File.Copy(keysSource, Path.Combine(installDirectory, info.Name), true);
-                    break;
-                default:
-                    throw new InvalidFirmwarePackageException("Input file is not a valid key package");
-            }
-        }
-
-        private void InstallKeysFromZip(ZipArchive archive, string installDirectory)
-        {
-            string temporaryDirectory = Path.Combine(installDirectory, "temp");
-            if (Directory.Exists(temporaryDirectory))
-            {
-                Directory.Delete(temporaryDirectory, true);
-            }
-            Directory.CreateDirectory(temporaryDirectory);
-            foreach (var entry in archive.Entries)
-            {
-                if (Path.GetExtension(entry.FullName).Equals(".keys", StringComparison.OrdinalIgnoreCase))
-                {
-                    string extractDestination = Path.Combine(temporaryDirectory, entry.Name);
-                    entry.ExtractToFile(extractDestination, overwrite: true);
-                    try
-                    {
-                        VerifyKeysFile(extractDestination);
-                        File.Move(extractDestination, Path.Combine(installDirectory, entry.Name), true);
-                    }
-                    catch (Exception)
-                    {
-                        Directory.Delete(temporaryDirectory, true);
-                        throw;
-                    }
-                }
-            }
-            Directory.Delete(temporaryDirectory, true);
-        }
-
        private void FinishInstallation(string temporaryDirectory, string registeredDirectory)
        {
            if (Directory.Exists(registeredDirectory))
@@ -1016,70 +947,5 @@ namespace Ryujinx.HLE.FileSystem

            return null;
        }
-
-        public void VerifyKeysFile(string filePath)
-        {
-            // Verify the keys file format refers to https://github.com/Thealexbarney/LibHac/blob/master/KEYS.md
-            string genericPattern = @"^[a-z0-9_]+ = [a-z0-9]+$";
-            string titlePattern = @"^[a-z0-9]{32} = [a-z0-9]{32}$";
-
-            if (File.Exists(filePath))
-            {
-                // Read all lines from the file
-                string fileName = Path.GetFileName(filePath);
-                string[] lines = File.ReadAllLines(filePath);
-
-                bool verified = false;
-                switch (fileName)
-                {
-                    case "prod.keys":
-                        verified = verifyKeys(lines, genericPattern);
-                        break;
-                    case "title.keys":
-                        verified = verifyKeys(lines, titlePattern);
-                        break;
-                    case "console.keys":
-                        verified = verifyKeys(lines, genericPattern);
-                        break;
-                    case "dev.keys":
-                        verified = verifyKeys(lines, genericPattern);
-                        break;
-                    default:
-                        throw new FormatException($"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.");
-                }
-                if (!verified)
-                {
-                    throw new FormatException($"Invalid \"{filePath}\" file format.");
-                }
-            } else
-            {
-                throw new FileNotFoundException($"Keys file not found at \"{filePath}\".");
-            }
-        }
-
-        private bool verifyKeys(string[] lines, string regex)
-        {
-            foreach (string line in lines)
-            {
-                if (!Regex.IsMatch(line, regex))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public bool AreKeysAlredyPresent(string pathToCheck)
-        {
-            string[] fileNames = { "prod.keys", "title.keys", "console.keys", "dev.keys" };
-            foreach (var file in fileNames)
-            {
-                if (File.Exists(Path.Combine(pathToCheck, file)))
-                {
-                    return true;                    
-                }
-            }
-            return false;
-        }
    }
 }
--- a/src/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
+++ b/src/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
@@ -223,10 +223,9 @@ namespace Ryujinx.HLE.FileSystem
        {
            KeySet ??= KeySet.CreateDefaultKeySet();

-            string prodKeyFile = null;
+            string keyFile = null;
            string titleKeyFile = null;
            string consoleKeyFile = null;
-            string devKeyFile = null;

            if (AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile)
            {
@@ -237,14 +236,13 @@ namespace Ryujinx.HLE.FileSystem

            void LoadSetAtPath(string basePath)
            {
-                string localProdKeyFile = Path.Combine(basePath, "prod.keys");
+                string localKeyFile = Path.Combine(basePath, "prod.keys");
                string localTitleKeyFile = Path.Combine(basePath, "title.keys");
                string localConsoleKeyFile = Path.Combine(basePath, "console.keys");
-                string localDevKeyFile = Path.Combine(basePath, "dev.keys");

-                if (File.Exists(localProdKeyFile))
+                if (File.Exists(localKeyFile))
                {
-                    prodKeyFile = localProdKeyFile;
+                    keyFile = localKeyFile;
                }

                if (File.Exists(localTitleKeyFile))
@@ -256,14 +254,9 @@ namespace Ryujinx.HLE.FileSystem
                {
                    consoleKeyFile = localConsoleKeyFile;
                }
-
-                if (File.Exists(localDevKeyFile))
-                {
-                    devKeyFile = localDevKeyFile;
-                }
            }

-            ExternalKeyReader.ReadKeyFile(KeySet, prodKeyFile, devKeyFile, titleKeyFile, consoleKeyFile, null);
+            ExternalKeyReader.ReadKeyFile(KeySet, keyFile, titleKeyFile, consoleKeyFile, null);
        }

        public void ImportTickets(IFileSystem fs)
--- a/src/Ryujinx.HLE/HLEConfiguration.cs
+++ b/src/Ryujinx.HLE/HLEConfiguration.cs
@@ -9,7 +9,6 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.HLE.UI;
 using System;
-using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;

 namespace Ryujinx.HLE
 {
@@ -85,14 +84,9 @@ namespace Ryujinx.HLE
        internal readonly RegionCode Region;

        /// <summary>
-        /// Control the initial state of the present interval in the SurfaceFlinger service (previously Vsync).
+        /// Control the initial state of the vertical sync in the SurfaceFlinger service.
        /// </summary>
-        internal readonly VSyncMode VSyncMode;
-
-        /// <summary>
-        /// Control the custom VSync interval, if enabled and active.
-        /// </summary>
-        internal readonly int CustomVSyncInterval;
+        internal readonly bool EnableVsync;

        /// <summary>
        /// Control the initial state of the docked mode.
@@ -201,7 +195,7 @@ namespace Ryujinx.HLE
                                IHostUIHandler hostUIHandler,
                                SystemLanguage systemLanguage,
                                RegionCode region,
-                                VSyncMode vSyncMode,
+                                bool enableVsync,
                                bool enableDockedMode,
                                bool enablePtc,
                                bool enableInternetAccess,
@@ -218,8 +212,7 @@ namespace Ryujinx.HLE
                                MultiplayerMode multiplayerMode,
                                bool multiplayerDisableP2p,
                                string multiplayerLdnPassphrase,
-                                string multiplayerLdnServer,
-                                int customVSyncInterval)
+                                string multiplayerLdnServer)
        {
            VirtualFileSystem = virtualFileSystem;
            LibHacHorizonManager = libHacHorizonManager;
@@ -232,8 +225,7 @@ namespace Ryujinx.HLE
            HostUIHandler = hostUIHandler;
            SystemLanguage = systemLanguage;
            Region = region;
-            VSyncMode = vSyncMode;
-            CustomVSyncInterval = customVSyncInterval;
+            EnableVsync = enableVsync;
            EnableDockedMode = enableDockedMode;
            EnablePtc = enablePtc;
            EnableInternetAccess = enableInternetAccess;
--- a/src/Ryujinx.HLE/HOS/Applets/AppletManager.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/AppletManager.cs
@@ -1,6 +1,5 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Applets.Browser;
-using Ryujinx.HLE.HOS.Applets.Cabinet;
 using Ryujinx.HLE.HOS.Applets.Dummy;
 using Ryujinx.HLE.HOS.Applets.Error;
 using Ryujinx.HLE.HOS.Services.Am.AppletAE;
@@ -24,14 +23,14 @@ namespace Ryujinx.HLE.HOS.Applets
                case AppletId.SoftwareKeyboard:
                    return new SoftwareKeyboardApplet(system);
                case AppletId.LibAppletWeb:
+                    return new BrowserApplet(system);
                case AppletId.LibAppletShop:
+                    return new BrowserApplet(system);
                case AppletId.LibAppletOff:
-                    return new BrowserApplet();
+                    return new BrowserApplet(system);
                case AppletId.MiiEdit:
                    Logger.Warning?.Print(LogClass.Application, $"Please use the MiiEdit inside File/Open Applet");
                    return new DummyApplet(system);
-                case AppletId.Cabinet:
-                    return new CabinetApplet(system);
            }

            Logger.Warning?.Print(LogClass.Application, $"Applet {applet} not implemented!");
--- a/src/Ryujinx.HLE/HOS/Applets/Browser/BrowserApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Browser/BrowserApplet.cs
@@ -18,6 +18,13 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
        private List<BrowserArgument> _arguments;
        private ShimKind _shimKind;

+        public BrowserApplet(Horizon system) { }
+
+        public ResultCode GetResult()
+        {
+            return ResultCode.Success;
+        }
+
        public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
        {
            _normalSession = normalSession;
--- a/src/Ryujinx.HLE/HOS/Applets/Cabinet/CabinetApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Cabinet/CabinetApplet.cs
@@ -1,182 +0,0 @@
-using Ryujinx.Common.Logging;
-using Ryujinx.Common.Memory;
-using Ryujinx.HLE.HOS.Services.Am.AppletAE;
-using Ryujinx.HLE.HOS.Services.Hid.HidServer;
-using Ryujinx.HLE.HOS.Services.Hid;
-using Ryujinx.HLE.HOS.Services.Nfc.Nfp;
-using Ryujinx.HLE.HOS.Services.Nfc.Nfp.NfpManager;
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace Ryujinx.HLE.HOS.Applets.Cabinet
-{
-    internal unsafe class CabinetApplet : IApplet
-    {
-        private readonly Horizon _system;
-        private AppletSession _normalSession;
-
-        public event EventHandler AppletStateChanged;
-
-        public CabinetApplet(Horizon system)
-        {
-            _system = system;
-        }
-
-        public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
-        {
-            _normalSession = normalSession;
-
-            byte[] launchParams = _normalSession.Pop();
-            byte[] startParamBytes = _normalSession.Pop();
-
-            StartParamForAmiiboSettings startParam = IApplet.ReadStruct<StartParamForAmiiboSettings>(startParamBytes);
-
-            Logger.Stub?.PrintStub(LogClass.ServiceAm, $"CabinetApplet Start Type: {startParam.Type}");
-
-            switch (startParam.Type)
-            {
-                case 0:
-                    StartNicknameAndOwnerSettings(ref startParam);
-                    break;
-                case 1:
-                case 3:
-                    StartFormatter(ref startParam);
-                    break;
-                default:
-                    Logger.Error?.Print(LogClass.ServiceAm, $"Unknown AmiiboSettings type: {startParam.Type}");
-                    break;
-            }
-
-            // Prepare the response
-            ReturnValueForAmiiboSettings returnValue = new()
-            {
-                AmiiboSettingsReturnFlag = (byte)AmiiboSettingsReturnFlag.HasRegisterInfo,
-                DeviceHandle = new DeviceHandle
-                {
-                    Handle = 0 // Dummy device handle
-                },
-                RegisterInfo = startParam.RegisterInfo
-            };
-
-            // Push the response
-            _normalSession.Push(BuildResponse(returnValue));
-            AppletStateChanged?.Invoke(this, null);
-
-            _system.ReturnFocus();
-
-            return ResultCode.Success;
-        }
-
-        public ResultCode GetResult()
-        {
-            _system.Device.System.NfpDevices.RemoveAt(0);
-            return ResultCode.Success;
-        }
-
-        private void StartFormatter(ref StartParamForAmiiboSettings startParam)
-        {
-            // Initialize RegisterInfo
-            startParam.RegisterInfo = new RegisterInfo();
-        }
-
-        private void StartNicknameAndOwnerSettings(ref StartParamForAmiiboSettings startParam)
-        {
-            _system.Device.UIHandler.DisplayCabinetDialog(out string newName);
-            byte[] nameBytes = Encoding.UTF8.GetBytes(newName);
-            Array41<byte> nickName = new Array41<byte>();
-            nameBytes.CopyTo(nickName.AsSpan());
-            startParam.RegisterInfo.Nickname = nickName;
-            NfpDevice devicePlayer1 = new()
-            {
-                NpadIdType = NpadIdType.Player1,
-                Handle = HidUtils.GetIndexFromNpadIdType(NpadIdType.Player1),
-                State = NfpDeviceState.SearchingForTag,
-            };
-            _system.Device.System.NfpDevices.Add(devicePlayer1);
-            _system.Device.UIHandler.DisplayCabinetMessageDialog();
-            string amiiboId = string.Empty;
-            bool scanned = false;
-            while (!scanned)
-            {
-                for (int i = 0; i < _system.Device.System.NfpDevices.Count; i++)
-                {
-                    if (_system.Device.System.NfpDevices[i].State == NfpDeviceState.TagFound)
-                    {
-                        amiiboId = _system.Device.System.NfpDevices[i].AmiiboId;
-                        scanned = true;
-                    }
-                }
-            }
-            VirtualAmiibo.UpdateNickName(amiiboId, newName);
-        }
-
-        private static byte[] BuildResponse(ReturnValueForAmiiboSettings returnValue)
-        {
-            int size = Unsafe.SizeOf<ReturnValueForAmiiboSettings>();
-            byte[] bytes = new byte[size];
-
-            fixed (byte* bytesPtr = bytes)
-            {
-                Unsafe.Write(bytesPtr, returnValue);
-            }
-
-            return bytes;
-        }
-
-        #region Structs
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public unsafe struct TagInfo
-        {
-            public fixed byte Data[0x58];
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public unsafe struct StartParamForAmiiboSettings
-        {
-            public byte ZeroValue; // Left at zero by sdknso
-            public byte Type;
-            public byte Flags;
-            public byte AmiiboSettingsStartParamOffset28;
-            public ulong AmiiboSettingsStartParam0;
-
-            public TagInfo TagInfo; // Only enabled when flags bit 1 is set
-            public RegisterInfo RegisterInfo; // Only enabled when flags bit 2 is set
-
-            public fixed byte StartParamExtraData[0x20];
-
-            public fixed byte Reserved[0x24];
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public unsafe struct ReturnValueForAmiiboSettings
-        {
-            public byte AmiiboSettingsReturnFlag;
-            private byte Padding1;
-            private byte Padding2;
-            private byte Padding3;
-            public DeviceHandle DeviceHandle;
-            public TagInfo TagInfo;
-            public RegisterInfo RegisterInfo;
-            public fixed byte IgnoredBySdknso[0x24];
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public struct DeviceHandle
-        {
-            public ulong Handle;
-        }
-
-        public enum AmiiboSettingsReturnFlag : byte
-        {
-            Cancel = 0,
-            HasTagInfo = 2,
-            HasRegisterInfo = 4,
-            HasTagInfoAndRegisterInfo = 6
-        }
-
-        #endregion
-    }
-}
--- a/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
@@ -117,6 +117,11 @@ namespace Ryujinx.HLE.HOS.Applets
            return ResultCode.Success;
        }

+        public ResultCode GetResult()
+        {
+            return ResultCode.Success;
+        }
+
        private static byte[] BuildResponse(ControllerSupportResultInfo result)
        {
            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
--- a/src/Ryujinx.HLE/HOS/Applets/Dummy/DummyApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Dummy/DummyApplet.cs
@@ -11,14 +11,11 @@ namespace Ryujinx.HLE.HOS.Applets.Dummy
    {
        private readonly Horizon _system;
        private AppletSession _normalSession;
-        
        public event EventHandler AppletStateChanged;
-        
        public DummyApplet(Horizon system)
        {
            _system = system;
        }
-        
        public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
        {
            _normalSession = normalSession;
@@ -27,7 +24,10 @@ namespace Ryujinx.HLE.HOS.Applets.Dummy
            _system.ReturnFocus();
            return ResultCode.Success;
        }
-        
+        private static T ReadStruct<T>(byte[] data) where T : struct
+        {
+            return MemoryMarshal.Read<T>(data.AsSpan());
+        }
        private static byte[] BuildResponse()
        {
            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
@@ -35,5 +35,9 @@ namespace Ryujinx.HLE.HOS.Applets.Dummy
            writer.Write((ulong)ResultCode.Success);
            return stream.ToArray();
        }
+        public ResultCode GetResult()
+        {
+            return ResultCode.Success;
+        }
    }
 }
--- a/src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs
@@ -203,5 +203,10 @@ namespace Ryujinx.HLE.HOS.Applets.Error
                _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Number: {applicationErrorArg.ErrorNumber} (Details)", "\n" + detailsText, buttons.ToArray());
            }
        }
+
+        public ResultCode GetResult()
+        {
+            return ResultCode.Success;
+        }
    }
 }
--- a/src/Ryujinx.HLE/HOS/Applets/IApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/IApplet.cs
@@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Applets
        ResultCode Start(AppletSession normalSession,
                         AppletSession interactiveSession);

-        ResultCode GetResult() => ResultCode.Success;
+        ResultCode GetResult();

        bool DrawTo(RenderingSurfaceInfo surfaceInfo, IVirtualMemoryManager destination, ulong position) => false;

--- a/src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
@@ -37,6 +37,11 @@ namespace Ryujinx.HLE.HOS.Applets
            return ResultCode.Success;
        }

+        public ResultCode GetResult()
+        {
+            return ResultCode.Success;
+        }
+
        private byte[] BuildResponse()
        {
            UserProfile currentUser = _system.AccountManager.LastOpenedUser;
--- a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
@@ -144,6 +144,11 @@ namespace Ryujinx.HLE.HOS.Applets
            }
        }

+        public ResultCode GetResult()
+        {
+            return ResultCode.Success;
+        }
+
        private bool IsKeyboardActive()
        {
            return _backgroundState >= InlineKeyboardState.Appearing && _backgroundState < InlineKeyboardState.Disappearing;
--- a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/TRef.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/TRef.cs
@@ -2,7 +2,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
 {
    /// <summary>
    /// Wraps a type in a class so it gets stored in the GC managed heap. This is used as communication mechanism
-    /// between classes that need to be disposed and, thus, can't share their references.
+    /// between classed that need to be disposed and, thus, can't share their references.
    /// </summary>
    /// <typeparam name="T">The internal type.</typeparam>
    class TRef<T>
--- a/src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs
@@ -1,4 +1,3 @@
-using Gommon;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
@@ -7,13 +6,12 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;

 namespace Ryujinx.HLE.HOS.Services.Account.Acc
 {
-    public class AccountSaveDataManager
+    class AccountSaveDataManager
    {
-        private static readonly string _profilesJsonPath = Path.Join(AppDataManager.BaseDirPath, "system", "Profiles.json");
+        private readonly string _profilesJsonPath = Path.Join(AppDataManager.BaseDirPath, "system", "Profiles.json");

        private static readonly ProfilesJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());

@@ -51,16 +49,6 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
            }
        }

-        public static Optional<UserProfile> GetLastUsedUser()
-        {
-            ProfilesJson profilesJson = JsonHelper.DeserializeFromFile(_profilesJsonPath, _serializerContext.ProfilesJson);
-
-            return profilesJson.Profiles
-                .FindFirst(profile => profile.AccountState == AccountState.Open)
-                .Convert(profileJson => new UserProfile(new UserId(profileJson.UserId), profileJson.Name,
-                    profileJson.Image, profileJson.LastModifiedTimestamp));
-        }
-
        public void Save(ConcurrentDictionary<string, UserProfile> profiles)
        {
            ProfilesJson profilesJson = new()
--- a/src/Ryujinx.HLE/HOS/Services/Ldn/Lp2p/IServiceCreator.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Ldn/Lp2p/IServiceCreator.cs
@@ -5,23 +5,5 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.Lp2p
    class IServiceCreator : IpcService
    {
        public IServiceCreator(ServiceCtx context) { }
-
-        [CommandCmif(0)]
-        // CreateNetworkService(pid, u64, u32) -> object<nn::ldn::detail::ISfService>
-        public ResultCode CreateNetworkService(ServiceCtx context)
-        {
-            MakeObject(context, new ISfService(context));
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(8)]
-        // CreateNetworkServiceMonitor(pid, u64) -> object<nn::ldn::detail::ISfServiceMonitor>
-        public ResultCode CreateNetworkServiceMonitor(ServiceCtx context)
-        {
-            MakeObject(context, new ISfServiceMonitor(context));
-
-            return ResultCode.Success;
-        }
    }
 }
--- a/src/Ryujinx.HLE/HOS/Services/Ldn/Lp2p/ISfService.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Ldn/Lp2p/ISfService.cs
@@ -1,54 +0,0 @@
-using Ryujinx.Common.Logging;
-
-namespace Ryujinx.HLE.HOS.Services.Ldn.Lp2p
-{
-    class ISfService : IpcService
-    {
-        public ISfService(ServiceCtx context) { }
-
-        [CommandCmif(0)]
-        // Initialize()
-        public ResultCode Initialize(ServiceCtx context)
-        {
-            context.ResponseData.Write(0);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(768)]
-        // CreateGroup(buffer<nn::lp2p::GroupInfo, 0x31)
-        public ResultCode CreateGroup(ServiceCtx context)
-        {
-            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(776)]
-        // DestroyGroup()
-        public ResultCode DestroyGroup(ServiceCtx context)
-        {
-            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(1536)]
-        // SendToOtherGroup(nn::lp2p::MacAddress, nn::lp2p::GroupId, s16, s16, u32, buffer<unknown, 0x21>)
-        public ResultCode SendToOtherGroup(ServiceCtx context)
-        {
-            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(1544)]
-        // RecvFromOtherGroup(u32, buffer<unknown, 0x22>) -> (nn::lp2p::MacAddress, u16, s16, u32, s32)
-        public ResultCode RecvFromOtherGroup(ServiceCtx context)
-        {
-            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
-
-            return ResultCode.Success;
-        }
-    }
-}
--- a/src/Ryujinx.HLE/HOS/Services/Ldn/Lp2p/ISfServiceMonitor.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Ldn/Lp2p/ISfServiceMonitor.cs
@@ -1,86 +0,0 @@
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.HOS.Ipc;
-using Ryujinx.HLE.HOS.Kernel.Threading;
-using Ryujinx.Horizon.Common;
-using System;
-
-namespace Ryujinx.HLE.HOS.Services.Ldn.Lp2p
-{
-    class ISfServiceMonitor : IpcService
-    {
-        private readonly KEvent _stateChangeEvent;
-        private readonly KEvent _jointEvent;
-        private int _stateChangeEventHandle = 0;
-        private int _jointEventHandle = 0;
-
-        public ISfServiceMonitor(ServiceCtx context)
-        {
-            _stateChangeEvent = new KEvent(context.Device.System.KernelContext);
-            _jointEvent = new KEvent(context.Device.System.KernelContext);
-        }
-
-        [CommandCmif(0)]
-        // Initialize()
-        public ResultCode Initialize(ServiceCtx context)
-        {
-            context.ResponseData.Write(0);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(256)]
-        // AttachNetworkInterfaceStateChangeEvent() -> handle<copy>
-        public ResultCode AttachNetworkInterfaceStateChangeEvent(ServiceCtx context)
-        {
-            if (context.Process.HandleTable.GenerateHandle(_stateChangeEvent.ReadableEvent, out _stateChangeEventHandle) != Result.Success)
-            {
-                throw new InvalidOperationException("Out of handles!");
-            }
-
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_stateChangeEventHandle);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(288)]
-        // GetGroupInfo(buffer<nn::lp2p::GroupInfo, 0x32>)
-        public ResultCode GetGroupInfo(ServiceCtx context)
-        {
-            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(296)]
-        // GetGroupInfo2(buffer<nn::lp2p::GroupInfo, 0x32>, buffer<nn::lp2p::GroupInfo, 0x31>)
-        public ResultCode GetGroupInfo2(ServiceCtx context)
-        {
-            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(312)]
-        // GetIpConfig(buffer<unknown<0x100>, 0x1a>)
-        public ResultCode GetIpConfig(ServiceCtx context)
-        {
-            Logger.Stub?.PrintStub(LogClass.ServiceLdn);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(328)]
-        // AttachNetworkInterfaceStateChangeEvent() -> handle<copy>
-        public ResultCode AttachJoinEvent(ServiceCtx context)
-        {
-            if (context.Process.HandleTable.GenerateHandle(_jointEvent.ReadableEvent, out _jointEventHandle) != Result.Success)
-            {
-                throw new InvalidOperationException("Out of handles!");
-            }
-
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_jointEventHandle);
-
-            return ResultCode.Success;
-        }
-    }
-}
--- a/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs
@@ -1,5 +1,3 @@
-using Gommon;
-using Humanizer;
 using NetCoreServer;
 using Open.Nat;
 using Ryujinx.Common.Logging;
@@ -155,10 +153,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy

            if (_publicPort != 0)
            {
-                _ = Executor.ExecuteAfterDelayAsync(
-                    PortLeaseRenew.Seconds(), 
-                    _disposedCancellation.Token,
-                    RefreshLease);
+                _ = Task.Delay(PortLeaseRenew * 1000, _disposedCancellation.Token).ContinueWith((task) => Task.Run(RefreshLease));
            }

            _natDevice = device;
@@ -262,10 +257,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy

            }

-            _ = Executor.ExecuteAfterDelayAsync(
-                PortLeaseRenew.Milliseconds(),
-                _disposedCancellation.Token,
-                RefreshLease);
+            _ = Task.Delay(PortLeaseRenew, _disposedCancellation.Token).ContinueWith((task) => Task.Run(RefreshLease));
        }

        public bool TryRegisterUser(P2pProxySession session, ExternalProxyConfig config)
--- a/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs
@@ -93,13 +93,6 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
            return registerInfo;
        }

-        public static void UpdateNickName(string amiiboId, string newNickName)
-        {
-            VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
-            virtualAmiiboFile.NickName = newNickName;
-            SaveAmiiboFile(virtualAmiiboFile);
-        }
-
        public static bool OpenApplicationArea(string amiiboId, uint applicationAreaId)
        {
            VirtualAmiiboFile virtualAmiiboFile = LoadAmiiboFile(amiiboId);
--- a/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
+++ b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
@@ -10,12 +10,13 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;

 namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
    class SurfaceFlinger : IConsumerListener, IDisposable
    {
+        private const int TargetFps = 60;
+
        private readonly Switch _device;

        private readonly Dictionary<long, Layer> _layers;
@@ -31,9 +32,6 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
        private readonly long _spinTicks;
        private readonly long _1msTicks;

-        private VSyncMode _vSyncMode;
-        private long _targetVSyncInterval;
-
        private int _swapInterval;
        private int _swapIntervalDelay;

@@ -90,8 +88,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
            }
            else
            {
-                _ticksPerFrame = Stopwatch.Frequency / _device.TargetVSyncInterval;
-                _targetVSyncInterval = _device.TargetVSyncInterval;
+                _ticksPerFrame = Stopwatch.Frequency / TargetFps;
            }
        }

@@ -373,20 +370,15 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger

                if (acquireStatus == Status.Success)
                {
-                    if (_device.VSyncMode == VSyncMode.Unbounded)
+                    // If device vsync is disabled, reflect the change.
+                    if (!_device.EnableDeviceVsync)
                    {
                        if (_swapInterval != 0)
                        {
                            UpdateSwapInterval(0);
-                            _vSyncMode = _device.VSyncMode;
                        }
                    }
-                    else if (_device.VSyncMode != _vSyncMode)
-                    {
-                        UpdateSwapInterval(_device.VSyncMode == VSyncMode.Unbounded ? 0 : item.SwapInterval);
-                        _vSyncMode = _device.VSyncMode;
-                    }
-                    else if (item.SwapInterval != _swapInterval || _device.TargetVSyncInterval != _targetVSyncInterval)
+                    else if (item.SwapInterval != _swapInterval)
                    {
                        UpdateSwapInterval(item.SwapInterval);
                    }
--- a/src/Ryujinx.HLE/Loaders/Processes/Extensions/NcaExtensions.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/Extensions/NcaExtensions.cs
@@ -26,7 +26,7 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
    {
        private static readonly TitleUpdateMetadataJsonSerializerContext _applicationSerializerContext = new(JsonHelper.GetDefaultSerializerOptions());

-        public static ProcessResult Load(this Nca nca, Switch device, Nca patchNca, Nca controlNca, BlitStruct<ApplicationControlProperty>? customNacpData = null)
+        public static ProcessResult Load(this Nca nca, Switch device, Nca patchNca, Nca controlNca)
        {
            // Extract RomFs and ExeFs from NCA.
            IStorage romFs = nca.GetRomFs(device, patchNca);
@@ -55,10 +55,6 @@ namespace Ryujinx.HLE.Loaders.Processes.Extensions
            {
                nacpData = controlNca.GetNacp(device);
            }
-            else if (customNacpData != null) // if the Application doesn't provide a nacp file but the Application provides an override, use the provided nacp override
-            {
-                nacpData = (BlitStruct<ApplicationControlProperty>)customNacpData;
-            }

            /* TODO: Rework this since it's wrong and doesn't work as it takes the DisplayVersion from a "potential" non-existent update.

--- a/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
@@ -98,12 +98,12 @@ namespace Ryujinx.HLE.Loaders.Processes
            return false;
        }

-        public bool LoadNca(string path, BlitStruct<ApplicationControlProperty>? customNacpData = null)
+        public bool LoadNca(string path)
        {
            FileStream file = new(path, FileMode.Open, FileAccess.Read);
            Nca nca = new(_device.Configuration.VirtualFileSystem.KeySet, file.AsStorage(false));

-            ProcessResult processResult = nca.Load(_device, null, null, customNacpData);
+            ProcessResult processResult = nca.Load(_device, null, null);

            if (processResult.ProcessId != 0 && _processesByPid.TryAdd(processResult.ProcessId, processResult))
            {
--- a/src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs
@@ -84,19 +84,12 @@ namespace Ryujinx.HLE.Loaders.Processes
                return false;
            }

-            bool isFirmware = ProgramId is >= 0x0100000000000819 and <= 0x010000000000081C;
-            bool isFirmwareApplication = ProgramId <= 0x0100000000007FFF;
-
-            string name = !isFirmware
-                ? (isFirmwareApplication ? "Firmware Application " : "") + (!string.IsNullOrWhiteSpace(Name) ? Name : "<Unknown Name>")
-                : "Firmware";
-
            // TODO: LibHac npdm currently doesn't support version field.
-            string version = !isFirmware
-                ? (!string.IsNullOrWhiteSpace(DisplayVersion) ? DisplayVersion : "<Unknown Version>")
+            string version = ProgramId > 0x0100000000007FFF
+                ? DisplayVersion
                : device.System.ContentManager.GetCurrentFirmwareVersion()?.VersionString ?? "?";

-            Logger.Info?.Print(LogClass.Loader, $"Application Loaded: {name} v{version} [{ProgramIdText}] [{(Is64Bit ? "64-bit" : "32-bit")}]");
+            Logger.Info?.Print(LogClass.Loader, $"Application Loaded: {Name} v{version} [{ProgramIdText}] [{(Is64Bit ? "64-bit" : "32-bit")}]");

            return true;
        }
--- a/src/Ryujinx.HLE/Ryujinx.HLE.csproj
+++ b/src/Ryujinx.HLE/Ryujinx.HLE.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.HLE/StructHelpers.cs
+++ b/src/Ryujinx.HLE/StructHelpers.cs
@@ -1,37 +0,0 @@
-using LibHac.Common;
-using LibHac.Ns;
-using System;
-using System.Text;
-
-namespace Ryujinx.HLE
-{
-    public static class StructHelpers
-    {
-        public static BlitStruct<ApplicationControlProperty> CreateCustomNacpData(string name, string version)
-        {
-            // https://switchbrew.org/wiki/NACP
-            const int OffsetOfDisplayVersion = 0x3060;
-            
-            // https://switchbrew.org/wiki/NACP#ApplicationTitle
-            const int TotalApplicationTitles = 0x10;
-            const int SizeOfApplicationTitle = 0x300;
-            const int OffsetOfApplicationPublisherStrings = 0x200;
-            
-            
-            var nacpData = new BlitStruct<ApplicationControlProperty>(1);
-
-            // name and publisher buffer
-            // repeat once for each locale (the ApplicationControlProperty has 16 locales)
-            for (int i = 0; i < TotalApplicationTitles; i++)
-            {
-                Encoding.ASCII.GetBytes(name).AsSpan().CopyTo(nacpData.ByteSpan[(i * SizeOfApplicationTitle)..]);
-                "Ryujinx"u8.CopyTo(nacpData.ByteSpan[(i * SizeOfApplicationTitle + OffsetOfApplicationPublisherStrings)..]);
-            }
-            
-            // version buffer
-            Encoding.ASCII.GetBytes(version).AsSpan().CopyTo(nacpData.ByteSpan[OffsetOfDisplayVersion..]);
-
-            return nacpData;
-        }
-    }
-}
--- a/src/Ryujinx.HLE/Switch.cs
+++ b/src/Ryujinx.HLE/Switch.cs
@@ -1,5 +1,3 @@
-using LibHac.Common;
-using LibHac.Ns;
 using Ryujinx.Audio.Backends.CompatLayer;
 using Ryujinx.Audio.Integration;
 using Ryujinx.Common.Configuration;
@@ -29,11 +27,7 @@ namespace Ryujinx.HLE
        public TamperMachine TamperMachine { get; }
        public IHostUIHandler UIHandler { get; }

-        public VSyncMode VSyncMode { get; set; } = VSyncMode.Switch;
-        public bool CustomVSyncIntervalEnabled { get; set; } = false;
-        public int CustomVSyncInterval { get; set; }
-
-        public long TargetVSyncInterval { get; set; } = 60;
+        public bool EnableDeviceVsync { get; set; }

        public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;

@@ -65,14 +59,12 @@ namespace Ryujinx.HLE
            System.State.SetLanguage(Configuration.SystemLanguage);
            System.State.SetRegion(Configuration.Region);

-            VSyncMode                               = Configuration.VSyncMode;
-            CustomVSyncInterval                     = Configuration.CustomVSyncInterval;
+            EnableDeviceVsync                       = Configuration.EnableVsync;
            System.State.DockedMode                 = Configuration.EnableDockedMode;
            System.PerformanceState.PerformanceMode = System.State.DockedMode ? PerformanceMode.Boost : PerformanceMode.Default;
            System.EnablePtc                        = Configuration.EnablePtc;
            System.FsIntegrityCheckLevel            = Configuration.FsIntegrityCheckLevel;
            System.GlobalAccessLogMode              = Configuration.FsGlobalAccessLogMode;
-            UpdateVSyncInterval();
 #pragma warning restore IDE0055
        }

@@ -83,37 +75,9 @@ namespace Ryujinx.HLE
            Gpu.GPFifo.DispatchCalls();
        }

-        public void IncrementCustomVSyncInterval()
-        {
-            CustomVSyncInterval += 1;
-            UpdateVSyncInterval();
-        }
-
-        public void DecrementCustomVSyncInterval()
-        {
-            CustomVSyncInterval -= 1;
-            UpdateVSyncInterval();
-        }
-
-        public void UpdateVSyncInterval()
-        {
-            switch (VSyncMode)
-            {
-                case VSyncMode.Custom:
-                    TargetVSyncInterval = CustomVSyncInterval;
-                    break;
-                case VSyncMode.Switch:
-                    TargetVSyncInterval = 60;
-                    break;
-                case VSyncMode.Unbounded:
-                    TargetVSyncInterval = 1;
-                    break;
-            }
-        }
-
        public bool LoadCart(string exeFsDir, string romFsFile = null) => Processes.LoadUnpackedNca(exeFsDir, romFsFile);
        public bool LoadXci(string xciFile, ulong applicationId = 0) => Processes.LoadXci(xciFile, applicationId);
-        public bool LoadNca(string ncaFile, BlitStruct<ApplicationControlProperty>? customNacpData = null) => Processes.LoadNca(ncaFile, customNacpData);
+        public bool LoadNca(string ncaFile) => Processes.LoadNca(ncaFile);
        public bool LoadNsp(string nspFile, ulong applicationId = 0) => Processes.LoadNsp(nspFile, applicationId);
        public bool LoadProgram(string fileName) => Processes.LoadNxo(fileName);

--- a/src/Ryujinx.HLE/UI/IHostUIHandler.cs
+++ b/src/Ryujinx.HLE/UI/IHostUIHandler.cs
@@ -24,18 +24,6 @@ namespace Ryujinx.HLE.UI
        /// <returns>True when OK is pressed, False otherwise.</returns>
        bool DisplayMessageDialog(ControllerAppletUIArgs args);

-        /// <summary>
-        /// Displays an Input Dialog box to the user so they can enter the Amiibo's new name
-        /// </summary>
-        /// <param name="userText">Text that the user entered. Set to `null` on internal errors</param>
-        /// <returns>True when OK is pressed, False otherwise. Also returns True on internal errors</returns>
-        bool DisplayCabinetDialog(out string userText);
-
-        /// <summary>
-        /// Displays a Message Dialog box to the user to notify them to scan the Amiibo.
-        /// </summary>
-        void DisplayCabinetMessageDialog();
-
        /// <summary>
        /// Tell the UI that we need to transition to another program.
        /// </summary>
--- a/src/Ryujinx.Headless.SDL2/HeadlessDynamicTextInputHandler.cs
+++ b/src/Ryujinx.Headless.SDL2/HeadlessDynamicTextInputHandler.cs
@@ -2,7 +2,7 @@ using Ryujinx.HLE.UI;
 using System.Threading;
 using System.Threading.Tasks;

-namespace Ryujinx.Headless
+namespace Ryujinx.Headless.SDL2
 {
    /// <summary>
    /// Headless text processing class, right now there is no way to forward the input to it.
--- a/src/Ryujinx.Headless.SDL2/HeadlessHostUiTheme.cs
+++ b/src/Ryujinx.Headless.SDL2/HeadlessHostUiTheme.cs
@@ -1,6 +1,6 @@
 using Ryujinx.HLE.UI;

-namespace Ryujinx.Headless
+namespace Ryujinx.Headless.SDL2
 {
    internal class HeadlessHostUiTheme : IHostUITheme
    {
--- a/src/Ryujinx.Headless.SDL2/OpenGL/OpenGLWindow.cs
+++ b/src/Ryujinx.Headless.SDL2/OpenGL/OpenGLWindow.cs
@@ -7,7 +7,7 @@ using Ryujinx.Input.HLE;
 using System;
 using static SDL2.SDL;

-namespace Ryujinx.Headless
+namespace Ryujinx.Headless.SDL2.OpenGL
 {
    class OpenGLWindow : WindowBase
    {
--- a/src/Ryujinx.Headless.SDL2/Options.cs
+++ b/src/Ryujinx.Headless.SDL2/Options.cs
@@ -1,168 +1,13 @@
 using CommandLine;
-using Gommon;
 using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.HLE;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.SystemState;
-using Ryujinx.UI.Common.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;

-namespace Ryujinx.Headless
+namespace Ryujinx.Headless.SDL2
 {
    public class Options
    {
-        public void InheritMainConfig(string[] originalArgs, ConfigurationState configurationState, out bool needsProfileSet)
-        {
-            needsProfileSet = NeedsOverride(nameof(UserProfile));
-
-            if (NeedsOverride(nameof(IsFullscreen)))
-                IsFullscreen = configurationState.UI.StartFullscreen;
-
-            if (NeedsOverride(nameof(EnableKeyboard)))
-                EnableKeyboard = configurationState.Hid.EnableKeyboard;
-            
-            if (NeedsOverride(nameof(EnableMouse)))
-                EnableMouse = configurationState.Hid.EnableMouse;
-
-            if (NeedsOverride(nameof(HideCursorMode)))
-                HideCursorMode = configurationState.HideCursor;
-
-            if (NeedsOverride(nameof(DisablePTC)))
-                DisablePTC = !configurationState.System.EnablePtc;
-
-            if (NeedsOverride(nameof(EnableInternetAccess)))
-                EnableInternetAccess = configurationState.System.EnableInternetAccess;
-
-            if (NeedsOverride(nameof(DisableFsIntegrityChecks)))
-                DisableFsIntegrityChecks = configurationState.System.EnableFsIntegrityChecks;
-            
-            if (NeedsOverride(nameof(FsGlobalAccessLogMode)))
-                FsGlobalAccessLogMode = configurationState.System.FsGlobalAccessLogMode;
-            
-            if (NeedsOverride(nameof(VSyncMode)))
-                VSyncMode = configurationState.Graphics.VSyncMode;
-            
-            if (NeedsOverride(nameof(CustomVSyncInterval)))
-                CustomVSyncInterval = configurationState.Graphics.CustomVSyncInterval;
-            
-            if (NeedsOverride(nameof(DisableShaderCache)))
-                DisableShaderCache = !configurationState.Graphics.EnableShaderCache;
-
-            if (NeedsOverride(nameof(EnableTextureRecompression)))
-                EnableTextureRecompression = configurationState.Graphics.EnableTextureRecompression;
-            
-            if (NeedsOverride(nameof(DisableDockedMode)))
-                DisableDockedMode = !configurationState.System.EnableDockedMode;
-
-            if (NeedsOverride(nameof(SystemLanguage)))
-                SystemLanguage = (SystemLanguage)(int)configurationState.System.Language.Value;
-            
-            if (NeedsOverride(nameof(SystemRegion)))
-                SystemRegion = (RegionCode)(int)configurationState.System.Region.Value;
-            
-            if (NeedsOverride(nameof(SystemTimeZone)))
-                SystemTimeZone = configurationState.System.TimeZone;
-            
-            if (NeedsOverride(nameof(SystemTimeOffset)))
-                SystemTimeOffset = configurationState.System.SystemTimeOffset;
-            
-            if (NeedsOverride(nameof(MemoryManagerMode)))
-                MemoryManagerMode = configurationState.System.MemoryManagerMode;
-            
-            if (NeedsOverride(nameof(AudioVolume)))
-                AudioVolume = configurationState.System.AudioVolume;
-
-            if (NeedsOverride(nameof(UseHypervisor)) && OperatingSystem.IsMacOS())
-                UseHypervisor = configurationState.System.UseHypervisor;
-
-            if (NeedsOverride(nameof(MultiplayerLanInterfaceId)))
-                MultiplayerLanInterfaceId = configurationState.Multiplayer.LanInterfaceId;
-            
-            if (NeedsOverride(nameof(DisableFileLog)))
-                DisableFileLog = !configurationState.Logger.EnableFileLog;
-            
-            if (NeedsOverride(nameof(LoggingEnableDebug)))
-                LoggingEnableDebug = configurationState.Logger.EnableDebug;
-            
-            if (NeedsOverride(nameof(LoggingDisableStub)))
-                LoggingDisableStub = !configurationState.Logger.EnableStub;
-            
-            if (NeedsOverride(nameof(LoggingDisableInfo)))
-                LoggingDisableInfo = !configurationState.Logger.EnableInfo;
-            
-            if (NeedsOverride(nameof(LoggingDisableWarning)))
-                LoggingDisableWarning = !configurationState.Logger.EnableWarn;
-            
-            if (NeedsOverride(nameof(LoggingDisableError)))
-                LoggingDisableError = !configurationState.Logger.EnableError;
-            
-            if (NeedsOverride(nameof(LoggingEnableTrace)))
-                LoggingEnableTrace = configurationState.Logger.EnableTrace;
-            
-            if (NeedsOverride(nameof(LoggingDisableGuest)))
-                LoggingDisableGuest = !configurationState.Logger.EnableGuest;
-
-            if (NeedsOverride(nameof(LoggingEnableFsAccessLog)))
-                LoggingEnableFsAccessLog = configurationState.Logger.EnableFsAccessLog;
-
-            if (NeedsOverride(nameof(LoggingGraphicsDebugLevel)))
-                LoggingGraphicsDebugLevel = configurationState.Logger.GraphicsDebugLevel;
-
-            if (NeedsOverride(nameof(ResScale)))
-                ResScale = configurationState.Graphics.ResScale;
-            
-            if (NeedsOverride(nameof(MaxAnisotropy)))
-                MaxAnisotropy = configurationState.Graphics.MaxAnisotropy;
-            
-            if (NeedsOverride(nameof(AspectRatio)))
-                AspectRatio = configurationState.Graphics.AspectRatio;
-            
-            if (NeedsOverride(nameof(BackendThreading)))
-                BackendThreading = configurationState.Graphics.BackendThreading;
-            
-            if (NeedsOverride(nameof(DisableMacroHLE)))
-                DisableMacroHLE = !configurationState.Graphics.EnableMacroHLE;
-            
-            if (NeedsOverride(nameof(GraphicsShadersDumpPath)))
-                GraphicsShadersDumpPath = configurationState.Graphics.ShadersDumpPath;
-            
-            if (NeedsOverride(nameof(GraphicsBackend)))
-                GraphicsBackend = configurationState.Graphics.GraphicsBackend;
-            
-            if (NeedsOverride(nameof(AntiAliasing)))
-                AntiAliasing = configurationState.Graphics.AntiAliasing;
-            
-            if (NeedsOverride(nameof(ScalingFilter)))
-                ScalingFilter = configurationState.Graphics.ScalingFilter;
-            
-            if (NeedsOverride(nameof(ScalingFilterLevel)))
-                ScalingFilterLevel = configurationState.Graphics.ScalingFilterLevel;
-
-            if (NeedsOverride(nameof(DramSize)))
-                DramSize = configurationState.System.DramSize;
-            
-            if (NeedsOverride(nameof(IgnoreMissingServices)))
-                IgnoreMissingServices = configurationState.System.IgnoreMissingServices;
-            
-            if (NeedsOverride(nameof(IgnoreControllerApplet)))
-                IgnoreControllerApplet = configurationState.IgnoreApplet;
-            
-            return;
-            
-            bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey)));
-
-            string OptionName(string propertyName) =>
-                typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute<OptionAttribute>()!.LongName;
-        }
-        
        // General
-        
-        [Option("use-main-config", Required = false, Default = false, HelpText = "Use the settings from what was configured via the UI.")]
-        public bool InheritConfig { get; set; }

        [Option("root-data-dir", Required = false, HelpText = "Set the custom folder path for Ryujinx data.")]
        public string BaseDataDir { get; set; }
@@ -270,11 +115,8 @@ namespace Ryujinx.Headless
        [Option("fs-global-access-log-mode", Required = false, Default = 0, HelpText = "Enables FS access log output to the console.")]
        public int FsGlobalAccessLogMode { get; set; }

-        [Option("vsync-mode", Required = false, Default = VSyncMode.Switch, HelpText = "Sets the emulated VSync mode (Switch, Unbounded, or Custom).")]
-        public VSyncMode VSyncMode { get; set; }
-
-        [Option("custom-refresh-rate", Required = false, Default = 90, HelpText = "Sets the custom refresh rate target value (integer).")]
-        public int CustomVSyncInterval { get; set; }
+        [Option("disable-vsync", Required = false, HelpText = "Disables Vertical Sync.")]
+        public bool DisableVSync { get; set; }

        [Option("disable-shader-cache", Required = false, HelpText = "Disables Shader cache.")]
        public bool DisableShaderCache { get; set; }
@@ -327,7 +169,7 @@ namespace Ryujinx.Headless
        public bool LoggingDisableWarning { get; set; }

        [Option("disable-error-logs", Required = false, HelpText = "Disables printing error log messages.")]
-        public bool LoggingDisableError { get; set; }
+        public bool LoggingEnableError { get; set; }

        [Option("enable-trace-logs", Required = false, Default = false, HelpText = "Enables printing trace log messages.")]
        public bool LoggingEnableTrace { get; set; }
--- a/src/Ryujinx/Headless/HeadlessRyujinx.cs
+++ b/src/Ryujinx/Headless/HeadlessRyujinx.cs
@@ -1,9 +1,12 @@
 using CommandLine;
-using Gommon;
-using Ryujinx.Ava;
+using LibHac.Tools.FsSystem;
+using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Configuration.Hid.Controller;
+using Ryujinx.Common.Configuration.Hid.Controller.Motion;
+using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Logging.Targets;
@@ -11,9 +14,14 @@ using Ryujinx.Common.SystemInterop;
 using Ryujinx.Common.Utilities;
 using Ryujinx.Cpu;
 using Ryujinx.Graphics.GAL;
+using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.Gpu.Shader;
+using Ryujinx.Graphics.OpenGL;
+using Ryujinx.Graphics.Vulkan;
 using Ryujinx.Graphics.Vulkan.MoltenVK;
+using Ryujinx.Headless.SDL2.OpenGL;
+using Ryujinx.Headless.SDL2.Vulkan;
 using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
@@ -22,16 +30,22 @@ using Ryujinx.Input;
 using Ryujinx.Input.HLE;
 using Ryujinx.Input.SDL2;
 using Ryujinx.SDL2.Common;
-using Ryujinx.UI.Common.Configuration;
+using Silk.NET.Vulkan;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text.Json;
 using System.Threading;
+using ConfigGamepadInputId = Ryujinx.Common.Configuration.Hid.Controller.GamepadInputId;
+using ConfigStickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
+using Key = Ryujinx.Common.Configuration.Hid.Key;

-namespace Ryujinx.Headless
+namespace Ryujinx.Headless.SDL2
 {
-    public partial class HeadlessRyujinx
+    class Program
    {
+        public static string Version { get; private set; }
+
        private static VirtualFileSystem _virtualFileSystem;
        private static ContentManager _contentManager;
        private static AccountManager _accountManager;
@@ -41,18 +55,20 @@ namespace Ryujinx.Headless
        private static Switch _emulationContext;
        private static WindowBase _window;
        private static WindowsMultimediaTimerResolution _windowsMultimediaTimerResolution;
-        private static List<InputConfig> _inputConfiguration = [];
+        private static List<InputConfig> _inputConfiguration;
        private static bool _enableKeyboard;
        private static bool _enableMouse;

        private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());

-        public static void Entrypoint(string[] args)
+        static void Main(string[] args)
        {
+            Version = ReleaseInformation.Version;
+
            // Make process DPI aware for proper window sizing on high-res screens.
            ForceDpiAware.Windows();

-            Console.Title = $"Ryujinx Console {Program.Version} (Headless)";
+            Console.Title = $"Ryujinx Console {Version} (Headless SDL2)";

            if (OperatingSystem.IsMacOS() || OperatingSystem.IsLinux())
            {
@@ -80,89 +96,242 @@ namespace Ryujinx.Headless
            }

            Parser.Default.ParseArguments<Options>(args)
-                .WithParsed(options => Load(args, options))
-                .WithNotParsed(errors =>
-                {
-                    Logger.Error?.PrintMsg(LogClass.Application, "Error parsing command-line arguments:");
-                    
-                    errors.ForEach(err => Logger.Error?.PrintMsg(LogClass.Application, $" - {err.Tag}"));
-                });
+            .WithParsed(Load)
+            .WithNotParsed(errors => errors.Output());
        }
-        
-        public static void ReloadConfig(string customConfigPath = null)
+
+        private static InputConfig HandlePlayerConfiguration(string inputProfileName, string inputId, PlayerIndex index)
        {
-            string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
-            string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
-
-            string configurationPath = null;
-            
-            // Now load the configuration as the other subsystems are now registered
-            if (customConfigPath != null && File.Exists(customConfigPath))
+            if (inputId == null)
            {
-                configurationPath = customConfigPath;
-            } 
-            else if (File.Exists(localConfigurationPath))
-            {
-                configurationPath = localConfigurationPath;
-            }
-            else if (File.Exists(appDataConfigurationPath))
-            {
-                configurationPath = appDataConfigurationPath;
-            }
-
-            if (configurationPath == null)
-            {
-                // No configuration, we load the default values and save it to disk
-                configurationPath = appDataConfigurationPath;
-                Logger.Notice.Print(LogClass.Application, $"No configuration file found. Saving default configuration to: {configurationPath}");
-
-                ConfigurationState.Instance.LoadDefault();
-                ConfigurationState.Instance.ToFileFormat().SaveConfig(configurationPath);
-            }
-            else
-            {
-                Logger.Notice.Print(LogClass.Application, $"Loading configuration from: {configurationPath}");
-
-                if (ConfigurationFileFormat.TryLoad(configurationPath, out ConfigurationFileFormat configurationFileFormat))
+                if (index == PlayerIndex.Player1)
                {
-                    ConfigurationState.Instance.Load(configurationFileFormat, configurationPath);
+                    Logger.Info?.Print(LogClass.Application, $"{index} not configured, defaulting to default keyboard.");
+
+                    // Default to keyboard
+                    inputId = "0";
                }
                else
                {
-                    Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location: {configurationPath}");
+                    Logger.Info?.Print(LogClass.Application, $"{index} not configured");

-                    ConfigurationState.Instance.LoadDefault();
+                    return null;
                }
            }
+
+            IGamepad gamepad = _inputManager.KeyboardDriver.GetGamepad(inputId);
+
+            bool isKeyboard = true;
+
+            if (gamepad == null)
+            {
+                gamepad = _inputManager.GamepadDriver.GetGamepad(inputId);
+                isKeyboard = false;
+
+                if (gamepad == null)
+                {
+                    Logger.Error?.Print(LogClass.Application, $"{index} gamepad not found (\"{inputId}\")");
+
+                    return null;
+                }
+            }
+
+            string gamepadName = gamepad.Name;
+
+            gamepad.Dispose();
+
+            InputConfig config;
+
+            if (inputProfileName == null || inputProfileName.Equals("default"))
+            {
+                if (isKeyboard)
+                {
+                    config = new StandardKeyboardInputConfig
+                    {
+                        Version = InputConfig.CurrentVersion,
+                        Backend = InputBackendType.WindowKeyboard,
+                        Id = null,
+                        ControllerType = ControllerType.JoyconPair,
+                        LeftJoycon = new LeftJoyconCommonConfig<Key>
+                        {
+                            DpadUp = Key.Up,
+                            DpadDown = Key.Down,
+                            DpadLeft = Key.Left,
+                            DpadRight = Key.Right,
+                            ButtonMinus = Key.Minus,
+                            ButtonL = Key.E,
+                            ButtonZl = Key.Q,
+                            ButtonSl = Key.Unbound,
+                            ButtonSr = Key.Unbound,
+                        },
+
+                        LeftJoyconStick = new JoyconConfigKeyboardStick<Key>
+                        {
+                            StickUp = Key.W,
+                            StickDown = Key.S,
+                            StickLeft = Key.A,
+                            StickRight = Key.D,
+                            StickButton = Key.F,
+                        },
+
+                        RightJoycon = new RightJoyconCommonConfig<Key>
+                        {
+                            ButtonA = Key.Z,
+                            ButtonB = Key.X,
+                            ButtonX = Key.C,
+                            ButtonY = Key.V,
+                            ButtonPlus = Key.Plus,
+                            ButtonR = Key.U,
+                            ButtonZr = Key.O,
+                            ButtonSl = Key.Unbound,
+                            ButtonSr = Key.Unbound,
+                        },
+
+                        RightJoyconStick = new JoyconConfigKeyboardStick<Key>
+                        {
+                            StickUp = Key.I,
+                            StickDown = Key.K,
+                            StickLeft = Key.J,
+                            StickRight = Key.L,
+                            StickButton = Key.H,
+                        },
+                    };
+                }
+                else
+                {
+                    bool isNintendoStyle = gamepadName.Contains("Nintendo");
+
+                    config = new StandardControllerInputConfig
+                    {
+                        Version = InputConfig.CurrentVersion,
+                        Backend = InputBackendType.GamepadSDL2,
+                        Id = null,
+                        ControllerType = ControllerType.JoyconPair,
+                        DeadzoneLeft = 0.1f,
+                        DeadzoneRight = 0.1f,
+                        RangeLeft = 1.0f,
+                        RangeRight = 1.0f,
+                        TriggerThreshold = 0.5f,
+                        LeftJoycon = new LeftJoyconCommonConfig<ConfigGamepadInputId>
+                        {
+                            DpadUp = ConfigGamepadInputId.DpadUp,
+                            DpadDown = ConfigGamepadInputId.DpadDown,
+                            DpadLeft = ConfigGamepadInputId.DpadLeft,
+                            DpadRight = ConfigGamepadInputId.DpadRight,
+                            ButtonMinus = ConfigGamepadInputId.Minus,
+                            ButtonL = ConfigGamepadInputId.LeftShoulder,
+                            ButtonZl = ConfigGamepadInputId.LeftTrigger,
+                            ButtonSl = ConfigGamepadInputId.Unbound,
+                            ButtonSr = ConfigGamepadInputId.Unbound,
+                        },
+
+                        LeftJoyconStick = new JoyconConfigControllerStick<ConfigGamepadInputId, ConfigStickInputId>
+                        {
+                            Joystick = ConfigStickInputId.Left,
+                            StickButton = ConfigGamepadInputId.LeftStick,
+                            InvertStickX = false,
+                            InvertStickY = false,
+                            Rotate90CW = false,
+                        },
+
+                        RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId>
+                        {
+                            ButtonA = isNintendoStyle ? ConfigGamepadInputId.A : ConfigGamepadInputId.B,
+                            ButtonB = isNintendoStyle ? ConfigGamepadInputId.B : ConfigGamepadInputId.A,
+                            ButtonX = isNintendoStyle ? ConfigGamepadInputId.X : ConfigGamepadInputId.Y,
+                            ButtonY = isNintendoStyle ? ConfigGamepadInputId.Y : ConfigGamepadInputId.X,
+                            ButtonPlus = ConfigGamepadInputId.Plus,
+                            ButtonR = ConfigGamepadInputId.RightShoulder,
+                            ButtonZr = ConfigGamepadInputId.RightTrigger,
+                            ButtonSl = ConfigGamepadInputId.Unbound,
+                            ButtonSr = ConfigGamepadInputId.Unbound,
+                        },
+
+                        RightJoyconStick = new JoyconConfigControllerStick<ConfigGamepadInputId, ConfigStickInputId>
+                        {
+                            Joystick = ConfigStickInputId.Right,
+                            StickButton = ConfigGamepadInputId.RightStick,
+                            InvertStickX = false,
+                            InvertStickY = false,
+                            Rotate90CW = false,
+                        },
+
+                        Motion = new StandardMotionConfigController
+                        {
+                            MotionBackend = MotionInputBackendType.GamepadDriver,
+                            EnableMotion = true,
+                            Sensitivity = 100,
+                            GyroDeadzone = 1,
+                        },
+                        Rumble = new RumbleConfigController
+                        {
+                            StrongRumble = 1f,
+                            WeakRumble = 1f,
+                            EnableRumble = false,
+                        },
+                    };
+                }
+            }
+            else
+            {
+                string profileBasePath;
+
+                if (isKeyboard)
+                {
+                    profileBasePath = Path.Combine(AppDataManager.ProfilesDirPath, "keyboard");
+                }
+                else
+                {
+                    profileBasePath = Path.Combine(AppDataManager.ProfilesDirPath, "controller");
+                }
+
+                string path = Path.Combine(profileBasePath, inputProfileName + ".json");
+
+                if (!File.Exists(path))
+                {
+                    Logger.Error?.Print(LogClass.Application, $"Input profile \"{inputProfileName}\" not found for \"{inputId}\"");
+
+                    return null;
+                }
+
+                try
+                {
+                    config = JsonHelper.DeserializeFromFile(path, _serializerContext.InputConfig);
+                }
+                catch (JsonException)
+                {
+                    Logger.Error?.Print(LogClass.Application, $"Input profile \"{inputProfileName}\" parsing failed for \"{inputId}\"");
+
+                    return null;
+                }
+            }
+
+            config.Id = inputId;
+            config.PlayerIndex = index;
+
+            string inputTypeName = isKeyboard ? "Keyboard" : "Gamepad";
+
+            Logger.Info?.Print(LogClass.Application, $"{config.PlayerIndex} configured with {inputTypeName} \"{config.Id}\"");
+
+            // If both stick ranges are 0 (usually indicative of an outdated profile load) then both sticks will be set to 1.0.
+            if (config is StandardControllerInputConfig controllerConfig)
+            {
+                if (controllerConfig.RangeLeft <= 0.0f && controllerConfig.RangeRight <= 0.0f)
+                {
+                    controllerConfig.RangeLeft = 1.0f;
+                    controllerConfig.RangeRight = 1.0f;
+
+                    Logger.Info?.Print(LogClass.Application, $"{config.PlayerIndex} stick range reset. Save the profile now to update your configuration");
+                }
+            }
+
+            return config;
        }

-        static void Load(string[] originalArgs, Options option)
+        static void Load(Options option)
        {
-            Initialize();
-
-            bool useLastUsedProfile = false;
-
-            if (option.InheritConfig)
-            {
-                option.InheritMainConfig(originalArgs, ConfigurationState.Instance, out useLastUsedProfile);
-            }
-
            AppDataManager.Initialize(option.BaseDataDir);
-            
-            if (useLastUsedProfile && AccountSaveDataManager.GetLastUsedUser().TryGet(out var profile))
-                option.UserProfile = profile.Name;
-            
-            // Check if keys exists.
-            if (!File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys")))
-            {
-                if (!(AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile && File.Exists(Path.Combine(AppDataManager.KeysDirPathUser, "prod.keys"))))
-                {
-                    Logger.Error?.Print(LogClass.Application, "Keys not found");
-                }
-            }
-            
-            ReloadConfig();
-            
+
            _virtualFileSystem = VirtualFileSystem.CreateInstance();
            _libHacHorizonManager = new LibHacHorizonManager();

@@ -177,7 +346,7 @@ namespace Ryujinx.Headless

            _inputManager = new InputManager(new SDL2KeyboardDriver(), new SDL2GamepadDriver());

-            GraphicsConfig.EnableShaderCache = !option.DisableShaderCache;
+            GraphicsConfig.EnableShaderCache = true;

            if (OperatingSystem.IsMacOS())
            {
@@ -188,13 +357,15 @@ namespace Ryujinx.Headless
                }
            }

+            IGamepad gamepad;
+
            if (option.ListInputIds)
            {
                Logger.Info?.Print(LogClass.Application, "Input Ids:");

                foreach (string id in _inputManager.KeyboardDriver.GamepadsIds)
                {
-                    IGamepad gamepad = _inputManager.KeyboardDriver.GetGamepad(id);
+                    gamepad = _inputManager.KeyboardDriver.GetGamepad(id);

                    Logger.Info?.Print(LogClass.Application, $"- {id} (\"{gamepad.Name}\")");

@@ -203,7 +374,7 @@ namespace Ryujinx.Headless

                foreach (string id in _inputManager.GamepadDriver.GamepadsIds)
                {
-                    IGamepad gamepad = _inputManager.GamepadDriver.GetGamepad(id);
+                    gamepad = _inputManager.GamepadDriver.GetGamepad(id);

                    Logger.Info?.Print(LogClass.Application, $"- {id} (\"{gamepad.Name}\")");

@@ -220,7 +391,7 @@ namespace Ryujinx.Headless
                return;
            }

-            _inputConfiguration ??= [];
+            _inputConfiguration = new List<InputConfig>();
            _enableKeyboard = option.EnableKeyboard;
            _enableMouse = option.EnableMouse;

@@ -233,9 +404,9 @@ namespace Ryujinx.Headless
                    _inputConfiguration.Add(inputConfig);
                }
            }
-            
+
            LoadPlayerConfiguration(option.InputProfile1Name, option.InputId1, PlayerIndex.Player1);
-            LoadPlayerConfiguration(option.InputProfile2Name, option.InputId2, PlayerIndex.Player2); 
+            LoadPlayerConfiguration(option.InputProfile2Name, option.InputId2, PlayerIndex.Player2);
            LoadPlayerConfiguration(option.InputProfile3Name, option.InputId3, PlayerIndex.Player3);
            LoadPlayerConfiguration(option.InputProfile4Name, option.InputId4, PlayerIndex.Player4);
            LoadPlayerConfiguration(option.InputProfile5Name, option.InputId5, PlayerIndex.Player5);
@@ -243,7 +414,6 @@ namespace Ryujinx.Headless
            LoadPlayerConfiguration(option.InputProfile7Name, option.InputId7, PlayerIndex.Player7);
            LoadPlayerConfiguration(option.InputProfile8Name, option.InputId8, PlayerIndex.Player8);
            LoadPlayerConfiguration(option.InputProfileHandheldName, option.InputIdHandheld, PlayerIndex.Handheld);
-            

            if (_inputConfiguration.Count == 0)
            {
@@ -255,7 +425,7 @@ namespace Ryujinx.Headless
            Logger.SetEnable(LogLevel.Stub, !option.LoggingDisableStub);
            Logger.SetEnable(LogLevel.Info, !option.LoggingDisableInfo);
            Logger.SetEnable(LogLevel.Warning, !option.LoggingDisableWarning);
-            Logger.SetEnable(LogLevel.Error, !option.LoggingDisableError);
+            Logger.SetEnable(LogLevel.Error, option.LoggingEnableError);
            Logger.SetEnable(LogLevel.Trace, option.LoggingEnableTrace);
            Logger.SetEnable(LogLevel.Guest, !option.LoggingDisableGuest);
            Logger.SetEnable(LogLevel.AccessLog, option.LoggingEnableFsAccessLog);
@@ -339,6 +509,82 @@ namespace Ryujinx.Headless
                : new OpenGLWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet);
        }

+        private static IRenderer CreateRenderer(Options options, WindowBase window)
+        {
+            if (options.GraphicsBackend == GraphicsBackend.Vulkan && window is VulkanWindow vulkanWindow)
+            {
+                string preferredGpuId = string.Empty;
+                Vk api = Vk.GetApi();
+
+                if (!string.IsNullOrEmpty(options.PreferredGPUVendor))
+                {
+                    string preferredGpuVendor = options.PreferredGPUVendor.ToLowerInvariant();
+                    var devices = VulkanRenderer.GetPhysicalDevices(api);
+
+                    foreach (var device in devices)
+                    {
+                        if (device.Vendor.ToLowerInvariant() == preferredGpuVendor)
+                        {
+                            preferredGpuId = device.Id;
+                            break;
+                        }
+                    }
+                }
+
+                return new VulkanRenderer(
+                    api,
+                    (instance, vk) => new SurfaceKHR((ulong)(vulkanWindow.CreateWindowSurface(instance.Handle))),
+                    vulkanWindow.GetRequiredInstanceExtensions,
+                    preferredGpuId);
+            }
+
+            return new OpenGLRenderer();
+        }
+
+        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options)
+        {
+            BackendThreading threadingMode = options.BackendThreading;
+
+            bool threadedGAL = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
+
+            if (threadedGAL)
+            {
+                renderer = new ThreadedRenderer(renderer);
+            }
+
+            HLEConfiguration configuration = new(_virtualFileSystem,
+                _libHacHorizonManager,
+                _contentManager,
+                _accountManager,
+                _userChannelPersistence,
+                renderer,
+                new SDL2HardwareDeviceDriver(),
+                options.DramSize,
+                window,
+                options.SystemLanguage,
+                options.SystemRegion,
+                !options.DisableVSync,
+                !options.DisableDockedMode,
+                !options.DisablePTC,
+                options.EnableInternetAccess,
+                !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                options.FsGlobalAccessLogMode,
+                options.SystemTimeOffset,
+                options.SystemTimeZone,
+                options.MemoryManagerMode,
+                options.IgnoreMissingServices,
+                options.AspectRatio,
+                options.AudioVolume,
+                options.UseHypervisor ?? true,
+                options.MultiplayerLanInterfaceId,
+                Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
+                false,
+                "",
+                "");
+
+            return new Switch(configuration);
+        }
+
        private static void ExecutionEntrypoint()
        {
            if (OperatingSystem.IsWindows())
--- a/src/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj
+++ b/src/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj
@@ -0,0 +1,72 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <OutputType>Exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Version>1.0.0-dirty</Version>
+    <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
+    <SigningCertificate Condition=" '$(SigningCertificate)' == '' ">-</SigningCertificate>
+    <TieredPGO>true</TieredPGO>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="OpenTK.Core" />
+    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" />
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOSPlatform('OSX'))">
+    <Exec Command="codesign --entitlements '$(ProjectDir)..\..\distribution\macos\entitlements.xml' -f -s $(SigningCertificate) '$(TargetDir)$(TargetName)'" />
+  </Target>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
+    <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
+    <ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
+    <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
+    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
+    <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
+    <ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" />
+    <ProjectReference Include="..\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
+    <ProjectReference Include="..\Ryujinx.Graphics.Gpu\Ryujinx.Graphics.Gpu.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" />
+    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\..\distribution\legal\THIRDPARTY.md">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>THIRDPARTY.md</TargetPath>
+    </Content>
+    <Content Include="..\..\LICENSE.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>LICENSE.txt</TargetPath>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64' OR ('$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOSPlatform('Linux')))">
+    <Content Include="..\..\distribution\linux\Ryujinx.sh">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Ryujinx.bmp" />
+  </ItemGroup>
+
+  <!-- Due to .net core 3.1 embedded resource loading -->
+  <PropertyGroup>
+    <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
+    <ApplicationIcon>..\Ryujinx\Ryujinx.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>partial</TrimMode>
+  </PropertyGroup>
+</Project>
--- a/src/Ryujinx.Headless.SDL2/Ryujinx.bmp
+++ b/src/Ryujinx.Headless.SDL2/Ryujinx.bmp
--- a/src/Ryujinx.Headless.SDL2/StatusUpdatedEventArgs.cs
+++ b/src/Ryujinx.Headless.SDL2/StatusUpdatedEventArgs.cs
@@ -1,9 +1,9 @@
 using System;

-namespace Ryujinx.Headless
+namespace Ryujinx.Headless.SDL2
 {
    class StatusUpdatedEventArgs(
-        string vSyncMode,
+        bool vSyncEnabled,
        string dockedMode,
        string aspectRatio,
        string gameStatus,
@@ -11,7 +11,7 @@ namespace Ryujinx.Headless
        string gpuName)
        : EventArgs
    {
-        public string VSyncMode = vSyncMode;
+        public bool VSyncEnabled = vSyncEnabled;
        public string DockedMode = dockedMode;
        public string AspectRatio = aspectRatio;
        public string GameStatus = gameStatus;
--- a/src/Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs
+++ b/src/Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs
@@ -6,7 +6,7 @@ using System;
 using System.Runtime.InteropServices;
 using static SDL2.SDL;

-namespace Ryujinx.Headless
+namespace Ryujinx.Headless.SDL2.Vulkan
 {
    class VulkanWindow : WindowBase
    {
--- a/src/Ryujinx.Headless.SDL2/WindowBase.cs
+++ b/src/Ryujinx.Headless.SDL2/WindowBase.cs
@@ -1,6 +1,4 @@
 using Humanizer;
-using LibHac.Tools.Fs;
-using Ryujinx.Ava;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Logging;
@@ -27,7 +25,7 @@ using AntiAliasing = Ryujinx.Common.Configuration.AntiAliasing;
 using ScalingFilter = Ryujinx.Common.Configuration.ScalingFilter;
 using Switch = Ryujinx.HLE.Switch;

-namespace Ryujinx.Headless
+namespace Ryujinx.Headless.SDL2
 {
    abstract partial class WindowBase : IHostUIHandler, IDisposable
    {
@@ -137,7 +135,7 @@ namespace Ryujinx.Headless

        private void SetWindowIcon()
        {
-            Stream iconStream = typeof(Program).Assembly.GetManifestResourceStream("HeadlessLogo");
+            Stream iconStream = typeof(WindowBase).Assembly.GetManifestResourceStream("Ryujinx.Headless.SDL2.Ryujinx.bmp");
            byte[] iconBytes = new byte[iconStream!.Length];

            if (iconStream.Read(iconBytes, 0, iconBytes.Length) != iconBytes.Length)
@@ -316,10 +314,10 @@ namespace Ryujinx.Headless
                        }

                        StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
-                            Device.VSyncMode.ToString(),
+                            Device.EnableDeviceVsync,
                            dockedMode,
                            Device.Configuration.AspectRatio.ToText(),
-                            $"{Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
+                            $"Game: {Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
                            $"FIFO: {Device.Statistics.GetFifoPercent():0.00} %",
                            $"GPU: {_gpuDriverName}"));

@@ -487,19 +485,6 @@ namespace Ryujinx.Headless
            return true;
        }

-        public bool DisplayCabinetDialog(out string userText)
-        {
-            // SDL2 doesn't support input dialogs
-            userText = "Ryujinx";
-
-            return true;
-        }
-
-        public void DisplayCabinetMessageDialog()
-        {
-            SDL_ShowSimpleMessageBox(SDL_MessageBoxFlags.SDL_MESSAGEBOX_INFORMATION, "Cabinet Dialog", "Please scan your Amiibo now.", WindowHandle);
-        }
-
        public bool DisplayMessageDialog(ControllerAppletUIArgs args)
        {
            if (_ignoreControllerApplet) return false;
--- a/src/Ryujinx.Horizon.Common/Ryujinx.Horizon.Common.csproj
+++ b/src/Ryujinx.Horizon.Common/Ryujinx.Horizon.Common.csproj
@@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj
+++ b/src/Ryujinx.Horizon.Generators/Ryujinx.Horizon.Generators.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Horizon.Kernel.Generators/Ryujinx.Horizon.Kernel.Generators.csproj
+++ b/src/Ryujinx.Horizon.Kernel.Generators/Ryujinx.Horizon.Kernel.Generators.csproj
@@ -3,8 +3,6 @@
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Horizon/Ryujinx.Horizon.csproj
+++ b/src/Ryujinx.Horizon/Ryujinx.Horizon.csproj
@@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Input.SDL2/Ryujinx.Input.SDL2.csproj
+++ b/src/Ryujinx.Input.SDL2/Ryujinx.Input.SDL2.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Input/Ryujinx.Input.csproj
+++ b/src/Ryujinx.Input/Ryujinx.Input.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Memory/Ryujinx.Memory.csproj
+++ b/src/Ryujinx.Memory/Ryujinx.Memory.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj
+++ b/src/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj
@@ -2,7 +2,6 @@

  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj
+++ b/src/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj
@@ -4,7 +4,6 @@
    <TargetFramework>net8.0</TargetFramework>
    <OutputType>Exe</OutputType>
    <Configurations>Debug;Release</Configurations>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Tests.Memory/Ryujinx.Tests.Memory.csproj
+++ b/src/Ryujinx.Tests.Memory/Ryujinx.Tests.Memory.csproj
@@ -3,7 +3,6 @@
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <IsPackable>false</IsPackable>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Ryujinx.Tests.Unicorn/Ryujinx.Tests.Unicorn.csproj
+++ b/src/Ryujinx.Tests.Unicorn/Ryujinx.Tests.Unicorn.csproj
@@ -4,7 +4,6 @@
    <TargetFramework>net8.0</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Configurations>Debug;Release</Configurations>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <PropertyGroup>
--- a/src/Ryujinx.Tests/Ryujinx.Tests.csproj
+++ b/src/Ryujinx.Tests/Ryujinx.Tests.csproj
@@ -10,7 +10,6 @@
    <TargetOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">linux</TargetOS>
    <Configurations>Debug;Release</Configurations>
    <RunSettingsFilePath>$(MSBuildProjectDirectory)\.runsettings</RunSettingsFilePath>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

  <PropertyGroup>
--- a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
@@ -1,4 +1,5 @@
 using DynamicData;
+using DynamicData.Kernel;
 using Gommon;
 using LibHac;
 using LibHac.Common;
@@ -36,13 +37,14 @@ using System.Threading.Tasks;
 using ContentType = LibHac.Ncm.ContentType;
 using MissingKeyException = LibHac.Common.Keys.MissingKeyException;
 using Path = System.IO.Path;
+using SpanHelpers = LibHac.Common.SpanHelpers;
 using TimeSpan = System.TimeSpan;

 namespace Ryujinx.UI.App.Common
 {
    public class ApplicationLibrary
    {
-        public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
+        public static string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
        public Language DesiredLanguage { get; set; }
        public event EventHandler<ApplicationCountUpdatedEventArgs> ApplicationCountUpdated;
        public event EventHandler<LdnGameDataReceivedEventArgs> LdnGameDataReceived;
@@ -189,9 +191,12 @@ namespace Ryujinx.UI.App.Common
                }
            }

-            return isExeFs 
-                ? GetApplicationFromExeFs(pfs, filePath) 
-                : null;
+            if (isExeFs)
+            {
+                return GetApplicationFromExeFs(pfs, filePath);
+            }
+
+            return null;
        }

        /// <exception cref="LibHac.Common.Keys.MissingKeyException">The configured key set is missing a key.</exception>
@@ -507,6 +512,10 @@ namespace Ryujinx.UI.App.Common
                    case ".xci":
                    case ".nsp":
                        {
+                            IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
+                                ? IntegrityCheckLevel.ErrorOnInvalid
+                                : IntegrityCheckLevel.None;
+
                            using IFileSystem pfs = PartitionFileSystemUtils.OpenApplicationFileSystem(filePath, _virtualFileSystem);

                            foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
@@ -595,7 +604,7 @@ namespace Ryujinx.UI.App.Common
                                    controlNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.None)
                                        .OpenFile(ref nacpFile.Ref, "/control.nacp".ToU8Span(), OpenMode.Read)
                                        .ThrowIfFailure();
-                                    nacpFile.Get.Read(out _, 0, LibHac.Common.SpanHelpers.AsByteSpan(ref controlData),
+                                    nacpFile.Get.Read(out _, 0, SpanHelpers.AsByteSpan(ref controlData),
                                        ReadOption.None).ThrowIfFailure();

                                    var displayVersion = controlData.DisplayVersionString.ToString();
@@ -818,7 +827,7 @@ namespace Ryujinx.UI.App.Common
        {
            _downloadableContents.Edit(it =>
            {
-                DownloadableContentsHelper.SaveDownloadableContentsJson(application.IdBase, dlcs);
+                DownloadableContentsHelper.SaveDownloadableContentsJson(_virtualFileSystem, application.IdBase, dlcs);

                it.Remove(it.Items.Where(item => item.Dlc.TitleIdBase == application.IdBase));
                it.AddOrUpdate(dlcs);
@@ -830,7 +839,7 @@ namespace Ryujinx.UI.App.Common
        {
            _titleUpdates.Edit(it =>
            {
-                TitleUpdatesHelper.SaveTitleUpdatesJson(application.IdBase, updates);
+                TitleUpdatesHelper.SaveTitleUpdatesJson(_virtualFileSystem, application.IdBase, updates);

                it.Remove(it.Items.Where(item => item.TitleUpdate.TitleIdBase == application.IdBase));
                it.AddOrUpdate(updates);
@@ -1079,15 +1088,14 @@ namespace Ryujinx.UI.App.Common

        private bool AddAndAutoSelectUpdate(TitleUpdateModel update)
        {
-            if (update == null) return false;
-            
-            var currentlySelected = TitleUpdates.Items.FindFirst(it =>
+            var currentlySelected = TitleUpdates.Items.FirstOrOptional(it =>
                it.TitleUpdate.TitleIdBase == update.TitleIdBase && it.IsSelected);

-            var shouldSelect = currentlySelected.Check(curr => curr.TitleUpdate?.Version < update.Version);
+            var shouldSelect = !currentlySelected.HasValue ||
+                               currentlySelected.Value.TitleUpdate.Version < update.Version;

            _titleUpdates.AddOrUpdate((update, shouldSelect));
-            
+
            if (currentlySelected.HasValue && shouldSelect)
            {
                _titleUpdates.AddOrUpdate((currentlySelected.Value.TitleUpdate, false));
@@ -1456,7 +1464,7 @@ namespace Ryujinx.UI.App.Common
                    if (addedNewDlc)
                    {
                        var gameDlcs = it.Items.Where(dlc => dlc.Dlc.TitleIdBase == application.IdBase).ToList();
-                        DownloadableContentsHelper.SaveDownloadableContentsJson(application.IdBase,
+                        DownloadableContentsHelper.SaveDownloadableContentsJson(_virtualFileSystem, application.IdBase,
                            gameDlcs);
                    }
                }
@@ -1475,11 +1483,11 @@ namespace Ryujinx.UI.App.Common
                    TitleUpdatesHelper.LoadTitleUpdatesJson(_virtualFileSystem, application.IdBase);
                it.AddOrUpdate(savedUpdates);

-                var selectedUpdate = savedUpdates.FindFirst(update => update.IsSelected);
+                var selectedUpdate = savedUpdates.FirstOrOptional(update => update.IsSelected);

                if (TryGetTitleUpdatesFromFile(application.Path, out var bundledUpdates))
                {
-                    var savedUpdateLookup = savedUpdates.Select(update => update.Update).ToHashSet();
+                    var savedUpdateLookup = savedUpdates.Select(update => update.Item1).ToHashSet();
                    bool updatesChanged = false;

                    foreach (var update in bundledUpdates.OrderByDescending(bundled => bundled.Version))
@@ -1487,11 +1495,12 @@ namespace Ryujinx.UI.App.Common
                        if (!savedUpdateLookup.Contains(update))
                        {
                            bool shouldSelect = false;
-                            if (selectedUpdate.Check(su => su.Update?.Version < update.Version))
+                            if (!selectedUpdate.HasValue || selectedUpdate.Value.Item1.Version < update.Version)
                            {
                                shouldSelect = true;
-                                _titleUpdates.AddOrUpdate((selectedUpdate.Value.Update, false));
-                                selectedUpdate = (update, true);
+                                if (selectedUpdate.HasValue)
+                                    _titleUpdates.AddOrUpdate((selectedUpdate.Value.Item1, false));
+                                selectedUpdate = DynamicData.Kernel.Optional<(TitleUpdateModel, bool IsSelected)>.Create((update, true));
                            }

                            modifiedVersion = modifiedVersion || shouldSelect;
@@ -1504,7 +1513,7 @@ namespace Ryujinx.UI.App.Common
                    if (updatesChanged)
                    {
                        var gameUpdates = it.Items.Where(update => update.TitleUpdate.TitleIdBase == application.IdBase).ToList();
-                        TitleUpdatesHelper.SaveTitleUpdatesJson(application.IdBase, gameUpdates);
+                        TitleUpdatesHelper.SaveTitleUpdatesJson(_virtualFileSystem, application.IdBase, gameUpdates);
                    }
                }
            });
@@ -1516,14 +1525,14 @@ namespace Ryujinx.UI.App.Common
        private void SaveDownloadableContentsForGame(ulong titleIdBase)
        {
            var dlcs = DownloadableContents.Items.Where(dlc => dlc.Dlc.TitleIdBase == titleIdBase).ToList();
-            DownloadableContentsHelper.SaveDownloadableContentsJson(titleIdBase, dlcs);
+            DownloadableContentsHelper.SaveDownloadableContentsJson(_virtualFileSystem, titleIdBase, dlcs);
        }

        // Save the _currently tracked_ update state for the game
        private void SaveTitleUpdatesForGame(ulong titleIdBase)
        {
            var updates = TitleUpdates.Items.Where(update => update.TitleUpdate.TitleIdBase == titleIdBase).ToList();
-            TitleUpdatesHelper.SaveTitleUpdatesJson(titleIdBase, updates);
+            TitleUpdatesHelper.SaveTitleUpdatesJson(_virtualFileSystem, titleIdBase, updates);
        }

        // ApplicationData isnt live-updating (e.g. when an update gets applied) and so this is meant to trigger a refresh
--- a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs
+++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs
@@ -1,4 +1,3 @@
-using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -17,7 +16,7 @@ namespace Ryujinx.UI.Common.Configuration
        /// <summary>
        /// The current version of the file format
        /// </summary>
-        public const int CurrentVersion = 57;
+        public const int CurrentVersion = 56;

        /// <summary>
        /// Version of the configuration file format
@@ -192,25 +191,8 @@ namespace Ryujinx.UI.Common.Configuration
        /// <summary>
        /// Enables or disables Vertical Sync
        /// </summary>
-        /// <remarks>Kept for file format compatibility (to avoid possible failure when parsing configuration on old versions)</remarks>
-        /// TODO: Remove this when those older versions aren't in use anymore.
        public bool EnableVsync { get; set; }

-        /// <summary>
-        /// Current VSync mode; 60 (Switch), unbounded ("Vsync off"), or custom
-        /// </summary>
-        public VSyncMode VSyncMode { get; set; }
-
-        /// <summary>
-        /// Enables or disables the custom present interval
-        /// </summary>
-        public bool EnableCustomVSyncInterval { get; set; }
-
-        /// <summary>
-        /// The custom present interval value
-        /// </summary>
-        public int CustomVSyncInterval { get; set; }
-
        /// <summary>
        /// Enables or disables Shader cache
        /// </summary>
--- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.Migration.cs
@@ -82,7 +82,7 @@ namespace Ryujinx.UI.Common.Configuration

                configurationFileFormat.Hotkeys = new KeyboardHotkeys
                {
-                    ToggleVSyncMode = Key.F1,
+                    ToggleVsync = Key.F1,
                };

                configurationFileUpdated = true;
@@ -276,7 +276,7 @@ namespace Ryujinx.UI.Common.Configuration

                configurationFileFormat.Hotkeys = new KeyboardHotkeys
                {
-                    ToggleVSyncMode = Key.F1,
+                    ToggleVsync = Key.F1,
                    Screenshot = Key.F8,
                };

@@ -289,7 +289,7 @@ namespace Ryujinx.UI.Common.Configuration

                configurationFileFormat.Hotkeys = new KeyboardHotkeys
                {
-                    ToggleVSyncMode = Key.F1,
+                    ToggleVsync = Key.F1,
                    Screenshot = Key.F8,
                    ShowUI = Key.F4,
                };
@@ -332,7 +332,7 @@ namespace Ryujinx.UI.Common.Configuration

                configurationFileFormat.Hotkeys = new KeyboardHotkeys
                {
-                    ToggleVSyncMode = configurationFileFormat.Hotkeys.ToggleVSyncMode,
+                    ToggleVsync = configurationFileFormat.Hotkeys.ToggleVsync,
                    Screenshot = configurationFileFormat.Hotkeys.Screenshot,
                    ShowUI = configurationFileFormat.Hotkeys.ShowUI,
                    Pause = Key.F5,
@@ -347,7 +347,7 @@ namespace Ryujinx.UI.Common.Configuration

                configurationFileFormat.Hotkeys = new KeyboardHotkeys
                {
-                    ToggleVSyncMode = configurationFileFormat.Hotkeys.ToggleVSyncMode,
+                    ToggleVsync = configurationFileFormat.Hotkeys.ToggleVsync,
                    Screenshot = configurationFileFormat.Hotkeys.Screenshot,
                    ShowUI = configurationFileFormat.Hotkeys.ShowUI,
                    Pause = configurationFileFormat.Hotkeys.Pause,
@@ -421,7 +421,7 @@ namespace Ryujinx.UI.Common.Configuration

                configurationFileFormat.Hotkeys = new KeyboardHotkeys
                {
-                    ToggleVSyncMode = configurationFileFormat.Hotkeys.ToggleVSyncMode,
+                    ToggleVsync = configurationFileFormat.Hotkeys.ToggleVsync,
                    Screenshot = configurationFileFormat.Hotkeys.Screenshot,
                    ShowUI = configurationFileFormat.Hotkeys.ShowUI,
                    Pause = configurationFileFormat.Hotkeys.Pause,
@@ -448,7 +448,7 @@ namespace Ryujinx.UI.Common.Configuration

                configurationFileFormat.Hotkeys = new KeyboardHotkeys
                {
-                    ToggleVSyncMode = configurationFileFormat.Hotkeys.ToggleVSyncMode,
+                    ToggleVsync = configurationFileFormat.Hotkeys.ToggleVsync,
                    Screenshot = configurationFileFormat.Hotkeys.Screenshot,
                    ShowUI = configurationFileFormat.Hotkeys.ShowUI,
                    Pause = configurationFileFormat.Hotkeys.Pause,
@@ -611,33 +611,6 @@ namespace Ryujinx.UI.Common.Configuration
                configurationFileUpdated = true;
            }

-            if (configurationFileFormat.Version < 57)
-            {
-                Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 57.");
-
-                configurationFileFormat.VSyncMode = VSyncMode.Switch;
-                configurationFileFormat.EnableCustomVSyncInterval = false;
-
-                configurationFileFormat.Hotkeys = new KeyboardHotkeys
-                {
-                    ToggleVSyncMode = Key.F1,
-                    Screenshot = configurationFileFormat.Hotkeys.Screenshot,
-                    ShowUI = configurationFileFormat.Hotkeys.ShowUI,
-                    Pause = configurationFileFormat.Hotkeys.Pause,
-                    ToggleMute = configurationFileFormat.Hotkeys.ToggleMute,
-                    ResScaleUp = configurationFileFormat.Hotkeys.ResScaleUp,
-                    ResScaleDown = configurationFileFormat.Hotkeys.ResScaleDown,
-                    VolumeUp = configurationFileFormat.Hotkeys.VolumeUp,
-                    VolumeDown = configurationFileFormat.Hotkeys.VolumeDown,
-                    CustomVSyncIntervalIncrement = Key.Unbound,
-                    CustomVSyncIntervalDecrement = Key.Unbound,
-                };
-
-                configurationFileFormat.CustomVSyncInterval = 120;
-
-                configurationFileUpdated = true;
-            }
-
            Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog;
            Graphics.ResScale.Value = configurationFileFormat.ResScale;
            Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom;
@@ -673,9 +646,7 @@ namespace Ryujinx.UI.Common.Configuration
            ShowTitleBar.Value = configurationFileFormat.ShowTitleBar;
            EnableHardwareAcceleration.Value = configurationFileFormat.EnableHardwareAcceleration;
            HideCursor.Value = configurationFileFormat.HideCursor;
-            Graphics.VSyncMode.Value = configurationFileFormat.VSyncMode;
-            Graphics.EnableCustomVSyncInterval.Value = configurationFileFormat.EnableCustomVSyncInterval;
-            Graphics.CustomVSyncInterval.Value = configurationFileFormat.CustomVSyncInterval;
+            Graphics.EnableVsync.Value = configurationFileFormat.EnableVsync;
            Graphics.EnableShaderCache.Value = configurationFileFormat.EnableShaderCache;
            Graphics.EnableTextureRecompression.Value = configurationFileFormat.EnableTextureRecompression;
            Graphics.EnableMacroHLE.Value = configurationFileFormat.EnableMacroHLE;
--- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.Model.cs
@@ -1,4 +1,4 @@
-using ARMeilleure;
+using ARMeilleure;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -474,19 +474,9 @@ namespace Ryujinx.UI.Common.Configuration
            public ReactiveObject<string> ShadersDumpPath { get; private set; }

            /// <summary>
-            /// Toggles the present interval mode. Options are Switch (60Hz), Unbounded (previously Vsync off), and Custom, if enabled.
+            /// Enables or disables Vertical Sync
            /// </summary>
-            public ReactiveObject<VSyncMode> VSyncMode { get; private set; }
-
-            /// <summary>
-            /// Enables or disables the custom present interval mode.
-            /// </summary>
-            public ReactiveObject<bool> EnableCustomVSyncInterval { get; private set; }
-
-            /// <summary>
-            /// Changes the custom present interval.
-            /// </summary>
-            public ReactiveObject<int> CustomVSyncInterval { get; private set; }
+            public ReactiveObject<bool> EnableVsync { get; private set; }

            /// <summary>
            /// Enables or disables Shader cache
@@ -546,12 +536,8 @@ namespace Ryujinx.UI.Common.Configuration
                AspectRatio = new ReactiveObject<AspectRatio>();
                AspectRatio.LogChangesToValue(nameof(AspectRatio));
                ShadersDumpPath = new ReactiveObject<string>();
-                VSyncMode = new ReactiveObject<VSyncMode>();
-                VSyncMode.LogChangesToValue(nameof(VSyncMode));
-                EnableCustomVSyncInterval = new ReactiveObject<bool>();
-                EnableCustomVSyncInterval.LogChangesToValue(nameof(EnableCustomVSyncInterval));
-                CustomVSyncInterval = new ReactiveObject<int>();
-                CustomVSyncInterval.LogChangesToValue(nameof(CustomVSyncInterval));
+                EnableVsync = new ReactiveObject<bool>();
+                EnableVsync.LogChangesToValue(nameof(EnableVsync));
                EnableShaderCache = new ReactiveObject<bool>();
                EnableShaderCache.LogChangesToValue(nameof(EnableShaderCache));
                EnableTextureRecompression = new ReactiveObject<bool>();
--- a/Show More
+++ b/Show More