Merge daf2771859 into f3a9cecf72

.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     }

.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:

.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: "Ryujinx"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Stable-Releases"
   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
 

COMPILING.md

@@ -5,7 +5,7 @@ If you wish to build the emulator yourself, follow these steps:
 
 ### Step 1
 
-Install the [.NET 9.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/9.0).
+Install the [.NET 10.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/10.0).
 Make sure your SDK version is higher or equal to the required version specified in [global.json](global.json).
 
 ### Step 2

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 </Project>

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.IO.Hashing" Version="9.0.0" />
-    <PackageVersion Include="System.Management" Version="9.0.2" />
+    <PackageVersion Include="System.Management" Version="9.0.0" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
 </Project>

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)

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100-preview.1.25120.13",
     "rollForward": "latestFeature"
   }
 }

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>

src/Ryujinx.Common/Configuration/DirtyHack.cs

@@ -9,8 +9,7 @@ namespace Ryujinx.Common.Configuration
     public enum DirtyHack : byte
     {
         Xc2MenuSoftlockFix = 1,
-        // ShaderTranslationDelay = 2
+        ShaderTranslationDelay = 2
-        NifmServiceDisableIsAnyInternetRequestAccepted = 3
     }
 
     public readonly struct EnabledDirtyHack(DirtyHack hack, int value)

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; }
     }
 }

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}";
     }
 }

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

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>

src/Ryujinx.Cpu/TickSource.cs

@@ -15,36 +15,11 @@ namespace Ryujinx.Cpu
         /// <inheritdoc/>
         public ulong Counter => (ulong)(ElapsedSeconds * Frequency);
 
-        
+        /// <inheritdoc/>
-        public long TickScalar { get; set; }
+        public TimeSpan ElapsedTime => _tickCounter.Elapsed;
-
-
-        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 double ElapsedSeconds => _tickCounter.ElapsedTicks * _hostTickFreq;
-        public TimeSpan ElapsedTime => Stopwatch.GetElapsedTime(0, ElapsedTicks);
-
-        /// <inheritdoc/>
-        public double ElapsedSeconds => ElapsedTicks * _hostTickFreq;
 
         public TickSource(ulong frequency)
         {

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;
+            IndexBufferState indexBuffer = _state.State.IndexBufferState;
-
-            if (!indexBufferNullable.HasValue)
-            {
-                return;
-            }
-
-            IndexBufferState indexBuffer = indexBufferNullable.Value;
 
             if (_drawState.IndexCount == 0)
             {

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) },
+            { AvCodecLibraryName, (58, 59) },
-            { AvUtilLibraryName, (56, 59) },
+            { AvUtilLibraryName, (56, 57) },
         };
 
         private static string FormatLibraryNameForCurrentOs(string libraryName, int version)

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

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;
         }

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;

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;

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;
             }
         }

src/Ryujinx.HLE/HleConfiguration.cs

@@ -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>
@@ -206,7 +201,6 @@ namespace Ryujinx.HLE
                                 VSyncMode vSyncMode,
                                 bool enableDockedMode,
                                 bool enablePtc,
-                                long tickScalar,
                                 bool enableInternetAccess,
                                 IntegrityCheckLevel fsIntegrityCheckLevel,
                                 int fsGlobalAccessLogMode,
@@ -232,7 +226,6 @@ namespace Ryujinx.HLE
             CustomVSyncInterval = customVSyncInterval;
             EnableDockedMode = enableDockedMode;
             EnablePtc = enablePtc;
-            TickScalar = tickScalar;
             EnableInternetAccess = enableInternetAccess;
             FsIntegrityCheckLevel = fsIntegrityCheckLevel;
             FsGlobalAccessLogMode = fsGlobalAccessLogMode;

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();

src/Ryujinx.HLE/Switch.cs

@@ -4,7 +4,6 @@ using Ryujinx.Audio.Backends.CompatLayer;
 using Ryujinx.Audio.Integration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
-using Ryujinx.Cpu;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
@@ -27,26 +26,18 @@ namespace Ryujinx.HLE
         public GpuContext Gpu { get; }
         public VirtualFileSystem FileSystem { get; }
         public HOS.Horizon System { get; }
-
-        public bool TurboMode = false;
-
-        public long TickScalar
-        {
-            get => System?.TickSource?.TickScalar ?? ITickSource.RealityTickScalar;
-            set => System.TickSource.TickScalar = value;
-        }
-        
         public ProcessLoader Processes { get; }
         public PerformanceStatistics Statistics { get; }
         public Hid Hid { get; }
         public TamperMachine TamperMachine { get; }
         public IHostUIHandler UIHandler { get; }
 
-        public int CpuCoresCount = 4; // Switch has a quad-core Tegra X1 SoC
+        public int CpuCoresCount = 4; //Switch 1 has 4 cores
 
         public VSyncMode VSyncMode { get; set; }
         public bool CustomVSyncIntervalEnabled { get; set; }
         public int CustomVSyncInterval { get; set; }
+
         public long TargetVSyncInterval { get; set; } = 60;
 
         public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;
@@ -73,7 +64,7 @@ namespace Ryujinx.HLE
             Memory            = new MemoryBlock(Configuration.MemoryConfiguration.ToDramSize(), memoryAllocationFlags);
             Gpu               = new GpuContext(Configuration.GpuRenderer, DirtyHacks);
             System            = new HOS.Horizon(this);
-            Statistics        = new PerformanceStatistics(this);
+            Statistics        = new PerformanceStatistics();
             Hid               = new Hid(this, System.HidStorage);
             Processes         = new ProcessLoader(this);
             TamperMachine     = new TamperMachine();
@@ -84,7 +75,6 @@ namespace Ryujinx.HLE
 
             VSyncMode                               = Configuration.VSyncMode;
             CustomVSyncInterval                     = Configuration.CustomVSyncInterval;
-            TickScalar                              = TurboMode ? Configuration.TickScalar : ITickSource.RealityTickScalar;
             System.State.DockedMode                 = Configuration.EnableDockedMode;
             System.PerformanceState.PerformanceMode = System.State.DockedMode ? PerformanceMode.Boost : PerformanceMode.Default;
             System.EnablePtc                        = Configuration.EnablePtc;
@@ -136,12 +126,6 @@ namespace Ryujinx.HLE
             }
         }
 
-        public void ToggleTurbo()
-        {
-            TurboMode = !TurboMode;
-            TickScalar = TurboMode ? Configuration.TickScalar : ITickSource.RealityTickScalar;
-        }
-
         public bool LoadCart(string exeFsDir, string romFsFile = null) => Processes.LoadUnpackedNca(exeFsDir, romFsFile);
         public bool LoadXci(string xciFile, ulong applicationId = 0) => Processes.LoadXci(xciFile, applicationId);
         public bool LoadNca(string ncaFile, BlitStruct<ApplicationControlProperty>? customNacpData = null) => Processes.LoadNca(ncaFile, customNacpData);

src/Ryujinx/AppHost.cs

@@ -4,9 +4,9 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Threading;
 using DiscordRPC;
-using Gommon;
 using LibHac.Common;
 using LibHac.Ns;
+using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.Dummy;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -35,9 +35,11 @@ using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
+using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
+using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
 using SkiaSharp;
@@ -60,7 +62,7 @@ using Size = Avalonia.Size;
 using Switch = Ryujinx.HLE.Switch;
 using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
-namespace Ryujinx.Ava.Systems
+namespace Ryujinx.Ava
 {
     internal class AppHost
     {
@@ -1116,23 +1118,11 @@ namespace Ryujinx.Ava.Systems
                 LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                 dockedMode,
                 ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                FormatGameFrameRate(),
+                Device.Statistics.FormatGameFrameRate(),
                 Device.Statistics.FormatFifoPercent(),
                 _displayCount));
         }
 
