Merge e36f6527b7 into 7bdf013ba6

Unify "Enable"
Update TChinese translation
2025-03-05 15:57:15 +00:00 · 2025-03-01 18:30:08 +08:00 · 2025-03-01 18:28:09 +08:00
101 changed files with 854 additions and 1376 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,6 @@ jobs:
        configuration: [Debug, Release]
        platform:
          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
-          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
          - { name: osx-x64,     os: macos-13,       zip_os_name: osx_x64     }
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -62,7 +62,6 @@ jobs:
            | Platform | Artifact |
            |--|--|
            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Windows ARM 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) |
            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
@@ -80,7 +79,6 @@ jobs:
      matrix:
        platform:
          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
-          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
    steps:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,8 +12,7 @@ env:
  RYUJINX_BASE_VERSION: "1.2"
  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
-  RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Stable-Releases"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
  RELEASE: 1

 jobs:
@@ -34,7 +33,7 @@ jobs:
          script: |
            github.rest.git.createRef({
              owner: "${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}",
-              repo: "${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}",
+              repo: "${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}",
              ref: 'refs/tags/${{ steps.version_info.outputs.build_version }}',
              sha: context.sha
            })
@@ -53,7 +52,7 @@ jobs:
            | Linux ARM 64-bit | [Stable Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Stable macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
            
-            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
+            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
          omitBodyDuringUpdate: true
          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
@@ -66,7 +65,6 @@ jobs:
      matrix:
        platform:
          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
-          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
    steps:
@@ -94,7 +92,7 @@ jobs:
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
        shell: bash

@@ -118,7 +116,6 @@ jobs:
        if: matrix.platform.os == 'ubuntu-latest'
        run: |
          pushd publish
-          rm libarmeilleure-jitsupport.dylib
          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
@@ -176,7 +173,7 @@ jobs:
            | Linux ARM 64-bit | [Stable Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Stable macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
            
-            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
+            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
          omitBodyDuringUpdate: true
          allowUpdates: true
          replacesArtifacts: true
@@ -225,7 +222,7 @@ jobs:
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
        shell: bash

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -39,7 +39,7 @@
    <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.8.2" />
    <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
    <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
-    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
+    <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.7.1.1" />
@@ -53,8 +53,8 @@
    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
    <PackageVersion Include="SPB" Version="0.0.4-build32" />
-    <PackageVersion Include="System.IO.Hashing" Version="9.0.2" />
-    <PackageVersion Include="System.Management" Version="9.0.2" />
+    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
+    <PackageVersion Include="System.Management" Version="9.0.0" />
    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
  </ItemGroup>
 </Project>
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 <table align="center">
    <tr>
        <td align="center" width="25%">
-            <img src="https://raw.githubusercontent.com/Ryubing/Assets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
+            <img src="https://raw.githubusercontent.com/GreemDev/ryuassets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
        </td>
        <td align="center" width="75%">
          
 # Ryujinx
          
 [![Release workflow](https://github.com/Ryubing/Ryujinx/actions/workflows/release.yml/badge.svg)](https://github.com/Ryubing/Ryujinx/actions/workflows/release.yml)
-[![Latest release](https://img.shields.io/github/v/release/Ryubing/Ryujinx)](https://github.com/Ryubing/Ryujinx/releases/latest)
+[![Latest release](https://img.shields.io/github/v/release/GreemDev/Ryujinx)](https://github.com/Ryubing/Ryujinx/releases/latest)
  <br>
 [![Canary workflow](https://github.com/Ryubing/Ryujinx/actions/workflows/canary.yml/badge.svg)](https://github.com/Ryubing/Ryujinx/actions/workflows/canary.yml)
 [![Latest canary release](https://img.shields.io/github/v/release/Ryubing/Canary-Releases?label=canary)](https://github.com/Ryubing/Canary-Releases/releases/latest)
--- a/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj
+++ b/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;win-arm64;osx-arm64;linux-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
  </PropertyGroup>

@@ -11,15 +11,15 @@
  </ItemGroup>

  <ItemGroup>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dll" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dll" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <TargetPath>libsoundio.dll</TargetPath>
    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dylib" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dylib" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <TargetPath>libsoundio.dylib</TargetPath>
    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.so" Condition="'$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64' AND '$(RuntimeIdentifier)' != 'linux-arm64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.so" Condition="'$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64'">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <TargetPath>libsoundio.so</TargetPath>
    </ContentWithTargetPath>
--- a/src/Ryujinx.Common/Configuration/DirtyHack.cs
+++ b/src/Ryujinx.Common/Configuration/DirtyHack.cs
@@ -9,8 +9,7 @@ namespace Ryujinx.Common.Configuration
    public enum DirtyHack : byte
    {
        Xc2MenuSoftlockFix = 1,
-        // ShaderTranslationDelay = 2
-        NifmServiceDisableIsAnyInternetRequestAccepted = 3
+        ShaderTranslationDelay = 2
    }

    public readonly struct EnabledDirtyHack(DirtyHack hack, int value)
--- a/src/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs
@@ -13,7 +13,5 @@ namespace Ryujinx.Common.Configuration.Hid
        public Key VolumeDown { get; set; }
        public Key CustomVSyncIntervalIncrement { get; set; }
        public Key CustomVSyncIntervalDecrement { get; set; }
-        public Key TurboMode { get; set; }
-        public bool TurboModeWhileHeld { get; set; }
    }
 }
--- a/src/Ryujinx.Common/ReleaseInformation.cs
+++ b/src/Ryujinx.Common/ReleaseInformation.cs
@@ -37,9 +37,9 @@ namespace Ryujinx.Common
        public static string GetChangelogUrl(Version currentVersion, Version newVersion) =>
            IsCanaryBuild 
                ? $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelSourceRepo}/compare/Canary-{currentVersion}...Canary-{newVersion}" 
-                : GetChangelogForVersion(newVersion);
+                : $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelSourceRepo}/releases/tag/{newVersion}";
        
        public static string GetChangelogForVersion(Version version) =>
-            $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelRepo}/releases/{version}";
+            $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelRepo}/releases/tag/{version}";
    }
 }
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@@ -1,4 +1,7 @@
 using Gommon;
+using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Helper;
+using System;
 using System.Linq;

 namespace Ryujinx.Common
--- a/src/Ryujinx.Cpu/ITickSource.cs
+++ b/src/Ryujinx.Cpu/ITickSource.cs
@@ -8,17 +8,10 @@ namespace Ryujinx.Cpu
    /// </summary>
    public interface ITickSource : ICounter
    {
-        public const long RealityTickScalar = 100;
-        
        /// <summary>
        /// Time elapsed since the counter was created.
        /// </summary>
        TimeSpan ElapsedTime { get; }
-        
-        /// <summary>
-        /// Clock tick scalar, in percent points (100 = 1.0).
-        /// </summary>
-        long TickScalar { get; set; }

        /// <summary>
        /// Time elapsed since the counter was created, in seconds.
--- a/src/Ryujinx.Cpu/TickSource.cs
+++ b/src/Ryujinx.Cpu/TickSource.cs
@@ -14,37 +14,12 @@ namespace Ryujinx.Cpu

        /// <inheritdoc/>
        public ulong Counter => (ulong)(ElapsedSeconds * Frequency);
-        
-        
-        public long TickScalar { get; set; }
-
-
-        private static long _acumElapsedTicks;
-
-
-        private static long _lastElapsedTicks;
-
-
-        private long ElapsedTicks
-        {
-            get
-            {
-                long elapsedTicks = _tickCounter.ElapsedTicks;
-                
-                _acumElapsedTicks += (elapsedTicks - _lastElapsedTicks) * TickScalar / 100;
-
-                _lastElapsedTicks = elapsedTicks;
-                
-                return _acumElapsedTicks;
-            }
-        }

        /// <inheritdoc/>
-        
-        public TimeSpan ElapsedTime => Stopwatch.GetElapsedTime(0, ElapsedTicks);
+        public TimeSpan ElapsedTime => _tickCounter.Elapsed;

        /// <inheritdoc/>
-        public double ElapsedSeconds => ElapsedTicks * _hostTickFreq;
+        public double ElapsedSeconds => _tickCounter.ElapsedTicks * _hostTickFreq;

        public TickSource(ulong frequency)
        {
--- a/src/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs
@@ -1065,14 +1065,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
        /// </summary>
        private void UpdateIndexBufferState()
        {
-            IndexBufferState? indexBufferNullable = _state?.State.IndexBufferState;
-
-            if (!indexBufferNullable.HasValue)
-            {
-                return;
-            }
-
-            IndexBufferState indexBuffer = indexBufferNullable.Value;
+            IndexBufferState indexBuffer = _state.State.IndexBufferState;

            if (_drawState.IndexCount == 0)
            {
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs
@@ -12,8 +12,8 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native

        private static readonly Dictionary<string, (int, int)> _librariesWhitelist = new()
        {
-            { AvCodecLibraryName, (58, 61) },
-            { AvUtilLibraryName, (56, 59) },
+            { AvCodecLibraryName, (58, 59) },
+            { AvUtilLibraryName, (56, 57) },
        };

        private static string FormatLibraryNameForCurrentOs(string libraryName, int version)
--- a/src/Ryujinx.HLE/HOS/Services/IpcService.cs
+++ b/src/Ryujinx.HLE/HOS/Services/IpcService.cs
@@ -127,7 +127,10 @@ namespace Ryujinx.HLE.HOS.Services
                }
                else
                {
-                    string serviceName = (service is not DummyService dummyService) ? service.GetType().FullName : dummyService.ServiceName;
+                    string serviceName;
+
+
+                    serviceName = (service is not DummyService dummyService) ? service.GetType().FullName : dummyService.ServiceName;

                    Logger.Warning?.Print(LogClass.KernelIpc, $"Missing service {serviceName}: {commandId} ignored");
                }
--- a/src/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs
@@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm
        // CreateGeneralServiceOld() -> object<nn::nifm::detail::IGeneralService>
        public ResultCode CreateGeneralServiceOld(ServiceCtx context)
        {
-            MakeObject(context, new IGeneralService(context));
+            MakeObject(context, new IGeneralService());

            return ResultCode.Success;
        }
@@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm
        // CreateGeneralService(u64, pid) -> object<nn::nifm::detail::IGeneralService>
        public ResultCode CreateGeneralService(ServiceCtx context)
        {
-            MakeObject(context, new IGeneralService(context));
+            MakeObject(context, new IGeneralService());

            return ResultCode.Success;
        }
--- a/src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs
@@ -1,5 +1,4 @@
 using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.Services.Nifm.StaticService.GeneralService;
@@ -18,12 +17,12 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService
        private UnicastIPAddressInformation _targetAddressInfoCache = null;
        private string _cacheChosenInterface = null;

-        public IGeneralService(ServiceCtx context)
+        public IGeneralService()
        {
            _generalServiceDetail = new GeneralServiceDetail
            {
                ClientId = GeneralServiceManager.Count,
-                IsAnyInternetRequestAccepted = !context.Device.DirtyHacks.IsEnabled(DirtyHack.NifmServiceDisableIsAnyInternetRequestAccepted), // NOTE: Why not accept any internet request?
+                IsAnyInternetRequestAccepted = true, // NOTE: Why not accept any internet request?
            };

            NetworkChange.NetworkAddressChanged += LocalInterfaceCacheHandler;
--- a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs
@@ -1,5 +1,6 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy;
+using Ryujinx.HLE.HOS.Services.Sockets.Bsd.Types;
 using System;
 using System.Collections.Generic;
 using System.Linq;
--- a/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
+++ b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
@@ -2,7 +2,6 @@ using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.PreciseSleep;
-using Ryujinx.Cpu;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap;
@@ -90,7 +89,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
            }
            else
            {
-                _ticksPerFrame = ((Stopwatch.Frequency / _device.TargetVSyncInterval) * 100) / _device.TickScalar;
+                _ticksPerFrame = Stopwatch.Frequency / _device.TargetVSyncInterval;
                _targetVSyncInterval = _device.TargetVSyncInterval;
            }
        }
--- a/src/Ryujinx.HLE/HleConfiguration.cs
+++ b/src/Ryujinx.HLE/HleConfiguration.cs
@@ -102,11 +102,6 @@ namespace Ryujinx.HLE
        /// Control if the Profiled Translation Cache (PTC) should be used.
        /// </summary>
        internal readonly bool EnablePtc;
-        
-        /// <summary>
-        /// Control the arbitrary scalar applied to emulated CPU tick timing.
-        /// </summary>
-        public long TickScalar { get; set; }

        /// <summary>
        /// Control if the guest application should be told that there is a Internet connection available.
@@ -206,7 +201,6 @@ namespace Ryujinx.HLE
                                VSyncMode vSyncMode,
                                bool enableDockedMode,
                                bool enablePtc,
-                                long tickScalar,
                                bool enableInternetAccess,
                                IntegrityCheckLevel fsIntegrityCheckLevel,
                                int fsGlobalAccessLogMode,
@@ -232,7 +226,6 @@ namespace Ryujinx.HLE
            CustomVSyncInterval = customVSyncInterval;
            EnableDockedMode = enableDockedMode;
            EnablePtc = enablePtc;
-            TickScalar = tickScalar;
            EnableInternetAccess = enableInternetAccess;
            FsIntegrityCheckLevel = fsIntegrityCheckLevel;
            FsGlobalAccessLogMode = fsGlobalAccessLogMode;
--- a/src/Ryujinx.HLE/PerformanceStatistics.cs
+++ b/src/Ryujinx.HLE/PerformanceStatistics.cs
@@ -6,8 +6,6 @@ namespace Ryujinx.HLE
 {
    public class PerformanceStatistics
    {
-        private readonly Switch _device;
-        
        private const int FrameTypeGame = 0;
        private const int PercentTypeFifo = 0;

@@ -30,10 +28,8 @@ namespace Ryujinx.HLE

        private readonly System.Timers.Timer _resetTimer;

-        public PerformanceStatistics(Switch device)
+        public PerformanceStatistics()
        {
-            _device = device;
-            
            _frameRate = new double[1];
            _accumulatedFrameTime = new double[1];
            _previousFrameTime = new double[1];
@@ -166,6 +162,14 @@ namespace Ryujinx.HLE
            return 1000 / _frameRate[FrameTypeGame];
        }
        
+        public string FormatGameFrameRate()
+        {
+            double frameRate = GetGameFrameRate();
+            double frameTime = GetGameFrameTime();
+
+            return $"{frameRate:00.00} FPS ({frameTime:00.00}ms)";
+        }
+        
        public string FormatFifoPercent()
        {
            double fifoPercent = GetFifoPercent();
--- a/src/Ryujinx.HLE/Switch.cs
+++ b/src/Ryujinx.HLE/Switch.cs
@@ -4,7 +4,6 @@ using Ryujinx.Audio.Backends.CompatLayer;
 using Ryujinx.Audio.Integration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
-using Ryujinx.Cpu;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
@@ -27,26 +26,18 @@ namespace Ryujinx.HLE
        public GpuContext Gpu { get; }
        public VirtualFileSystem FileSystem { get; }
        public HOS.Horizon System { get; }
-
-        public bool TurboMode = false;
-
-        public long TickScalar
-        {
-            get => System?.TickSource?.TickScalar ?? ITickSource.RealityTickScalar;
-            set => System.TickSource.TickScalar = value;
-        }
-        
        public ProcessLoader Processes { get; }
        public PerformanceStatistics Statistics { get; }
        public Hid Hid { get; }
        public TamperMachine TamperMachine { get; }
        public IHostUIHandler UIHandler { get; }

-        public int CpuCoresCount = 4; // Switch has a quad-core Tegra X1 SoC
+        public int CpuCoresCount = 4; //Switch 1 has 4 cores

        public VSyncMode VSyncMode { get; set; }
        public bool CustomVSyncIntervalEnabled { get; set; }
        public int CustomVSyncInterval { get; set; }
+
        public long TargetVSyncInterval { get; set; } = 60;

        public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;
@@ -73,7 +64,7 @@ namespace Ryujinx.HLE
            Memory            = new MemoryBlock(Configuration.MemoryConfiguration.ToDramSize(), memoryAllocationFlags);
            Gpu               = new GpuContext(Configuration.GpuRenderer, DirtyHacks);
            System            = new HOS.Horizon(this);
-            Statistics        = new PerformanceStatistics(this);
+            Statistics        = new PerformanceStatistics();
            Hid               = new Hid(this, System.HidStorage);
            Processes         = new ProcessLoader(this);
            TamperMachine     = new TamperMachine();
@@ -84,7 +75,6 @@ namespace Ryujinx.HLE

            VSyncMode                               = Configuration.VSyncMode;
            CustomVSyncInterval                     = Configuration.CustomVSyncInterval;
-            TickScalar                              = TurboMode ? Configuration.TickScalar : ITickSource.RealityTickScalar;
            System.State.DockedMode                 = Configuration.EnableDockedMode;
            System.PerformanceState.PerformanceMode = System.State.DockedMode ? PerformanceMode.Boost : PerformanceMode.Default;
            System.EnablePtc                        = Configuration.EnablePtc;
@@ -136,12 +126,6 @@ namespace Ryujinx.HLE
            }
        }

-        public void ToggleTurbo()
-        {
-            TurboMode = !TurboMode;
-            TickScalar = TurboMode ? Configuration.TickScalar : ITickSource.RealityTickScalar;
-        }
-
        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);
--- a/src/Ryujinx/Systems/AppHost.cs
+++ b/src/Ryujinx/Systems/AppHost.cs
@@ -4,9 +4,9 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Threading;
 using DiscordRPC;
-using Gommon;
 using LibHac.Common;
 using LibHac.Ns;
+using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.Dummy;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -35,9 +35,11 @@ using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
+using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
+using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
 using SkiaSharp;
@@ -60,7 +62,7 @@ using Size = Avalonia.Size;
 using Switch = Ryujinx.HLE.Switch;
 using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;

-namespace Ryujinx.Ava.Systems
+namespace Ryujinx.Ava
 {
    internal class AppHost
    {
@@ -468,7 +470,7 @@ namespace Ryujinx.Ava.Systems

            Dispatcher.UIThread.InvokeAsync(() =>
            {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
            });

            _viewModel.SetUiProgressHandlers(Device);
@@ -870,7 +872,7 @@ namespace Ryujinx.Ava.Systems
            Device?.System.TogglePauseEmulation(false);

            _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
        }

@@ -879,7 +881,7 @@ namespace Ryujinx.Ava.Systems
            Device?.System.TogglePauseEmulation(true);

            _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
        }

@@ -1116,23 +1118,11 @@ namespace Ryujinx.Ava.Systems
                LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                dockedMode,
                ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                FormatGameFrameRate(),
+                Device.Statistics.FormatGameFrameRate(),
                Device.Statistics.FormatFifoPercent(),
                _displayCount));
        }

-        private string FormatGameFrameRate()
-        {
-            string frameRate = Device.Statistics.GetGameFrameRate().ToString("00.00");
-            string frameTime = Device.Statistics.GetGameFrameTime().ToString("00.00");
-
-            return Device.TurboMode
-                ? LocaleManager.GetUnformatted(LocaleKeys.FpsTurboStatusBarText)
-                    .Format(frameRate, frameTime, Device.TickScalar)
-                : LocaleManager.GetUnformatted(LocaleKeys.FpsStatusBarText)
-                    .Format(frameRate, frameTime);
-        }
-
        public async Task ShowExitPrompt()
        {
            bool shouldExit = !ConfigurationState.Instance.ShowConfirmExit;
@@ -1228,12 +1218,6 @@ namespace Ryujinx.Ava.Systems

                if (currentHotkeyState != _prevHotkeyState)
                {
-                    if (ConfigurationState.Instance.Hid.Hotkeys.Value.TurboModeWhileHeld &&
-                        _keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.TurboMode) != Device.TurboMode)
-                    {
-                        Device.ToggleTurbo();
-                    }
-                    
                    switch (currentHotkeyState)
                    {
                        case KeyboardHotkeyState.ToggleVSyncMode:
@@ -1245,12 +1229,6 @@ namespace Ryujinx.Ava.Systems
                        case KeyboardHotkeyState.CustomVSyncIntervalIncrement:
                            _viewModel.CustomVSyncInterval = Device.IncrementCustomVSyncInterval();
                            break;
-                        case KeyboardHotkeyState.TurboMode:
-                            if (!ConfigurationState.Instance.Hid.Hotkeys.Value.TurboModeWhileHeld)
-                            {
-                                Device.ToggleTurbo();
-                            }
-                            break;
                        case KeyboardHotkeyState.Screenshot:
                            ScreenshotRequested = true;
                            break;
@@ -1380,10 +1358,6 @@ namespace Ryujinx.Ava.Systems
            {
                state = KeyboardHotkeyState.CustomVSyncIntervalDecrement;
            }
-            else if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.TurboMode))
-            {
-                state = KeyboardHotkeyState.TurboMode;
-            }

            return state;
        }
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -84,7 +84,7 @@
        "he_IL": "",
        "it_IT": "Applet Editor Mii",
        "ja_JP": "",
-        "ko_KR": "애플릿 Mii 편집기",
+        "ko_KR": "Mii 편집 애플릿",
        "no_NO": "Mii-redigeringsapplet",
        "pl_PL": "",
        "pt_BR": "Editor de Mii",
@@ -459,7 +459,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "스크린샷 폴더 열기",
+        "ko_KR": "",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "Abrir Pasta de Capturas de Tela",
@@ -1559,7 +1559,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "{0}에서 개발",
+        "ko_KR": "",
        "no_NO": "Utviklet av {0}",
        "pl_PL": "",
        "pt_BR": "Desenvolvido por {0}",
@@ -1664,7 +1664,7 @@
        "pl_PL": "Rozszerzenie pliku: {0}",
        "pt_BR": "Extensão: {0}",
        "ru_RU": "Расширение файла: {0}",
-        "sv_SE": "Filändelse: {0}",
+        "sv_SE": "Filänd: {0}",
        "th_TH": "นามสกุลไฟล์: {0}",
        "tr_TR": "Dosya Uzantısı: {0}",
        "uk_UA": "Розширення файлу: {0}",
@@ -1789,7 +1789,7 @@
        "pl_PL": "Rozszerzenie pliku",
        "pt_BR": "Extensão",
        "ru_RU": "Расширение файла",
-        "sv_SE": "Filändelse",
+        "sv_SE": "Filänd",
        "th_TH": "นามสกุลไฟล์",
        "tr_TR": "Dosya Uzantısı",
        "uk_UA": "Розширення файлу",
@@ -1859,7 +1859,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "호환성 :",
+        "ko_KR": "",
        "no_NO": "Kompatibilitet",
        "pl_PL": "",
        "pt_BR": "Compatibilidade:",
@@ -1884,7 +1884,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "타이틀 ID :",
+        "ko_KR": "",
        "no_NO": "Tittel ID:",
        "pl_PL": "",
        "pt_BR": "ID do Título:",
@@ -1909,7 +1909,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "호스트 게임 : {0}",
+        "ko_KR": "",
        "no_NO": "Spill som Arrangeres: {0}",
        "pl_PL": "",
        "pt_BR": "Jogos Hospedados: {0}",
@@ -1934,7 +1934,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "온라인 플레이어 : {0}",
+        "ko_KR": "",
        "no_NO": "Online-spillere: {0}",
        "pl_PL": "",
        "pt_BR": "Jogadores Online: {0}",
@@ -2759,16 +2759,16 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "사용자 정의 구성 만들기",
+        "ko_KR": "",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Задать индивидуальные параметры",
+        "ru_RU": "Создать пользовательскую конфигурацию",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Створити користувацьку конфігурацію",
-        "zh_CN": "创建自定义设置",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": "建立遊戲獨立自訂 (per-game) 設定檔"
      }
    },
