Merge branch 'master' into ffmpeg-win-arm64

Disable trimming on win-arm64
* nuget: Bump System group to 9.0.2 * Clean up RuntimeIdentifiers in project files
2025-12-05 07:22:28 -05:00 · 2025-03-02 18:41:17 -06:00 · 2025-02-26 15:38:40 -06:00 · 2025-02-26 15:38:40 -06:00 · 2025-02-26 15:38:40 -06:00
182 changed files with 1797 additions and 2079 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,7 @@ 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,6 +62,7 @@ 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) |
@@ -79,6 +80,7 @@ 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:
@@ -122,7 +124,6 @@ jobs:
        if: matrix.platform.os == 'windows-latest'
        run: |
          pushd publish
-          rm libarmeilleure-jitsupport.dylib
          7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd
        shell: bash
@@ -131,7 +132,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-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
          popd
--- 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,6 +65,7 @@ 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:
@@ -93,7 +93,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

@@ -108,7 +108,6 @@ jobs:
        if: matrix.platform.os == 'windows-latest'
        run: |
          pushd publish
-          rm libarmeilleure-jitsupport.dylib
          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
          popd
        shell: bash
@@ -174,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
@@ -223,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" Version="5.0.3-build14" />
+    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
    <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.0" />
-    <PackageVersion Include="System.Management" Version="9.0.0" />
+    <PackageVersion Include="System.IO.Hashing" Version="9.0.2" />
+    <PackageVersion Include="System.Management" Version="9.0.2" />
    <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/ryuassets/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/ARMeilleure/ARMeilleure.csproj
+++ b/src/ARMeilleure/ARMeilleure.csproj
@@ -11,7 +11,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ContentWithTargetPath Include="Native\libs\libarmeilleure-jitsupport.dylib" Condition="'$(RuntimeIdentifier)' == '' OR '$(RuntimeIdentifier)' == 'osx-arm64'">
+    <ContentWithTargetPath Include="Native\libs\libarmeilleure-jitsupport.dylib" Condition="'$(RuntimeIdentifier)' == 'osx-arm64'">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <TargetPath>libarmeilleure-jitsupport.dylib</TargetPath>
    </ContentWithTargetPath>
--- 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</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;win-arm64;osx-arm64;linux-arm64</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'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dll" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'">
      <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'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dylib" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <TargetPath>libsoundio.dylib</TargetPath>
    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.so" Condition="'$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64'">
+    <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'">
      <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/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.Graphics.GAL/IRenderer.cs
+++ b/src/Ryujinx.Graphics.GAL/IRenderer.cs
@@ -1,6 +1,4 @@
 using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.GAL.Multithreading;
 using System;
 using System.Threading;

@@ -12,20 +10,6 @@ namespace Ryujinx.Graphics.GAL

        bool PreferThreading { get; }

-        public IRenderer TryMakeThreaded(BackendThreading backendThreading = BackendThreading.Auto)
-        {
-            if (backendThreading is BackendThreading.On ||
-                (backendThreading is BackendThreading.Auto && PreferThreading))
-            {
-                Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({backendThreading}): True");
-                return new ThreadedRenderer(this);
-            }
-            
-            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({backendThreading}): False");
-
-            return this;
-        }
-
        IPipeline Pipeline { get; }

        IWindow Window { get; }
--- 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, 59) },
-            { AvUtilLibraryName, (56, 57) },
+            { AvCodecLibraryName, (58, 61) },
+            { AvUtilLibraryName, (56, 59) },
        };

        private static string FormatLibraryNameForCurrentOs(string libraryName, int version)
--- a/src/Ryujinx.HLE/HLEConfiguration.cs
+++ b/src/Ryujinx.HLE/HLEConfiguration.cs
@@ -15,55 +15,55 @@ namespace Ryujinx.HLE
    /// <summary>
    /// HLE configuration.
    /// </summary>
-    public class HleConfiguration
+    public class HLEConfiguration
    {
        /// <summary>
        /// The virtual file system used by the FS service.
        /// </summary>
        /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal VirtualFileSystem VirtualFileSystem { get; private set; }
+        internal readonly VirtualFileSystem VirtualFileSystem;

        /// <summary>
        /// The manager for handling a LibHac Horizon instance.
        /// </summary>
        /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal LibHacHorizonManager LibHacHorizonManager { get; private set; }
+        internal readonly LibHacHorizonManager LibHacHorizonManager;

        /// <summary>
        /// The account manager used by the account service.
        /// </summary>
        /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal AccountManager AccountManager { get; private set; }
+        internal readonly AccountManager AccountManager;

        /// <summary>
        /// The content manager used by the NCM service.
        /// </summary>
        /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal ContentManager ContentManager { get; private set; }
+        internal readonly ContentManager ContentManager;

        /// <summary>
        /// The persistent information between run for multi-application capabilities.
        /// </summary>
        /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        public UserChannelPersistence UserChannelPersistence { get; private set; }
+        public readonly UserChannelPersistence UserChannelPersistence;

        /// <summary>
        /// The GPU renderer to use for all GPU operations.
        /// </summary>
        /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal IRenderer GpuRenderer { get; private set; }
+        internal readonly IRenderer GpuRenderer;

        /// <summary>
        /// The audio device driver to use for all audio operations.
        /// </summary>
        /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal IHardwareDeviceDriver AudioDeviceDriver { get; private set; }
+        internal readonly IHardwareDeviceDriver AudioDeviceDriver;

        /// <summary>
        /// The handler for various UI related operations needed outside of HLE.
        /// </summary>
        /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal IHostUIHandler HostUIHandler { get; private set; }
+        internal readonly IHostUIHandler HostUIHandler;

        /// <summary>
        /// Control the memory configuration used by the emulation context.
@@ -195,7 +195,15 @@ namespace Ryujinx.HLE
        /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
        public EnabledDirtyHack[] Hacks { internal get; set; }

-        public HleConfiguration(MemoryConfiguration memoryConfiguration,
+        public HLEConfiguration(VirtualFileSystem virtualFileSystem,
+                                LibHacHorizonManager libHacHorizonManager,
+                                ContentManager contentManager,
+                                AccountManager accountManager,
+                                UserChannelPersistence userChannelPersistence,
+                                IRenderer gpuRenderer,
+                                IHardwareDeviceDriver audioDeviceDriver,
+                                MemoryConfiguration memoryConfiguration,
+                                IHostUIHandler hostUIHandler,
                                SystemLanguage systemLanguage,
                                RegionCode region,
                                VSyncMode vSyncMode,
@@ -219,7 +227,15 @@ namespace Ryujinx.HLE
                                int customVSyncInterval,
                                EnabledDirtyHack[] dirtyHacks = null)
        {
+            VirtualFileSystem = virtualFileSystem;
+            LibHacHorizonManager = libHacHorizonManager;
+            AccountManager = accountManager;
+            ContentManager = contentManager;
+            UserChannelPersistence = userChannelPersistence;
+            GpuRenderer = gpuRenderer;
+            AudioDeviceDriver = audioDeviceDriver;
            MemoryConfiguration = memoryConfiguration;
+            HostUIHandler = hostUIHandler;
            SystemLanguage = systemLanguage;
            Region = region;
            VSyncMode = vSyncMode;
@@ -243,30 +259,5 @@ namespace Ryujinx.HLE
            MultiplayerLdnServer = multiplayerLdnServer;
            Hacks = dirtyHacks ?? [];
        }
-
-        /// <summary>
-        /// Set the pre-configured services to use for this <see cref="HleConfiguration"/> instance.
-        /// </summary>
-        public HleConfiguration Configure(
-            VirtualFileSystem virtualFileSystem,
-            LibHacHorizonManager libHacHorizonManager,
-            ContentManager contentManager,
-            AccountManager accountManager,
-            UserChannelPersistence userChannelPersistence,
-            IRenderer gpuRenderer,
-            IHardwareDeviceDriver audioDeviceDriver,
-            IHostUIHandler hostUIHandler
-        )
-        {
-            VirtualFileSystem = virtualFileSystem;
-            LibHacHorizonManager = libHacHorizonManager;
-            AccountManager = accountManager;
-            ContentManager = contentManager;
-            UserChannelPersistence = userChannelPersistence;
-            GpuRenderer = gpuRenderer;
-            AudioDeviceDriver = audioDeviceDriver;
-            HostUIHandler = hostUIHandler;
-            return this;
-        }
    }
 }
--- a/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnMitm/LdnMitmClient.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnMitm/LdnMitmClient.cs
@@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnMitm

        private readonly LanDiscovery _lanDiscovery;

-        public LdnMitmClient(HleConfiguration config)
+        public LdnMitmClient(HLEConfiguration config)
        {
            UnicastIPAddressInformation localIpInterface = NetworkHelpers.GetLocalInterface(config.MultiplayerLanInterfaceId).Item2;

--- a/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/LdnMasterProxyClient.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/LdnMasterProxyClient.cs
@@ -51,13 +51,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
        private string _passphrase;
        private byte[] _gameVersion = new byte[0x10];

-        private readonly HleConfiguration _config;
+        private readonly HLEConfiguration _config;

        public event EventHandler<NetworkChangeEventArgs> NetworkChange;

        public ProxyConfig Config { get; private set; }

-        public LdnMasterProxyClient(string address, int port, HleConfiguration config) : base(address, port)
+        public LdnMasterProxyClient(string address, int port, HLEConfiguration config) : base(address, port)
        {
            if (ProxyHelpers.SupportsNoDelay())
            {
--- 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/Switch.cs
+++ b/src/Ryujinx.HLE/Switch.cs
@@ -20,7 +20,7 @@ namespace Ryujinx.HLE
    {
        public static Switch Shared { get; private set; }
        
-        public HleConfiguration Configuration { get; }
+        public HLEConfiguration Configuration { get; }
        public IHardwareDeviceDriver AudioDeviceDriver { get; }
        public MemoryBlock Memory { get; }
        public GpuContext Gpu { get; }
@@ -44,7 +44,7 @@ namespace Ryujinx.HLE

        public DirtyHacks DirtyHacks { get; }

-        public Switch(HleConfiguration configuration)
+        public Switch(HLEConfiguration configuration)
        {
            ArgumentNullException.ThrowIfNull(configuration.GpuRenderer);
            ArgumentNullException.ThrowIfNull(configuration.AudioDeviceDriver);
@@ -94,20 +94,16 @@ namespace Ryujinx.HLE
            Gpu.GPFifo.DispatchCalls();
        }

-        public int IncrementCustomVSyncInterval()
+        public void IncrementCustomVSyncInterval()
        {
            CustomVSyncInterval += 1;
            UpdateVSyncInterval();
-
-            return CustomVSyncInterval;
        }

-        public int DecrementCustomVSyncInterval()
+        public void DecrementCustomVSyncInterval()
        {
            CustomVSyncInterval -= 1;
            UpdateVSyncInterval();
-
-            return CustomVSyncInterval;
        }

        public void UpdateVSyncInterval()
--- a/src/Ryujinx/Systems/AppHost.cs
+++ b/src/Ryujinx/Systems/AppHost.cs
@@ -6,6 +6,7 @@ using Avalonia.Threading;
 using DiscordRPC;
 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;
@@ -20,8 +21,8 @@ using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -34,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;
@@ -59,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
    {
@@ -467,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);
@@ -869,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");
        }

@@ -878,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");
        }

@@ -899,19 +902,53 @@ namespace Ryujinx.Ava.Systems
                _ => new OpenGLRenderer()
            };

+            BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
+
+            bool isGALThreaded = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
+            if (isGALThreaded)
+            {
+                renderer = new ThreadedRenderer(renderer);
+            }
+
+            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({threadingMode}): {isGALThreaded}");
+
            // Initialize Configuration.
-            Device = new Switch(ConfigurationState.Instance.CreateHleConfiguration()
-                .Configure(
-                    VirtualFileSystem,
-                    _viewModel.LibHacHorizonManager,
-                    ContentManager,
-                    _accountManager,
-                    _userChannelPersistence,
-                    renderer.TryMakeThreaded(ConfigurationState.Instance.Graphics.BackendThreading),
-                    InitializeAudio(),
-                    _viewModel.UiHandler
-                )
-            );
+            MemoryConfiguration memoryConfiguration = ConfigurationState.Instance.System.DramSize.Value;
+
+            Device = new Switch(new HLEConfiguration(
+                VirtualFileSystem,
+                _viewModel.LibHacHorizonManager,
+                ContentManager,
+                _accountManager,
+                _userChannelPersistence,
+                renderer,
+                InitializeAudio(),
+                memoryConfiguration,
+                _viewModel.UiHandler,
+                (SystemLanguage)ConfigurationState.Instance.System.Language.Value,
+                (RegionCode)ConfigurationState.Instance.System.Region.Value,
+                ConfigurationState.Instance.Graphics.VSyncMode,
+                ConfigurationState.Instance.System.EnableDockedMode,
+                ConfigurationState.Instance.System.EnablePtc,
+                ConfigurationState.Instance.System.EnableInternetAccess,
+                ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                ConfigurationState.Instance.System.FsGlobalAccessLogMode,
+                ConfigurationState.Instance.System.MatchSystemTime 
+                    ? 0 
+                    : ConfigurationState.Instance.System.SystemTimeOffset,
+                ConfigurationState.Instance.System.TimeZone,
+                ConfigurationState.Instance.System.MemoryManagerMode,
+                ConfigurationState.Instance.System.IgnoreMissingServices,
+                ConfigurationState.Instance.Graphics.AspectRatio,
+                ConfigurationState.Instance.System.AudioVolume,
+                ConfigurationState.Instance.System.UseHypervisor,
+                ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value,
+                ConfigurationState.Instance.Multiplayer.Mode,
+                ConfigurationState.Instance.Multiplayer.DisableP2p,
+                ConfigurationState.Instance.Multiplayer.LdnPassphrase,
+                ConfigurationState.Instance.Multiplayer.GetLdnServer(),
+                ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value,
+                ConfigurationState.Instance.Hacks.ShowDirtyHacks ? ConfigurationState.Instance.Hacks.EnabledHacks : null));
        }

        private static IHardwareDeviceDriver InitializeAudio()
