Merge e36f6527b7 into a23c6bf547

Unify "Enable"
Update TChinese translation
2025-03-05 03:39:57 +02:00 · 2025-03-01 18:30:08 +08:00 · 2025-03-01 18:28:09 +08:00
30 changed files with 281 additions and 476 deletions
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -470,7 +470,7 @@ namespace Ryujinx.Ava

            Dispatcher.UIThread.InvokeAsync(() =>
            {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
            });

            _viewModel.SetUiProgressHandlers(Device);
@@ -872,7 +872,7 @@ namespace Ryujinx.Ava
            Device?.System.TogglePauseEmulation(false);

            _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
        }

@@ -881,7 +881,7 @@ namespace Ryujinx.Ava
            Device?.System.TogglePauseEmulation(true);

            _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
        }

--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -440,7 +440,7 @@
        <x:Double x:Key="ControlContentThemeFontSize">13</x:Double>
        <x:Double x:Key="MenuItemHeight">26</x:Double>
        <x:Double x:Key="TabItemMinHeight">28</x:Double>
-        <x:Double x:Key="ContentDialogMaxWidth">700</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
        <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
    </Styles.Resources>
 </Styles>
--- a/src/Ryujinx/Assets/locales.json
+++ b/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": ""
+        "zh_TW": "開啟遊戲時隱藏 UI"
      }
    },
    {
@@ -1569,7 +1569,7 @@
        "tr_TR": "",
        "uk_UA": "Розроблено: {0}",
        "zh_CN": "由 {0} 开发",
-        "zh_TW": ""
+        "zh_TW": "由 {0} 開發"
      }
    },
    {
@@ -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": ""
+        "zh_TW": "標題 ID:"
      }
    },
    {
@@ -1919,7 +1919,7 @@
        "tr_TR": "",
        "uk_UA": "Розміщені ігри: {0}",
        "zh_CN": "服务的游戏: {0}",
-        "zh_TW": ""
+        "zh_TW": "LDN 上主持的遊戲數量: {0}"
      }
    },
    {
@@ -1944,7 +1944,7 @@
        "tr_TR": "",
        "uk_UA": "Гравців онлайн: {0}",
        "zh_CN": "在线玩家: {0}",
-        "zh_TW": ""
+        "zh_TW": "LDN 上在線的玩家數量: {0}"
      }
    },
    {
@@ -2294,7 +2294,7 @@
        "tr_TR": "",
        "uk_UA": "Очистити кеш PPTC",
        "zh_CN": "清理 PPTC 缓存",
-        "zh_TW": ""
+        "zh_TW": "清除 PPTC"
      }
    },
    {
@@ -2319,7 +2319,7 @@
        "tr_TR": "",
        "uk_UA": "Видаляє всі файли кешу PPTC для застосунку",
        "zh_CN": "删除应用程序的所有 PPTC 缓存",
-        "zh_TW": ""
+        "zh_TW": "清除應用程式的 PPTC"
      }
    },
    {
@@ -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": ""
+        "zh_TW": "從已選擇的 DLC 檔案中提取 RomFS"
      }
    },
    {
@@ -2769,7 +2769,7 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "建立遊戲獨立自訂 (per-game) 設定檔"
      }
    },
    {
@@ -2794,7 +2794,7 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "編輯遊戲獨立自訂 (per-game) 設定檔"
      }
    },
    {
@@ -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": "為當前遊戲創建獨立的配置"
+        "zh_TW": "為已選擇的遊戲建立遊戲獨立自訂 (game-specific) 的設定檔"
      }
    },
    {
@@ -2869,7 +2869,7 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "為已選擇的遊戲編輯遊戲獨立自訂 (game-specific) 的設定檔"
      }
    },
    {
@@ -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,57 +3819,32 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "在后台时禁用输入",
-        "zh_TW": ""
+        "zh_TW": "在「失去焦點」時停用輸入"
      }
    },
    {
-      "ID": "SettingsTabGeneralShowOldUI",
+      "ID": "SettingsTabGeneralShowTitleBar",
      "Translations": {
        "ar_SA": "",
        "de_DE": "",
        "el_GR": "",
-        "en_US": "Show Original UI Style (Requires restart)",
-        "es_ES": "",
-        "fr_FR": "",
+        "en_US": "Show Title Bar (Requires restart)",
+        "es_ES": "Mostrar Barra de Título (Requiere reinicio)",
+        "fr_FR": "Afficher Barre de Titre (Nécessite redémarrage)",
        "he_IL": "",
-        "it_IT": "",
+        "it_IT": "Mostra barra del titolo (Richiede il riavvio)",
        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "Vis original UI-stil (krever omstart)",
+        "ko_KR": "제목 표시줄 표시(다시 시작해야 함)",
+        "no_NO": "Vis tittellinje (krever omstart)",
        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
+        "pt_BR": "Mostrar Barra de Título (Requer reinicialização)",
+        "ru_RU": "Показать строку заголовка (требуется перезапуск)",
+        "sv_SE": "Visa titelrad (kräver omstart)",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "SettingsTabGeneralShowOldUIToolTip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Show the older Avalonia Ryujinx UI reminiscent of Ryujinx 1.1.1403. This is enabled by default on platforms that are not Windows.\nThe classic-style title bar is back and major window layout reworkings are reversed; such as the settings navigation placement above this tooltip.",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "Vis det eldre Avalonia Ryujinx-grensesnittet som minner om Ryujinx 1.1.1403. Dette er aktivert som standard på plattformer som ikke er Windows.\nTittellinjen i klassisk stil er tilbake, og store omarbeidinger av vindusoppsettet er reversert, for eksempel plasseringen av innstillingsnavigasjonen over dette verktøytipset.",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
+        "uk_UA": "Показувати рядок заголовка (Потрібен перезапуск)",
+        "zh_CN": "显示标题栏 (需要重启)",
+        "zh_TW": "顯示「標題列」 (需要重新開啟Ryujinx)"
      }
    },
    {
@@ -4869,7 +4844,7 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "与系统时间同步",
-        "zh_TW": ""
+        "zh_TW": "與系統時間同步"
      }
    },
    {
@@ -5294,7 +5269,7 @@
        "tr_TR": "",
        "uk_UA": "Ігнорувати Аплет Контролера",
        "zh_CN": "忽略控制器小程序",
-        "zh_TW": ""
+        "zh_TW": "忽略控制器小程式"
      }
    },
    {
@@ -6144,7 +6119,7 @@
        "tr_TR": "",
        "uk_UA": "Увімкнути журнали інтерфейсу",
        "zh_CN": "启用 UI 日志",
-        "zh_TW": ""
+        "zh_TW": "啟用 UI 日誌"
      }
    },
    {
@@ -6544,7 +6519,7 @@
        "tr_TR": "",
        "uk_UA": "Скинути налаштування",
        "zh_CN": "重置设置",
-        "zh_TW": ""
+        "zh_TW": "重設設定"
      }
    },
    {
@@ -6569,7 +6544,7 @@
        "tr_TR": "",
        "uk_UA": "Я хочу скинути налаштування.",
        "zh_CN": "我要重置我的设置。",
-        "zh_TW": ""
+        "zh_TW": "我想重設我的設定。"
      }
    },
    {
@@ -8494,7 +8469,7 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "关闭",
-        "zh_TW": ""
+        "zh_TW": "關閉"
      }
    },
    {
@@ -8519,7 +8494,7 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "彩虹",
-        "zh_TW": ""
+        "zh_TW": "彩虹"
      }
    },
    {
@@ -8544,7 +8519,7 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "彩虹滚动速度",
-        "zh_TW": ""
+        "zh_TW": "彩虹滾動速度"
      }
    },
    {
@@ -8569,7 +8544,7 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "颜色",
-        "zh_TW": ""
+        "zh_TW": "顏色"
      }
    },
    {
@@ -13844,7 +13819,7 @@
        "tr_TR": "",
        "uk_UA": "Ви збираєтесь видалити всі дані PPTC з:\n\n{0}\n\nБажаєте продовжити цю операцію?",
        "zh_CN": "您正要清理 PPTC 数据:\n\n{0}\n\n您确实要继续吗?",
-        "zh_TW": ""
+        "zh_TW": "您將要刪除以下遊戲的 PPTC:\n\n{0}\n\n您確定要繼續嗎?"
      }
    },
    {
@@ -16694,7 +16669,7 @@
        "tr_TR": "",
        "uk_UA": "Діалогове вікно Аплету Контролера не з'явиться, якщо геймпад було відключено під час роботи програми.\n\nЗалиште вимкненим якщо не впевнені.",
        "zh_CN": "在应用程序运行时如果游戏手柄断开连接则不会显示控制器小程序对话框。\n\n如果不确定，请保持关闭状态。",
-        "zh_TW": ""
+        "zh_TW": "在模擬應用程式時如果遊戲手柄中斷連線則不會顯示控制器小程式。\n\n如果不確定，請保持關閉狀態。"
      }
    },
    {
@@ -17169,7 +17144,7 @@
        "tr_TR": "",
        "uk_UA": "Виводити повідомлення журналу Avalonia (UI) в консоль",
        "zh_CN": "在控制台显示 Avalonia (UI) 的日志信息",
-        "zh_TW": ""
+        "zh_TW": "在控制台中輸出 Avalonia (UI) 日誌訊息。"
      }
    },
    {
@@ -17369,7 +17344,7 @@
        "tr_TR": "",
        "uk_UA": "Відкрити теку куди зберігаються скріншоти Ryujinx",
        "zh_CN": "打开 Ryujinx 截图文件夹",
-        "zh_TW": ""
+        "zh_TW": "開啟 Ryujinx 螢幕擷取畫面資料夾"
      }
    },
    {
@@ -18119,7 +18094,7 @@
        "tr_TR": "",
        "uk_UA": "Доступне оновлення!",
        "zh_CN": "有可用的更新！",
-        "zh_TW": ""
+        "zh_TW": "有可用的更新！"
      }
    },
    {
@@ -19944,7 +19919,7 @@
        "tr_TR": "",
        "uk_UA": "Налаштування LED",
        "zh_CN": "LED 设置",
-        "zh_TW": ""
+        "zh_TW": "LED 設定"
      }
    },
    {
@@ -21794,7 +21769,7 @@
        "tr_TR": "Yeniden Doku Sıkıştırılmasını Aktif Et",
        "uk_UA": "Увімкнути рекомпресію текстури",
        "zh_CN": "启用纹理压缩",
-        "zh_TW": "開啟材質重新壓縮"
+        "zh_TW": "啟用材質重新壓縮"
      }
    },
    {
@@ -23847,31 +23822,6 @@
        "zh_TW": "上次更新時間: {0}"
      }
    },