@@ -2784,16 +2784,16 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "사용자 정의 구성 편집",
+        "ko_KR": "",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Изменить индивидуальные параметры",
+        "ru_RU": "Изменить пользовательскую конфигурацию",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Редагувати користувацьку конфігурацію",
-        "zh_CN": "编辑自定义设置",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": "編輯遊戲獨立自訂 (per-game) 設定檔"
      }
    },
@@ -2842,7 +2842,7 @@
        "sv_SE": "Skapar en oberoende konfiguration för det aktuella spelet",
        "th_TH": "สร้างการกำหนดค่าที่เป็นอิสระสำหรับเกมปัจจุบัน",
        "tr_TR": "Mevcut oyun için bağımsız bir yapılandırma oluşturur",
-        "uk_UA": "Створюйте незалежну конфігурацію для поточної гри",
+        "uk_UA": "Створює незалежну конфігурацію для поточної гри",
        "zh_CN": "为当前游戏创建独立的配置",
        "zh_TW": "為已選擇的遊戲建立遊戲獨立自訂 (game-specific) 的設定檔"
      }
@@ -2859,16 +2859,16 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "선택한 게임에 대한 기존 독립 구성 편집",
+        "ko_KR": "",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Отредактировать существующие независимые параметры для выбранной игры.",
+        "ru_RU": "Отредактировать существующую независимую конфигурацию для выбранной игры.",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Відредагувати наявну індивідуальну конфігурацію для цієї гри.",
-        "zh_CN": "编辑选定游戏的现存独立配置",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": "為已選擇的遊戲編輯遊戲獨立自訂 (game-specific) 的設定檔"
      }
    },
@@ -3442,7 +3442,7 @@
        "sv_SE": "Användargränssnitt",
        "th_TH": "หน้าจอผู้ใช้",
        "tr_TR": "Kullancı Arayüzü",
-        "uk_UA": "Інтерфейс",
+        "uk_UA": "Інтерфейс користувача",
        "zh_CN": "用户界面",
        "zh_TW": "使用者介面"
      }
@@ -3509,7 +3509,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "업데이트 확인 :",
+        "ko_KR": "",
        "no_NO": "Se etter Oppdateringer:",
        "pl_PL": "",
        "pt_BR": "Verificar Atualizações:",
@@ -3534,7 +3534,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "끔",
+        "ko_KR": "",
        "no_NO": "Av",
        "pl_PL": "",
        "pt_BR": "Desligado",
@@ -3559,7 +3559,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "프롬프트",
+        "ko_KR": "",
        "no_NO": "Spør",
        "pl_PL": "",
        "pt_BR": "Ao Abrir",
@@ -3584,7 +3584,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "백그라운드",
+        "ko_KR": "",
        "no_NO": "Bakgrunn",
        "pl_PL": "",
        "pt_BR": "2° Plano",
@@ -3609,7 +3609,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "에뮬레이터 초점 손실 :",
+        "ko_KR": "",
        "no_NO": "På Emulator Fokus Tapt:",
        "pl_PL": "",
        "pt_BR": "Ao Perder o Foco:",
@@ -3634,7 +3634,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "아무것도 하지 않음",
+        "ko_KR": "",
        "no_NO": "Gjør Ingenting",
        "pl_PL": "",
        "pt_BR": "Não Fazer Nada",
@@ -3659,7 +3659,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "입력 차단",
+        "ko_KR": "",
        "no_NO": "Blokkinngang",
        "pl_PL": "",
        "pt_BR": "Bloquear Controles",
@@ -3684,7 +3684,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "음소거",
+        "ko_KR": "",
        "no_NO": "Demp Lyd",
        "pl_PL": "",
        "pt_BR": "Ficar Mudo",
@@ -3709,7 +3709,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "입력 차단 및 음소거",
+        "ko_KR": "",
        "no_NO": "Blokker Inputs og demp Volumet",
        "pl_PL": "",
        "pt_BR": "Bloquear Controles & Ficar Mudo",
@@ -3734,7 +3734,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "에뮬레이션 일시 중지",
+        "ko_KR": "",
        "no_NO": "Pause Emulatoren",
        "pl_PL": "",
        "pt_BR": "Pausar a Emulação",
@@ -3809,7 +3809,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "초점이 맞지 않으면 입력 비활성화",
+        "ko_KR": "",
        "no_NO": "Deaktiver inndata når vinduet er ute av fokus",
        "pl_PL": "",
        "pt_BR": "Desativar Controles Quando Estiver Fora de Foco",
@@ -3817,59 +3817,34 @@
        "sv_SE": "Inaktivera inmatning när fokus tappas",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Вимкнути введення, якщо вікно неактивне",
+        "uk_UA": "",
        "zh_CN": "在后台时禁用输入",
        "zh_TW": "在「失去焦點」時停用輸入"
      }
    },
    {
-      "ID": "SettingsTabGeneralShowOldUI",
+      "ID": "SettingsTabGeneralShowTitleBar",
      "Translations": {
        "ar_SA": "",
        "de_DE": "",
        "el_GR": "",
-        "en_US": "Show Original UI Style (Requires restart)",
-        "es_ES": "",
-        "fr_FR": "",
+        "en_US": "Show Title Bar (Requires restart)",
+        "es_ES": "Mostrar Barra de Título (Requiere reinicio)",
+        "fr_FR": "Afficher Barre de Titre (Nécessite redémarrage)",
        "he_IL": "",
-        "it_IT": "",
+        "it_IT": "Mostra barra del titolo (Richiede il riavvio)",
        "ja_JP": "",
-        "ko_KR": "원래 UI 스타일 표시(다시 시작 필요)",
-        "no_NO": "Vis original UI-stil (krever omstart)",
+        "ko_KR": "제목 표시줄 표시(다시 시작해야 함)",
+        "no_NO": "Vis tittellinje (krever omstart)",
        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "Включить оригинальный интерфейса (требуется перезагрузка)",
-        "sv_SE": "",
+        "pt_BR": "Mostrar Barra de Título (Requer reinicialização)",
+        "ru_RU": "Показать строку заголовка (требуется перезапуск)",
+        "sv_SE": "Visa titelrad (kräver omstart)",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Показати оригінальний UI (Потрібен перезапуск)",
-        "zh_CN": "显示原始 UI 样式 (需要重启)",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsTabGeneralShowOldUIToolTip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Show the older Avalonia Ryujinx UI reminiscent of Ryujinx 1.1.1403. This is enabled by default on platforms that are not Windows.\nThe classic-style title bar is back and major window layout reworkings are reversed; such as the settings navigation placement above this tooltip.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "Ryujinx 1.1.1403을 연상시키는 이전 Avalonia Ryujinx UI를 표시합니다. 이 기능은 Windows가 아닌 플랫폼에서는 기본적으로 활성화됩니다.\n 클래식 스타일의 타이틀 바가 돌아왔고 주요 창 레이아웃 재작업이 역전되었습니다. 이 툴팁 위의 설정 탐색 배치와 같은 작업입니다.",
-        "no_NO": "Vis det eldre Avalonia Ryujinx-grensesnittet som minner om Ryujinx 1.1.1403. Dette er aktivert som standard på plattformer som ikke er Windows.\nTittellinjen i klassisk stil er tilbake, og store omarbeidinger av vindusoppsettet er reversert, for eksempel plasseringen av innstillingsnavigasjonen over dette verktøytipset.",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "Показать старый пользовательский интерфейс Avalonia Ryujinx, напоминающий Ryujinx 1.1.1403. Включено по умолчанию на платформах, отличных от Windows.\nСтрока заголовка в классическом стиле вернётся на место, а основные изменения в оформлении окна будут отменены; например, расположение навигации по настройкам над этой всплывающей подсказкой.",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "Показати старий інтерфейс Avalonia Ryujinx, який був у Ryujinx 1.1.1403. Ця опція активна за замовчуванням на всіх інших, окрім Windows платформах.\nПовернеться класична панель заголовка, а всі суттєві зміни інтерфейсу будуть скасовані, зокрема горизонтальне розміщення навігації в налаштуваннях.",
-        "zh_CN": "显示旧的类似 Ryujinx 1.1.1403 的 Avalonia Ryujinx UI。在非 Windows 平台上默认启用此选项。\n经典样式的标题栏已回归并且恢复了对窗口布局的重大重构;例如在工具提示上方放置设置导航。",
-        "zh_TW": ""
+        "uk_UA": "Показувати рядок заголовка (Потрібен перезапуск)",
+        "zh_CN": "显示标题栏 (需要重启)",
+        "zh_TW": "顯示「標題列」 (需要重新開啟Ryujinx)"
      }
    },
    {
@@ -4014,7 +3989,7 @@
        "pl_PL": "",
        "pt_BR": "Carregar Automaticamente Pasta de DLC e Atualizações",
        "ru_RU": "Автозагрузка папки с DLC/Обновлениями",
-        "sv_SE": "Läs automatiskt in DLC/speluppdateringar",
+        "sv_SE": "Läs automatisk in DLC/speluppdateringar",
        "th_TH": "โหลดไดเรกทอรี DLC/ไฟล์อัปเดต อัตโนมัติ",
        "tr_TR": "",
        "uk_UA": "Автозавантаження теки DLC/Оновлень",
@@ -4867,7 +4842,7 @@
        "sv_SE": "Matcha systemtid",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Синхронізувати з системним годинником",
+        "uk_UA": "",
        "zh_CN": "与系统时间同步",
        "zh_TW": "與系統時間同步"
      }
@@ -4922,81 +4897,6 @@
        "zh_TW": "低功耗 PPTC"
      }
    },
-    {
-      "ID": "SettingsTabSystemTurboMultiplier",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Turbo Mode multiplier:",
-        "es_ES": "",
-        "fr_FR": "Multiplicateur du Mode Turbo :",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsTabSystemTurboMultiplierValueToolTip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "The Turbo mode multiplier target value.\n\nLeave at 200 if unsure.",
-        "es_ES": "",
-        "fr_FR": "La valeur souhaitée du multiplicateur du Mode Turbo.\n\nGarder à 200 si incertain.",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsTabSystemTurboMultiplierToolTip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Turbo mode is an emulator feature which effectively causes speed up or slow down when a game is not frame-rate sensitive.\nYou can toggle this feature in-game with a hotkey, configurable in Ryujinx Keyboard Hotkeys settings.\n\nLeave at 200 if unsure.",
-        "es_ES": "",
-        "fr_FR": "Le Mode Turbo est une fonctionnalité de l'émulateur qui accélère ou ralentit le jeu lorsque ce dernier n'est pas sensible au framerate.\nVous pouvez changer cette option en jeu avec un raccourci clavier, configurable dans les paramètres de Raccourcis clavier de Ryujinx.\n\nGarder à 200 si incertain.",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
    {
      "ID": "SettingsTabSystemEnableFsIntegrityChecks",
      "Translations": {
@@ -5113,7 +5013,7 @@
        "no_NO": "Lyd Inn/Ut",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "Выход/Вход звука",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -5359,7 +5259,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "컨트롤러 애플릿 무시",
+        "ko_KR": "",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "Ignorar Applet do Controlador",
@@ -6209,7 +6109,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "UI 로그 활성화",
+        "ko_KR": "",
        "no_NO": "Aktivere UI-logger",
        "pl_PL": "",
        "pt_BR": "Habilitar Logs da IU",
@@ -6609,7 +6509,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "설정 초기화",
+        "ko_KR": "",
        "no_NO": "Tilbakestill innstillinger",
        "pl_PL": "",
        "pt_BR": "Redefinir Configurações",
@@ -6634,7 +6534,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "설정을 초기화하고 싶습니다.",
+        "ko_KR": "",
        "no_NO": "Jeg vil tilbakestille innstillingene mine.",
        "pl_PL": "",
        "pt_BR": "Quero redefinir minhas configurações.",
@@ -6663,7 +6563,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "Ок",
        "sv_SE": "Ok",
        "th_TH": "ตกลง",
        "tr_TR": "Tamam",
@@ -7113,7 +7013,7 @@
        "no_NO": "",
        "pl_PL": "Pro Kontroler",
        "pt_BR": "",
-        "ru_RU": "",
+        "ru_RU": "Pro контроллер",
        "sv_SE": "",
        "th_TH": "โปรคอนโทรลเลอร์",
        "tr_TR": "Profesyonel Kumanda",
@@ -7339,7 +7239,7 @@
        "pl_PL": "Przyciski",
        "pt_BR": "Botões",
        "ru_RU": "Кнопки",
-        "sv_SE": "Handlingsknappar",
+        "sv_SE": "Knappar",
        "th_TH": "ปุ่มกด",
        "tr_TR": "Tuşlar",
        "uk_UA": "Кнопки",
@@ -8542,7 +8442,7 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "LED-підсвітка",
+        "uk_UA": "",
        "zh_CN": "",
        "zh_TW": ""
      }
@@ -8567,7 +8467,7 @@
        "sv_SE": "Inaktivera",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Вимкнути",
+        "uk_UA": "",
        "zh_CN": "关闭",
        "zh_TW": "關閉"
      }
@@ -8592,7 +8492,7 @@
        "sv_SE": "Regnbåge",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Веселка",
+        "uk_UA": "",
        "zh_CN": "彩虹",
        "zh_TW": "彩虹"
      }
@@ -8617,7 +8517,7 @@
        "sv_SE": "Regnbågshastighet",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Швидкість зміни кольорів",
+        "uk_UA": "",
        "zh_CN": "彩虹滚动速度",
        "zh_TW": "彩虹滾動速度"
      }
@@ -9242,7 +9142,7 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "Esc",
-        "uk_UA": "Esc",
+        "uk_UA": "",
        "zh_CN": "Esc",
        "zh_TW": "Esc 鍵"
      }
@@ -10580,7 +10480,7 @@
        "el_GR": "",
        "en_US": "Unbound",
        "es_ES": "",
-        "fr_FR": "Non Attribuée",
+        "fr_FR": "Pas Attribuée",
        "he_IL": "",
        "it_IT": "Non assegnato",
        "ja_JP": "",
@@ -10942,7 +10842,7 @@
        "sv_SE": "Diverse",
        "th_TH": "",
        "tr_TR": "Diğer",
-        "uk_UA": "Інше",
+        "uk_UA": "",
        "zh_CN": "截图键",
        "zh_TW": "其他按鍵"
      }
@@ -13559,7 +13459,7 @@
        "he_IL": "שגיאה בהצגת דיאלוג  ErrorApplet: {0}",
        "it_IT": "Errore nella visualizzazione della finestra dell'ErrorApplet: {0}",
        "ja_JP": "エラーアプレットダイアログ表示エラー: {0}",