@@ -1145,9 +1182,6 @@ namespace Ryujinx.Ava.Systems

        private void UpdateShaderCount()
        {
-            if (_displayCount is 0 && _renderer.ProgramCount is 0)
-                return;
-            
            // If there is a mismatch between total program compile and previous count
            // this means new shaders have been compiled and should be displayed.
            if (_renderer.ProgramCount != _previousCount)
@@ -1221,10 +1255,12 @@ namespace Ryujinx.Ava.Systems
                            VSyncModeToggle();
                            break;
                        case KeyboardHotkeyState.CustomVSyncIntervalDecrement:
-                            _viewModel.CustomVSyncInterval = Device.DecrementCustomVSyncInterval();
+                            Device.DecrementCustomVSyncInterval();
+                            _viewModel.CustomVSyncInterval -= 1;
                            break;
                        case KeyboardHotkeyState.CustomVSyncIntervalIncrement:
-                            _viewModel.CustomVSyncInterval = Device.IncrementCustomVSyncInterval();
+                            Device.IncrementCustomVSyncInterval();
+                            _viewModel.CustomVSyncInterval += 1;
                            break;
                        case KeyboardHotkeyState.Screenshot:
                            ScreenshotRequested = true;
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -440,7 +440,7 @@
        <x:Double x:Key="ControlContentThemeFontSize">13</x:Double>
        <x:Double x:Key="MenuItemHeight">26</x:Double>
        <x:Double x:Key="TabItemMinHeight">28</x:Double>
-        <x:Double x:Key="ContentDialogMaxWidth">700</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
        <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
    </Styles.Resources>
 </Styles>
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -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": "Розширення файлу",
@@ -2767,8 +2767,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Створити користувацьку конфігурацію",
-        "zh_CN": "创建自定义设置",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -2792,8 +2792,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Редагувати користувацьку конфігурацію",
-        "zh_CN": "编辑自定义设置",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -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": "為當前遊戲創建獨立的配置"
      }
@@ -2867,8 +2867,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Відредагувати наявну індивідуальну конфігурацію для цієї гри.",
-        "zh_CN": "编辑选定游戏的现存独立配置",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -3442,7 +3442,7 @@
        "sv_SE": "Användargränssnitt",
        "th_TH": "หน้าจอผู้ใช้",
        "tr_TR": "Kullancı Arayüzü",
-        "uk_UA": "Інтерфейс",
+        "uk_UA": "Інтерфейс користувача",
        "zh_CN": "用户界面",
        "zh_TW": "使用者介面"
      }
@@ -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": "",
-        "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": "",
-        "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": "",
-        "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": ""
      }
@@ -7264,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": "Кнопки",
@@ -8467,7 +8442,7 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "LED-підсвітка",
+        "uk_UA": "",
        "zh_CN": "",
        "zh_TW": ""
      }
@@ -8492,7 +8467,7 @@
        "sv_SE": "Inaktivera",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Вимкнути",
+        "uk_UA": "",
        "zh_CN": "关闭",
        "zh_TW": ""
      }
@@ -8517,7 +8492,7 @@
        "sv_SE": "Regnbåge",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Веселка",
+        "uk_UA": "",
        "zh_CN": "彩虹",
        "zh_TW": ""
      }
@@ -8542,7 +8517,7 @@
        "sv_SE": "Regnbågshastighet",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Швидкість зміни кольорів",
+        "uk_UA": "",
        "zh_CN": "彩虹滚动速度",
        "zh_TW": ""
      }
@@ -9167,7 +9142,7 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "Esc",
-        "uk_UA": "Esc",
+        "uk_UA": "",
        "zh_CN": "Esc",
        "zh_TW": "Esc 鍵"
      }
@@ -10867,7 +10842,7 @@
        "sv_SE": "Diverse",
        "th_TH": "",
        "tr_TR": "Diğer",
-        "uk_UA": "Інше",
+        "uk_UA": "",
        "zh_CN": "截图键",
        "zh_TW": "其他按鍵"
      }
@@ -14914,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": "Багатопотоковість графічного сервера:",
@@ -17692,7 +17667,7 @@
        "sv_SE": "Ändra ljudvolym",
        "th_TH": "ปรับระดับเสียง",
        "tr_TR": "Ses seviyesini değiştirir",
-        "uk_UA": "Регулювання гучності",
+        "uk_UA": "Змінити гучність звуку",
        "zh_CN": "调节音量",
        "zh_TW": "調節音量"
      }
@@ -18714,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": "Необрізані",
@@ -19592,7 +19567,7 @@
        "sv_SE": "Alla tangentbord",
        "th_TH": "คีย์บอร์ดทั้งหมด",
        "tr_TR": "Tüm Klavyeler",
-        "uk_UA": "Усі клавіатури",
+        "uk_UA": "Всі клавіатури",
        "zh_CN": "所有键盘",
        "zh_TW": "所有鍵盤"
      }
@@ -19742,7 +19717,7 @@
        "sv_SE": "Snabbtangenter för tangentbord",
        "th_TH": "ปุ่มลัดของคีย์บอร์ด",
        "tr_TR": "Klavye Kısayolları",
-        "uk_UA": "Гарячі клавіші",
+        "uk_UA": "Гарячі клавіші клавіатури",
        "zh_CN": "快捷键",
        "zh_TW": "鍵盤快速鍵"
      }
@@ -22467,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如果不確定，請選擇無狀態。"
      }
@@ -22542,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) 狀態。"
      }
@@ -23847,31 +23822,6 @@
        "zh_TW": "上次更新時間: {0}"
      }
    },
-    {
-      "ID": "CompatibilityListTitle",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Compatibility List - {0} entries",
-        "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": "Список сумісності — {0} ігор",
-        "zh_CN": "兼容性列表 - {0} 条",
-        "zh_TW": ""
-      }
-    },
    {
      "ID": "CompatibilityListWarning",
      "Translations": {
@@ -23922,31 +23872,6 @@
        "zh_TW": "搜尋相容性列表紀錄..."
      }
    },
-    {
-      "ID": "CompatibilityListSearchBoxWatermarkWithCount",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Search {0} compatibility entries...",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "Søk i {0} kompatibilitetsoppføringer...",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "Шукати серед {0} перевірених ігор...",
-        "zh_CN": "搜索  {0}  兼容性条目...",
-        "zh_TW": ""
-      }
-    },
    {
      "ID": "CompatibilityListOpen",
      "Translations": {
@@ -24017,7 +23942,7 @@
        "sv_SE": "Spelbart",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Справна",
+        "uk_UA": "Оптимально",
        "zh_CN": "可游玩",
        "zh_TW": "可暢順遊玩"
      }
@@ -24267,8 +24192,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Власна конфігурація",
-        "zh_CN": "自定义配置",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
@@ -24292,8 +24217,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "(Глобальні)",
-        "zh_CN": "(全局)",
+        "uk_UA": "",
+        "zh_CN": "",
        "zh_TW": ""
      }
    },
--- a/src/Ryujinx/Common/ApplicationHelper.cs
+++ b/src/Ryujinx/Common/ApplicationHelper.cs
@@ -13,10 +13,10 @@ using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Windows;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.FileSystem;
@@ -216,7 +216,11 @@ namespace Ryujinx.Ava.Common
                    return;
                }

-                (Nca updatePatchNca, _) = mainNca.GetUpdateData(_virtualFileSystem, ConfigurationState.Instance.System.IntegrityCheckLevel, programIndex, out _);
+                IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
+                    ? IntegrityCheckLevel.ErrorOnInvalid
+                    : IntegrityCheckLevel.None;
+
+                (Nca updatePatchNca, _) = mainNca.GetUpdateData(_virtualFileSystem, checkLevel, programIndex, out _);
                if (updatePatchNca is not null)
                {
                    patchNca = updatePatchNca;
--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -1,7 +1,6 @@
 using Gommon;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Utilities;
 using System;
@@ -26,21 +25,7 @@ namespace Ryujinx.Ava.Common.Locale
        public LocaleManager()
        {
            _localeStrings = new Dictionary<LocaleKeys, string>();
-            _dynamicValues = new ConcurrentDictionary<LocaleKeys, object[]>(new Dictionary<LocaleKeys, object[]>
-            {
-                { LocaleKeys.DialogConfirmationTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogUpdaterTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogErrorTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogWarningTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogExitTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogStopEmulationTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxInfo, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxConfirm, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxUpdater, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxRebooter, [RyujinxApp.FullAppName] },
-                { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityDatabase.Entries.Length] },
-                { LocaleKeys.CompatibilityListTitle, [CompatibilityDatabase.Entries.Length] }
-            });
+            _dynamicValues = new ConcurrentDictionary<LocaleKeys, object[]>();

            Load();
        }