-    {
-      "ID": "CompatibilityListTitle",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Compatibility List - {0} entries",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
    {
      "ID": "CompatibilityListWarning",
      "Translations": {
@@ -23922,31 +23872,6 @@
        "zh_TW": "搜尋相容性列表紀錄..."
      }
    },
-    {
-      "ID": "CompatibilityListSearchBoxWatermarkWithCount",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Search {0} compatibility entries...",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "Søk i {0} kompatibilitetsoppføringer...",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
    {
      "ID": "CompatibilityListOpen",
      "Translations": {
@@ -24144,7 +24069,7 @@
        "tr_TR": "",
        "uk_UA": "Запускається та оптимально працює (без збоїв або графічних багів) на середньостатистичному комп'ютері.",
        "zh_CN": "启动和游戏时不会出现任何崩溃或任何类型的 GPU bug 且速度足够快可以在一般 PC 上尽情游玩。",
-        "zh_TW": ""
+        "zh_TW": "啟動和遊玩時不會出現任何崩潰或任何類型的 GPU bug 且速度足夠快可以在一般 PC 上盡情遊玩。"
      }
    },
    {
@@ -24169,7 +24094,7 @@
        "tr_TR": "",
        "uk_UA": "Запускається, але в грі на вас чекатимуть одна або декілька наступних проблем: збої, зависання, графічні баги, спотворений звук або ж гра загалом працюватиме надто повільно. Можливо, її все ще можна пройти, але досвід буде не найкращим.",
        "zh_CN": "可以成功启动并进入游戏但可能会遇到以下一种或多种问题: 崩溃、卡死、GPU bug、令人无法接受的音频,或者只是太慢。仍然可以继续进行游戏,但是可能无法达到预期。",
-        "zh_TW": ""
+        "zh_TW": "能啟動並進入遊戲，但可能會遇到下列狀況：崩潰、卡死、GPU bug、令人無法接受的聲音、或遊戲過慢。遊戲或可繼續進行，但是可能無法達到預期效果。"
      }
    },
    {
@@ -24194,7 +24119,7 @@
        "tr_TR": "",
        "uk_UA": "Запускається та проходить початковий екран, але пограти не вийде.",
        "zh_CN": "可以启动并通过标题画面但是无法进入到主要的游戏流程。",
-        "zh_TW": ""
+        "zh_TW": "能啟動並通過標題畫面，但是無法進入主要的遊戲畫面。"
      }
    },
    {
@@ -24219,7 +24144,7 @@
        "tr_TR": "",
        "uk_UA": "Запускається, але не відображає навіть початкового екрану.",
        "zh_CN": "可以启动但是无法通过标题画面。",
-        "zh_TW": ""
+        "zh_TW": "能啟動，但是無法通過標題畫面。"
      }
    },
    {
@@ -24244,7 +24169,7 @@
        "tr_TR": "",
        "uk_UA": "Взагалі не запускається.",
        "zh_CN": "无法启动或显示无任何动静。",
-        "zh_TW": ""
+        "zh_TW": "無法啟動"
      }
    },
    {
@@ -24269,7 +24194,7 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "遊戲獨立自訂 (game-specific) 設定"
      }
    },
    {
@@ -24294,7 +24219,7 @@
        "tr_TR": "",
        "uk_UA": "",
        "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "(全域)"
      }
    },
    {
@@ -24319,7 +24244,7 @@
        "tr_TR": "",
        "uk_UA": "Оберіть DLC які бажаєте вилучити",
        "zh_CN": "选择一个要解压的 DLC",
-        "zh_TW": ""
+        "zh_TW": "選擇要提取的 DLC"
      }
    },
    {
@@ -24344,7 +24269,7 @@
        "tr_TR": "",
        "uk_UA": "Зображення картки активності Discord",
        "zh_CN": "Rich Presence 图像",
-        "zh_TW": ""
+        "zh_TW": "Rich Presence 圖像"
      }
    },
    {
@@ -24369,7 +24294,7 @@
        "tr_TR": "",
        "uk_UA": "Динамічна картка активності Discord",
        "zh_CN": "动态 Rich Presence",
-        "zh_TW": ""
+        "zh_TW": "動態 Rich Presence"
      }
    }
  ]
