localize Turbo Mode for French

Adds an elapsed tick multiplier feature which speeds up games which are built upon delta time.
More information: https://web.archive.org/web/20240713135029/https://github.com/Ryujinx/Ryujinx/pull/6456

src/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs

@@ -13,5 +13,7 @@ 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.Cpu/ITickSource.cs

@@ -12,6 +12,11 @@ namespace Ryujinx.Cpu
         /// 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.

src/Ryujinx.Cpu/TickSource.cs

@@ -14,12 +14,37 @@ namespace Ryujinx.Cpu
 
         /// <inheritdoc/>
         public ulong Counter => (ulong)(ElapsedSeconds * Frequency);
+        
+        
+        public long TickScalar { get; set; }
+
+
+        private static long _acumElapsedTicks;
+
+
+        private static long _lastElapsedTicks;
+
+
+        private long ElapsedTicks
+        {
+            get
+            {
+                long elapsedTicks = _tickCounter.ElapsedTicks;
+                
+                _acumElapsedTicks += (elapsedTicks - _lastElapsedTicks) * TickScalar / 100;
+
+                _lastElapsedTicks = elapsedTicks;
+                
+                return _acumElapsedTicks;
+            }
+        }
 
         /// <inheritdoc/>
-        public TimeSpan ElapsedTime => _tickCounter.Elapsed;
+        
+        public TimeSpan ElapsedTime => Stopwatch.GetElapsedTime(0, ElapsedTicks);
 
         /// <inheritdoc/>