@@ -59,6 +44,17 @@ namespace Ryujinx.Ava.Common.Locale

                ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
            }
+            
+            SetDynamicValues(LocaleKeys.DialogConfirmationTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.DialogUpdaterTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.DialogErrorTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.DialogWarningTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.DialogExitTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.DialogStopEmulationTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.RyujinxInfo, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.RyujinxConfirm, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.RyujinxUpdater, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.RyujinxRebooter, RyujinxApp.FullAppName);
        }

        public string this[LocaleKeys key]
--- 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/Models/XCITrimmerFileModel.cs
+++ b/src/Ryujinx/Common/Models/XCITrimmerFileModel.cs
@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;

--- 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
@@ -1,17 +1,18 @@
 using DiscordRPC;
 using Gommon;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Systems.PlayReport;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Utilities.PlayReport;
 using Ryujinx.Common;
 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,8 +2,7 @@ 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.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -12,6 +11,7 @@ using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.Graphics.GAL;
+using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
 using Ryujinx.HLE;
@@ -312,42 +312,49 @@ namespace Ryujinx.Headless
            return new OpenGLRenderer();
        }

-        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) =>
-            new(
-                new HleConfiguration(
-                        options.DramSize,
-                        options.SystemLanguage,
-                        options.SystemRegion,
-                        options.VSyncMode,
-                        !options.DisableDockedMode,
-                        !options.DisablePTC,
-                        options.EnableInternetAccess,
-                        !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
-                        options.FsGlobalAccessLogMode,
-                        options.SystemTimeOffset,
-                        options.SystemTimeZone,
-                        options.MemoryManagerMode,
-                        options.IgnoreMissingServices,
-                        options.AspectRatio,
-                        options.AudioVolume,
-                        options.UseHypervisor ?? true,
-                        options.MultiplayerLanInterfaceId,
-                        Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
-                        false,
-                        string.Empty,
-                        string.Empty,
-                        options.CustomVSyncInterval
-                    )
-                    .Configure(
-                        _virtualFileSystem,
-                        _libHacHorizonManager,
-                        _contentManager,
-                        _accountManager,
-                        _userChannelPersistence,
-                        renderer.TryMakeThreaded(options.BackendThreading),
-                        new SDL2HardwareDeviceDriver(),
-                        window
-                    )
-            );
+        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options)
+        {
+            BackendThreading threadingMode = options.BackendThreading;
+
+            bool threadedGAL = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
+
+            if (threadedGAL)
+            {
+                renderer = new ThreadedRenderer(renderer);
+            }
+
+            HLEConfiguration configuration = new(_virtualFileSystem,
+                _libHacHorizonManager,
+                _contentManager,
+                _accountManager,
+                _userChannelPersistence,
+                renderer,
+                new SDL2HardwareDeviceDriver(),
+                options.DramSize,
+                window,
+                options.SystemLanguage,
+                options.SystemRegion,
+                options.VSyncMode,
+                !options.DisableDockedMode,
+                !options.DisablePTC,
+                options.EnableInternetAccess,
+                !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                options.FsGlobalAccessLogMode,
+                options.SystemTimeOffset,
+                options.SystemTimeZone,
+                options.MemoryManagerMode,
+                options.IgnoreMissingServices,
+                options.AspectRatio,
+                options.AudioVolume,
+                options.UseHypervisor ?? true,
+                options.MultiplayerLanInterfaceId,
+                Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
+                false,
+                string.Empty,
+                string.Empty,
+                options.CustomVSyncInterval);
+
+            return new Switch(configuration);
+        }
    }
 }
--- a/src/Ryujinx/Headless/HeadlessRyujinx.cs
+++ b/src/Ryujinx/Headless/HeadlessRyujinx.cs
@@ -1,7 +1,7 @@
 using CommandLine;
 using Gommon;
 using Ryujinx.Ava;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
--- a/src/Ryujinx/Headless/Options.cs
+++ b/src/Ryujinx/Headless/Options.cs
@@ -1,7 +1,6 @@
 using CommandLine;
 using Gommon;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.HLE;
@@ -38,7 +37,7 @@ namespace Ryujinx.Headless
                EnableInternetAccess = configurationState.System.EnableInternetAccess;

            if (NeedsOverride(nameof(DisableFsIntegrityChecks)))
-                DisableFsIntegrityChecks = !configurationState.System.EnableFsIntegrityChecks;
+                DisableFsIntegrityChecks = configurationState.System.EnableFsIntegrityChecks;
            
            if (NeedsOverride(nameof(FsGlobalAccessLogMode)))
                FsGlobalAccessLogMode = configurationState.System.FsGlobalAccessLogMode;
@@ -59,10 +58,10 @@ namespace Ryujinx.Headless
                DisableDockedMode = !configurationState.System.EnableDockedMode;

            if (NeedsOverride(nameof(SystemLanguage)))
-                SystemLanguage = configurationState.System.Language.Value.ToHLE();
+                SystemLanguage = (SystemLanguage)(int)configurationState.System.Language.Value;
            
            if (NeedsOverride(nameof(SystemRegion)))
-                SystemRegion = configurationState.System.Region.Value.ToHLE();
+                SystemRegion = (RegionCode)(int)configurationState.System.Region.Value;
            
            if (NeedsOverride(nameof(SystemTimeZone)))
                SystemTimeZone = configurationState.System.TimeZone;
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -5,12 +5,10 @@ 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;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Ava.Utilities.SystemInfo;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
@@ -284,16 +282,16 @@ namespace Ryujinx.Ava

            // Check if region was overridden. 
            if (CommandLineState.OverrideSystemRegion is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out HLE.HOS.SystemState.RegionCode result))
+                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Ryujinx.HLE.HOS.SystemState.RegionCode result))
                {
-                    ConfigurationState.Instance.System.Region.Value = result.ToUI();
+                    ConfigurationState.Instance.System.Region.Value = (Utilities.Configuration.System.Region)result;
                }

            //Check if language was overridden. 
            if (CommandLineState.OverrideSystemLanguage is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out HLE.HOS.SystemState.SystemLanguage result))
+                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Ryujinx.HLE.HOS.SystemState.SystemLanguage result))
                {
-                    ConfigurationState.Instance.System.Language.Value = result.ToUI();
+                    ConfigurationState.Instance.System.Language.Value = (Utilities.Configuration.System.Language)result;
                }

            // Check if hardware-acceleration was overridden.
--- 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</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;win-arm64;osx-arm64;linux-arm64;</RuntimeIdentifiers>
    <OutputType>Exe</OutputType>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Version>1.0.0-dirty</Version>
@@ -29,12 +29,18 @@
    <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>
@@ -57,8 +63,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" />
-    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'" />
+    <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="securifybv.ShellLink" />
    <PackageReference Include="Sep" />
    <PackageReference Include="Silk.NET.Vulkan" />
@@ -67,7 +73,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" />
@@ -84,19 +90,17 @@
  </ItemGroup>

  <ItemGroup>
-    <Content Include="..\..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
+    <Content Include="..\..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'">
      <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
@@ -17,9 +17,4 @@
        <sty:FluentAvaloniaTheme PreferUserAccentColor="True" PreferSystemTheme="False" />
        <StyleInclude Source="/Assets/Styles/Styles.xaml" />
    </Application.Styles>
-    <NativeMenu.Menu>
-        <NativeMenu>
-            <NativeMenuItem Header="About Ryujinx" Click="AboutRyujinx_OnClick" />
-        </NativeMenu>
-    </NativeMenu.Menu>
 </Application>
--- 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.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using System;
@@ -147,10 +147,5 @@ namespace Ryujinx.Ava
            Current is RyujinxApp { PlatformSettings: not null } app
                ? ConvertThemeVariant(app.PlatformSettings.GetColorValues().ThemeVariant)
                : ThemeVariant.Default;
-
-        private async void AboutRyujinx_OnClick(object sender, EventArgs e)
-        {
-            await AboutView.Show();
-        }
    }
 }
--- a/src/Ryujinx/Systems/Configuration/System/Region.cs
+++ b/src/Ryujinx/Systems/Configuration/System/Region.cs
@@ -1,26 +0,0 @@
-using Ryujinx.Common.Utilities;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Ava.Systems.Configuration.System
-{
-    [JsonConverter(typeof(TypedStringEnumConverter<Region>))]
-    public enum Region
-    {
-        Japan,
-        USA,
-        Europe,
-        Australia,
-        China,
-        Korea,
-        Taiwan,
-    }
-    
-    public static class RegionEnumHelper
-    {
-        public static Region ToUI(this HLE.HOS.SystemState.RegionCode hleRegion)
-            => (Region)hleRegion;
-
-        public static HLE.HOS.SystemState.RegionCode ToHLE(this Region uiRegion)
-            => (HLE.HOS.SystemState.RegionCode)uiRegion;
-    }
-}
--- a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
+++ b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
@@ -7,7 +7,7 @@ using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.Applets;
--- a/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml
+++ b/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml
@@ -17,8 +17,12 @@
        <viewModels:ProfileSelectorDialogViewModel />
    </Design.DataContext>
    
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
-
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        
        <Border
            CornerRadius="5"
            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