--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -1,5 +1,4 @@
 using Gommon;
-using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
@@ -26,21 +25,7 @@ namespace Ryujinx.Ava.Common.Locale
        public LocaleManager()
        {
            _localeStrings = new Dictionary<LocaleKeys, string>();
-            _dynamicValues = new ConcurrentDictionary<LocaleKeys, object[]>(new Dictionary<LocaleKeys, object[]>
-            {
-                { LocaleKeys.DialogConfirmationTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogUpdaterTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogErrorTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogWarningTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogExitTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.DialogStopEmulationTitle, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxInfo, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxConfirm, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxUpdater, [RyujinxApp.FullAppName] },
-                { LocaleKeys.RyujinxRebooter, [RyujinxApp.FullAppName] },
-                { LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, [CompatibilityCsv.Entries.Length] },
-                { LocaleKeys.CompatibilityListTitle, [CompatibilityCsv.Entries.Length] }
-            });
+            _dynamicValues = new ConcurrentDictionary<LocaleKeys, object[]>();

            Load();
        }
@@ -59,6 +44,17 @@ 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]
--- a/src/Ryujinx/Common/Markup/MarkupExtensions.cs
+++ b/src/Ryujinx/Common/Markup/MarkupExtensions.cs
@@ -1,5 +1,4 @@
 using Avalonia.Markup.Xaml.MarkupExtensions;
-using Humanizer;
 using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;

@@ -25,17 +24,4 @@ namespace Ryujinx.Ava.Common.Markup
        protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
            => bindingExtension.Source = LocaleManager.Instance;
    }
-    
-    internal class WindowTitleExtension(LocaleKeys key, bool includeVersion) : BasicMarkupExtension<string>
-    {
-        public WindowTitleExtension(LocaleKeys key) : this(key, true)
-        {
-        }
-        
-        public override string Name => "WindowTitleTranslation";
-        protected override string Value => RyujinxApp.FormatTitle(key, includeVersion);
-
-        protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 
-            => bindingExtension.Source = LocaleManager.Instance;
-    }
 }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
@@ -46,11 +46,12 @@ namespace Ryujinx.Ava.Systems.Configuration
            
          
            EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