-        "ko_KR": "애플릿 오류 대화 상자 표시 오류 : {0}",
+        "ko_KR": "애플릿 오류류 대화 상자 표시 오류 : {0}",
        "no_NO": "Feil ved visning av Feilmeldingsdialog: {0}",
        "pl_PL": "Błąd wyświetlania okna Dialogowego ErrorApplet: {0}",
        "pt_BR": "Erro ao exibir applet ErrorApplet: {0}",
@@ -14989,7 +14889,7 @@
        "pl_PL": "Wielowątkowość Backendu Graficznego:",
        "pt_BR": "Multi Enfileiramento do Renderizador Gráfico:",
        "ru_RU": "Многопоточность графического бэкенда:",
-        "sv_SE": "Multitrådning för grafikbakände:",
+        "sv_SE": "Multithreading för grafikbakände:",
        "th_TH": "มัลติเธรด กราฟิกเบื้องหลัง:",
        "tr_TR": "Grafik Backend Multithreading:",
        "uk_UA": "Багатопотоковість графічного сервера:",
@@ -16759,7 +16659,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "앱이 실행 중일 때, 게임패드의 연결이 끊어지면 컨트롤러 애플릿 대화 상자가 나타나지 않습니다.\n\n모르시면 끔으로 두십시오.",
+        "ko_KR": "",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "A caixa de diálogo do Applet do controlador não aparecerá se o controle for desconectado enquanto um aplicativo estiver em execução.\n\nDeixe a opção DESLIGADO se não tiver certeza.",
@@ -17234,7 +17134,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "콘솔에 Avalonia(UI) 로그 메시지를 출력합니다.",
+        "ko_KR": "",
        "no_NO": "Skriver ut Avalonia (UI)-loggmeldinger i konsollen.",
        "pl_PL": "",
        "pt_BR": "Imprime mensagens de log do Avalonia (UI) no console.",
@@ -17434,7 +17334,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "Ryujinx 스크린샷 폴더 열기",
+        "ko_KR": "",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "Abre a pasta de capturas de tela do Ryujinx",
@@ -17767,7 +17667,7 @@
        "sv_SE": "Ändra ljudvolym",
        "th_TH": "ปรับระดับเสียง",
        "tr_TR": "Ses seviyesini değiştirir",
-        "uk_UA": "Регулювання гучності",
+        "uk_UA": "Змінити гучність звуку",
        "zh_CN": "调节音量",
        "zh_TW": "調節音量"
      }
@@ -18172,56 +18072,6 @@
        "zh_TW": "更新已停用!"
      }
    },
-    {
-      "ID": "FpsStatusBarText",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "{0} FPS ({1}ms)",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "FpsTurboStatusBarText",
-      "Translations": {
-        "ar_SA": "{0} FPS ({1}ms), التوربو %{2}",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "{0} FPS ({1}ms), Turbo ({2}%)",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
    {
      "ID": "UpdaterBackgroundStatusBarButtonText",
      "Translations": {
@@ -18234,7 +18084,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "업데이트 가능!",
+        "ko_KR": "",
        "no_NO": "Oppdatering tilgjengelig!",
        "pl_PL": "",
        "pt_BR": "Atualização Disponível!",
@@ -18839,7 +18689,7 @@
        "pl_PL": "",
        "pt_BR": "Não Reduzido",
        "ru_RU": "Не обрезан",
-        "sv_SE": "Orörd",
+        "sv_SE": "Inte optimerad",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "Необрізані",
@@ -19717,7 +19567,7 @@
        "sv_SE": "Alla tangentbord",
        "th_TH": "คีย์บอร์ดทั้งหมด",
        "tr_TR": "Tüm Klavyeler",
-        "uk_UA": "Усі клавіатури",
+        "uk_UA": "Всі клавіатури",
        "zh_CN": "所有键盘",
        "zh_TW": "所有鍵盤"
      }
@@ -19867,7 +19717,7 @@
        "sv_SE": "Snabbtangenter för tangentbord",
        "th_TH": "ปุ่มลัดของคีย์บอร์ด",
        "tr_TR": "Klavye Kısayolları",
-        "uk_UA": "Гарячі клавіші",
+        "uk_UA": "Гарячі клавіші клавіатури",
        "zh_CN": "快捷键",
        "zh_TW": "鍵盤快速鍵"
      }
@@ -22592,7 +22442,7 @@
        "sv_SE": "Tillämpar anti-aliasing på spelrenderaren.\n\nFXAA kommer att sudda det mesta av bilden, medan SMAA kommer att försöka hitta taggiga kanter och släta ut dem.\n\nRekommenderas inte att använda tillsammans med skalfiltret FSR.\n\nDet här alternativet kan ändras medan ett spel körs genom att klicka på \"Tillämpa\" nedan. Du kan helt enkelt flytta inställningsfönstret åt sidan och experimentera tills du hittar ditt föredragna utseende för ett spel.\n\nLämna som INGEN om du är osäker.",
        "th_TH": "ใช้การลดรอยหยักกับการเรนเดอร์เกม\n\nFXAA จะเบลอภาพส่วนใหญ่ ในขณะที่ SMAA จะพยายามค้นหารอยหยักและปรับให้เรียบ\n\nไม่แนะนำให้ใช้ร่วมกับตัวกรองสเกล FSR\n\nตัวเลือกนี้สามารถเปลี่ยนแปลงได้ในขณะที่เกมกำลังทำงานอยู่โดยคลิก \"นำไปใช้\" ด้านล่าง คุณสามารถย้ายหน้าต่างการตั้งค่าไปด้านข้างและทดลองจนกว่าคุณจะพบรูปลักษณ์ที่คุณต้องการสำหรับเกม\n\nปล่อยไว้ที่ NONE หากไม่แน่ใจ",
        "tr_TR": "",
-        "uk_UA": "Застосовує згладження до рендера гри.\n\nFXAA розмиє більшість зображення, а SMAA спробує знайти нерівні краї та згладити їх.\n\nНе рекомендується використовувати разом з фільтром масштабування FSR.\n\nЦю опцію можна міняти коли гра запущена кліком на \"Застосувати; ви можете відсунути вікно налаштувань і поекспериментувати з видом гри.\n\nЗалиште \"Немає\", якщо не впевнені.",
+        "uk_UA": "Застосовує згладження до рендера гри.\n\nFXAA розмиє більшість зображення, а SMAA спробує знайти нерівні краї та згладити їх.\n\nНе рекомендується використовувати разом з фільтром масштабування FSR.\n\nЦю опцію можна міняти коли гра запущена кліком на \"Застосувати; ви можете відсунути вікно налаштувань і поекспериментувати з видом гри.\n\nЗалиште на \"Немає\", якщо не впевнені.",
        "zh_CN": "抗锯齿是一种图形处理技术，用于减少图像边缘的锯齿状现象，使图像更加平滑。\n\nFXAA（快速近似抗锯齿）是一种性能开销相对较小的抗锯齿方法，但可能会使得整体图像看起来有些模糊。\n\nSMAA（增强型子像素抗锯齿）则更加精细，它会尝试找到锯齿边缘并平滑它们，相比 FXAA 有更好的图像质量，但性能开销可能会稍大一些。\n\n如果开启了 FSR（FidelityFX Super Resolution，超级分辨率锐画技术）来提高性能或图像质量，不建议再启用抗锯齿，因为它们会产生不必要的图形处理开销，或者相互之间效果不协调。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“无”。",
        "zh_TW": "對遊戲繪製進行反鋸齒處理。\n\nFXAA 會模糊大部分圖像，而 SMAA 則會嘗試找出鋸齒邊緣並將其平滑化。\n\n不建議與 FSR 縮放濾鏡一起使用。\n\n此選項可在遊戲執行時透過點選下方的「套用」進行變更；您只需將設定視窗移到一旁，然後進行試驗，直到找到您喜歡的遊戲效果。\n\n如果不確定，請選擇無狀態。"
      }
@@ -22667,7 +22517,7 @@
        "sv_SE": "Välj det skalfilter som ska tillämpas vid användning av upplösningsskala.\n\nBilinjär fungerar bra för 3D-spel och är ett säkert standardalternativ.\n\nNärmast rekommenderas för pixel art-spel.\n\nFSR 1.0 är bara ett skarpningsfilter, rekommenderas inte för FXAA eller SMAA.\n\nOmrådesskalning rekommenderas vid nedskalning av upplösning som är större än utdatafönstret. Det kan användas för att uppnå en supersamplad anti-alias-effekt vid nedskalning med mer än 2x.\n\nDetta alternativ kan ändras medan ett spel körs genom att klicka på \"Tillämpa\" nedan. du kan helt enkelt flytta inställningsfönstret åt sidan och experimentera tills du hittar ditt föredragna utseende för ett spel.\n\nLämna som BILINJÄR om du är osäker.",
        "th_TH": "เลือกตัวกรองสเกลที่จะใช้เมื่อใช้สเกลความละเอียด\n\nBilinear ทำงานได้ดีกับเกม 3D และเป็นตัวเลือกเริ่มต้นที่ปลอดภัย\n\nแนะนำให้ใช้เกมภาพพิกเซลที่ใกล้เคียงที่สุด\n\nFSR 1.0 เป็นเพียงตัวกรองความคมชัด ไม่แนะนำให้ใช้กับ FXAA หรือ SMAA\n\nตัวเลือกนี้สามารถเปลี่ยนแปลงได้ในขณะที่เกมกำลังทำงานอยู่โดยคลิก \"นำไปใช้\" ด้านล่าง คุณสามารถย้ายหน้าต่างการตั้งค่าไปด้านข้างและทดลองจนกว่าคุณจะพบรูปลักษณ์ที่คุณต้องการสำหรับเกม",
        "tr_TR": "Choose the scaling filter that will be applied when using resolution scale.\n\nBilinear works well for 3D games and is a safe default option.\n\nNearest is recommended for pixel art games.\n\nFSR 1.0 is merely a sharpening filter, not recommended for use with FXAA or SMAA.\n\nThis option can be changed while a game is running by clicking \"Apply\" below; you can simply move the settings window aside and experiment until you find your preferred look for a game.\n\nLeave on BILINEAR if unsure.",
-        "uk_UA": "Виберіть фільтр масштабування, що використається при збільшенні роздільної здатності.\n\n\"Білінійний\" добре виглядає в 3D іграх, і хороше налаштування за умовчуванням.\n\n\"Найближчий\" рекомендується для ігор з піксель-артом.\n\n\"FSR 1.0\" - фільтр різкості. Не варто використовувати разом з FXAA або SMAA.\n\nЦю опцію можна змінювати під час гри кліком на \"Застосувати\" нижче; ви можете відсунути вікно налаштувань і поекспериментувати з тим, як відображатиметься гра.\n\nЗалиште \"Білінійний\", якщо не впевнені.",
+        "uk_UA": "Виберіть фільтр масштабування, що використається при збільшенні роздільної здатності.\n\n\"Білінійний\" добре виглядає в 3D іграх, і хороше налаштування за умовчуванням.\n\n\"Найближчий\" рекомендується для ігор з піксель-артом.\n\n\"FSR 1.0\" - фільтр різкості. Не варто використовувати разом з FXAA або SMAA.\n\nЦю опцію можна змінювати під час гри кліком на \"Застосувати\" нижче; ви можете відсунути вікно налаштувань і поекспериментувати з тим, як відображатиметься гра.\n\nЗалиште на \"Білінійний\", якщо не впевнені.",
        "zh_CN": "选择在分辨率缩放时将使用的缩放过滤器。\n\nBilinear（双线性过滤）对于3D游戏效果较好，是一个安全的默认选项。\n\nNearest（最近邻过滤）推荐用于像素艺术游戏。\n\nFSR（超级分辨率锐画）只是一个锐化过滤器，不推荐与 FXAA 或 SMAA 抗锯齿一起使用。\n\nArea（局部过滤），当渲染分辨率大于窗口实际分辨率，推荐该选项。该选项在渲染比例大于2.0的情况下，可以实现超采样的效果。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“Bilinear（双线性过滤）”。",
        "zh_TW": "選擇使用解析度縮放時套用的縮放過濾器。\n\n雙線性 (Bilinear) 濾鏡適用於 3D 遊戲，是一個安全的預設選項。\n\n建議像素美術遊戲使用近鄰性 (Nearest) 濾鏡。\n\nFSR 1.0 只是一個銳化濾鏡，不建議與 FXAA 或 SMAA 一起使用。\n\n此選項可在遊戲執行時透過點選下方的「套用」進行變更；您只需將設定視窗移到一旁，然後進行試驗，直到找到您喜歡的遊戲效果。\n\n如果不確定，請保持雙線性 (Bilinear) 狀態。"
      }
@@ -23947,81 +23797,6 @@
        "zh_TW": "降低自訂的重新整理頻率"
      }
    },
-    {
-      "ID": "SettingsTabHotkeysTurboMode",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Turbo mode:",
-        "es_ES": "",
-        "fr_FR": "Mode Turbo :",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsTabHotkeysTurboModeToolTip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "The Turbo mode hotkey.\nConfigure the behavior of Turbo mode in Ryujinx CPU settings.\n\nLeave Unbound if unsure.",
-        "es_ES": "",
-        "fr_FR": "Le raccourci clavier Mode Turbo.\nConfigurez le comportement du Mode Turbo dans les paramètres de CPU de Ryujinx.\n\nLaisser Non Attribuée si incertain.",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsTabHotkeysOnlyWhilePressed",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Only while pressed",
-        "es_ES": "",
-        "fr_FR": "Seulement quand le raccourci est maintenu",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
    {
      "ID": "CompatibilityListLastUpdated",
      "Translations": {
@@ -24059,16 +23834,16 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "호환성 목록 - {0}개 항목",
+        "ko_KR": "",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Список совместимости — записей: {0}",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Список сумісності — {0} ігор",
-        "zh_CN": "兼容性列表 - {0} 条",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -24134,16 +23909,16 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "어카이브 {0} 호환성 항목...",
+        "ko_KR": "",
        "no_NO": "Søk i {0} kompatibilitetsoppføringer...",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Поиск среди {0} записей о совместимости...",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Шукати серед {0} перевірених ігор...",
-        "zh_CN": "搜索  {0}  兼容性条目...",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -24217,7 +23992,7 @@
        "sv_SE": "Spelbart",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Справна",
+        "uk_UA": "Оптимально",
        "zh_CN": "可游玩",
        "zh_TW": "可暢順遊玩"
      }
@@ -24334,7 +24109,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "어떠한 충돌이나 GPU 버그 없이 부팅 및 플레이가 가능하며, 일반 PC에서 충분히 즐길 수 있을 만큼 빠른 속도입니다.",
+        "ko_KR": "",
        "no_NO": "Starter opp og spiller uten krasj eller GPU-feil av noe slag, og med en hastighet som er rask nok til å ha rimelig glede av på en gjennomsnittlig PC.",
        "pl_PL": "",
        "pt_BR": "Inicializa e roda sem travamentos ou bugs de GPU de qualquer tipo, e em uma velocidade rápida o suficiente para ser aproveitado em um PC comum.",
@@ -24359,7 +24134,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "부팅하고 게임에 들어가지만 충돌, 교착 상태, GPU 버그, 방해가 될 정도로 나쁜 오디오 또는 너무 느린 문제 중 하나 이상으로 인해 문제가 발생합니다. 게임은 여전히 가능할 수 있습니다.",
+        "ko_KR": "",
        "no_NO": "Starter og går i gang i spillet, men lider av ett eller flere av følgende: krasjer, fastlåser, GPU-feil, distraherende dårlig lyd eller er rett og slett for tregt. Spillet kan fortsatt spilles helt til ende, men ikke slik det er ment å spilles.",
        "pl_PL": "",
        "pt_BR": "Inicializa e entra no jogo, mas sofre de um ou mais dos seguintes: travamentos, deadlocks, bugs de GPU, áudio ruim que distrai ou é simplesmente muito lento. O jogo ainda pode ser jogado até o fim, mas não da forma como foi criado para ser jogado.",
@@ -24384,7 +24159,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "부팅하고 타이틀 화면이 나오지만 메인 게임 플레이로 진입할 수 없습니다.",
+        "ko_KR": "",
        "no_NO": "Starter opp og går forbi tittelskjermen, men kommer ikke inn i hovedspillet.",
        "pl_PL": "",
        "pt_BR": "Inicializa e passa da tela de título, mas não entra no jogo principal.",
@@ -24409,7 +24184,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "부팅되지만 타이틀 화면을 통과하지 못합니다.",
+        "ko_KR": "",
        "no_NO": "Starter, men kommer ikke lenger enn til tittelskjermen.",
        "pl_PL": "",
        "pt_BR": "Inizializa, mas não passa da tela de título.",
@@ -24434,7 +24209,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "부팅되지 않거나 활동 흔적이 보이지 않습니다.",
+        "ko_KR": "",
        "no_NO": "Starter ikke opp eller viser ingen tegn til aktivitet.",
        "pl_PL": "",
        "pt_BR": "Não inicializa ou não mostra sinais de atividade.",
@@ -24459,16 +24234,16 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "사용자 정의 설정",
+        "ko_KR": "",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Индивидуальные параметры",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Власна конфігурація",
-        "zh_CN": "自定义配置",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": "遊戲獨立自訂 (game-specific) 設定"
      }
    },
@@ -24484,16 +24259,16 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "(글로벌)",
+        "ko_KR": "",
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "(Глобальный)",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "(Глобальні)",
-        "zh_CN": "(全局)",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": "(全域)"
      }
    },
@@ -24534,7 +24309,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "리치 프레즌스 이미지",
+        "ko_KR": "",
        "no_NO": "Rikt nærværsbilde",
        "pl_PL": "",
        "pt_BR": "Imagem da Presença do Discord",
@@ -24559,7 +24334,7 @@
        "he_IL": "",
        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "다이내믹 리치 프레즌스",
+        "ko_KR": "",
        "no_NO": "Dynamisk og rik tilstedeværelse",
        "pl_PL": "",
        "pt_BR": "Presença Dinâmica do Discord",
--- a/src/Ryujinx/Common/KeyboardHotkeyState.cs
+++ b/src/Ryujinx/Common/KeyboardHotkeyState.cs
@@ -14,6 +14,5 @@ namespace Ryujinx.Ava.Common
        VolumeDown,
        CustomVSyncIntervalIncrement,
        CustomVSyncIntervalDecrement,
-        TurboMode,
    }
 }
--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -38,8 +38,8 @@ namespace Ryujinx.Ava.Common.Locale
                { LocaleKeys.RyujinxConfirm, [RyujinxApp.FullAppName] },
                { LocaleKeys.RyujinxUpdater, [RyujinxApp.FullAppName] },
                { LocaleKeys.RyujinxRebooter, [RyujinxApp.FullAppName] },
-                { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityDatabase.Entries.Length] },
-                { LocaleKeys.CompatibilityListTitle, [CompatibilityDatabase.Entries.Length] }
+                { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityCsv.Entries.Length] },
+                { LocaleKeys.CompatibilityListTitle, [CompatibilityCsv.Entries.Length] }
            });

            Load();
