Merge branch 'master' into feature/turbo-mode

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/DirtyHack.cs

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

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.Common/TitleIDs.cs

@@ -1,4 +1,7 @@
 using Gommon;
+using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Helper;
+using System;
 using System.Linq;
 
 namespace Ryujinx.Common

src/Ryujinx.Cpu/ITickSource.cs

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

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.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/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/Nifm/IStaticService.cs

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

src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs

@@ -1,5 +1,4 @@
 using Ryujinx.Common;
-using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.Services.Nifm.StaticService.GeneralService;
@@ -18,12 +17,12 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService
         private UnicastIPAddressInformation _targetAddressInfoCache = null;
         private string _cacheChosenInterface = null;
 
-        public IGeneralService(ServiceCtx context)
+        public IGeneralService()
         {
             _generalServiceDetail = new GeneralServiceDetail
             {
                 ClientId = GeneralServiceManager.Count,
-                IsAnyInternetRequestAccepted = !context.Device.DirtyHacks.IsEnabled(DirtyHack.NifmServiceDisableIsAnyInternetRequestAccepted), // NOTE: Why not accept any internet request?
+                IsAnyInternetRequestAccepted = true, // NOTE: Why not accept any internet request?
             };
 
             NetworkChange.NetworkAddressChanged += LocalInterfaceCacheHandler;

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs

@@ -1,5 +1,6 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy;
+using Ryujinx.HLE.HOS.Services.Sockets.Bsd.Types;
 using System;
 using System.Collections.Generic;
 using System.Linq;

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

@@ -2,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/HleConfiguration.cs

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

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

@@ -4,6 +4,7 @@ using Ryujinx.Audio.Backends.CompatLayer;
 using Ryujinx.Audio.Integration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
+using Ryujinx.Cpu;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
@@ -26,18 +27,26 @@ namespace Ryujinx.HLE
         public GpuContext Gpu { get; }
         public VirtualFileSystem FileSystem { get; }
         public HOS.Horizon System { get; }
+
+        public bool TurboMode = false;
+
+        public long TickScalar
+        {
+            get => System?.TickSource?.TickScalar ?? ITickSource.RealityTickScalar;
+            set => System.TickSource.TickScalar = value;
+        }
+        
         public ProcessLoader Processes { get; }
         public PerformanceStatistics Statistics { get; }
         public Hid Hid { get; }
         public TamperMachine TamperMachine { get; }
         public IHostUIHandler UIHandler { get; }
 
-        public int CpuCoresCount = 4; //Switch 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;
@@ -64,7 +73,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 +84,7 @@ namespace Ryujinx.HLE
 
             VSyncMode                               = Configuration.VSyncMode;
             CustomVSyncInterval                     = Configuration.CustomVSyncInterval;
+            TickScalar                              = TurboMode ? Configuration.TickScalar : ITickSource.RealityTickScalar;
             System.State.DockedMode                 = Configuration.EnableDockedMode;
             System.PerformanceState.PerformanceMode = System.State.DockedMode ? PerformanceMode.Boost : PerformanceMode.Default;
             System.EnablePtc                        = Configuration.EnablePtc;
@@ -126,6 +136,12 @@ namespace Ryujinx.HLE
             }
         }
 
+        public void ToggleTurbo()
+        {
+            TurboMode = !TurboMode;
+            TickScalar = TurboMode ? Configuration.TickScalar : ITickSource.RealityTickScalar;
+        }
+
         public bool LoadCart(string exeFsDir, string romFsFile = null) => Processes.LoadUnpackedNca(exeFsDir, romFsFile);
         public bool LoadXci(string xciFile, ulong applicationId = 0) => Processes.LoadXci(xciFile, applicationId);
         public bool LoadNca(string ncaFile, BlitStruct<ApplicationControlProperty>? customNacpData = null) => Processes.LoadNca(ncaFile, customNacpData);

src/Ryujinx/AppHost.cs

@@ -4,6 +4,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Threading;
 using DiscordRPC;
+using Gommon;
 using LibHac.Common;
 using LibHac.Ns;
 using Ryujinx.Audio.Backends.Dummy;
@@ -20,8 +21,8 @@ using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -59,7 +60,7 @@ using Size = Avalonia.Size;
 using Switch = Ryujinx.HLE.Switch;
 using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