+            CheckUpdatesOnStart.Value = shouldLoadFromFile ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
            UpdateCheckerType.Value = shouldLoadFromFile ? cff.UpdateCheckerType : UpdateCheckerType.Value; // Get from global config only
            FocusLostActionType.Value = cff.FocusLostActionType;
            ShowConfirmExit.Value = shouldLoadFromFile ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
            RememberWindowState.Value = shouldLoadFromFile ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
-            ShowOldUI.Value = shouldLoadFromFile ? cff.ShowTitleBar : ShowOldUI.Value; // Get from global config only
+            ShowTitleBar.Value = shouldLoadFromFile ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only
            EnableHardwareAcceleration.Value = shouldLoadFromFile ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
            HideCursor.Value = cff.HideCursor;
          
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
@@ -783,6 +783,11 @@ namespace Ryujinx.Ava.Systems.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.
@@ -805,9 +810,9 @@ namespace Ryujinx.Ava.Systems.Configuration
        public ReactiveObject<bool> RememberWindowState { get; private set; }

        /// <summary>
-        /// Disable the new title bar layout & window layout changes.
+        /// Enables or disables the redesigned title bar
        /// </summary>
-        public ReactiveObject<bool> ShowOldUI { get; private set; }
+        public ReactiveObject<bool> ShowTitleBar { get; private set; }

        /// <summary>
        /// Enables hardware-accelerated rendering for Avalonia
@@ -828,14 +833,15 @@ namespace Ryujinx.Ava.Systems.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>();
-            ShowOldUI = new ReactiveObject<bool>();
+            ShowTitleBar = new ReactiveObject<bool>();
            EnableHardwareAcceleration = new ReactiveObject<bool>();
+            HideCursor = new ReactiveObject<HideCursorMode>();
        }

        public HleConfiguration CreateHleConfiguration() =>
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
@@ -56,11 +56,12 @@ namespace Ryujinx.Ava.Systems.Configuration
                MatchSystemTime = System.MatchSystemTime,
                DockedMode = System.EnableDockedMode,
                EnableDiscordIntegration = EnableDiscordIntegration,
+                CheckUpdatesOnStart = CheckUpdatesOnStart,
                UpdateCheckerType = UpdateCheckerType,
                FocusLostActionType = FocusLostActionType,
                ShowConfirmExit = ShowConfirmExit,
                RememberWindowState = RememberWindowState,
-                ShowTitleBar = ShowOldUI,
+                ShowTitleBar = ShowTitleBar,
                EnableHardwareAcceleration = EnableHardwareAcceleration,
                HideCursor = HideCursor,
                VSyncMode = Graphics.VSyncMode,
@@ -182,7 +183,7 @@ namespace Ryujinx.Ava.Systems.Configuration
            FocusLostActionType.Value = FocusLostType.DoNothing;
            ShowConfirmExit.Value = true;
            RememberWindowState.Value = true;
-            ShowOldUI.Value = !OperatingSystem.IsWindows();
+            ShowTitleBar.Value = !OperatingSystem.IsWindows();
            EnableHardwareAcceleration.Value = true;
            HideCursor.Value = HideCursorMode.OnIdle;
            Graphics.VSyncMode.Value = VSyncMode.Switch;
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -407,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 CompatibilityListWindow.Show(viewModel.SelectedApplication.IdString);
+                await CompatibilityList.Show(viewModel.SelectedApplication.IdString);
        }
               
        public async void OpenApplicationData_Click(object sender, RoutedEventArgs args)
--- a/src/Ryujinx/UI/Controls/RyujinxLogo.cs
+++ b/src/Ryujinx/UI/Controls/RyujinxLogo.cs
@@ -1,29 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Layout;
-using Avalonia.Media.Imaging;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.ViewModels;
-using System.Reflection;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public class RyujinxLogo : Image
-    {
-        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
-        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
-        // The border gets reduced to colored pixels in the 4 corners.
-        public static readonly Bitmap Bitmap =
-            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
-                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
-        
-        public RyujinxLogo()
-        {
-            Margin = new Thickness(7, 7, 7, 0);
-            Height = 25;
-            Width = 25;
-            Source = Bitmap;
-            IsVisible = !ConfigurationState.Instance.ShowOldUI;
-        }
-    }
-}
--- a/src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs
@@ -1,7 +1,6 @@
 using Gommon;
 using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Windows;
 using System.Collections.Generic;
 using System.Linq;

--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -137,6 +137,13 @@ namespace Ryujinx.Ava.UI.ViewModels
        // Key is Title ID
        public SafeDictionary<string, LdnGameData.Array> LdnData = [];

+        // The UI specifically uses a thicker bordered variant of the icon to avoid crunching out the border at lower resolutions.
+        // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
+        // The border gets reduced to colored pixels in the 4 corners.
+        public static readonly Bitmap IconBitmap =
+            new(Assembly.GetAssembly(typeof(MainWindowViewModel))!
+                .GetManifestResourceStream("Ryujinx.Assets.UIImages.Logo_Ryujinx_AntiAlias.png")!);
+
        public MainWindow Window { get; init; }

        internal AppHost AppHost { get; set; }