@@ -61,13 +61,6 @@ namespace Ryujinx.Ava.Common.Locale
            }
        }

-        public static string GetUnformatted(LocaleKeys key) => Instance.Get(key);
-
-        public string Get(LocaleKeys key) =>
-            _localeStrings.TryGetValue(key, out string value) 
-                ? value 
-                : key.ToString();
-
        public string this[LocaleKeys key]
        {
            get
--- a/src/Ryujinx/Common/Markup/MarkupExtensions.cs
+++ b/src/Ryujinx/Common/Markup/MarkupExtensions.cs
@@ -24,17 +24,4 @@ namespace Ryujinx.Ava.Common.Markup
        protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
            => bindingExtension.Source = LocaleManager.Instance;
    }
-    
-    internal class WindowTitleExtension(LocaleKeys key, bool includeVersion) : BasicMarkupExtension<string>
-    {
-        public WindowTitleExtension(LocaleKeys key) : this(key, true)
-        {
-        }
-        
-        public override string Name => "WindowTitleTranslation";
-        protected override string Value => RyujinxApp.FormatTitle(key, includeVersion);
-
-        protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
-            => bindingExtension.Source = LocaleManager.Instance;
-    }
 }
--- a/src/Ryujinx/Common/XCITrimmerLog.cs
+++ b/src/Ryujinx/Common/XCITrimmerLog.cs
@@ -26,9 +26,9 @@ namespace Ryujinx.Ava.Common
        
        internal class TrimmerWindow : Ryujinx.Common.Logging.XCIFileTrimmerLog
        {
-            private readonly XciTrimmerViewModel _viewModel;
+            private readonly XCITrimmerViewModel _viewModel;

-            public TrimmerWindow(XciTrimmerViewModel viewModel)
+            public TrimmerWindow(XCITrimmerViewModel viewModel)
            {
                _viewModel = viewModel;
            }
--- a/src/Ryujinx/Systems/DiscordIntegrationModule.cs
+++ b/src/Ryujinx/Systems/DiscordIntegrationModule.cs
@@ -9,9 +9,10 @@ using Ryujinx.Common.Logging;
 using Ryujinx.HLE;
 using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.Horizon;
+using Ryujinx.Horizon.Prepo.Types;
 using System.Text;

-namespace Ryujinx.Ava.Systems
+namespace Ryujinx.Ava
 {
    public static class DiscordIntegrationModule
    {
@@ -123,7 +124,7 @@ namespace Ryujinx.Ava.Systems
            _currentApp = null;
        }

-        private static void HandlePlayReport(Horizon.Prepo.Types.PlayReport playReport)
+        private static void HandlePlayReport(PlayReport playReport)
        {
            if (_discordClient is null) return;
            if (!TitleIDs.CurrentApplication.Value.HasValue) return;
--- a/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs
+++ b/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs
@@ -2,7 +2,6 @@ using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -11,8 +10,8 @@ using Ryujinx.Common.Configuration.Hid.Controller.Motion;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
-using Ryujinx.Cpu;
 using Ryujinx.Graphics.GAL;
+using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
 using Ryujinx.HLE;
@@ -312,7 +311,7 @@ namespace Ryujinx.Headless

            return new OpenGLRenderer();
        }
-        
+
        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) =>
            new(
                new HleConfiguration(
@@ -322,7 +321,6 @@ namespace Ryujinx.Headless
                        options.VSyncMode,
                        !options.DisableDockedMode,
                        !options.DisablePTC,
-                        ITickSource.RealityTickScalar,
                        options.EnableInternetAccess,
                        !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
                        options.FsGlobalAccessLogMode,
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -5,7 +5,6 @@ using Gommon;
 using Projektanker.Icons.Avalonia;
 using Projektanker.Icons.Avalonia.FontAwesome;
 using Projektanker.Icons.Avalonia.MaterialDesign;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
--- a/src/Ryujinx/Systems/Rebooter.cs
+++ b/src/Ryujinx/Systems/Rebooter.cs
@@ -1,6 +1,8 @@
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -8,7 +10,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;

-namespace Ryujinx.Ava.Systems
+namespace Ryujinx.Ava
 {
    internal static class Rebooter
    {
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;win-arm64;osx-arm64;linux-arm64;</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
    <OutputType>Exe</OutputType>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Version>1.0.0-dirty</Version>
@@ -29,18 +29,12 @@
    <TrimMode>partial</TrimMode>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'win-arm64'">
-    <PublishSingleFile>true</PublishSingleFile>
-    <PublishTrimmed>false</PublishTrimmed>
-  </PropertyGroup>
-  
  <!--
    FluentAvalonia, used in the Avalonia UI, requires a workaround for the json serializer used internally when using .NET 8+ System.Text.Json.
    See:
      https://github.com/amwx/FluentAvalonia/issues/481
      https://devblogs.microsoft.com/dotnet/system-text-json-in-dotnet-8/
  -->
-  
  <PropertyGroup>
    <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
  </PropertyGroup>
@@ -63,8 +57,8 @@
    <PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" />
    <PackageReference Include="OpenTK.Core" />
    <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" />
-    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'" />
+    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" />
+    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'" />
    <PackageReference Include="securifybv.ShellLink" />
    <PackageReference Include="Sep" />
    <PackageReference Include="Silk.NET.Vulkan" />
@@ -73,7 +67,7 @@
    <PackageReference Include="SPB" />
    <PackageReference Include="SharpZipLib" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
@@ -90,19 +84,17 @@
  </ItemGroup>

  <ItemGroup>
-    <Content Include="..\..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'">
+    <Content Include="..\..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      <TargetPath>alsoft.ini</TargetPath>
    </Content>
    <Content Include="..\..\distribution\legal\THIRDPARTY.md">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      <TargetPath>THIRDPARTY.md</TargetPath>
-      <Visible>False</Visible>
    </Content>
    <Content Include="..\..\LICENSE.txt">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      <TargetPath>LICENSE.txt</TargetPath>
-      <Visible>False</Visible>
    </Content>
  </ItemGroup>

--- a/src/Ryujinx/UI/RyujinxApp.axaml
+++ b/src/Ryujinx/UI/RyujinxApp.axaml
--- a/src/Ryujinx/UI/RyujinxApp.axaml.cs
+++ b/src/Ryujinx/UI/RyujinxApp.axaml.cs
@@ -7,12 +7,12 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Windowing;
 using Gommon;
+using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using System;
@@ -150,7 +150,7 @@ namespace Ryujinx.Ava

        private async void AboutRyujinx_OnClick(object sender, EventArgs e)
        {
-            await AboutView.Show();
+            await AboutWindow.Show();
        }
    }
 }
--- a/src/Ryujinx/Systems/AppLibrary/ApplicationData.cs
+++ b/src/Ryujinx/Systems/AppLibrary/ApplicationData.cs
@@ -36,7 +36,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
            {
                _id = value;

-                Compatibility = CompatibilityDatabase.Find(value);
+                Compatibility = CompatibilityCsv.Find(value);
                RichPresenceSpec = PlayReports.Analyzer.TryGetSpec(IdString, out GameSpec gameSpec) 
                    ? gameSpec 
                    : default(Optional<GameSpec>);
--- a/src/Ryujinx/Systems/AppLibrary/LdnGameDataReceivedEventArgs.cs
+++ b/src/Ryujinx/Systems/AppLibrary/LdnGameDataReceivedEventArgs.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;

 namespace Ryujinx.Ava.Systems.AppLibrary
 {
--- a/src/Ryujinx/Systems/CompatibilityDatabase.cs
+++ b/src/Ryujinx/Systems/CompatibilityDatabase.cs
@@ -11,9 +11,24 @@ using System.Text;

 namespace Ryujinx.Ava.Systems
 {
-    public class CompatibilityDatabase
+    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
    {
-        static CompatibilityDatabase() => Load();
+        public const string TitleIdCol = "\"title_id\"";
+        public const string GameNameCol = "\"game_name\"";
+        public const string LabelsCol = "\"labels\"";
+        public const string StatusCol = "\"status\"";
+        public const string LastUpdatedCol = "\"last_updated\"";
+        
+        public readonly int TitleId = getIndex(TitleIdCol);
+        public readonly int GameName = getIndex(GameNameCol);
+        public readonly int Labels = getIndex(LabelsCol);
+        public readonly int Status = getIndex(StatusCol);
+        public readonly int LastUpdated = getIndex(LastUpdatedCol);
+    }
+    
+    public class CompatibilityCsv
+    {
+        static CompatibilityCsv() => Load();

        public static void Load()
        {
@@ -50,6 +65,16 @@ namespace Ryujinx.Ava.Systems
        
        public static CompatibilityEntry Find(ulong titleId)
            => Find(titleId.ToString("X16"));
+        
+        public static LocaleKeys? GetStatus(string titleId)
+            => Find(titleId)?.Status;
+        
+        public static LocaleKeys? GetStatus(ulong titleId) => GetStatus(titleId.ToString("X16"));
+        
+        public static string GetLabels(string titleId)
+            => Find(titleId)?.FormattedIssueLabels;
+        
+        public static string GetLabels(ulong titleId) => GetLabels(titleId.ToString("X16"));
    }

    public class CompatibilityEntry
@@ -110,7 +135,6 @@ namespace Ryujinx.Ava.Systems

        public string FormattedIssueLabels => Labels
            .Select(FormatLabelName)
-            .Where(x => x != null)
            .JoinToString(", ");

        public override string ToString() =>
@@ -134,6 +158,7 @@ namespace Ryujinx.Ava.Systems
            "gui" => "GUI",
            "help wanted" => "Help Wanted",
            "horizon" => "Horizon",
+            "infra" => "Project Infra",
            "invalid" => "Invalid",
            "kernel" => "Kernel",
            "ldn" => "LDN",
@@ -147,9 +172,9 @@ namespace Ryujinx.Ava.Systems
            "ldn-untested" => "LDN Untested",
            "ldn-broken" => "LDN Broken",
            "ldn-partial" => "Partial LDN",
-            "nvdec" => "GPU Video Decoding",
-            "services" => "HLE Services",
-            "services-horizon" => "New HLE Services",
+            "nvdec" => "NVDEC",
+            "services" => "NX Services",
+            "services-horizon" => "Horizon OS Services",
            "slow" => "Runs Slow",
            "crash" => "Crashes",
            "deadlock" => "Deadlock",
@@ -157,7 +182,7 @@ namespace Ryujinx.Ava.Systems
            "opengl" => "OpenGL",
            "opengl-backend-bug" => "OpenGL Backend Bug",
            "vulkan-backend-bug" => "Vulkan Backend Bug",
-            "mac-bug" => "Mac-specific Problems",
+            "mac-bug" => "Mac-specific Bug(s)",
            "amd-vendor-bug" => "AMD GPU Bug",
            "intel-vendor-bug" => "Intel GPU Bug",
            "loader-allocator" => "Loader Allocator",
@@ -166,22 +191,18 @@ namespace Ryujinx.Ava.Systems
            "UE4" => "Unreal Engine 4",
            "homebrew" => "Homebrew Content",
            "online-broken" => "Online Broken",
-            _ => null
+            _ => Capitalize(labelName)
        };
-    }
-    
-    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
-    {
-        private const string TitleIdCol = "\"title_id\"";
-        private const string GameNameCol = "\"game_name\"";
-        private const string LabelsCol = "\"labels\"";
-        private const string StatusCol = "\"status\"";
-        private const string LastUpdatedCol = "\"last_updated\"";
        
-        public readonly int TitleId = getIndex(TitleIdCol);
-        public readonly int GameName = getIndex(GameNameCol);
-        public readonly int Labels = getIndex(LabelsCol);
-        public readonly int Status = getIndex(StatusCol);
-        public readonly int LastUpdated = getIndex(LastUpdatedCol);
+        public static string Capitalize(string value)
+        {
+            if (value == string.Empty)
+                return string.Empty;
+        
+            char firstChar = value[0];
+            string rest = value[1..];
+
+            return $"{char.ToUpper(firstChar)}{rest}";
+        }
    }
 }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
@@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Systems.Configuration
        /// <summary>
        /// The current version of the file format
        /// </summary>
-        public const int CurrentVersion = 68;
+        public const int CurrentVersion = 67;

        /// <summary>
        /// Version of the configuration file format
@@ -258,11 +258,6 @@ namespace Ryujinx.Ava.Systems.Configuration
        /// Enables or disables low-power profiled translation cache persistency loading
        /// </summary>
        public bool EnableLowPowerPtc { get; set; }
-        
-        /// <summary>
-        /// Clock tick scalar, in percent points (100 = 1.0).
-        /// </summary>
-        public long TickScalar { get; set; }

        /// <summary>
        /// Enables or disables guest Internet access
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
@@ -46,11 +46,12 @@ namespace Ryujinx.Ava.Systems.Configuration
            
          
            EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
+            CheckUpdatesOnStart.Value = shouldLoadFromFile ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
            UpdateCheckerType.Value = shouldLoadFromFile ? cff.UpdateCheckerType : UpdateCheckerType.Value; // Get from global config only
            FocusLostActionType.Value = cff.FocusLostActionType;
            ShowConfirmExit.Value = shouldLoadFromFile ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
            RememberWindowState.Value = shouldLoadFromFile ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
-            ShowOldUI.Value = shouldLoadFromFile ? cff.ShowTitleBar : ShowOldUI.Value; // Get from global config only
+            ShowTitleBar.Value = shouldLoadFromFile ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only
            EnableHardwareAcceleration.Value = shouldLoadFromFile ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
            HideCursor.Value = cff.HideCursor;
          
@@ -93,7 +94,6 @@ namespace Ryujinx.Ava.Systems.Configuration
            System.EnableDockedMode.Value = cff.DockedMode;
            System.EnablePtc.Value = cff.EnablePtc;
            System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
-            System.TickScalar.Value = cff.TickScalar;
            System.EnableInternetAccess.Value = cff.EnableInternetAccess;
            System.EnableFsIntegrityChecks.Value = cff.EnableFsIntegrityChecks;
            System.FsGlobalAccessLogMode.Value = cff.FsGlobalAccessLogMode;
@@ -161,7 +161,9 @@ namespace Ryujinx.Ava.Systems.Configuration
                DirtyHacks hacks = new (cff.DirtyHacks ?? []);

                Hacks.Xc2MenuSoftlockFix.Value = hacks.IsEnabled(DirtyHack.Xc2MenuSoftlockFix);
-                
+
+                Hacks.EnableShaderTranslationDelay.Value = hacks.IsEnabled(DirtyHack.ShaderTranslationDelay);
+                Hacks.ShaderTranslationDelay.Value = hacks[DirtyHack.ShaderTranslationDelay].CoerceAtLeast(0);
            }

            if (configurationFileUpdated)
@@ -439,27 +441,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                (64, static cff => cff.LoggingEnableAvalonia = false),
                (65, static cff => cff.UpdateCheckerType = cff.CheckUpdatesOnStart ? UpdaterType.PromptAtStartup : UpdaterType.Off),
                (66, static cff => cff.DisableInputWhenOutOfFocus = false),
-                (67, static cff => cff.FocusLostActionType = cff.DisableInputWhenOutOfFocus ? FocusLostType.BlockInput : FocusLostType.DoNothing),
-                (68, static cff =>
-                {
-                    cff.TickScalar = 200;
-                    cff.Hotkeys = new KeyboardHotkeys
-                    {
-                        ToggleVSyncMode = cff.Hotkeys.ToggleVSyncMode,
-                        Screenshot = cff.Hotkeys.Screenshot,
-                        ShowUI = cff.Hotkeys.ShowUI,
-                        Pause = cff.Hotkeys.Pause,
-                        ToggleMute = cff.Hotkeys.ToggleMute,
-                        ResScaleUp = cff.Hotkeys.ResScaleUp,
-                        ResScaleDown = cff.Hotkeys.ResScaleDown,
-                        VolumeUp = cff.Hotkeys.VolumeUp,
-                        VolumeDown = cff.Hotkeys.VolumeDown,
-                        CustomVSyncIntervalIncrement = cff.Hotkeys.CustomVSyncIntervalIncrement,
-                        CustomVSyncIntervalDecrement = cff.Hotkeys.CustomVSyncIntervalDecrement,
-                        TurboMode = Key.Unbound,
-                        TurboModeWhileHeld = false
-                    };
-                })
+                (67, static cff => cff.FocusLostActionType = cff.DisableInputWhenOutOfFocus ? FocusLostType.BlockInput : FocusLostType.DoNothing)
            );
    }
 }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
@@ -11,6 +11,7 @@ using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
+using Ryujinx.HLE.HOS.SystemState;
 using System.Collections.Generic;
 using System.Linq;
 using RyuLogger = Ryujinx.Common.Logging.Logger;
@@ -335,11 +336,6 @@ namespace Ryujinx.Ava.Systems.Configuration
            /// Enables or disables persistent profiled translation cache
            /// </summary>
            public ReactiveObject<bool> EnablePtc { get; private set; }
-            
-            /// <summary>
-            /// Clock tick scalar, in percent points (100 = 1.0).
-            /// </summary>
-            public ReactiveObject<long> TickScalar { get; set; }

            /// <summary>
            /// Enables or disables low-power persistent profiled translation cache loading
@@ -420,15 +416,6 @@ namespace Ryujinx.Ava.Systems.Configuration
                EnableLowPowerPtc.LogChangesToValue(nameof(EnableLowPowerPtc));
                EnableLowPowerPtc.Event += (_, evnt) 
                    => Optimizations.LowPower = evnt.NewValue;
-                TickScalar = new ReactiveObject<long>();
-                TickScalar.LogChangesToValue(nameof(TickScalar));
-                TickScalar.Event += (_, evnt) =>
-                {
-                    if (Switch.Shared is null)
-                        return;
-
-                    Switch.Shared.Configuration.TickScalar = evnt.NewValue;
-                };
                EnableInternetAccess = new ReactiveObject<bool>();
                EnableInternetAccess.LogChangesToValue(nameof(EnableInternetAccess));
                EnableFsIntegrityChecks = new ReactiveObject<bool>();
@@ -697,15 +684,18 @@ namespace Ryujinx.Ava.Systems.Configuration
            
            public ReactiveObject<bool> Xc2MenuSoftlockFix { get; private set; }
            
-            public ReactiveObject<bool> DisableNifmIsAnyInternetRequestAccepted { get; private set; }
+            public ReactiveObject<bool> EnableShaderTranslationDelay { get; private set; }
+            
+            public ReactiveObject<int> ShaderTranslationDelay { get; private set; }

            public HacksSection()
            {
                ShowDirtyHacks = new ReactiveObject<bool>();
                Xc2MenuSoftlockFix = new ReactiveObject<bool>();
                Xc2MenuSoftlockFix.Event += HackChanged;
-                DisableNifmIsAnyInternetRequestAccepted = new ReactiveObject<bool>();
-                DisableNifmIsAnyInternetRequestAccepted.Event += HackChanged;
+                EnableShaderTranslationDelay = new ReactiveObject<bool>();
+                EnableShaderTranslationDelay.Event += HackChanged;
+                ShaderTranslationDelay = new ReactiveObject<int>();
            }

            private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
