change all grid RowDefinitions/ColumnDefinitions to direct property setters

slight settings window default height bump
optimize spacing
2025-03-02 17:50:40 -06:00 · 2025-03-02 16:11:11 -06:00 · 2025-03-02 16:11:11 -06:00 · 2025-03-02 16:11:11 -06:00 · 2025-03-02 15:44:26 -06:00 · 2025-02-26 20:01:14 -06:00
180 changed files with 1631 additions and 2124 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,6 @@ jobs:
        configuration: [Debug, Release]
        platform:
          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
-          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
          - { name: osx-x64,     os: macos-13,       zip_os_name: osx_x64     }
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -62,7 +62,6 @@ jobs:
            | Platform | Artifact |
            |--|--|
            | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
-            | Windows ARM 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) |
            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
@@ -80,7 +79,6 @@ jobs:
      matrix:
        platform:
          - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
-          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
          - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
          - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
    steps:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,8 +12,7 @@ env:
  RYUJINX_BASE_VERSION: "1.2"
  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
-  RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Stable-Releases"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
  RELEASE: 1

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

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

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -39,7 +39,7 @@
    <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.8.2" />
    <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
    <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
-    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
+    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
    <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
    <PackageVersion Include="Gommon" Version="2.7.1.1" />
@@ -53,8 +53,8 @@
    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
    <PackageVersion Include="SPB" Version="0.0.4-build32" />
-    <PackageVersion Include="System.IO.Hashing" Version="9.0.2" />
-    <PackageVersion Include="System.Management" Version="9.0.2" />
+    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
+    <PackageVersion Include="System.Management" Version="9.0.0" />
    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
  </ItemGroup>
 </Project>
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 <table align="center">
    <tr>
        <td align="center" width="25%">