--- a/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml.cs
+++ b/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml.cs
@@ -9,14 +9,17 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Threading.Tasks;
 using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
 using UserProfileSft = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;

 namespace Ryujinx.Ava.UI.Applet
 {
-    public partial class ProfileSelectorDialog : RyujinxControl<ProfileSelectorDialogViewModel>
+    public partial class ProfileSelectorDialog : UserControl
    {
+        public ProfileSelectorDialogViewModel ViewModel { get; set; }
+
        public ProfileSelectorDialog(ProfileSelectorDialogViewModel viewModel)
        {
            DataContext = ViewModel = viewModel;
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -11,8 +11,8 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Views.Dialog;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -26,7 +26,6 @@ namespace Ryujinx.Ava.UI.Controls
 {
    public class ApplicationContextMenu : MenuFlyout
    {
-        
        public ApplicationContextMenu()
        {
            InitializeComponent();
@@ -80,13 +79,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 +126,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, 
@@ -407,7 +406,7 @@ namespace Ryujinx.Ava.UI.Controls
        public async void OpenApplicationCompatibility_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await CompatibilityListWindow.Show(viewModel.SelectedApplication.IdString);
+                await CompatibilityList.Show(viewModel.SelectedApplication.IdString);
        }
               
        public async void OpenApplicationData_Click(object sender, RoutedEventArgs args)
--- 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.Controls.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
@@ -1,20 +1,20 @@
 using Avalonia.Controls;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
-using Avalonia.Layout;
+using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
 using System.Linq;
 using System.Threading.Tasks;

-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
+    public partial class ApplicationDataView : UserControl
    {
        public static async Task Show(ApplicationData appData)
        {
@@ -25,10 +25,20 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                SecondaryButtonText = string.Empty,
                CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
                MinWidth = 256,
-                Content = new ApplicationDataView { ViewModel = new ApplicationDataViewModel(appData) }
+                Content = new ApplicationDataView { DataContext = new ApplicationDataViewModel(appData) }
            };

-            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles(160, HorizontalAlignment.Center));
+            Style closeButton = new(x => x.Name("CloseButton"));
+            closeButton.Setters.Add(new Setter(WidthProperty, 160d));
+
+            Style closeButtonParent = new(x => x.Name("CommandSpace"));
+            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty,
+                Avalonia.Layout.HorizontalAlignment.Center));
+
+            contentDialog.Styles.Add(closeButton);
+            contentDialog.Styles.Add(closeButtonParent);
+
+            await ContentDialogHelper.ShowAsync(contentDialog);
        }
        
        public ApplicationDataView()
@@ -44,18 +54,21 @@ namespace Ryujinx.Ava.UI.Views.Dialog
            if (RyujinxApp.AppLifetime.Windows.TryGetFirst(x => x is ContentDialogOverlayWindow, out Window window))
                window.Close(ContentDialogResult.None);
            
-            await CompatibilityListWindow.Show((string)playabilityLabel.Tag);
+            await CompatibilityList.Show((string)playabilityLabel.Tag);
        }

        private async void IdString_OnClick(object sender, RoutedEventArgs e)
        {
+            if (DataContext is not MainWindowViewModel mwvm)
+                return;
+            
            if (sender is not Button { Content: TextBlock idText })
                return;

            if (!RyujinxApp.IsClipboardAvailable(out IClipboard clipboard))
                return;
            
-            ApplicationData appData = RyujinxApp.MainWindow.ViewModel.Applications.FirstOrDefault(it => it.IdString == idText.Text);
+            ApplicationData appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
            if (appData is null)
                return;
            
--- a/src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationGridView"
+    x:Class="Ryujinx.Ava.UI.Controls.ApplicationGridView"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
@@ -14,7 +14,10 @@
    mc:Ignorable="d"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    x:DataType="viewModels:MainWindowViewModel">
-    <Grid RowDefinitions="*">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
        <ListBox
            Grid.Row="0"
            Padding="8"
@@ -54,7 +57,11 @@
                            Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
                            ClipToBounds="True"
                            CornerRadius="4">
-                            <Grid RowDefinitions="Auto,Auto">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
                                <Image
                                    Grid.Row="0"
                                    HorizontalAlignment="Stretch"
--- a/src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml.cs
@@ -1,15 +1,13 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System;

-namespace Ryujinx.Ava.UI.Views.Misc
+namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class ApplicationGridView : RyujinxControl<MainWindowViewModel>
+    public partial class ApplicationGridView : UserControl
    {
        public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
            RoutedEvent.Register<ApplicationGridView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);
--- a/src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationListView"
+    x:Class="Ryujinx.Ava.UI.Controls.ApplicationListView"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -13,7 +13,10 @@
    mc:Ignorable="d"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    x:DataType="viewModels:MainWindowViewModel">
-    <Grid RowDefinitions="*">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
        <ListBox
            Name="GameListBox"
            Grid.Row="0"
--- a/src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml.cs
@@ -2,17 +2,16 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Windows;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
 using System;
 using System.Linq;

-namespace Ryujinx.Ava.UI.Views.Misc
+namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class ApplicationListView : RyujinxControl<MainWindowViewModel>
+    public partial class ApplicationListView : UserControl
    {
        public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
            RoutedEvent.Register<ApplicationListView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);
@@ -33,21 +32,27 @@ namespace Ryujinx.Ava.UI.Views.Misc
        
        private async void PlayabilityStatus_OnClick(object sender, RoutedEventArgs e)
        {
+            if (DataContext is not MainWindowViewModel mwvm)
+                return;
+            
            if (sender is not Button { Content: TextBlock playabilityLabel })
                return;

-            await CompatibilityListWindow.Show((string)playabilityLabel.Tag);
+            await CompatibilityList.Show((string)playabilityLabel.Tag);
        }

        private async void IdString_OnClick(object sender, RoutedEventArgs e)
        {
+            if (DataContext is not MainWindowViewModel mwvm)
+                return;
+            
            if (sender is not Button { Content: TextBlock idText })
                return;

            if (!RyujinxApp.IsClipboardAvailable(out IClipboard clipboard))
                return;
            
-            ApplicationData appData = ViewModel.Applications.FirstOrDefault(it => it.IdString == idText.Text);
+            ApplicationData appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
            if (appData is null)
                return;
            
--- 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.Controls.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,15 +1,16 @@
-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;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Threading.Tasks;

-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class DlcSelectView : RyujinxControl<DlcSelectViewModel>
+    public partial class DlcSelectView : UserControl
    {
        public DlcSelectView()
        {
@@ -27,10 +28,20 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue],
                SecondaryButtonText = string.Empty,
                CloseButtonText = string.Empty,
-                Content = new DlcSelectView { ViewModel = viewModel }
+                Content = new DlcSelectView { DataContext = viewModel }
            };

-            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());
+            Style closeButton = new(x => x.Name("CloseButton"));
+            closeButton.Setters.Add(new Setter(WidthProperty, 80d));
+
+            Style closeButtonParent = new(x => x.Name("CommandSpace"));
+            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty,
+                Avalonia.Layout.HorizontalAlignment.Right));
+
+            contentDialog.Styles.Add(closeButton);
+            contentDialog.Styles.Add(closeButtonParent);
+
+            await ContentDialogHelper.ShowAsync(contentDialog);

            return viewModel.SelectedDlc;
        }
--- a/src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs
+++ b/src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs
@@ -23,12 +23,13 @@ using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;

 namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class NavigationDialogHost : RyujinxControl<UserProfileViewModel>