-namespace Ryujinx.Ava.Systems
+namespace Ryujinx.Ava
 {
     internal class AppHost
     {
@@ -467,7 +468,7 @@ namespace Ryujinx.Ava.Systems
 
             Dispatcher.UIThread.InvokeAsync(() =>
             {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
             });
 
             _viewModel.SetUiProgressHandlers(Device);
@@ -869,7 +870,7 @@ namespace Ryujinx.Ava.Systems
             Device?.System.TogglePauseEmulation(false);
 
             _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
         }
 
@@ -878,7 +879,7 @@ namespace Ryujinx.Ava.Systems
             Device?.System.TogglePauseEmulation(true);
 
             _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
         }
 
@@ -1115,11 +1116,23 @@ namespace Ryujinx.Ava.Systems
                 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;
@@ -1215,6 +1228,12 @@ namespace Ryujinx.Ava.Systems
 
                 if (currentHotkeyState != _prevHotkeyState)
                 {
+                    if (ConfigurationState.Instance.Hid.Hotkeys.Value.TurboModeWhileHeld &&
+                        _keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.TurboMode) != Device.TurboMode)
+                    {
+                        Device.ToggleTurbo();
+                    }
+                    
                     switch (currentHotkeyState)
                     {
                         case KeyboardHotkeyState.ToggleVSyncMode:
@@ -1226,6 +1245,12 @@ namespace Ryujinx.Ava.Systems
                         case KeyboardHotkeyState.CustomVSyncIntervalIncrement:
                             _viewModel.CustomVSyncInterval = Device.IncrementCustomVSyncInterval();
                             break;
+                        case KeyboardHotkeyState.TurboMode:
+                            if (!ConfigurationState.Instance.Hid.Hotkeys.Value.TurboModeWhileHeld)
+                            {
+                                Device.ToggleTurbo();
+                            }
+                            break;
                         case KeyboardHotkeyState.Screenshot:
                             ScreenshotRequested = true;
                             break;
@@ -1355,6 +1380,10 @@ namespace Ryujinx.Ava.Systems
             {
                 state = KeyboardHotkeyState.CustomVSyncIntervalDecrement;
             }
+            else if (_keyboardInterface.IsPressed((Key)ConfigurationState.Instance.Hid.Hotkeys.Value.TurboMode))
+            {
+                state = KeyboardHotkeyState.TurboMode;
+            }
 
             return state;
         }

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

@@ -2767,7 +2767,7 @@
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Створити користувацьку конфігурацію",
+        "uk_UA": "",
         "zh_CN": "",
         "zh_TW": ""
       }
@@ -2792,7 +2792,7 @@
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Редагувати користувацьку конфігурацію",
+        "uk_UA": "",
         "zh_CN": "",
         "zh_TW": ""
       }
@@ -2842,7 +2842,7 @@
         "sv_SE": "Skapar en oberoende konfiguration för det aktuella spelet",
         "th_TH": "สร้างการกำหนดค่าที่เป็นอิสระสำหรับเกมปัจจุบัน",
         "tr_TR": "Mevcut oyun için bağımsız bir yapılandırma oluşturur",
-        "uk_UA": "Створюйте незалежну конфігурацію для поточної гри",
+        "uk_UA": "Створює незалежну конфігурацію для поточної гри",
         "zh_CN": "为当前游戏创建独立的配置",
         "zh_TW": "為當前遊戲創建獨立的配置"
       }
@@ -2867,7 +2867,7 @@
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Відредагувати наявну індивідуальну конфігурацію для цієї гри.",
+        "uk_UA": "",
         "zh_CN": "",
         "zh_TW": ""
       }
@@ -3442,7 +3442,7 @@
         "sv_SE": "Användargränssnitt",
         "th_TH": "หน้าจอผู้ใช้",
         "tr_TR": "Kullancı Arayüzü",
-        "uk_UA": "Інтерфейс",
+        "uk_UA": "Інтерфейс користувача",
         "zh_CN": "用户界面",
         "zh_TW": "使用者介面"
       }
@@ -3817,59 +3817,34 @@
         "sv_SE": "Inaktivera inmatning när fokus tappas",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Вимкнути введення, якщо вікно неактивне",
