UI: Inline game/autoload dir & motion/rumble/led

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

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

src/Ryujinx.Common/TitleIDs.cs

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

src/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs

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

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

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

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

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

src/Ryujinx/Assets/Styles/Styles.xaml

@@ -440,7 +440,7 @@
         <x:Double x:Key="ControlContentThemeFontSize">13</x:Double>
         <x:Double x:Key="MenuItemHeight">26</x:Double>
         <x:Double x:Key="TabItemMinHeight">28</x:Double>
-        <x:Double x:Key="ContentDialogMaxWidth">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

@@ -469,7 +469,7 @@
         "tr_TR": "",
         "uk_UA": "Відкрити теку скріншотів",
         "zh_CN": "打开截图文件夹",
-        "zh_TW": "開啟螢幕擷取畫面資料夾"
+        "zh_TW": ""
       }
     },
     {
@@ -619,7 +619,7 @@
         "tr_TR": "",
         "uk_UA": "Запускати ігри з прихованим інтерфейсом",
         "zh_CN": "启动游戏时隐藏 UI",
-        "zh_TW": "開啟遊戲時隱藏 UI"
+        "zh_TW": ""
       }
     },
     {
@@ -1569,7 +1569,7 @@
         "tr_TR": "",
         "uk_UA": "Розроблено: {0}",
         "zh_CN": "由 {0} 开发",
-        "zh_TW": "由 {0} 開發"
+        "zh_TW": ""
       }
     },
     {
@@ -1869,7 +1869,7 @@
         "tr_TR": "",
         "uk_UA": "Сумісність:",
         "zh_CN": "兼容性:",
-        "zh_TW": "相容性:"
+        "zh_TW": ""
       }
     },
     {
@@ -1894,7 +1894,7 @@
         "tr_TR": "",
         "uk_UA": "ID гри:",
         "zh_CN": "标题 ID:",
-        "zh_TW": "標題 ID:"
+        "zh_TW": ""
       }
     },
     {
@@ -1919,7 +1919,7 @@
         "tr_TR": "",
         "uk_UA": "Розміщені ігри: {0}",
         "zh_CN": "服务的游戏: {0}",
-        "zh_TW": "LDN 上主持的遊戲數量: {0}"
+        "zh_TW": ""
       }
     },
     {
@@ -1944,7 +1944,7 @@
         "tr_TR": "",
         "uk_UA": "Гравців онлайн: {0}",
         "zh_CN": "在线玩家: {0}",
-        "zh_TW": "LDN 上在線的玩家數量: {0}"
+        "zh_TW": ""
       }
     },
     {
@@ -2294,7 +2294,7 @@
         "tr_TR": "",
         "uk_UA": "Очистити кеш PPTC",
         "zh_CN": "清理 PPTC 缓存",
-        "zh_TW": "清除 PPTC"
+        "zh_TW": ""
       }
     },
     {
@@ -2319,7 +2319,7 @@
         "tr_TR": "",
         "uk_UA": "Видаляє всі файли кешу PPTC для застосунку",
         "zh_CN": "删除应用程序的所有 PPTC 缓存",
-        "zh_TW": "清除應用程式的 PPTC"
+        "zh_TW": ""
       }
     },
     {
@@ -2369,7 +2369,7 @@
         "tr_TR": "Uygulamanın shader önbelleğini temizler",
         "uk_UA": "Видаляє кеш шейдерів застосунку (гри)",
         "zh_CN": "删除游戏的着色器缓存文件，下次启动游戏时重新生成着色器缓存文件",
-        "zh_TW": "清除應用程式的著色器快取檔案"
+        "zh_TW": "刪除應用程式的著色器快取"
       }
     },
     {
@@ -2644,7 +2644,7 @@
         "tr_TR": "",
         "uk_UA": "Витягти RomFS з обраного файлу DLC",
         "zh_CN": "从选定的 DLC 文件中解压 RomFS",
-        "zh_TW": "從已選擇的 DLC 檔案中提取 RomFS"
+        "zh_TW": ""
       }
     },
     {
@@ -2769,7 +2769,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": "建立遊戲獨立自訂 (per-game) 設定檔"
+        "zh_TW": ""
       }
     },
     {
@@ -2794,7 +2794,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": "編輯遊戲獨立自訂 (per-game) 設定檔"
+        "zh_TW": ""
       }
     },
     {
@@ -2844,7 +2844,7 @@
         "tr_TR": "Mevcut oyun için bağımsız bir yapılandırma oluşturur",
         "uk_UA": "Створює незалежну конфігурацію для поточної гри",
         "zh_CN": "为当前游戏创建独立的配置",
-        "zh_TW": "為已選擇的遊戲建立遊戲獨立自訂 (game-specific) 的設定檔"
+        "zh_TW": "為當前遊戲創建獨立的配置"
       }
     },
     {
@@ -2869,7 +2869,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": "為已選擇的遊戲編輯遊戲獨立自訂 (game-specific) 的設定檔"
+        "zh_TW": ""
       }
     },
     {
@@ -2894,7 +2894,7 @@
         "tr_TR": "",
         "uk_UA": "Iнформація про сумісність",
         "zh_CN": "显示兼容性项目",
-        "zh_TW": "顯示相容性資訊"
+        "zh_TW": ""
       }
     },
     {
@@ -2919,7 +2919,7 @@
         "tr_TR": "",
         "uk_UA": "Показати цю гру в Списку Сумісності. Список сумісності також можна зайти в меню Довідки.",
         "zh_CN": "在兼容性列表中显示选定的游戏,您通常可以通过帮助菜单访问。",
-        "zh_TW": "在相容性列表中顯示已選擇的遊戲。你也可以透過「說明」選單開啟。"
+        "zh_TW": ""
       }
     },
     {
@@ -2944,7 +2944,7 @@
         "tr_TR": "",
         "uk_UA": "Інформація про гру",
         "zh_CN": "显示游戏信息",
-        "zh_TW": "顯示遊戲資訊"
+        "zh_TW": ""
       }
     },
     {
@@ -2969,7 +2969,7 @@
         "tr_TR": "",
         "uk_UA": "Показати статистику та деталі обраної гри.",
         "zh_CN": "显示当前选定游戏的状态与详细信息。",
-        "zh_TW": "顯示目前已選擇遊戲的狀態及詳細資訊。"
+        "zh_TW": ""
       }
     },
     {
@@ -3519,7 +3519,7 @@
         "tr_TR": "",
         "uk_UA": "Перевірка оновлень:",
         "zh_CN": "检查更新",
-        "zh_TW": "檢查更新:"
+        "zh_TW": ""
       }
     },
     {
@@ -3544,7 +3544,7 @@
         "tr_TR": "",
         "uk_UA": "Вимкнути",
         "zh_CN": "关闭",
-        "zh_TW": "關閉"
+        "zh_TW": ""
       }
     },
     {
@@ -3569,7 +3569,7 @@
         "tr_TR": "",
         "uk_UA": "Запитувати щоразу",
         "zh_CN": "提示",
-        "zh_TW": "提示"
+        "zh_TW": ""
       }
     },
     {
@@ -3594,7 +3594,7 @@
         "tr_TR": "",
         "uk_UA": "Оновлювати в фоні",
         "zh_CN": "背景",
-        "zh_TW": "背景"
+        "zh_TW": ""
       }
     },
     {
@@ -3619,7 +3619,7 @@
         "tr_TR": "",
         "uk_UA": "При втраті фокуса емулятором:",
         "zh_CN": "当模拟器在后台时：",
-        "zh_TW": "當模擬器「失去焦點」(如切換工作)時:"
+        "zh_TW": ""
       }
     },
     {
@@ -3644,7 +3644,7 @@
         "tr_TR": "",
         "uk_UA": "Нічого не робити",
         "zh_CN": "什么事情也不做",
-        "zh_TW": "沒有動作"
+        "zh_TW": ""
       }
     },
     {
@@ -3669,7 +3669,7 @@
         "tr_TR": "",
         "uk_UA": "Блокувати введення",
         "zh_CN": "禁用输入",
-        "zh_TW": "停用輸入"
+        "zh_TW": ""
       }
     },
     {
@@ -3694,7 +3694,7 @@
         "tr_TR": "",
         "uk_UA": "Вимкнути звук",
         "zh_CN": "静音",
-        "zh_TW": "靜音"
+        "zh_TW": ""
       }
     },
     {
@@ -3719,7 +3719,7 @@
         "tr_TR": "",
         "uk_UA": "Блокувати введення та Вимкнути звук",
         "zh_CN": "阻止输入且静音",
-        "zh_TW": "停用輸入且靜音"
+        "zh_TW": ""
       }
     },
     {
@@ -3744,7 +3744,7 @@
         "tr_TR": "",
         "uk_UA": "Поставити на паузу",
         "zh_CN": "暂停模拟",
-        "zh_TW": "暫停模擬"
+        "zh_TW": ""
       }
     },
     {
@@ -3819,32 +3819,57 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "在后台时禁用输入",
-        "zh_TW": "在「失去焦點」時停用輸入"
+        "zh_TW": ""
       }
     },
     {
-      "ID": "SettingsTabGeneralShowTitleBar",
+      "ID": "SettingsTabGeneralShowOldUI",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "Show Title Bar (Requires restart)",
+        "en_US": "Show Original UI Style (Requires restart)",
-        "es_ES": "Mostrar Barra de Título (Requiere reinicio)",
+        "es_ES": "",
-        "fr_FR": "Afficher Barre de Titre (Nécessite redémarrage)",
+        "fr_FR": "",
         "he_IL": "",
-        "it_IT": "Mostra barra del titolo (Richiede il riavvio)",
+        "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "제목 표시줄 표시(다시 시작해야 함)",
+        "ko_KR": "",
-        "no_NO": "Vis tittellinje (krever omstart)",
+        "no_NO": "Vis original UI-stil (krever omstart)",
         "pl_PL": "",
-        "pt_BR": "Mostrar Barra de Título (Requer reinicialização)",
+        "pt_BR": "",
-        "ru_RU": "Показать строку заголовка (требуется перезапуск)",
+        "ru_RU": "",
-        "sv_SE": "Visa titelrad (kräver omstart)",
+        "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
-        "uk_UA": "Показувати рядок заголовка (Потрібен перезапуск)",
+        "uk_UA": "",
-        "zh_CN": "显示标题栏 (需要重启)",
+        "zh_CN": "",
-        "zh_TW": "顯示「標題列」 (需要重新開啟Ryujinx)"
+        "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": ""
       }
     },
     {
@@ -4844,7 +4869,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "与系统时间同步",
-        "zh_TW": "與系統時間同步"
+        "zh_TW": ""
       }
     },
     {
@@ -5269,7 +5294,7 @@
         "tr_TR": "",
         "uk_UA": "Ігнорувати Аплет Контролера",
         "zh_CN": "忽略控制器小程序",
-        "zh_TW": "忽略控制器小程式"
+        "zh_TW": ""
       }
     },
     {
@@ -6119,7 +6144,7 @@
         "tr_TR": "",
         "uk_UA": "Увімкнути журнали інтерфейсу",
         "zh_CN": "启用 UI 日志",
-        "zh_TW": "啟用 UI 日誌"
+        "zh_TW": ""
       }
     },
     {
@@ -6519,7 +6544,7 @@
         "tr_TR": "",
         "uk_UA": "Скинути налаштування",
         "zh_CN": "重置设置",
-        "zh_TW": "重設設定"
+        "zh_TW": ""
       }
     },
     {
@@ -6544,7 +6569,7 @@
         "tr_TR": "",
         "uk_UA": "Я хочу скинути налаштування.",
         "zh_CN": "我要重置我的设置。",
-        "zh_TW": "我想重設我的設定。"
+        "zh_TW": ""
       }
     },
     {
@@ -8469,7 +8494,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "关闭",
-        "zh_TW": "關閉"
+        "zh_TW": ""
       }
     },
     {
@@ -8494,7 +8519,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "彩虹",
-        "zh_TW": "彩虹"
+        "zh_TW": ""
       }
     },
     {
@@ -8519,7 +8544,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "彩虹滚动速度",
-        "zh_TW": "彩虹滾動速度"
+        "zh_TW": ""
       }
     },
     {
@@ -8544,7 +8569,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "颜色",
-        "zh_TW": "顏色"
+        "zh_TW": ""
       }
     },
     {
@@ -13819,7 +13844,7 @@
         "tr_TR": "",
         "uk_UA": "Ви збираєтесь видалити всі дані PPTC з:\n\n{0}\n\nБажаєте продовжити цю операцію?",
         "zh_CN": "您正要清理 PPTC 数据:\n\n{0}\n\n您确实要继续吗?",
-        "zh_TW": "您將要刪除以下遊戲的 PPTC:\n\n{0}\n\n您確定要繼續嗎?"
+        "zh_TW": ""
       }
     },
     {
@@ -16669,7 +16694,7 @@
         "tr_TR": "",
         "uk_UA": "Діалогове вікно Аплету Контролера не з'явиться, якщо геймпад було відключено під час роботи програми.\n\nЗалиште вимкненим якщо не впевнені.",
         "zh_CN": "在应用程序运行时如果游戏手柄断开连接则不会显示控制器小程序对话框。\n\n如果不确定，请保持关闭状态。",
-        "zh_TW": "在模擬應用程式時如果遊戲手柄中斷連線則不會顯示控制器小程式。\n\n如果不確定，請保持關閉狀態。"
+        "zh_TW": ""
       }
     },
     {
@@ -17144,7 +17169,7 @@
         "tr_TR": "",
         "uk_UA": "Виводити повідомлення журналу Avalonia (UI) в консоль",
         "zh_CN": "在控制台显示 Avalonia (UI) 的日志信息",
-        "zh_TW": "在控制台中輸出 Avalonia (UI) 日誌訊息。"
+        "zh_TW": ""
       }
     },
     {
@@ -17344,7 +17369,7 @@
         "tr_TR": "",
         "uk_UA": "Відкрити теку куди зберігаються скріншоти Ryujinx",
         "zh_CN": "打开 Ryujinx 截图文件夹",
-        "zh_TW": "開啟 Ryujinx 螢幕擷取畫面資料夾"
+        "zh_TW": ""
       }
     },
     {
@@ -18094,7 +18119,7 @@
         "tr_TR": "",
         "uk_UA": "Доступне оновлення!",
         "zh_CN": "有可用的更新！",
-        "zh_TW": "有可用的更新！"
+        "zh_TW": ""
       }
     },
     {
@@ -19919,7 +19944,7 @@
         "tr_TR": "",
         "uk_UA": "Налаштування LED",
         "zh_CN": "LED 设置",
-        "zh_TW": "LED 設定"
+        "zh_TW": ""
       }
     },
     {
@@ -21769,7 +21794,7 @@
         "tr_TR": "Yeniden Doku Sıkıştırılmasını Aktif Et",
         "uk_UA": "Увімкнути рекомпресію текстури",
         "zh_CN": "启用纹理压缩",
-        "zh_TW": "啟用材質重新壓縮"
+        "zh_TW": "開啟材質重新壓縮"
       }
     },
     {
@@ -23822,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": {
@@ -23872,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": {
@@ -24069,7 +24144,7 @@
         "tr_TR": "",
         "uk_UA": "Запускається та оптимально працює (без збоїв або графічних багів) на середньостатистичному комп'ютері.",
         "zh_CN": "启动和游戏时不会出现任何崩溃或任何类型的 GPU bug 且速度足够快可以在一般 PC 上尽情游玩。",
-        "zh_TW": "啟動和遊玩時不會出現任何崩潰或任何類型的 GPU bug 且速度足夠快可以在一般 PC 上盡情遊玩。"
+        "zh_TW": ""
       }
     },
     {
@@ -24094,7 +24169,7 @@
         "tr_TR": "",
         "uk_UA": "Запускається, але в грі на вас чекатимуть одна або декілька наступних проблем: збої, зависання, графічні баги, спотворений звук або ж гра загалом працюватиме надто повільно. Можливо, її все ще можна пройти, але досвід буде не найкращим.",
         "zh_CN": "可以成功启动并进入游戏但可能会遇到以下一种或多种问题: 崩溃、卡死、GPU bug、令人无法接受的音频,或者只是太慢。仍然可以继续进行游戏,但是可能无法达到预期。",
-        "zh_TW": "能啟動並進入遊戲，但可能會遇到下列狀況：崩潰、卡死、GPU bug、令人無法接受的聲音、或遊戲過慢。遊戲或可繼續進行，但是可能無法達到預期效果。"
+        "zh_TW": ""
       }
     },
     {
@@ -24119,7 +24194,7 @@
         "tr_TR": "",
         "uk_UA": "Запускається та проходить початковий екран, але пограти не вийде.",
         "zh_CN": "可以启动并通过标题画面但是无法进入到主要的游戏流程。",
-        "zh_TW": "能啟動並通過標題畫面，但是無法進入主要的遊戲畫面。"
+        "zh_TW": ""
       }
     },
     {
@@ -24144,7 +24219,7 @@
         "tr_TR": "",
         "uk_UA": "Запускається, але не відображає навіть початкового екрану.",
         "zh_CN": "可以启动但是无法通过标题画面。",
-        "zh_TW": "能啟動，但是無法通過標題畫面。"
+        "zh_TW": ""
       }
     },
     {
@@ -24169,7 +24244,7 @@
         "tr_TR": "",
         "uk_UA": "Взагалі не запускається.",
         "zh_CN": "无法启动或显示无任何动静。",
-        "zh_TW": "無法啟動"
+        "zh_TW": ""
       }
     },
     {
@@ -24194,7 +24269,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": "遊戲獨立自訂 (game-specific) 設定"
+        "zh_TW": ""
       }
     },
     {
@@ -24219,7 +24294,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": "(全域)"
+        "zh_TW": ""
       }
     },
     {
@@ -24244,7 +24319,7 @@
         "tr_TR": "",
         "uk_UA": "Оберіть DLC які бажаєте вилучити",
         "zh_CN": "选择一个要解压的 DLC",
-        "zh_TW": "選擇要提取的 DLC"
+        "zh_TW": ""
       }
     },
     {
@@ -24269,7 +24344,7 @@
         "tr_TR": "",
         "uk_UA": "Зображення картки активності Discord",
         "zh_CN": "Rich Presence 图像",
-        "zh_TW": "Rich Presence 圖像"
+        "zh_TW": ""
       }
     },
     {
@@ -24294,7 +24369,7 @@
         "tr_TR": "",
         "uk_UA": "Динамічна картка активності Discord",
         "zh_CN": "动态 Rich Presence",
-        "zh_TW": "動態 Rich Presence"
+        "zh_TW": ""
       }
     }
   ]

