UI: Rename Show Title Bar + Revamp for global settings window

Moved AppLibrary, Configuration, and PlayReport namespaces to Ryujinx.Systems, add the compat list stuff in the base Ryujinx.Systems namespace.
Moved the compatibility UI stuff to the proper UI view/viewmodel folders.

src/Ryujinx/AppHost.cs

@@ -21,8 +21,8 @@ using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -470,7 +470,7 @@ namespace Ryujinx.Ava
 
             Dispatcher.UIThread.InvokeAsync(() =>
             {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
             });
 
             _viewModel.SetUiProgressHandlers(Device);
@@ -872,7 +872,7 @@ namespace Ryujinx.Ava
             Device?.System.TogglePauseEmulation(false);
 
             _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
         }
 
@@ -881,7 +881,7 @@ namespace Ryujinx.Ava
             Device?.System.TogglePauseEmulation(true);
 
             _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
         }
 

src/Ryujinx/Assets/Styles/Styles.xaml

@@ -49,6 +49,7 @@
                 <TextBlock
                          Classes="globalConfigMarker"/>
             </StackPanel>
+            
         </Border>
     </Design.PreviewWith>
     <Style Selector="DropDownButton">
@@ -439,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">900</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">700</x:Double>
         <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
     </Styles.Resources>
 </Styles>

src/Ryujinx/Assets/locales.json

@@ -3823,28 +3823,53 @@
       }
     },
     {
-      "ID": "SettingsTabGeneralShowTitleBar",
+      "ID": "SettingsTabGeneralShowOldUI",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "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)",
+        "en_US": "Show Original UI Style (Requires restart)",
+        "es_ES": "",
+        "fr_FR": "",
         "he_IL": "",
-        "it_IT": "Mostra barra del titolo (Richiede il riavvio)",
+        "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "제목 표시줄 표시(다시 시작해야 함)",
-        "no_NO": "Vis tittellinje (krever omstart)",
+        "ko_KR": "",
+        "no_NO": "Vis original UI-stil (krever omstart)",
         "pl_PL": "",
-        "pt_BR": "Mostrar Barra de Título (Requer reinicialização)",
-        "ru_RU": "Показать строку заголовка (требуется перезапуск)",
-        "sv_SE": "Visa titelrad (kräver omstart)",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Показувати рядок заголовка (Потрібен перезапуск)",
-        "zh_CN": "显示标题栏 (需要重启)",
-        "zh_TW": "顯示「標題列」 (需要重新開啟Ryujinx)"
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SettingsTabGeneralShowOldUIToolTip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Show the older Avalonia Ryujinx UI reminiscent of Ryujinx 1.1.1403. This is enabled by default on platforms that are not Windows.\nThe classic-style title bar is back and major window layout reworkings are reversed; such as the settings navigation placement above this tooltip.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "Vis det eldre Avalonia Ryujinx-grensesnittet som minner om Ryujinx 1.1.1403. Dette er aktivert som standard på plattformer som ikke er Windows.\nTittellinjen i klassisk stil er tilbake, og store omarbeidinger av vindusoppsettet er reversert, for eksempel plasseringen av innstillingsnavigasjonen over dette verktøytipset.",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
       }
     },
     {
@@ -7197,81 +7222,6 @@
         "zh_TW": "新增"
       }
     },
-    {
-      "ID": "ControllerSettingsModifiedNotification",
-      "Translations": {
-        "ar_SA": "(تم التعديل!)",
-        "de_DE": "(modifiziert!)",
-        "el_GR": "(τροποποιημένο!)",
-        "en_US": "(Modified!)",
-        "es_ES": "(modificado!)",
-        "fr_FR": "(modifié!)",
-        "he_IL": "(שונה!)",
-        "it_IT": "(modificato!)",
-        "ja_JP": "(変更済み!)",
-        "ko_KR": "(수정됨!)",
-        "no_NO": "(modifisert!)",
-        "pl_PL": "(zmodyfikowane!)",
-        "pt_BR": "(modificado!)",
-        "ru_RU": "(изменено!)",
-        "sv_SE": "(ändrad!)",
-        "th_TH": "(แก้ไขแล้ว!)",
-        "tr_TR": "(değiştirildi!)",
-        "uk_UA": "(модифіковано!)",
-        "zh_CN": "(已修改!)",
-        "zh_TW": "(已修改!)"
-      }
-    },
-    {
-      "ID": "ControllerSettingsDisableDeviceForSaving",
-      "Translations": {
-        "ar_SA": "تم إعداد التحكم.\n\nفي انتظار اتصال وحدة التحكم...",
-        "de_DE": "Steuerung konfiguriert.\n\nWarten auf die Verbindung des Controllers...",
-        "el_GR": "Η διαχείριση έχει ρυθμιστεί.\n\nΑναμένεται σύνδεση του χειριστηρίου...",
-        "en_US": "Control configured.\n\nWaiting for controller connection...",
-        "es_ES": "Control configurado.\n\nEsperando la conexión del controlador...",
-        "fr_FR": "Contrôle configuré.\n\nEn attente de la connexion du contrôleur...",
-        "he_IL": "השליטה הוגדרה.\n\nממתין לחיבור הבקר...",
-        "it_IT": "Controllo configurato.\n\nIn attesa della connessione del controller...",
-        "ja_JP": "コントロールが設定されました。\n\nコントローラーの接続を待っています...",
-        "ko_KR": "제어가 설정되었습니다.\n\n컨트롤러 연결 대기 중...",
-        "no_NO": "Kontroll konfigurert.\n\nVenter på tilkobling av kontroller...",
-        "pl_PL": "Sterowanie skonfigurowane.\n\nOczekiwanie na połączenie kontrolera...",
-        "pt_BR": "Controle configurado.\n\nAguardando conexão do controle...",
-        "ru_RU": "Управление настроено.\n\nОжидается подключение контроллера...",
-        "sv_SE": "Kontroll konfigurerad.\n\nVäntar på anslutning av kontrollen...",
-        "th_TH": "การควบคุมได้รับการตั้งค่าแล้ว\n\nกำลังรอการเชื่อมต่อคอนโทรลเลอร์...",
-        "tr_TR": "Kontrol yapılandırıldı.\n\nKontrolcü bağlantısı bekleniyor...",
-        "uk_UA": "Керування налаштовано.\n\nОчікується підключення контролера...",
-        "zh_CN": "控制已配置。\n\n等待控制器连接...",
-        "zh_TW": "控制已設定。\n\n等待控制器連接..."
-      }
-    },
-    {
-      "ID": "ControllerSettingsUnlink",
-      "Translations": {
-        "ar_SA": "إلغاء الربط",
-        "de_DE": "Entkoppeln",
-        "el_GR": "Αποσύνδεση",
-        "en_US": "Unlink",
-        "es_ES": "Desvincular",
-        "fr_FR": "Dissocier",
-        "he_IL": "ניתוק קישור",
-        "it_IT": "Scollega",
-        "ja_JP": "リンク解除",
-        "ko_KR": "연결 해제",
-        "no_NO": "Frakoble",
-        "pl_PL": "Odłącz",
-        "pt_BR": "Desvincular",
-        "ru_RU": "Отвязать",
-        "sv_SE": "Koppla från",
-        "th_TH": "ยกเลิกการเชื่อมโยง",
-        "tr_TR": "Bağlantıyı Kes",
-        "uk_UA": "Відв'язати",
-        "zh_CN": "解除绑定",
-        "zh_TW": "解除綁定"
-      }
-    },
     {
       "ID": "ControllerSettingsRemove",
       "Translations": {
@@ -11922,31 +11872,6 @@
         "zh_TW": "儲存設定檔"
       }
     },