+        "uk_UA": "",
         "zh_CN": "在后台时禁用输入",
         "zh_TW": ""
       }
     },
     {
-      "ID": "SettingsTabGeneralShowOldUI",
+      "ID": "SettingsTabGeneralShowTitleBar",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "Show Original UI Style (Requires restart)",
-        "es_ES": "",
-        "fr_FR": "",
+        "en_US": "Show Title Bar (Requires restart)",
+        "es_ES": "Mostrar Barra de Título (Requiere reinicio)",
+        "fr_FR": "Afficher Barre de Titre (Nécessite redémarrage)",
         "he_IL": "",
-        "it_IT": "",
+        "it_IT": "Mostra barra del titolo (Richiede il riavvio)",
         "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "Vis original UI-stil (krever omstart)",
+        "ko_KR": "제목 표시줄 표시(다시 시작해야 함)",
+        "no_NO": "Vis tittellinje (krever omstart)",
         "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "pt_BR": "Mostrar Barra de Título (Requer reinicialização)",
+        "ru_RU": "Показать строку заголовка (требуется перезапуск)",
+        "sv_SE": "Visa titelrad (kräver omstart)",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Показати оригінальний UI (Потрібен перезапуск)",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsTabGeneralShowOldUIToolTip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Show the older Avalonia Ryujinx UI reminiscent of Ryujinx 1.1.1403. This is enabled by default on platforms that are not Windows.\nThe classic-style title bar is back and major window layout reworkings are reversed; such as the settings navigation placement above this tooltip.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "Vis det eldre Avalonia Ryujinx-grensesnittet som minner om Ryujinx 1.1.1403. Dette er aktivert som standard på plattformer som ikke er Windows.\nTittellinjen i klassisk stil er tilbake, og store omarbeidinger av vindusoppsettet er reversert, for eksempel plasseringen av innstillingsnavigasjonen over dette verktøytipset.",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "Показати старий інтерфейс Avalonia Ryujinx, який був у Ryujinx 1.1.1403. Ця опція активна за замовчуванням на всіх інших, окрім Windows платформах.\nПовернеться класична панель заголовка, а всі суттєві зміни інтерфейсу будуть скасовані, зокрема горизонтальне розміщення навігації в налаштуваннях.",
-        "zh_CN": "",
-        "zh_TW": ""
+        "uk_UA": "Показувати рядок заголовка (Потрібен перезапуск)",
+        "zh_CN": "显示标题栏 (需要重启)",
+        "zh_TW": "顯示「標題列」 (需要重新開啟Ryujinx)"
       }
     },
     {
@@ -4867,7 +4842,7 @@
         "sv_SE": "Matcha systemtid",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Синхронізувати з системним годинником",
+        "uk_UA": "",
         "zh_CN": "与系统时间同步",
         "zh_TW": ""
       }
@@ -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": {
@@ -8467,7 +8517,7 @@
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "LED-підсвітка",
+        "uk_UA": "",
         "zh_CN": "",
         "zh_TW": ""
       }
@@ -8492,7 +8542,7 @@
         "sv_SE": "Inaktivera",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Вимкнути",
+        "uk_UA": "",
         "zh_CN": "关闭",
         "zh_TW": ""
       }
@@ -8517,7 +8567,7 @@
         "sv_SE": "Regnbåge",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Веселка",
+        "uk_UA": "",
         "zh_CN": "彩虹",
         "zh_TW": ""
       }
@@ -8542,7 +8592,7 @@
         "sv_SE": "Regnbågshastighet",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Швидкість зміни кольорів",
+        "uk_UA": "",
         "zh_CN": "彩虹滚动速度",
         "zh_TW": ""
       }
@@ -9167,7 +9217,7 @@
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "Esc",
-        "uk_UA": "Esc",
+        "uk_UA": "",
         "zh_CN": "Esc",
         "zh_TW": "Esc 鍵"
       }
@@ -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": "",
@@ -10867,7 +10917,7 @@
         "sv_SE": "Diverse",
         "th_TH": "",
         "tr_TR": "Diğer",
-        "uk_UA": "Інше",
+        "uk_UA": "",
         "zh_CN": "截图键",
         "zh_TW": "其他按鍵"
       }
@@ -17692,7 +17742,7 @@
         "sv_SE": "Ändra ljudvolym",
         "th_TH": "ปรับระดับเสียง",
         "tr_TR": "Ses seviyesini değiştirir",
-        "uk_UA": "Регулювання гучності",
+        "uk_UA": "Змінити гучність звуку",
         "zh_CN": "调节音量",
         "zh_TW": "調節音量"
       }
@@ -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": {
@@ -19592,7 +19692,7 @@
         "sv_SE": "Alla tangentbord",
         "th_TH": "คีย์บอร์ดทั้งหมด",
         "tr_TR": "Tüm Klavyeler",
-        "uk_UA": "Усі клавіатури",
+        "uk_UA": "Всі клавіатури",
         "zh_CN": "所有键盘",
         "zh_TW": "所有鍵盤"
       }
@@ -19742,7 +19842,7 @@
         "sv_SE": "Snabbtangenter för tangentbord",
         "th_TH": "ปุ่มลัดของคีย์บอร์ด",
         "tr_TR": "Klavye Kısayolları",