-            <img src="https://raw.githubusercontent.com/Ryubing/Assets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
+            <img src="https://raw.githubusercontent.com/GreemDev/ryuassets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
        </td>
        <td align="center" width="75%">
          
 # Ryujinx
          
 [![Release workflow](https://github.com/Ryubing/Ryujinx/actions/workflows/release.yml/badge.svg)](https://github.com/Ryubing/Ryujinx/actions/workflows/release.yml)
-[![Latest release](https://img.shields.io/github/v/release/Ryubing/Ryujinx)](https://github.com/Ryubing/Ryujinx/releases/latest)
+[![Latest release](https://img.shields.io/github/v/release/GreemDev/Ryujinx)](https://github.com/Ryubing/Ryujinx/releases/latest)
  <br>
 [![Canary workflow](https://github.com/Ryubing/Ryujinx/actions/workflows/canary.yml/badge.svg)](https://github.com/Ryubing/Ryujinx/actions/workflows/canary.yml)
 [![Latest canary release](https://img.shields.io/github/v/release/Ryubing/Canary-Releases?label=canary)](https://github.com/Ryubing/Canary-Releases/releases/latest)
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
@@ -631,7 +631,6 @@
 010030D012FF6000,"Bus Driver Simulator",,playable,2022-10-17 13:55:27
 0100A9101418C000,"BUSTAFELLOWS",nvdec,playable,2020-10-17 20:04:41
 0100177005C8A000,"BUTCHER",,playable,2021-01-11 18:50:17
-01008c2019598000,"Bluey: The Videogame",,playable,2025-02-11 04:38:00
 01000B900D8B0000,"Cadence of Hyrule: Crypt of the NecroDancer Featuring The Legend of Zelda",slow;nvdec,playable,2024-04-01 22:43:40
 010065700EE06000,"Cadence of Hyrule: Crypt of the NecroDancer Featuring The Legend of Zelda Demo",demo;gpu;nvdec,ingame,2021-02-14 21:48:15
 01005C00117A8000,"Café Enchanté",,playable,2020-11-13 14:54:25
@@ -1383,9 +1382,6 @@
 0100763015C2E000,"Gunvolt Chronicles: Luminous Avenger iX 2",crash;Needs Update,nothing,2022-04-29 15:34:34
 01002C8018554000,"Gurimugurimoa OnceMore Demo",,playable,2022-07-29 22:07:31
 0100AC601DCA8000,"GYLT",crash,ingame,2024-03-18 20:16:51
-0100c3c012718000,"Grand Theft Auto: III – The Definitive Edition",gpu;UE4,ingame,2022-10-31 20:13:52
-0100182014022000,"Grand Theft Auto: Vice City – The Definitive Edition",gpu;UE4,ingame,2022-10-31 20:13:52
-010065a014024000,"Grand Theft Auto: San Andreas – The Definitive Edition",gpu;UE4,ingame,2022-10-31 20:13:52
 0100822012D76000,"HAAK",gpu,ingame,2023-02-19 14:31:05
 01007E100EFA8000,"Habroxia",,playable,2020-06-16 23:04:42
 0100535012974000,"Hades",vulkan,playable,2022-10-05 10:45:21
@@ -2733,7 +2729,7 @@
 0100C2500FC20000,"Splatoon™ 3",ldn-works;opengl-backend-bug;LAN;amd-vendor-bug,playable,2024-08-04 23:49:11
 0100BA0018500000,"Splatoon™ 3: Splatfest World Premiere",gpu;online-broken;demo,ingame,2022-09-19 03:17:12
 010062800D39C000,"SpongeBob SquarePants: Battle for Bikini Bottom - Rehydrated",online-broken;UE4;ldn-broken;vulkan-backend-bug,playable,2023-08-01 19:29:34
-01009FB0172F4000,"SpongeBob SquarePants: The Cosmic Shake",gpu;UE4,ingame,2024-03-04 16:35:00
+01009FB0172F4000,"SpongeBob SquarePants: The Cosmic Shake",gpu;UE4,ingame,2023-08-01 19:29:53
 010097C01336A000,"Spooky Chase",,playable,2022-11-04 12:17:44
 0100C6100D75E000,"Spooky Ghosts Dot Com",,playable,2021-06-15 15:16:11
 0100DE9005170000,"Sports Party",nvdec,playable,2021-03-05 13:40:42
--- a/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj
+++ b/src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj
@@ -2,7 +2,7 @@

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

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

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

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

 namespace Ryujinx.Common
--- a/src/Ryujinx.Cpu/ITickSource.cs
+++ b/src/Ryujinx.Cpu/ITickSource.cs
@@ -8,18 +8,11 @@ namespace Ryujinx.Cpu
    /// </summary>
    public interface ITickSource : ICounter
    {
-        public const long RealityTickScalar = 100;
-        
        /// <summary>
        /// Time elapsed since the counter was created.
        /// </summary>
        TimeSpan ElapsedTime { get; }

-        /// <summary>
-        /// Clock tick scalar, in percent points (100 = 1.0).
-        /// </summary>
-        long TickScalar { get; set; }
-
        /// <summary>
        /// Time elapsed since the counter was created, in seconds.
        /// </summary>
--- a/src/Ryujinx.Cpu/TickSource.cs
+++ b/src/Ryujinx.Cpu/TickSource.cs
@@ -15,36 +15,11 @@ namespace Ryujinx.Cpu
        /// <inheritdoc/>
        public ulong Counter => (ulong)(ElapsedSeconds * Frequency);

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

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

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

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

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

        private static string FormatLibraryNameForCurrentOs(string libraryName, int version)
--- a/src/Ryujinx.HLE/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.
@@ -103,11 +103,6 @@ namespace Ryujinx.HLE
        /// </summary>
        internal readonly bool EnablePtc;

-        /// <summary>
-        /// Control the arbitrary scalar applied to emulated CPU tick timing.
-        /// </summary>
-        public long TickScalar { get; set; }
-
        /// <summary>
        /// Control if the guest application should be told that there is a Internet connection available.
        /// </summary>
@@ -200,13 +195,20 @@ 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,
                                bool enableDockedMode,
                                bool enablePtc,
-                                long tickScalar,
                                bool enableInternetAccess,
                                IntegrityCheckLevel fsIntegrityCheckLevel,
                                int fsGlobalAccessLogMode,
@@ -225,14 +227,21 @@ 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;
            CustomVSyncInterval = customVSyncInterval;
            EnableDockedMode = enableDockedMode;
            EnablePtc = enablePtc;
-            TickScalar = tickScalar;
            EnableInternetAccess = enableInternetAccess;
            FsIntegrityCheckLevel = fsIntegrityCheckLevel;
            FsGlobalAccessLogMode = fsGlobalAccessLogMode;
@@ -250,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/IpcService.cs
+++ b/src/Ryujinx.HLE/HOS/Services/IpcService.cs
@@ -127,7 +127,10 @@ namespace Ryujinx.HLE.HOS.Services
                }
                else
                {
-                    string serviceName = (service is not DummyService dummyService) ? service.GetType().FullName : dummyService.ServiceName;
+                    string serviceName;
+
+
+                    serviceName = (service is not DummyService dummyService) ? service.GetType().FullName : dummyService.ServiceName;

                    Logger.Warning?.Print(LogClass.KernelIpc, $"Missing service {serviceName}: {commandId} ignored");
                }
--- a/src/Ryujinx.HLE/HOS/Services/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/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
+++ b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
@@ -2,7 +2,6 @@ using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.PreciseSleep;
-using Ryujinx.Cpu;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap;
@@ -90,7 +89,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
            }
            else
            {
-                _ticksPerFrame = ((Stopwatch.Frequency / _device.TargetVSyncInterval) * 100) / _device.TickScalar;
+                _ticksPerFrame = Stopwatch.Frequency / _device.TargetVSyncInterval;
                _targetVSyncInterval = _device.TargetVSyncInterval;
            }
        }
--- a/src/Ryujinx.HLE/PerformanceStatistics.cs
+++ b/src/Ryujinx.HLE/PerformanceStatistics.cs
@@ -6,8 +6,6 @@ namespace Ryujinx.HLE
 {
    public class PerformanceStatistics
    {
-        private readonly Switch _device;
-        
        private const int FrameTypeGame = 0;
        private const int PercentTypeFifo = 0;

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

        private readonly System.Timers.Timer _resetTimer;

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

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

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

        public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;

        public DirtyHacks DirtyHacks { get; }

-        public Switch(HleConfiguration configuration)
+        public Switch(HLEConfiguration configuration)
        {
            ArgumentNullException.ThrowIfNull(configuration.GpuRenderer);
            ArgumentNullException.ThrowIfNull(configuration.AudioDeviceDriver);
@@ -73,7 +64,7 @@ namespace Ryujinx.HLE
            Memory            = new MemoryBlock(Configuration.MemoryConfiguration.ToDramSize(), memoryAllocationFlags);
            Gpu               = new GpuContext(Configuration.GpuRenderer, DirtyHacks);
            System            = new HOS.Horizon(this);
-            Statistics        = new PerformanceStatistics(this);
+            Statistics        = new PerformanceStatistics();
            Hid               = new Hid(this, System.HidStorage);
            Processes         = new ProcessLoader(this);
            TamperMachine     = new TamperMachine();
@@ -84,7 +75,6 @@ namespace Ryujinx.HLE

            VSyncMode                               = Configuration.VSyncMode;
            CustomVSyncInterval                     = Configuration.CustomVSyncInterval;
-            TickScalar                              = TurboMode ? Configuration.TickScalar : ITickSource.RealityTickScalar;
            System.State.DockedMode                 = Configuration.EnableDockedMode;
            System.PerformanceState.PerformanceMode = System.State.DockedMode ? PerformanceMode.Boost : PerformanceMode.Default;
            System.EnablePtc                        = Configuration.EnablePtc;
@@ -104,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()
@@ -136,12 +122,6 @@ namespace Ryujinx.HLE
            }
        }

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

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

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

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

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

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

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

@@ -900,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(
+            MemoryConfiguration memoryConfiguration = ConfigurationState.Instance.System.DramSize.Value;
+
+            Device = new Switch(new HLEConfiguration(
                VirtualFileSystem,
                _viewModel.LibHacHorizonManager,
                ContentManager,
                _accountManager,
                _userChannelPersistence,
-                    renderer.TryMakeThreaded(ConfigurationState.Instance.Graphics.BackendThreading),
+                renderer,
                InitializeAudio(),
-                    _viewModel.UiHandler
-                )
-            );
+                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()
@@ -1116,23 +1152,11 @@ namespace Ryujinx.Ava.Systems
                LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                dockedMode,
                ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                FormatGameFrameRate(),
+                Device.Statistics.FormatGameFrameRate(),
                Device.Statistics.FormatFifoPercent(),
                _displayCount));
        }

-        private string FormatGameFrameRate()
-        {
-            string frameRate = Device.Statistics.GetGameFrameRate().ToString("00.00");
-            string frameTime = Device.Statistics.GetGameFrameTime().ToString("00.00");
-
-            return Device.TurboMode
-                ? LocaleManager.GetUnformatted(LocaleKeys.FpsTurboStatusBarText)
-                    .Format(frameRate, frameTime, Device.TickScalar)
-                : LocaleManager.GetUnformatted(LocaleKeys.FpsStatusBarText)
-                    .Format(frameRate, frameTime);
-        }
-
        public async Task ShowExitPrompt()
        {
            bool shouldExit = !ConfigurationState.Instance.ShowConfirmExit;
@@ -1158,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)
@@ -1228,28 +1249,18 @@ namespace Ryujinx.Ava.Systems

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

            return state;
        }
--- a/src/Ryujinx/Assets/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
--- 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/KeyboardHotkeyState.cs
+++ b/src/Ryujinx/Common/KeyboardHotkeyState.cs
@@ -14,6 +14,5 @@ namespace Ryujinx.Ava.Common
        VolumeDown,
        CustomVSyncIntervalIncrement,
        CustomVSyncIntervalDecrement,
-        TurboMode,
    }
 }
--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -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,15 +44,19 @@ 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 static string GetUnformatted(LocaleKeys key) => Instance.Get(key);
-
-        public string Get(LocaleKeys key) =>
-            _localeStrings.TryGetValue(key, out string value) 
-                ? value 
-                : key.ToString();
-
        public string this[LocaleKeys key]
        {
            get
--- a/src/Ryujinx/Common/Markup/MarkupExtensions.cs
+++ b/src/Ryujinx/Common/Markup/MarkupExtensions.cs
@@ -24,17 +24,4 @@ namespace Ryujinx.Ava.Common.Markup
        protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
            => bindingExtension.Source = LocaleManager.Instance;
    }
-    
-    internal class WindowTitleExtension(LocaleKeys key, bool includeVersion) : BasicMarkupExtension<string>
-    {
-        public WindowTitleExtension(LocaleKeys key) : this(key, true)
-        {
-        }
-        
-        public override string Name => "WindowTitleTranslation";
-        protected override string Value => RyujinxApp.FormatTitle(key, includeVersion);
-
-        protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
-            => bindingExtension.Source = LocaleManager.Instance;
-    }
 }
--- a/src/Ryujinx/Common/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;
@@ -11,8 +10,8 @@ using Ryujinx.Common.Configuration.Hid.Controller.Motion;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
-using Ryujinx.Cpu;
 using Ryujinx.Graphics.GAL;
+using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
 using Ryujinx.HLE;
@@ -313,16 +312,31 @@ namespace Ryujinx.Headless
            return new OpenGLRenderer();
        }

-        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) =>
-            new(
-                new HleConfiguration(
+        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,
-                        ITickSource.RealityTickScalar,
                options.EnableInternetAccess,
                !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
                options.FsGlobalAccessLogMode,
@@ -338,18 +352,9 @@ namespace Ryujinx.Headless
                false,
                string.Empty,
                string.Empty,
-                        options.CustomVSyncInterval
-                    )
-                    .Configure(
-                        _virtualFileSystem,
-                        _libHacHorizonManager,
-                        _contentManager,
-                        _accountManager,
-                        _userChannelPersistence,
-                        renderer.TryMakeThreaded(options.BackendThreading),
-                        new SDL2HardwareDeviceDriver(),
-                        window
-                    )
-            );
+                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;win-arm64;osx-arm64;linux-arm64;</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
    <OutputType>Exe</OutputType>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Version>1.0.0-dirty</Version>
@@ -29,18 +29,12 @@
    <TrimMode>partial</TrimMode>
  </PropertyGroup>

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

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

--- a/src/Ryujinx/UI/RyujinxApp.axaml
+++ b/src/Ryujinx/UI/RyujinxApp.axaml
@@ -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.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"
--- 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"
--- 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"
--- 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/HotkeyConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/HotkeyConfig.cs
@@ -28,10 +28,6 @@ namespace Ryujinx.Ava.UI.Models.Input

        [ObservableProperty] private Key _customVSyncIntervalDecrement;

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

        public KeyboardHotkeys GetConfig() =>
@@ -66,8 +60,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                VolumeDown = VolumeDown,
                CustomVSyncIntervalIncrement = CustomVSyncIntervalIncrement,
                CustomVSyncIntervalDecrement = CustomVSyncIntervalDecrement,
-                TurboMode = TurboMode,
-                TurboModeWhileHeld = TurboModeWhileHeld
            };
    }
 }