@@ -1787,7 +1794,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            if (WindowState is not WindowState.Normal)
            {
                WindowState = WindowState.Normal;
-                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowOldUI;
+                Window.TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;

                if (IsGameRunning)
                {
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -130,10 +130,11 @@ namespace Ryujinx.Ava.UI.ViewModels
        public bool IsOpenGLAvailable => !OperatingSystem.IsMacOS();

        public bool EnableDiscordIntegration { get; set; }
+        public bool CheckUpdatesOnStart { get; set; }
        public bool ShowConfirmExit { get; set; }
        public bool IgnoreApplet { get; set; }
        public bool RememberWindowState { get; set; }
-        public bool ShowOldUI { get; set; }
+        public bool ShowTitleBar { get; set; }
        public int HideCursor { get; set; }
        public int UpdateCheckerType { get; set; }
        public bool EnableDockedMode { get; set; }
@@ -536,9 +537,10 @@ namespace Ryujinx.Ava.UI.ViewModels

            // User Interface
            EnableDiscordIntegration = config.EnableDiscordIntegration;
+            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
            ShowConfirmExit = config.ShowConfirmExit;
            RememberWindowState = config.RememberWindowState;
-            ShowOldUI = config.ShowOldUI;
+            ShowTitleBar = config.ShowTitleBar;
            HideCursor = (int)config.HideCursor.Value;
            UpdateCheckerType = (int)config.UpdateCheckerType.Value;
            FocusLostActionType = (int)config.FocusLostActionType.Value;
@@ -644,9 +646,10 @@ namespace Ryujinx.Ava.UI.ViewModels

            // User Interface
            config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
+            config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
            config.ShowConfirmExit.Value = ShowConfirmExit;
            config.RememberWindowState.Value = RememberWindowState;
-            config.ShowOldUI.Value = ShowOldUI;
+            config.ShowTitleBar.Value = ShowTitleBar;
            config.HideCursor.Value = (HideCursorMode)HideCursor;
            config.UpdateCheckerType.Value = (UpdaterType)UpdateCheckerType;
            config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType;
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -6,16 +6,18 @@
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    mc:Ignorable="d"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    x:DataType="viewModels:MainWindowViewModel"
    x:Class="Ryujinx.Ava.UI.Views.Main.MainMenuBarView">
    <Design.DataContext>
        <viewModels:MainWindowViewModel />
    </Design.DataContext>
    <DockPanel HorizontalAlignment="Stretch">
-        <controls:RyujinxLogo 
-            Margin="7, 0" 
-            ToolTip.Tip="{Binding Title}"/>
+        <Image
+            Name="RyuLogo"
+            Margin="7, 0"
+            Height="25"
+            Width="25"
+            ToolTip.Tip="{Binding Title}" />
        <Menu
            Name="Menu"
            Height="32"
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -34,6 +34,9 @@ namespace Ryujinx.Ava.UI.Views.Main
        {
            InitializeComponent();

+            RyuLogo.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
+            RyuLogo.Source = MainWindowViewModel.IconBitmap;
+
            ToggleFileTypesMenuItem.ItemsSource = GenerateToggleFileTypeItems();
            ChangeLanguageMenuItem.ItemsSource = GenerateLanguageMenuItems();

@@ -48,7 +51,7 @@ namespace Ryujinx.Ava.UI.Views.Main
            UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
            XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
            AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
-            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityListWindow.Show());
+            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());

            UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;

@@ -223,7 +226,7 @@ namespace Ryujinx.Ava.UI.Views.Main

            // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
            double barsHeight = ((Window.StatusBarHeight + Window.MenuBarHeight) +
-                (ConfigurationState.Instance.ShowOldUI ? (int)Window.TitleBar.Height : 0));
+                (ConfigurationState.Instance.ShowTitleBar ? (int)Window.TitleBar.Height : 0));

            double windowWidthScaled = (resolutionWidth * Program.WindowScaleFactor);
            double windowHeightScaled = ((resolutionHeight + barsHeight) * Program.WindowScaleFactor);
--- a/src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml.cs
@@ -44,18 +44,21 @@ namespace Ryujinx.Ava.UI.Views.Misc
            if (RyujinxApp.AppLifetime.Windows.TryGetFirst(x => x is ContentDialogOverlayWindow, out Window window))
                window.Close(ContentDialogResult.None);
            
-            await CompatibilityListWindow.Show((string)playabilityLabel.Tag);
+            await CompatibilityList.Show((string)playabilityLabel.Tag);
        }

        private async void IdString_OnClick(object sender, RoutedEventArgs e)
        {
+            if (DataContext is not MainWindowViewModel mwvm)
+                return;
+            
            if (sender is not Button { Content: TextBlock idText })
                return;

            if (!RyujinxApp.IsClipboardAvailable(out IClipboard clipboard))
                return;
            
-            ApplicationData appData = RyujinxApp.MainWindow.ViewModel.Applications.FirstOrDefault(it => it.IdString == idText.Text);
+            ApplicationData appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
            if (appData is null)
                return;
            
--- a/src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml.cs
@@ -6,7 +6,6 @@ using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Windows;
 using System;
 using System.Linq;

@@ -36,7 +35,7 @@ namespace Ryujinx.Ava.UI.Views.Misc
            if (sender is not Button { Content: TextBlock playabilityLabel })
                return;

-            await CompatibilityListWindow.Show((string)playabilityLabel.Tag);
+            await CompatibilityList.Show((string)playabilityLabel.Tag);
        }

        private async void IdString_OnClick(object sender, RoutedEventArgs e)
--- a/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml
+++ b/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml
@@ -1,82 +1,82 @@
-<window:StyleableAppWindow xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:helpers="using:Ryujinx.Ava.UI.Helpers"
             xmlns:ext="using:Ryujinx.Ava.Common.Markup"
+             xmlns:ui="using:FluentAvalonia.UI.Controls"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
             xmlns:systems="clr-namespace:Ryujinx.Ava.Systems"
-             xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
-             xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
-             CanResize="False"
-             mc:Ignorable="d"
-             MinWidth="800"
-             MinHeight="745"
-             x:Class="Ryujinx.Ava.UI.Windows.CompatibilityListWindow"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.CompatibilityList"
             x:DataType="viewModels:CompatibilityViewModel">