-        "uk_UA": "Гарячі клавіші",
+        "uk_UA": "Гарячі клавіші клавіатури",
         "zh_CN": "快捷键",
         "zh_TW": "鍵盤快速鍵"
       }
@@ -22467,7 +22567,7 @@
         "sv_SE": "Tillämpar anti-aliasing på spelrenderaren.\n\nFXAA kommer att sudda det mesta av bilden, medan SMAA kommer att försöka hitta taggiga kanter och släta ut dem.\n\nRekommenderas inte att använda tillsammans med skalfiltret FSR.\n\nDet här alternativet kan ändras medan ett spel körs genom att klicka på \"Tillämpa\" nedan. Du kan helt enkelt flytta inställningsfönstret åt sidan och experimentera tills du hittar ditt föredragna utseende för ett spel.\n\nLämna som INGEN om du är osäker.",
         "th_TH": "ใช้การลดรอยหยักกับการเรนเดอร์เกม\n\nFXAA จะเบลอภาพส่วนใหญ่ ในขณะที่ SMAA จะพยายามค้นหารอยหยักและปรับให้เรียบ\n\nไม่แนะนำให้ใช้ร่วมกับตัวกรองสเกล FSR\n\nตัวเลือกนี้สามารถเปลี่ยนแปลงได้ในขณะที่เกมกำลังทำงานอยู่โดยคลิก \"นำไปใช้\" ด้านล่าง คุณสามารถย้ายหน้าต่างการตั้งค่าไปด้านข้างและทดลองจนกว่าคุณจะพบรูปลักษณ์ที่คุณต้องการสำหรับเกม\n\nปล่อยไว้ที่ NONE หากไม่แน่ใจ",
         "tr_TR": "",
-        "uk_UA": "Застосовує згладження до рендера гри.\n\nFXAA розмиє більшість зображення, а SMAA спробує знайти нерівні краї та згладити їх.\n\nНе рекомендується використовувати разом з фільтром масштабування FSR.\n\nЦю опцію можна міняти коли гра запущена кліком на \"Застосувати; ви можете відсунути вікно налаштувань і поекспериментувати з видом гри.\n\nЗалиште \"Немає\", якщо не впевнені.",
+        "uk_UA": "Застосовує згладження до рендера гри.\n\nFXAA розмиє більшість зображення, а SMAA спробує знайти нерівні краї та згладити їх.\n\nНе рекомендується використовувати разом з фільтром масштабування FSR.\n\nЦю опцію можна міняти коли гра запущена кліком на \"Застосувати; ви можете відсунути вікно налаштувань і поекспериментувати з видом гри.\n\nЗалиште на \"Немає\", якщо не впевнені.",
         "zh_CN": "抗锯齿是一种图形处理技术，用于减少图像边缘的锯齿状现象，使图像更加平滑。\n\nFXAA（快速近似抗锯齿）是一种性能开销相对较小的抗锯齿方法，但可能会使得整体图像看起来有些模糊。\n\nSMAA（增强型子像素抗锯齿）则更加精细，它会尝试找到锯齿边缘并平滑它们，相比 FXAA 有更好的图像质量，但性能开销可能会稍大一些。\n\n如果开启了 FSR（FidelityFX Super Resolution，超级分辨率锐画技术）来提高性能或图像质量，不建议再启用抗锯齿，因为它们会产生不必要的图形处理开销，或者相互之间效果不协调。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“无”。",
         "zh_TW": "對遊戲繪製進行反鋸齒處理。\n\nFXAA 會模糊大部分圖像，而 SMAA 則會嘗試找出鋸齒邊緣並將其平滑化。\n\n不建議與 FSR 縮放濾鏡一起使用。\n\n此選項可在遊戲執行時透過點選下方的「套用」進行變更；您只需將設定視窗移到一旁，然後進行試驗，直到找到您喜歡的遊戲效果。\n\n如果不確定，請選擇無狀態。"
       }