-        private string FormatGameFrameRate()
-        {
-            string frameRate = Device.Statistics.GetGameFrameRate().ToString("00.00");
-            string frameTime = Device.Statistics.GetGameFrameTime().ToString("00.00");
-
-            return Device.TurboMode
-                ? LocaleManager.GetUnformatted(LocaleKeys.FpsTurboStatusBarText)
-                    .Format(frameRate, frameTime, Device.TickScalar)
-                : LocaleManager.GetUnformatted(LocaleKeys.FpsStatusBarText)
-                    .Format(frameRate, frameTime);
-        }
-
         public async Task ShowExitPrompt()
         {
             bool shouldExit = !ConfigurationState.Instance.ShowConfirmExit;
@@ -1228,12 +1218,6 @@ namespace Ryujinx.Ava.Systems
 
                 if (currentHotkeyState != _prevHotkeyState)
                 {
-                    if (ConfigurationState.Instance.Hid.Hotkeys.Value.TurboModeWhileHeld &&
-                        _keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.TurboMode) != Device.TurboMode)
-                    {
-                        Device.ToggleTurbo();
-                    }
-                    
                     switch (currentHotkeyState)
                     {
                         case KeyboardHotkeyState.ToggleVSyncMode:
@@ -1245,12 +1229,6 @@ namespace Ryujinx.Ava.Systems
                         case KeyboardHotkeyState.CustomVSyncIntervalIncrement:
                             _viewModel.CustomVSyncInterval = Device.IncrementCustomVSyncInterval();
                             break;
-                        case KeyboardHotkeyState.TurboMode:
-                            if (!ConfigurationState.Instance.Hid.Hotkeys.Value.TurboModeWhileHeld)
-                            {
-                                Device.ToggleTurbo();
-                            }
-                            break;
                         case KeyboardHotkeyState.Screenshot:
                             ScreenshotRequested = true;
                             break;
@@ -1380,10 +1358,6 @@ namespace Ryujinx.Ava.Systems
             {
                 state = KeyboardHotkeyState.CustomVSyncIntervalDecrement;
             }
-            else if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.TurboMode))
-            {
-                state = KeyboardHotkeyState.TurboMode;
-            }
 
             return state;
         }

src/Ryujinx/Common/KeyboardHotkeyState.cs

@@ -14,6 +14,5 @@ namespace Ryujinx.Ava.Common
         VolumeDown,
         CustomVSyncIntervalIncrement,
         CustomVSyncIntervalDecrement,
-        TurboMode,
     }
 }

src/Ryujinx/Common/LocaleManager.cs

@@ -38,8 +38,8 @@ namespace Ryujinx.Ava.Common.Locale
                 { LocaleKeys.RyujinxConfirm, [RyujinxApp.FullAppName] },
                 { LocaleKeys.RyujinxUpdater, [RyujinxApp.FullAppName] },
                 { LocaleKeys.RyujinxRebooter, [RyujinxApp.FullAppName] },
-                { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityDatabase.Entries.Length] },
+                { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityCsv.Entries.Length] },
-                { LocaleKeys.CompatibilityListTitle, [CompatibilityDatabase.Entries.Length] }
+                { LocaleKeys.CompatibilityListTitle, [CompatibilityCsv.Entries.Length] }
             });
 
             Load();
@@ -61,13 +61,6 @@ namespace Ryujinx.Ava.Common.Locale
             }
         }
 
-        public static string GetUnformatted(LocaleKeys key) => Instance.Get(key);
-
-        public string Get(LocaleKeys key) =>
-            _localeStrings.TryGetValue(key, out string value) 
-                ? value 
-                : key.ToString();
-
         public string this[LocaleKeys key]
         {
             get

src/Ryujinx/Common/Markup/MarkupExtensions.cs

@@ -1,4 +1,5 @@
 using Avalonia.Markup.Xaml.MarkupExtensions;
+using Humanizer;
 using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;
 

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;
             }

src/Ryujinx/DiscordIntegrationModule.cs

@@ -9,9 +9,10 @@ using Ryujinx.Common.Logging;
 using Ryujinx.HLE;
 using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.Horizon;
+using Ryujinx.Horizon.Prepo.Types;
 using System.Text;
 