-    <window:StyleableAppWindow.DataContext>
+    <UserControl.DataContext>
        <viewModels:CompatibilityViewModel />
-    </window:StyleableAppWindow.DataContext>
-    <Grid RowDefinitions="Auto,*">
-        <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto" Name="FlushControls">
-            <controls:RyujinxLogo 
+    </UserControl.DataContext>
+    <Grid RowDefinitions="*,Auto,*">
+        <Grid 
+            Grid.Row="0"
+            HorizontalAlignment="Center"
+            ColumnDefinitions="Auto,*"
+            Margin="0 0 0 10">
+            <ui:FontIcon
                Grid.Column="0"
-                Margin="15, 0, 7, 0"
-                ToolTip.Tip="{ext:WindowTitle CompatibilityListTitle, False}"/>
-            <TextBox Name="SearchBoxFlush" Grid.Column="1" Margin="0, 5, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermarkWithCount}" TextChanged="TextBox_OnTextChanged" />
-            <CheckBox Grid.Column="2" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
-            <TextBlock Grid.Column="3" Padding="0, 0, 138, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
+                Margin="0"
+                HorizontalAlignment="Stretch"
+                FontFamily="avares://FluentAvalonia/Fonts#Symbols"
+                Glyph="{helpers:GlyphValueConverter Important}" />
+            <!-- NOTE: aligning to bottom for better visual alignment with glyph -->
+            <TextBlock
+                Grid.Column="1"
+                Margin="5, 0, 0, 0"
+                FontStyle="Italic"
+                VerticalAlignment="Center"
+                TextWrapping="Wrap"
+                Text="{ext:Locale CompatibilityListWarning}" />
        </Grid>
-        <Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto" Name="NormalControls">
-            <TextBox Name="SearchBoxNormal" Grid.Column="0" Margin="15, 0, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
+        <Grid Grid.Row="1" ColumnDefinitions="*,Auto,Auto">
+            <TextBox Name="SearchBox" Grid.Column="0" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
            <CheckBox Grid.Column="1" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
-            <TextBlock Grid.Column="2" Padding="0, 0, 1, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
+            <TextBlock Grid.Column="2" Margin="-10, 0, 0, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
        </Grid>
-        <ScrollViewer Grid.Row="1">
-                <ListBox Margin="12, 0, 13, 0"
+        <ScrollViewer Grid.Row="2">
+                <ListBox Margin="0,5, 0, 0"
                         Background="Transparent"
                         ItemsSource="{Binding CurrentEntries}">
                    <ListBox.ItemTemplate>
                        <DataTemplate DataType="{x:Type systems:CompatibilityEntry}">
-                            <Grid MinWidth="800"
-                                  Margin="10"
-                                  ColumnDefinitions="*,Auto,Auto,*"
+                            <Grid Width="750"
+                                  Margin="5"
+                                  ColumnDefinitions="Auto,Auto,Auto,*"
                                  Background="Transparent"
                                  ToolTip.Tip="{Binding  LocalizedLastUpdated}">
                                <TextBlock Grid.Column="0"
                                           Text="{Binding GameName}"
-                                           Width="525"
-                                           VerticalAlignment="Center"
-                                           HorizontalAlignment="Center"
+                                           Width="320"
                                           TextWrapping="Wrap" />
                                <TextBlock Grid.Column="1"
                                           Width="135"
                                           Padding="7, 0, 0, 0"
                                           FontFamily="{StaticResource JetBrainsMono}"
                                           Text="{Binding FormattedTitleId}"
-                                           VerticalAlignment="Center"
-                                           HorizontalAlignment="Center"
                                           TextWrapping="Wrap" />
                                <TextBlock Grid.Column="2"
                                           Padding="7, 0"
+                                           VerticalAlignment="Center"
                                           Text="{Binding LocalizedStatus}"
-                                           Width="90"
+                                           Width="85"
                                           Background="Transparent"
                                           ToolTip.Tip="{Binding LocalizedStatusDescription}"
                                           Foreground="{Binding Status, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
-                                           VerticalAlignment="Center"
-                                           HorizontalAlignment="Center"
                                           TextWrapping="NoWrap" />
                                <TextBlock Grid.Column="3"
-                                           Text="{Binding FormattedIssueLabels}"
                                           VerticalAlignment="Center"
-                                           HorizontalAlignment="Left"
+                                           Text="{Binding FormattedIssueLabels}"
                                           TextWrapping="WrapWithOverflow" />
                            </Grid>
                        </DataTemplate>
                    </ListBox.ItemTemplate>
                </ListBox>
        </ScrollViewer>
-        <Grid></Grid>
    </Grid>
-</window:StyleableAppWindow>
+</UserControl>
--- a/src/Ryujinx/UI/Views/Misc/CompatibilityList.axaml.cs
+++ b/src/Ryujinx/UI/Views/Misc/CompatibilityList.axaml.cs
@@ -0,0 +1,48 @@
+using Avalonia.Controls;
+using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.ViewModels;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.UI.Views.Misc
+{
+    public partial class CompatibilityList : UserControl
+    {
+        public static async Task Show(string titleId = null)
+        {
+            ContentDialog contentDialog = new()
+            {
+                PrimaryButtonText = string.Empty,
+                SecondaryButtonText = string.Empty,
+                CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
+                Content = new CompatibilityList
+                {
+                    DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary), 
+                    SearchBox = {
+                        Text = titleId ?? ""
+                    }
+                }
+            };
+
+            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());
+        }
+        
+        public CompatibilityList()
+        {
+            InitializeComponent();
+        }
+
+        private void TextBox_OnTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (DataContext is not CompatibilityViewModel cvm)
+                return;
+
+            if (sender is not TextBox searchBox)
+                return;
+        
+            cvm.Search(searchBox.Text);
+        }
+    }
+}
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -191,16 +191,16 @@
                        IsEnabled="{Binding !IsGameTitleNotNull}"
                        Opacity="{Binding PanelOpacity}"
                        Orientation="Horizontal">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"