src/Ryujinx/Common/ApplicationHelper.cs

@@ -16,7 +16,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.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
+                (Nca updatePatchNca, _) = mainNca.GetUpdateData(_virtualFileSystem, ConfigurationState.Instance.System.IntegrityCheckLevel, programIndex, out _);
-                    ? IntegrityCheckLevel.ErrorOnInvalid
-                    : IntegrityCheckLevel.None;
-
-                (Nca updatePatchNca, _) = mainNca.GetUpdateData(_virtualFileSystem, checkLevel, 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, [CompatibilityDatabase.Entries.Length] },
+                { LocaleKeys.CompatibilityListTitle, [CompatibilityDatabase.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

@@ -24,4 +24,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/Common/XCITrimmerLog.cs

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

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -2,7 +2,8 @@ using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -11,7 +12,6 @@ using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.Graphics.GAL;
-using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
 using Ryujinx.HLE;

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

@@ -5,10 +5,12 @@ using Gommon;
 using Projektanker.Icons.Avalonia;
 using Projektanker.Icons.Avalonia.FontAwesome;
 using Projektanker.Icons.Avalonia.MaterialDesign;
+using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.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 +284,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/Ryujinx.csproj

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

src/Ryujinx/Systems/AppHost.cs

@@ -6,7 +6,6 @@ using Avalonia.Threading;
 using DiscordRPC;
 using LibHac.Common;
 using LibHac.Ns;
-using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.Dummy;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -21,8 +20,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.Systems.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -35,11 +34,9 @@ using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
-using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
-using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
 using SkiaSharp;
@@ -62,7 +59,7 @@ using Size = Avalonia.Size;
 using Switch = Ryujinx.HLE.Switch;
 using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
-namespace Ryujinx.Ava
+namespace Ryujinx.Ava.Systems
 {
     internal class AppHost
     {
@@ -470,7 +467,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 +869,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 +878,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/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;
-using Ryujinx.Ava.Utilities.PlayReport;
+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
     {
@@ -36,7 +36,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             {
                 _id = value;
 
-                Compatibility = CompatibilityCsv.Find(value);
+                Compatibility = CompatibilityDatabase.Find(value);
                 RichPresenceSpec = PlayReports.Analyzer.TryGetSpec(IdString, out GameSpec gameSpec) 
                     ? gameSpec 
                     : default(Optional<GameSpec>);

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;
-using Ryujinx.Ava.Utilities.Configuration.System;
+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,6 @@
 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/CompatibilityDatabase.cs

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

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.Systems.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -8,14 +8,14 @@ using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
 using System.Collections.Generic;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public class ConfigurationFileFormat
     {
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 67;
+        public const int CurrentVersion = 68;
 
         /// <summary>
         /// Version of the configuration file format

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.Systems.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+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;
           
@@ -161,9 +160,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 DirtyHacks hacks = new (cff.DirtyHacks ?? []);
 
                 Hacks.Xc2MenuSoftlockFix.Value = hacks.IsEnabled(DirtyHack.Xc2MenuSoftlockFix);
-
+                
-                Hacks.EnableShaderTranslationDelay.Value = hacks.IsEnabled(DirtyHack.ShaderTranslationDelay);
-                Hacks.ShaderTranslationDelay.Value = hacks[DirtyHack.ShaderTranslationDelay].CoerceAtLeast(0);
             }
 
             if (configurationFileUpdated)
@@ -442,6 +439,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 (65, static cff => cff.UpdateCheckerType = cff.CheckUpdatesOnStart ? UpdaterType.PromptAtStartup : UpdaterType.Off),
                 (66, static cff => cff.DisableInputWhenOutOfFocus = false),
                 (67, static cff => cff.FocusLostActionType = cff.DisableInputWhenOutOfFocus ? FocusLostType.BlockInput : FocusLostType.DoNothing)
+                // 68 was the version that added per-game configs; the file structure did not change
+                // the version was increased so external tools could know that your Ryujinx version has per-game config capabilities.
             );
     }
 }

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.Systems.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -11,12 +11,11 @@ using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
-using Ryujinx.HLE.HOS.SystemState;
 using System.Collections.Generic;
 using System.Linq;
 using RyuLogger = Ryujinx.Common.Logging.Logger;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public partial class ConfigurationState
     {
@@ -352,6 +351,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>
@@ -680,18 +683,15 @@ namespace Ryujinx.Ava.Utilities.Configuration
             
             public ReactiveObject<bool> Xc2MenuSoftlockFix { get; private set; }
             
-            public ReactiveObject<bool> EnableShaderTranslationDelay { get; private set; }
+            public ReactiveObject<bool> DisableNifmIsAnyInternetRequestAccepted { get; private set; }
-            
-            public ReactiveObject<int> ShaderTranslationDelay { get; private set; }
 
             public HacksSection()
             {
                 ShowDirtyHacks = new ReactiveObject<bool>();
                 Xc2MenuSoftlockFix = new ReactiveObject<bool>();
                 Xc2MenuSoftlockFix.Event += HackChanged;
-                EnableShaderTranslationDelay = new ReactiveObject<bool>();
+                DisableNifmIsAnyInternetRequestAccepted = new ReactiveObject<bool>();
-                EnableShaderTranslationDelay.Event += HackChanged;
+                DisableNifmIsAnyInternetRequestAccepted.Event += HackChanged;
-                ShaderTranslationDelay = new ReactiveObject<int>();
             }
 
             private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
@@ -722,8 +722,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     if (Xc2MenuSoftlockFix)
                         Apply(DirtyHack.Xc2MenuSoftlockFix);
                     
-                    if (EnableShaderTranslationDelay)
+                    if (DisableNifmIsAnyInternetRequestAccepted)
-                        Apply(DirtyHack.ShaderTranslationDelay, ShaderTranslationDelay);
+                        Apply(DirtyHack.NifmServiceDisableIsAnyInternetRequestAccepted);
                     
                     return enabledHacks.ToArray();
 
@@ -779,11 +779,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 +801,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 +824,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,
+                System.Language.Value.ToHLE(),
-                (RegionCode)System.Region.Value,
+                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.Systems.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+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/DiscordIntegrationModule.cs

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

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/Systems/Rebooter.cs

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

src/Ryujinx/Systems/Updater.cs

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

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

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

src/Ryujinx/UI/Helpers/ApplicationOpenedEventArgs.cs

@@ -1,5 +1,5 @@
 using Avalonia.Interactivity;
-using Ryujinx.Ava.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/IconColorPicker.cs

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

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

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

src/Ryujinx/UI/RyujinxApp.axaml.cs

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

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -3,9 +3,8 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 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.Systems.AppLibrary;
-using Ryujinx.Ava.Utilities.PlayReport;
+using Ryujinx.Ava.Systems.PlayReport;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {

src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs

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

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

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

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

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

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

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

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Media;
-using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -17,14 +16,15 @@ using LibHac.Ns;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
+using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Models.Generic;
 using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
@@ -46,7 +46,6 @@ using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Key = Ryujinx.Input.Key;
@@ -137,13 +136,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 +1786,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
 {
@@ -16,11 +16,12 @@ namespace Ryujinx.Ava.UI.ViewModels
         }
 
         [ObservableProperty] private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
+        [ObservableProperty] private bool _nifmDisableIsAnyInternetRequestAccepted = ConfigurationState.Instance.Hacks.DisableNifmIsAnyInternetRequestAccepted;
         
         public static string Xc2MenuFixTooltip { get; } = Lambda.String(sb =>
         {
             sb.AppendLine(
-                    "This fix applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
+                    "This hack applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
                 .AppendLine();
             
             sb.AppendLine("From the issue on GitHub:").AppendLine();
@@ -29,5 +30,14 @@ namespace Ryujinx.Ava.UI.ViewModels
                 "there is a low chance that the game will softlock, " +
                 "the submenu won't show up, while background music is still there.");
         });
+        
+        public static string NifmDisableIsAnyInternetRequestAcceptedTooltip { get; } = Lambda.String(sb =>
+        {
+            sb.AppendLine(
+                    "This hack simply sets 'IsAnyInternetRequestAccepted' to 'false' when initializing the Nifm IGeneralService.")
+                .AppendLine();
+
+            sb.Append("Lets DOOM 2016 go in game.");
+        });
     }
 }

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -12,9 +12,9 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.Utilities.Configuration.System;
+using Ryujinx.Ava.Systems.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+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;
@@ -760,6 +757,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // Dirty Hacks
             config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFix;
+            config.Hacks.DisableNifmIsAnyInternetRequestAccepted.Value =
+                DirtyHacks.NifmDisableIsAnyInternetRequestAccepted;
 
             config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
 

src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs

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

src/Ryujinx/UI/Views/Dialog/AboutView.axaml

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

src/Ryujinx/UI/Views/Dialog/AboutView.axaml.cs

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

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

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

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

@@ -2,19 +2,17 @@
 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.Systems.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Misc
+namespace Ryujinx.Ava.UI.Views.Dialog
 {
     public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
     {
@@ -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/Dialog/DlcSelectView.axaml

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

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

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

src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml

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

src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml.cs

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

src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml

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

src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml.cs

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

src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml

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

src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml.cs

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

src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml

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

src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml.cs

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

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

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