-namespace Ryujinx.Ava.Systems
+namespace Ryujinx.Ava
 {
     public static class DiscordIntegrationModule
     {
@@ -123,7 +124,7 @@ namespace Ryujinx.Ava.Systems
             _currentApp = null;
         }
 
-        private static void HandlePlayReport(Horizon.Prepo.Types.PlayReport playReport)
+        private static void HandlePlayReport(PlayReport playReport)
         {
             if (_discordClient is null) return;
             if (!TitleIDs.CurrentApplication.Value.HasValue) return;

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -2,7 +2,6 @@ using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -11,8 +10,8 @@ using Ryujinx.Common.Configuration.Hid.Controller.Motion;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
-using Ryujinx.Cpu;
 using Ryujinx.Graphics.GAL;
+using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
 using Ryujinx.HLE;
@@ -322,7 +321,6 @@ namespace Ryujinx.Headless
                         options.VSyncMode,
                         !options.DisableDockedMode,
                         !options.DisablePTC,
-                        ITickSource.RealityTickScalar,
                         options.EnableInternetAccess,
                         !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
                         options.FsGlobalAccessLogMode,

src/Ryujinx/Program.cs

@@ -5,7 +5,6 @@ using Gommon;
 using Projektanker.Icons.Avalonia;
 using Projektanker.Icons.Avalonia.FontAwesome;
 using Projektanker.Icons.Avalonia.MaterialDesign;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;

src/Ryujinx/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
     {

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.Nvdec.Dependencies" />
-    <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.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>
 

src/Ryujinx/RyujinxApp.axaml.cs

@@ -7,12 +7,12 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Windowing;
 using Gommon;
+using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using System;
@@ -150,7 +150,7 @@ namespace Ryujinx.Ava
 
         private async void AboutRyujinx_OnClick(object sender, EventArgs e)
         {
-            await AboutView.Show();
+            await AboutWindow.Show();
         }
     }
 }

src/Ryujinx/Systems/AppLibrary/ApplicationData.cs

@@ -36,7 +36,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
             {
                 _id = value;
 
-                Compatibility = CompatibilityDatabase.Find(value);
+                Compatibility = CompatibilityCsv.Find(value);
                 RichPresenceSpec = PlayReports.Analyzer.TryGetSpec(IdString, out GameSpec gameSpec) 
                     ? gameSpec 
                     : default(Optional<GameSpec>);

src/Ryujinx/Systems/AppLibrary/LdnGameDataReceivedEventArgs.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace Ryujinx.Ava.Systems.AppLibrary
 {

src/Ryujinx/Systems/CompatibilityCsv.cs

@@ -11,9 +11,24 @@ using System.Text;
 
 namespace Ryujinx.Ava.Systems
 {
-    public class CompatibilityDatabase
+    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
     {
-        static CompatibilityDatabase() => Load();
+        public const string TitleIdCol = "\"title_id\"";
+        public const string GameNameCol = "\"game_name\"";
+        public const string LabelsCol = "\"labels\"";
+        public const string StatusCol = "\"status\"";
+        public const string LastUpdatedCol = "\"last_updated\"";
+        
+        public readonly int TitleId = getIndex(TitleIdCol);
+        public readonly int GameName = getIndex(GameNameCol);
+        public readonly int Labels = getIndex(LabelsCol);
+        public readonly int Status = getIndex(StatusCol);
+        public readonly int LastUpdated = getIndex(LastUpdatedCol);
+    }
+    
+    public class CompatibilityCsv
+    {
+        static CompatibilityCsv() => Load();
 
         public static void Load()
         {
@@ -50,6 +65,16 @@ namespace Ryujinx.Ava.Systems
         
         public static CompatibilityEntry Find(ulong titleId)
             => Find(titleId.ToString("X16"));
+        
+        public static LocaleKeys? GetStatus(string titleId)
+            => Find(titleId)?.Status;
+        
+        public static LocaleKeys? GetStatus(ulong titleId) => GetStatus(titleId.ToString("X16"));
+        
+        public static string GetLabels(string titleId)
+            => Find(titleId)?.FormattedIssueLabels;
+        
+        public static string GetLabels(ulong titleId) => GetLabels(titleId.ToString("X16"));
     }
 
     public class CompatibilityEntry
@@ -110,7 +135,6 @@ namespace Ryujinx.Ava.Systems
 
         public string FormattedIssueLabels => Labels
             .Select(FormatLabelName)
-            .Where(x => x != null)
             .JoinToString(", ");
 
         public override string ToString() =>
@@ -134,6 +158,7 @@ namespace Ryujinx.Ava.Systems
             "gui" => "GUI",
             "help wanted" => "Help Wanted",
             "horizon" => "Horizon",
+            "infra" => "Project Infra",
             "invalid" => "Invalid",
             "kernel" => "Kernel",
             "ldn" => "LDN",
@@ -147,9 +172,9 @@ namespace Ryujinx.Ava.Systems
             "ldn-untested" => "LDN Untested",
             "ldn-broken" => "LDN Broken",
             "ldn-partial" => "Partial LDN",
-            "nvdec" => "GPU Video Decoding",
+            "nvdec" => "NVDEC",
-            "services" => "HLE Services",
+            "services" => "NX Services",
-            "services-horizon" => "New HLE Services",
+            "services-horizon" => "Horizon OS Services",
             "slow" => "Runs Slow",
             "crash" => "Crashes",
             "deadlock" => "Deadlock",
@@ -157,7 +182,7 @@ namespace Ryujinx.Ava.Systems
             "opengl" => "OpenGL",
             "opengl-backend-bug" => "OpenGL Backend Bug",
             "vulkan-backend-bug" => "Vulkan Backend Bug",
-            "mac-bug" => "Mac-specific Problems",
+            "mac-bug" => "Mac-specific Bug(s)",
             "amd-vendor-bug" => "AMD GPU Bug",
             "intel-vendor-bug" => "Intel GPU Bug",
             "loader-allocator" => "Loader Allocator",
@@ -166,22 +191,18 @@ namespace Ryujinx.Ava.Systems
             "UE4" => "Unreal Engine 4",
             "homebrew" => "Homebrew Content",
             "online-broken" => "Online Broken",
-            _ => null
+            _ => Capitalize(labelName)
         };
-    }
         
-    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
+        public static string Capitalize(string value)
         {
-        private const string TitleIdCol = "\"title_id\"";
+            if (value == string.Empty)
-        private const string GameNameCol = "\"game_name\"";
+                return string.Empty;
-        private const string LabelsCol = "\"labels\"";
-        private const string StatusCol = "\"status\"";
-        private const string LastUpdatedCol = "\"last_updated\"";
         
-        public readonly int TitleId = getIndex(TitleIdCol);
+            char firstChar = value[0];
-        public readonly int GameName = getIndex(GameNameCol);
+            string rest = value[1..];
-        public readonly int Labels = getIndex(LabelsCol);
+
-        public readonly int Status = getIndex(StatusCol);
+            return $"{char.ToUpper(firstChar)}{rest}";
-        public readonly int LastUpdated = getIndex(LastUpdatedCol);
+        }
     }
 }

src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Systems.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 68;
+        public const int CurrentVersion = 67;
 
         /// <summary>
         /// Version of the configuration file format
@@ -259,11 +259,6 @@ namespace Ryujinx.Ava.Systems.Configuration
         /// </summary>
         public bool EnableLowPowerPtc { get; set; }
 
-        /// <summary>
-        /// Clock tick scalar, in percent points (100 = 1.0).
-        /// </summary>
-        public long TickScalar { get; set; }
-
         /// <summary>
         /// Enables or disables guest Internet access
         /// </summary>

src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs

@@ -93,7 +93,6 @@ namespace Ryujinx.Ava.Systems.Configuration
             System.EnableDockedMode.Value = cff.DockedMode;
             System.EnablePtc.Value = cff.EnablePtc;
             System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
-            System.TickScalar.Value = cff.TickScalar;
             System.EnableInternetAccess.Value = cff.EnableInternetAccess;
             System.EnableFsIntegrityChecks.Value = cff.EnableFsIntegrityChecks;
             System.FsGlobalAccessLogMode.Value = cff.FsGlobalAccessLogMode;
@@ -162,6 +161,8 @@ namespace Ryujinx.Ava.Systems.Configuration
 
                 Hacks.Xc2MenuSoftlockFix.Value = hacks.IsEnabled(DirtyHack.Xc2MenuSoftlockFix);
 
+                Hacks.EnableShaderTranslationDelay.Value = hacks.IsEnabled(DirtyHack.ShaderTranslationDelay);
+                Hacks.ShaderTranslationDelay.Value = hacks[DirtyHack.ShaderTranslationDelay].CoerceAtLeast(0);
             }
 
             if (configurationFileUpdated)
@@ -439,27 +440,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                 (64, static cff => cff.LoggingEnableAvalonia = false),
                 (65, static cff => cff.UpdateCheckerType = cff.CheckUpdatesOnStart ? UpdaterType.PromptAtStartup : UpdaterType.Off),
                 (66, static cff => cff.DisableInputWhenOutOfFocus = false),
-                (67, static cff => cff.FocusLostActionType = cff.DisableInputWhenOutOfFocus ? FocusLostType.BlockInput : FocusLostType.DoNothing),
+                (67, static cff => cff.FocusLostActionType = cff.DisableInputWhenOutOfFocus ? FocusLostType.BlockInput : FocusLostType.DoNothing)
-                (68, static cff =>
-                {
-                    cff.TickScalar = 200;
-                    cff.Hotkeys = new KeyboardHotkeys
-                    {
-                        ToggleVSyncMode = cff.Hotkeys.ToggleVSyncMode,
-                        Screenshot = cff.Hotkeys.Screenshot,
-                        ShowUI = cff.Hotkeys.ShowUI,
-                        Pause = cff.Hotkeys.Pause,
-                        ToggleMute = cff.Hotkeys.ToggleMute,
-                        ResScaleUp = cff.Hotkeys.ResScaleUp,
-                        ResScaleDown = cff.Hotkeys.ResScaleDown,
-                        VolumeUp = cff.Hotkeys.VolumeUp,
-                        VolumeDown = cff.Hotkeys.VolumeDown,
-                        CustomVSyncIntervalIncrement = cff.Hotkeys.CustomVSyncIntervalIncrement,
-                        CustomVSyncIntervalDecrement = cff.Hotkeys.CustomVSyncIntervalDecrement,
-                        TurboMode = Key.Unbound,
-                        TurboModeWhileHeld = false
-                    };
-                })
             );
     }
 }

src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs

@@ -11,6 +11,7 @@ using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
+using Ryujinx.HLE.HOS.SystemState;
 using System.Collections.Generic;
 using System.Linq;
 using RyuLogger = Ryujinx.Common.Logging.Logger;