+                            Width="250"/>
                        <CheckBox
                            VerticalAlignment="Center"
                            IsChecked="{Binding MatchSystemTime}"
-                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
-                            <TextBlock
-                                VerticalAlignment="Center"
-                                Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
-                                Width="250"/>
-                        </CheckBox>
-                        <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"/>
+                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                    </StackPanel>
                    <Separator />
                    <StackPanel Margin="0,10,0,10"
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -49,15 +49,14 @@
                        <StackPanel Orientation="Horizontal">
                            <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                        </StackPanel>
+                            </StackPanel>
                    </CheckBox>
                    <CheckBox
                        IsEnabled="{Binding !IsGameTitleNotNull}"
                        Opacity="{Binding PanelOpacity}"
-                        IsChecked="{Binding ShowOldUI}"
-                        ToolTip.Tip="{ext:Locale SettingsTabGeneralShowOldUIToolTip}">
+                        IsChecked="{Binding ShowTitleBar}" IsVisible="{x:Static helper:RunningPlatform.IsWindows}">
                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowOldUI}" />
+                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowTitleBar}" />
                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                        </StackPanel>
                    </CheckBox>
--- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
+++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
@@ -6,7 +6,6 @@
    xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    mc:Ignorable="d"
    d:DesignWidth="400"
    d:DesignHeight="350"
@@ -24,25 +23,7 @@
        <viewModels:AmiiboWindowViewModel />
    </Design.DataContext>
    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
-        <Grid Name="FlushControls" ColumnDefinitions="Auto,Auto" Grid.Row="1" Margin="-15">
-            <controls:RyujinxLogo 
-                Grid.Column="0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Top"
-                Margin="8, 8, 7, 0"
-                ToolTip.Tip="{ext:WindowTitle Amiibo}" />
-            <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0, 0, 0, 100">
-                <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
-                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
-                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
-                </StackPanel>
-                <StackPanel Margin="15, 0, 0, 0" Spacing="10" Orientation="Horizontal" >
-                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboCharacterLabel}" />
-                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding AmiiboSelectedIndex}" MinWidth="100" ItemsSource="{Binding AmiiboList}" />
-                </StackPanel>
-            </StackPanel>
-        </Grid>
-        <Grid Name="NormalControls" ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
+        <Grid ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
            <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
                <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
                <ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
--- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
@@ -1,14 +1,13 @@
 using Avalonia.Interactivity;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models.Amiibo;
-using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;

 namespace Ryujinx.Ava.UI.Windows
 {
    public partial class AmiiboWindow : StyleableAppWindow
    {
-        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId) : base(true, 40)
+        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId)
        {
            DataContext = ViewModel = new AmiiboWindowViewModel(this, lastScannedAmiiboId, titleId)
            {
@@ -17,9 +16,6 @@ namespace Ryujinx.Ava.UI.Windows

            InitializeComponent();

-            FlushControls.IsVisible = !ConfigurationState.Instance.ShowOldUI;
-            NormalControls.IsVisible = ConfigurationState.Instance.ShowOldUI;
-
            Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
        }

--- a/src/Ryujinx/UI/Windows/CheatWindow.axaml
+++ b/src/Ryujinx/UI/Windows/CheatWindow.axaml
@@ -6,7 +6,6 @@
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    Width="600"
    Height="750"
    MinWidth="500"
@@ -21,81 +20,38 @@
        </Style>
    </Window.Styles>
    <Grid Name="CheatGrid" Margin="15" RowDefinitions="Auto,Auto,Auto,*,Auto" ColumnDefinitions="*,*">
-        <Grid Name="FlushHeader" Grid.Row="1" Column="0" ColumnSpan="2" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="Auto,*,Auto,*">
-            <controls:RyujinxLogo
-                Grid.Row="0"
-                Grid.Column="0"
-                HorizontalAlignment="Left"
-                Margin="-7, -22, 7, 0"
-                Height="28"
-                Width="28"
-                ToolTip.Tip="{ext:WindowTitle CheatWindowTitle}"/>
-            <StackPanel Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2"
-                        Margin="7, -7, 0, 5"
-                        Orientation="Horizontal"
-                        VerticalAlignment="Center"
-                        HorizontalAlignment="Stretch">
-                <TextBlock
-                    MaxWidth="500"
-                    Margin="0,8,5,0"
-                    LineHeight="30"
-                    Text="{ext:Locale BuildId}"
-                    TextAlignment="Center"
-                    TextWrapping="Wrap" />
-                <TextBox
-                    Margin="0,0,0,0"
-                    MinWidth="135"
-                    Text="{Binding BuildId}"
-                    IsReadOnly="True" />
-            </StackPanel>
-            <TextBlock
-                Grid.Row="1"
-                Grid.Column="0"
-                Grid.ColumnSpan="4"
-                MaxWidth="500"
-                Margin="0,10,0,5"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                LineHeight="18"
-                Text="{Binding Heading}"
-                TextAlignment="Center"
-                TextWrapping="Wrap" />
-
-        </Grid>
-        <Grid Name="NormalHeader" Grid.Row="1" Column="0" ColumnSpan="2" RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*,*">
-            <TextBlock
-                Grid.Row="1"
-                Grid.Column="0"
-                Grid.ColumnSpan="2"
-                MaxWidth="500"
-                Margin="20,15,20,5"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                LineHeight="18"
-                Text="{Binding Heading}"
-                TextAlignment="Center"
-                TextWrapping="Wrap" />
-            <TextBlock
-                Grid.Row="2"
-                Grid.Column="0"
-                MaxWidth="500"
-                Margin="140,15,20,5"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                LineHeight="30"
-                Text="{ext:Locale BuildId}"
-                TextAlignment="Center"
-                TextWrapping="Wrap" />
-            <TextBox
-                Grid.Row="2"
-                Grid.Column="1"
-                Margin="0,5,110,5"
-                MinWidth="160"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Text="{Binding BuildId}"
-                IsReadOnly="True" />
-        </Grid>
+        <TextBlock
+            Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="2"
+            MaxWidth="500"
+            Margin="20,15,20,5"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            LineHeight="18"
+            Text="{Binding Heading}"
+            TextAlignment="Center"
+            TextWrapping="Wrap" />
+        <TextBlock
+            Grid.Row="2"
+            Grid.Column="0"
+            MaxWidth="500"
+            Margin="140,15,20,5"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            LineHeight="30"
+            Text="{ext:Locale BuildId}"
+            TextAlignment="Center"
+            TextWrapping="Wrap" />
+        <TextBox
+            Grid.Row="2"
+            Grid.Column="1"
+            Margin="0,5,110,5"
+            MinWidth="160"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Text="{Binding BuildId}"
+            IsReadOnly="True" />
        <Border
            Grid.Row="3"
            Grid.Column="0"
--- a/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
@@ -4,7 +4,6 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using System.Collections.Generic;
@@ -33,7 +32,7 @@ namespace Ryujinx.Ava.UI.Windows
            Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
        }