-        public double ElapsedSeconds => _tickCounter.ElapsedTicks * _hostTickFreq;
+        public double ElapsedSeconds => ElapsedTicks * _hostTickFreq;
 
         public TickSource(ulong frequency)
         {

src/Ryujinx.Graphics.GAL/IRenderer.cs

@@ -1,6 +1,4 @@
 using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.GAL.Multithreading;
 using System;
 using System.Threading;
 
@@ -12,20 +10,6 @@ namespace Ryujinx.Graphics.GAL
 
         bool PreferThreading { get; }
 
-        public IRenderer TryMakeThreaded(BackendThreading backendThreading = BackendThreading.Auto)
-        {
-            if (backendThreading is BackendThreading.On ||
-                (backendThreading is BackendThreading.Auto && PreferThreading))
-            {
-                Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({backendThreading}): True");
-                return new ThreadedRenderer(this);
-            }
-            
-            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({backendThreading}): False");
-
-            return this;
-        }
-
         IPipeline Pipeline { get; }
 
         IWindow Window { get; }

src/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs

@@ -1065,7 +1065,14 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         private void UpdateIndexBufferState()
         {
-            IndexBufferState indexBuffer = _state.State.IndexBufferState;
+            IndexBufferState? indexBufferNullable = _state?.State.IndexBufferState;
+
+            if (!indexBufferNullable.HasValue)
+            {
+                return;
+            }
+
+            IndexBufferState indexBuffer = indexBufferNullable.Value;
 
             if (_drawState.IndexCount == 0)
             {

src/Ryujinx.HLE/HLEConfiguration.cs

@@ -15,55 +15,55 @@ namespace Ryujinx.HLE
     /// <summary>
     /// HLE configuration.
     /// </summary>
-    public class HleConfiguration
+    public class HLEConfiguration
     {
         /// <summary>
         /// The virtual file system used by the FS service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal VirtualFileSystem VirtualFileSystem { get; private set; }
+        internal readonly VirtualFileSystem VirtualFileSystem;
 
         /// <summary>
         /// The manager for handling a LibHac Horizon instance.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal LibHacHorizonManager LibHacHorizonManager { get; private set; }
+        internal readonly LibHacHorizonManager LibHacHorizonManager;
 
         /// <summary>
         /// The account manager used by the account service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal AccountManager AccountManager { get; private set; }
+        internal readonly AccountManager AccountManager;
 
         /// <summary>
         /// The content manager used by the NCM service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal ContentManager ContentManager { get; private set; }
+        internal readonly ContentManager ContentManager;
 
         /// <summary>
         /// The persistent information between run for multi-application capabilities.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        public UserChannelPersistence UserChannelPersistence { get; private set; }
+        public readonly UserChannelPersistence UserChannelPersistence;
 
         /// <summary>
         /// The GPU renderer to use for all GPU operations.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal IRenderer GpuRenderer { get; private set; }
+        internal readonly IRenderer GpuRenderer;
 
         /// <summary>
         /// The audio device driver to use for all audio operations.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal IHardwareDeviceDriver AudioDeviceDriver { get; private set; }
+        internal readonly IHardwareDeviceDriver AudioDeviceDriver;
 
         /// <summary>
         /// The handler for various UI related operations needed outside of HLE.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal IHostUIHandler HostUIHandler { get; private set; }
+        internal readonly IHostUIHandler HostUIHandler;
 
         /// <summary>
         /// Control the memory configuration used by the emulation context.
@@ -102,6 +102,11 @@ namespace Ryujinx.HLE
         /// Control if the Profiled Translation Cache (PTC) should be used.
         /// </summary>
         internal readonly bool EnablePtc;
+        
+        /// <summary>
+        /// Control the arbitrary scalar applied to emulated CPU tick timing.
+        /// </summary>
+        public long TickScalar { get; set; }
 
         /// <summary>
         /// Control if the guest application should be told that there is a Internet connection available.
@@ -195,7 +200,15 @@ namespace Ryujinx.HLE
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
         public EnabledDirtyHack[] Hacks { internal get; set; }
 
-        public HleConfiguration(MemoryConfiguration memoryConfiguration,
+        public HLEConfiguration(VirtualFileSystem virtualFileSystem,
+                                LibHacHorizonManager libHacHorizonManager,
+                                ContentManager contentManager,
+                                AccountManager accountManager,
+                                UserChannelPersistence userChannelPersistence,
+                                IRenderer gpuRenderer,
+                                IHardwareDeviceDriver audioDeviceDriver,
+                                MemoryConfiguration memoryConfiguration,
+                                IHostUIHandler hostUIHandler,
                                 SystemLanguage systemLanguage,
                                 RegionCode region,
                                 VSyncMode vSyncMode,
@@ -217,9 +230,18 @@ namespace Ryujinx.HLE
                                 string multiplayerLdnPassphrase,
                                 string multiplayerLdnServer,
                                 int customVSyncInterval,
+                                long tickScalar,
                                 EnabledDirtyHack[] dirtyHacks = null)
         {
+            VirtualFileSystem = virtualFileSystem;
+            LibHacHorizonManager = libHacHorizonManager;
+            AccountManager = accountManager;
+            ContentManager = contentManager;
+            UserChannelPersistence = userChannelPersistence;
+            GpuRenderer = gpuRenderer;
+            AudioDeviceDriver = audioDeviceDriver;
             MemoryConfiguration = memoryConfiguration;
+            HostUIHandler = hostUIHandler;
             SystemLanguage = systemLanguage;
             Region = region;
             VSyncMode = vSyncMode;
@@ -241,32 +263,8 @@ namespace Ryujinx.HLE
             MultiplayerDisableP2p = multiplayerDisableP2p;
             MultiplayerLdnPassphrase = multiplayerLdnPassphrase;
             MultiplayerLdnServer = multiplayerLdnServer;
+            TickScalar = tickScalar;
             Hacks = dirtyHacks ?? [];
         }
-
-        /// <summary>
-        /// Set the pre-configured services to use for this <see cref="HleConfiguration"/> instance.
-        /// </summary>
-        public HleConfiguration Configure(
-            VirtualFileSystem virtualFileSystem,
-            LibHacHorizonManager libHacHorizonManager,
-            ContentManager contentManager,
-            AccountManager accountManager,
-            UserChannelPersistence userChannelPersistence,
-            IRenderer gpuRenderer,
-            IHardwareDeviceDriver audioDeviceDriver,
-            IHostUIHandler hostUIHandler
-        )
-        {
-            VirtualFileSystem = virtualFileSystem;
-            LibHacHorizonManager = libHacHorizonManager;
-            AccountManager = accountManager;
-            ContentManager = contentManager;
-            UserChannelPersistence = userChannelPersistence;
-            GpuRenderer = gpuRenderer;
-            AudioDeviceDriver = audioDeviceDriver;
-            HostUIHandler = hostUIHandler;
-            return this;
-        }
     }
 }

src/Ryujinx.HLE/HOS/Services/IpcService.cs

@@ -127,10 +127,7 @@ namespace Ryujinx.HLE.HOS.Services
                 }
                 else
                 {
-                    string serviceName;
-
-
-                    serviceName = (service is not DummyService dummyService) ? service.GetType().FullName : dummyService.ServiceName;
+                    string 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/Ldn/UserServiceCreator/LdnMitm/LdnMitmClient.cs

@@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnMitm
 
         private readonly LanDiscovery _lanDiscovery;
 
-        public LdnMitmClient(HleConfiguration config)
+        public LdnMitmClient(HLEConfiguration config)
         {
             UnicastIPAddressInformation localIpInterface = NetworkHelpers.GetLocalInterface(config.MultiplayerLanInterfaceId).Item2;
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/LdnMasterProxyClient.cs

@@ -51,13 +51,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
         private string _passphrase;
         private byte[] _gameVersion = new byte[0x10];
 
-        private readonly HleConfiguration _config;
+        private readonly HLEConfiguration _config;
 
         public event EventHandler<NetworkChangeEventArgs> NetworkChange;
 
         public ProxyConfig Config { get; private set; }
 
-        public LdnMasterProxyClient(string address, int port, HleConfiguration config) : base(address, port)
+        public LdnMasterProxyClient(string address, int port, HLEConfiguration config) : base(address, port)
         {
             if (ProxyHelpers.SupportsNoDelay())
             {

src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs

@@ -2,6 +2,7 @@ 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;
@@ -89,7 +90,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
             }
             else
             {
-                _ticksPerFrame = Stopwatch.Frequency / _device.TargetVSyncInterval;
+                _ticksPerFrame = ((Stopwatch.Frequency / _device.TargetVSyncInterval) * 100) / _device.TickScalar;
                 _targetVSyncInterval = _device.TargetVSyncInterval;
             }
         }

src/Ryujinx.HLE/PerformanceStatistics.cs

@@ -6,6 +6,8 @@ namespace Ryujinx.HLE
 {
     public class PerformanceStatistics
     {
+        private readonly Switch _device;
+        
         private const int FrameTypeGame = 0;
         private const int PercentTypeFifo = 0;
 
@@ -28,8 +30,10 @@ namespace Ryujinx.HLE
 
         private readonly System.Timers.Timer _resetTimer;
 
-        public PerformanceStatistics()
+        public PerformanceStatistics(Switch device)
         {
+            _device = device;
+            
             _frameRate = new double[1];
             _accumulatedFrameTime = new double[1];
             _previousFrameTime = new double[1];
@@ -162,14 +166,6 @@ 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

@@ -20,31 +20,39 @@ namespace Ryujinx.HLE
     {
         public static Switch Shared { get; private set; }
         
-        public HleConfiguration Configuration { get; }
+        public HLEConfiguration Configuration { get; }
         public IHardwareDeviceDriver AudioDeviceDriver { get; }
         public MemoryBlock Memory { get; }
         public GpuContext Gpu { get; }
         public VirtualFileSystem FileSystem { get; }
         public HOS.Horizon System { get; }
+
+        public bool TurboMode = false;
+
+        public long TickScalar
+        {
+            get => System?.TickSource?.TickScalar ?? 100;
+            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 1 has 4 cores
+        public int CpuCoresCount = 4; // Switch has a quad-core Tegra X1 SoC
 
         public VSyncMode VSyncMode { get; set; }
         public bool CustomVSyncIntervalEnabled { get; set; }
         public int CustomVSyncInterval { get; set; }
-
         public long TargetVSyncInterval { get; set; } = 60;
 
         public bool IsFrameAvailable => Gpu.Window.IsFrameAvailable;
 
         public DirtyHacks DirtyHacks { get; }
 
-        public Switch(HleConfiguration configuration)
+        public Switch(HLEConfiguration configuration)
         {
             ArgumentNullException.ThrowIfNull(configuration.GpuRenderer);
             ArgumentNullException.ThrowIfNull(configuration.AudioDeviceDriver);
@@ -64,7 +72,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();
+            Statistics        = new PerformanceStatistics(this);
             Hid               = new Hid(this, System.HidStorage);
             Processes         = new ProcessLoader(this);
             TamperMachine     = new TamperMachine();
@@ -75,6 +83,7 @@ namespace Ryujinx.HLE
 
             VSyncMode                               = Configuration.VSyncMode;
             CustomVSyncInterval                     = Configuration.CustomVSyncInterval;
+            TickScalar                              = TurboMode ? Configuration.TickScalar : 100;
             System.State.DockedMode                 = Configuration.EnableDockedMode;
             System.PerformanceState.PerformanceMode = System.State.DockedMode ? PerformanceMode.Boost : PerformanceMode.Default;
             System.EnablePtc                        = Configuration.EnablePtc;
@@ -94,20 +103,16 @@ namespace Ryujinx.HLE
             Gpu.GPFifo.DispatchCalls();
         }
 
-        public int IncrementCustomVSyncInterval()
+        public void IncrementCustomVSyncInterval()
         {
             CustomVSyncInterval += 1;
             UpdateVSyncInterval();
-
-            return CustomVSyncInterval;
         }
 
-        public int DecrementCustomVSyncInterval()
+        public void DecrementCustomVSyncInterval()
         {
             CustomVSyncInterval -= 1;
             UpdateVSyncInterval();
-
-            return CustomVSyncInterval;
         }
 
         public void UpdateVSyncInterval()
@@ -126,6 +131,12 @@ namespace Ryujinx.HLE
             }
         }
 
+        public void ToggleTurbo()
+        {
+            TurboMode = !TurboMode;
+            TickScalar = TurboMode ? Configuration.TickScalar : 100;
+        }
+
         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,6 +4,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Threading;
 using DiscordRPC;
+using Gommon;
 using LibHac.Common;
 using LibHac.Ns;
 using LibHac.Tools.FsSystem;
@@ -21,8 +22,8 @@ using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -470,7 +471,7 @@ namespace Ryujinx.Ava
 
             Dispatcher.UIThread.InvokeAsync(() =>
             {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
             });
 
             _viewModel.SetUiProgressHandlers(Device);
@@ -872,7 +873,7 @@ namespace Ryujinx.Ava
             Device?.System.TogglePauseEmulation(false);
 
             _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
         }
 
@@ -881,7 +882,7 @@ namespace Ryujinx.Ava
             Device?.System.TogglePauseEmulation(true);
 
             _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
         }
 
@@ -902,19 +903,54 @@ namespace Ryujinx.Ava
                 _ => new OpenGLRenderer()
             };
 
+            BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
+
+            bool isGALThreaded = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
+            if (isGALThreaded)
+            {
+                renderer = new ThreadedRenderer(renderer);
+            }
+
+            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({threadingMode}): {isGALThreaded}");
+
             // Initialize Configuration.
-            Device = new Switch(ConfigurationState.Instance.CreateHleConfiguration()
-                .Configure(
-                    VirtualFileSystem,
-                    _viewModel.LibHacHorizonManager,
-                    ContentManager,
-                    _accountManager,
-                    _userChannelPersistence,
-                    renderer.TryMakeThreaded(ConfigurationState.Instance.Graphics.BackendThreading),
-                    InitializeAudio(),
-                    _viewModel.UiHandler
-                )
-            );
+            MemoryConfiguration memoryConfiguration = ConfigurationState.Instance.System.DramSize.Value;
+
+            Device = new Switch(new HLEConfiguration(
+                VirtualFileSystem,
+                _viewModel.LibHacHorizonManager,
+                ContentManager,
+                _accountManager,
+                _userChannelPersistence,
+                renderer,
+                InitializeAudio(),
+                memoryConfiguration,
+                _viewModel.UiHandler,
+                (SystemLanguage)ConfigurationState.Instance.System.Language.Value,
+                (RegionCode)ConfigurationState.Instance.System.Region.Value,
+                ConfigurationState.Instance.Graphics.VSyncMode,
+                ConfigurationState.Instance.System.EnableDockedMode,
+                ConfigurationState.Instance.System.EnablePtc,
+                ConfigurationState.Instance.System.EnableInternetAccess,
+                ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                ConfigurationState.Instance.System.FsGlobalAccessLogMode,
+                ConfigurationState.Instance.System.MatchSystemTime 
+                    ? 0 
+                    : ConfigurationState.Instance.System.SystemTimeOffset,
+                ConfigurationState.Instance.System.TimeZone,
+                ConfigurationState.Instance.System.MemoryManagerMode,
+                ConfigurationState.Instance.System.IgnoreMissingServices,
+                ConfigurationState.Instance.Graphics.AspectRatio,
+                ConfigurationState.Instance.System.AudioVolume,
+                ConfigurationState.Instance.System.UseHypervisor,
+                ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value,
+                ConfigurationState.Instance.Multiplayer.Mode,
+                ConfigurationState.Instance.Multiplayer.DisableP2p,
+                ConfigurationState.Instance.Multiplayer.LdnPassphrase,
+                ConfigurationState.Instance.Multiplayer.GetLdnServer(),
+                ConfigurationState.Instance.Graphics.CustomVSyncInterval,
+                ConfigurationState.Instance.System.TickScalar,
+                ConfigurationState.Instance.Hacks.ShowDirtyHacks ? ConfigurationState.Instance.Hacks.EnabledHacks : null));
         }
 
         private static IHardwareDeviceDriver InitializeAudio()
@@ -1118,11 +1154,23 @@ namespace Ryujinx.Ava
                 LocaleManager.Instance[LocaleKeys.VolumeShort] + $": {(int)(Device.GetVolume() * 100)}%",
                 dockedMode,
                 ConfigurationState.Instance.Graphics.AspectRatio.Value.ToText(),
-                Device.Statistics.FormatGameFrameRate(),
+                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;
@@ -1148,9 +1196,6 @@ namespace Ryujinx.Ava
 
         private void UpdateShaderCount()
         {
-            if (_displayCount is 0 && _renderer.ProgramCount is 0)
-                return;
-            
             // If there is a mismatch between total program compile and previous count
             // this means new shaders have been compiled and should be displayed.
             if (_renderer.ProgramCount != _previousCount)
@@ -1218,16 +1263,30 @@ namespace Ryujinx.Ava
 
                 if (currentHotkeyState != _prevHotkeyState)
                 {
+                    if (ConfigurationState.Instance.Hid.Hotkeys.Value.TurboModeWhileHeld &&
+                        _keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.TurboMode) != Device.TurboMode)
+                    {
+                        Device.ToggleTurbo();
+                    }
+                    
                     switch (currentHotkeyState)
                     {
                         case KeyboardHotkeyState.ToggleVSyncMode:
                             VSyncModeToggle();
                             break;
                         case KeyboardHotkeyState.CustomVSyncIntervalDecrement:
-                            _viewModel.CustomVSyncInterval = Device.DecrementCustomVSyncInterval();
+                            Device.DecrementCustomVSyncInterval();
+                            _viewModel.CustomVSyncInterval -= 1;
                             break;
                         case KeyboardHotkeyState.CustomVSyncIntervalIncrement:
-                            _viewModel.CustomVSyncInterval = Device.IncrementCustomVSyncInterval();
+                            Device.IncrementCustomVSyncInterval();
+                            _viewModel.CustomVSyncInterval += 1;
+                            break;
+                        case KeyboardHotkeyState.TurboMode:
+                            if (!ConfigurationState.Instance.Hid.Hotkeys.Value.TurboModeWhileHeld)
+                            {
+                                Device.ToggleTurbo();
+                            }
                             break;
                         case KeyboardHotkeyState.Screenshot:
                             ScreenshotRequested = true;
@@ -1358,6 +1417,10 @@ namespace Ryujinx.Ava
             {
                 state = KeyboardHotkeyState.CustomVSyncIntervalDecrement;
             }
+            else if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.TurboMode))
+            {
+                state = KeyboardHotkeyState.TurboMode;
+            }
 
             return state;
         }

src/Ryujinx/Assets/Styles/Styles.xaml

@@ -440,7 +440,7 @@
         <x:Double x:Key="ControlContentThemeFontSize">13</x:Double>
         <x:Double x:Key="MenuItemHeight">26</x:Double>
         <x:Double x:Key="TabItemMinHeight">28</x:Double>
-        <x:Double x:Key="ContentDialogMaxWidth">700</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
         <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
     </Styles.Resources>
 </Styles>

src/Ryujinx/Assets/locales.json

@@ -3823,53 +3823,28 @@
       }
     },
     {
-      "ID": "SettingsTabGeneralShowOldUI",
+      "ID": "SettingsTabGeneralShowTitleBar",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "Show Original UI Style (Requires restart)",
-        "es_ES": "",
-        "fr_FR": "",
+        "en_US": "Show Title Bar (Requires restart)",
+        "es_ES": "Mostrar Barra de Título (Requiere reinicio)",
+        "fr_FR": "Afficher Barre de Titre (Nécessite redémarrage)",
         "he_IL": "",
-        "it_IT": "",
+        "it_IT": "Mostra barra del titolo (Richiede il riavvio)",
         "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "Vis original UI-stil (krever omstart)",
+        "ko_KR": "제목 표시줄 표시(다시 시작해야 함)",
+        "no_NO": "Vis tittellinje (krever omstart)",
         "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "pt_BR": "Mostrar Barra de Título (Requer reinicialização)",
+        "ru_RU": "Показать строку заголовка (требуется перезапуск)",
+        "sv_SE": "Visa titelrad (kräver omstart)",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsTabGeneralShowOldUIToolTip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Show the older Avalonia Ryujinx UI reminiscent of Ryujinx 1.1.1403. This is enabled by default on platforms that are not Windows.\nThe classic-style title bar is back and major window layout reworkings are reversed; such as the settings navigation placement above this tooltip.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "Vis det eldre Avalonia Ryujinx-grensesnittet som minner om Ryujinx 1.1.1403. Dette er aktivert som standard på plattformer som ikke er Windows.\nTittellinjen i klassisk stil er tilbake, og store omarbeidinger av vindusoppsettet er reversert, for eksempel plasseringen av innstillingsnavigasjonen over dette verktøytipset.",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
+        "uk_UA": "Показувати рядок заголовка (Потрібен перезапуск)",
+        "zh_CN": "显示标题栏 (需要重启)",
+        "zh_TW": "顯示「標題列」 (需要重新開啟Ryujinx)"
       }
     },
     {
@@ -4922,6 +4897,81 @@
         "zh_TW": "低功耗 PPTC"
       }
     },