--- a/src/Ryujinx/UI/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
@@ -37,6 +39,32 @@ namespace Ryujinx.Ava.UI.Renderer
                _ => 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/AmiiboWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AmiiboWindowViewModel.cs
@@ -432,7 +432,7 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            try
            {
-                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json"));
+                HttpResponseMessage response = await _httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, "https://raw.githubusercontent.com/Ryubing/Ryujinx/refs/heads/master/assets/amiibo/Amiibo.json"));

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

                if (response.IsSuccessStatusCode)
                {
--- a/src/Ryujinx/UI/ViewModels/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
@@ -1,5 +1,9 @@
 using Avalonia.Svg.Skia;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Input;
+using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
 using Ryujinx.Common.Utilities;
--- a/src/Ryujinx/UI/ViewModels/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;
--- 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;
@@ -60,7 +60,6 @@ namespace Ryujinx.Ava.UI.ViewModels
        private bool _enableCustomVSyncInterval;
        private int _customVSyncIntervalPercentageProxy;
        private VSyncMode _vSyncMode;
-        private long _turboModeMultiplier;

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

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

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

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

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

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

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

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

--- a/src/Ryujinx/UI/ViewModels/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"
@@ -507,49 +507,65 @@
                        CornerRadius="5"
                        VerticalAlignment="Bottom"
                        HorizontalAlignment="Stretch">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                            <StackPanel Orientation="Vertical" Spacing="5">
+                        <Grid ColumnDefinitions="*,Auto">
                            <CheckBox
-                                    Margin="10, 10, 10, 0"
+                                Margin="10"
                                MinWidth="0"
+                                Grid.Column="0"
                                IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
                                <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
                            </CheckBox>
                            <Button
-                                    Margin="10, 0, 10, 10"
+                                Margin="10"
+                                Grid.Column="1"
                                Command="{Binding ShowMotionConfig}">
-                                    <pt:Icon Value="fa-solid fa-gear" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
                            </Button>
-                            </StackPanel>
-                            <controls:MiniVerticalSeparator Height="64"/>
-                            <StackPanel Orientation="Vertical" Spacing="5">
+                        </Grid>
+                    </Border>
+                    <Border
+                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="5"
+                        HorizontalAlignment="Stretch"
+                        Margin="0,-1,0,0">
+                        <Grid ColumnDefinitions="*,Auto">
                            <CheckBox
-                                    Margin="10, 10, 10, 0"
+                                Margin="10"
                                MinWidth="0"
+                                Grid.Column="0"
                                IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
                                <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
                            </CheckBox>
                            <Button
-                                    Margin="10, 0, 10, 10"
+                                Margin="10"
+                                Grid.Column="1"
                                Command="{Binding ShowRumbleConfig}">
-                                    <pt:Icon Value="fa-solid fa-gear" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
                            </Button>
-                            </StackPanel>
-                            <controls:MiniVerticalSeparator Height="64" IsVisible="{Binding ParentModel.HasLed}"/>
-                            <StackPanel Orientation="Vertical" Spacing="5">
+                        </Grid>
+                    </Border>
+                    <Border
+                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="5"
+                        HorizontalAlignment="Stretch"
+                        Margin="0,-1,0,0">
+                        <Grid IsVisible="{Binding ParentModel.HasLed}" ColumnDefinitions="*,Auto">
                            <CheckBox
-                                    Margin="10, 10, 10, 0"
+                                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, 0, 10, 10"
+                                Margin="10"
+                                Grid.Column="1"
                                Command="{Binding ShowLedConfig}">
-                                    <pt:Icon Value="fa-solid fa-gear" />
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
                            </Button>
-                            </StackPanel>
-                        </StackPanel>
+                        </Grid>
                    </Border>
                </StackPanel>
            </StackPanel>
--- 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.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.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.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.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 
+        <Image
+            Name="RyuLogo"
            Margin="7, 0"
-            ToolTip.Tip="{Binding Title}"/>
+            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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Evan Husted	5a3eac99d6	change all grid RowDefinitions/ColumnDefinitions to direct property setters	2025-03-02 17:50:40 -06:00
Evan Husted	e8071e9c43	slight settings window default height bump	2025-03-02 16:11:11 -06:00
Evan Husted	eec39806e0	optimize spacing	2025-03-02 16:11:11 -06:00
Evan Husted	a65acae4aa	Restyle stick visualizer	2025-03-02 16:11:11 -06:00
Evan Husted	2a97c00a55	Merge branch 'master' into xeyes	2025-03-02 15:44:26 -06:00
Evan Husted	e8f6931d5f	Merge branch 'master' into xeyes	2025-02-26 20:01:14 -06:00
Evan Husted	e914e94ad3	Merge branch 'master' into xeyes	2025-02-23 17:30:41 -06:00
Evan Husted	8a6f806dda	Merge branch 'master' into xeyes	2025-02-12 16:34:47 -06:00
Evan Husted	15d589c455	Merge branch 'master' into xeyes	2025-02-11 22:55:43 -06:00
Evan Husted	3262020e18	Merge branch 'master' into xeyes	2025-02-07 21:35:51 -06:00
Evan Husted	a3afebd3a2	Merge branch 'master' into xeyes	2025-02-05 14:59:03 -06:00
Evan Husted	24e88e2485	Merge branch 'master' into xeyes	2025-01-29 02:48:51 -06:00
Evan Husted	3b447b764e	Merge branch 'master' into xeyes	2025-01-28 01:45:49 -06:00
Evan Husted	849fd0199e	Merge branch 'master' into xeyes	2025-01-26 17:33:58 -06:00
Evan Husted	57e26114e8	Merge branch 'master' into xeyes	2025-01-25 21:56:40 -06:00
Evan Husted	6a283190b3	Add the controller image back	2025-01-24 22:24:02 -06:00
MutantAura	85547874c8	Consolidate most logic into `StickVisualizer`.	2025-01-24 20:08:58 -06:00
MutantAura	16ca8e5005	Move most logic into new `StickVisualizer` class and add keyboard support.	2025-01-24 20:01:36 -06:00
MutantAura	cfa5ad0757	Simplfy clamping and fix bug on window close.	2025-01-24 19:58:17 -06:00
MutantAura	43ece083b2	Move some backing fields to match others. formatting pt.2	2025-01-24 19:57:11 -06:00
MutantAura	e1f5c501b0	Fix some issues with stick magnitude.	2025-01-24 19:56:21 -06:00
MutantAura	ffe366d953	Cleanup AXAML and hide sticks when only one is present on guest controller.	2025-01-24 19:52:57 -06:00
MutantAura	75c7a29278	style and analyzers	2025-01-24 19:52:52 -06:00
MutantAura	3a0d9c1435	whitespace	2025-01-24 19:52:47 -06:00
MutantAura	93d1476a2a	Remove unused grid definitions.	2025-01-24 19:52:39 -06:00
MutantAura	ce13830063	Clean up some magic numbers between code and axaml.	2025-01-24 19:52:24 -06:00
MutantAura	aa3f2824e0	Polish the aesthetic and include deadzone visualization.	2025-01-24 19:51:44 -06:00
MutantAura	d2bb580aea	Initial implementation of analog stick visualization.	2025-01-24 19:50:09 -06:00