-    {
-      "ID": "ControllerSettingsCancelCurrentChangesToolTip",
-      "Translations": {
-        "ar_SA": "إلغاء التغييرات الحالية",
-        "de_DE": "Aktuelle Änderungen abbrechen",
-        "el_GR": "Ακύρωση τρεχουσών αλλαγών",
-        "en_US": "Cancel current changes",
-        "es_ES": "Cancelar los cambios actuales",
-        "fr_FR": "Annuler les modifications en cours",
-        "he_IL": "ביטול השינויים הנוכחיים",
-        "it_IT": "Annulla le modifiche correnti",
-        "ja_JP": "現在の変更をキャンセル",
-        "ko_KR": "현재 변경 취소",
-        "no_NO": "Avbryt gjeldende endringer",
-        "pl_PL": "Anuluj bieżące zmiany",
-        "pt_BR": "Cancelar alterações atuais",
-        "ru_RU": "Отменить текущие изменения",
-        "sv_SE": "Avbryt aktuella ändringar",
-        "th_TH": "ยกเลิกการเปลี่ยนแปลงปัจจุบัน",
-        "tr_TR": "Geçerli değişiklikleri iptal et",
-        "uk_UA": "Скасувати поточні зміни",
-        "zh_CN": "取消当前更改",
-        "zh_TW": "取消當前變更"
-      }
-    },
     {
       "ID": "MenuBarFileToolsTakeScreenshot",
       "Translations": {
@@ -23922,6 +23847,31 @@
         "zh_TW": "上次更新時間: {0}"
       }
     },
+    {
+      "ID": "CompatibilityListTitle",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Compatibility List - {0} entries",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "CompatibilityListWarning",
       "Translations": {
@@ -23972,6 +23922,31 @@
         "zh_TW": "搜尋相容性列表紀錄..."
       }
     },