+    {
+      "ID": "SettingsTabSystemTurboMultiplier",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Turbo Mode multiplier:",
+        "es_ES": "",
+        "fr_FR": "Multiplicateur du Mode Turbo :",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SettingsTabSystemTurboMultiplierValueToolTip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "The Turbo mode multiplier target value.\n\nLeave at 200 if unsure.",
+        "es_ES": "",
+        "fr_FR": "La valeur souhaitée du multiplicateur du Mode Turbo.\n\nGarder à 200 si incertain.",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SettingsTabSystemTurboMultiplierToolTip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Turbo mode is an emulator feature which effectively causes speed up or slow down when a game is not frame-rate sensitive.\nYou can toggle this feature in-game with a hotkey, configurable in Ryujinx Keyboard Hotkeys settings.\n\nLeave at 200 if unsure.",
+        "es_ES": "",
+        "fr_FR": "Le Mode Turbo est une fonctionnalité de l'émulateur qui accélère ou ralentit le jeu lorsque ce dernier n'est pas sensible au framerate.\nVous pouvez changer cette option en jeu avec un raccourci clavier, configurable dans les paramètres de Raccourcis clavier de Ryujinx.\n\nGarder à 200 si incertain.",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "SettingsTabSystemEnableFsIntegrityChecks",
       "Translations": {
@@ -10505,7 +10555,7 @@
         "el_GR": "",
         "en_US": "Unbound",
         "es_ES": "",
-        "fr_FR": "Pas Attribuée",
+        "fr_FR": "Non Attribuée",
         "he_IL": "",
         "it_IT": "Non assegnato",
         "ja_JP": "",
@@ -18097,6 +18147,56 @@
         "zh_TW": "更新已停用!"
       }
     },
+    {
+      "ID": "FpsStatusBarText",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "{0} FPS ({1}ms)",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "FpsTurboStatusBarText",
+      "Translations": {
+        "ar_SA": "{0} FPS ({1}ms), التوربو %{2}",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "{0} FPS ({1}ms), Turbo ({2}%)",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "UpdaterBackgroundStatusBarButtonText",
       "Translations": {
@@ -23822,6 +23922,81 @@
         "zh_TW": "降低自訂的重新整理頻率"
       }
     },
+    {
+      "ID": "SettingsTabHotkeysTurboMode",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Turbo mode:",
+        "es_ES": "",
+        "fr_FR": "Mode Turbo :",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SettingsTabHotkeysTurboModeToolTip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "The Turbo mode hotkey.\nConfigure the behavior of Turbo mode in Ryujinx CPU settings.\n\nLeave Unbound if unsure.",
+        "es_ES": "",
+        "fr_FR": "Le raccourci clavier Mode Turbo.\nConfigurez le comportement du Mode Turbo dans les paramètres de CPU de Ryujinx.\n\nLaisser Non Attribuée si incertain.",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SettingsTabHotkeysOnlyWhilePressed",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Only while pressed",
+        "es_ES": "",
+        "fr_FR": "Seulement quand le raccourci est maintenu",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "CompatibilityListLastUpdated",
       "Translations": {
@@ -23847,31 +24022,6 @@
         "zh_TW": "上次更新時間: {0}"
       }
     },
-    {
-      "ID": "CompatibilityListTitle",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Compatibility List - {0} entries",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "CompatibilityListWarning",
       "Translations": {
@@ -23922,31 +24072,6 @@
         "zh_TW": "搜尋相容性列表紀錄..."
       }
     },
-    {
-      "ID": "CompatibilityListSearchBoxWatermarkWithCount",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Search {0} compatibility entries...",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "Søk i {0} kompatibilitetsoppføringer...",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "CompatibilityListOpen",
       "Translations": {

src/Ryujinx/Common/ApplicationHelper.cs

@@ -16,7 +16,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.FileSystem;
@@ -216,7 +216,11 @@ namespace Ryujinx.Ava.Common
                     return;
                 }
 
-                (Nca updatePatchNca, _) = mainNca.GetUpdateData(_virtualFileSystem, ConfigurationState.Instance.System.IntegrityCheckLevel, programIndex, out _);
+                IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
+                    ? IntegrityCheckLevel.ErrorOnInvalid
+                    : IntegrityCheckLevel.None;
+
+                (Nca updatePatchNca, _) = mainNca.GetUpdateData(_virtualFileSystem, checkLevel, programIndex, out _);
                 if (updatePatchNca is not null)
                 {
                     patchNca = updatePatchNca;

src/Ryujinx/Common/KeyboardHotkeyState.cs

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

src/Ryujinx/Common/LocaleManager.cs

@@ -1,7 +1,6 @@
 using Gommon;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Utilities;
 using System;
@@ -26,21 +25,7 @@ namespace Ryujinx.Ava.Common.Locale
         public LocaleManager()
         {
             _localeStrings = new Dictionary<LocaleKeys, string>();
-            _dynamicValues = new ConcurrentDictionary<LocaleKeys, object[]>(new Dictionary<LocaleKeys, object[]>
-            {
-                { LocaleKeys.DialogConfirmationTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogUpdaterTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogErrorTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogWarningTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogExitTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogStopEmulationTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxInfo, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxConfirm, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxUpdater, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxRebooter, [RyujinxApp.FullAppName] },
-                { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityCsv.Entries.Length] },
-                { LocaleKeys.CompatibilityListTitle, [CompatibilityCsv.Entries.Length] }
-            });
+            _dynamicValues = new ConcurrentDictionary<LocaleKeys, object[]>();
 
             Load();
         }
@@ -59,8 +44,26 @@ namespace Ryujinx.Ava.Common.Locale
 
                 ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
             }
+            
+            SetDynamicValues(LocaleKeys.DialogConfirmationTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.DialogUpdaterTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.DialogErrorTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.DialogWarningTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.DialogExitTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.DialogStopEmulationTitle, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.RyujinxInfo, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.RyujinxConfirm, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.RyujinxUpdater, RyujinxApp.FullAppName);
+            SetDynamicValues(LocaleKeys.RyujinxRebooter, RyujinxApp.FullAppName);
         }
 
+        public static string GetUnformatted(LocaleKeys key) => Instance.Get(key);
+
+        public string Get(LocaleKeys key) =>
+            _localeStrings.TryGetValue(key, out string value) 
+                ? value 
+                : key.ToString();
+
         public string this[LocaleKeys key]
         {
             get

src/Ryujinx/Common/Markup/MarkupExtensions.cs

@@ -1,5 +1,4 @@
 using Avalonia.Markup.Xaml.MarkupExtensions;
-using Humanizer;
 using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;
 
@@ -25,17 +24,4 @@ namespace Ryujinx.Ava.Common.Markup
         protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
             => bindingExtension.Source = LocaleManager.Instance;
     }