@@ -22542,7 +22642,7 @@
         "sv_SE": "Välj det skalfilter som ska tillämpas vid användning av upplösningsskala.\n\nBilinjär fungerar bra för 3D-spel och är ett säkert standardalternativ.\n\nNärmast rekommenderas för pixel art-spel.\n\nFSR 1.0 är bara ett skarpningsfilter, rekommenderas inte för FXAA eller SMAA.\n\nOmrådesskalning rekommenderas vid nedskalning av upplösning som är större än utdatafönstret. Det kan användas för att uppnå en supersamplad anti-alias-effekt vid nedskalning med mer än 2x.\n\nDetta alternativ kan ändras medan ett spel körs genom att klicka på \"Tillämpa\" nedan. du kan helt enkelt flytta inställningsfönstret åt sidan och experimentera tills du hittar ditt föredragna utseende för ett spel.\n\nLämna som BILINJÄR om du är osäker.",
         "th_TH": "เลือกตัวกรองสเกลที่จะใช้เมื่อใช้สเกลความละเอียด\n\nBilinear ทำงานได้ดีกับเกม 3D และเป็นตัวเลือกเริ่มต้นที่ปลอดภัย\n\nแนะนำให้ใช้เกมภาพพิกเซลที่ใกล้เคียงที่สุด\n\nFSR 1.0 เป็นเพียงตัวกรองความคมชัด ไม่แนะนำให้ใช้กับ FXAA หรือ SMAA\n\nตัวเลือกนี้สามารถเปลี่ยนแปลงได้ในขณะที่เกมกำลังทำงานอยู่โดยคลิก \"นำไปใช้\" ด้านล่าง คุณสามารถย้ายหน้าต่างการตั้งค่าไปด้านข้างและทดลองจนกว่าคุณจะพบรูปลักษณ์ที่คุณต้องการสำหรับเกม",
         "tr_TR": "Choose the scaling filter that will be applied when using resolution scale.\n\nBilinear works well for 3D games and is a safe default option.\n\nNearest is recommended for pixel art games.\n\nFSR 1.0 is merely a sharpening filter, not recommended for use with FXAA or SMAA.\n\nThis option can be changed while a game is running by clicking \"Apply\" below; you can simply move the settings window aside and experiment until you find your preferred look for a game.\n\nLeave on BILINEAR if unsure.",
-        "uk_UA": "Виберіть фільтр масштабування, що використається при збільшенні роздільної здатності.\n\n\"Білінійний\" добре виглядає в 3D іграх, і хороше налаштування за умовчуванням.\n\n\"Найближчий\" рекомендується для ігор з піксель-артом.\n\n\"FSR 1.0\" - фільтр різкості. Не варто використовувати разом з FXAA або SMAA.\n\nЦю опцію можна змінювати під час гри кліком на \"Застосувати\" нижче; ви можете відсунути вікно налаштувань і поекспериментувати з тим, як відображатиметься гра.\n\nЗалиште \"Білінійний\", якщо не впевнені.",
+        "uk_UA": "Виберіть фільтр масштабування, що використається при збільшенні роздільної здатності.\n\n\"Білінійний\" добре виглядає в 3D іграх, і хороше налаштування за умовчуванням.\n\n\"Найближчий\" рекомендується для ігор з піксель-артом.\n\n\"FSR 1.0\" - фільтр різкості. Не варто використовувати разом з FXAA або SMAA.\n\nЦю опцію можна змінювати під час гри кліком на \"Застосувати\" нижче; ви можете відсунути вікно налаштувань і поекспериментувати з тим, як відображатиметься гра.\n\nЗалиште на \"Білінійний\", якщо не впевнені.",
         "zh_CN": "选择在分辨率缩放时将使用的缩放过滤器。\n\nBilinear（双线性过滤）对于3D游戏效果较好，是一个安全的默认选项。\n\nNearest（最近邻过滤）推荐用于像素艺术游戏。\n\nFSR（超级分辨率锐画）只是一个锐化过滤器，不推荐与 FXAA 或 SMAA 抗锯齿一起使用。\n\nArea（局部过滤），当渲染分辨率大于窗口实际分辨率，推荐该选项。该选项在渲染比例大于2.0的情况下，可以实现超采样的效果。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“Bilinear（双线性过滤）”。",
         "zh_TW": "選擇使用解析度縮放時套用的縮放過濾器。\n\n雙線性 (Bilinear) 濾鏡適用於 3D 遊戲，是一個安全的預設選項。\n\n建議像素美術遊戲使用近鄰性 (Nearest) 濾鏡。\n\nFSR 1.0 只是一個銳化濾鏡，不建議與 FXAA 或 SMAA 一起使用。\n\n此選項可在遊戲執行時透過點選下方的「套用」進行變更；您只需將設定視窗移到一旁，然後進行試驗，直到找到您喜歡的遊戲效果。\n\n如果不確定，請保持雙線性 (Bilinear) 狀態。"
       }
@@ -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": "Список сумісності — {0} ігор",
-        "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": "Шукати серед {0} перевірених ігор...",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "CompatibilityListOpen",
       "Translations": {
@@ -24017,7 +24142,7 @@
         "sv_SE": "Spelbart",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Справна",
+        "uk_UA": "Оптимально",
         "zh_CN": "可游玩",
         "zh_TW": "可暢順遊玩"
       }