+    {
+      "ID": "CompatibilityListSearchBoxWatermarkWithCount",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Search {0} compatibility entries...",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "Søk i {0} kompatibilitetsoppføringer...",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "CompatibilityListOpen",
       "Translations": {

src/Ryujinx/Common/ApplicationHelper.cs

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

src/Ryujinx/Common/LocaleManager.cs

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

src/Ryujinx/Common/Markup/MarkupExtensions.cs

@@ -1,4 +1,5 @@
 using Avalonia.Markup.Xaml.MarkupExtensions;
+using Humanizer;
 using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;
 
@@ -24,4 +25,17 @@ 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.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 

src/Ryujinx/DiscordIntegrationModule.cs

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

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -2,7 +2,7 @@ using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;

src/Ryujinx/Headless/HeadlessRyujinx.cs

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

src/Ryujinx/Headless/Options.cs

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

src/Ryujinx/Program.cs

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

src/Ryujinx/RyujinxApp.axaml.cs

@@ -12,7 +12,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using System;

src/Ryujinx/Systems/AppLibrary/ApplicationCountUpdatedEventArgs.cs

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

src/Ryujinx/Systems/AppLibrary/ApplicationData.cs

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

src/Ryujinx/Systems/AppLibrary/ApplicationJsonSerializerContext.cs

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

src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs

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

src/Ryujinx/Systems/AppLibrary/ApplicationMetadata.cs

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

src/Ryujinx/Systems/AppLibrary/LdnGameData.cs

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

src/Ryujinx/Systems/AppLibrary/LdnGameDataReceivedEventArgs.cs

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

src/Ryujinx/Systems/AppLibrary/LdnGameDataSerializerContext.cs

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

src/Ryujinx/Systems/CompatibilityCsv.cs

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

src/Ryujinx/Systems/Configuration/AudioBackend.cs

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

src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs

@@ -1,5 +1,5 @@
-using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -8,7 +8,7 @@ using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
 using System.Collections.Generic;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public class ConfigurationFileFormat
     {

src/Ryujinx/Systems/Configuration/ConfigurationFileFormatSettings.cs

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

src/Ryujinx/Systems/Configuration/ConfigurationJsonSerializerContext.cs

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

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

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

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

@@ -1,8 +1,8 @@
 using ARMeilleure;
 using Gommon;
 using LibHac.Tools.FsSystem;
-using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -16,7 +16,7 @@ using System.Collections.Generic;
 using System.Linq;
 using RyuLogger = Ryujinx.Common.Logging.Logger;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public partial class ConfigurationState
     {
@@ -352,6 +352,10 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// </summary>
             public ReactiveObject<bool> EnableFsIntegrityChecks { get; private set; }
 
+            public IntegrityCheckLevel IntegrityCheckLevel => EnableFsIntegrityChecks
+                ? IntegrityCheckLevel.ErrorOnInvalid
+                : IntegrityCheckLevel.None;
+
             /// <summary>
             /// Enables FS access log output to the console. Possible modes are 0-3
             /// </summary>
@@ -779,11 +783,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// Enables or disables Discord Rich Presence
         /// </summary>
         public ReactiveObject<bool> EnableDiscordIntegration { get; private set; }
-
-        /// <summary>
-        /// Checks for updates when Ryujinx starts when enabled
-        /// </summary>
-        public ReactiveObject<bool> CheckUpdatesOnStart { get; private set; }
         
         /// <summary>
         /// Checks for updates when Ryujinx starts when enabled, either prompting when an update is found or just showing a notification.
@@ -806,9 +805,9 @@ namespace Ryujinx.Ava.Utilities.Configuration
         public ReactiveObject<bool> RememberWindowState { get; private set; }
 
         /// <summary>
-        /// Enables or disables the redesigned title bar
+        /// Disable the new title bar layout & window layout changes.
         /// </summary>
-        public ReactiveObject<bool> ShowTitleBar { get; private set; }
+        public ReactiveObject<bool> ShowOldUI { get; private set; }
 
         /// <summary>
         /// Enables hardware-accelerated rendering for Avalonia
@@ -829,22 +828,21 @@ namespace Ryujinx.Ava.Utilities.Configuration
             Hid = new HidSection();
             Multiplayer = new MultiplayerSection();
             Hacks = new HacksSection();
-            EnableDiscordIntegration = new ReactiveObject<bool>();
-            CheckUpdatesOnStart = new ReactiveObject<bool>();
             UpdateCheckerType = new ReactiveObject<UpdaterType>();
             FocusLostActionType = new ReactiveObject<FocusLostType>();
+            HideCursor = new ReactiveObject<HideCursorMode>();
+            EnableDiscordIntegration = new ReactiveObject<bool>();
             ShowConfirmExit = new ReactiveObject<bool>();
             RememberWindowState = new ReactiveObject<bool>();
-            ShowTitleBar = new ReactiveObject<bool>();
+            ShowOldUI = new ReactiveObject<bool>();
             EnableHardwareAcceleration = new ReactiveObject<bool>();
-            HideCursor = new ReactiveObject<HideCursorMode>();
         }
 
         public HleConfiguration CreateHleConfiguration() =>
             new(
                 System.DramSize,
-                (SystemLanguage)System.Language.Value,
-                (RegionCode)System.Region.Value,
+                System.Language.Value.ToHLE(),
+                System.Region.Value.ToHLE(),
                 Graphics.VSyncMode,
                 System.EnableDockedMode,
                 System.EnablePtc,

src/Ryujinx/Systems/Configuration/ConfigurationState.cs

@@ -1,5 +1,5 @@
-using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
@@ -9,7 +9,7 @@ using Ryujinx.HLE;
 using System;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public partial class ConfigurationState
     {
@@ -56,12 +56,11 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 MatchSystemTime = System.MatchSystemTime,
                 DockedMode = System.EnableDockedMode,
                 EnableDiscordIntegration = EnableDiscordIntegration,
-                CheckUpdatesOnStart = CheckUpdatesOnStart,
                 UpdateCheckerType = UpdateCheckerType,
                 FocusLostActionType = FocusLostActionType,
                 ShowConfirmExit = ShowConfirmExit,
                 RememberWindowState = RememberWindowState,
-                ShowTitleBar = ShowTitleBar,
+                ShowTitleBar = ShowOldUI,
                 EnableHardwareAcceleration = EnableHardwareAcceleration,
                 HideCursor = HideCursor,
                 VSyncMode = Graphics.VSyncMode,
@@ -183,7 +182,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             FocusLostActionType.Value = FocusLostType.DoNothing;
             ShowConfirmExit.Value = true;
             RememberWindowState.Value = true;
-            ShowTitleBar.Value = !OperatingSystem.IsWindows();
+            ShowOldUI.Value = !OperatingSystem.IsWindows();
             EnableHardwareAcceleration.Value = true;
             HideCursor.Value = HideCursorMode.OnIdle;
             Graphics.VSyncMode.Value = VSyncMode.Switch;

src/Ryujinx/Systems/Configuration/FileTypes.cs

@@ -1,8 +1,8 @@
 using System;
 
-using static Ryujinx.Ava.Utilities.Configuration.ConfigurationState.UISection;
+using static Ryujinx.Ava.Systems.Configuration.ConfigurationState.UISection;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public enum FileTypes
     {

src/Ryujinx/Systems/Configuration/LoggerModule.cs

@@ -4,7 +4,7 @@ using Ryujinx.Common.Logging.Targets;
 using System;
 using System.IO;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public static class LoggerModule
     {

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

@@ -1,7 +1,7 @@
 using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Utilities.Configuration.System
+namespace Ryujinx.Ava.Systems.Configuration.System
 {
     [JsonConverter(typeof(TypedStringEnumConverter<Language>))]
     public enum Language
@@ -25,4 +25,13 @@ namespace Ryujinx.Ava.Utilities.Configuration.System
         TraditionalChinese,
         BrazilianPortuguese,
     }
+
+    public static class LanguageEnumHelper
+    {
+        public static Language ToUI(this HLE.HOS.SystemState.SystemLanguage hleLanguage)
+            => (Language)hleLanguage;
+
+        public static HLE.HOS.SystemState.SystemLanguage ToHLE(this Language uiLanguage)
+            => (HLE.HOS.SystemState.SystemLanguage)uiLanguage;
+    }
 }

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

@@ -0,0 +1,26 @@
+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/Systems/Configuration/UI/ColumnSort.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.Utilities.Configuration.UI
+namespace Ryujinx.Ava.Systems.Configuration.UI
 {
     public struct ColumnSort
     {

src/Ryujinx/Systems/Configuration/UI/FocusLostType.cs

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

src/Ryujinx/Systems/Configuration/UI/GuiColumns.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.Utilities.Configuration.UI
+namespace Ryujinx.Ava.Systems.Configuration.UI
 {
     public struct GuiColumns
     {

src/Ryujinx/Systems/Configuration/UI/ShownFileTypes.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.Utilities.Configuration.UI
+namespace Ryujinx.Ava.Systems.Configuration.UI
 {
     public struct ShownFileTypes
     {

src/Ryujinx/Systems/Configuration/UI/UpdaterType.cs

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

src/Ryujinx/Systems/Configuration/UI/WindowStartup.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.Utilities.Configuration.UI
+namespace Ryujinx.Ava.Systems.Configuration.UI
 {
     public struct WindowStartup
     {

src/Ryujinx/Systems/PlayReport/Analyzer.cs

@@ -1,5 +1,5 @@
 using Gommon;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Logging;
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     /// <summary>
     /// The entrypoint for the Play Report analysis system.

src/Ryujinx/Systems/PlayReport/Delegates.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     /// <summary>
     /// The delegate type that powers single value formatters.<br/>

src/Ryujinx/Systems/PlayReport/MatchedValues.cs

@@ -1,8 +1,8 @@
 using MsgPack;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Collections.Generic;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     public abstract class MatchedValue<T>
     {

src/Ryujinx/Systems/PlayReport/PlayReports.Formatters.cs

@@ -5,7 +5,7 @@ using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     public partial class PlayReports
     {

src/Ryujinx/Systems/PlayReport/PlayReports.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     public static partial class PlayReports
     {

src/Ryujinx/Systems/PlayReport/Specs.cs

@@ -1,10 +1,10 @@
 using MsgPack;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     /// <summary>
     /// A mapping of title IDs to value formatter specs.
@@ -103,7 +103,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
         /// <br/><br/>
         /// The 'Sparse' multi-value formatters do not require every key to be present.
-        /// If you need this requirement, use <see cref="AddMultiValueFormatter(string[], Ryujinx.Ava.Utilities.PlayReport.MultiValueFormatter)"/>.
+        /// If you need this requirement, use <see cref="AddMultiValueFormatter(string[], MultiValueFormatter)"/>.
         /// </summary>
         /// <param name="reportKeys">The key names to match.</param>
         /// <param name="valueFormatter">The function which can format the values.</param>
@@ -118,7 +118,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
         /// <br/><br/>
         /// The 'Sparse' multi-value formatters do not require every key to be present.
-        /// If you need this requirement, use <see cref="AddMultiValueFormatter(int, string[], Ryujinx.Ava.Utilities.PlayReport.MultiValueFormatter)"/>.
+        /// If you need this requirement, use <see cref="AddMultiValueFormatter(int, string[], MultiValueFormatter)"/>.
         /// </summary>
         /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
         /// <param name="reportKeys">The key names to match.</param>

src/Ryujinx/Systems/PlayReport/Value.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     /// <summary>
     /// The base input data to a ValueFormatter delegate,

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.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.Applets;

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

@@ -12,8 +12,7 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -408,7 +407,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 CompatibilityList.Show(viewModel.SelectedApplication.IdString);
+                await CompatibilityListWindow.Show(viewModel.SelectedApplication.IdString);
         }
                
         public async void OpenApplicationData_Click(object sender, RoutedEventArgs args)

src/Ryujinx/UI/Controls/RyujinxLogo.cs

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

src/Ryujinx/UI/Helpers/ApplicationOpenedEventArgs.cs

@@ -1,5 +1,5 @@
 using Avalonia.Interactivity;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.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.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.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.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Logging;
 using System;
 using System.Text;

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

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

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

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

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.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.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.Utilities.Configuration;
+using Ryujinx.Ava.Systems.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.Utilities.Configuration;
+using Ryujinx.Ava.Systems.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.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using System;
 

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

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

src/Ryujinx/UI/ViewModels/AppListFavoriteComparable.cs

@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.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.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.PlayReport;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.PlayReport;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {

src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs

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

src/Ryujinx/UI/ViewModels/DlcSelectViewModel.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.Common.Models;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.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.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;

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

@@ -95,21 +95,18 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         }
 
         public async void ShowMotionConfig()
-        {      
+        {
             await MotionInputView.Show(this);
-            ParentModel.IsModified = true;
         }
 
         public async void ShowRumbleConfig()
-        {        
+        {
             await RumbleInputView.Show(this);
-            ParentModel.IsModified = true;
         }
         
         public async void ShowLedConfig()
         {
             await LedInputView.Show(this);
-            ParentModel.IsModified = true;
         }
 
         public void OnParentModelChanged()

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.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -88,41 +88,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsKeyboard => !IsController;
         public bool IsRight { get; set; }
         public bool IsLeft { get; set; }
-        public int DeviceIndexBeforeChange { get; set; }
+
         public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
         public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");
 
-        public bool _isChangeTrackingActive;
-
-        public bool _isModified;
-        public bool IsModified
-        {
-            get => _isModified;
-            set 
-            {
-                _isModified = value;
-                OnPropertyChanged();
-            }
-        }
-
+        public bool IsModified { get; set; }
         public event Action NotifyChangesEvent;
 
-
-        public string _profileChoose;
-        public string ProfileChoose
-        {
-            get => _profileChoose;
-            set
-            {
-                // When you select a profile, the settings from the profile will be applied.
-                // To save the settings, you still need to click the apply button
-
-                _profileChoose = value;
-                LoadProfile();
-                OnPropertyChanged();
-            }
-        }
-
         public object ConfigViewModel
         {
             get => _configViewModel;
@@ -148,14 +120,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             set
             {
                 if (IsModified)
-                {                 
+                {
+
                     _playerIdChoose = value;
                     return;
                 }
-             
+
                 IsModified = false;
                 _playerId = value;
-                _isChangeTrackingActive = false;
 
                 if (!Enum.IsDefined<PlayerIndex>(_playerId))
                 {
@@ -163,13 +135,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 }
                 _isLoaded = false;
+
                 LoadConfiguration();
                 LoadDevice();
                 LoadProfiles();
 
-                DeviceIndexBeforeChange = Device;
                 _isLoaded = true;
-                _isChangeTrackingActive = true;
+
                 OnPropertyChanged();
             }
         }
@@ -213,12 +185,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                             IsLeft = false;
                             break;
                     }
-                    
+
                     LoadInputDriver();
                     LoadProfiles();
-                    SetChangeTrackingActive();
                 }
-       
+
                 OnPropertyChanged();
                 NotifyChanges();
             }
@@ -258,11 +229,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             get => _device;
             set
             {
-                if (!IsModified)
-                {
-                    DeviceIndexBeforeChange = _device;
-                }
-
                 _device = value < 0 ? 0 : value;
 
                 if (_device >= Devices.Count)
@@ -282,28 +248,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     }
                 }
 
-                FindPairedDevice();
-                SetChangeTrackingActive();
                 OnPropertyChanged();
                 NotifyChanges();
             }
         }
 
-
         public InputConfig Config { get; set; }
 
-        public bool _notificationView;
-
-        public bool NotificationView
-        {
-            get => _notificationView;
-            set
-            {
-                _notificationView = value;
-                OnPropertyChanged();
-            }
-        }
-
         public InputViewModel(UserControl owner) : this()
         {
             if (Program.PreviewerDetached)
@@ -323,8 +274,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 PlayerId = PlayerIndex.Player1;
             }
-
-            _isChangeTrackingActive = true;
         }
 
         public InputViewModel()
@@ -362,54 +311,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
             }
-
-            FindPairedDevice();
         }
 
-        private void FindPairedDevice()
-        {
-            // This feature allows you to display a notification
-            // if a configuration is found, but the gamepad is not connected.
-            if (Config != null)
-            {
-                (DeviceType Type, string Id, string Name) activeDevice = Devices.FirstOrDefault(d => d.Id == Config.Id);
-
-                if (activeDevice.Id != Config.Id)
-                {
-                    // display notification when input device is turned off, and
-                    // if device and configuration do not match (different controllers)
-                    NotificationView = true; 
-                }
-                else
-                {
-                    NotificationView = false;
-                }
-            }
-            else
-            {
-                NotificationView = false;
-            }
-        }
-
-        private void SetChangeTrackingActive()
-        {
-          
-            if (_isChangeTrackingActive)
-            {
-                IsModified = true;
-            }
-        }
-
-
-        public void DisableDeviceForSaving()
-        {
-            // "Disabled" mode is available after unbinding the device
-            // NOTE: the IsModified flag to be able to apply the settings.
-            IsModified = true;
-            NotificationView = false;
-        }
-
-
         public void LoadDevice()
         {
             if (Config == null || Config.Backend == InputBackendType.Invalid)
@@ -475,37 +378,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
         }
 
-        private async void HandleOnGamepadDisconnected(string id)
+        private void HandleOnGamepadDisconnected(string id)
         {
-            _isChangeTrackingActive = false;
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                LoadDevices();
-
-                IsModified = true;
-                LoadSavedConfiguration();
-                FindPairedDevice();
-
-                _isChangeTrackingActive = true;
-                return System.Threading.Tasks.Task.CompletedTask;
-            });
+            Dispatcher.UIThread.Post(LoadDevices);
         }
 
-        private async void HandleOnGamepadConnected(string id)
+        private void HandleOnGamepadConnected(string id)
         {
-            _isChangeTrackingActive = false;
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                LoadDevices();
-
-                if (Config != null)
-                {
-                    // Load configuration after connection if it is in the configuration file
-                    IsModified = true;
-                    LoadSavedConfiguration();                  
-                }
-                _isChangeTrackingActive = true;
-            });
+            Dispatcher.UIThread.Post(LoadDevices);
         }
 
         private string GetCurrentGamepadId()
@@ -808,12 +688,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             return config;
         }
 
-        public void LoadProfileButton()
-        {
-            IsModified = true;
-            LoadProfile();
-        }
-
         public async void LoadProfile()
         {
             if (Device == 0)
@@ -865,12 +739,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 _isLoaded = false;
 
-                config.Id = null; // ignore device IDs (there is no longer a need to store device IDs for presets due to their independence from devices)
-
                 LoadConfiguration(config);
 
-                // This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers
-                // LoadDevice();
+                LoadDevice();
 
                 _isLoaded = true;
 
@@ -922,8 +793,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     await File.WriteAllTextAsync(path, jsonString);
 
                     LoadProfiles();
-
-                    ProfileChoose = ProfileName; // Show new profile
                 }
                 else
                 {
@@ -956,40 +825,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 }
 
                 LoadProfiles();
-
-                ProfileChoose = ProfilesList[0].ToString(); // Show default profile
-            }
-        }
-
-        public void LoadSavedConfiguration()
-        {
-            // Restores settings and sets the previously selected device to the last saved state
-            // NOTE: The current order allows the configuration and device to be loaded correctly until the configuration is changed.
-
-            if (IsModified) // Fixes random gamepad appearance in "disabled" option
-            {
-                Device = DeviceIndexBeforeChange;
-
-                LoadDevice();
-                LoadConfiguration();
-
-                IsModified = false;
-
-                OnPropertyChanged();
             }
         }
 
         public void Save()
         {
-            
-            if (!IsModified)
-            {
-                return; //If the input settings were not touched, then do nothing
-            }
-
             IsModified = false;
-            DeviceIndexBeforeChange = Device;
-            List <InputConfig> newConfig = [];
+
+            List<InputConfig> newConfig = [];
 
             newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value);
 

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.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using System.Globalization;
 
 namespace Ryujinx.Ava.UI.ViewModels.Input

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -23,8 +23,8 @@ using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Models.Generic;
 using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
@@ -137,13 +137,6 @@ 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; }
@@ -1794,7 +1787,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             if (WindowState is not WindowState.Normal)
             {
                 WindowState = WindowState.Normal;
-                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
+                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowOldUI;
 
                 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.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.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.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -12,9 +12,9 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.GraphicsDriver;
@@ -130,11 +130,10 @@ 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 ShowTitleBar { get; set; }
+        public bool ShowOldUI { get; set; }
         public int HideCursor { get; set; }
         public int UpdateCheckerType { get; set; }
         public bool EnableDockedMode { get; set; }
@@ -537,10 +536,9 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // User Interface
             EnableDiscordIntegration = config.EnableDiscordIntegration;
-            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
             ShowConfirmExit = config.ShowConfirmExit;
             RememberWindowState = config.RememberWindowState;
-            ShowTitleBar = config.ShowTitleBar;
+            ShowOldUI = config.ShowOldUI;
             HideCursor = (int)config.HideCursor.Value;
             UpdateCheckerType = (int)config.UpdateCheckerType.Value;
             FocusLostActionType = (int)config.FocusLostActionType.Value;
@@ -646,10 +644,9 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // User Interface
             config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
-            config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
             config.ShowConfirmExit.Value = ShowConfirmExit;
             config.RememberWindowState.Value = RememberWindowState;
-            config.ShowTitleBar.Value = ShowTitleBar;
+            config.ShowOldUI.Value = ShowOldUI;
             config.HideCursor.Value = (HideCursorMode)HideCursor;
             config.UpdateCheckerType.Value = (UpdaterType)UpdateCheckerType;
             config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType;

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.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.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.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Utilities;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

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

@@ -64,9 +64,8 @@ namespace Ryujinx.Ava.UI.Views.Input
                 };
 
                 if (!float.IsNaN(_changeSlider) && _changeSlider != (float)check.Value)
-                {     
-                    FlagInputConfigChanged();
-
+                {
+                    (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
                     _changeSlider = (float)check.Value;
                 }
             }
@@ -76,8 +75,7 @@ namespace Ryujinx.Ava.UI.Views.Input
         {
             if (sender is CheckBox { IsPointerOver: true })
             {
-                FlagInputConfigChanged();
-
+                (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
                 _currentAssigner?.Cancel();
                 _currentAssigner = null;
             }
@@ -104,7 +102,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                         this.Focus(NavigationMethod.Pointer);
 
                         PointerPressed += MouseClick;
-                       
+
                         ControllerInputViewModel viewModel = (DataContext as ControllerInputViewModel);
 
                         IKeyboard keyboard =
@@ -117,7 +115,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                             if (e.ButtonValue.HasValue)
                             {
                                 Button buttonValue = e.ButtonValue.Value;
-                                FlagInputConfigChanged();
+                                viewModel.ParentModel.IsModified = true;
 
                                 switch (button.Name)
                                 {
@@ -211,11 +209,6 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
-        private void FlagInputConfigChanged()
-        {
-            (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
-        }
-
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
@@ -239,6 +232,7 @@ namespace Ryujinx.Ava.UI.Views.Input
             {
                 gamepad?.ClearLed();
             }
+            
             _currentAssigner?.Cancel();
             _currentAssigner = null;
         }

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

@@ -41,20 +41,13 @@
                     Grid.Column="0"
                     Margin="2"
                     HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*,Auto">
-                    <StackPanel 
-                        Orientation="Vertical"   
+                    VerticalAlignment="Center" ColumnDefinitions="Auto,*">
+                    <TextBlock
                         Margin="5,0,10,0"
+                        Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Width="90">
-                        <TextBlock
-                            Text="{ext:Locale ControllerSettingsPlayer}" />
-                         <TextBlock                        
-                            Classes="pending" 
-                            Text ="{ext:Locale ControllerSettingsModifiedNotification}"
-                            IsVisible="{Binding IsModified}"/>
-                    </StackPanel>
+                        Text="{ext:Locale ControllerSettingsPlayer}" />
                     <ComboBox
                         Grid.Column="1"
                         Name="PlayerIndexBox"
@@ -69,18 +62,6 @@
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
-                    <Button
-                        Grid.Column="2"
-                            MinWidth="0"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Center"
-                            ToolTip.Tip="{ext:Locale ControllerSettingsCancelCurrentChangesToolTip}"
-                            Command="{Binding LoadSavedConfiguration}">
-                        <ui:SymbolIcon
-                            Symbol="Undo"
-                            FontSize="15"
-                            Height="20" />
-                    </Button>
                 </Grid>
                 <!-- Profile Selection -->
                 <Grid
@@ -100,8 +81,7 @@
                         Name="ProfileBox"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Center"
-                        SelectedItem="{Binding ProfileChoose, Mode=TwoWay}"
-                        SelectionChanged="ComboBox_SelectionChanged"
+                        SelectedIndex="0"
                         ItemsSource="{Binding ProfilesList}"
                         Text="{Binding ProfileName, Mode=TwoWay}" />
                     <Button
@@ -110,7 +90,7 @@
                         Margin="5,0,0,0"
                         VerticalAlignment="Center"
                         ToolTip.Tip="{ext:Locale ControllerSettingsLoadProfileToolTip}"
-                        Command="{Binding LoadProfileButton}">
+                        Command="{Binding LoadProfile}">
                         <ui:SymbolIcon
                             Symbol="View"
                             FontSize="15"
@@ -168,7 +148,7 @@
                         MinWidth="0"
                         Margin="5,0,0,0"
                         VerticalAlignment="Center"
-                        Command="{Binding LoadDevice}">
+                        Command="{Binding LoadDevices}">
                         <ui:SymbolIcon
                             Symbol="Refresh"
                             FontSize="15"
@@ -201,37 +181,15 @@
                 </Grid>
             </Grid>
         </StackPanel>
-        <ContentControl IsVisible="{Binding NotificationView}">
-            <ContentControl.Content>
-                <StackPanel>
-                    <TextBlock 
-                        Margin="5,20,0,0"
-                        Text="{ext:Locale ControllerSettingsDisableDeviceForSaving}" />
-        
-                    <Button
-                        MinWidth="0"
-                        Width="90"
-                        Height="27"
-                        Margin="5,10,0,0"
-                        VerticalAlignment="Center"
-                        Command="{Binding DisableDeviceForSaving}">
-                        <TextBlock
-                            Text="{ext:Locale ControllerSettingsUnlink}"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center" />
-                    </Button>
-                </StackPanel>
-            </ContentControl.Content>
+        <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">
+            <ContentControl.DataTemplates>
+                <DataTemplate DataType="viewModels:ControllerInputViewModel">
+                    <views:ControllerInputView />
+                </DataTemplate>
+                <DataTemplate DataType="viewModels:KeyboardInputViewModel">
+                    <views:KeyboardInputView />
+                </DataTemplate>
+            </ContentControl.DataTemplates>
         </ContentControl>
-            <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">        
-                <ContentControl.DataTemplates>
-                    <DataTemplate DataType="viewModels:ControllerInputViewModel">
-                        <views:ControllerInputView />
-                    </DataTemplate>
-                    <DataTemplate DataType="viewModels:KeyboardInputViewModel">
-                        <views:KeyboardInputView />
-                    </DataTemplate>
-                </ContentControl.DataTemplates>
-            </ContentControl>
     </StackPanel>
 </UserControl>

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

@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
@@ -63,21 +62,12 @@ namespace Ryujinx.Ava.UI.Views.Input
                     }
                     return;
                 }
+                
+                ViewModel.PlayerId = ViewModel.PlayerIdChoose;
 
                 ViewModel.IsModified = false;
-                ViewModel.PlayerId = ViewModel.PlayerIdChoose;
-                
-            }   
-            
-        }
-
-        private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (sender is FAComboBox faComboBox)
-            {
-                faComboBox.IsDropDownOpen = false;
-                ViewModel.IsModified = true;
             }
+            
         }
 
         public void Dispose()

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

@@ -9,8 +9,6 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System.Collections.Generic;
-using System;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;
 
@@ -184,74 +182,15 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
-        private void FlagInputConfigChanged()
-        {
-            (DataContext as KeyboardInputViewModel)!.ParentModel.IsModified = true;
-        }
-
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
 
-            bool shouldRemoveBinding = e.GetCurrentPoint(this).Properties.IsRightButtonPressed;
-
-            if (shouldRemoveBinding)
-            {
-                DeleteBind();
-            }
-
             _currentAssigner?.Cancel(shouldUnbind);
 
             PointerPressed -= MouseClick;
         }
 
-        private void DeleteBind()
-        {
-            if (DataContext is not KeyboardInputViewModel viewModel)
-                return;
-
-            if (_currentAssigner != null)
-            {
-                Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
-                {
-                    { "ButtonZl", () => viewModel.Config.ButtonZl = Key.Unbound },
-                    { "ButtonL", () => viewModel.Config.ButtonL = Key.Unbound },
-                    { "ButtonMinus", () => viewModel.Config.ButtonMinus = Key.Unbound },
-                    { "LeftStickButton", () => viewModel.Config.LeftStickButton = Key.Unbound },
-                    { "LeftStickUp", () => viewModel.Config.LeftStickUp = Key.Unbound },
-                    { "LeftStickDown", () => viewModel.Config.LeftStickDown = Key.Unbound },
-                    { "LeftStickRight", () => viewModel.Config.LeftStickRight = Key.Unbound },
-                    { "LeftStickLeft", () => viewModel.Config.LeftStickLeft = Key.Unbound },
-                    { "DpadUp", () => viewModel.Config.DpadUp = Key.Unbound },
-                    { "DpadDown", () => viewModel.Config.DpadDown = Key.Unbound },
-                    { "DpadLeft", () => viewModel.Config.DpadLeft = Key.Unbound },
-                    { "DpadRight", () => viewModel.Config.DpadRight = Key.Unbound },
-                    { "LeftButtonSr", () => viewModel.Config.LeftButtonSr = Key.Unbound },
-                    { "LeftButtonSl", () => viewModel.Config.LeftButtonSl = Key.Unbound },
-                    { "RightButtonSr", () => viewModel.Config.RightButtonSr = Key.Unbound },
-                    { "RightButtonSl", () => viewModel.Config.RightButtonSl = Key.Unbound },
-                    { "ButtonZr", () => viewModel.Config.ButtonZr = Key.Unbound },
-                    { "ButtonR", () => viewModel.Config.ButtonR = Key.Unbound },
-                    { "ButtonPlus", () => viewModel.Config.ButtonPlus = Key.Unbound },
-                    { "ButtonA", () => viewModel.Config.ButtonA = Key.Unbound },
-                    { "ButtonB", () => viewModel.Config.ButtonB = Key.Unbound },
-                    { "ButtonX", () => viewModel.Config.ButtonX = Key.Unbound },
-                    { "ButtonY", () => viewModel.Config.ButtonY = Key.Unbound },
-                    { "RightStickButton", () => viewModel.Config.RightStickButton = Key.Unbound },
-                    { "RightStickUp", () => viewModel.Config.RightStickUp = Key.Unbound },
-                    { "RightStickDown", () => viewModel.Config.RightStickDown = Key.Unbound },
-                    { "RightStickRight", () => viewModel.Config.RightStickRight = Key.Unbound },
-                    { "RightStickLeft", () => viewModel.Config.RightStickLeft = Key.Unbound }
-                };
-
-                if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
-                {
-                    action();
-                    FlagInputConfigChanged();
-                }
-            }
-        }
-
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTree(e);

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

@@ -6,18 +6,16 @@
     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">
-        <Image
-            Name="RyuLogo"
-            Margin="7, 0"
-            Height="25"
-            Width="25"
-            ToolTip.Tip="{Binding Title}" />
+        <controls:RyujinxLogo 
+            Margin="7, 0" 
+            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.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Utilities;
@@ -34,9 +34,6 @@ namespace Ryujinx.Ava.UI.Views.Main
         {
             InitializeComponent();
 
-            RyuLogo.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
-            RyuLogo.Source = MainWindowViewModel.IconBitmap;
-
             ToggleFileTypesMenuItem.ItemsSource = GenerateToggleFileTypeItems();
             ChangeLanguageMenuItem.ItemsSource = GenerateLanguageMenuItems();
 
@@ -51,7 +48,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
             XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
             AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
-            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());
+            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityListWindow.Show());
 
             UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;
 