-    
-    internal class WindowTitleExtension(LocaleKeys key, bool includeVersion) : BasicMarkupExtension<string>
-    {
-        public WindowTitleExtension(LocaleKeys key) : this(key, true)
-        {
-        }
-        
-        public override string Name => "WindowTitleTranslation";
-        protected override string Value => RyujinxApp.FormatTitle(key, includeVersion);
-
-        protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
-            => bindingExtension.Source = LocaleManager.Instance;
-    }
 }

src/Ryujinx/Common/Models/XCITrimmerFileModel.cs

@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 

src/Ryujinx/DiscordIntegrationModule.cs

@@ -1,9 +1,9 @@
 using DiscordRPC;
 using Gommon;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Systems.PlayReport;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Utilities.PlayReport;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE;

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -2,7 +2,7 @@ using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -312,42 +312,50 @@ namespace Ryujinx.Headless
             return new OpenGLRenderer();
         }
 
-        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) =>
-            new(
-                new HleConfiguration(
-                        options.DramSize,
-                        options.SystemLanguage,
-                        options.SystemRegion,
-                        options.VSyncMode,
-                        !options.DisableDockedMode,
-                        !options.DisablePTC,
-                        options.EnableInternetAccess,
-                        !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
-                        options.FsGlobalAccessLogMode,
-                        options.SystemTimeOffset,
-                        options.SystemTimeZone,
-                        options.MemoryManagerMode,
-                        options.IgnoreMissingServices,
-                        options.AspectRatio,
-                        options.AudioVolume,
-                        options.UseHypervisor ?? true,
-                        options.MultiplayerLanInterfaceId,
-                        Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
-                        false,
-                        string.Empty,
-                        string.Empty,
-                        options.CustomVSyncInterval
-                    )
-                    .Configure(
-                        _virtualFileSystem,
-                        _libHacHorizonManager,
-                        _contentManager,
-                        _accountManager,
-                        _userChannelPersistence,
-                        renderer.TryMakeThreaded(options.BackendThreading),
-                        new SDL2HardwareDeviceDriver(),
-                        window
-                    )
-            );
+        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options)
+        {
+            BackendThreading threadingMode = options.BackendThreading;
+
+            bool threadedGAL = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
+
+            if (threadedGAL)
+            {
+                renderer = new ThreadedRenderer(renderer);
+            }
+
+            HLEConfiguration configuration = new(_virtualFileSystem,
+                _libHacHorizonManager,
+                _contentManager,
+                _accountManager,
+                _userChannelPersistence,
+                renderer,
+                new SDL2HardwareDeviceDriver(),
+                options.DramSize,
+                window,
+                options.SystemLanguage,
+                options.SystemRegion,
+                options.VSyncMode,
+                !options.DisableDockedMode,
+                !options.DisablePTC,
+                options.EnableInternetAccess,
+                !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                options.FsGlobalAccessLogMode,
+                options.SystemTimeOffset,
+                options.SystemTimeZone,
+                options.MemoryManagerMode,
+                options.IgnoreMissingServices,
+                options.AspectRatio,
+                options.AudioVolume,
+                options.UseHypervisor ?? true,
+                options.MultiplayerLanInterfaceId,
+                Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
+                false,
+                string.Empty,
+                string.Empty,
+                options.CustomVSyncInterval,
+                100);
+
+            return new Switch(configuration);
+        }
     }
 }

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -1,7 +1,7 @@
 using CommandLine;
 using Gommon;
 using Ryujinx.Ava;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;

src/Ryujinx/Headless/Options.cs

@@ -1,7 +1,6 @@
 using CommandLine;
 using Gommon;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.HLE;
@@ -38,7 +37,7 @@ namespace Ryujinx.Headless
                 EnableInternetAccess = configurationState.System.EnableInternetAccess;
 
             if (NeedsOverride(nameof(DisableFsIntegrityChecks)))
-                DisableFsIntegrityChecks = !configurationState.System.EnableFsIntegrityChecks;
+                DisableFsIntegrityChecks = configurationState.System.EnableFsIntegrityChecks;
             
             if (NeedsOverride(nameof(FsGlobalAccessLogMode)))
                 FsGlobalAccessLogMode = configurationState.System.FsGlobalAccessLogMode;
@@ -59,10 +58,10 @@ namespace Ryujinx.Headless
                 DisableDockedMode = !configurationState.System.EnableDockedMode;
 
             if (NeedsOverride(nameof(SystemLanguage)))
-                SystemLanguage = configurationState.System.Language.Value.ToHLE();
+                SystemLanguage = (SystemLanguage)(int)configurationState.System.Language.Value;
             
             if (NeedsOverride(nameof(SystemRegion)))
-                SystemRegion = configurationState.System.Region.Value.ToHLE();
+                SystemRegion = (RegionCode)(int)configurationState.System.Region.Value;
             
             if (NeedsOverride(nameof(SystemTimeZone)))
                 SystemTimeZone = configurationState.System.TimeZone;

src/Ryujinx/Program.cs

@@ -8,8 +8,7 @@ using Projektanker.Icons.Avalonia.MaterialDesign;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Ava.Utilities.SystemInfo;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
@@ -283,16 +282,16 @@ namespace Ryujinx.Ava
 
             // Check if region was overridden. 
             if (CommandLineState.OverrideSystemRegion is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out HLE.HOS.SystemState.RegionCode result))
+                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Ryujinx.HLE.HOS.SystemState.RegionCode result))
                 {
-                    ConfigurationState.Instance.System.Region.Value = result.ToUI();
+                    ConfigurationState.Instance.System.Region.Value = (Utilities.Configuration.System.Region)result;
                 }
 
             //Check if language was overridden. 
             if (CommandLineState.OverrideSystemLanguage is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out HLE.HOS.SystemState.SystemLanguage result))
+                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Ryujinx.HLE.HOS.SystemState.SystemLanguage result))
                 {
-                    ConfigurationState.Instance.System.Language.Value = result.ToUI();
+                    ConfigurationState.Instance.System.Language.Value = (Utilities.Configuration.System.Language)result;
                 }
 
             // Check if hardware-acceleration was overridden.

src/Ryujinx/RyujinxApp.axaml

@@ -17,9 +17,4 @@
         <sty:FluentAvaloniaTheme PreferUserAccentColor="True" PreferSystemTheme="False" />
         <StyleInclude Source="/Assets/Styles/Styles.xaml" />
     </Application.Styles>
-    <NativeMenu.Menu>
-        <NativeMenu>
-            <NativeMenuItem Header="About Ryujinx" Click="AboutRyujinx_OnClick" />
-        </NativeMenu>
-    </NativeMenu.Menu>
 </Application>

src/Ryujinx/RyujinxApp.axaml.cs

@@ -12,7 +12,7 @@ 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.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using System;
@@ -147,10 +147,5 @@ namespace Ryujinx.Ava
             Current is RyujinxApp { PlatformSettings: not null } app
                 ? ConvertThemeVariant(app.PlatformSettings.GetColorValues().ThemeVariant)
                 : ThemeVariant.Default;
-
-        private async void AboutRyujinx_OnClick(object sender, EventArgs e)
-        {
-            await AboutWindow.Show();
-        }
     }
 }

src/Ryujinx/Systems/Configuration/System/Region.cs

@@ -1,26 +0,0 @@
-using Ryujinx.Common.Utilities;
-using System.Text.Json.Serialization;
-
-namespace Ryujinx.Ava.Systems.Configuration.System
-{
-    [JsonConverter(typeof(TypedStringEnumConverter<Region>))]
-    public enum Region
-    {
-        Japan,
-        USA,
-        Europe,
-        Australia,
-        China,
-        Korea,
-        Taiwan,
-    }
-    
-    public static class RegionEnumHelper
-    {
-        public static Region ToUI(this HLE.HOS.SystemState.RegionCode hleRegion)
-            => (Region)hleRegion;
-
-        public static HLE.HOS.SystemState.RegionCode ToHLE(this Region uiRegion)
-            => (HLE.HOS.SystemState.RegionCode)uiRegion;
-    }
-}

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -7,7 +7,7 @@ using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.Applets;

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

@@ -12,7 +12,8 @@ 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.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -407,7 +408,7 @@ namespace Ryujinx.Ava.UI.Controls
         public async void OpenApplicationCompatibility_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await CompatibilityListWindow.Show(viewModel.SelectedApplication.IdString);
+                await CompatibilityList.Show(viewModel.SelectedApplication.IdString);
         }
                
         public async void OpenApplicationData_Click(object sender, RoutedEventArgs args)

src/Ryujinx/UI/Controls/RyujinxLogo.cs

@@ -1,29 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Media.Imaging;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.ViewModels;
-using System.Reflection;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public class RyujinxLogo : Image
-    {
-        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
-        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
-        // The border gets reduced to colored pixels in the 4 corners.
-        public static readonly Bitmap Bitmap =
-            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
-                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
-        
-        public RyujinxLogo()
-        {
-            Margin = new Thickness(7, 7, 7, 0);
-            Height = 25;
-            Width = 25;
-            Source = Bitmap;
-            IsVisible = !ConfigurationState.Instance.ShowOldUI;
-        }
-    }
-}

src/Ryujinx/UI/Helpers/ApplicationOpenedEventArgs.cs