@@ -24267,7 +24392,7 @@
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Власна конфігурація",
+        "uk_UA": "",
         "zh_CN": "",
         "zh_TW": ""
       }
@@ -24292,7 +24417,7 @@
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "(Глобальні)",
+        "uk_UA": "",
         "zh_CN": "",
         "zh_TW": ""
       }

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, [CompatibilityDatabase.Entries.Length] },
-                { LocaleKeys.CompatibilityListTitle, [CompatibilityDatabase.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

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

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/Common/XCITrimmerLog.cs

@@ -26,9 +26,9 @@ namespace Ryujinx.Ava.Common
         
         internal class TrimmerWindow : Ryujinx.Common.Logging.XCIFileTrimmerLog
         {
-            private readonly XciTrimmerViewModel _viewModel;
+            private readonly XCITrimmerViewModel _viewModel;
 
-            public TrimmerWindow(XciTrimmerViewModel viewModel)
+            public TrimmerWindow(XCITrimmerViewModel viewModel)
             {
                 _viewModel = viewModel;
             }

src/Ryujinx/DiscordIntegrationModule.cs

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

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -2,8 +2,7 @@ using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;
-using Ryujinx.Ava.Systems;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -11,7 +10,9 @@ using Ryujinx.Common.Configuration.Hid.Controller.Motion;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
+using Ryujinx.Cpu;
 using Ryujinx.Graphics.GAL;
+using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
 using Ryujinx.HLE;
@@ -311,7 +312,7 @@ namespace Ryujinx.Headless
 
             return new OpenGLRenderer();
         }
-
+        
         private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) =>
             new(
                 new HleConfiguration(
@@ -321,6 +322,7 @@ namespace Ryujinx.Headless
                         options.VSyncMode,
                         !options.DisableDockedMode,
                         !options.DisablePTC,
+                        ITickSource.RealityTickScalar,
                         options.EnableInternetAccess,
                         !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
                         options.FsGlobalAccessLogMode,

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

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

src/Ryujinx/Rebooter.cs

@@ -1,6 +1,8 @@
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -8,7 +10,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.Systems
+namespace Ryujinx.Ava
 {
     internal static class Rebooter
     {

src/Ryujinx/Ryujinx.csproj

@@ -91,12 +91,10 @@
     <Content Include="..\..\distribution\legal\THIRDPARTY.md">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <TargetPath>THIRDPARTY.md</TargetPath>
-      <Visible>False</Visible>
     </Content>
     <Content Include="..\..\LICENSE.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <TargetPath>LICENSE.txt</TargetPath>
-      <Visible>False</Visible>
     </Content>
   </ItemGroup>
 

src/Ryujinx/RyujinxApp.axaml

@@ -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

@@ -7,12 +7,12 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Windowing;
 using Gommon;
+using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Views.Dialog;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using System;
@@ -147,10 +147,5 @@ namespace Ryujinx.Ava
             Current is RyujinxApp { PlatformSettings: not null } app
                 ? ConvertThemeVariant(app.PlatformSettings.GetColorValues().ThemeVariant)
                 : ThemeVariant.Default;
-
-        private async void AboutRyujinx_OnClick(object sender, EventArgs e)
-        {
-            await AboutView.Show();
-        }
     }
 }

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

@@ -9,10 +9,11 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Views.Dialog;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -80,13 +81,13 @@ namespace Ryujinx.Ava.UI.Controls
         public async void OpenTitleUpdateManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await TitleUpdateManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
+                await TitleUpdateWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
         }
 
         public async void OpenDownloadableContentManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await DownloadableContentManagerView.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
+                await DownloadableContentManagerWindow.Show(viewModel.ApplicationLibrary, viewModel.SelectedApplication);
         }
 
         public async void OpenCheatManager_Click(object sender, RoutedEventArgs args)
@@ -127,7 +128,7 @@ namespace Ryujinx.Ava.UI.Controls
         public async void OpenModManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await ModManagerView.Show(
+                await ModManagerWindow.Show(
                     viewModel.SelectedApplication.Id, 
                     viewModel.SelectedApplication.IdBase, 
                     viewModel.ApplicationLibrary, 
@@ -407,7 +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,28 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Media.Imaging;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.ViewModels;
-using System.Reflection;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public class RyujinxLogo : Image
-    {
-        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
-        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
-        // The border gets reduced to colored pixels in the 4 corners.
-        public static readonly Bitmap Bitmap =
-            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
-                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
-        
-        public RyujinxLogo()
-        {
-            Margin = new Thickness(7, 7, 7, 0);
-            Height = 25;
-            Width = 25;
-            Source = Bitmap;
-            IsVisible = !ConfigurationState.Instance.ShowOldUI;
-        }
-    }
-}

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/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

@@ -3,8 +3,9 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
+using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.Configuration;
 using System;
 
 namespace Ryujinx.Ava.UI.ViewModels

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/ControllerInputViewModel.cs

@@ -1,5 +1,9 @@
 using Avalonia.Svg.Skia;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Input;
+using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
 using Ryujinx.Common.Utilities;

src/Ryujinx/UI/ViewModels/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

@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Media;
+using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -16,15 +17,14 @@ using LibHac.Ns;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Models.Generic;
 using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
@@ -46,6 +46,7 @@ using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Key = Ryujinx.Input.Key;
@@ -136,6 +137,13 @@ namespace Ryujinx.Ava.UI.ViewModels
         // Key is Title ID
         public SafeDictionary<string, LdnGameData.Array> LdnData = [];
 
+        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
+        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
+        // The border gets reduced to colored pixels in the 4 corners.
+        public static readonly Bitmap IconBitmap =
+            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
+                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
+
         public MainWindow Window { get; init; }
 
         internal AppHost AppHost { get; set; }
@@ -1786,7 +1794,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             if (WindowState is not WindowState.Normal)
             {
                 WindowState = WindowState.Normal;
-                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowOldUI;
+                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
 
                 if (IsGameRunning)
                 {

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

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -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;
@@ -757,8 +782,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // Dirty Hacks
             config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFix;
-            config.Hacks.DisableNifmIsAnyInternetRequestAccepted.Value =
-                DirtyHacks.NifmDisableIsAnyInternetRequestAccepted;
 
             config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
 

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

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml

@@ -4,10 +4,10 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:pt="using:Projektanker.Icons.Avalonia"
     HorizontalAlignment="Stretch"
     VerticalAlignment="Stretch"
     d:DesignHeight="800"
@@ -507,49 +507,65 @@
                         CornerRadius="5"
                         VerticalAlignment="Bottom"
                         HorizontalAlignment="Stretch">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                            <StackPanel Orientation="Vertical" Spacing="5">
-                                <CheckBox
-                                    Margin="10, 10, 10, 0"
-                                    MinWidth="0"
-                                    IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
-                                    <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
-                                </CheckBox>
-                                <Button
-                                    Margin="10, 0, 10, 10"
-                                    Command="{Binding ShowMotionConfig}">
-                                    <pt:Icon Value="fa-solid fa-gear" />
-                                </Button>
-                            </StackPanel>
-                            <controls:MiniVerticalSeparator Height="64"/>
-                            <StackPanel Orientation="Vertical" Spacing="5">
-                                <CheckBox
-                                    Margin="10, 10, 10, 0"
-                                    MinWidth="0"
-                                    IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
-                                    <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
-                                </CheckBox>
-                                <Button
-                                    Margin="10, 0, 10, 10"
-                                    Command="{Binding ShowRumbleConfig}">
-                                    <pt:Icon Value="fa-solid fa-gear" />
-                                </Button>
-                            </StackPanel>
-                            <controls:MiniVerticalSeparator Height="64" IsVisible="{Binding ParentModel.HasLed}"/>
-                            <StackPanel Orientation="Vertical" Spacing="5">
-                                <CheckBox
-                                    Margin="10, 10, 10, 0"
-                                    MinWidth="0"
-                                    IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
-                                    <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
-                                </CheckBox>
-                                <Button
-                                    Margin="10, 0, 10, 10"
-                                    Command="{Binding ShowLedConfig}">
-                                    <pt:Icon Value="fa-solid fa-gear" />
-                                </Button>
-                            </StackPanel>
-                        </StackPanel>
+                        <Grid ColumnDefinitions="*,Auto">
+                            <CheckBox
+                                Margin="10"
+                                MinWidth="0"
+                                Grid.Column="0"
+                                IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
+                            </CheckBox>
+                            <Button
+                                Margin="10"
+                                Grid.Column="1"
+                                Command="{Binding ShowMotionConfig}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                            </Button>
+                        </Grid>
+                    </Border>
+                    <Border
+                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="5"
+                        HorizontalAlignment="Stretch"
+                        Margin="0,-1,0,0">
+                        <Grid ColumnDefinitions="*,Auto">
+                            <CheckBox
+                                Margin="10"
+                                MinWidth="0"
+                                Grid.Column="0"
+                                IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
+                            </CheckBox>
+                            <Button
+                                Margin="10"
+                                Grid.Column="1"
+                                Command="{Binding ShowRumbleConfig}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                            </Button>
+                        </Grid>
+                    </Border>
+                    <Border
+                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="5"
+                        HorizontalAlignment="Stretch"
+                        Margin="0,-1,0,0">
+                        <Grid IsVisible="{Binding ParentModel.HasLed}" ColumnDefinitions="*,Auto">
+                            <CheckBox
+                                Margin="10, 10, 5, 10"
+                                MinWidth="0"
+                                Grid.Column="0"
+                                IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
+                            </CheckBox>
+                            <Button
+                                Margin="10"
+                                Grid.Column="1"
+                                Command="{Binding ShowLedConfig}">
+                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                            </Button>
+                        </Grid>
                     </Border>
                 </StackPanel>
             </StackPanel>

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

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

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

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

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

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

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

@@ -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.Dialog;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Utilities;
@@ -34,6 +34,9 @@ namespace Ryujinx.Ava.UI.Views.Main
         {
             InitializeComponent();
 
+            RyuLogo.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
+            RyuLogo.Source = MainWindowViewModel.IconBitmap;
+
             ToggleFileTypesMenuItem.ItemsSource = GenerateToggleFileTypeItems();
             ChangeLanguageMenuItem.ItemsSource = GenerateLanguageMenuItems();
 
@@ -46,9 +49,9 @@ namespace Ryujinx.Ava.UI.Views.Main
             CheatManagerMenuItem.Command = Commands.CreateSilentFail(OpenCheatManagerForCurrentApp);
             InstallFileTypesMenuItem.Command = Commands.Create(InstallFileTypes);
             UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
-            XciTrimmerMenuItem.Command = Commands.Create(XciTrimmerView.Show);
-            AboutWindowMenuItem.Command = Commands.Create(AboutView.Show);
-            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityListWindow.Show());
+            XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
+            AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
+            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());
 
             UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;
 
@@ -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

@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
@@ -6,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

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

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

@@ -2,17 +2,19 @@
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
+using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Compat;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Dialog
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
     {
@@ -44,18 +46,21 @@ namespace Ryujinx.Ava.UI.Views.Dialog
             if (RyujinxApp.AppLifetime.Windows.TryGetFirst(x => x is ContentDialogOverlayWindow, out Window window))
                 window.Close(ContentDialogResult.None);
             
-            await CompatibilityListWindow.Show((string)playabilityLabel.Tag);
+            await CompatibilityList.Show((string)playabilityLabel.Tag);
         }
 
         private async void IdString_OnClick(object sender, RoutedEventArgs e)
         {
+            if (DataContext is not MainWindowViewModel mwvm)
+                return;
+            
             if (sender is not Button { Content: TextBlock idText })
                 return;
 
             if (!RyujinxApp.IsClipboardAvailable(out IClipboard clipboard))
                 return;
             
-            ApplicationData appData = RyujinxApp.MainWindow.ViewModel.Applications.FirstOrDefault(it => it.IdString == idText.Text);
+            ApplicationData appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
             if (appData is null)
                 return;
             

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

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

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

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

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/SettingsHacksView.axaml

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

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

@@ -19,7 +19,7 @@
             <Setter Property="Margin" Value="10, 0, 0, 0" />
             <Setter Property="Orientation" Value="Horizontal" />
         </Style>
-        <Style Selector="StackPanel > StackPanel > TextBlock">
+        <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

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

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

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

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/SettingsSystemView.axaml.cs

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

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

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

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

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

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

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

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

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

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

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

src/Ryujinx/UI/Windows/AboutWindow.axaml

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

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

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

src/Ryujinx/UI/Windows/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

@@ -1,8 +1,9 @@
 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.Utilities.AppLibrary;
+using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using System.Collections.Generic;
@@ -31,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,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,46 +0,0 @@
-using Avalonia.Controls;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.ViewModels;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.Windows
-{
-    public partial class CompatibilityListWindow : StyleableAppWindow
-    {
-        public static async Task Show(string titleId = null)
-        {
-            using CompatibilityViewModel compatWindow = new(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary);
-            
-            await ShowAsync(new CompatibilityListWindow
-            {
-                DataContext = compatWindow,
-                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

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

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

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

src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml

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

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

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

src/Ryujinx/UI/Windows/IconColorPicker.cs

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

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

@@ -7,19 +7,20 @@ using Avalonia.Platform;
 using Avalonia.Threading;
 using DynamicData;
 using FluentAvalonia.UI.Controls;
+using FluentAvalonia.UI.Windowing;
 using Gommon;
 using LibHac.Ns;
+using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Applet;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 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;
@@ -75,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
             {
@@ -89,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;
@@ -96,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;
@@ -269,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,
             };