@@ -226,7 +223,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.ShowTitleBar ? (int)Window.TitleBar.Height : 0));
+                (ConfigurationState.Instance.ShowOldUI ? (int)Window.TitleBar.Height : 0));
 
             double windowWidthScaled = (resolutionWidth * Program.WindowScaleFactor);
             double windowHeightScaled = ((resolutionHeight + barsHeight) * Program.WindowScaleFactor);

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

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

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

@@ -2,15 +2,13 @@
 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.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -46,21 +44,18 @@ namespace Ryujinx.Ava.UI.Views.Misc
             if (RyujinxApp.AppLifetime.Windows.TryGetFirst(x => x is ContentDialogOverlayWindow, out Window window))
                 window.Close(ContentDialogResult.None);
             
-            await CompatibilityList.Show((string)playabilityLabel.Tag);
+            await CompatibilityListWindow.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 = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
+            ApplicationData appData = RyujinxApp.MainWindow.ViewModel.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.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.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.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.UI.Windows;
 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 CompatibilityList.Show((string)playabilityLabel.Tag);
+            await CompatibilityListWindow.Show((string)playabilityLabel.Tag);
         }
 
         private async void IdString_OnClick(object sender, RoutedEventArgs e)

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

@@ -6,7 +6,7 @@ using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Misc

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