@@ -1,5 +1,5 @@
 using Avalonia.Interactivity;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 
 namespace Ryujinx.Ava.UI.Helpers
 {

src/Ryujinx/UI/Helpers/ContentDialogHelper.cs

@@ -4,7 +4,6 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
-using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
@@ -22,23 +21,6 @@ namespace Ryujinx.Ava.UI.Helpers
         private static bool _isChoiceDialogOpen;
         private static ContentDialogOverlayWindow _contentDialogOverlayWindow;
 
-        public static ContentDialog ApplyStyles(
-            this ContentDialog contentDialog, 
-            double closeButtonWidth = 80, 
-            HorizontalAlignment buttonSpaceAlignment = HorizontalAlignment.Right)
-        {
-            Style closeButton = new(x => x.Name("CloseButton"));
-            closeButton.Setters.Add(new Setter(Layoutable.WidthProperty, closeButtonWidth));
-            
-            Style closeButtonParent = new(x => x.Name("CommandSpace"));
-            closeButtonParent.Setters.Add(new Setter(Layoutable.HorizontalAlignmentProperty, buttonSpaceAlignment));
-
-            contentDialog.Styles.Add(closeButton);
-            contentDialog.Styles.Add(closeButtonParent);
-
-            return contentDialog;
-        }
-
         private async static Task<UserResult> ShowContentDialog(
              string title,
              object content,

src/Ryujinx/UI/Helpers/Converters/MultiplayerInfoConverter.cs

@@ -2,7 +2,7 @@ using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 using System.Globalization;
 using System.Text;

src/Ryujinx/UI/Helpers/LoggerAdapter.cs

@@ -1,7 +1,7 @@
 using Avalonia.Logging;
 using Avalonia.Utilities;
 using Gommon;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Logging;
 using System;
 using System.Text;

src/Ryujinx/UI/Models/Generic/LastPlayedSortComparer.cs

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

src/Ryujinx/UI/Models/Generic/TimePlayedSortComparer.cs

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

src/Ryujinx/UI/Models/Input/HotkeyConfig.cs

@@ -28,6 +28,10 @@ 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)
@@ -44,6 +48,8 @@ namespace Ryujinx.Ava.UI.Models.Input
             VolumeDown = config.VolumeDown;
             CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
             CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
+            TurboMode = config.TurboMode;
+            TurboModeWhileHeld = config.TurboModeWhileHeld;
         }
 
         public KeyboardHotkeys GetConfig() =>
@@ -60,6 +66,8 @@ namespace Ryujinx.Ava.UI.Models.Input
                 VolumeDown = VolumeDown,
                 CustomVSyncIntervalIncrement = CustomVSyncIntervalIncrement,
                 CustomVSyncIntervalDecrement = CustomVSyncIntervalDecrement,
+                TurboMode = TurboMode,
+                TurboModeWhileHeld = TurboModeWhileHeld
             };
     }
 }

src/Ryujinx/UI/Models/SaveModel.cs

@@ -3,7 +3,7 @@ using LibHac.Fs;
 using LibHac.Ncm;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.HLE.FileSystem;
 using System.IO;
 using System.Linq;

src/Ryujinx/UI/Renderer/EmbeddedWindow.cs

@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Platform;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using SPB.Graphics;

src/Ryujinx/UI/Renderer/EmbeddedWindowOpenGL.cs

@@ -1,5 +1,5 @@
 using OpenTK.Graphics.OpenGL;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;

src/Ryujinx/UI/Renderer/RendererHost.cs

@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using System;
 

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -5,7 +5,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using System;
 
 namespace Ryujinx.Ava.UI.ViewModels

src/Ryujinx/UI/ViewModels/AppListFavoriteComparable.cs

@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 
 namespace Ryujinx.Ava.UI.ViewModels

src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs

@@ -1,7 +1,7 @@
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.PlayReport;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.PlayReport;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {

src/Ryujinx/UI/ViewModels/DlcSelectViewModel.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.Common.Models;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Linq;
 
 namespace Ryujinx.Ava.UI.ViewModels

src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs

@@ -7,7 +7,7 @@ using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -10,7 +10,7 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;

src/Ryujinx/UI/ViewModels/Input/LedInputViewModel.cs

@@ -3,7 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Humanizer;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using System.Globalization;
 
 namespace Ryujinx.Ava.UI.ViewModels.Input

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -23,8 +23,8 @@ using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Models.Generic;
 using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
@@ -137,6 +137,13 @@ namespace Ryujinx.Ava.UI.ViewModels
         // Key is Title ID
         public SafeDictionary<string, LdnGameData.Array> LdnData = [];
 
+        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
+        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
+        // The border gets reduced to colored pixels in the 4 corners.
+        public static readonly Bitmap IconBitmap =
+            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
+                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
+
         public MainWindow Window { get; init; }
 
         internal AppHost AppHost { get; set; }
@@ -1787,7 +1794,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             if (WindowState is not WindowState.Normal)
             {
                 WindowState = WindowState.Normal;
-                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowOldUI;
+                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
 
                 if (IsGameRunning)
                 {

src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs

@@ -7,7 +7,7 @@ using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;

src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -12,9 +12,9 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Systems.Configuration.System;
-using Ryujinx.Ava.Systems.Configuration.UI;
+using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Utilities.Configuration.System;
+using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.GraphicsDriver;
@@ -60,6 +60,7 @@ 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;
@@ -130,10 +131,11 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool IsOpenGLAvailable => !OperatingSystem.IsMacOS();
 
         public bool EnableDiscordIntegration { get; set; }
+        public bool CheckUpdatesOnStart { get; set; }
         public bool ShowConfirmExit { get; set; }
         public bool IgnoreApplet { get; set; }
         public bool RememberWindowState { get; set; }
-        public bool ShowOldUI { get; set; }
+        public bool ShowTitleBar { get; set; }
         public int HideCursor { get; set; }
         public int UpdateCheckerType { get; set; }
         public bool EnableDockedMode { get; set; }
@@ -206,6 +208,25 @@ 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; }
@@ -536,9 +557,10 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // User Interface
             EnableDiscordIntegration = config.EnableDiscordIntegration;
+            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
             ShowConfirmExit = config.ShowConfirmExit;
             RememberWindowState = config.RememberWindowState;
-            ShowOldUI = config.ShowOldUI;
+            ShowTitleBar = config.ShowTitleBar;
             HideCursor = (int)config.HideCursor.Value;
             UpdateCheckerType = (int)config.UpdateCheckerType.Value;
             FocusLostActionType = (int)config.FocusLostActionType.Value;
@@ -592,6 +614,7 @@ 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;
@@ -644,9 +667,10 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // User Interface
             config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
+            config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
             config.ShowConfirmExit.Value = ShowConfirmExit;
             config.RememberWindowState.Value = RememberWindowState;
-            config.ShowOldUI.Value = ShowOldUI;
+            config.ShowTitleBar.Value = ShowTitleBar;
             config.HideCursor.Value = (HideCursorMode)HideCursor;
             config.UpdateCheckerType.Value = (UpdaterType)UpdateCheckerType;
             config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType;
@@ -694,6 +718,7 @@ 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;

src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs

@@ -6,7 +6,7 @@ using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs

@@ -6,7 +6,7 @@ using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Utilities;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

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

@@ -6,16 +6,18 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     mc:Ignorable="d"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     x:DataType="viewModels:MainWindowViewModel"
     x:Class="Ryujinx.Ava.UI.Views.Main.MainMenuBarView">
     <Design.DataContext>
         <viewModels:MainWindowViewModel />
     </Design.DataContext>
     <DockPanel HorizontalAlignment="Stretch">
-        <controls:RyujinxLogo 
-            Margin="7, 0" 
-            ToolTip.Tip="{Binding Title}"/>
+        <Image
+            Name="RyuLogo"
+            Margin="7, 0"
+            Height="25"
+            Width="25"
+            ToolTip.Tip="{Binding Title}" />
         <Menu
             Name="Menu"
             Height="32"

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

@@ -11,9 +11,9 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Views.Misc;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Utilities;
@@ -34,6 +34,9 @@ namespace Ryujinx.Ava.UI.Views.Main
         {
             InitializeComponent();
 
+            RyuLogo.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
+            RyuLogo.Source = MainWindowViewModel.IconBitmap;
+
             ToggleFileTypesMenuItem.ItemsSource = GenerateToggleFileTypeItems();
             ChangeLanguageMenuItem.ItemsSource = GenerateLanguageMenuItems();
 
@@ -48,7 +51,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
             XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
             AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
-            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityListWindow.Show());
+            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());
 
             UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;
 
@@ -223,7 +226,7 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
             double barsHeight = ((Window.StatusBarHeight + Window.MenuBarHeight) +
-                (ConfigurationState.Instance.ShowOldUI ? (int)Window.TitleBar.Height : 0));
+                (ConfigurationState.Instance.ShowTitleBar ? (int)Window.TitleBar.Height : 0));
 
             double windowWidthScaled = (resolutionWidth * Program.WindowScaleFactor);
             double windowHeightScaled = ((resolutionHeight + barsHeight) * Program.WindowScaleFactor);

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

@@ -7,7 +7,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;

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

@@ -1,14 +1,15 @@
 using Avalonia.Controls;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
-using Avalonia.Layout;
+using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -28,7 +29,17 @@ namespace Ryujinx.Ava.UI.Views.Misc
                 Content = new ApplicationDataView { ViewModel = new ApplicationDataViewModel(appData) }
             };
 
-            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles(160, HorizontalAlignment.Center));
+            Style closeButton = new(x => x.Name("CloseButton"));
+            closeButton.Setters.Add(new Setter(WidthProperty, 160d));
+
+            Style closeButtonParent = new(x => x.Name("CommandSpace"));
+            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty,
+                Avalonia.Layout.HorizontalAlignment.Center));
+
+            contentDialog.Styles.Add(closeButton);
+            contentDialog.Styles.Add(closeButtonParent);
+
+            await ContentDialogHelper.ShowAsync(contentDialog);
         }
         
         public ApplicationDataView()
@@ -44,18 +55,21 @@ namespace Ryujinx.Ava.UI.Views.Misc
             if (RyujinxApp.AppLifetime.Windows.TryGetFirst(x => x is ContentDialogOverlayWindow, out Window window))
                 window.Close(ContentDialogResult.None);
             