@@ -336,11 +337,6 @@ namespace Ryujinx.Ava.Systems.Configuration
             /// </summary>
             public ReactiveObject<bool> EnablePtc { get; private set; }
 
-            /// <summary>
-            /// Clock tick scalar, in percent points (100 = 1.0).
-            /// </summary>
-            public ReactiveObject<long> TickScalar { get; set; }
-
             /// <summary>
             /// Enables or disables low-power persistent profiled translation cache loading
             /// </summary>
@@ -420,15 +416,6 @@ namespace Ryujinx.Ava.Systems.Configuration
                 EnableLowPowerPtc.LogChangesToValue(nameof(EnableLowPowerPtc));
                 EnableLowPowerPtc.Event += (_, evnt) 
                     => Optimizations.LowPower = evnt.NewValue;
-                TickScalar = new ReactiveObject<long>();
-                TickScalar.LogChangesToValue(nameof(TickScalar));
-                TickScalar.Event += (_, evnt) =>
-                {
-                    if (Switch.Shared is null)
-                        return;
-
-                    Switch.Shared.Configuration.TickScalar = evnt.NewValue;
-                };
                 EnableInternetAccess = new ReactiveObject<bool>();
                 EnableInternetAccess.LogChangesToValue(nameof(EnableInternetAccess));
                 EnableFsIntegrityChecks = new ReactiveObject<bool>();
@@ -697,15 +684,18 @@ namespace Ryujinx.Ava.Systems.Configuration
             
             public ReactiveObject<bool> Xc2MenuSoftlockFix { get; private set; }
             
-            public ReactiveObject<bool> DisableNifmIsAnyInternetRequestAccepted { get; private set; }
+            public ReactiveObject<bool> EnableShaderTranslationDelay { get; private set; }
+            
+            public ReactiveObject<int> ShaderTranslationDelay { get; private set; }
 
             public HacksSection()
             {
                 ShowDirtyHacks = new ReactiveObject<bool>();
                 Xc2MenuSoftlockFix = new ReactiveObject<bool>();
                 Xc2MenuSoftlockFix.Event += HackChanged;
-                DisableNifmIsAnyInternetRequestAccepted = new ReactiveObject<bool>();
+                EnableShaderTranslationDelay = new ReactiveObject<bool>();
-                DisableNifmIsAnyInternetRequestAccepted.Event += HackChanged;
+                EnableShaderTranslationDelay.Event += HackChanged;
+                ShaderTranslationDelay = new ReactiveObject<int>();
             }
 
             private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
@@ -736,8 +726,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                     if (Xc2MenuSoftlockFix)
                         Apply(DirtyHack.Xc2MenuSoftlockFix);
                     
-                    if (DisableNifmIsAnyInternetRequestAccepted)
+                    if (EnableShaderTranslationDelay)
-                        Apply(DirtyHack.NifmServiceDisableIsAnyInternetRequestAccepted);
+                        Apply(DirtyHack.ShaderTranslationDelay, ShaderTranslationDelay);
                     
                     return enabledHacks.ToArray();
 
@@ -856,7 +846,6 @@ namespace Ryujinx.Ava.Systems.Configuration
                 Graphics.VSyncMode,
                 System.EnableDockedMode,
                 System.EnablePtc,
-                System.TickScalar,
                 System.EnableInternetAccess,
                 System.EnableFsIntegrityChecks 
                     ? IntegrityCheckLevel.ErrorOnInvalid 
@@ -875,8 +864,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                 Multiplayer.Mode,
                 Multiplayer.DisableP2p,
                 Multiplayer.LdnPassphrase,
-                Multiplayer.GetLdnServer(),
+                Instance.Multiplayer.GetLdnServer(),
-                Graphics.CustomVSyncInterval,
+                Instance.Graphics.CustomVSyncInterval,
-                Hacks.ShowDirtyHacks ? Hacks.EnabledHacks : null);
+                Instance.Hacks.ShowDirtyHacks ? Instance.Hacks.EnabledHacks : null);
     }
 }

src/Ryujinx/Systems/Configuration/ConfigurationState.cs

@@ -72,7 +72,6 @@ namespace Ryujinx.Ava.Systems.Configuration
                 EnableColorSpacePassthrough = Graphics.EnableColorSpacePassthrough,
                 EnablePtc = System.EnablePtc,
                 EnableLowPowerPtc = System.EnableLowPowerPtc,
-                TickScalar = System.TickScalar,
                 EnableInternetAccess = System.EnableInternetAccess,
                 EnableFsIntegrityChecks = System.EnableFsIntegrityChecks,
                 FsGlobalAccessLogMode = System.FsGlobalAccessLogMode,
@@ -261,10 +260,6 @@ namespace Ryujinx.Ava.Systems.Configuration
                 ResScaleDown = Key.Unbound,
                 VolumeUp = Key.Unbound,
                 VolumeDown = Key.Unbound,
-                CustomVSyncIntervalIncrement = Key.Unbound,
-                CustomVSyncIntervalDecrement = Key.Unbound,
-                TurboMode = Key.Unbound,
-                TurboModeWhileHeld = false
             };
             Hid.RainbowSpeed.Value = 1f;
             Hid.InputConfig.Value =

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -9,10 +9,10 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -80,13 +80,13 @@ namespace Ryujinx.Ava.UI.Controls
         public async void OpenTitleUpdateManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await TitleUpdateManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
+                await TitleUpdateWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
         }
 
         public async void OpenDownloadableContentManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await DownloadableContentManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
+                await DownloadableContentManagerWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
         }
 
         public async void OpenCheatManager_Click(object sender, RoutedEventArgs args)