@@ -8,8 +8,6 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System.Collections.Generic;
-using System;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;
 
@@ -48,47 +46,12 @@ namespace Ryujinx.Ava.UI.Views.Settings
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
-            bool shouldRemoveBinding = e.GetCurrentPoint(this).Properties.IsRightButtonPressed;
 
-            if (shouldRemoveBinding)
-            {
-                DeleteBind();
-            }
-          
             _currentAssigner?.Cancel(shouldUnbind);
 
             PointerPressed -= MouseClick;
         }
 
-        private void DeleteBind()
-        {
-            if (DataContext is not SettingsViewModel viewModel)
-                return;
-
-            if (_currentAssigner != null)
-            {
-                Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
-                {
-                    { "ToggleVSyncMode", () => viewModel.KeyboardHotkey.ToggleVSyncMode = Key.Unbound },
-                    { "Screenshot", () => viewModel.KeyboardHotkey.Screenshot = Key.Unbound },
-                    { "ShowUI", () => viewModel.KeyboardHotkey.ShowUI = Key.Unbound },
-                    { "Pause", () => viewModel.KeyboardHotkey.Pause = Key.Unbound },
-                    { "ToggleMute", () => viewModel.KeyboardHotkey.ToggleMute = Key.Unbound },
-                    { "ResScaleUp", () => viewModel.KeyboardHotkey.ResScaleUp = Key.Unbound },
-                    { "ResScaleDown", () => viewModel.KeyboardHotkey.ResScaleDown = Key.Unbound },
-                    { "VolumeUp", () => viewModel.KeyboardHotkey.VolumeUp = Key.Unbound },
-                    { "VolumeDown", () => viewModel.KeyboardHotkey.VolumeDown = Key.Unbound },
-                    { "CustomVSyncIntervalIncrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = Key.Unbound },
-                    { "CustomVSyncIntervalDecrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = Key.Unbound }
-                };
-
-                if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
-                {
-                    action();
-                }
-            }
-        }
-
         private void Button_IsCheckedChanged(object sender, RoutedEventArgs e)
         {
             if (sender is ToggleButton button)

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  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
+                                Width="250"/>
+                        </CheckBox>
+                        <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                     </StackPanel>
                     <Separator />
                     <StackPanel Margin="0,10,0,10"

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

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

src/Ryujinx/UI/Windows/AmiiboWindow.axaml

@@ -6,6 +6,7 @@
     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"
@@ -23,7 +24,25 @@
         <viewModels:AmiiboWindowViewModel />
     </Design.DataContext>
     <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
-        <Grid ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="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" >
             <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,13 +1,14 @@
 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)
+        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId) : base(true, 40)
         {
             DataContext = ViewModel = new AmiiboWindowViewModel(this, lastScannedAmiiboId, titleId)
             {
@@ -16,6 +17,9 @@ 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,6 +6,7 @@
     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"
@@ -20,38 +21,81 @@
         </Style>
     </Window.Styles>
     <Grid Name="CheatGrid" Margin="15" RowDefinitions="Auto,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 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>
         <Border
             Grid.Row="3"
             Grid.Column="0"

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

@@ -2,8 +2,9 @@ using Avalonia.Collections;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using System.Collections.Generic;
@@ -32,21 +33,21 @@ namespace Ryujinx.Ava.UI.Windows
             Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
         }
 
-        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
+        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath) : base(useCustomTitleBar: true, 46)
         {
             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, checkLevel, titlePath);
+            BuildId = ApplicationData.GetBuildId(virtualFileSystem, ConfigurationState.Instance.System.IntegrityCheckLevel, 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

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

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

@@ -0,0 +1,47 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
+using FluentAvalonia.UI.Windowing;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Windows;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.UI.Windows
+{
+    public partial class CompatibilityListWindow : StyleableAppWindow
+    {
+        public static Task Show(string titleId = null) =>
+            ShowAsync(new CompatibilityListWindow
+            {
+                DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary),
+                SearchBoxFlush = { Text = titleId ?? string.Empty },
+                SearchBoxNormal = { Text = titleId ?? string.Empty }
+            });
+
+        public CompatibilityListWindow() : base(useCustomTitleBar: true, 37)
+        {
+            Title = RyujinxApp.FormatTitle(LocaleKeys.CompatibilityListTitle);
+            
+            InitializeComponent();
+            
+            FlushControls.IsVisible = !ConfigurationState.Instance.ShowOldUI;
+            NormalControls.IsVisible = ConfigurationState.Instance.ShowOldUI;
+        }
+
+        // ReSharper disable once UnusedMember.Local
+        // its referenced in the axaml but rider keeps yelling at me that its unused so
+        private void TextBox_OnTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (DataContext is not CompatibilityViewModel cvm)
+                return;
+
+            if (sender is not TextBox searchBox)
+                return;
+        
+            cvm.Search(searchBox.Text);
+        }
+    }
+}

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

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

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