-            await CompatibilityListWindow.Show((string)playabilityLabel.Tag);
+            await CompatibilityList.Show((string)playabilityLabel.Tag);
         }
 
         private async void IdString_OnClick(object sender, RoutedEventArgs e)
         {
+            if (DataContext is not MainWindowViewModel mwvm)
+                return;
+            
             if (sender is not Button { Content: TextBlock idText })
                 return;
 
             if (!RyujinxApp.IsClipboardAvailable(out IClipboard clipboard))
                 return;
             
-            ApplicationData appData = RyujinxApp.MainWindow.ViewModel.Applications.FirstOrDefault(it => it.IdString == idText.Text);
+            ApplicationData appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
             if (appData is null)
                 return;
             

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

@@ -4,7 +4,7 @@ using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 
 namespace Ryujinx.Ava.UI.Views.Misc

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

@@ -5,8 +5,8 @@ using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Windows;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
 using System;
 using System.Linq;
 
@@ -36,7 +36,7 @@ namespace Ryujinx.Ava.UI.Views.Misc
             if (sender is not Button { Content: TextBlock playabilityLabel })
                 return;
 
-            await CompatibilityListWindow.Show((string)playabilityLabel.Tag);
+            await CompatibilityList.Show((string)playabilityLabel.Tag);
         }
 
         private async void IdString_OnClick(object sender, RoutedEventArgs e)

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

@@ -6,7 +6,7 @@ using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Misc
@@ -32,7 +32,17 @@ namespace Ryujinx.Ava.UI.Views.Misc
                 Content = new DlcSelectView { ViewModel = viewModel }
             };
 
-            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());
+            Style closeButton = new(x => x.Name("CloseButton"));
+            closeButton.Setters.Add(new Setter(WidthProperty, 80d));
+
+            Style closeButtonParent = new(x => x.Name("CommandSpace"));
+            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty,
+                Avalonia.Layout.HorizontalAlignment.Right));
+
+            contentDialog.Styles.Add(closeButton);
+            contentDialog.Styles.Add(closeButtonParent);
+
+            await ContentDialogHelper.ShowAsync(contentDialog);
 
             return viewModel.SelectedDlc;
         }

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

@@ -7,6 +7,7 @@
     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>
@@ -76,6 +77,57 @@
                                    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="500" />
+                        <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/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">
+        <Style Selector="StackPanel > StackPanel > TextBlock.settingHeader">
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="Width" Value="230" />
         </Style>
@@ -47,71 +47,79 @@
                     Classes="h1"
                     Text="{ext:Locale SettingsTabHotkeysHotkeys}" />
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" Classes="settingHeader" />
                     <ToggleButton Name="ToggleVSyncMode">
                         <TextBlock Text="{Binding KeyboardHotkey.ToggleVSyncMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" Classes="settingHeader" />
                     <ToggleButton Name="Screenshot">
                         <TextBlock Text="{Binding KeyboardHotkey.Screenshot, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" Classes="settingHeader" />
                     <ToggleButton Name="ShowUI">
                         <TextBlock Text="{Binding KeyboardHotkey.ShowUI, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" Classes="settingHeader" />
                     <ToggleButton Name="Pause">
                         <TextBlock Text="{Binding KeyboardHotkey.Pause, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" Classes="settingHeader" />
                     <ToggleButton Name="ToggleMute">
                         <TextBlock Text="{Binding KeyboardHotkey.ToggleMute, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" Classes="settingHeader" />
                     <ToggleButton Name="ResScaleUp">
                         <TextBlock Text="{Binding KeyboardHotkey.ResScaleUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" Classes="settingHeader" />
                     <ToggleButton Name="ResScaleDown">
                         <TextBlock Text="{Binding KeyboardHotkey.ResScaleDown, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" Classes="settingHeader" />
                     <ToggleButton Name="VolumeUp">
                         <TextBlock Text="{Binding KeyboardHotkey.VolumeUp, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
                     </ToggleButton>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" Classes="settingHeader" />
                     <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}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" Classes="settingHeader" />
                     <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}" />
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" Classes="settingHeader" />
                     <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

@@ -116,6 +116,9 @@ namespace Ryujinx.Ava.UI.Views.Settings
                                     case "CustomVSyncIntervalDecrement":
                                         viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = buttonValue.AsHidType<Key>();
                                         break;
+                                    case "TurboMode":
+                                        viewModel.KeyboardHotkey.TurboMode = buttonValue.AsHidType<Key>();
+                                        break;
                                 }
                             }
                         };

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

@@ -191,16 +191,16 @@
                         IsEnabled="{Binding !IsGameTitleNotNull}"
                         Opacity="{Binding PanelOpacity}"
                         Orientation="Horizontal">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"
+                            Width="250"/>
                         <CheckBox
                             VerticalAlignment="Center"
                             IsChecked="{Binding MatchSystemTime}"
-                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
-                            <TextBlock
-                                VerticalAlignment="Center"
-                                Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
-                                Width="250"/>
-                        </CheckBox>
-                        <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"/>
+                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                     </StackPanel>
                     <Separator />
                     <StackPanel Margin="0,10,0,10"

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

@@ -49,15 +49,14 @@
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                        </StackPanel>
+                            </StackPanel>
                     </CheckBox>
                     <CheckBox
                         IsEnabled="{Binding !IsGameTitleNotNull}"
                         Opacity="{Binding PanelOpacity}"
-                        IsChecked="{Binding ShowOldUI}"
-                        ToolTip.Tip="{ext:Locale SettingsTabGeneralShowOldUIToolTip}">
+                        IsChecked="{Binding ShowTitleBar}" IsVisible="{x:Static helper:RunningPlatform.IsWindows}">
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowOldUI}" />
+                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowTitleBar}" />
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
                     </CheckBox>

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

@@ -5,7 +5,6 @@ using Avalonia.Layout;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common;
@@ -15,7 +14,7 @@ using Button = Avalonia.Controls.Button;
 
 namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class AboutWindow : RyujinxControl<AboutWindowViewModel>
+    public partial class AboutWindow : UserControl
     {
         public AboutWindow()
         {
@@ -34,10 +33,19 @@ namespace Ryujinx.Ava.UI.Windows
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.UserProfilesClose],
-                Content = new AboutWindow { ViewModel = viewModel }
+                Content = new AboutWindow { DataContext = viewModel }
             };
 
-            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());
+            Style closeButton = new(x => x.Name("CloseButton"));
+            closeButton.Setters.Add(new Setter(WidthProperty, 80d));
+
+            Style closeButtonParent = new(x => x.Name("CommandSpace"));
+            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty, HorizontalAlignment.Right));
+
+            contentDialog.Styles.Add(closeButton);
+            contentDialog.Styles.Add(closeButtonParent);
+
+            await ContentDialogHelper.ShowAsync(contentDialog);
         }
 
         private void Button_OnClick(object sender, RoutedEventArgs e)

src/Ryujinx/UI/Windows/AmiiboWindow.axaml

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

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

@@ -1,14 +1,13 @@
 using Avalonia.Interactivity;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models.Amiibo;
-using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;
 
 namespace Ryujinx.Ava.UI.Windows
 {
     public partial class AmiiboWindow : StyleableAppWindow
     {
-        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId) : base(true, 40)
+        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId)
         {
             DataContext = ViewModel = new AmiiboWindowViewModel(this, lastScannedAmiiboId, titleId)
             {
@@ -17,9 +16,6 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
 
-            FlushControls.IsVisible = !ConfigurationState.Instance.ShowOldUI;
-            NormalControls.IsVisible = ConfigurationState.Instance.ShowOldUI;
-
             Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
         }
 

src/Ryujinx/UI/Windows/CheatWindow.axaml

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

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

@@ -2,9 +2,8 @@ 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.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using System.Collections.Generic;
@@ -33,21 +32,21 @@ namespace Ryujinx.Ava.UI.Windows
             Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
         }
 
-        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath) : base(useCustomTitleBar: true, 46)
+        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
         {
             MinWidth = 500;
             MinHeight = 650;
             
             LoadedCheats = [];
+            IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
+                ? IntegrityCheckLevel.ErrorOnInvalid
+                : IntegrityCheckLevel.None;
 
             Heading = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.CheatWindowHeading, titleName, titleId.ToUpper());
-            BuildId = ApplicationData.GetBuildId(virtualFileSystem, ConfigurationState.Instance.System.IntegrityCheckLevel, titlePath);
+            BuildId = ApplicationData.GetBuildId(virtualFileSystem, checkLevel, titlePath);
 
             InitializeComponent();
 
-            FlushHeader.IsVisible = !ConfigurationState.Instance.ShowOldUI;
-            NormalHeader.IsVisible = ConfigurationState.Instance.ShowOldUI;
-
             string modsBasePath = ModLoader.GetModsBasePath();
             string titleModsPath = ModLoader.GetApplicationDir(modsBasePath, titleId);
             ulong titleIdValue = ulong.Parse(titleId, NumberStyles.HexNumber);

src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml

@@ -1,82 +0,0 @@
-<window:StyleableAppWindow xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:helpers="using:Ryujinx.Ava.UI.Helpers"
-             xmlns:ext="using:Ryujinx.Ava.Common.Markup"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-             xmlns:systems="clr-namespace:Ryujinx.Ava.Systems"
-             xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
-             xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
-             CanResize="False"
-             mc:Ignorable="d"
-             MinWidth="800"
-             MinHeight="745"
-             x:Class="Ryujinx.Ava.UI.Windows.CompatibilityListWindow"
-             x:DataType="viewModels:CompatibilityViewModel">
-    <window:StyleableAppWindow.DataContext>
-        <viewModels:CompatibilityViewModel />
-    </window:StyleableAppWindow.DataContext>
-    <Grid RowDefinitions="Auto,*">
-        <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto" Name="FlushControls">
-            <controls:RyujinxLogo 
-                Grid.Column="0"
-                Margin="15, 0, 7, 0"
-                ToolTip.Tip="{ext:WindowTitle CompatibilityListTitle, False}"/>
-            <TextBox Name="SearchBoxFlush" Grid.Column="1" Margin="0, 5, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermarkWithCount}" TextChanged="TextBox_OnTextChanged" />
-            <CheckBox Grid.Column="2" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
-            <TextBlock Grid.Column="3" Padding="0, 0, 138, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
-        </Grid>
-        <Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto" Name="NormalControls">
-            <TextBox Name="SearchBoxNormal" Grid.Column="0" Margin="15, 0, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
-            <CheckBox Grid.Column="1" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
-            <TextBlock Grid.Column="2" Padding="0, 0, 1, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
-        </Grid>
-        <ScrollViewer Grid.Row="1">
-                <ListBox Margin="12, 0, 13, 0"
-                         Background="Transparent"
-                         ItemsSource="{Binding CurrentEntries}">
-                    <ListBox.ItemTemplate>
-                        <DataTemplate DataType="{x:Type systems:CompatibilityEntry}">
-                            <Grid MinWidth="800"
-                                  Margin="10"
-                                  ColumnDefinitions="*,Auto,Auto,*"
-                                  Background="Transparent"
-                                  ToolTip.Tip="{Binding  LocalizedLastUpdated}">
-                                <TextBlock Grid.Column="0"
-                                           Text="{Binding GameName}"
-                                           Width="525"
-                                           VerticalAlignment="Center"
-                                           HorizontalAlignment="Center"
-                                           TextWrapping="Wrap" />
-                                <TextBlock Grid.Column="1"
-                                           Width="135"
-                                           Padding="7, 0, 0, 0"
-                                           FontFamily="{StaticResource JetBrainsMono}"
-                                           Text="{Binding FormattedTitleId}"
-                                           VerticalAlignment="Center"
-                                           HorizontalAlignment="Center"
-                                           TextWrapping="Wrap" />
-                                <TextBlock Grid.Column="2"
-                                           Padding="7, 0"
-                                           Text="{Binding LocalizedStatus}"
-                                           Width="90"
-                                           Background="Transparent"
-                                           ToolTip.Tip="{Binding LocalizedStatusDescription}"
-                                           Foreground="{Binding Status, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
-                                           VerticalAlignment="Center"
-                                           HorizontalAlignment="Center"
-                                           TextWrapping="NoWrap" />
-                                <TextBlock Grid.Column="3"
-                                           Text="{Binding FormattedIssueLabels}"
-                                           VerticalAlignment="Center"
-                                           HorizontalAlignment="Left"
-                                           TextWrapping="WrapWithOverflow" />
-                            </Grid>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
-        </ScrollViewer>
-        <Grid></Grid>
-    </Grid>
-</window:StyleableAppWindow>

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

@@ -1,47 +0,0 @@
-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 Task Show(string titleId = null) =>
-            ShowAsync(new CompatibilityListWindow
-            {
-                DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary),
-                SearchBoxFlush = { Text = titleId ?? string.Empty },
-                SearchBoxNormal = { Text = titleId ?? string.Empty }
-            });
-
-        public CompatibilityListWindow() : base(useCustomTitleBar: true, 37)
-        {
-            Title = RyujinxApp.FormatTitle(LocaleKeys.CompatibilityListTitle);
-            
-            InitializeComponent();
-            
-            FlushControls.IsVisible = !ConfigurationState.Instance.ShowOldUI;
-            NormalControls.IsVisible = ConfigurationState.Instance.ShowOldUI;
-        }
-
-        // ReSharper disable once UnusedMember.Local
-        // its referenced in the axaml but rider keeps yelling at me that its unused so
-        private void TextBox_OnTextChanged(object sender, TextChangedEventArgs e)
-        {
-            if (DataContext is not CompatibilityViewModel cvm)
-                return;
-
-            if (sender is not TextBox searchBox)
-                return;
-        
-            cvm.Search(searchBox.Text);
-        }
-    }
-}

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

@@ -5,7 +5,7 @@ using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 

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

@@ -11,7 +11,7 @@ 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.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS.SystemState;

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

@@ -18,9 +18,9 @@ using Ryujinx.Ava.UI.Applet;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Systems.Configuration.UI;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
@@ -76,7 +76,7 @@ namespace Ryujinx.Ava.UI.Windows
         public readonly double StatusBarHeight;
         public readonly double MenuBarHeight;
 
-        public MainWindow() : base(useCustomTitleBar: true)
+        public MainWindow()
         {
             DataContext = ViewModel = new MainWindowViewModel
             {
@@ -90,6 +90,9 @@ namespace Ryujinx.Ava.UI.Windows
 
             ViewModel.Title = RyujinxApp.FormatTitle();
 
+            TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
+            TitleBar.TitleBarHitTestType = (ConfigurationState.Instance.ShowTitleBar) ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
+
             // NOTE: Height of MenuBar and StatusBar is not usable here, since it would still be 0 at this point.
             StatusBarHeight = StatusBarView.StatusBar.MinHeight;
             MenuBarHeight = MenuBar.MinHeight;
@@ -97,7 +100,7 @@ namespace Ryujinx.Ava.UI.Windows
             TitleBar.Height = MenuBarHeight;
             
             // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
-            TitleBarHeight = (ConfigurationState.Instance.ShowOldUI ? TitleBar.Height : 0);
+            TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);
 
             ApplicationList.DataContext = DataContext;
             ApplicationGrid.DataContext = DataContext;
@@ -270,7 +273,11 @@ namespace Ryujinx.Ava.UI.Windows
             LibHacHorizonManager.InitializeBcatServer();
             LibHacHorizonManager.InitializeSystemClients();
 
-            ApplicationLibrary = new ApplicationLibrary(VirtualFileSystem, ConfigurationState.Instance.System.IntegrityCheckLevel)
+            IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
+                ? IntegrityCheckLevel.ErrorOnInvalid
+                : IntegrityCheckLevel.None;
+
+            ApplicationLibrary = new ApplicationLibrary(VirtualFileSystem, checkLevel)
             {
                 DesiredLanguage = ConfigurationState.Instance.System.Language,
             };

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

@@ -6,7 +6,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 using Button = Avalonia.Controls.Button;

src/Ryujinx/UI/Windows/SettingsWindow.axaml

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

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

@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.Input;
@@ -14,7 +13,7 @@ namespace Ryujinx.Ava.UI.Windows
     {
         internal readonly SettingsViewModel ViewModel;
 
-        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : base(true)
+        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
         {
             Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
 
@@ -24,16 +23,6 @@ namespace Ryujinx.Ava.UI.Windows
             ViewModel.SaveSettingsEvent += SaveSettings;
 
             InitializeComponent();
-
-            NavPanel.PaneDisplayMode =
-                ConfigurationState.Instance.ShowOldUI
-                    ? NavigationViewPaneDisplayMode.Left
-                    : NavigationViewPaneDisplayMode.Top;
-
-            Height = ConfigurationState.Instance.ShowOldUI
-                ? 927
-                : 993; // nav panel is put on top with custom title bar so account for new height
-            
             Load();
         }
 

src/Ryujinx/UI/Windows/StyleableWindow.cs

@@ -6,8 +6,6 @@ using Avalonia.Media;
 using Avalonia.Platform;
 using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using System.Threading.Tasks;
 
@@ -23,7 +21,7 @@ namespace Ryujinx.Ava.UI.Windows
             await appWindow.ShowDialog(owner ?? RyujinxApp.MainWindow);
         }
         
-        protected StyleableAppWindow(bool useCustomTitleBar = false, double? titleBarHeight = null)
+        protected StyleableAppWindow()
         {
             WindowStartupLocation = WindowStartupLocation.CenterOwner;
             TransparencyLevelHint = [WindowTransparencyLevel.None];
@@ -31,16 +29,7 @@ namespace Ryujinx.Ava.UI.Windows
             LocaleManager.Instance.LocaleChanged += LocaleChanged;
             LocaleChanged();
 
-            if (useCustomTitleBar)
-            {
-                TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowOldUI;
-                TitleBar.TitleBarHitTestType = ConfigurationState.Instance.ShowOldUI ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
-                
-                if (TitleBar.ExtendsContentIntoTitleBar && titleBarHeight != null)
-                    TitleBar.Height = titleBarHeight.Value;
-            }
-
-            Icon = RyujinxLogo.Bitmap;
+            Icon = MainWindowViewModel.IconBitmap;
         }
 
         private void LocaleChanged()
@@ -74,7 +63,7 @@ namespace Ryujinx.Ava.UI.Windows
             LocaleManager.Instance.LocaleChanged += LocaleChanged;
             LocaleChanged();
 
-            Icon = new WindowIcon(RyujinxLogo.Bitmap);
+            Icon = new WindowIcon(MainWindowViewModel.IconBitmap);
         }
 
         private void LocaleChanged()

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

@@ -5,7 +5,7 @@ using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 