-        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath) : base(useCustomTitleBar: true, 46)
+        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
        {
            MinWidth = 500;
            MinHeight = 650;
@@ -45,9 +44,6 @@ namespace Ryujinx.Ava.UI.Windows

            InitializeComponent();

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

-        public MainWindow() : base(useCustomTitleBar: true)
+        public MainWindow()
        {
            DataContext = ViewModel = new MainWindowViewModel
            {
@@ -90,6 +90,9 @@ namespace Ryujinx.Ava.UI.Windows

            ViewModel.Title = RyujinxApp.FormatTitle();

+            TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
+            TitleBar.TitleBarHitTestType = (ConfigurationState.Instance.ShowTitleBar) ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
+
            // NOTE: Height of MenuBar and StatusBar is not usable here, since it would still be 0 at this point.
            StatusBarHeight = StatusBarView.StatusBar.MinHeight;
            MenuBarHeight = MenuBar.MinHeight;
@@ -97,7 +100,7 @@ namespace Ryujinx.Ava.UI.Windows
            TitleBar.Height = MenuBarHeight;
            
            // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
-            TitleBarHeight = (ConfigurationState.Instance.ShowOldUI ? TitleBar.Height : 0);
+            TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);

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

-        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : base(true)
+        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
        {
            Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);

@@ -24,16 +23,6 @@ namespace Ryujinx.Ava.UI.Windows
            ViewModel.SaveSettingsEvent += SaveSettings;

            InitializeComponent();
-
-            NavPanel.PaneDisplayMode =
-                ConfigurationState.Instance.ShowOldUI
-                    ? NavigationViewPaneDisplayMode.Left
-                    : NavigationViewPaneDisplayMode.Top;
-
-            Height = ConfigurationState.Instance.ShowOldUI
-                ? 927
-                : 993; // nav panel is put on top with custom title bar so account for new height
-            
            Load();
        }

--- a/src/Ryujinx/UI/Windows/StyleableWindow.cs
+++ b/src/Ryujinx/UI/Windows/StyleableWindow.cs
@@ -6,8 +6,6 @@ using Avalonia.Media;
 using Avalonia.Platform;
 using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using System.Threading.Tasks;

@@ -23,7 +21,7 @@ namespace Ryujinx.Ava.UI.Windows
            await appWindow.ShowDialog(owner ?? RyujinxApp.MainWindow);
        }
        
-        protected StyleableAppWindow(bool useCustomTitleBar = false, double? titleBarHeight = null)
+        protected StyleableAppWindow()
        {
            WindowStartupLocation = WindowStartupLocation.CenterOwner;
            TransparencyLevelHint = [WindowTransparencyLevel.None];
@@ -31,16 +29,7 @@ namespace Ryujinx.Ava.UI.Windows
            LocaleManager.Instance.LocaleChanged += LocaleChanged;
            LocaleChanged();

-            if (useCustomTitleBar)
-            {
-                TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowOldUI;
-                TitleBar.TitleBarHitTestType = ConfigurationState.Instance.ShowOldUI ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
-                
-                if (TitleBar.ExtendsContentIntoTitleBar && titleBarHeight != null)
-                    TitleBar.Height = titleBarHeight.Value;
-            }
-
-            Icon = RyujinxLogo.Bitmap;
+            Icon = MainWindowViewModel.IconBitmap;
        }

        private void LocaleChanged()
@@ -74,7 +63,7 @@ namespace Ryujinx.Ava.UI.Windows
            LocaleManager.Instance.LocaleChanged += LocaleChanged;
            LocaleChanged();

-            Icon = new WindowIcon(RyujinxLogo.Bitmap);
+            Icon = new WindowIcon(MainWindowViewModel.IconBitmap);
        }

        private void LocaleChanged()
Author	SHA1	Message	Date
WilliamWsyHK	18d464d4f3	Merge `e36f6527b7` into `a23c6bf547`	2025-03-05 03:39:57 +02:00
WilliamWsyHK	e36f6527b7	Unify "Enable"	2025-03-01 18:30:08 +08:00
WilliamWsyHK	8891559823	Update TChinese translation	2025-03-01 18:28:09 +08:00