@@ -11,7 +11,7 @@ using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS.SystemState;

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

@@ -18,9 +18,9 @@ using Ryujinx.Ava.UI.Applet;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
@@ -76,7 +76,7 @@ namespace Ryujinx.Ava.UI.Windows
         public readonly double StatusBarHeight;
         public readonly double MenuBarHeight;
 
-        public MainWindow()
+        public MainWindow() : base(useCustomTitleBar: true)
         {
             DataContext = ViewModel = new MainWindowViewModel
             {
@@ -90,9 +90,6 @@ 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;
@@ -100,7 +97,7 @@ namespace Ryujinx.Ava.UI.Windows
             TitleBar.Height = MenuBarHeight;
             
             // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
-            TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);
+            TitleBarHeight = (ConfigurationState.Instance.ShowOldUI ? TitleBar.Height : 0);
 
             ApplicationList.DataContext = DataContext;
             ApplicationGrid.DataContext = DataContext;
@@ -273,11 +270,7 @@ namespace Ryujinx.Ava.UI.Windows
             LibHacHorizonManager.InitializeBcatServer();
             LibHacHorizonManager.InitializeSystemClients();
 
-            IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
-                ? IntegrityCheckLevel.ErrorOnInvalid
-                : IntegrityCheckLevel.None;
-
-            ApplicationLibrary = new ApplicationLibrary(VirtualFileSystem, checkLevel)
+            ApplicationLibrary = new ApplicationLibrary(VirtualFileSystem, ConfigurationState.Instance.System.IntegrityCheckLevel)
             {
                 DesiredLanguage = ConfigurationState.Instance.System.Language,
             };

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

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

src/Ryujinx/UI/Windows/SettingsWindow.axaml

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

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

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

src/Ryujinx/UI/Windows/StyleableWindow.cs

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