+    public partial class NavigationDialogHost : UserControl
    {
        public AccountManager AccountManager { get; }
        public ContentManager ContentManager { get; }
        public VirtualFileSystem VirtualFileSystem { get; }
        public HorizonClient HorizonClient { get; }
+        public UserProfileViewModel ViewModel { get; set; }

        public NavigationDialogHost()
        {
--- a/src/Ryujinx/UI/Controls/RyujinxControl.cs
+++ b/src/Ryujinx/UI/Controls/RyujinxControl.cs
@@ -1,24 +0,0 @@
-using Avalonia.Controls;
-using Gommon;
-using Ryujinx.Ava.UI.ViewModels;
-using System;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public class RyujinxControl<TViewModel> : UserControl where TViewModel : BaseModel
-    {
-        public TViewModel ViewModel
-        {
-            get
-            {
-                if (DataContext is not TViewModel viewModel)
-                    throw new InvalidOperationException(
-                        $"Underlying DataContext is not of type {typeof(TViewModel).AsPrettyString()}; " +
-                        $"Actual type is {DataContext?.GetType().AsPrettyString()}");
-
-                return viewModel;
-            }
-            set => DataContext = value;
-        }
-    }
-}
--- 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/Controls/UpdateWaitWindow.axaml
+++ b/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
@@ -1,5 +1,5 @@
 <Window
-    x:Class="Ryujinx.Ava.UI.Windows.UpdateWaitWindow"
+    x:Class="Ryujinx.Ava.UI.Controls.UpdateWaitWindow"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -13,7 +13,15 @@
    <Grid
        Margin="20"
        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch" ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
+        VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
        <Image
            Grid.Row="1"
            Height="70"
--- a/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml.cs
+++ b/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml.cs
@@ -1,7 +1,8 @@
 using Avalonia.Controls;
+using Ryujinx.Ava.UI.Windows;
 using System.Threading;

-namespace Ryujinx.Ava.UI.Windows
+namespace Ryujinx.Ava.UI.Controls
 {
    public partial class UpdateWaitWindow : StyleableWindow
    {
--- a/src/Ryujinx/UI/Helpers/ApplicationOpenedEventArgs.cs
+++ b/src/Ryujinx/UI/Helpers/ApplicationOpenedEventArgs.cs
@@ -1,5 +1,5 @@
 using Avalonia.Interactivity;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;

 namespace Ryujinx.Ava.UI.Helpers
 {
--- a/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
+++ b/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
@@ -4,7 +4,6 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
-using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
@@ -22,23 +21,6 @@ namespace Ryujinx.Ava.UI.Helpers
        private static bool _isChoiceDialogOpen;
        private static ContentDialogOverlayWindow _contentDialogOverlayWindow;

-        public static ContentDialog ApplyStyles(
-            this ContentDialog contentDialog, 
-            double closeButtonWidth = 80, 
-            HorizontalAlignment buttonSpaceAlignment = HorizontalAlignment.Right)
-        {
-            Style closeButton = new(x => x.Name("CloseButton"));
-            closeButton.Setters.Add(new Setter(Layoutable.WidthProperty, closeButtonWidth));
-            
-            Style closeButtonParent = new(x => x.Name("CommandSpace"));
-            closeButtonParent.Setters.Add(new Setter(Layoutable.HorizontalAlignmentProperty, buttonSpaceAlignment));
-
-            contentDialog.Styles.Add(closeButton);
-            contentDialog.Styles.Add(closeButtonParent);
-
-            return contentDialog;
-        }
-
        private async static Task<UserResult> ShowContentDialog(
             string title,
             object content,
@@ -58,19 +40,19 @@ namespace Ryujinx.Ava.UI.Helpers
                SecondaryButtonText = secondaryButton,
                CloseButtonText = closeButton,
                Content = content,
-                PrimaryButtonCommand = Commands.Create(() =>
+                PrimaryButtonCommand = MiniCommand.Create(() =>
                {
                    result = primaryButtonResult;
                })
            };

-            contentDialog.SecondaryButtonCommand = Commands.Create(() =>
+            contentDialog.SecondaryButtonCommand = MiniCommand.Create(() =>
            {
                result = UserResult.No;
                contentDialog.PrimaryButtonClick -= deferCloseAction;
            });

-            contentDialog.CloseButtonCommand = Commands.Create(() =>
+            contentDialog.CloseButtonCommand = MiniCommand.Create(() =>
            {
                result = UserResult.Cancel;
                contentDialog.PrimaryButtonClick -= deferCloseAction;
--- a/src/Ryujinx/UI/Helpers/Converters/MultiplayerInfoConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/MultiplayerInfoConverter.cs
@@ -2,7 +2,7 @@ using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 using System.Globalization;
 using System.Text;
--- a/src/Ryujinx/UI/Helpers/LoggerAdapter.cs
+++ b/src/Ryujinx/UI/Helpers/LoggerAdapter.cs
@@ -1,7 +1,7 @@
 using Avalonia.Logging;
 using Avalonia.Utilities;
 using Gommon;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Logging;
 using System;
 using System.Text;
--- a/src/Ryujinx/UI/Helpers/MiniCommand.cs
+++ b/src/Ryujinx/UI/Helpers/MiniCommand.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+    public sealed class MiniCommand<T> : MiniCommand, ICommand
+    {
+        private readonly Action<T> _callback;
+        private bool _busy;
+        private readonly Func<T, Task> _asyncCallback;
+
+        public MiniCommand(Action<T> callback)
+        {
+            _callback = callback;
+        }
+
+        public MiniCommand(Func<T, Task> callback)
+        {
+            _asyncCallback = callback;
+        }
+
+        private bool Busy
+        {
+            get => _busy;
+            set
+            {
+                _busy = value;
+                CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        public override event EventHandler CanExecuteChanged;
+        public override bool CanExecute(object parameter) => !_busy;
+
+        public override async void Execute(object parameter)
+        {
+            if (Busy)
+            {
+                return;
+            }
+            try
+            {
+                Busy = true;
+                if (_callback != null)
+                {
+                    _callback((T)parameter);
+                }
+                else
+                {
+                    await _asyncCallback((T)parameter);
+                }
+            }
+            finally
+            {
+                Busy = false;
+            }
+        }
+    }
+
+    public abstract class MiniCommand : ICommand
+    {
+        public static MiniCommand Create(Action callback) => new MiniCommand<object>(_ => callback());
+        public static MiniCommand Create<TArg>(Action<TArg> callback) => new MiniCommand<TArg>(callback);
+        public static MiniCommand CreateFromTask(Func<Task> callback) => new MiniCommand<object>(_ => callback());
+        public static MiniCommand CreateFromTask<TArg>(Func<TArg, Task> callback) => new MiniCommand<TArg>(callback);
+
+        public abstract bool CanExecute(object parameter);
+        public abstract void Execute(object parameter);
+        public abstract event EventHandler CanExecuteChanged;
+    }
+}
--- a/src/Ryujinx/UI/Models/Generic/LastPlayedSortComparer.cs
+++ b/src/Ryujinx/UI/Models/Generic/LastPlayedSortComparer.cs
@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 using System.Collections.Generic;

--- a/src/Ryujinx/UI/Models/Generic/TimePlayedSortComparer.cs
+++ b/src/Ryujinx/UI/Models/Generic/TimePlayedSortComparer.cs
@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 using System.Collections.Generic;

--- a/src/Ryujinx/UI/Models/Input/StickVisualizer.cs
+++ b/src/Ryujinx/UI/Models/Input/StickVisualizer.cs
@@ -1,260 +0,0 @@
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
-using Ryujinx.Input;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.Models.Input
-{
-    public class StickVisualizer : BaseModel, IDisposable
-    {
-        public const int DrawStickPollRate = 50; // Milliseconds per poll.
-        public const int DrawStickCircumference = 5;
-        public const float DrawStickScaleFactor = DrawStickCanvasCenter;
-        public const int DrawStickCanvasSize = 100;
-        public const int DrawStickBorderSize = DrawStickCanvasSize + 5;
-        public const float DrawStickCanvasCenter = (DrawStickCanvasSize - DrawStickCircumference) / 2;
-        public const float MaxVectorLength = DrawStickCanvasSize / 2;
-
-        public CancellationTokenSource PollTokenSource;
-        public CancellationToken PollToken;
-
-        private static float _vectorLength;
-        private static float _vectorMultiplier;
-
-        private bool disposedValue;
-
-        private DeviceType _type;
-        public DeviceType Type
-        {
-            get => _type;
-            set
-            {
-                _type = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputConfig _gamepadConfig;
-        public GamepadInputConfig GamepadConfig
-        {
-            get => _gamepadConfig;
-            set
-            {
-                _gamepadConfig = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        private KeyboardInputConfig _keyboardConfig;
-        public KeyboardInputConfig KeyboardConfig
-        {
-            get => _keyboardConfig;
-            set
-            {
-                _keyboardConfig = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        private (float, float) _uiStickLeft;
-        public (float, float) UiStickLeft
-        {
-            get => (_uiStickLeft.Item1 * DrawStickScaleFactor, _uiStickLeft.Item2 * DrawStickScaleFactor);
-            set
-            {
-                _uiStickLeft = value;
-
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(UiStickRightX));
-                OnPropertyChanged(nameof(UiStickRightY));
-                OnPropertyChanged(nameof(UiDeadzoneRight));
-            }
-        }
-
-        private (float, float) _uiStickRight;
-        public (float, float) UiStickRight
-        {
-            get => (_uiStickRight.Item1 * DrawStickScaleFactor, _uiStickRight.Item2 * DrawStickScaleFactor);
-            set
-            {
-                _uiStickRight = value;
-
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(UiStickLeftX));
-                OnPropertyChanged(nameof(UiStickLeftY));
-                OnPropertyChanged(nameof(UiDeadzoneLeft));
-            }
-        }
-
-        public float UiStickLeftX => ClampVector(UiStickLeft).Item1;
-        public float UiStickLeftY => ClampVector(UiStickLeft).Item2;
-        public float UiStickRightX => ClampVector(UiStickRight).Item1;
-        public float UiStickRightY => ClampVector(UiStickRight).Item2;
-
-        public int UiStickCircumference => DrawStickCircumference;
-        public int UiCanvasSize => DrawStickCanvasSize;
-        public int UiStickBorderSize => DrawStickBorderSize;
-
-        public float? UiDeadzoneLeft => _gamepadConfig?.DeadzoneLeft * DrawStickCanvasSize - DrawStickCircumference;
-        public float? UiDeadzoneRight => _gamepadConfig?.DeadzoneRight * DrawStickCanvasSize - DrawStickCircumference;
-
-        private InputViewModel Parent;
-
-        public StickVisualizer(InputViewModel parent)
-        {
-            Parent = parent;
-
-            PollTokenSource = new CancellationTokenSource();
-            PollToken = PollTokenSource.Token;
-
-            Task.Run(Initialize, PollToken);
-        }
-
-        public void UpdateConfig(object config)
-        {
-            if (config is ControllerInputViewModel padConfig)
-            {
-                GamepadConfig = padConfig.Config;
-                Type = DeviceType.Controller;
-
-                return;
-            }
-            else if (config is KeyboardInputViewModel keyConfig)
-            {
-                KeyboardConfig = keyConfig.Config;
-                Type = DeviceType.Keyboard;
-
-                return;
-            }
-
-            Type = DeviceType.None;
-        }
-
-        public async Task Initialize()
-        {
-            (float, float) leftBuffer;
-            (float, float) rightBuffer;
-
-            while (!PollToken.IsCancellationRequested)
-            {
-                leftBuffer = (0f, 0f);
-                rightBuffer = (0f, 0f);
-
-                switch (Type)
-                {
-                    case DeviceType.Keyboard:
-                        IKeyboard keyboard = (IKeyboard)Parent.AvaloniaKeyboardDriver.GetGamepad("0");
-
-                        if (keyboard != null)
-                        {
-                            KeyboardStateSnapshot snapshot = keyboard.GetKeyboardStateSnapshot();
-
-                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickRight))
-                            {
-                                leftBuffer.Item1 += 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickLeft))
-                            {
-                                leftBuffer.Item1 -= 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickUp))
-                            {
-                                leftBuffer.Item2 += 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickDown))
-                            {
-                                leftBuffer.Item2 -= 1;
-                            }
-
-                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickRight))
-                            {
-                                rightBuffer.Item1 += 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickLeft))
-                            {
-                                rightBuffer.Item1 -= 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickUp))
-                            {
-                                rightBuffer.Item2 += 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickDown))
-                            {
-                                rightBuffer.Item2 -= 1;
-                            }
-
-                            UiStickLeft = leftBuffer;
-                            UiStickRight = rightBuffer;
-                        }
-                        break;
-
-                    case DeviceType.Controller:
-                        IGamepad controller = Parent.SelectedGamepad;
-
-                        if (controller != null)
-                        {
-                            leftBuffer = controller.GetStick((StickInputId)GamepadConfig.LeftJoystick);
-                            rightBuffer = controller.GetStick((StickInputId)GamepadConfig.RightJoystick);
-                        }
-                        break;
-
-                    case DeviceType.None:
-                        break;
-                    default:
-                        throw new ArgumentException($"Unable to poll device type \"{Type}\"");
-                }
-
-                UiStickLeft = leftBuffer;
-                UiStickRight = rightBuffer;
-
-                await Task.Delay(DrawStickPollRate, PollToken);
-            }
-
-            PollTokenSource.Dispose();
-        }
-
-        public static (float, float) ClampVector((float, float) vect)
-        {
-            _vectorMultiplier = 1;
-            _vectorLength = MathF.Sqrt((vect.Item1 * vect.Item1) + (vect.Item2 * vect.Item2));
-
-            if (_vectorLength > MaxVectorLength)
-            {
-                _vectorMultiplier = MaxVectorLength / _vectorLength;
-            }
-
-            vect.Item1 = vect.Item1 * _vectorMultiplier + DrawStickCanvasCenter;
-            vect.Item2 = vect.Item2 * _vectorMultiplier + DrawStickCanvasCenter;
-
-            return vect;
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!disposedValue)
-            {
-                if (disposing)
-                {
-                    PollTokenSource.Cancel();
-                }
-
-                KeyboardConfig = null;
-                GamepadConfig = null;
-                Parent = null;
-
-                disposedValue = true;
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}
--- a/src/Ryujinx/UI/Models/SaveModel.cs
+++ b/src/Ryujinx/UI/Models/SaveModel.cs
@@ -3,7 +3,7 @@ using LibHac.Fs;
 using LibHac.Ncm;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.HLE.FileSystem;
 using System.IO;
 using System.Linq;
--- a/src/Ryujinx/UI/Renderer/EmbeddedWindow.cs
+++ b/src/Ryujinx/UI/Renderer/EmbeddedWindow.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Platform;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using SPB.Graphics;
--- a/src/Ryujinx/UI/Renderer/EmbeddedWindowOpenGL.cs
+++ b/src/Ryujinx/UI/Renderer/EmbeddedWindowOpenGL.cs
@@ -1,5 +1,5 @@
 using OpenTK.Graphics.OpenGL;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
--- a/src/Ryujinx/UI/Renderer/RendererHost.cs
+++ b/src/Ryujinx/UI/Renderer/RendererHost.cs
@@ -1,8 +1,10 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Logging;
 using System;

 namespace Ryujinx.Ava.UI.Renderer
@@ -36,6 +38,32 @@ namespace Ryujinx.Ava.UI.Renderer
                EmbeddedWindowOpenGL => GraphicsBackend.OpenGl,
                _ => throw new NotImplementedException()
            };
+
+        public RendererHost(string titleId)
+        {
+            Focusable = true;
+            FlowDirection = FlowDirection.LeftToRight;
+
+            EmbeddedWindow =
+#pragma warning disable CS8524
+                ConfigurationState.Instance.Graphics.GraphicsBackend.Value switch
+#pragma warning restore CS8524
+                {
+                    GraphicsBackend.OpenGl => new EmbeddedWindowOpenGL(),
+                    GraphicsBackend.Vulkan => new EmbeddedWindowVulkan(),
+                };
+
+            string backendText = EmbeddedWindow switch
+            {
+                EmbeddedWindowVulkan => "Vulkan",
+                EmbeddedWindowOpenGL => "OpenGL",
+                _ => throw new NotImplementedException()
+            };
+                    
+            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend ({ConfigurationState.Instance.Graphics.GraphicsBackend.Value}): {backendText}");
+
+            Initialize();
+        }
        
        
        private void Initialize()
--- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
@@ -3,8 +3,9 @@ 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 Ryujinx.Ava.Utilities.Configuration;
 using System;

 namespace Ryujinx.Ava.UI.ViewModels
--- a/src/Ryujinx/UI/ViewModels/AppListFavoriteComparable.cs
+++ b/src/Ryujinx/UI/ViewModels/AppListFavoriteComparable.cs
@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System;

 namespace Ryujinx.Ava.UI.ViewModels
--- a/src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs
@@ -1,7 +1,7 @@
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.PlayReport;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.PlayReport;

 namespace Ryujinx.Ava.UI.ViewModels
 {
--- a/src/Ryujinx/UI/ViewModels/DlcSelectViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/DlcSelectViewModel.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.Common.Models;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Linq;

 namespace Ryujinx.Ava.UI.ViewModels
--- a/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs
@@ -7,7 +7,7 @@ using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
--- a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
@@ -10,30 +10,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 {
    public partial class ControllerInputViewModel : BaseModel
    {
-        private GamepadInputConfig _config;
-        public GamepadInputConfig Config
-        {
-            get => _config;
-            set
-            {
-                _config = value;
+        [ObservableProperty] private GamepadInputConfig _config;

-                OnPropertyChanged();
-            }
-        }
-
-        private StickVisualizer _visualizer;
-        public StickVisualizer Visualizer
-        {
-            get => _visualizer;
-            set
-            {
-                _visualizer = value;
-
-                OnPropertyChanged();
-            }
-        }
-        
        private bool _isLeft;
        public bool IsLeft
        {
@@ -59,15 +37,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        }

        public bool HasSides => IsLeft ^ IsRight;
-        
+
        [ObservableProperty] private SvgImage _image;
-        
+
        public InputViewModel ParentModel { get; }
-        
-        public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config, StickVisualizer visualizer)
+
+        public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
        {
            ParentModel = model;
-            Visualizer = visualizer;
            model.NotifyChangesEvent += OnParentModelChanged;
            OnParentModelChanged();
            config.PropertyChanged += (_, args) =>
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -10,7 +10,7 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        private int _controller;
        private string _controllerImage;
        private int _device;
-        private object _configViewModel;
+        [ObservableProperty] private object _configViewModel;
        [ObservableProperty] private string _profileName;
        private bool _isLoaded;

@@ -74,7 +74,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                OnPropertiesChanged(nameof(HasLed), nameof(CanClearLed));
            }
        }
-        public StickVisualizer VisualStick { get; private set; }

        public ObservableCollection<PlayerModel> PlayerIndexes { get; set; }
        public ObservableCollection<(DeviceType Type, string Id, string Name)> Devices { get; set; }
@@ -95,19 +94,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        public bool IsModified { get; set; }
        public event Action NotifyChangesEvent;

-        public object ConfigViewModel
-        {
-            get => _configViewModel;
-            set
-            {
-                _configViewModel = value;
-
-                VisualStick.UpdateConfig(value);
-
-                OnPropertyChanged();
-            }
-        }
-
        public PlayerIndex PlayerIdChoose
        {
            get => _playerIdChoose;
@@ -283,7 +269,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            Devices = [];
            ProfilesList = [];
            DeviceList = [];
-            VisualStick = new StickVisualizer(this);

            ControllerImage = ProControllerResource;

@@ -304,12 +289,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

            if (Config is StandardKeyboardInputConfig keyboardInputConfig)
            {
-                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig), VisualStick);
+                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig));
            }

            if (Config is StandardControllerInputConfig controllerInputConfig)
            {
-                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
+                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig));
            }
        }