src/Ryujinx/Utilities/AppLibrary/ApplicationCountUpdatedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Ava.Systems.AppLibrary
+namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     public class ApplicationCountUpdatedEventArgs : EventArgs
     {

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -9,8 +9,8 @@ using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.PlayReport;
+using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Utilities.PlayReport;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
@@ -18,7 +18,7 @@ using System;
 using System.IO;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Systems.AppLibrary
+namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     public class ApplicationData
     {

src/Ryujinx/Utilities/AppLibrary/ApplicationJsonSerializerContext.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Systems.AppLibrary
+namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     [JsonSourceGenerationOptions(WriteIndented = true)]
     [JsonSerializable(typeof(ApplicationMetadata))]

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -12,9 +12,8 @@ using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Models;
-using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Utilities.Configuration.System;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -39,7 +38,7 @@ using MissingKeyException = LibHac.Common.Keys.MissingKeyException;
 using Path = System.IO.Path;
 using TimeSpan = System.TimeSpan;
 
-namespace Ryujinx.Ava.Systems.AppLibrary
+namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     public class ApplicationLibrary
     {
@@ -618,11 +617,15 @@ namespace Ryujinx.Ava.Systems.AppLibrary
                     case ".xci":
                     case ".nsp":
                         {
+                            IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
+                                ? IntegrityCheckLevel.ErrorOnInvalid
+                                : IntegrityCheckLevel.None;
+
                             using IFileSystem pfs =
                                 PartitionFileSystemUtils.OpenApplicationFileSystem(filePath, _virtualFileSystem);
 
                             Dictionary<ulong, ContentMetaData> updates =
-                                pfs.GetContentData(ContentMetaType.Patch, _virtualFileSystem, ConfigurationState.Instance.System.IntegrityCheckLevel);
+                                pfs.GetContentData(ContentMetaType.Patch, _virtualFileSystem, checkLevel);
 
                             if (updates.Count == 0)
                             {

src/Ryujinx/Utilities/AppLibrary/ApplicationMetadata.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Systems.AppLibrary
+namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     public class ApplicationMetadata
     {

src/Ryujinx/Utilities/AppLibrary/LdnGameData.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Ava.Systems.AppLibrary
+namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     public struct LdnGameData
     {

src/Ryujinx/Utilities/AppLibrary/LdnGameDataReceivedEventArgs.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Ava.Systems.AppLibrary
+namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     public class LdnGameDataReceivedEventArgs : EventArgs
     {

src/Ryujinx/Utilities/AppLibrary/LdnGameDataSerializerContext.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Systems.AppLibrary
+namespace Ryujinx.Ava.Utilities.AppLibrary
 {
     [JsonSerializable(typeof(IEnumerable<LdnGameData>))]
     internal partial class LdnGameDataSerializerContext : JsonSerializerContext;

src/Ryujinx/Utilities/AppletMetadata.cs

@@ -2,7 +2,7 @@
 using LibHac.Ncm;
 using LibHac.Ns;
 using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 
-namespace Ryujinx.Ava.Systems
+namespace Ryujinx.Ava.Utilities.Compat
 {
     public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
     {

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml

@@ -0,0 +1,81 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="using:Ryujinx.Ava.Utilities.Compat"
+             xmlns:helpers="using:Ryujinx.Ava.UI.Helpers"
+             xmlns:ext="using:Ryujinx.Ava.Common.Markup"
+             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.Utilities.Compat.CompatibilityList"
+             x:DataType="local:CompatibilityViewModel">
+    <UserControl.DataContext>
+        <local:CompatibilityViewModel />
+    </UserControl.DataContext>
+    <Grid RowDefinitions="*,Auto,*">
+        <Grid 
+            Grid.Row="0"
+            HorizontalAlignment="Center"
+            ColumnDefinitions="Auto,*"
+            Margin="0 0 0 10">
+            <ui:FontIcon
+                Grid.Column="0"
+                Margin="0"
+                HorizontalAlignment="Stretch"
+                FontFamily="avares://FluentAvalonia/Fonts#Symbols"
+                Glyph="{helpers:GlyphValueConverter Important}" />
+            <!-- NOTE: aligning to bottom for better visual alignment with glyph -->
+            <TextBlock
+                Grid.Column="1"
+                Margin="5, 0, 0, 0"
+                FontStyle="Italic"
+                VerticalAlignment="Center"
+                TextWrapping="Wrap"
+                Text="{ext:Locale CompatibilityListWarning}" />
+        </Grid>
+        <Grid Grid.Row="1" ColumnDefinitions="*,Auto,Auto">
+            <TextBox Name="SearchBox" Grid.Column="0" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
+            <CheckBox Grid.Column="1" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
+            <TextBlock Grid.Column="2" Margin="-10, 0, 0, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
+        </Grid>
+        <ScrollViewer Grid.Row="2">
+                <ListBox Margin="0,5, 0, 0"
+                         Background="Transparent"
+                         ItemsSource="{Binding CurrentEntries}">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate DataType="{x:Type local:CompatibilityEntry}">
+                            <Grid Width="750"
+                                  Margin="5"
+                                  ColumnDefinitions="Auto,Auto,Auto,*"
+                                  Background="Transparent"
+                                  ToolTip.Tip="{Binding  LocalizedLastUpdated}">
+                                <TextBlock Grid.Column="0"
+                                           Text="{Binding GameName}"
+                                           Width="320"
+                                           TextWrapping="Wrap" />
+                                <TextBlock Grid.Column="1"
+                                           Width="135"
+                                           Padding="7, 0, 0, 0"
+                                           FontFamily="{StaticResource JetBrainsMono}"
+                                           Text="{Binding FormattedTitleId}"
+                                           TextWrapping="Wrap" />
+                                <TextBlock Grid.Column="2"
+                                           Padding="7, 0"
+                                           VerticalAlignment="Center"
+                                           Text="{Binding LocalizedStatus}"
+                                           Width="85"
+                                           Background="Transparent"
+                                           ToolTip.Tip="{Binding LocalizedStatusDescription}"
+                                           Foreground="{Binding Status, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
+                                           TextWrapping="NoWrap" />
+                                <TextBlock Grid.Column="3"
+                                           VerticalAlignment="Center"
+                                           Text="{Binding FormattedIssueLabels}"
+                                           TextWrapping="WrapWithOverflow" />
+                            </Grid>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+        </ScrollViewer>
+    </Grid>
+</UserControl>

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs

@@ -0,0 +1,56 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Helpers;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.Utilities.Compat
+{
+    public partial class CompatibilityList : UserControl
+    {
+        public static async Task Show(string titleId = null)
+        {
+            ContentDialog contentDialog = new()
+            {
+                PrimaryButtonText = string.Empty,
+                SecondaryButtonText = string.Empty,
+                CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
+                Content = new CompatibilityList
+                {
+                    DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary), 
+                    SearchBox = {
+                        Text = titleId ?? ""
+                    }
+                }
+            };
+
+            Style closeButton = new(x => x.Name("CloseButton"));
+            closeButton.Setters.Add(new Setter(WidthProperty, 80d));
+            
+            Style closeButtonParent = new(x => x.Name("CommandSpace"));
+            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty, Avalonia.Layout.HorizontalAlignment.Right));
+
+            contentDialog.Styles.Add(closeButton);
+            contentDialog.Styles.Add(closeButtonParent);
+
+            await ContentDialogHelper.ShowAsync(contentDialog);
+        }
+        
+        public CompatibilityList()
+        {
+            InitializeComponent();
+        }
+
+        private void TextBox_OnTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (DataContext is not CompatibilityViewModel cvm)
+                return;
+
+            if (sender is not TextBox searchBox)
+                return;
+        
+            cvm.Search(searchBox.Text);
+        }
+    }
+}

src/Ryujinx/Utilities/Compat/CompatibilityViewModel.cs

@@ -1,11 +1,10 @@
 using Gommon;
-using Ryujinx.Ava.Systems;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Windows;
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Ava.UI.ViewModels
+namespace Ryujinx.Ava.Utilities.Compat
 {
     public class CompatibilityViewModel : BaseModel
     {

src/Ryujinx/Utilities/Configuration/AudioBackend.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Systems.Configuration
+namespace Ryujinx.Ava.Utilities.Configuration
 {
     [JsonConverter(typeof(TypedStringEnumConverter<AudioBackend>))]
     public enum AudioBackend

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -1,5 +1,5 @@
-using Ryujinx.Ava.Systems.Configuration.System;
-using Ryujinx.Ava.Systems.Configuration.UI;
+using Ryujinx.Ava.Utilities.Configuration.System;
+using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -8,14 +8,14 @@ using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
 using System.Collections.Generic;
 
-namespace Ryujinx.Ava.Systems.Configuration
+namespace Ryujinx.Ava.Utilities.Configuration
 {
     public class ConfigurationFileFormat
     {
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 67;
+        public const int CurrentVersion = 68;
 
         /// <summary>
         /// Version of the configuration file format
@@ -258,6 +258,11 @@ namespace Ryujinx.Ava.Systems.Configuration
         /// Enables or disables low-power profiled translation cache persistency loading
         /// </summary>
         public bool EnableLowPowerPtc { get; set; }
+        
+        /// <summary>
+        /// Clock tick scalar, in percent points (100 = 1.0).
+        /// </summary>
+        public long TickScalar { get; set; }
 
         /// <summary>
         /// Enables or disables guest Internet access

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormatSettings.cs

@@ -1,6 +1,6 @@
 using Ryujinx.Common.Utilities;
 
-namespace Ryujinx.Ava.Systems.Configuration
+namespace Ryujinx.Ava.Utilities.Configuration
 {
     internal static class ConfigurationFileFormatSettings
     {

src/Ryujinx/Utilities/Configuration/ConfigurationJsonSerializerContext.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Systems.Configuration
+namespace Ryujinx.Ava.Utilities.Configuration
 {
     [JsonSourceGenerationOptions(WriteIndented = true)]
     [JsonSerializable(typeof(ConfigurationFileFormat))]

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

@@ -1,7 +1,7 @@
 using Avalonia.Media;
 using Gommon;
-using Ryujinx.Ava.Systems.Configuration.System;
-using Ryujinx.Ava.Systems.Configuration.UI;
+using Ryujinx.Ava.Utilities.Configuration.System;
+using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -14,7 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using RyuLogger = Ryujinx.Common.Logging.Logger;
 
-namespace Ryujinx.Ava.Systems.Configuration
+namespace Ryujinx.Ava.Utilities.Configuration
 {
     public partial class ConfigurationState
     {
@@ -46,11 +46,12 @@ namespace Ryujinx.Ava.Systems.Configuration
             
           
             EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
+            CheckUpdatesOnStart.Value = shouldLoadFromFile ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
             UpdateCheckerType.Value = shouldLoadFromFile ? cff.UpdateCheckerType : UpdateCheckerType.Value; // Get from global config only
             FocusLostActionType.Value = cff.FocusLostActionType;
             ShowConfirmExit.Value = shouldLoadFromFile ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
             RememberWindowState.Value = shouldLoadFromFile ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
-            ShowOldUI.Value = shouldLoadFromFile ? cff.ShowTitleBar : ShowOldUI.Value; // Get from global config only
+            ShowTitleBar.Value = shouldLoadFromFile ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only
             EnableHardwareAcceleration.Value = shouldLoadFromFile ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
             HideCursor.Value = cff.HideCursor;
           
@@ -93,6 +94,7 @@ 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;
@@ -440,7 +442,27 @@ 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
+                    };
+                })
             );
     }
 }