@@ -127,7 +127,7 @@ namespace Ryujinx.Ava.UI.Controls
         public async void OpenModManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await ModManagerView.Show(
+                await ModManagerWindow.Show(
                     viewModel.SelectedApplication.Id, 
                     viewModel.SelectedApplication.IdBase, 
                     viewModel.ApplicationLibrary, 

src/Ryujinx/UI/Controls/RyujinxLogo.cs

@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Layout;
 using Avalonia.Media.Imaging;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;

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
             };
     }
 }

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -3,6 +3,7 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
+using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
 using System;

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)
                 {

src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs

@@ -1,17 +1,17 @@
 using Gommon;
 using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.Systems.AppLibrary;
-using System;
+using Ryujinx.Ava.UI.Windows;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class CompatibilityViewModel : BaseModel, IDisposable
+    public class CompatibilityViewModel : BaseModel
     {
-        private readonly ApplicationLibrary _appLibrary;
+        private bool _onlyShowOwnedGames = true;
 
-        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityDatabase.Entries;
+        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Entries;
         private string[] _ownedGameTitleIds = [];
 
         public IEnumerable<CompatibilityEntry> CurrentEntries => OnlyShowOwnedGames
@@ -21,26 +21,14 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public CompatibilityViewModel() {}
 
-        private void AppCountUpdated(object _, ApplicationCountUpdatedEventArgs __)
-            => _ownedGameTitleIds = _appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
-
         public CompatibilityViewModel(ApplicationLibrary appLibrary)
         {
-            _appLibrary = appLibrary;
+            appLibrary.ApplicationCountUpdated += (_, _) 
+                => _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
             
-            AppCountUpdated(null, null);
+            _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
-
-            _appLibrary.ApplicationCountUpdated += AppCountUpdated;
         }
 
-        void IDisposable.Dispose()
-        {
-            GC.SuppressFinalize(this);
-            _appLibrary.ApplicationCountUpdated -= AppCountUpdated;
-        }
-        
-        private bool _onlyShowOwnedGames = true;
-
         public bool OnlyShowOwnedGames
         {
             get => _onlyShowOwnedGames;
@@ -58,11 +46,11 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             if (string.IsNullOrEmpty(searchTerm))
             {
-                SetEntries(CompatibilityDatabase.Entries);
+                SetEntries(CompatibilityCsv.Entries);
                 return;
             }
 
-            SetEntries(CompatibilityDatabase.Entries.Where(x =>
+            SetEntries(CompatibilityCsv.Entries.Where(x =>
                 x.GameName.ContainsIgnoreCase(searchTerm)
                 || x.TitleId.Check(tid => tid.ContainsIgnoreCase(searchTerm))));
         }

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;

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Media;
+using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -16,7 +17,6 @@ using LibHac.Ns;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
@@ -46,6 +46,7 @@ using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Key = Ryujinx.Input.Key;

src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs

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

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -60,7 +60,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         private bool _enableCustomVSyncInterval;
         private int _customVSyncIntervalPercentageProxy;
         private VSyncMode _vSyncMode;
-        private long _turboModeMultiplier;
 
         public event Action CloseWindow;
         public event Action SaveSettingsEvent;
@@ -207,25 +206,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; }
@@ -612,7 +592,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;
@@ -715,7 +694,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 +757,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);
 

src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs

@@ -16,7 +16,7 @@ using static Ryujinx.Common.Utilities.XCIFileTrimmer;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public class XciTrimmerViewModel : BaseModel
+    public class XCITrimmerViewModel : BaseModel
     {
         private const long _bytesPerMB = 1024 * 1024;
         private enum ProcessingMode
@@ -46,7 +46,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private SortField _sortField = SortField.Name;
         private bool _sortAscending = true;
 
-        public XciTrimmerViewModel(MainWindowViewModel mainWindowViewModel)
+        public XCITrimmerViewModel(MainWindowViewModel mainWindowViewModel)
         {
             _logger = new XCITrimmerLog.TrimmerWindow(this);
             _mainWindowViewModel = mainWindowViewModel;
@@ -254,9 +254,9 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private class CompareXCITrimmerFiles : IComparer<XCITrimmerFileModel>
         {
-            private XciTrimmerViewModel _viewModel;
+            private XCITrimmerViewModel _viewModel;
 
-            public CompareXCITrimmerFiles(XciTrimmerViewModel ViewModel)
+            public CompareXCITrimmerFiles(XCITrimmerViewModel ViewModel)
             {
                 _viewModel = ViewModel;
             }

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">
+                        <Grid ColumnDefinitions="*,Auto">
-                            <StackPanel Orientation="Vertical" Spacing="5">
                             <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>
+                        </Grid>
-                            <controls:MiniVerticalSeparator Height="64"/>
+                    </Border>
-                            <StackPanel Orientation="Vertical" Spacing="5">
+                    <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>
+                        </Grid>
-                            <controls:MiniVerticalSeparator Height="64" IsVisible="{Binding ParentModel.HasLed}"/>
+                    </Border>
-                            <StackPanel Orientation="Vertical" Spacing="5">
+                    <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>
+                        </Grid>
-                        </StackPanel>
                     </Border>
                 </StackPanel>
             </StackPanel>

src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs

@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;

src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs

@@ -1,3 +1,4 @@
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;

src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs

@@ -1,3 +1,4 @@
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -13,7 +13,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Views.Dialog;
+using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Utilities;
@@ -46,8 +46,8 @@ namespace Ryujinx.Ava.UI.Views.Main
             CheatManagerMenuItem.Command = Commands.CreateSilentFail(OpenCheatManagerForCurrentApp);
             InstallFileTypesMenuItem.Command = Commands.Create(InstallFileTypes);
             UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
-            XciTrimmerMenuItem.Command = Commands.Create(XciTrimmerView.Show);
+            XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
-            AboutWindowMenuItem.Command = Commands.Create(AboutView.Show);
+            AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
             CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityListWindow.Show());
 
             UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs

@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Threading;

src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml

@@ -7,7 +7,7 @@
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Views.Dialog.ApplicationDataView"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationDataView"
              x:DataType="viewModels:ApplicationDataViewModel">
     <StackPanel Orientation="Horizontal">
         <Image Margin="0"

src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml.cs

@@ -12,7 +12,7 @@ using Ryujinx.Ava.Systems.AppLibrary;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
     {

src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml

@@ -7,7 +7,7 @@
              xmlns:models="using:Ryujinx.Ava.Common.Models"
              xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Views.Dialog.DlcSelectView"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.DlcSelectView"
              x:DataType="viewModels:DlcSelectViewModel">
     <Grid RowDefinitions="*,Auto,*">
         <TextBlock

src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml.cs

@@ -1,4 +1,6 @@
-using FluentAvalonia.UI.Controls;
+using Avalonia.Controls;
+using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Controls;
@@ -7,7 +9,7 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class DlcSelectView : RyujinxControl<DlcSelectViewModel>
     {

src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml

@@ -7,7 +7,6 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
     <Design.DataContext>
@@ -77,57 +76,6 @@
                                    ToolTip.Tip="{ext:Locale UseHypervisorTooltip}" />
                     </CheckBox>
                 </StackPanel>
-                <Separator Height="1" />
-                <StackPanel
-                    Orientation="Vertical"
-                    Spacing="5">
-                    <TextBlock
-                        Classes="h1"
-                        Text="{ext:Locale SettingsTabSystemHacks}" />
-                    <TextBlock
-                        Foreground="{DynamicResource SecondaryTextColor}"
-                        TextDecorations="Underline"
-                        Text="{ext:Locale SettingsTabSystemHacksNote}" />
-                </StackPanel>
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical">
-                    <StackPanel Margin="0,0,0,10"
-                                Orientation="Horizontal">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Text="{ext:Locale SettingsTabSystemTurboMultiplier}"
-                            ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierToolTip}"
-                            Width="250" />
-                        <ui:NumberBox ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
-                                      Value="{Binding TurboMultiplier}"
-                                      Width="165"
-                                      SmallChange="1.0"
-                                      LargeChange="10"
-                                      SimpleNumberFormat="F0"
-                                      SpinButtonPlacementMode="Hidden"
-                                      Minimum="50"
-                                      Maximum="300" />
-                        <Slider Value="{Binding TurboMultiplier}"
-                                ToolTip.Tip="{ext:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
-                                MinWidth="175"
-                                Margin="10,-3,0,0"
-                                Height="32"
-                                Padding="0,-5"
-                                TickFrequency="1"
-                                IsSnapToTickEnabled="True"
-                                LargeChange="10"
-                                SmallChange="1"
-                                VerticalAlignment="Center"
-                                Minimum="50"
-                                Maximum="500" />
-                        <TextBlock Margin="5,0"
-                                   Width="40"
-                                   Text="{Binding TurboMultiplierPercentageText}"/>
-                    </StackPanel>
-                </StackPanel>
             </StackPanel>
         </Border>
     </ScrollViewer>

src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml

@@ -29,7 +29,7 @@
                 <TextBlock
                     Foreground="{DynamicResource SecondaryTextColor}"
                     TextDecorations="Underline"
-                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Can cause issues." />
+                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Will cause issues." />
                 <StackPanel
                     Margin="0,10,0,0"
                     Orientation="Horizontal"
@@ -43,18 +43,6 @@
                         Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
                 </StackPanel>
                 <Separator/>
-                <StackPanel
-                    Margin="0,10,0,0"
-                    Orientation="Horizontal"
-                    HorizontalAlignment="Center"
-                    ToolTip.Tip="{Binding DirtyHacks.NifmDisableIsAnyInternetRequestAcceptedTooltip}">
-                    <CheckBox
-                        Margin="0"
-                        IsChecked="{Binding DirtyHacks.NifmDisableIsAnyInternetRequestAccepted}"/>
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        Text="Disable IsAnyInternetRequestAccepted" />
-                </StackPanel>
             </StackPanel>
         </Border>
     </ScrollViewer>

src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml

@@ -19,7 +19,7 @@
             <Setter Property="Margin" Value="10, 0, 0, 0" />
             <Setter Property="Orientation" Value="Horizontal" />
         </Style>
-        <Style Selector="StackPanel > StackPanel > TextBlock.settingHeader">
+        <Style Selector="StackPanel > StackPanel > TextBlock">
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="Width" Value="230" />
         </Style>
@@ -47,79 +47,71 @@
                     Classes="h1"
                     Text="{ext:Locale SettingsTabHotkeysHotkeys}" />
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" />
                     <ToggleButton Name="ToggleVSyncMode">
                         <TextBlock Text="{Binding KeyboardHotkey.ToggleVSyncMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" />
                     <ToggleButton Name="Screenshot">
                         <TextBlock Text="{Binding KeyboardHotkey.Screenshot, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" />
                     <ToggleButton Name="ShowUI">
                         <TextBlock Text="{Binding KeyboardHotkey.ShowUI, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" />
                     <ToggleButton Name="Pause">
                         <TextBlock Text="{Binding KeyboardHotkey.Pause, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" />
                     <ToggleButton Name="ToggleMute">
                         <TextBlock Text="{Binding KeyboardHotkey.ToggleMute, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" />
                     <ToggleButton Name="ResScaleUp">
                         <TextBlock Text="{Binding KeyboardHotkey.ResScaleUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" />
                     <ToggleButton Name="ResScaleDown">
                         <TextBlock Text="{Binding KeyboardHotkey.ResScaleDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" />
                     <ToggleButton Name="VolumeUp">
                         <TextBlock Text="{Binding KeyboardHotkey.VolumeUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" />
                     <ToggleButton Name="VolumeDown">
                         <TextBlock Text="{Binding KeyboardHotkey.VolumeDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" />
                     <ToggleButton Name="CustomVSyncIntervalIncrement">
                         <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalIncrement, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" Classes="settingHeader" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" />
                     <ToggleButton Name="CustomVSyncIntervalDecrement">
                         <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalDecrement, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysTurboMode}" Classes="settingHeader" ToolTip.Tip="{ext:Locale SettingsTabHotkeysTurboModeToolTip}" Background="Transparent" />
-                    <ToggleButton Name="TurboMode">
-                        <TextBlock Text="{Binding KeyboardHotkey.TurboMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
-                    </ToggleButton>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysOnlyWhilePressed}" Margin="10,0" />
-                    <CheckBox IsChecked="{Binding KeyboardHotkey.TurboModeWhileHeld}" />
-                </StackPanel>
             </StackPanel>
         </Border>
    </ScrollViewer>

src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs

@@ -3,9 +3,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using Avalonia.Threading;
 using Ryujinx.Ava.Input;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Input;
@@ -15,7 +13,7 @@ using Key = Ryujinx.Common.Configuration.Hid.Key;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsHotkeysView : RyujinxControl<SettingsViewModel>
+    public partial class SettingsHotkeysView : UserControl
     {
         private ButtonKeyAssigner _currentAssigner;
         private readonly IGamepadDriver _avaloniaKeyboardDriver;
@@ -80,52 +78,45 @@ namespace Ryujinx.Ava.UI.Views.Settings
                         {
                             if (e.ButtonValue.HasValue)
                             {
+                                SettingsViewModel viewModel = (DataContext) as SettingsViewModel;
                                 Button buttonValue = e.ButtonValue.Value;
 
-                                Dispatcher.UIThread.Post(() =>
-                                {
                                 switch (button.Name)
                                 {
                                     case "ToggleVSyncMode":
-                                            ViewModel.KeyboardHotkey.ToggleVSyncMode = buttonValue.AsHidType<Key>();
+                                        viewModel.KeyboardHotkey.ToggleVSyncMode = buttonValue.AsHidType<Key>();
                                         break;
                                     case "Screenshot":
-                                            ViewModel.KeyboardHotkey.Screenshot = buttonValue.AsHidType<Key>();
+                                        viewModel.KeyboardHotkey.Screenshot = buttonValue.AsHidType<Key>();
                                         break;
                                     case "ShowUI":
-                                            ViewModel.KeyboardHotkey.ShowUI = buttonValue.AsHidType<Key>();
+                                        viewModel.KeyboardHotkey.ShowUI = buttonValue.AsHidType<Key>();
                                         break;
                                     case "Pause":
-                                            ViewModel.KeyboardHotkey.Pause = buttonValue.AsHidType<Key>();
+                                        viewModel.KeyboardHotkey.Pause = buttonValue.AsHidType<Key>();
                                         break;
                                     case "ToggleMute":
-                                            ViewModel.KeyboardHotkey.ToggleMute = buttonValue.AsHidType<Key>();
+                                        viewModel.KeyboardHotkey.ToggleMute = buttonValue.AsHidType<Key>();
                                         break;
                                     case "ResScaleUp":
-                                            ViewModel.KeyboardHotkey.ResScaleUp = buttonValue.AsHidType<Key>();
+                                        viewModel.KeyboardHotkey.ResScaleUp = buttonValue.AsHidType<Key>();
                                         break;
                                     case "ResScaleDown":
-                                            ViewModel.KeyboardHotkey.ResScaleDown = buttonValue.AsHidType<Key>();
+                                        viewModel.KeyboardHotkey.ResScaleDown = buttonValue.AsHidType<Key>();
                                         break;
                                     case "VolumeUp":
-                                            ViewModel.KeyboardHotkey.VolumeUp = buttonValue.AsHidType<Key>();
+                                        viewModel.KeyboardHotkey.VolumeUp = buttonValue.AsHidType<Key>();
                                         break;
                                     case "VolumeDown":
-                                            ViewModel.KeyboardHotkey.VolumeDown = buttonValue.AsHidType<Key>();
+                                        viewModel.KeyboardHotkey.VolumeDown = buttonValue.AsHidType<Key>();
                                         break;
                                     case "CustomVSyncIntervalIncrement":
-                                            ViewModel.KeyboardHotkey.CustomVSyncIntervalIncrement =
+                                        viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = buttonValue.AsHidType<Key>();
-                                                buttonValue.AsHidType<Key>();
                                         break;
                                     case "CustomVSyncIntervalDecrement":
-                                            ViewModel.KeyboardHotkey.CustomVSyncIntervalDecrement =
+                                        viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = buttonValue.AsHidType<Key>();
-                                                buttonValue.AsHidType<Key>();
-                                            break;
-                                        case "TurboMode":
-                                            ViewModel.KeyboardHotkey.TurboMode = buttonValue.AsHidType<Key>();
                                         break;
                                 }
-                                });
                             }
                         };
 

src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml.cs

@@ -1,14 +1,16 @@
+using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using System;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsNetworkView : RyujinxControl<SettingsViewModel>
+    public partial class SettingsNetworkView : UserControl
     {
         private readonly Random _random;
         
+        public SettingsViewModel ViewModel;
+
         public SettingsNetworkView()
         {
             _random = new Random();

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs

@@ -1,12 +1,13 @@
 using Avalonia.Controls;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsSystemView : RyujinxControl<SettingsViewModel>
+    public partial class SettingsSystemView : UserControl
     {
+        public SettingsViewModel ViewModel;
+
         public SettingsSystemView()
         {
             InitializeComponent();

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml

@@ -6,6 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
     <Design.DataContext>
@@ -18,9 +19,7 @@
         HorizontalScrollBarVisibility="Disabled"
         VerticalScrollBarVisibility="Auto">
         <Border Classes="settings">
-            <Grid ColumnDefinitions="Auto,Auto,*" HorizontalAlignment="Stretch">
             <StackPanel
-                    Grid.Column="0"
                 Margin="10"
                 HorizontalAlignment="Stretch"
                 Orientation="Vertical"
@@ -81,8 +80,7 @@
                                 <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                    <TextBlock
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
-                                        Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
                                 <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
@@ -104,8 +102,7 @@
                                 <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
-                                    <TextBlock
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
-                                        Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
                             </ComboBoxItem>
                             <ComboBoxItem>
                                 <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
@@ -158,20 +155,7 @@
                         <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                     </StackPanel>
                 </StackPanel>
-                </StackPanel>
+                <Separator Height="1" />
-                <Border Grid.Column="1"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        Margin="10, 10, 10, 0"
-                        Height="405"
-                        BorderBrush="Gray"
-                        Background="Gray"
-                        Width="1" />
-                <StackPanel
-                    Margin="10"
-                    Spacing="10"
-                    Grid.Column="2"
-                    Orientation="Vertical" HorizontalAlignment="Stretch">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
                     <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
@@ -227,8 +211,7 @@
                         <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
                         <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                     </StackPanel>
-                        <TextBlock Foreground="{DynamicResource SecondaryTextColor}"
+                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
-                                   Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
                 </StackPanel>
                 <StackPanel
                     IsEnabled="{Binding !IsGameTitleNotNull}"
@@ -276,7 +259,6 @@
                     </Grid>
                 </StackPanel>
             </StackPanel>
-            </Grid>
         </Border>
     </ScrollViewer>
 </UserControl>

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs

@@ -3,10 +3,10 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using Gommon;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -14,18 +14,20 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsUiView : RyujinxControl<SettingsViewModel>
+    public partial class SettingsUiView : UserControl
     {
+        public SettingsViewModel ViewModel;
+
         public SettingsUiView()
         {
             InitializeComponent();
             AddGameDirButton.Command =
-                Commands.Create(() => AddDirButton(GameDirPathBox, ViewModel.GameDirectories));
+                Commands.Create(() => AddDirButton(GameDirPathBox, ViewModel.GameDirectories, true));
             AddAutoloadDirButton.Command =
-                Commands.Create(() => AddDirButton(AutoloadDirPathBox, ViewModel.AutoloadDirectories));
+                Commands.Create(() => AddDirButton(AutoloadDirPathBox, ViewModel.AutoloadDirectories, false));
         }
 
-        private async Task AddDirButton(TextBox addDirBox, AvaloniaList<string> directories)
+        private async Task AddDirButton(TextBox addDirBox, AvaloniaList<string> directories, bool isGameList)
         {
             string path = addDirBox.Text;
 

src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs

@@ -8,6 +8,7 @@ using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
+using System;
 using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
 
 namespace Ryujinx.Ava.UI.Views.User

src/Ryujinx/UI/Views/User/UserRecovererView.axaml.cs

@@ -1,3 +1,4 @@
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Navigation;

src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs

@@ -1,3 +1,4 @@
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;

src/Ryujinx/UI/Windows/AboutWindow.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Dialog.AboutView"
+    x:Class="Ryujinx.Ava.UI.Windows.AboutWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Windows/AboutWindow.axaml.cs

@@ -1,6 +1,8 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
@@ -11,11 +13,11 @@ using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 using Button = Avalonia.Controls.Button;
 
-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class AboutView : RyujinxControl<AboutWindowViewModel>
+    public partial class AboutWindow : RyujinxControl<AboutWindowViewModel>
     {
-        public AboutView()
+        public AboutWindow()
         {
             InitializeComponent();
 
@@ -32,7 +34,7 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.UserProfilesClose],
-                Content = new AboutView { ViewModel = viewModel }
+                Content = new AboutWindow { ViewModel = viewModel }
             };
 
             await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());

src/Ryujinx/UI/Windows/CheatWindow.axaml.cs

@@ -1,8 +1,10 @@
 using Avalonia.Collections;
+using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using System.Collections.Generic;

src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml

@@ -40,7 +40,7 @@
                         <DataTemplate DataType="{x:Type systems:CompatibilityEntry}">
                             <Grid MinWidth="800"
                                   Margin="10"
-                                  ColumnDefinitions="Auto,Auto,Auto,*"
+                                  ColumnDefinitions="*,Auto,Auto,*"
                                   Background="Transparent"
                                   ToolTip.Tip="{Binding  LocalizedLastUpdated}">
                                 <TextBlock Grid.Column="0"

src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml.cs

@@ -1,24 +1,25 @@
 using Avalonia.Controls;
+using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
+using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Windows;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Windows
 {
     public partial class CompatibilityListWindow : StyleableAppWindow
     {
-        public static async Task Show(string titleId = null)
+        public static Task Show(string titleId = null) =>
+            ShowAsync(new CompatibilityListWindow
             {
-            using CompatibilityViewModel compatWindow = new(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary);
+                DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary),
-            
-            await ShowAsync(new CompatibilityListWindow
-            {
-                DataContext = compatWindow,
                 SearchBoxFlush = { Text = titleId ?? string.Empty },
                 SearchBoxNormal = { Text = titleId ?? string.Empty }
             });
-        }
 
         public CompatibilityListWindow() : base(useCustomTitleBar: true, 37)
         {

src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Dialog.DownloadableContentManagerView"
+    x:Class="Ryujinx.Ava.UI.Windows.DownloadableContentManagerWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml.cs

@@ -6,16 +6,26 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class DownloadableContentManagerView : RyujinxControl<DownloadableContentManagerViewModel>
+    public partial class DownloadableContentManagerWindow : UserControl
     {
-        public DownloadableContentManagerView()
+        public DownloadableContentManagerViewModel ViewModel;
+
+        public DownloadableContentManagerWindow()
         {
+            DataContext = this;
+
+            InitializeComponent();
+        }
+
+        public DownloadableContentManagerWindow(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
+        {
+            DataContext = ViewModel = new DownloadableContentManagerViewModel(applicationLibrary, applicationData);
+
             InitializeComponent();
         }
 
@@ -26,11 +36,8 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
+                Content = new DownloadableContentManagerWindow(applicationLibrary, applicationData),
                 Title = string.Format(LocaleManager.Instance[LocaleKeys.DlcWindowTitle], applicationData.Name, applicationData.IdBaseString),
-                Content = new DownloadableContentManagerView
-                {
-                    ViewModel = new DownloadableContentManagerViewModel(applicationLibrary, applicationData)
-                }
             };
 
             Style bottomBorder = new(x => x.OfType<Grid>().Name("DialogSpace").Child().OfType<Border>());

src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml

@@ -13,7 +13,7 @@
     xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     Width="1100"
     Height="910"
-    MinWidth="1037"
+    MinWidth="800"
     MinHeight="480"
     WindowStartupLocation="CenterOwner"
     x:DataType="viewModels:SettingsViewModel"

src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs

@@ -1,9 +1,25 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Input;
+using Avalonia.Media.Imaging;
+using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
+using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Ava.Utilities;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Common.Configuration;
+using Ryujinx.HLE.FileSystem;
+using Ryujinx.HLE.HOS.SystemState;
+using Ryujinx.Input;
 using System;
+using System.IO;
 using System.Linq;
+using Key = Avalonia.Input.Key;
 
 
 namespace Ryujinx.Ava.UI.Windows

src/Ryujinx/UI/Windows/IconColorPicker.cs

@@ -2,9 +2,9 @@ using SkiaSharp;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Ava.UI.Helpers
+namespace Ryujinx.Ava.UI.Windows
 {
-    public static class IconColorPicker
+    static class IconColorPicker
     {
         private const int ColorsPerLine = 64;
         private const int TotalColors = ColorsPerLine * ColorsPerLine;

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -7,12 +7,13 @@ using Avalonia.Platform;
 using Avalonia.Threading;
 using DynamicData;
 using FluentAvalonia.UI.Controls;
+using FluentAvalonia.UI.Windowing;
 using Gommon;
 using LibHac.Ns;
+using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Applet;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;

src/Ryujinx/UI/Windows/ModManagerWindow.axaml

@@ -10,7 +10,7 @@
     Width="500"
     Height="380"
     mc:Ignorable="d"
-    x:Class="Ryujinx.Ava.UI.Views.Dialog.ModManagerView"
+    x:Class="Ryujinx.Ava.UI.Windows.ModManagerWindow"
     x:CompileBindings="True"
     x:DataType="viewModels:ModManagerViewModel"
     Focusable="True">

src/Ryujinx/UI/Windows/ModManagerWindow.axaml.cs

@@ -7,17 +7,27 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 using Button = Avalonia.Controls.Button;
 
-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class ModManagerView : RyujinxControl<ModManagerViewModel>
+    public partial class ModManagerWindow : UserControl
     {
-        public ModManagerView()
+        public readonly ModManagerViewModel ViewModel;
+
+        public ModManagerWindow()
         {
+            DataContext = this;
+
+            InitializeComponent();
+        }
+
+        public ModManagerWindow(ulong titleId, ulong titleIdBase, ApplicationLibrary applicationLibrary)
+        {
+            DataContext = ViewModel = new ModManagerViewModel(titleId, titleIdBase, applicationLibrary);
+
             InitializeComponent();
         }
 
@@ -28,10 +38,7 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
-                Content = new ModManagerView
+                Content = new ModManagerWindow(titleId, titleIdBase, appLibrary),
-                {
-                    ViewModel = new ModManagerViewModel(titleId, titleIdBase, appLibrary)
-                },
                 Title = string.Format(LocaleManager.Instance[LocaleKeys.ModWindowTitle], titleName, titleId.ToString("X16")),
             };
 

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -13,7 +13,7 @@
     xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     Width="1100"
-    MinWidth="844"
+    MinWidth="800"
     MinHeight="480"
     Title="{ext:WindowTitle Settings}"
     WindowStartupLocation="CenterOwner"

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -31,8 +31,8 @@ namespace Ryujinx.Ava.UI.Windows
                     : NavigationViewPaneDisplayMode.Top;
 
             Height = ConfigurationState.Instance.ShowOldUI
-                ? 906
+                ? 927
-                : 954; // nav panel is put on top with custom title bar so account for new height
+                : 993; // nav panel is put on top with custom title bar so account for new height
             
             Load();
         }

src/Ryujinx/UI/Windows/StyleableWindow.cs

@@ -8,6 +8,7 @@ using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.Controls;
+using Ryujinx.Ava.UI.ViewModels;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Windows

src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Dialog.TitleUpdateManagerView"
+    x:Class="Ryujinx.Ava.UI.Windows.TitleUpdateWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Windows/TitleUpdateWindow.axaml.cs

@@ -6,16 +6,26 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class TitleUpdateManagerView : RyujinxControl<TitleUpdateViewModel>
+    public partial class TitleUpdateWindow : UserControl
     {
-        public TitleUpdateManagerView()
+        public readonly TitleUpdateViewModel ViewModel;
+
+        public TitleUpdateWindow()
         {
+            DataContext = this;
+
+            InitializeComponent();
+        }
+
+        public TitleUpdateWindow(ApplicationLibrary applicationLibrary, ApplicationData applicationData)
+        {
+            DataContext = ViewModel = new TitleUpdateViewModel(applicationLibrary, applicationData);
+
             InitializeComponent();
         }
 
@@ -26,11 +36,8 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
+                Content = new TitleUpdateWindow(applicationLibrary, applicationData),
                 Title = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.GameUpdateWindowHeading, applicationData.Name, applicationData.IdBaseString),
-                Content = new TitleUpdateManagerView
-                {
-                    ViewModel = new TitleUpdateViewModel(applicationLibrary, applicationData)
-                }
             };
 
             Style bottomBorder = new(x => x.OfType<Grid>().Name("DialogSpace").Child().OfType<Border>());

src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Dialog.XciTrimmerView"
+    x:Class="Ryujinx.Ava.UI.Windows.XCITrimmerWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -10,7 +10,7 @@
     xmlns:models="clr-namespace:Ryujinx.Ava.Common.Models"
     Width="700"
     Height="600"
-    x:DataType="viewModels:XciTrimmerViewModel"
+    x:DataType="viewModels:XCITrimmerViewModel"
     Focusable="True"
     mc:Ignorable="d">    
     <Grid Margin="20 0 20 0" RowDefinitions="Auto,Auto,*,Auto,Auto">
@@ -151,7 +151,7 @@
                                         HorizontalAlignment="Stretch"
                                         VerticalAlignment="Center"
                                         CornerRadius="5"
-                                        IsVisible="{Binding $parent[UserControl].((viewModels:XciTrimmerViewModel)DataContext).Processing}"
+                                        IsVisible="{Binding $parent[UserControl].((viewModels:XCITrimmerViewModel)DataContext).Processing}"
                                         Maximum="100"
                                         Minimum="0"
                                         Value="{Binding PercentageProgress}" />

src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml.cs

@@ -4,17 +4,27 @@ using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using System;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class XciTrimmerView : RyujinxControl<XciTrimmerViewModel>
+    public partial class XCITrimmerWindow : UserControl
     {
-        public XciTrimmerView()
+        public XCITrimmerViewModel ViewModel;
+
+        public XCITrimmerWindow()
         {
+            DataContext = this;
+
+            InitializeComponent();
+        }
+
+        public XCITrimmerWindow(MainWindowViewModel mainWindowViewModel)
+        {
+            DataContext = ViewModel = new XCITrimmerViewModel(mainWindowViewModel);
+
             InitializeComponent();
         }
 
@@ -25,10 +35,7 @@ namespace Ryujinx.Ava.UI.Views.Dialog
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
-                Content = new XciTrimmerView
+                Content = new XCITrimmerWindow(RyujinxApp.MainWindow.ViewModel),
-                {
-                    ViewModel = new XciTrimmerViewModel(RyujinxApp.MainWindow.ViewModel)
-                },
                 Title = LocaleManager.Instance[LocaleKeys.XCITrimmerWindowTitle]
             };
 
@@ -63,7 +70,7 @@ namespace Ryujinx.Ava.UI.Views.Dialog
         public void Sort_Checked(object sender, RoutedEventArgs args)
         {
             if (sender is RadioButton { Tag: string sortField })
-                ViewModel.SortingField = Enum.Parse<XciTrimmerViewModel.SortField>(sortField);
+                ViewModel.SortingField = Enum.Parse<XCITrimmerViewModel.SortField>(sortField);
         }
 
         public void Order_Checked(object sender, RoutedEventArgs args)

src/Ryujinx/Updater.cs

@@ -27,7 +27,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.Systems
+namespace Ryujinx.Ava
 {
     internal static class Updater
     {