@@ -736,8 +726,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                    if (Xc2MenuSoftlockFix)
                        Apply(DirtyHack.Xc2MenuSoftlockFix);
                    
-                    if (DisableNifmIsAnyInternetRequestAccepted)
-                        Apply(DirtyHack.NifmServiceDisableIsAnyInternetRequestAccepted);
+                    if (EnableShaderTranslationDelay)
+                        Apply(DirtyHack.ShaderTranslationDelay, ShaderTranslationDelay);
                    
                    return enabledHacks.ToArray();

@@ -793,6 +783,11 @@ namespace Ryujinx.Ava.Systems.Configuration
        /// Enables or disables Discord Rich Presence
        /// </summary>
        public ReactiveObject<bool> EnableDiscordIntegration { get; private set; }
+
+        /// <summary>
+        /// Checks for updates when Ryujinx starts when enabled
+        /// </summary>
+        public ReactiveObject<bool> CheckUpdatesOnStart { get; private set; }
        
        /// <summary>
        /// Checks for updates when Ryujinx starts when enabled, either prompting when an update is found or just showing a notification.
@@ -815,9 +810,9 @@ namespace Ryujinx.Ava.Systems.Configuration
        public ReactiveObject<bool> RememberWindowState { get; private set; }

        /// <summary>
-        /// Disable the new title bar layout & window layout changes.
+        /// Enables or disables the redesigned title bar
        /// </summary>
-        public ReactiveObject<bool> ShowOldUI { get; private set; }
+        public ReactiveObject<bool> ShowTitleBar { get; private set; }

        /// <summary>
        /// Enables hardware-accelerated rendering for Avalonia
@@ -838,14 +833,15 @@ namespace Ryujinx.Ava.Systems.Configuration
            Hid = new HidSection();
            Multiplayer = new MultiplayerSection();
            Hacks = new HacksSection();
+            EnableDiscordIntegration = new ReactiveObject<bool>();
+            CheckUpdatesOnStart = new ReactiveObject<bool>();
            UpdateCheckerType = new ReactiveObject<UpdaterType>();
            FocusLostActionType = new ReactiveObject<FocusLostType>();
-            HideCursor = new ReactiveObject<HideCursorMode>();
-            EnableDiscordIntegration = new ReactiveObject<bool>();
            ShowConfirmExit = new ReactiveObject<bool>();
            RememberWindowState = new ReactiveObject<bool>();
-            ShowOldUI = new ReactiveObject<bool>();
+            ShowTitleBar = new ReactiveObject<bool>();
            EnableHardwareAcceleration = new ReactiveObject<bool>();
+            HideCursor = new ReactiveObject<HideCursorMode>();
        }

        public HleConfiguration CreateHleConfiguration() =>
@@ -856,7 +852,6 @@ namespace Ryujinx.Ava.Systems.Configuration
                Graphics.VSyncMode,
                System.EnableDockedMode,
                System.EnablePtc,
-                System.TickScalar,
                System.EnableInternetAccess,
                System.EnableFsIntegrityChecks 
                    ? IntegrityCheckLevel.ErrorOnInvalid 
@@ -875,8 +870,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                Multiplayer.Mode,
                Multiplayer.DisableP2p,
                Multiplayer.LdnPassphrase,
-                Multiplayer.GetLdnServer(),
-                Graphics.CustomVSyncInterval,
-                Hacks.ShowDirtyHacks ? Hacks.EnabledHacks : null);
+                Instance.Multiplayer.GetLdnServer(),
+                Instance.Graphics.CustomVSyncInterval,
+                Instance.Hacks.ShowDirtyHacks ? Instance.Hacks.EnabledHacks : null);
    }
 }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
@@ -56,11 +56,12 @@ namespace Ryujinx.Ava.Systems.Configuration
                MatchSystemTime = System.MatchSystemTime,
                DockedMode = System.EnableDockedMode,
                EnableDiscordIntegration = EnableDiscordIntegration,
+                CheckUpdatesOnStart = CheckUpdatesOnStart,
                UpdateCheckerType = UpdateCheckerType,
                FocusLostActionType = FocusLostActionType,
                ShowConfirmExit = ShowConfirmExit,
                RememberWindowState = RememberWindowState,
-                ShowTitleBar = ShowOldUI,
+                ShowTitleBar = ShowTitleBar,
                EnableHardwareAcceleration = EnableHardwareAcceleration,
                HideCursor = HideCursor,
                VSyncMode = Graphics.VSyncMode,
@@ -72,7 +73,6 @@ namespace Ryujinx.Ava.Systems.Configuration
                EnableColorSpacePassthrough = Graphics.EnableColorSpacePassthrough,
                EnablePtc = System.EnablePtc,
                EnableLowPowerPtc = System.EnableLowPowerPtc,
-                TickScalar = System.TickScalar,
                EnableInternetAccess = System.EnableInternetAccess,
                EnableFsIntegrityChecks = System.EnableFsIntegrityChecks,
                FsGlobalAccessLogMode = System.FsGlobalAccessLogMode,
@@ -183,7 +183,7 @@ namespace Ryujinx.Ava.Systems.Configuration
            FocusLostActionType.Value = FocusLostType.DoNothing;
            ShowConfirmExit.Value = true;
            RememberWindowState.Value = true;
-            ShowOldUI.Value = !OperatingSystem.IsWindows();
+            ShowTitleBar.Value = !OperatingSystem.IsWindows();
            EnableHardwareAcceleration.Value = true;
            HideCursor.Value = HideCursorMode.OnIdle;
            Graphics.VSyncMode.Value = VSyncMode.Switch;
@@ -261,10 +261,6 @@ namespace Ryujinx.Ava.Systems.Configuration
                ResScaleDown = Key.Unbound,
                VolumeUp = Key.Unbound,
                VolumeDown = Key.Unbound,
-                CustomVSyncIntervalIncrement = Key.Unbound,
-                CustomVSyncIntervalDecrement = Key.Unbound,
-                TurboMode = Key.Unbound,
-                TurboModeWhileHeld = false
            };
            Hid.RainbowSpeed.Value = 1f;
            Hid.InputConfig.Value =
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -9,10 +9,10 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -80,13 +80,13 @@ namespace Ryujinx.Ava.UI.Controls
        public async void OpenTitleUpdateManager_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await TitleUpdateManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
+                await TitleUpdateWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
        }

        public async void OpenDownloadableContentManager_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await DownloadableContentManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
+                await DownloadableContentManagerWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
        }

        public async void OpenCheatManager_Click(object sender, RoutedEventArgs args)
@@ -127,7 +127,7 @@ namespace Ryujinx.Ava.UI.Controls
        public async void OpenModManager_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await ModManagerView.Show(
+                await ModManagerWindow.Show(
                    viewModel.SelectedApplication.Id, 
                    viewModel.SelectedApplication.IdBase, 
                    viewModel.ApplicationLibrary, 
--- a/src/Ryujinx/UI/Controls/RyujinxLogo.cs
+++ b/src/Ryujinx/UI/Controls/RyujinxLogo.cs
@@ -1,28 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Media.Imaging;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.ViewModels;
-using System.Reflection;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public class RyujinxLogo : Image
-    {
-        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
-        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
-        // The border gets reduced to colored pixels in the 4 corners.
-        public static readonly Bitmap Bitmap =
-            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
-                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
-        
-        public RyujinxLogo()
-        {
-            Margin = new Thickness(7, 7, 7, 0);
-            Height = 25;
-            Width = 25;
-            Source = Bitmap;
-            IsVisible = !ConfigurationState.Instance.ShowOldUI;
-        }
-    }
-}
--- a/src/Ryujinx/UI/Controls/MiniVerticalSeparator.cs
+++ b/src/Ryujinx/UI/Controls/MiniVerticalSeparator.cs
--- a/src/Ryujinx/UI/Models/Input/HotkeyConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/HotkeyConfig.cs
@@ -28,10 +28,6 @@ namespace Ryujinx.Ava.UI.Models.Input

        [ObservableProperty] private Key _customVSyncIntervalDecrement;

-        [ObservableProperty] private Key _turboMode;
-
-        [ObservableProperty] private bool _turboModeWhileHeld;
-
        public HotkeyConfig(KeyboardHotkeys config)
        {
            if (config == null)
@@ -48,8 +44,6 @@ namespace Ryujinx.Ava.UI.Models.Input
            VolumeDown = config.VolumeDown;
            CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
            CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
-            TurboMode = config.TurboMode;
-            TurboModeWhileHeld = config.TurboModeWhileHeld;
        }

        public KeyboardHotkeys GetConfig() =>
@@ -66,8 +60,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                VolumeDown = VolumeDown,
                CustomVSyncIntervalIncrement = CustomVSyncIntervalIncrement,
                CustomVSyncIntervalDecrement = CustomVSyncIntervalDecrement,
-                TurboMode = TurboMode,
-                TurboModeWhileHeld = TurboModeWhileHeld
            };
    }
 }
--- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
@@ -3,6 +3,7 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
+using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
 using System;