@@ -908,8 +893,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

            _mainWindow.ViewModel.AppHost?.NpadManager.UnblockInputUpdates();

-            VisualStick.Dispose();
-
            SelectedGamepad?.Dispose();

            AvaloniaKeyboardDriver.Dispose();
--- a/src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs
@@ -6,29 +6,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 {
    public partial class KeyboardInputViewModel : BaseModel
    {
-        private KeyboardInputConfig _config;
-        public KeyboardInputConfig Config
-        {
-            get => _config;
-            set
-            {
-                _config = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        private StickVisualizer _visualizer;
-        public StickVisualizer Visualizer
-        {
-            get => _visualizer;
-            set
-            {
-                _visualizer = value;
-
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private KeyboardInputConfig _config;

        private bool _isLeft;
        public bool IsLeft
@@ -60,10 +38,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

        public readonly InputViewModel ParentModel;

-        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config, StickVisualizer visualizer)
+        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config)
        {
            ParentModel = model;
-            Visualizer = visualizer;
            model.NotifyChangesEvent += OnParentModelChanged;
            OnParentModelChanged();
            Config = config;
--- a/src/Ryujinx/UI/ViewModels/Input/LedInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/LedInputViewModel.cs
@@ -3,7 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Humanizer;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using System.Globalization;

 namespace Ryujinx.Ava.UI.ViewModels.Input
--- 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,15 +17,14 @@ 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;
 using Ryujinx.Ava.UI.Models.Generic;
 using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
@@ -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/ModManagerViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs
@@ -7,7 +7,7 @@ using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
--- a/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;

 namespace Ryujinx.Ava.UI.ViewModels
 {
@@ -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
@@ -12,9 +12,9 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Systems.Configuration.System;
-using Ryujinx.Ava.Systems.Configuration.UI;
+using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Utilities.Configuration.System;
+using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.GraphicsDriver;
@@ -130,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; }
@@ -536,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;
@@ -644,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;
@@ -757,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/TitleUpdateViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs
@@ -6,7 +6,7 @@ using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
--- a/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
@@ -21,7 +21,7 @@ using Image = SkiaSharp.SKImage;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public partial class UserFirmwareAvatarSelectorViewModel : BaseModel
+    internal partial class UserFirmwareAvatarSelectorViewModel : BaseModel
    {
        private static readonly Dictionary<string, byte[]> _avatarStore = new();

--- a/src/Ryujinx/UI/ViewModels/UserProfileImageSelectorViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/UserProfileImageSelectorViewModel.cs
@@ -2,7 +2,7 @@ using CommunityToolkit.Mvvm.ComponentModel;

 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public partial class UserProfileImageSelectorViewModel : BaseModel
+    internal partial class UserProfileImageSelectorViewModel : BaseModel
    {
        [ObservableProperty] private bool _firmwareFound;
    }
--- a/src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs
@@ -6,7 +6,7 @@ using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Utilities;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -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"
@@ -34,7 +34,12 @@
        <!-- Button / JoyStick Settings -->
        <Grid
            Name="SettingButtons"
-            MinHeight="450" ColumnDefinitions="Auto,*,Auto">
+            MinHeight="450">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
            <!-- Left Controls -->
            <StackPanel
                Orientation="Vertical"
@@ -49,7 +54,15 @@
                    CornerRadius="5">
                    <Grid
                        Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                        <StackPanel
                            Grid.Column="0"
                            Grid.Row="0"
@@ -303,99 +316,17 @@
                HorizontalAlignment="Stretch"
                VerticalAlignment="Stretch">
                <!-- Controller Picture -->
+                <Image
+                    Margin="0,10"
+                    MaxHeight="300"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Source="{Binding Image}" />
                <Border
                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
                    BorderThickness="1"
                    CornerRadius="5"
-                    Margin="0,0, 0, 5"
                    MinHeight="90">
-                    <StackPanel Orientation="Vertical">
-                        <Image
-                            Margin="5,10"
-                            MaxHeight="300"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Source="{Binding Image}" />
-                        <StackPanel
-                            Margin="10"
-                            Orientation="Horizontal"
-                            Spacing="20"
-                            HorizontalAlignment="Center">
-                            <Border
-                                BorderBrush="Transparent"
-                                Height="{Binding Visualizer.UiStickBorderSize}"
-                                Width="{Binding Visualizer.UiStickBorderSize}"
-                                IsVisible="{Binding IsLeft}">
-                                <Canvas
-                                    Background="{DynamicResource ThemeBackgroundColor}"
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}">
-                                    <Grid
-                                        Height="{Binding Visualizer.UiCanvasSize}"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Background="{DynamicResource ThemeBackgroundColor}">
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Stroke="{DynamicResource ThemeControlBorderColor}"
-                                            StrokeThickness="1"
-                                            Width="{Binding Visualizer.UiCanvasSize}"
-                                            Height="{Binding Visualizer.UiCanvasSize}" />
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Fill="Black"
-                                            Opacity="100"
-                                            Height="{Binding Visualizer.UiDeadzoneLeft}"
-                                            Width="{Binding Visualizer.UiDeadzoneLeft}" />
-                                    </Grid>
-                                    <Ellipse
-                                        Fill="{DynamicResource Warning}"
-                                        Width="{Binding Visualizer.UiStickCircumference}"
-                                        Height="{Binding Visualizer.UiStickCircumference}"
-                                        Canvas.Bottom="{Binding Visualizer.UiStickLeftY}"
-                                        Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
-                                </Canvas>
-                            </Border>
-                            <Border
-                                BorderBrush="Transparent"
-                                Height="{Binding Visualizer.UiStickBorderSize}"
-                                Width="{Binding Visualizer.UiStickBorderSize}"
-                                IsVisible="{Binding IsRight}">
-                                <Canvas
-                                    Background="{DynamicResource ThemeBackgroundColor}"
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}">
-                                    <Grid
-                                        Height="{Binding Visualizer.UiCanvasSize}"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Background="{DynamicResource ThemeBackgroundColor}">
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Stroke="{DynamicResource ThemeControlBorderColor}"
-                                            StrokeThickness="1"
-                                            Width="{Binding Visualizer.UiCanvasSize}"
-                                            Height="{Binding Visualizer.UiCanvasSize}" />
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Fill="Black"
-                                            Opacity="100"
-                                            Height="{Binding Visualizer.UiDeadzoneRight}"
-                                            Width="{Binding Visualizer.UiDeadzoneRight}" />
-                                    </Grid>
-                                    <Ellipse
-                                        Fill="{DynamicResource Warning}"
-                                        Width="{Binding Visualizer.UiStickCircumference}"
-                                        Height="{Binding Visualizer.UiStickCircumference}"
-                                        Canvas.Bottom="{Binding Visualizer.UiStickRightY}"
-                                        Canvas.Left="{Binding Visualizer.UiStickRightX}" />
-                                </Canvas>
-                            </Border>
-                        </StackPanel>
-                    </StackPanel>
-                </Border>
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    CornerRadius="5">
                    <StackPanel
                        Margin="8"
                        Orientation="Vertical">
@@ -414,8 +345,8 @@
                                Minimum="0"
                                Value="{Binding Config.TriggerThreshold, Mode=TwoWay}" />
                            <TextBlock
-                                Width="25"
-                                Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
+                              Width="25"
+                              Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
                        </StackPanel>
                        <StackPanel
                            Orientation="Vertical"
@@ -497,7 +428,7 @@
                </Border>
                <!-- Motion, Rumble, LED -->
                <StackPanel
-                    Margin="0,5,0,0"
+                    Margin="0,10,0,0"
                    Spacing="5"
                    Orientation="Vertical"
                    VerticalAlignment="Bottom">
@@ -507,49 +438,77 @@
                        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>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <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>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <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}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <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>
@@ -567,7 +526,15 @@
                    CornerRadius="5">
                    <Grid
                        Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                        <StackPanel
                            Grid.Column="1"
                            Grid.Row="0"
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
@@ -4,7 +4,6 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -15,7 +14,7 @@ using StickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;

 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class ControllerInputView : RyujinxControl<ControllerInputViewModel>
+    public partial class ControllerInputView : UserControl
    {
        private ButtonKeyAssigner _currentAssigner;

@@ -218,12 +217,20 @@ namespace Ryujinx.Ava.UI.Views.Input
            PointerPressed -= MouseClick;
        }

-        private IButtonAssigner CreateButtonAssigner(bool forStick) =>
-            new GamepadButtonAssigner(
-                ViewModel.ParentModel.SelectedGamepad,
-                (ViewModel.ParentModel.Config as StandardControllerInputConfig).TriggerThreshold,
+        private IButtonAssigner CreateButtonAssigner(bool forStick)
+        {
+            IButtonAssigner assigner;
+
+            ControllerInputViewModel controllerInputViewModel = DataContext as ControllerInputViewModel;
+
+            assigner = new GamepadButtonAssigner(
+                controllerInputViewModel.ParentModel.SelectedGamepad,
+                (controllerInputViewModel.ParentModel.Config as StandardControllerInputConfig).TriggerThreshold,
                forStick);

+            return assigner;
+        }
+
        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
        {
            base.OnDetachedFromVisualTree(e);
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -35,13 +35,22 @@
            Margin="0 0 0 5"
            Orientation="Vertical"
            Spacing="5">
-            <Grid ColumnDefinitions="*,10,*">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
                <!-- Player Selection -->
                <Grid
                    Grid.Column="0"
                    Margin="2"
                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*">
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
                    <TextBlock
                        Margin="5,0,10,0"
                        Width="90"
@@ -68,7 +77,14 @@
                    Grid.Column="2"
                    Margin="2"
                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
                    <TextBlock
                        Margin="5,0,10,0"
                        Width="90"
@@ -123,12 +139,22 @@
                </Grid>
            </Grid>
            <Separator />
-            <Grid ColumnDefinitions="*,10,*">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
                <!-- Input Device -->
                <Grid
                    Grid.Column="0"
                    Margin="2"
-                    HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*,Auto">
+                    HorizontalAlignment="Stretch">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
                    <TextBlock
                        Grid.Column="0"
                        Margin="5,0,10,0"
@@ -160,7 +186,11 @@
                    Grid.Column="2"
                    Margin="2"
                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*">
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
                    <TextBlock
                        Margin="5,0,10,0"
                        Width="90"
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
@@ -1,19 +1,19 @@
 using Avalonia.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels.Input;

 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class InputView : RyujinxControl<InputViewModel>
+    public partial class InputView : UserControl
    {
        private bool _dialogOpen;
+        private InputViewModel ViewModel { get; set; }

        public InputView()
        {
-            ViewModel = new InputViewModel(this);
+            DataContext = ViewModel = new InputViewModel(this);

            InitializeComponent();
        }
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
@@ -32,7 +32,12 @@
        <!-- Button / JoyStick Settings -->
        <Grid
            Name="SettingButtons"
-            MinHeight="450" ColumnDefinitions="Auto,*,Auto">
+            MinHeight="450">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
            <!-- Left Controls -->
            <StackPanel
                Orientation="Vertical"
@@ -47,7 +52,15 @@
                    CornerRadius="5">
                    <Grid
                        Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                        <StackPanel
                            Grid.Column="0"
                            Grid.Row="0"
@@ -296,79 +309,12 @@
                HorizontalAlignment="Stretch"
                VerticalAlignment="Stretch">
                <!-- Controller Picture -->
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    CornerRadius="5"
+                <Image
                    Margin="0,10"
-                    MinHeight="90">
-                    <StackPanel
-                        Margin="10"
-                        Orientation="Horizontal"
-                        Spacing="20"
-                        HorizontalAlignment="Center">
-                        <Border
-                            BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                            BorderThickness="1"
-                            CornerRadius="5"
-                            Height="{Binding Visualizer.UiStickBorderSize}"
-                            Width="{Binding Visualizer.UiStickBorderSize}"
-                            IsVisible="{Binding IsLeft}">
-                            <Canvas
-                                Background="{DynamicResource ThemeBackgroundColor}"
-                                Height="{Binding Visualizer.UiCanvasSize}"
-                                Width="{Binding Visualizer.UiCanvasSize}">
-                                <Grid
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}"
-                                    Background="{DynamicResource ThemeBackgroundColor}">
-                                    <Ellipse
-                                        HorizontalAlignment="Center"
-                                        Stroke="Black"
-                                        StrokeThickness="1"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Height="{Binding Visualizer.UiCanvasSize}"/>
-                                </Grid>
-                                <Ellipse
-                                        Fill="Red" 
-                                        Width="{Binding Visualizer.UiStickCircumference}" 
-                                        Height="{Binding Visualizer.UiStickCircumference}" 
-                                        Canvas.Bottom="{Binding Visualizer.UiStickLeftY}" 
-                                        Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
-                            </Canvas>
-                        </Border>        
-                        <Border
-                            BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                            BorderThickness="1"
-                            CornerRadius="5"
-                            Height="{Binding Visualizer.UiStickBorderSize}"
-                            Width="{Binding Visualizer.UiStickBorderSize}"
-                            IsVisible="{Binding IsRight}">
-                            <Canvas
-                                Background="{DynamicResource ThemeBackgroundColor}"
-                                Height="{Binding Visualizer.UiCanvasSize}"
-                                Width="{Binding Visualizer.UiCanvasSize}">
-                                <Grid
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}"
-                                    Background="{DynamicResource ThemeBackgroundColor}">
-                                    <Ellipse
-                                        HorizontalAlignment="Center"
-                                        Stroke="Black"
-                                        StrokeThickness="1"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Height="{Binding Visualizer.UiCanvasSize}"/>
-                                </Grid>
-                                <Ellipse
-                                        Fill="Red" 
-                                        Width="{Binding Visualizer.UiStickCircumference}" 
-                                        Height="{Binding Visualizer.UiStickCircumference}" 
-                                        Canvas.Bottom="{Binding Visualizer.UiStickRightY}" 
-                                        Canvas.Left="{Binding Visualizer.UiStickRightX}" />
-                            </Canvas>
-                        </Border>        
-                    </StackPanel>
-                </Border>
+                    MaxHeight="300"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Source="{Binding Image}" />
                <Border
                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
                    BorderThickness="1"
@@ -467,7 +413,15 @@
                    CornerRadius="5">
                    <Grid
                        Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                        <StackPanel
                            Grid.Column="1"
                            Grid.Row="0"
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
@@ -4,7 +4,6 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Input;
@@ -14,7 +13,7 @@ using Key = Ryujinx.Common.Configuration.Hid.Key;

 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class KeyboardInputView : RyujinxControl<KeyboardInputViewModel>
+    public partial class KeyboardInputView : UserControl
    {
        private ButtonKeyAssigner _currentAssigner;

@@ -61,103 +60,106 @@ namespace Ryujinx.Ava.UI.Views.Input

                    PointerPressed += MouseClick;

-                    IKeyboard keyboard =
-                        (IKeyboard)ViewModel.ParentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
-                    IButtonAssigner assigner = 
-                        new KeyboardKeyAssigner((IKeyboard)ViewModel.ParentModel.SelectedGamepad);
+                    if (DataContext is not KeyboardInputViewModel viewModel)
+                        return;

-                    _currentAssigner.ButtonAssigned += (_, be) =>
+                    IKeyboard keyboard =
+                        (IKeyboard)viewModel.ParentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
+                    IButtonAssigner assigner = 
+                        new KeyboardKeyAssigner((IKeyboard)viewModel.ParentModel.SelectedGamepad);
+
+                    _currentAssigner.ButtonAssigned += (_, e) =>
                    {
-                        if (be.ButtonValue.HasValue)
+                        if (e.ButtonValue.HasValue)
                        {
-                            Button buttonValue = be.ButtonValue.Value;
-                            ViewModel.ParentModel.IsModified = true;
+                            Button buttonValue = e.ButtonValue.Value;
+                            viewModel.ParentModel.IsModified = true;

                            switch (button.Name)
                            {
                                case "ButtonZl":
-                                    ViewModel.Config.ButtonZl = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonZl = buttonValue.AsHidType<Key>();
                                    break;
                                case "ButtonL":
-                                    ViewModel.Config.ButtonL = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonL = buttonValue.AsHidType<Key>();
                                    break;
                                case "ButtonMinus":
-                                    ViewModel.Config.ButtonMinus = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonMinus = buttonValue.AsHidType<Key>();
                                    break;
                                case "LeftStickButton":
-                                    ViewModel.Config.LeftStickButton = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftStickButton = buttonValue.AsHidType<Key>();
                                    break;
                                case "LeftStickUp":
-                                    ViewModel.Config.LeftStickUp = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftStickUp = buttonValue.AsHidType<Key>();
                                    break;
                                case "LeftStickDown":
-                                    ViewModel.Config.LeftStickDown = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftStickDown = buttonValue.AsHidType<Key>();
                                    break;
                                case "LeftStickRight":
-                                    ViewModel.Config.LeftStickRight = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftStickRight = buttonValue.AsHidType<Key>();
                                    break;
                                case "LeftStickLeft":
-                                    ViewModel.Config.LeftStickLeft = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftStickLeft = buttonValue.AsHidType<Key>();
                                    break;
                                case "DpadUp":
-                                    ViewModel.Config.DpadUp = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.DpadUp = buttonValue.AsHidType<Key>();
                                    break;
                                case "DpadDown":
-                                    ViewModel.Config.DpadDown = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.DpadDown = buttonValue.AsHidType<Key>();
                                    break;
                                case "DpadLeft":
-                                    ViewModel.Config.DpadLeft = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.DpadLeft = buttonValue.AsHidType<Key>();
                                    break;
                                case "DpadRight":
-                                    ViewModel.Config.DpadRight = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.DpadRight = buttonValue.AsHidType<Key>();
                                    break;
                                case "LeftButtonSr":
-                                    ViewModel.Config.LeftButtonSr = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftButtonSr = buttonValue.AsHidType<Key>();
                                    break;
                                case "LeftButtonSl":
-                                    ViewModel.Config.LeftButtonSl = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftButtonSl = buttonValue.AsHidType<Key>();
                                    break;
                                case "RightButtonSr":
-                                    ViewModel.Config.RightButtonSr = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightButtonSr = buttonValue.AsHidType<Key>();
                                    break;
                                case "RightButtonSl":
-                                    ViewModel.Config.RightButtonSl = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightButtonSl = buttonValue.AsHidType<Key>();
                                    break;
                                case "ButtonZr":
-                                    ViewModel.Config.ButtonZr = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonZr = buttonValue.AsHidType<Key>();
                                    break;
                                case "ButtonR":
-                                    ViewModel.Config.ButtonR = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonR = buttonValue.AsHidType<Key>();
                                    break;
                                case "ButtonPlus":
-                                    ViewModel.Config.ButtonPlus = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonPlus = buttonValue.AsHidType<Key>();
                                    break;
                                case "ButtonA":
-                                    ViewModel.Config.ButtonA = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonA = buttonValue.AsHidType<Key>();
                                    break;
                                case "ButtonB":
-                                    ViewModel.Config.ButtonB = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonB = buttonValue.AsHidType<Key>();
                                    break;
                                case "ButtonX":
-                                    ViewModel.Config.ButtonX = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonX = buttonValue.AsHidType<Key>();
                                    break;
                                case "ButtonY":
-                                    ViewModel.Config.ButtonY = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonY = buttonValue.AsHidType<Key>();
                                    break;
                                case "RightStickButton":
-                                    ViewModel.Config.RightStickButton = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightStickButton = buttonValue.AsHidType<Key>();
                                    break;
                                case "RightStickUp":
-                                    ViewModel.Config.RightStickUp = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightStickUp = buttonValue.AsHidType<Key>();
                                    break;
                                case "RightStickDown":
-                                    ViewModel.Config.RightStickDown = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightStickDown = buttonValue.AsHidType<Key>();
                                    break;
                                case "RightStickRight":
-                                    ViewModel.Config.RightStickRight = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightStickRight = buttonValue.AsHidType<Key>();
                                    break;
                                case "RightStickLeft":
-                                    ViewModel.Config.RightStickLeft = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightStickLeft = buttonValue.AsHidType<Key>();
                                    break;
                            }
                        }
--- a/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs
@@ -1,18 +1,20 @@
 using Avalonia;
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using System.Threading.Tasks;

 namespace Ryujinx.UI.Views.Input
 {
-    public partial class LedInputView : RyujinxControl<LedInputViewModel>
+    public partial class LedInputView : UserControl
    {
+        private readonly LedInputViewModel _viewModel;
+        
        public LedInputView(ControllerInputViewModel viewModel)
        {
-            ViewModel = new LedInputViewModel
+            DataContext = _viewModel = new LedInputViewModel
            {
                ParentModel = viewModel.ParentModel,
                TurnOffLed = viewModel.Config.TurnOffLed,
@@ -27,18 +29,20 @@ namespace Ryujinx.UI.Views.Input
        private void ColorPickerButton_OnColorChanged(ColorPickerButton sender, ColorButtonColorChangedEventArgs args)
        {
            if (!args.NewColor.HasValue) return;
-            if (!ViewModel.EnableLedChanging) return;
-            if (ViewModel.TurnOffLed) return;
+            if (DataContext is not LedInputViewModel lvm) return;
+            if (!lvm.EnableLedChanging) return;
+            if (lvm.TurnOffLed) return;
            
-            ViewModel.ParentModel.SelectedGamepad.SetLed(args.NewColor.Value.ToUInt32());
+            lvm.ParentModel.SelectedGamepad.SetLed(args.NewColor.Value.ToUInt32());
        }

        private void ColorPickerButton_OnAttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
        {
-            if (!ViewModel.EnableLedChanging) return;
-            if (ViewModel.TurnOffLed) return;
+            if (DataContext is not LedInputViewModel lvm) return;
+            if (!lvm.EnableLedChanging) return;
+            if (lvm.TurnOffLed) return;
            
-            ViewModel.ParentModel.SelectedGamepad.SetLed(ViewModel.LedColor.ToUInt32());
+            lvm.ParentModel.SelectedGamepad.SetLed(lvm.LedColor.ToUInt32());
        }
        
        public static async Task Show(ControllerInputViewModel viewModel)
@@ -53,13 +57,13 @@ namespace Ryujinx.UI.Views.Input
                CloseButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsClose],
                Content = content,
            };
-            contentDialog.PrimaryButtonClick += (_, _) =>
+            contentDialog.PrimaryButtonClick += (sender, args) =>
            {
                GamepadInputConfig config = viewModel.Config;
-                config.EnableLedChanging = content.ViewModel.EnableLedChanging;
-                config.LedColor = content.ViewModel.LedColor;
-                config.UseRainbowLed = content.ViewModel.UseRainbowLed;
-                config.TurnOffLed = content.ViewModel.TurnOffLed;
+                config.EnableLedChanging = content._viewModel.EnableLedChanging;
+                config.LedColor = content._viewModel.LedColor;
+                config.UseRainbowLed = content._viewModel.UseRainbowLed;
+                config.TurnOffLed = content._viewModel.TurnOffLed;
            };

            await contentDialog.ShowAsync();
--- a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
@@ -11,7 +11,11 @@
    x:Class="Ryujinx.Ava.UI.Views.Input.MotionInputView"
    x:DataType="viewModels:MotionInputViewModel"
    Focusable="True">
-    <Grid Margin="10" RowDefinitions="Auto,*">
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
        <StackPanel Orientation="Vertical">
            <StackPanel
                Orientation="Horizontal"
@@ -76,7 +80,11 @@
            BorderThickness="1"
            CornerRadius="5"
            HorizontalAlignment="Stretch">
-            <Grid VerticalAlignment="Top" RowDefinitions="Auto,*">
+            <Grid VerticalAlignment="Top">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
                <StackPanel
                    Grid.Row="1"
                    HorizontalAlignment="Center"
@@ -110,7 +118,15 @@
                            Text="{Binding DsuServerPort, Mode=TwoWay}" />
                    </StackPanel>
                    <StackPanel Orientation="Vertical">
-                        <Grid RowDefinitions="*,*" ColumnDefinitions="*,*">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
                            <TextBlock
                                Margin="0,10,0,0"
                                VerticalAlignment="Center"
--- a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs
@@ -1,14 +1,16 @@
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using System.Threading.Tasks;

 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class MotionInputView : RyujinxControl<MotionInputViewModel>
+    public partial class MotionInputView : UserControl
    {
+        private readonly MotionInputViewModel _viewModel;
+
        public MotionInputView()
        {
            InitializeComponent();
@@ -18,7 +20,7 @@ namespace Ryujinx.Ava.UI.Views.Input
        {
            GamepadInputConfig config = viewModel.Config;

-            ViewModel = new MotionInputViewModel
+            _viewModel = new MotionInputViewModel
            {
                Slot = config.Slot,
                AltSlot = config.AltSlot,
@@ -31,6 +33,7 @@ namespace Ryujinx.Ava.UI.Views.Input
            };

            InitializeComponent();
+            DataContext = _viewModel;
        }

        public static async Task Show(ControllerInputViewModel viewModel)
@@ -45,17 +48,17 @@ namespace Ryujinx.Ava.UI.Views.Input
                CloseButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsClose],
                Content = content,
            };
-            contentDialog.PrimaryButtonClick += (_, _) =>
+            contentDialog.PrimaryButtonClick += (sender, args) =>
            {
                GamepadInputConfig config = viewModel.Config;
-                config.Slot = content.ViewModel.Slot;
-                config.Sensitivity = content.ViewModel.Sensitivity;
-                config.GyroDeadzone = content.ViewModel.GyroDeadzone;
-                config.AltSlot = content.ViewModel.AltSlot;
-                config.DsuServerHost = content.ViewModel.DsuServerHost;
-                config.DsuServerPort = content.ViewModel.DsuServerPort;
-                config.EnableCemuHookMotion = content.ViewModel.EnableCemuHookMotion;
-                config.MirrorInput = content.ViewModel.MirrorInput;
+                config.Slot = content._viewModel.Slot;
+                config.Sensitivity = content._viewModel.Sensitivity;
+                config.GyroDeadzone = content._viewModel.GyroDeadzone;
+                config.AltSlot = content._viewModel.AltSlot;
+                config.DsuServerHost = content._viewModel.DsuServerHost;
+                config.DsuServerPort = content._viewModel.DsuServerPort;
+                config.EnableCemuHookMotion = content._viewModel.EnableCemuHookMotion;
+                config.MirrorInput = content._viewModel.MirrorInput;
            };

            await contentDialog.ShowAsync();
--- a/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
@@ -10,7 +10,11 @@
    x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView"
    x:DataType="viewModels:RumbleInputViewModel"
    Focusable="True">
-    <Grid Margin="10" RowDefinitions="Auto,*">
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
        <StackPanel Orientation="Vertical">
            <StackPanel Orientation="Horizontal">
                <TextBlock
--- a/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs
@@ -1,14 +1,16 @@
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using System.Threading.Tasks;

 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class RumbleInputView : RyujinxControl<RumbleInputViewModel>
+    public partial class RumbleInputView : UserControl
    {
+        private readonly RumbleInputViewModel _viewModel;
+
        public RumbleInputView()
        {
            InitializeComponent();
@@ -18,13 +20,15 @@ namespace Ryujinx.Ava.UI.Views.Input
        {
            GamepadInputConfig config = viewModel.Config;

-            ViewModel = new RumbleInputViewModel
+            _viewModel = new RumbleInputViewModel
            {
                StrongRumble = config.StrongRumble,
                WeakRumble = config.WeakRumble,
            };

            InitializeComponent();
+
+            DataContext = _viewModel;
        }

        public static async Task Show(ControllerInputViewModel viewModel)
@@ -40,11 +44,11 @@ namespace Ryujinx.Ava.UI.Views.Input
                Content = content,
            };

-            contentDialog.PrimaryButtonClick += (_, _) =>
+            contentDialog.PrimaryButtonClick += (sender, args) =>
            {
                GamepadInputConfig config = viewModel.Config;
-                config.StrongRumble = content.ViewModel.StrongRumble;
-                config.WeakRumble = content.ViewModel.WeakRumble;
+                config.StrongRumble = content._viewModel.StrongRumble;
+                config.WeakRumble = content._viewModel.WeakRumble;
            };

            await contentDialog.ShowAsync();
--- 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
@@ -6,14 +6,13 @@ using Gommon;
 using LibHac.Common;
 using LibHac.Ns;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 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.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Utilities;
@@ -26,14 +25,18 @@ using System.Threading.Tasks;

 namespace Ryujinx.Ava.UI.Views.Main
 {
-    public partial class MainMenuBarView : RyujinxControl<MainWindowViewModel>
+    public partial class MainMenuBarView : UserControl
    {
        public MainWindow Window { get; private set; }
+        public MainWindowViewModel ViewModel { get; private set; }

        public MainMenuBarView()
        {
            InitializeComponent();

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

@@ -46,9 +49,9 @@ 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);
-            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityListWindow.Show());
+            XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
+            AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
+            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());

            UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;

@@ -70,7 +73,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                    {
                        Content = $".{it.FileName}",
                        IsChecked = it.FileType.GetConfigValue(ConfigurationState.Instance.UI.ShownFileTypes),
-                        Command = Commands.Create(() => Window.ToggleFileType(it.FileName))
+                        Command = MiniCommand.Create(() => Window.ToggleFileType(it.FileName))
                    }
                );

@@ -105,7 +108,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                    Margin = new Thickness(3, 0, 3, 0),
                    HorizontalAlignment = HorizontalAlignment.Stretch,
                    Header = languageName,
-                    Command = Commands.Create(() => MainWindowViewModel.ChangeLanguage(language))
+                    Command = MiniCommand.Create(() => MainWindowViewModel.ChangeLanguage(language))
                };

                yield return menuItem;
@@ -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,12 +1,11 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
@@ -14,7 +13,7 @@ using System;

 namespace Ryujinx.Ava.UI.Views.Main
 {
-    public partial class MainStatusBarView : RyujinxControl<MainWindowViewModel>
+    public partial class MainStatusBarView : UserControl
    {
        public MainWindow Window;

@@ -30,7 +29,7 @@ namespace Ryujinx.Ava.UI.Views.Main
            if (VisualRoot is MainWindow window)
            {
                Window = window;
-                ViewModel = window.ViewModel;
+                DataContext = window.ViewModel;
                LocaleManager.Instance.LocaleChanged += () => Dispatcher.UIThread.Post(() =>
                {
                    if (Window.ViewModel.EnableNonGameRunningControls)
--- a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml.cs
@@ -3,15 +3,16 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Ryujinx.Ava.Common;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using System;

 namespace Ryujinx.Ava.UI.Views.Main
 {
-    public partial class MainViewControls : RyujinxControl<MainWindowViewModel>
+    public partial class MainViewControls : UserControl
    {
+        public MainWindowViewModel ViewModel;
+
        public MainViewControls()
        {
            InitializeComponent();
@@ -23,7 +24,7 @@ namespace Ryujinx.Ava.UI.Views.Main

            if (VisualRoot is MainWindow window)
            {
-                ViewModel = window.ViewModel;
+                DataContext = ViewModel = window.ViewModel;
            }
        }

--- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Evan Husted	a8e453e1dc	Merge branch 'master' into ffmpeg-win-arm64	2025-03-02 18:41:17 -06:00
KeatonTheBot	03a73d763e	Disable trimming on win-arm64 * nuget: Bump System group to 9.0.2 * Clean up RuntimeIdentifiers in project files	2025-02-26 15:38:40 -06:00
KeatonTheBot	6c6640c7f3	Add win-arm64 to workflows	2025-02-26 15:38:40 -06:00
KeatonTheBot	05cb518d60	Update FFmpeg runtimes to 6.1.2 Add runtimes for win-arm64 arch.	2025-02-26 15:38:40 -06:00