--- a/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
@@ -432,7 +432,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            try
            {
-                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json"));
+                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json"));

                if (response.IsSuccessStatusCode)
                {
@@ -451,7 +451,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            try
            {
-                HttpResponseMessage response = await _httpClient.GetAsync("https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json");
+                HttpResponseMessage response = await _httpClient.GetAsync($"https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json");

                if (response.IsSuccessStatusCode)
                {
--- a/src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs
@@ -1,17 +1,17 @@
 using Gommon;
 using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.Systems.AppLibrary;
-using System;
+using Ryujinx.Ava.UI.Windows;
 using System.Collections.Generic;
 using System.Linq;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class CompatibilityViewModel : BaseModel, IDisposable
+    public class CompatibilityViewModel : BaseModel
    {
-        private readonly ApplicationLibrary _appLibrary;
+        private bool _onlyShowOwnedGames = true;

-        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityDatabase.Entries;
+        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Entries;
        private string[] _ownedGameTitleIds = [];

        public IEnumerable<CompatibilityEntry> CurrentEntries => OnlyShowOwnedGames
@@ -20,27 +20,15 @@ namespace Ryujinx.Ava.UI.ViewModels
            : _currentEntries;

        public CompatibilityViewModel() {}
-        
-        private void AppCountUpdated(object _, ApplicationCountUpdatedEventArgs __)
-            => _ownedGameTitleIds = _appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();

        public CompatibilityViewModel(ApplicationLibrary appLibrary)
        {
-            _appLibrary = appLibrary;
+            appLibrary.ApplicationCountUpdated += (_, _) 
+                => _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
            
-            AppCountUpdated(null, null);
-
-            _appLibrary.ApplicationCountUpdated += AppCountUpdated;
+            _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
        }

-        void IDisposable.Dispose()
-        {
-            GC.SuppressFinalize(this);
-            _appLibrary.ApplicationCountUpdated -= AppCountUpdated;
-        }
-        
-        private bool _onlyShowOwnedGames = true;
-
        public bool OnlyShowOwnedGames
        {
            get => _onlyShowOwnedGames;
@@ -58,11 +46,11 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            if (string.IsNullOrEmpty(searchTerm))
            {
-                SetEntries(CompatibilityDatabase.Entries);
+                SetEntries(CompatibilityCsv.Entries);
                return;
            }

-            SetEntries(CompatibilityDatabase.Entries.Where(x =>
+            SetEntries(CompatibilityCsv.Entries.Where(x =>
                x.GameName.ContainsIgnoreCase(searchTerm)
                || x.TitleId.Check(tid => tid.ContainsIgnoreCase(searchTerm))));
        }
--- a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
@@ -1,5 +1,9 @@
 using Avalonia.Svg.Skia;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Input;
+using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
 using Ryujinx.Common.Utilities;
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Media;
+using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -16,7 +17,6 @@ using LibHac.Ns;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
@@ -46,6 +46,7 @@ using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Key = Ryujinx.Input.Key;
@@ -136,6 +137,13 @@ namespace Ryujinx.Ava.UI.ViewModels
        // Key is Title ID
        public SafeDictionary<string, LdnGameData.Array> LdnData = [];

+        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
+        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
+        // The border gets reduced to colored pixels in the 4 corners.
+        public static readonly Bitmap IconBitmap =
+            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
+                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
+
        public MainWindow Window { get; init; }

        internal AppHost AppHost { get; set; }
@@ -1786,7 +1794,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            if (WindowState is not WindowState.Normal)
            {
                WindowState = WindowState.Normal;
-                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowOldUI;
+                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;

                if (IsGameRunning)
                {
--- a/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
@@ -16,12 +16,11 @@ namespace Ryujinx.Ava.UI.ViewModels
        }

        [ObservableProperty] private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
-        [ObservableProperty] private bool _nifmDisableIsAnyInternetRequestAccepted = ConfigurationState.Instance.Hacks.DisableNifmIsAnyInternetRequestAccepted;
        
        public static string Xc2MenuFixTooltip { get; } = Lambda.String(sb =>
        {
            sb.AppendLine(
-                    "This hack applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
+                    "This fix applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
                .AppendLine();
            
            sb.AppendLine("From the issue on GitHub:").AppendLine();
@@ -30,14 +29,5 @@ namespace Ryujinx.Ava.UI.ViewModels
                "there is a low chance that the game will softlock, " +
                "the submenu won't show up, while background music is still there.");
        });
-        
-        public static string NifmDisableIsAnyInternetRequestAcceptedTooltip { get; } = Lambda.String(sb =>
-        {
-            sb.AppendLine(
-                    "This hack simply sets 'IsAnyInternetRequestAccepted' to 'false' when initializing the Nifm IGeneralService.")
-                .AppendLine();
-
-            sb.Append("Lets DOOM 2016 go in game.");
-        });
    }
 }
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -60,7 +60,6 @@ namespace Ryujinx.Ava.UI.ViewModels
        private bool _enableCustomVSyncInterval;
        private int _customVSyncIntervalPercentageProxy;
        private VSyncMode _vSyncMode;
-        private long _turboModeMultiplier;

        public event Action CloseWindow;
        public event Action SaveSettingsEvent;
@@ -131,10 +130,11 @@ namespace Ryujinx.Ava.UI.ViewModels
        public bool IsOpenGLAvailable => !OperatingSystem.IsMacOS();

        public bool EnableDiscordIntegration { get; set; }
+        public bool CheckUpdatesOnStart { get; set; }
        public bool ShowConfirmExit { get; set; }
        public bool IgnoreApplet { get; set; }
        public bool RememberWindowState { get; set; }
-        public bool ShowOldUI { get; set; }
+        public bool ShowTitleBar { get; set; }
        public int HideCursor { get; set; }
        public int UpdateCheckerType { get; set; }
        public bool EnableDockedMode { get; set; }
@@ -207,25 +207,6 @@ namespace Ryujinx.Ava.UI.ViewModels
        }
        public bool EnablePptc { get; set; }
        public bool EnableLowPowerPptc { get; set; }
-        
-        
-        public long TurboMultiplier
-        {
-            get => _turboModeMultiplier;
-            set
-            {
-                if (_turboModeMultiplier != value)
-                {
-                    _turboModeMultiplier = value;
-                    
-                    OnPropertyChanged();
-                    OnPropertyChanged((nameof(TurboMultiplierPercentageText)));
-                }
-            }
-        }
-        
-        public string TurboMultiplierPercentageText => $"{TurboMultiplier}%";
-
        public bool EnableInternetAccess { get; set; }
        public bool EnableFsIntegrityChecks { get; set; }
        public bool IgnoreMissingServices { get; set; }
@@ -556,9 +537,10 @@ namespace Ryujinx.Ava.UI.ViewModels

            // User Interface
            EnableDiscordIntegration = config.EnableDiscordIntegration;
+            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
            ShowConfirmExit = config.ShowConfirmExit;
            RememberWindowState = config.RememberWindowState;
-            ShowOldUI = config.ShowOldUI;
+            ShowTitleBar = config.ShowTitleBar;
            HideCursor = (int)config.HideCursor.Value;
            UpdateCheckerType = (int)config.UpdateCheckerType.Value;
            FocusLostActionType = (int)config.FocusLostActionType.Value;
@@ -612,7 +594,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            EnableLowPowerPptc = config.System.EnableLowPowerPtc;
            MemoryMode = (int)config.System.MemoryManagerMode.Value;
            UseHypervisor = config.System.UseHypervisor;
-            TurboMultiplier = config.System.TickScalar;

            // Graphics
            GraphicsBackendIndex = (int)config.Graphics.GraphicsBackend.Value;
@@ -665,9 +646,10 @@ namespace Ryujinx.Ava.UI.ViewModels

            // User Interface
            config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
+            config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
            config.ShowConfirmExit.Value = ShowConfirmExit;
            config.RememberWindowState.Value = RememberWindowState;
-            config.ShowOldUI.Value = ShowOldUI;
+            config.ShowTitleBar.Value = ShowTitleBar;
            config.HideCursor.Value = (HideCursorMode)HideCursor;
            config.UpdateCheckerType.Value = (UpdaterType)UpdateCheckerType;
            config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType;
@@ -715,7 +697,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            config.System.EnableLowPowerPtc.Value = EnableLowPowerPptc;
            config.System.MemoryManagerMode.Value = (MemoryManagerMode)MemoryMode;
            config.System.UseHypervisor.Value = UseHypervisor;
-            config.System.TickScalar.Value = TurboMultiplier;

            // Graphics
            config.Graphics.VSyncMode.Value = VSyncMode;
@@ -779,8 +760,6 @@ namespace Ryujinx.Ava.UI.ViewModels

            // Dirty Hacks
            config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFix;
-            config.Hacks.DisableNifmIsAnyInternetRequestAccepted.Value =
-                DirtyHacks.NifmDisableIsAnyInternetRequestAccepted;

            config.ToFileFormat().SaveConfig(Program.ConfigurationPath);

--- a/src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs
@@ -16,7 +16,7 @@ using static Ryujinx.Common.Utilities.XCIFileTrimmer;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class XciTrimmerViewModel : BaseModel
+    public class XCITrimmerViewModel : BaseModel
    {
        private const long _bytesPerMB = 1024 * 1024;
        private enum ProcessingMode
@@ -46,7 +46,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        private SortField _sortField = SortField.Name;
        private bool _sortAscending = true;

-        public XciTrimmerViewModel(MainWindowViewModel mainWindowViewModel)
+        public XCITrimmerViewModel(MainWindowViewModel mainWindowViewModel)
        {
            _logger = new XCITrimmerLog.TrimmerWindow(this);
            _mainWindowViewModel = mainWindowViewModel;
@@ -254,9 +254,9 @@ namespace Ryujinx.Ava.UI.ViewModels

        private class CompareXCITrimmerFiles : IComparer<XCITrimmerFileModel>
        {
-            private XciTrimmerViewModel _viewModel;
+            private XCITrimmerViewModel _viewModel;

-            public CompareXCITrimmerFiles(XciTrimmerViewModel ViewModel)
+            public CompareXCITrimmerFiles(XCITrimmerViewModel ViewModel)
            {
                _viewModel = ViewModel;
            }
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
@@ -4,10 +4,10 @@
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:pt="using:Projektanker.Icons.Avalonia"
    HorizontalAlignment="Stretch"
    VerticalAlignment="Stretch"
    d:DesignHeight="800"
@@ -507,49 +507,65 @@
                        CornerRadius="5"
                        VerticalAlignment="Bottom"
                        HorizontalAlignment="Stretch">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                            <StackPanel Orientation="Vertical" Spacing="5">
-                                <CheckBox
-                                    Margin="10, 10, 10, 0"
-                                    MinWidth="0"
-                                    IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
-                                    <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
-                                </CheckBox>
-                                <Button
-                                    Margin="10, 0, 10, 10"
-                                    Command="{Binding ShowMotionConfig}">
-                                    <pt:Icon Value="fa-solid fa-gear" />
-                                </Button>
-                            </StackPanel>
-                            <controls:MiniVerticalSeparator Height="64"/>
-                            <StackPanel Orientation="Vertical" Spacing="5">
-                                <CheckBox
-                                    Margin="10, 10, 10, 0"
-                                    MinWidth="0"
-                                    IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
-                                    <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
-                                </CheckBox>
-                                <Button
-                                    Margin="10, 0, 10, 10"
-                                    Command="{Binding ShowRumbleConfig}">
-                                    <pt:Icon Value="fa-solid fa-gear" />
-                                </Button>
-                            </StackPanel>
-                            <controls:MiniVerticalSeparator Height="64" IsVisible="{Binding ParentModel.HasLed}"/>
-                            <StackPanel Orientation="Vertical" Spacing="5">
-                                <CheckBox
-                                    Margin="10, 10, 10, 0"
-                                    MinWidth="0"
-                                    IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
-                                    <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
-                                </CheckBox>
-                                <Button
-                                    Margin="10, 0, 10, 10"
-                                    Command="{Binding ShowLedConfig}">
-                                    <pt:Icon Value="fa-solid fa-gear" />
-                                </Button>
-                            </StackPanel>
-                        </StackPanel>
+                        <Grid ColumnDefinitions="*,Auto">
+                            <CheckBox
+                                Margin="10"
+                                MinWidth="0"
+                                Grid.Column="0"
+                                IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
+                            </CheckBox>
+                            <Button
+                                Margin="10"
+                                Grid.Column="1"
+                                Command="{Binding ShowMotionConfig}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                            </Button>
+                        </Grid>
+                    </Border>
+                    <Border
+                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="5"
+                        HorizontalAlignment="Stretch"
+                        Margin="0,-1,0,0">
+                        <Grid ColumnDefinitions="*,Auto">
+                            <CheckBox
+                                Margin="10"
+                                MinWidth="0"
+                                Grid.Column="0"
+                                IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
+                            </CheckBox>
+                            <Button
+                                Margin="10"
+                                Grid.Column="1"
+                                Command="{Binding ShowRumbleConfig}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                            </Button>
+                        </Grid>
+                    </Border>
+                    <Border
+                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="5"
+                        HorizontalAlignment="Stretch"
+                        Margin="0,-1,0,0">
+                        <Grid IsVisible="{Binding ParentModel.HasLed}" ColumnDefinitions="*,Auto">
+                            <CheckBox
+                                Margin="10, 10, 5, 10"
+                                MinWidth="0"
+                                Grid.Column="0"
+                                IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
+                            </CheckBox>
+                            <Button
+                                Margin="10"
+                                Grid.Column="1"
+                                Command="{Binding ShowLedConfig}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                            </Button>
+                        </Grid>
                    </Border>
                </StackPanel>
            </StackPanel>
--- a/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
--- a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs
@@ -1,3 +1,4 @@
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
--- a/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs
@@ -1,3 +1,4 @@
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -6,16 +6,18 @@
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    mc:Ignorable="d"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    x:DataType="viewModels:MainWindowViewModel"
    x:Class="Ryujinx.Ava.UI.Views.Main.MainMenuBarView">
    <Design.DataContext>
        <viewModels:MainWindowViewModel />
    </Design.DataContext>
    <DockPanel HorizontalAlignment="Stretch">
-        <controls:RyujinxLogo 
-            Margin="7, 0" 
-            ToolTip.Tip="{Binding Title}"/>
+        <Image
+            Name="RyuLogo"
+            Margin="7, 0"
+            Height="25"
+            Width="25"
+            ToolTip.Tip="{Binding Title}" />
        <Menu
            Name="Menu"
            Height="32"
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -13,7 +13,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Views.Dialog;
+using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Utilities;
@@ -34,6 +34,9 @@ namespace Ryujinx.Ava.UI.Views.Main
        {
            InitializeComponent();

+            RyuLogo.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
+            RyuLogo.Source = MainWindowViewModel.IconBitmap;
+
            ToggleFileTypesMenuItem.ItemsSource = GenerateToggleFileTypeItems();
            ChangeLanguageMenuItem.ItemsSource = GenerateLanguageMenuItems();

@@ -46,8 +49,8 @@ namespace Ryujinx.Ava.UI.Views.Main
            CheatManagerMenuItem.Command = Commands.CreateSilentFail(OpenCheatManagerForCurrentApp);
            InstallFileTypesMenuItem.Command = Commands.Create(InstallFileTypes);
            UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
-            XciTrimmerMenuItem.Command = Commands.Create(XciTrimmerView.Show);
-            AboutWindowMenuItem.Command = Commands.Create(AboutView.Show);
+            XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
+            AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityListWindow.Show());

            UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;
@@ -223,7 +226,7 @@ namespace Ryujinx.Ava.UI.Views.Main

            // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
            double barsHeight = ((Window.StatusBarHeight + Window.MenuBarHeight) +
-                (ConfigurationState.Instance.ShowOldUI ? (int)Window.TitleBar.Height : 0));
+                (ConfigurationState.Instance.ShowTitleBar ? (int)Window.TitleBar.Height : 0));

            double windowWidthScaled = (resolutionWidth * Program.WindowScaleFactor);
            double windowHeightScaled = ((resolutionHeight + barsHeight) * Program.WindowScaleFactor);
--- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
--- a/src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml
+++ b/src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml
@@ -7,7 +7,7 @@
             xmlns:ui="using:FluentAvalonia.UI.Controls"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Views.Dialog.ApplicationDataView"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationDataView"
             x:DataType="viewModels:ApplicationDataViewModel">
    <StackPanel Orientation="Horizontal">
        <Image Margin="0"
--- a/src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml.cs
@@ -12,7 +12,7 @@ using Ryujinx.Ava.Systems.AppLibrary;
 using System.Linq;
 using System.Threading.Tasks;

-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Views.Misc
 {
    public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
    {
--- a/src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml
+++ b/src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml
@@ -7,7 +7,7 @@
             xmlns:models="using:Ryujinx.Ava.Common.Models"
             xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Views.Dialog.DlcSelectView"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.DlcSelectView"
             x:DataType="viewModels:DlcSelectViewModel">
    <Grid RowDefinitions="*,Auto,*">
        <TextBlock
--- a/src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml.cs
@@ -1,4 +1,6 @@
-using FluentAvalonia.UI.Controls;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Controls;
@@ -7,7 +9,7 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
 using System.Threading.Tasks;

-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Views.Misc
 {
    public partial class DlcSelectView : RyujinxControl<DlcSelectViewModel>
    {
--- a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
@@ -7,7 +7,6 @@
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
    mc:Ignorable="d"
    x:DataType="viewModels:SettingsViewModel">
    <Design.DataContext>
@@ -77,57 +76,6 @@
                                   ToolTip.Tip="{ext:Locale UseHypervisorTooltip}" />
                    </CheckBox>
                </StackPanel>
-                <Separator Height="1" />
-                <StackPanel
-                    Orientation="Vertical"
-                    Spacing="5">
-                    <TextBlock
-                        Classes="h1"
-                        Text="{ext:Locale SettingsTabSystemHacks}" />
-                    <TextBlock
-                        Foreground="{DynamicResource SecondaryTextColor}"
-                        TextDecorations="Underline"
-                        Text="{ext:Locale SettingsTabSystemHacksNote}" />
-                </StackPanel>
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical">
-                    <StackPanel Margin="0,0,0,10"
-                                Orientation="Horizontal">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Text="{ext:Locale SettingsTabSystemTurboMultiplier}"
-                            ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierToolTip}"
-                            Width="250" />
-                        <ui:NumberBox ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
-                                      Value="{Binding TurboMultiplier}"
-                                      Width="165"
-                                      SmallChange="1.0"
-                                      LargeChange="10"
-                                      SimpleNumberFormat="F0"
-                                      SpinButtonPlacementMode="Hidden"
-                                      Minimum="50"
-                                      Maximum="300" />
-                        <Slider Value="{Binding TurboMultiplier}"
-                                ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
-                                MinWidth="175"
-                                Margin="10,-3,0,0"
-                                Height="32"
-                                Padding="0,-5"
-                                TickFrequency="1"
-                                IsSnapToTickEnabled="True"
-                                LargeChange="10"
-                                SmallChange="1"
-                                VerticalAlignment="Center"
-                                Minimum="50"
-                                Maximum="500" />
-                        <TextBlock Margin="5,0"
-                                   Width="40"
-                                   Text="{Binding TurboMultiplierPercentageText}"/>
-                    </StackPanel>
-                </StackPanel>
            </StackPanel>
        </Border>
    </ScrollViewer>
--- a/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
@@ -29,7 +29,7 @@
                <TextBlock
                    Foreground="{DynamicResource SecondaryTextColor}"
                    TextDecorations="Underline"
-                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Can cause issues." />
+                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Will cause issues." />
                <StackPanel
                    Margin="0,10,0,0"
                    Orientation="Horizontal"
@@ -43,18 +43,6 @@
                        Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
                </StackPanel>
                <Separator/>
-                <StackPanel
-                    Margin="0,10,0,0"
-                    Orientation="Horizontal"
-                    HorizontalAlignment="Center"
-                    ToolTip.Tip="{Binding DirtyHacks.NifmDisableIsAnyInternetRequestAcceptedTooltip}">
-                    <CheckBox
-                        Margin="0"
-                        IsChecked="{Binding DirtyHacks.NifmDisableIsAnyInternetRequestAccepted}"/>
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        Text="Disable IsAnyInternetRequestAccepted" />
-                </StackPanel>
            </StackPanel>
        </Border>
    </ScrollViewer>
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml
@@ -19,7 +19,7 @@
            <Setter Property="Margin" Value="10, 0, 0, 0" />
            <Setter Property="Orientation" Value="Horizontal" />
        </Style>
-        <Style Selector="StackPanel > StackPanel > TextBlock.settingHeader">
+        <Style Selector="StackPanel > StackPanel > TextBlock">
            <Setter Property="VerticalAlignment" Value="Center" />
            <Setter Property="Width" Value="230" />
        </Style>
@@ -47,79 +47,71 @@
                    Classes="h1"
                    Text="{ext:Locale SettingsTabHotkeysHotkeys}" />
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" />
                    <ToggleButton Name="ToggleVSyncMode">
                        <TextBlock Text="{Binding KeyboardHotkey.ToggleVSyncMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" />
                    <ToggleButton Name="Screenshot">
                        <TextBlock Text="{Binding KeyboardHotkey.Screenshot, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" />
                    <ToggleButton Name="ShowUI">
                        <TextBlock Text="{Binding KeyboardHotkey.ShowUI, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" />
                    <ToggleButton Name="Pause">
                        <TextBlock Text="{Binding KeyboardHotkey.Pause, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" />
                    <ToggleButton Name="ToggleMute">
                        <TextBlock Text="{Binding KeyboardHotkey.ToggleMute, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" />
                    <ToggleButton Name="ResScaleUp">
                        <TextBlock Text="{Binding KeyboardHotkey.ResScaleUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" />
                    <ToggleButton Name="ResScaleDown">
                        <TextBlock Text="{Binding KeyboardHotkey.ResScaleDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" />
                    <ToggleButton Name="VolumeUp">
                        <TextBlock Text="{Binding KeyboardHotkey.VolumeUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" />
                    <ToggleButton Name="VolumeDown">
                        <TextBlock Text="{Binding KeyboardHotkey.VolumeDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" />
                    <ToggleButton Name="CustomVSyncIntervalIncrement">
                        <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalIncrement, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" />
                    <ToggleButton Name="CustomVSyncIntervalDecrement">
                        <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalDecrement, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                    </ToggleButton>
                </StackPanel>
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysTurboMode}" Classes="settingHeader" ToolTip.Tip="{ext:Locale SettingsTabHotkeysTurboModeToolTip}" Background="Transparent" />
-                    <ToggleButton Name="TurboMode">
-                        <TextBlock Text="{Binding KeyboardHotkey.TurboMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                    </ToggleButton>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysOnlyWhilePressed}" Margin="10,0" />
-                    <CheckBox IsChecked="{Binding KeyboardHotkey.TurboModeWhileHeld}" />
-                </StackPanel>
            </StackPanel>
        </Border>
   </ScrollViewer>
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
@@ -3,9 +3,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using Avalonia.Threading;
 using Ryujinx.Ava.Input;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Input;
@@ -15,7 +13,7 @@ using Key = Ryujinx.Common.Configuration.Hid.Key;

 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsHotkeysView : RyujinxControl<SettingsViewModel>
+    public partial class SettingsHotkeysView : UserControl
    {
        private ButtonKeyAssigner _currentAssigner;
        private readonly IGamepadDriver _avaloniaKeyboardDriver;
@@ -80,52 +78,45 @@ namespace Ryujinx.Ava.UI.Views.Settings
                        {
                            if (e.ButtonValue.HasValue)
                            {
+                                SettingsViewModel viewModel = (DataContext) as SettingsViewModel;
                                Button buttonValue = e.ButtonValue.Value;

-                                Dispatcher.UIThread.Post(() =>
+                                switch (button.Name)
                                {
-                                    switch (button.Name)
-                                    {
-                                        case "ToggleVSyncMode":
-                                            ViewModel.KeyboardHotkey.ToggleVSyncMode = buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "Screenshot":
-                                            ViewModel.KeyboardHotkey.Screenshot = buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "ShowUI":
-                                            ViewModel.KeyboardHotkey.ShowUI = buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "Pause":
-                                            ViewModel.KeyboardHotkey.Pause = buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "ToggleMute":
-                                            ViewModel.KeyboardHotkey.ToggleMute = buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "ResScaleUp":
-                                            ViewModel.KeyboardHotkey.ResScaleUp = buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "ResScaleDown":
-                                            ViewModel.KeyboardHotkey.ResScaleDown = buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "VolumeUp":
-                                            ViewModel.KeyboardHotkey.VolumeUp = buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "VolumeDown":
-                                            ViewModel.KeyboardHotkey.VolumeDown = buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "CustomVSyncIntervalIncrement":
-                                            ViewModel.KeyboardHotkey.CustomVSyncIntervalIncrement =
-                                                buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "CustomVSyncIntervalDecrement":
-                                            ViewModel.KeyboardHotkey.CustomVSyncIntervalDecrement =
-                                                buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "TurboMode":
-                                            ViewModel.KeyboardHotkey.TurboMode = buttonValue.AsHidType<Key>();
-                                            break;
-                                    }
-                                });
+                                    case "ToggleVSyncMode":
+                                        viewModel.KeyboardHotkey.ToggleVSyncMode = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "Screenshot":
+                                        viewModel.KeyboardHotkey.Screenshot = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "ShowUI":
+                                        viewModel.KeyboardHotkey.ShowUI = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "Pause":
+                                        viewModel.KeyboardHotkey.Pause = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "ToggleMute":
+                                        viewModel.KeyboardHotkey.ToggleMute = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "ResScaleUp":
+                                        viewModel.KeyboardHotkey.ResScaleUp = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "ResScaleDown":
+                                        viewModel.KeyboardHotkey.ResScaleDown = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "VolumeUp":
+                                        viewModel.KeyboardHotkey.VolumeUp = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "VolumeDown":
+                                        viewModel.KeyboardHotkey.VolumeDown = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "CustomVSyncIntervalIncrement":
+                                        viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "CustomVSyncIntervalDecrement":
+                                        viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = buttonValue.AsHidType<Key>();
+                                        break;
+                                }
                            }
                        };

--- a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml.cs
@@ -1,13 +1,15 @@
+using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using System;

 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsNetworkView : RyujinxControl<SettingsViewModel>
+    public partial class SettingsNetworkView : UserControl
    {
        private readonly Random _random;
+        
+        public SettingsViewModel ViewModel;

        public SettingsNetworkView()
        {
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -191,16 +191,16 @@
                        IsEnabled="{Binding !IsGameTitleNotNull}"
                        Opacity="{Binding PanelOpacity}"
                        Orientation="Horizontal">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"
+                            Width="250"/>
                        <CheckBox
                            VerticalAlignment="Center"
                            IsChecked="{Binding MatchSystemTime}"
-                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
-                            <TextBlock
-                                VerticalAlignment="Center"
-                                Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
-                                Width="250"/>
-                        </CheckBox>
-                        <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"/>
+                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                    </StackPanel>
                    <Separator />
                    <StackPanel Margin="0,10,0,10"
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs
@@ -1,12 +1,13 @@
 using Avalonia.Controls;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;

 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsSystemView : RyujinxControl<SettingsViewModel>
+    public partial class SettingsSystemView : UserControl
    {
+        public SettingsViewModel ViewModel;
+
        public SettingsSystemView()
        {
            InitializeComponent();
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -6,6 +6,7 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
    mc:Ignorable="d"
    x:DataType="viewModels:SettingsViewModel">
    <Design.DataContext>
@@ -18,265 +19,245 @@
        HorizontalScrollBarVisibility="Disabled"
        VerticalScrollBarVisibility="Auto">
        <Border Classes="settings">
-            <Grid ColumnDefinitions="Auto,Auto,*" HorizontalAlignment="Stretch">
+            <StackPanel
+                Margin="10"
+                HorizontalAlignment="Stretch"
+                Orientation="Vertical"
+                Spacing="10">
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
+                <StackPanel Margin="10,0,0,0" Orientation="Vertical">
+                    <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center"
+                                       ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                       Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                        </StackPanel>
+                    </CheckBox>
+                    <CheckBox 
+                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                        Opacity="{Binding PanelOpacity}"
+                        IsChecked="{Binding ShowConfirmExit}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
+                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                        </StackPanel>
+                    </CheckBox>
+                    <CheckBox 
+                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                        Opacity="{Binding PanelOpacity}"
+                        IsChecked="{Binding RememberWindowState}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
+                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                            </StackPanel>
+                    </CheckBox>
+                    <CheckBox
+                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                        Opacity="{Binding PanelOpacity}"
+                        IsChecked="{Binding ShowTitleBar}" IsVisible="{x:Static helper:RunningPlatform.IsWindows}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowTitleBar}" />
+                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                        </StackPanel>
+                    </CheckBox>
+                    <StackPanel 
+                        Margin="0, 15, 0, 0" 
+                        Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center"
+                                   Text="{ext:Locale SettingsTabGeneralFocusLossType}"
+                                   Width="150" />
+                        <ComboBox SelectedIndex="{Binding FocusLostActionType}"
+                                  HorizontalContentAlignment="Left"
+                                  MinWidth="100">
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
+                            </ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
+                    <StackPanel 
+                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                        Opacity="{Binding PanelOpacity}"
+                        Margin="0, 15, 0, 0" 
+                        Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center"
+                                   Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}"
+                                   Width="150" />
+                        <ComboBox SelectedIndex="{Binding UpdateCheckerType}"
+                                  HorizontalContentAlignment="Left"
+                                  MinWidth="100">
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
+                            </ComboBoxItem>
+                        </ComboBox>
+                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                    </StackPanel>
+                    <StackPanel 
+                        Margin="0, 15, 0, 0" 
+                        Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center"
+                                   Text="{ext:Locale SettingsTabGeneralHideCursor}"
+                                   Width="150" />
+                        <ComboBox SelectedIndex="{Binding HideCursor}"
+                                  HorizontalContentAlignment="Left"
+                                  MinWidth="100">
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
+                            </ComboBoxItem>
+                        </ComboBox>
+                    </StackPanel>
+                    <StackPanel 
+                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                        Opacity="{Binding PanelOpacity}"
+                        Margin="0, 15, 0, 10" 
+                        Orientation="Horizontal">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            Text="{ext:Locale SettingsTabGeneralTheme}"
+                            Width="150" />
+                        <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
+                                  HorizontalContentAlignment="Left"
+                                  MinWidth="100">
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
+                            </ComboBoxItem>
+                        </ComboBox>
+                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                    </StackPanel>
+                </StackPanel>
+                <Separator Height="1" />
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
+                    <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                </StackPanel>
                <StackPanel
-                    Grid.Column="0"
-                    Margin="10"
+                    IsEnabled="{Binding !IsGameTitleNotNull}"
+                    Opacity="{Binding PanelOpacity}"
+                    Margin="10,0,0,0"
                    HorizontalAlignment="Stretch"
                    Orientation="Vertical"
                    Spacing="10">
-                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
-                    <StackPanel Margin="10,0,0,0" Orientation="Vertical">
-                        <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center"
-                                           ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
-                                           Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
-                            </StackPanel>
-                        </CheckBox>
-                        <CheckBox
-                            IsEnabled="{Binding !IsGameTitleNotNull}"
-                            Opacity="{Binding PanelOpacity}"
-                            IsChecked="{Binding ShowConfirmExit}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
-                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                            </StackPanel>
-                        </CheckBox>
-                        <CheckBox
-                            IsEnabled="{Binding !IsGameTitleNotNull}"
-                            Opacity="{Binding PanelOpacity}"
-                            IsChecked="{Binding RememberWindowState}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
-                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                            </StackPanel>
-                        </CheckBox>
-                        <CheckBox
-                            IsEnabled="{Binding !IsGameTitleNotNull}"
-                            Opacity="{Binding PanelOpacity}"
-                            IsChecked="{Binding ShowOldUI}"
-                            ToolTip.Tip="{ext:Locale SettingsTabGeneralShowOldUIToolTip}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralShowOldUI}" />
-                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                            </StackPanel>
-                        </CheckBox>
-                        <StackPanel
-                            Margin="0, 15, 0, 0"
-                            Orientation="Horizontal">
-                            <TextBlock VerticalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralFocusLossType}"
-                                       Width="150" />
-                            <ComboBox SelectedIndex="{Binding FocusLostActionType}"
-                                      HorizontalContentAlignment="Left"
-                                      MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock
-                                        Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
-                                </ComboBoxItem>
-                            </ComboBox>
-                        </StackPanel>
-                        <StackPanel
-                            IsEnabled="{Binding !IsGameTitleNotNull}"
-                            Opacity="{Binding PanelOpacity}"
-                            Margin="0, 15, 0, 0"
-                            Orientation="Horizontal">
-                            <TextBlock VerticalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}"
-                                       Width="150" />
-                            <ComboBox SelectedIndex="{Binding UpdateCheckerType}"
-                                      HorizontalContentAlignment="Left"
-                                      MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock
-                                        Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
-                                </ComboBoxItem>
-                            </ComboBox>
-                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                        </StackPanel>
-                        <StackPanel
-                            Margin="0, 15, 0, 0"
-                            Orientation="Horizontal">
-                            <TextBlock VerticalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralHideCursor}"
-                                       Width="150" />
-                            <ComboBox SelectedIndex="{Binding HideCursor}"
-                                      HorizontalContentAlignment="Left"
-                                      MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
-                                </ComboBoxItem>
-                            </ComboBox>
-                        </StackPanel>
-                        <StackPanel
-                            IsEnabled="{Binding !IsGameTitleNotNull}"
-                            Opacity="{Binding PanelOpacity}"
-                            Margin="0, 15, 0, 10"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                VerticalAlignment="Center"
-                                Text="{ext:Locale SettingsTabGeneralTheme}"
-                                Width="150" />
-                            <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
-                                      HorizontalContentAlignment="Left"
-                                      MinWidth="100">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
-                                </ComboBoxItem>
-                            </ComboBox>
-                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                        </StackPanel>
-                    </StackPanel>
+                    <ListBox
+                        Name="GameDirsList"
+                        MinHeight="120"
+                        ItemsSource="{Binding GameDirectories}">
+                        <ListBox.Styles>
+                            <Style Selector="ListBoxItem">
+                                <Setter Property="Padding" Value="10" />
+                                <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
+                            </Style>
+                        </ListBox.Styles>
+                    </ListBox>
+                    <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
+                        <TextBox
+                            Name="GameDirPathBox"
+                            Margin="0"
+                            ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}"
+                            VerticalAlignment="Stretch" />
+                        <Button
+                            Name="AddGameDirButton"
+                            Grid.Column="1"
+                            MinWidth="90"
+                            Margin="10,0,0,0"
+                            ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
+                            <TextBlock HorizontalAlignment="Center"
+                                       Text="{ext:Locale SettingsTabGeneralAdd}" />
+                        </Button>
+                        <Button
+                            Name="RemoveGameDirButton"
+                            Grid.Column="2"
+                            MinWidth="90"
+                            Margin="10,0,0,0"
+                            ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
+                            Click="RemoveGameDirButton_OnClick">
+                            <TextBlock HorizontalAlignment="Center"
+                                       Text="{ext:Locale SettingsTabGeneralRemove}" />
+                        </Button>
+                    </Grid>
                </StackPanel>
-                <Border Grid.Column="1"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        Margin="10, 10, 10, 0"
-                        Height="405"
-                        BorderBrush="Gray"
-                        Background="Gray"
-                        Width="1" />
-                <StackPanel
-                    Margin="10"
-                    Spacing="10"
-                    Grid.Column="2"
-                    Orientation="Vertical" HorizontalAlignment="Stretch">
+                <Separator Height="1" />
+               <StackPanel Orientation="Vertical" Spacing="5">
                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
-                        <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                    </StackPanel>
-                    <StackPanel
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        Margin="10,0,0,0"
-                        HorizontalAlignment="Stretch"
-                        Orientation="Vertical"
-                        Spacing="10">
-                        <ListBox
-                            Name="GameDirsList"
-                            MinHeight="120"
-                            ItemsSource="{Binding GameDirectories}">
-                            <ListBox.Styles>
-                                <Style Selector="ListBoxItem">
-                                    <Setter Property="Padding" Value="10" />
-                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
-                                </Style>
-                            </ListBox.Styles>
-                        </ListBox>
-                        <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
-                            <TextBox
-                                Name="GameDirPathBox"
-                                Margin="0"
-                                ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}"
-                                VerticalAlignment="Stretch" />
-                            <Button
-                                Name="AddGameDirButton"
-                                Grid.Column="1"
-                                MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
-                                <TextBlock HorizontalAlignment="Center"
-                                           Text="{ext:Locale SettingsTabGeneralAdd}" />
-                            </Button>
-                            <Button
-                                Name="RemoveGameDirButton"
-                                Grid.Column="2"
-                                MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
-                                Click="RemoveGameDirButton_OnClick">
-                                <TextBlock HorizontalAlignment="Center"
-                                           Text="{ext:Locale SettingsTabGeneralRemove}" />
-                            </Button>
-                        </Grid>
-                    </StackPanel>
-                    <Separator Height="1" />
-                    <StackPanel Orientation="Vertical" Spacing="5">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
-                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                        </StackPanel>
-                        <TextBlock Foreground="{DynamicResource SecondaryTextColor}"
-                                   Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
-                    </StackPanel>
-                    <StackPanel
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        Margin="10,0,0,0"
-                        HorizontalAlignment="Stretch"
-                        Orientation="Vertical"
-                        Spacing="10">
-                        <ListBox
-                            Name="AutoloadDirsList"
-                            MinHeight="100"
-                            ItemsSource="{Binding AutoloadDirectories}">
-                            <ListBox.Styles>
-                                <Style Selector="ListBoxItem">
-                                    <Setter Property="Padding" Value="10" />
-                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
-                                </Style>
-                            </ListBox.Styles>
-                        </ListBox>
-                        <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
-                            <TextBox
-                                Name="AutoloadDirPathBox"
-                                Margin="0"
-                                ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}"
-                                VerticalAlignment="Stretch" />
-                            <Button
-                                Name="AddAutoloadDirButton"
-                                Grid.Column="1"
-                                MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
-                                <TextBlock HorizontalAlignment="Center"
-                                           Text="{ext:Locale SettingsTabGeneralAdd}" />
-                            </Button>
-                            <Button
-                                Name="RemoveAutoloadDirButton"
-                                Grid.Column="2"
-                                MinWidth="90"
-                                Margin="10,0,0,0"
-                                ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
-                                Click="RemoveAutoloadDirButton_OnClick">
-                                <TextBlock HorizontalAlignment="Center"
-                                           Text="{ext:Locale SettingsTabGeneralRemove}" />
-                            </Button>
-                        </Grid>
+                        <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
+                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                    </StackPanel>
+                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
                </StackPanel>
-            </Grid>
+                <StackPanel
+                    IsEnabled="{Binding !IsGameTitleNotNull}"
+                    Opacity="{Binding PanelOpacity}"
+                    Margin="10,0,0,0"
+                    HorizontalAlignment="Stretch"
+                    Orientation="Vertical"
+                    Spacing="10">
+                    <ListBox
+                        Name="AutoloadDirsList"
+                        MinHeight="100"
+                        ItemsSource="{Binding AutoloadDirectories}">
+                        <ListBox.Styles>
+                            <Style Selector="ListBoxItem">
+                                <Setter Property="Padding" Value="10" />
+                                <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
+                            </Style>
+                        </ListBox.Styles>
+                    </ListBox>
+                    <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
+                        <TextBox
+                            Name="AutoloadDirPathBox"
+                            Margin="0"
+                            ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}"
+                            VerticalAlignment="Stretch" />
+                        <Button
+                            Name="AddAutoloadDirButton"
+                            Grid.Column="1"
+                            MinWidth="90"
+                            Margin="10,0,0,0"
+                            ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
+                            <TextBlock HorizontalAlignment="Center"
+                                       Text="{ext:Locale SettingsTabGeneralAdd}" />
+                        </Button>
+                        <Button
+                            Name="RemoveAutoloadDirButton"
+                            Grid.Column="2"
+                            MinWidth="90"
+                            Margin="10,0,0,0"
+                            ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
+                            Click="RemoveAutoloadDirButton_OnClick">
+                            <TextBlock HorizontalAlignment="Center"
+                                       Text="{ext:Locale SettingsTabGeneralRemove}" />
+                        </Button>
+                    </Grid>
+                </StackPanel>
+            </StackPanel>
        </Border>
    </ScrollViewer>
 </UserControl>
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs
@@ -3,10 +3,10 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using Gommon;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -14,18 +14,20 @@ using System.Threading.Tasks;

 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsUiView : RyujinxControl<SettingsViewModel>
+    public partial class SettingsUiView : UserControl
    {
+        public SettingsViewModel ViewModel;
+
        public SettingsUiView()
        {
            InitializeComponent();
            AddGameDirButton.Command =
-                Commands.Create(() => AddDirButton(GameDirPathBox, ViewModel.GameDirectories));
+                Commands.Create(() => AddDirButton(GameDirPathBox, ViewModel.GameDirectories, true));
            AddAutoloadDirButton.Command =
-                Commands.Create(() => AddDirButton(AutoloadDirPathBox, ViewModel.AutoloadDirectories));
+                Commands.Create(() => AddDirButton(AutoloadDirPathBox, ViewModel.AutoloadDirectories, false));
        }

-        private async Task AddDirButton(TextBox addDirBox, AvaloniaList<string> directories)
+        private async Task AddDirButton(TextBox addDirBox, AvaloniaList<string> directories, bool isGameList)
        {
            string path = addDirBox.Text;

--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs
@@ -8,6 +8,7 @@ using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
+using System;
 using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;

 namespace Ryujinx.Ava.UI.Views.User
--- a/src/Ryujinx/UI/Views/User/UserRecovererView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserRecovererView.axaml.cs
@@ -1,3 +1,4 @@
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Navigation;
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs
@@ -1,3 +1,4 @@
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
--- a/src/Ryujinx/UI/Views/Dialog/AboutView.axaml
+++ b/src/Ryujinx/UI/Views/Dialog/AboutView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Dialog.AboutView"
+    x:Class="Ryujinx.Ava.UI.Windows.AboutWindow"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
--- a/src/Ryujinx/UI/Views/Dialog/AboutView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/AboutView.axaml.cs
@@ -1,6 +1,8 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
@@ -11,11 +13,11 @@ using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 using Button = Avalonia.Controls.Button;

-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class AboutView : RyujinxControl<AboutWindowViewModel>
+    public partial class AboutWindow : RyujinxControl<AboutWindowViewModel>
    {
-        public AboutView()
+        public AboutWindow()
        {
            InitializeComponent();

@@ -32,7 +34,7 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                PrimaryButtonText = string.Empty,
                SecondaryButtonText = string.Empty,
                CloseButtonText = LocaleManager.Instance[LocaleKeys.UserProfilesClose],
-                Content = new AboutView { ViewModel = viewModel }
+                Content = new AboutWindow { ViewModel = viewModel }
            };

            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());
--- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
+++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
@@ -6,7 +6,6 @@
    xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    mc:Ignorable="d"
    d:DesignWidth="400"
    d:DesignHeight="350"
@@ -24,25 +23,7 @@
        <viewModels:AmiiboWindowViewModel />
    </Design.DataContext>
    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
-        <Grid Name="FlushControls" ColumnDefinitions="Auto,Auto" Grid.Row="1" Margin="-15">
-            <controls:RyujinxLogo 
-                Grid.Column="0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Margin="8, 8, 7, 0"
-                ToolTip.Tip="{ext:WindowTitle Amiibo}" />
-            <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0, 0, 0, 100">
-                <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
-                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
-                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
-                </StackPanel>
-                <StackPanel Margin="15, 0, 0, 0" Spacing="10" Orientation="Horizontal" >
-                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboCharacterLabel}" />
-                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding AmiiboSelectedIndex}" MinWidth="100" ItemsSource="{Binding AmiiboList}" />
-                </StackPanel>
-            </StackPanel>
-        </Grid>
-        <Grid Name="NormalControls" ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
+        <Grid ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
            <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
                <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
                <ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
--- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
@@ -1,14 +1,13 @@
 using Avalonia.Interactivity;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models.Amiibo;
-using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;

 namespace Ryujinx.Ava.UI.Windows
 {
    public partial class AmiiboWindow : StyleableAppWindow
    {
-        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId) : base(true, 40)
+        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId)
        {
            DataContext = ViewModel = new AmiiboWindowViewModel(this, lastScannedAmiiboId, titleId)
            {
@@ -17,9 +16,6 @@ namespace Ryujinx.Ava.UI.Windows

            InitializeComponent();

-            FlushControls.IsVisible = !ConfigurationState.Instance.ShowOldUI;
-            NormalControls.IsVisible = ConfigurationState.Instance.ShowOldUI;
-
            Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
        }

--- a/src/Ryujinx/UI/Windows/CheatWindow.axaml
+++ b/src/Ryujinx/UI/Windows/CheatWindow.axaml
@@ -6,7 +6,6 @@
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    Width="600"
    Height="750"
    MinWidth="500"
@@ -21,81 +20,38 @@
        </Style>
    </Window.Styles>
    <Grid Name="CheatGrid" Margin="15" RowDefinitions="Auto,Auto,Auto,*,Auto" ColumnDefinitions="*,*">
-        <Grid Name="FlushHeader" Grid.Row="1" Column="0" ColumnSpan="2" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="Auto,*,Auto,*">
-            <controls:RyujinxLogo
-                Grid.Row="0"
-                Grid.Column="0"
-                HorizontalAlignment="Left"
-                Margin="-7, -22, 7, 0"
-                Height="28"
-                Width="28"
-                ToolTip.Tip="{ext:WindowTitle CheatWindowTitle}"/>
-            <StackPanel Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2"
-                        Margin="7, -7, 0, 5"
-                        Orientation="Horizontal"
-                        VerticalAlignment="Center"
-                        HorizontalAlignment="Stretch">
-                <TextBlock
-                    MaxWidth="500"
-                    Margin="0,8,5,0"
-                    LineHeight="30"
-                    Text="{ext:Locale BuildId}"
-                    TextAlignment="Center"
-                    TextWrapping="Wrap" />
-                <TextBox
-                    Margin="0,0,0,0"
-                    MinWidth="135"
-                    Text="{Binding BuildId}"
-                    IsReadOnly="True" />
-            </StackPanel>
-            <TextBlock
-                Grid.Row="1"
-                Grid.Column="0"
-                Grid.ColumnSpan="4"
-                MaxWidth="500"
-                Margin="0,10,0,5"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                LineHeight="18"
-                Text="{Binding Heading}"
-                TextAlignment="Center"
-                TextWrapping="Wrap" />
-
-        </Grid>
-        <Grid Name="NormalHeader" Grid.Row="1" Column="0" ColumnSpan="2" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*,*">
-            <TextBlock
-                Grid.Row="1"
-                Grid.Column="0"
-                Grid.ColumnSpan="2"
-                MaxWidth="500"
-                Margin="20,15,20,5"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                LineHeight="18"
-                Text="{Binding Heading}"
-                TextAlignment="Center"
-                TextWrapping="Wrap" />
-            <TextBlock
-                Grid.Row="2"
-                Grid.Column="0"
-                MaxWidth="500"
-                Margin="140,15,20,5"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                LineHeight="30"
-                Text="{ext:Locale BuildId}"
-                TextAlignment="Center"
-                TextWrapping="Wrap" />
-            <TextBox
-                Grid.Row="2"
-                Grid.Column="1"
-                Margin="0,5,110,5"
-                MinWidth="160"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Text="{Binding BuildId}"
-                IsReadOnly="True" />
-        </Grid>
+        <TextBlock
+            Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            MaxWidth="500"
+            Margin="20,15,20,5"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            LineHeight="18"
+            Text="{Binding Heading}"
+            TextAlignment="Center"
+            TextWrapping="Wrap" />
+        <TextBlock
+            Grid.Row="2"
+            Grid.Column="0"
+            MaxWidth="500"
+            Margin="140,15,20,5"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            LineHeight="30"
+            Text="{ext:Locale BuildId}"
+            TextAlignment="Center"
+            TextWrapping="Wrap" />
+        <TextBox
+            Grid.Row="2"
+            Grid.Column="1"
+            Margin="0,5,110,5"
+            MinWidth="160"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Text="{Binding BuildId}"
+            IsReadOnly="True" />
        <Border
            Grid.Row="3"
            Grid.Column="0"
--- a/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Collections;
+using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.Systems.AppLibrary;
@@ -31,7 +32,7 @@ namespace Ryujinx.Ava.UI.Windows
            Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
        }

-        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath) : base(useCustomTitleBar: true, 46)
+        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
        {
            MinWidth = 500;
            MinHeight = 650;
@@ -43,9 +44,6 @@ namespace Ryujinx.Ava.UI.Windows

            InitializeComponent();

-            FlushHeader.IsVisible = !ConfigurationState.Instance.ShowOldUI;
-            NormalHeader.IsVisible = ConfigurationState.Instance.ShowOldUI;
-
            string modsBasePath = ModLoader.GetModsBasePath();
            string titleModsPath = ModLoader.GetApplicationDir(modsBasePath, titleId);
            ulong titleIdValue = ulong.Parse(titleId, NumberStyles.HexNumber);
--- a/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml
+++ b/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml
@@ -7,7 +7,6 @@
             xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
             xmlns:systems="clr-namespace:Ryujinx.Ava.Systems"
             xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
-             xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
             CanResize="False"
             mc:Ignorable="d"
             MinWidth="800"
@@ -19,10 +18,11 @@
    </window:StyleableAppWindow.DataContext>
    <Grid RowDefinitions="Auto,*">
        <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto" Name="FlushControls">
-            <controls:RyujinxLogo 
-                Grid.Column="0"
+            <Image
+                Name="RyuLogo"
                Margin="15, 0, 7, 0"
-                ToolTip.Tip="{ext:WindowTitle CompatibilityListTitle, False}"/>
+                Height="25"
+                Width="25" />
            <TextBox Name="SearchBoxFlush" Grid.Column="1" Margin="0, 5, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermarkWithCount}" TextChanged="TextBox_OnTextChanged" />
            <CheckBox Grid.Column="2" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
            <TextBlock Grid.Column="3" Padding="0, 0, 138, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
@@ -40,7 +40,7 @@
                        <DataTemplate DataType="{x:Type systems:CompatibilityEntry}">
                            <Grid MinWidth="800"
                                  Margin="10"
-                                  ColumnDefinitions="Auto,Auto,Auto,*"
+                                  ColumnDefinitions="*,Auto,Auto,*"
                                  Background="Transparent"
                                  ToolTip.Tip="{Binding  LocalizedLastUpdated}">
                                <TextBlock Grid.Column="0"
--- a/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml.cs
@@ -1,33 +1,37 @@
 using Avalonia.Controls;
+using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
+using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Windows;
 using System.Threading.Tasks;

 namespace Ryujinx.Ava.UI.Windows
 {
    public partial class CompatibilityListWindow : StyleableAppWindow
    {
-        public static async Task Show(string titleId = null)
-        {
-            using CompatibilityViewModel compatWindow = new(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary);
-            
-            await ShowAsync(new CompatibilityListWindow
+        public static Task Show(string titleId = null) =>
+            ShowAsync(new CompatibilityListWindow
            {
-                DataContext = compatWindow,
+                DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary),
                SearchBoxFlush = { Text = titleId ?? string.Empty },
                SearchBoxNormal = { Text = titleId ?? string.Empty }
            });
-        }

-        public CompatibilityListWindow() : base(useCustomTitleBar: true, 37)
+        public CompatibilityListWindow() : base(useCustomTitleBar: true)
        {
            Title = RyujinxApp.FormatTitle(LocaleKeys.CompatibilityListTitle);
            
-            InitializeComponent();
+            TitleBar.Height = 37;
            
-            FlushControls.IsVisible = !ConfigurationState.Instance.ShowOldUI;
-            NormalControls.IsVisible = ConfigurationState.Instance.ShowOldUI;
+            InitializeComponent();
+
+            RyuLogo.Source = MainWindowViewModel.IconBitmap;
+            FlushControls.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
+            NormalControls.IsVisible = ConfigurationState.Instance.ShowTitleBar;
        }

        // ReSharper disable once UnusedMember.Local
--- a/src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml
+++ b/src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Dialog.DownloadableContentManagerView"
+    x:Class="Ryujinx.Ava.UI.Windows.DownloadableContentManagerWindow"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
--- a/src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml.cs
@@ -6,16 +6,26 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;

-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class DownloadableContentManagerView : RyujinxControl<DownloadableContentManagerViewModel>
+    public partial class DownloadableContentManagerWindow : UserControl
    {
-        public DownloadableContentManagerView()
+        public DownloadableContentManagerViewModel ViewModel;
+
+        public DownloadableContentManagerWindow()
        {
+            DataContext = this;
+
+            InitializeComponent();
+        }
+
+        public DownloadableContentManagerWindow(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
+        {
+            DataContext = ViewModel = new DownloadableContentManagerViewModel(applicationLibrary, applicationData);
+
            InitializeComponent();
        }

@@ -26,11 +36,8 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                PrimaryButtonText = string.Empty,
                SecondaryButtonText = string.Empty,
                CloseButtonText = string.Empty,
+                Content = new DownloadableContentManagerWindow(applicationLibrary, applicationData),
                Title = string.Format(LocaleManager.Instance[LocaleKeys.DlcWindowTitle], applicationData.Name, applicationData.IdBaseString),
-                Content = new DownloadableContentManagerView
-                {
-                    ViewModel = new DownloadableContentManagerViewModel(applicationLibrary, applicationData)
-                }
            };

            Style bottomBorder = new(x => x.OfType<Grid>().Name("DialogSpace").Child().OfType<Border>());
--- a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
@@ -13,7 +13,7 @@
    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
    Width="1100"
    Height="910"
-    MinWidth="1037"
+    MinWidth="800"
    MinHeight="480"
    WindowStartupLocation="CenterOwner"
    x:DataType="viewModels:SettingsViewModel"
--- a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
@@ -1,9 +1,25 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Input;
+using Avalonia.Media.Imaging;
+using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
+using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Ava.Utilities;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Common.Configuration;
+using Ryujinx.HLE.FileSystem;
+using Ryujinx.HLE.HOS.SystemState;
+using Ryujinx.Input;
 using System;
+using System.IO;
 using System.Linq;
+using Key = Avalonia.Input.Key;


 namespace Ryujinx.Ava.UI.Windows
--- a/src/Ryujinx/UI/Windows/IconColorPicker.cs
+++ b/src/Ryujinx/UI/Windows/IconColorPicker.cs
@@ -2,9 +2,9 @@ using SkiaSharp;
 using System;
 using System.Collections.Generic;

-namespace Ryujinx.Ava.UI.Helpers
+namespace Ryujinx.Ava.UI.Windows
 {
-    public static class IconColorPicker
+    static class IconColorPicker
    {
        private const int ColorsPerLine = 64;
        private const int TotalColors = ColorsPerLine * ColorsPerLine;
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -7,12 +7,13 @@ using Avalonia.Platform;
 using Avalonia.Threading;
 using DynamicData;
 using FluentAvalonia.UI.Controls;
+using FluentAvalonia.UI.Windowing;
 using Gommon;
 using LibHac.Ns;
+using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Applet;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
@@ -96,7 +97,7 @@ namespace Ryujinx.Ava.UI.Windows
            TitleBar.Height = MenuBarHeight;
            
            // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
-            TitleBarHeight = (ConfigurationState.Instance.ShowOldUI ? TitleBar.Height : 0);
+            TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);

            ApplicationList.DataContext = DataContext;
            ApplicationGrid.DataContext = DataContext;
--- a/src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml
+++ b/src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml
@@ -10,7 +10,7 @@
    Width="500"
    Height="380"
    mc:Ignorable="d"
-    x:Class="Ryujinx.Ava.UI.Views.Dialog.ModManagerView"
+    x:Class="Ryujinx.Ava.UI.Windows.ModManagerWindow"
    x:CompileBindings="True"
    x:DataType="viewModels:ModManagerViewModel"
    Focusable="True">
--- a/src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml.cs
@@ -7,17 +7,27 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 using Button = Avalonia.Controls.Button;

-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class ModManagerView : RyujinxControl<ModManagerViewModel>
+    public partial class ModManagerWindow : UserControl
    {
-        public ModManagerView()
+        public readonly ModManagerViewModel ViewModel;
+
+        public ModManagerWindow()
        {
+            DataContext = this;
+
+            InitializeComponent();
+        }
+
+        public ModManagerWindow(ulong titleId, ulong titleIdBase, ApplicationLibrary applicationLibrary)
+        {
+            DataContext = ViewModel = new ModManagerViewModel(titleId, titleIdBase, applicationLibrary);
+
            InitializeComponent();
        }

@@ -28,10 +38,7 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                PrimaryButtonText = string.Empty,
                SecondaryButtonText = string.Empty,
                CloseButtonText = string.Empty,
-                Content = new ModManagerView
-                {
-                    ViewModel = new ModManagerViewModel(titleId, titleIdBase, appLibrary)
-                },
+                Content = new ModManagerWindow(titleId, titleIdBase, appLibrary),
                Title = string.Format(LocaleManager.Instance[LocaleKeys.ModWindowTitle], titleName, titleId.ToString("X16")),
            };

--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
@@ -11,11 +11,10 @@
    xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    Width="1100"
-    MinWidth="844"
+    Height="927"
+    MinWidth="800"
    MinHeight="480"
-    Title="{ext:WindowTitle Settings}"
    WindowStartupLocation="CenterOwner"
    x:DataType="viewModels:SettingsViewModel"
    mc:Ignorable="d"
@@ -23,20 +22,13 @@
    <Design.DataContext>
        <viewModels:SettingsViewModel />
    </Design.DataContext>
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600" RowDefinitions="Auto,Auto,*,Auto">
-        <StackPanel Grid.Row="0" Orientation="Horizontal">
-            <controls:RyujinxLogo
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Margin="7, 7, 7, 0"
-                ToolTip.Tip="{ext:WindowTitle Settings}"/>
-        </StackPanel>
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600" RowDefinitions="Auto,*,Auto">
        <ContentPresenter
            x:Name="ContentPresenter"
-            Grid.Row="2"
+            Grid.Row="1"
            IsVisible="False"
            KeyboardNavigation.IsTabStop="False"/>
-        <Grid Name="Pages" IsVisible="False" Grid.Row="3">
+        <Grid Name="Pages" IsVisible="False" Grid.Row="2">
            <settings:SettingsUiView Name="UiPage" />
            <settings:SettingsInputView Name="InputPage" />
            <settings:SettingsHotkeysView Name="HotkeysPage" />
@@ -49,11 +41,12 @@
            <settings:SettingsHacksView Name="HacksPage" />
        </Grid>
        <ui:NavigationView
-            Grid.Row="2"
+            Grid.Row="1"
            IsSettingsVisible="False"
            Name="NavPanel"
            IsBackEnabled="False"
-            Margin="10,10,10,0"
+            PaneDisplayMode="Left"
+            Margin="2,10,10,0"
            VerticalAlignment="Stretch"
            HorizontalAlignment="Stretch"
            OpenPaneLength="200">
@@ -115,7 +108,7 @@
                </Style>
            </ui:NavigationView.Styles>
        </ui:NavigationView>
-        <Grid Grid.Row="3"
+        <Grid Grid.Row="2"
              ColumnDefinitions="Auto,*,Auto">
            <StackPanel Grid.Column="0" Orientation="Horizontal">
                <Button
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.Input;
@@ -14,7 +13,7 @@ namespace Ryujinx.Ava.UI.Windows
    {
        internal readonly SettingsViewModel ViewModel;

-        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : base(true)
+        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
        {
            Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);

@@ -24,16 +23,6 @@ namespace Ryujinx.Ava.UI.Windows
            ViewModel.SaveSettingsEvent += SaveSettings;

            InitializeComponent();
-
-            NavPanel.PaneDisplayMode =
-                ConfigurationState.Instance.ShowOldUI
-                    ? NavigationViewPaneDisplayMode.Left
-                    : NavigationViewPaneDisplayMode.Top;
-
-            Height = ConfigurationState.Instance.ShowOldUI
-                ? 906
-                : 954; // nav panel is put on top with custom title bar so account for new height
-            
            Load();
        }

--- a/src/Ryujinx/UI/Windows/StyleableWindow.cs
+++ b/src/Ryujinx/UI/Windows/StyleableWindow.cs
@@ -7,7 +7,7 @@ using Avalonia.Platform;
 using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Controls;
+using Ryujinx.Ava.UI.ViewModels;
 using System.Threading.Tasks;

 namespace Ryujinx.Ava.UI.Windows
@@ -22,7 +22,7 @@ namespace Ryujinx.Ava.UI.Windows
            await appWindow.ShowDialog(owner ?? RyujinxApp.MainWindow);
        }
        
-        protected StyleableAppWindow(bool useCustomTitleBar = false, double? titleBarHeight = null)
+        protected StyleableAppWindow(bool useCustomTitleBar = false)
        {
            WindowStartupLocation = WindowStartupLocation.CenterOwner;
            TransparencyLevelHint = [WindowTransparencyLevel.None];
@@ -32,14 +32,11 @@ namespace Ryujinx.Ava.UI.Windows

            if (useCustomTitleBar)
            {
-                TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowOldUI;
-                TitleBar.TitleBarHitTestType = ConfigurationState.Instance.ShowOldUI ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
-                
-                if (TitleBar.ExtendsContentIntoTitleBar && titleBarHeight != null)
-                    TitleBar.Height = titleBarHeight.Value;
+                TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
+                TitleBar.TitleBarHitTestType = ConfigurationState.Instance.ShowTitleBar ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
            }

-            Icon = RyujinxLogo.Bitmap;
+            Icon = MainWindowViewModel.IconBitmap;
        }

        private void LocaleChanged()
@@ -73,7 +70,7 @@ namespace Ryujinx.Ava.UI.Windows
            LocaleManager.Instance.LocaleChanged += LocaleChanged;
            LocaleChanged();

-            Icon = new WindowIcon(RyujinxLogo.Bitmap);
+            Icon = new WindowIcon(MainWindowViewModel.IconBitmap);
        }

        private void LocaleChanged()
--- a/src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml
+++ b/src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Dialog.TitleUpdateManagerView"
+    x:Class="Ryujinx.Ava.UI.Windows.TitleUpdateWindow"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
--- a/src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml.cs
@@ -6,16 +6,26 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;

-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class TitleUpdateManagerView : RyujinxControl<TitleUpdateViewModel>
+    public partial class TitleUpdateWindow : UserControl
    {
-        public TitleUpdateManagerView()
+        public readonly TitleUpdateViewModel ViewModel;
+
+        public TitleUpdateWindow()
        {
+            DataContext = this;
+
+            InitializeComponent();
+        }
+
+        public TitleUpdateWindow(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
+        {
+            DataContext = ViewModel = new TitleUpdateViewModel(applicationLibrary, applicationData);
+
            InitializeComponent();
        }

@@ -26,11 +36,8 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                PrimaryButtonText = string.Empty,
                SecondaryButtonText = string.Empty,
                CloseButtonText = string.Empty,
+                Content = new TitleUpdateWindow(applicationLibrary, applicationData),
                Title = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.GameUpdateWindowHeading, applicationData.Name, applicationData.IdBaseString),
-                Content = new TitleUpdateManagerView
-                {
-                    ViewModel = new TitleUpdateViewModel(applicationLibrary, applicationData)
-                }
            };

            Style bottomBorder = new(x => x.OfType<Grid>().Name("DialogSpace").Child().OfType<Border>());
--- a/src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml
+++ b/src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Dialog.XciTrimmerView"
+    x:Class="Ryujinx.Ava.UI.Windows.XCITrimmerWindow"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -10,7 +10,7 @@
    xmlns:models="clr-namespace:Ryujinx.Ava.Common.Models"
    Width="700"
    Height="600"
-    x:DataType="viewModels:XciTrimmerViewModel"
+    x:DataType="viewModels:XCITrimmerViewModel"
    Focusable="True"
    mc:Ignorable="d">    
    <Grid Margin="20 0 20 0" RowDefinitions="Auto,Auto,*,Auto,Auto">
@@ -151,7 +151,7 @@
                                        HorizontalAlignment="Stretch"
                                        VerticalAlignment="Center"
                                        CornerRadius="5"
-                                        IsVisible="{Binding $parent[UserControl].((viewModels:XciTrimmerViewModel)DataContext).Processing}"
+                                        IsVisible="{Binding $parent[UserControl].((viewModels:XCITrimmerViewModel)DataContext).Processing}"
                                        Maximum="100"
                                        Minimum="0"
                                        Value="{Binding PercentageProgress}" />
--- a/src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml.cs
@@ -4,17 +4,27 @@ using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using System;
 using System.Threading.Tasks;

-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class XciTrimmerView : RyujinxControl<XciTrimmerViewModel>
+    public partial class XCITrimmerWindow : UserControl
    {
-        public XciTrimmerView()
+        public XCITrimmerViewModel ViewModel;
+
+        public XCITrimmerWindow()
        {
+            DataContext = this;
+
+            InitializeComponent();
+        }
+
+        public XCITrimmerWindow(MainWindowViewModel mainWindowViewModel)
+        {
+            DataContext = ViewModel = new XCITrimmerViewModel(mainWindowViewModel);
+
            InitializeComponent();
        }

@@ -25,10 +35,7 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                PrimaryButtonText = string.Empty,
                SecondaryButtonText = string.Empty,
                CloseButtonText = string.Empty,
-                Content = new XciTrimmerView
-                {
-                    ViewModel = new XciTrimmerViewModel(RyujinxApp.MainWindow.ViewModel)
-                },
+                Content = new XCITrimmerWindow(RyujinxApp.MainWindow.ViewModel),
                Title = LocaleManager.Instance[LocaleKeys.XCITrimmerWindowTitle]
            };

@@ -63,7 +70,7 @@ namespace Ryujinx.Ava.UI.Views.Dialog
        public void Sort_Checked(object sender, RoutedEventArgs args)
        {
            if (sender is RadioButton { Tag: string sortField })
-                ViewModel.SortingField = Enum.Parse<XciTrimmerViewModel.SortField>(sortField);
+                ViewModel.SortingField = Enum.Parse<XCITrimmerViewModel.SortField>(sortField);
        }

        public void Order_Checked(object sender, RoutedEventArgs args)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
WilliamWsyHK	d1d9c34443	Merge `e36f6527b7` into `7bdf013ba6`	2025-03-05 15:57:15 +00:00
WilliamWsyHK	e36f6527b7	Unify "Enable"	2025-03-01 18:30:08 +08:00
WilliamWsyHK	8891559823	Update TChinese translation	2025-03-01 18:28:09 +08:00