Updated Swedish in locales.json (#748 )

Updated Zh-CN Simplified Chinese. (#737 )
small readme update (test)
2025-03-11 05:16:33 -05:00 · 2025-03-11 01:35:19 -05:00 · 2025-03-11 06:06:10 +00:00 · 2025-03-10 01:24:06 -05:00 · 2025-03-08 21:07:03 -06:00 · 2025-03-08 20:49:21 -06:00
82 changed files with 846 additions and 767 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,8 @@ env:
  RYUJINX_BASE_VERSION: "1.2"
  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
+  RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO: "Ryujinx"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Stable-Releases"
  RELEASE: 1

 jobs:
@@ -33,7 +34,7 @@ jobs:
          script: |
            github.rest.git.createRef({
              owner: "${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}",
-              repo: "${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}",
+              repo: "${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}",
              ref: 'refs/tags/${{ steps.version_info.outputs.build_version }}',
              sha: context.sha
            })
@@ -52,7 +53,7 @@ jobs:
            | Linux ARM 64-bit | [Stable Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Stable macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
            
-            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
+            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
          omitBodyDuringUpdate: true
          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
@@ -92,7 +93,7 @@ jobs:
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
        shell: bash

@@ -173,7 +174,7 @@ jobs:
            | Linux ARM 64-bit | [Stable Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Stable macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
            
-            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
+            **Full Changelog**: https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}
          omitBodyDuringUpdate: true
          allowUpdates: true
          replacesArtifacts: true
@@ -222,7 +223,7 @@ jobs:
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
-          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
+          sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_SOURCE_REPO }}/g;' src/Ryujinx.Common/ReleaseInformation.cs
          sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/g;' src/Ryujinx.Common/ReleaseInformation.cs
        shell: bash

--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 <table align="center">
    <tr>
        <td align="center" width="25%">
-            <img src="https://raw.githubusercontent.com/GreemDev/ryuassets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
+            <img src="https://raw.githubusercontent.com/Ryubing/ryuassets/refs/heads/main/RyujinxApp_1024.png" alt="Ryujinx" >
        </td>
        <td align="center" width="75%">
          
 # Ryujinx
          
 [![Release workflow](https://github.com/Ryubing/Ryujinx/actions/workflows/release.yml/badge.svg)](https://github.com/Ryubing/Ryujinx/actions/workflows/release.yml)
-[![Latest release](https://img.shields.io/github/v/release/GreemDev/Ryujinx)](https://github.com/Ryubing/Ryujinx/releases/latest)
+[![Latest release](https://img.shields.io/github/v/release/Ryubing/Ryujinx)](https://github.com/Ryubing/Ryujinx/releases/latest)
  <br>
 [![Canary workflow](https://github.com/Ryubing/Ryujinx/actions/workflows/canary.yml/badge.svg)](https://github.com/Ryubing/Ryujinx/actions/workflows/canary.yml)
 [![Latest canary release](https://img.shields.io/github/v/release/Ryubing/Canary-Releases?label=canary)](https://github.com/Ryubing/Canary-Releases/releases/latest)
--- a/src/Ryujinx.Common/Configuration/DirtyHack.cs
+++ b/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)
--- a/src/Ryujinx.Common/ReleaseInformation.cs
+++ b/src/Ryujinx.Common/ReleaseInformation.cs
@@ -37,9 +37,9 @@ namespace Ryujinx.Common
        public static string GetChangelogUrl(Version currentVersion, Version newVersion) =>
            IsCanaryBuild 
                ? $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelSourceRepo}/compare/Canary-{currentVersion}...Canary-{newVersion}" 
-                : $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelSourceRepo}/releases/tag/{newVersion}";
+                : GetChangelogForVersion(newVersion);
        
        public static string GetChangelogForVersion(Version version) =>
-            $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelRepo}/releases/tag/{version}";
+            $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelRepo}/releases/{version}";
    }
 }
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/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
--- a/src/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs
+++ b/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;
        }
--- a/src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs
+++ b/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;
--- a/src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Proxy/SocketHelpers.cs
+++ b/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;
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -1664,7 +1664,7 @@
        "pl_PL": "Rozszerzenie pliku: {0}",
        "pt_BR": "Extensão: {0}",
        "ru_RU": "Расширение файла: {0}",
-        "sv_SE": "Filänd: {0}",
+        "sv_SE": "Filändelse: {0}",
        "th_TH": "นามสกุลไฟล์: {0}",
        "tr_TR": "Dosya Uzantısı: {0}",
        "uk_UA": "Розширення файлу: {0}",
@@ -1789,7 +1789,7 @@
        "pl_PL": "Rozszerzenie pliku",
        "pt_BR": "Extensão",
        "ru_RU": "Расширение файла",
-        "sv_SE": "Filänd",
+        "sv_SE": "Filändelse",
        "th_TH": "นามสกุลไฟล์",
        "tr_TR": "Dosya Uzantısı",
        "uk_UA": "Розширення файлу",
@@ -2767,8 +2767,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
+        "uk_UA": "Створити користувацьку конфігурацію",
+        "zh_CN": "创建自定义设置",
        "zh_TW": ""
      }
    },
@@ -2792,8 +2792,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
+        "uk_UA": "Редагувати користувацьку конфігурацію",
+        "zh_CN": "编辑自定义设置",
        "zh_TW": ""
      }
    },
@@ -2842,7 +2842,7 @@
        "sv_SE": "Skapar en oberoende konfiguration för det aktuella spelet",
        "th_TH": "สร้างการกำหนดค่าที่เป็นอิสระสำหรับเกมปัจจุบัน",
        "tr_TR": "Mevcut oyun için bağımsız bir yapılandırma oluşturur",
-        "uk_UA": "Створює незалежну конфігурацію для поточної гри",
+        "uk_UA": "Створюйте незалежну конфігурацію для поточної гри",
        "zh_CN": "为当前游戏创建独立的配置",
        "zh_TW": "為當前遊戲創建獨立的配置"
      }
@@ -2867,8 +2867,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
+        "uk_UA": "Відредагувати наявну індивідуальну конфігурацію для цієї гри.",
+        "zh_CN": "编辑选定游戏的现存独立配置",
        "zh_TW": ""
      }
    },
@@ -3442,7 +3442,7 @@
        "sv_SE": "Användargränssnitt",
        "th_TH": "หน้าจอผู้ใช้",
        "tr_TR": "Kullancı Arayüzü",
-        "uk_UA": "Інтерфейс користувача",
+        "uk_UA": "Інтерфейс",
        "zh_CN": "用户界面",
        "zh_TW": "使用者介面"
      }
@@ -3817,34 +3817,59 @@
        "sv_SE": "Inaktivera inmatning när fokus tappas",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
+        "uk_UA": "Вимкнути введення, якщо вікно неактивне",
        "zh_CN": "在后台时禁用输入",
        "zh_TW": ""
      }
    },
    {
-      "ID": "SettingsTabGeneralShowTitleBar",
+      "ID": "SettingsTabGeneralShowOldUI",
      "Translations": {
        "ar_SA": "",
        "de_DE": "",
        "el_GR": "",
-        "en_US": "Show Title Bar (Requires restart)",
-        "es_ES": "Mostrar Barra de Título (Requiere reinicio)",
-        "fr_FR": "Afficher Barre de Titre (Nécessite redémarrage)",
+        "en_US": "Show Original UI Style (Requires restart)",
+        "es_ES": "",
+        "fr_FR": "",
        "he_IL": "",
-        "it_IT": "Mostra barra del titolo (Richiede il riavvio)",
+        "it_IT": "",
        "ja_JP": "",
-        "ko_KR": "제목 표시줄 표시(다시 시작해야 함)",
-        "no_NO": "Vis tittellinje (krever omstart)",
+        "ko_KR": "",
+        "no_NO": "Vis original UI-stil (krever omstart)",
        "pl_PL": "",
-        "pt_BR": "Mostrar Barra de Título (Requer reinicialização)",
-        "ru_RU": "Показать строку заголовка (требуется перезапуск)",
-        "sv_SE": "Visa titelrad (kräver omstart)",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Показувати рядок заголовка (Потрібен перезапуск)",
-        "zh_CN": "显示标题栏 (需要重启)",
-        "zh_TW": "顯示「標題列」 (需要重新開啟Ryujinx)"
+        "uk_UA": "Показати оригінальний UI (Потрібен перезапуск)",
+        "zh_CN": "显示原始 UI 样式 (需要重启)",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "SettingsTabGeneralShowOldUIToolTip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Show the older Avalonia Ryujinx UI reminiscent of Ryujinx 1.1.1403. This is enabled by default on platforms that are not Windows.\nThe classic-style title bar is back and major window layout reworkings are reversed; such as the settings navigation placement above this tooltip.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "Vis det eldre Avalonia Ryujinx-grensesnittet som minner om Ryujinx 1.1.1403. Dette er aktivert som standard på plattformer som ikke er Windows.\nTittellinjen i klassisk stil er tilbake, og store omarbeidinger av vindusoppsettet er reversert, for eksempel plasseringen av innstillingsnavigasjonen over dette verktøytipset.",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "Показати старий інтерфейс Avalonia Ryujinx, який був у Ryujinx 1.1.1403. Ця опція активна за замовчуванням на всіх інших, окрім Windows платформах.\nПовернеться класична панель заголовка, а всі суттєві зміни інтерфейсу будуть скасовані, зокрема горизонтальне розміщення навігації в налаштуваннях.",
+        "zh_CN": "显示旧的类似 Ryujinx 1.1.1403 的 Avalonia Ryujinx UI。在非 Windows 平台上默认启用此选项。\n经典样式的标题栏已回归并且恢复了对窗口布局的重大重构;例如在工具提示上方放置设置导航。",
+        "zh_TW": ""
      }
    },
    {
@@ -3989,7 +4014,7 @@
        "pl_PL": "",
        "pt_BR": "Carregar Automaticamente Pasta de DLC e Atualizações",
        "ru_RU": "Автозагрузка папки с DLC/Обновлениями",
-        "sv_SE": "Läs automatisk in DLC/speluppdateringar",
+        "sv_SE": "Läs automatiskt in DLC/speluppdateringar",
        "th_TH": "โหลดไดเรกทอรี DLC/ไฟล์อัปเดต อัตโนมัติ",
        "tr_TR": "",
        "uk_UA": "Автозавантаження теки DLC/Оновлень",
@@ -4842,7 +4867,7 @@
        "sv_SE": "Matcha systemtid",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
+        "uk_UA": "Синхронізувати з системним годинником",
        "zh_CN": "与系统时间同步",
        "zh_TW": ""
      }
@@ -7239,7 +7264,7 @@
        "pl_PL": "Przyciski",
        "pt_BR": "Botões",
        "ru_RU": "Кнопки",
-        "sv_SE": "Knappar",
+        "sv_SE": "Handlingsknappar",
        "th_TH": "ปุ่มกด",
        "tr_TR": "Tuşlar",
        "uk_UA": "Кнопки",
@@ -8442,7 +8467,7 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
+        "uk_UA": "LED-підсвітка",
        "zh_CN": "",
        "zh_TW": ""
      }
@@ -8467,7 +8492,7 @@
        "sv_SE": "Inaktivera",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
+        "uk_UA": "Вимкнути",
        "zh_CN": "关闭",
        "zh_TW": ""
      }
@@ -8492,7 +8517,7 @@
        "sv_SE": "Regnbåge",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
+        "uk_UA": "Веселка",
        "zh_CN": "彩虹",
        "zh_TW": ""
      }
@@ -8517,7 +8542,7 @@
        "sv_SE": "Regnbågshastighet",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
+        "uk_UA": "Швидкість зміни кольорів",
        "zh_CN": "彩虹滚动速度",
        "zh_TW": ""
      }
@@ -9142,7 +9167,7 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "Esc",
-        "uk_UA": "",
+        "uk_UA": "Esc",
        "zh_CN": "Esc",
        "zh_TW": "Esc 鍵"
      }
@@ -10842,7 +10867,7 @@
        "sv_SE": "Diverse",
        "th_TH": "",
        "tr_TR": "Diğer",
-        "uk_UA": "",
+        "uk_UA": "Інше",
        "zh_CN": "截图键",
        "zh_TW": "其他按鍵"
      }
@@ -14889,7 +14914,7 @@
        "pl_PL": "Wielowątkowość Backendu Graficznego:",
        "pt_BR": "Multi Enfileiramento do Renderizador Gráfico:",
        "ru_RU": "Многопоточность графического бэкенда:",
-        "sv_SE": "Multithreading för grafikbakände:",
+        "sv_SE": "Multitrådning för grafikbakände:",
        "th_TH": "มัลติเธรด กราฟิกเบื้องหลัง:",
        "tr_TR": "Grafik Backend Multithreading:",
        "uk_UA": "Багатопотоковість графічного сервера:",
@@ -17667,7 +17692,7 @@
        "sv_SE": "Ändra ljudvolym",
        "th_TH": "ปรับระดับเสียง",
        "tr_TR": "Ses seviyesini değiştirir",
-        "uk_UA": "Змінити гучність звуку",
+        "uk_UA": "Регулювання гучності",
        "zh_CN": "调节音量",
        "zh_TW": "調節音量"
      }
@@ -18689,7 +18714,7 @@
        "pl_PL": "",
        "pt_BR": "Não Reduzido",
        "ru_RU": "Не обрезан",
-        "sv_SE": "Inte optimerad",
+        "sv_SE": "Orörd",
        "th_TH": "",
        "tr_TR": "",
        "uk_UA": "Необрізані",
@@ -19567,7 +19592,7 @@
        "sv_SE": "Alla tangentbord",
        "th_TH": "คีย์บอร์ดทั้งหมด",
        "tr_TR": "Tüm Klavyeler",
-        "uk_UA": "Всі клавіатури",
+        "uk_UA": "Усі клавіатури",
        "zh_CN": "所有键盘",
        "zh_TW": "所有鍵盤"
      }
@@ -19717,7 +19742,7 @@
        "sv_SE": "Snabbtangenter för tangentbord",
        "th_TH": "ปุ่มลัดของคีย์บอร์ด",
        "tr_TR": "Klavye Kısayolları",
-        "uk_UA": "Гарячі клавіші клавіатури",
+        "uk_UA": "Гарячі клавіші",
        "zh_CN": "快捷键",
        "zh_TW": "鍵盤快速鍵"
      }
@@ -22442,7 +22467,7 @@
        "sv_SE": "Tillämpar anti-aliasing på spelrenderaren.\n\nFXAA kommer att sudda det mesta av bilden, medan SMAA kommer att försöka hitta taggiga kanter och släta ut dem.\n\nRekommenderas inte att använda tillsammans med skalfiltret FSR.\n\nDet här alternativet kan ändras medan ett spel körs genom att klicka på \"Tillämpa\" nedan. Du kan helt enkelt flytta inställningsfönstret åt sidan och experimentera tills du hittar ditt föredragna utseende för ett spel.\n\nLämna som INGEN om du är osäker.",
        "th_TH": "ใช้การลดรอยหยักกับการเรนเดอร์เกม\n\nFXAA จะเบลอภาพส่วนใหญ่ ในขณะที่ SMAA จะพยายามค้นหารอยหยักและปรับให้เรียบ\n\nไม่แนะนำให้ใช้ร่วมกับตัวกรองสเกล FSR\n\nตัวเลือกนี้สามารถเปลี่ยนแปลงได้ในขณะที่เกมกำลังทำงานอยู่โดยคลิก \"นำไปใช้\" ด้านล่าง คุณสามารถย้ายหน้าต่างการตั้งค่าไปด้านข้างและทดลองจนกว่าคุณจะพบรูปลักษณ์ที่คุณต้องการสำหรับเกม\n\nปล่อยไว้ที่ NONE หากไม่แน่ใจ",
        "tr_TR": "",
-        "uk_UA": "Застосовує згладження до рендера гри.\n\nFXAA розмиє більшість зображення, а SMAA спробує знайти нерівні краї та згладити їх.\n\nНе рекомендується використовувати разом з фільтром масштабування FSR.\n\nЦю опцію можна міняти коли гра запущена кліком на \"Застосувати; ви можете відсунути вікно налаштувань і поекспериментувати з видом гри.\n\nЗалиште на \"Немає\", якщо не впевнені.",
+        "uk_UA": "Застосовує згладження до рендера гри.\n\nFXAA розмиє більшість зображення, а SMAA спробує знайти нерівні краї та згладити їх.\n\nНе рекомендується використовувати разом з фільтром масштабування FSR.\n\nЦю опцію можна міняти коли гра запущена кліком на \"Застосувати; ви можете відсунути вікно налаштувань і поекспериментувати з видом гри.\n\nЗалиште \"Немає\", якщо не впевнені.",
        "zh_CN": "抗锯齿是一种图形处理技术，用于减少图像边缘的锯齿状现象，使图像更加平滑。\n\nFXAA（快速近似抗锯齿）是一种性能开销相对较小的抗锯齿方法，但可能会使得整体图像看起来有些模糊。\n\nSMAA（增强型子像素抗锯齿）则更加精细，它会尝试找到锯齿边缘并平滑它们，相比 FXAA 有更好的图像质量，但性能开销可能会稍大一些。\n\n如果开启了 FSR（FidelityFX Super Resolution，超级分辨率锐画技术）来提高性能或图像质量，不建议再启用抗锯齿，因为它们会产生不必要的图形处理开销，或者相互之间效果不协调。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“无”。",
        "zh_TW": "對遊戲繪製進行反鋸齒處理。\n\nFXAA 會模糊大部分圖像，而 SMAA 則會嘗試找出鋸齒邊緣並將其平滑化。\n\n不建議與 FSR 縮放濾鏡一起使用。\n\n此選項可在遊戲執行時透過點選下方的「套用」進行變更；您只需將設定視窗移到一旁，然後進行試驗，直到找到您喜歡的遊戲效果。\n\n如果不確定，請選擇無狀態。"
      }
@@ -22517,7 +22542,7 @@
        "sv_SE": "Välj det skalfilter som ska tillämpas vid användning av upplösningsskala.\n\nBilinjär fungerar bra för 3D-spel och är ett säkert standardalternativ.\n\nNärmast rekommenderas för pixel art-spel.\n\nFSR 1.0 är bara ett skarpningsfilter, rekommenderas inte för FXAA eller SMAA.\n\nOmrådesskalning rekommenderas vid nedskalning av upplösning som är större än utdatafönstret. Det kan användas för att uppnå en supersamplad anti-alias-effekt vid nedskalning med mer än 2x.\n\nDetta alternativ kan ändras medan ett spel körs genom att klicka på \"Tillämpa\" nedan. du kan helt enkelt flytta inställningsfönstret åt sidan och experimentera tills du hittar ditt föredragna utseende för ett spel.\n\nLämna som BILINJÄR om du är osäker.",
        "th_TH": "เลือกตัวกรองสเกลที่จะใช้เมื่อใช้สเกลความละเอียด\n\nBilinear ทำงานได้ดีกับเกม 3D และเป็นตัวเลือกเริ่มต้นที่ปลอดภัย\n\nแนะนำให้ใช้เกมภาพพิกเซลที่ใกล้เคียงที่สุด\n\nFSR 1.0 เป็นเพียงตัวกรองความคมชัด ไม่แนะนำให้ใช้กับ FXAA หรือ SMAA\n\nตัวเลือกนี้สามารถเปลี่ยนแปลงได้ในขณะที่เกมกำลังทำงานอยู่โดยคลิก \"นำไปใช้\" ด้านล่าง คุณสามารถย้ายหน้าต่างการตั้งค่าไปด้านข้างและทดลองจนกว่าคุณจะพบรูปลักษณ์ที่คุณต้องการสำหรับเกม",
        "tr_TR": "Choose the scaling filter that will be applied when using resolution scale.\n\nBilinear works well for 3D games and is a safe default option.\n\nNearest is recommended for pixel art games.\n\nFSR 1.0 is merely a sharpening filter, not recommended for use with FXAA or SMAA.\n\nThis option can be changed while a game is running by clicking \"Apply\" below; you can simply move the settings window aside and experiment until you find your preferred look for a game.\n\nLeave on BILINEAR if unsure.",
-        "uk_UA": "Виберіть фільтр масштабування, що використається при збільшенні роздільної здатності.\n\n\"Білінійний\" добре виглядає в 3D іграх, і хороше налаштування за умовчуванням.\n\n\"Найближчий\" рекомендується для ігор з піксель-артом.\n\n\"FSR 1.0\" - фільтр різкості. Не варто використовувати разом з FXAA або SMAA.\n\nЦю опцію можна змінювати під час гри кліком на \"Застосувати\" нижче; ви можете відсунути вікно налаштувань і поекспериментувати з тим, як відображатиметься гра.\n\nЗалиште на \"Білінійний\", якщо не впевнені.",
+        "uk_UA": "Виберіть фільтр масштабування, що використається при збільшенні роздільної здатності.\n\n\"Білінійний\" добре виглядає в 3D іграх, і хороше налаштування за умовчуванням.\n\n\"Найближчий\" рекомендується для ігор з піксель-артом.\n\n\"FSR 1.0\" - фільтр різкості. Не варто використовувати разом з FXAA або SMAA.\n\nЦю опцію можна змінювати під час гри кліком на \"Застосувати\" нижче; ви можете відсунути вікно налаштувань і поекспериментувати з тим, як відображатиметься гра.\n\nЗалиште \"Білінійний\", якщо не впевнені.",
        "zh_CN": "选择在分辨率缩放时将使用的缩放过滤器。\n\nBilinear（双线性过滤）对于3D游戏效果较好，是一个安全的默认选项。\n\nNearest（最近邻过滤）推荐用于像素艺术游戏。\n\nFSR（超级分辨率锐画）只是一个锐化过滤器，不推荐与 FXAA 或 SMAA 抗锯齿一起使用。\n\nArea（局部过滤），当渲染分辨率大于窗口实际分辨率，推荐该选项。该选项在渲染比例大于2.0的情况下，可以实现超采样的效果。\n\n在游戏运行时，通过点击下面的“应用”按钮可以使设置生效；你可以将设置窗口移开，并试验找到您喜欢的游戏画面效果。\n\n如果不确定，请保持为“Bilinear（双线性过滤）”。",
        "zh_TW": "選擇使用解析度縮放時套用的縮放過濾器。\n\n雙線性 (Bilinear) 濾鏡適用於 3D 遊戲，是一個安全的預設選項。\n\n建議像素美術遊戲使用近鄰性 (Nearest) 濾鏡。\n\nFSR 1.0 只是一個銳化濾鏡，不建議與 FXAA 或 SMAA 一起使用。\n\n此選項可在遊戲執行時透過點選下方的「套用」進行變更；您只需將設定視窗移到一旁，然後進行試驗，直到找到您喜歡的遊戲效果。\n\n如果不確定，請保持雙線性 (Bilinear) 狀態。"
      }
@@ -23842,8 +23867,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
+        "uk_UA": "Список сумісності — {0} ігор",
+        "zh_CN": "兼容性列表 - {0} 条",
        "zh_TW": ""
      }
    },
@@ -23917,8 +23942,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
+        "uk_UA": "Шукати серед {0} перевірених ігор...",
+        "zh_CN": "搜索  {0}  兼容性条目...",
        "zh_TW": ""
      }
    },
@@ -23992,7 +24017,7 @@
        "sv_SE": "Spelbart",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "Оптимально",
+        "uk_UA": "Справна",
        "zh_CN": "可游玩",
        "zh_TW": "可暢順遊玩"
      }
@@ -24242,8 +24267,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
+        "uk_UA": "Власна конфігурація",
+        "zh_CN": "自定义配置",
        "zh_TW": ""
      }
    },
@@ -24267,8 +24292,8 @@
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
+        "uk_UA": "(Глобальні)",
+        "zh_CN": "(全局)",
        "zh_TW": ""
      }
    },
--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -26,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();
        }
@@ -45,19 +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);
-            SetDynamicValues(LocaleKeys.CompatibilityListSearchBoxWatermarkWithCount, CompatibilityCsv.Entries.Length);
-            
        }

        public string this[LocaleKeys key]
--- a/src/Ryujinx/Common/Markup/MarkupExtensions.cs
+++ b/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;
+    }
 }
--- a/src/Ryujinx/Common/XCITrimmerLog.cs
+++ b/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;
            }
--- a/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs
+++ b/src/Ryujinx/Headless/HeadlessRyujinx.Init.cs
@@ -2,6 +2,7 @@ using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;
+using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -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;
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -5,6 +5,7 @@ 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;
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/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>

--- a/src/Ryujinx/Systems/AppHost.cs
+++ b/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;
@@ -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");
        }

--- a/src/Ryujinx/Systems/AppLibrary/ApplicationData.cs
+++ b/src/Ryujinx/Systems/AppLibrary/ApplicationData.cs
@@ -36,7 +36,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
            {
                _id = value;

-                Compatibility = CompatibilityCsv.Find(value);
+                Compatibility = CompatibilityDatabase.Find(value);
                RichPresenceSpec = PlayReports.Analyzer.TryGetSpec(IdString, out GameSpec gameSpec) 
                    ? gameSpec 
                    : default(Optional<GameSpec>);
--- a/src/Ryujinx/Systems/AppLibrary/LdnGameDataReceivedEventArgs.cs
+++ b/src/Ryujinx/Systems/AppLibrary/LdnGameDataReceivedEventArgs.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;

 namespace Ryujinx.Ava.Systems.AppLibrary
 {
--- a/src/Ryujinx/Systems/CompatibilityDatabase.cs
+++ b/src/Ryujinx/Systems/CompatibilityDatabase.cs
@@ -11,24 +11,9 @@ using System.Text;

 namespace Ryujinx.Ava.Systems
 {
-    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
+    public class CompatibilityDatabase
    {
-        public const string TitleIdCol = "\"title_id\"";
-        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();
+        static CompatibilityDatabase() => Load();

        public static void Load()
        {
@@ -65,16 +50,6 @@ namespace Ryujinx.Ava.Systems
        
        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.Systems

        public string FormattedIssueLabels => Labels
            .Select(FormatLabelName)
+            .Where(x => x != null)
            .JoinToString(", ");

        public override string ToString() =>
@@ -158,7 +134,6 @@ namespace Ryujinx.Ava.Systems
            "gui" => "GUI",
            "help wanted" => "Help Wanted",
            "horizon" => "Horizon",
-            "infra" => "Project Infra",
            "invalid" => "Invalid",
            "kernel" => "Kernel",
            "ldn" => "LDN",
@@ -172,9 +147,9 @@ namespace Ryujinx.Ava.Systems
            "ldn-untested" => "LDN Untested",
            "ldn-broken" => "LDN Broken",
            "ldn-partial" => "Partial LDN",
-            "nvdec" => "NVDEC",
-            "services" => "NX Services",
-            "services-horizon" => "Horizon OS Services",
+            "nvdec" => "GPU Video Decoding",
+            "services" => "HLE Services",
+            "services-horizon" => "New HLE Services",
            "slow" => "Runs Slow",
            "crash" => "Crashes",
            "deadlock" => "Deadlock",
@@ -182,7 +157,7 @@ namespace Ryujinx.Ava.Systems
            "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.Systems
            "UE4" => "Unreal Engine 4",
            "homebrew" => "Homebrew Content",
            "online-broken" => "Online Broken",
-            _ => Capitalize(labelName)
+            _ => null
        };
+    }
    
-        public static string Capitalize(string value)
+    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
    {
-            if (value == string.Empty)
-                return string.Empty;
+        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\"";
        
-            char firstChar = value[0];
-            string rest = value[1..];
-
-            return $"{char.ToUpper(firstChar)}{rest}";
-        }
+        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);
    }
 }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs
@@ -15,7 +15,7 @@ namespace Ryujinx.Ava.Systems.Configuration
        /// <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
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
@@ -46,12 +46,11 @@ 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
-            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;
          
@@ -162,8 +161,6 @@ namespace Ryujinx.Ava.Systems.Configuration

                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.Systems.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.
            );
    }
 }
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs
@@ -11,7 +11,6 @@ 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;
@@ -684,18 +683,15 @@ namespace Ryujinx.Ava.Systems.Configuration
            
            public ReactiveObject<bool> Xc2MenuSoftlockFix { get; private set; }
            
-            public ReactiveObject<bool> EnableShaderTranslationDelay { get; private set; }
-            
-            public ReactiveObject<int> ShaderTranslationDelay { get; private set; }
+            public ReactiveObject<bool> DisableNifmIsAnyInternetRequestAccepted { get; private set; }

            public HacksSection()
            {
                ShowDirtyHacks = new ReactiveObject<bool>();
                Xc2MenuSoftlockFix = new ReactiveObject<bool>();
                Xc2MenuSoftlockFix.Event += HackChanged;
-                EnableShaderTranslationDelay = new ReactiveObject<bool>();
-                EnableShaderTranslationDelay.Event += HackChanged;
-                ShaderTranslationDelay = new ReactiveObject<int>();
+                DisableNifmIsAnyInternetRequestAccepted = new ReactiveObject<bool>();
+                DisableNifmIsAnyInternetRequestAccepted.Event += HackChanged;
            }

            private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
@@ -726,8 +722,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                    if (Xc2MenuSoftlockFix)
                        Apply(DirtyHack.Xc2MenuSoftlockFix);
                    
-                    if (EnableShaderTranslationDelay)
-                        Apply(DirtyHack.ShaderTranslationDelay, ShaderTranslationDelay);
+                    if (DisableNifmIsAnyInternetRequestAccepted)
+                        Apply(DirtyHack.NifmServiceDisableIsAnyInternetRequestAccepted);
                    
                    return enabledHacks.ToArray();

@@ -784,11 +780,6 @@ namespace Ryujinx.Ava.Systems.Configuration
        /// </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.
        /// </summary>
@@ -810,9 +801,9 @@ namespace Ryujinx.Ava.Systems.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
@@ -833,15 +824,14 @@ 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>();
-            ShowTitleBar = new ReactiveObject<bool>();
+            ShowOldUI = 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,12 +56,11 @@ namespace Ryujinx.Ava.Systems.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.Systems.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;
--- a/src/Ryujinx/Systems/DiscordIntegrationModule.cs
+++ b/src/Ryujinx/Systems/DiscordIntegrationModule.cs
@@ -9,10 +9,9 @@ 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;
--- a/src/Ryujinx/Systems/Rebooter.cs
+++ b/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
    {
--- a/src/Ryujinx/Systems/Updater.cs
+++ b/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
    {
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -9,10 +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.Systems.AppLibrary;
+using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -80,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)
@@ -127,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, 
--- a/src/Ryujinx/UI/Controls/MiniVerticalSeparator.cs
+++ b/src/Ryujinx/UI/Controls/MiniVerticalSeparator.cs
--- a/src/Ryujinx/UI/Controls/RyujinxLogo.cs
+++ b/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;
+        }
+    }
+}
--- a/src/Ryujinx/UI/Helpers/IconColorPicker.cs
+++ b/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;
--- a/src/Ryujinx/UI/RyujinxApp.axaml
+++ b/src/Ryujinx/UI/RyujinxApp.axaml
--- a/src/Ryujinx/UI/RyujinxApp.axaml.cs
+++ b/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.Systems.Configuration;
+using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using System;
@@ -150,7 +150,7 @@ namespace Ryujinx.Ava

        private async void AboutRyujinx_OnClick(object sender, EventArgs e)
        {
-            await AboutWindow.Show();
+            await AboutView.Show();
        }
    }
 }
--- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
@@ -3,7 +3,6 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
-using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Systems.Configuration;
 using System;
--- a/src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs
@@ -1,17 +1,17 @@
 using Gommon;
 using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.Systems.AppLibrary;
-using Ryujinx.Ava.UI.Windows;
+using System;
 using System.Collections.Generic;
 using System.Linq;

 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
@@ -21,14 +21,26 @@ namespace Ryujinx.Ava.UI.ViewModels

        public CompatibilityViewModel() {}
        
+        private void AppCountUpdated(object _, ApplicationCountUpdatedEventArgs __)
+            => _ownedGameTitleIds = _appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
+
        public CompatibilityViewModel(ApplicationLibrary appLibrary)
        {
-            appLibrary.ApplicationCountUpdated += (_, _) 
-                => _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
+            _appLibrary = appLibrary;
            
-            _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;
@@ -46,11 +58,11 @@ namespace Ryujinx.Ava.UI.ViewModels
        {
            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))));
        }
--- a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
+++ b/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;
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/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,6 +16,7 @@ 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;
@@ -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)
                {
--- a/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs
@@ -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.");
+        });
    }
 }
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -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);

--- a/src/Ryujinx/UI/ViewModels/XciTrimmerViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/XciTrimmerViewModel.cs
@@ -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;
            }
--- a/src/Ryujinx/UI/Views/Dialog/AboutView.axaml
+++ b/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"
--- a/src/Ryujinx/UI/Views/Dialog/AboutView.axaml.cs
+++ b/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());
--- a/src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml
+++ b/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"
--- a/src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/ApplicationDataView.axaml.cs
@@ -12,7 +12,7 @@ using Ryujinx.Ava.Systems.AppLibrary;
 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>
    {
@@ -49,16 +49,13 @@ namespace Ryujinx.Ava.UI.Views.Misc

        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;
            
--- a/src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml
+++ b/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
--- a/src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/DlcSelectView.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia.Controls;
-using Avalonia.Styling;
-using FluentAvalonia.UI.Controls;
+using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Controls;
@@ -9,7 +7,7 @@ using Ryujinx.Ava.UI.ViewModels;
 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>
    {
--- a/src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml
+++ b/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"
--- a/src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/DownloadableContentManagerView.axaml.cs
@@ -6,26 +6,16 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.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 DownloadableContentManagerWindow()
+        public DownloadableContentManagerView()
        {
-            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>());
--- a/src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml
+++ b/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">
--- a/src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/ModManagerView.axaml.cs
@@ -7,27 +7,17 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
 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 ModManagerWindow()
+        public ModManagerView()
        {
-            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")),
            };

--- a/src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml
+++ b/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"
--- a/src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Dialog/TitleUpdateManagerView.axaml.cs
@@ -6,26 +6,16 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.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 TitleUpdateWindow()
+        public TitleUpdateManagerView()
        {
-            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>());
--- a/src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml
+++ b/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}" />
--- a/src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml.cs
+++ b/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 XCITrimmerWindow()
+        public XciTrimmerView()
        {
-            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)
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
+++ b/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">
+                            <StackPanel Orientation="Vertical" Spacing="5">
                                <CheckBox
-                                Margin="10"
+                                    Margin="10, 10, 10, 0"
                                    MinWidth="0"
-                                Grid.Column="0"
                                    IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
                                    <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
                                </CheckBox>
                                <Button
-                                Margin="10"
-                                Grid.Column="1"
+                                    Margin="10, 0, 10, 10"
                                    Command="{Binding ShowMotionConfig}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                                    <pt:Icon Value="fa-solid fa-gear" />
                                </Button>
-                        </Grid>
-                    </Border>
-                    <Border
-                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                        BorderThickness="1"
-                        CornerRadius="5"
-                        HorizontalAlignment="Stretch"
-                        Margin="0,-1,0,0">
-                        <Grid ColumnDefinitions="*,Auto">
+                            </StackPanel>
+                            <controls:MiniVerticalSeparator Height="64"/>
+                            <StackPanel Orientation="Vertical" Spacing="5">
                                <CheckBox
-                                Margin="10"
+                                    Margin="10, 10, 10, 0"
                                    MinWidth="0"
-                                Grid.Column="0"
                                    IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
                                    <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
                                </CheckBox>
                                <Button
-                                Margin="10"
-                                Grid.Column="1"
+                                    Margin="10, 0, 10, 10"
                                    Command="{Binding ShowRumbleConfig}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                                    <pt:Icon Value="fa-solid fa-gear" />
                                </Button>
-                        </Grid>
-                    </Border>
-                    <Border
-                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                        BorderThickness="1"
-                        CornerRadius="5"
-                        HorizontalAlignment="Stretch"
-                        Margin="0,-1,0,0">
-                        <Grid IsVisible="{Binding ParentModel.HasLed}" ColumnDefinitions="*,Auto">
+                            </StackPanel>
+                            <controls:MiniVerticalSeparator Height="64" IsVisible="{Binding ParentModel.HasLed}"/>
+                            <StackPanel Orientation="Vertical" Spacing="5">
                                <CheckBox
-                                Margin="10, 10, 5, 10"
+                                    Margin="10, 10, 10, 0"
                                    MinWidth="0"
-                                Grid.Column="0"
                                    IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
                                    <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
                                </CheckBox>
                                <Button
-                                Margin="10"
-                                Grid.Column="1"
+                                    Margin="10, 0, 10, 10"
                                    Command="{Binding ShowLedConfig}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                                    <pt:Icon Value="fa-solid fa-gear" />
                                </Button>
-                        </Grid>
+                            </StackPanel>
+                        </StackPanel>
                    </Border>
                </StackPanel>
            </StackPanel>
--- a/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
--- a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs
@@ -1,4 +1,3 @@
-using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
--- a/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs
@@ -1,4 +1,3 @@
-using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -6,17 +6,15 @@
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    mc:Ignorable="d"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    x:DataType="viewModels:MainWindowViewModel"
    x:Class="Ryujinx.Ava.UI.Views.Main.MainMenuBarView">
    <Design.DataContext>
        <viewModels:MainWindowViewModel />
    </Design.DataContext>
    <DockPanel HorizontalAlignment="Stretch">
-        <Image
-            Name="RyuLogo"
+        <controls:RyujinxLogo 
            Margin="7, 0" 
-            Height="25"
-            Width="25"
            ToolTip.Tip="{Binding Title}"/>
        <Menu
            Name="Menu"
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -13,7 +13,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Ava.UI.Views.Misc;
+using Ryujinx.Ava.UI.Views.Dialog;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Utilities;
@@ -34,9 +34,6 @@ namespace Ryujinx.Ava.UI.Views.Main
        {
            InitializeComponent();

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

@@ -49,8 +46,8 @@ namespace Ryujinx.Ava.UI.Views.Main
            CheatManagerMenuItem.Command = Commands.CreateSilentFail(OpenCheatManagerForCurrentApp);
            InstallFileTypesMenuItem.Command = Commands.Create(InstallFileTypes);
            UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
-            XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
-            AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
+            XciTrimmerMenuItem.Command = Commands.Create(XciTrimmerView.Show);
+            AboutWindowMenuItem.Command = Commands.Create(AboutView.Show);
            CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityListWindow.Show());

            UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;
@@ -226,7 +223,7 @@ namespace Ryujinx.Ava.UI.Views.Main

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

            double windowWidthScaled = (resolutionWidth * Program.WindowScaleFactor);
            double windowHeightScaled = ((resolutionHeight + barsHeight) * Program.WindowScaleFactor);
--- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
--- a/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml
@@ -29,7 +29,7 @@
                <TextBlock
                    Foreground="{DynamicResource SecondaryTextColor}"
                    TextDecorations="Underline"
-                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Will cause issues." />
+                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Can cause issues." />
                <StackPanel
                    Margin="0,10,0,0"
                    Orientation="Horizontal"
@@ -43,6 +43,18 @@
                        Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
                </StackPanel>
                <Separator/>
+                <StackPanel
+                    Margin="0,10,0,0"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Center"
+                    ToolTip.Tip="{Binding DirtyHacks.NifmDisableIsAnyInternetRequestAcceptedTooltip}">
+                    <CheckBox
+                        Margin="0"
+                        IsChecked="{Binding DirtyHacks.NifmDisableIsAnyInternetRequestAccepted}"/>
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Text="Disable IsAnyInternetRequestAccepted" />
+                </StackPanel>
            </StackPanel>
        </Border>
    </ScrollViewer>
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
@@ -3,7 +3,9 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using Avalonia.Threading;
 using Ryujinx.Ava.Input;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Input;
@@ -13,7 +15,7 @@ using Key = Ryujinx.Common.Configuration.Hid.Key;

 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsHotkeysView : UserControl
+    public partial class SettingsHotkeysView : RyujinxControl<SettingsViewModel>
    {
        private ButtonKeyAssigner _currentAssigner;
        private readonly IGamepadDriver _avaloniaKeyboardDriver;
@@ -78,45 +80,49 @@ namespace Ryujinx.Ava.UI.Views.Settings
                        {
                            if (e.ButtonValue.HasValue)
                            {
-                                SettingsViewModel viewModel = (DataContext) as SettingsViewModel;
                                Button buttonValue = e.ButtonValue.Value;

+                                Dispatcher.UIThread.Post(() =>
+                                {
                                    switch (button.Name)
                                    {
                                        case "ToggleVSyncMode":
-                                        viewModel.KeyboardHotkey.ToggleVSyncMode = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.ToggleVSyncMode = buttonValue.AsHidType<Key>();
                                            break;
                                        case "Screenshot":
-                                        viewModel.KeyboardHotkey.Screenshot = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.Screenshot = buttonValue.AsHidType<Key>();
                                            break;
                                        case "ShowUI":
-                                        viewModel.KeyboardHotkey.ShowUI = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.ShowUI = buttonValue.AsHidType<Key>();
                                            break;
                                        case "Pause":
-                                        viewModel.KeyboardHotkey.Pause = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.Pause = buttonValue.AsHidType<Key>();
                                            break;
                                        case "ToggleMute":
-                                        viewModel.KeyboardHotkey.ToggleMute = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.ToggleMute = buttonValue.AsHidType<Key>();
                                            break;
                                        case "ResScaleUp":
-                                        viewModel.KeyboardHotkey.ResScaleUp = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.ResScaleUp = buttonValue.AsHidType<Key>();
                                            break;
                                        case "ResScaleDown":
-                                        viewModel.KeyboardHotkey.ResScaleDown = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.ResScaleDown = buttonValue.AsHidType<Key>();
                                            break;
                                        case "VolumeUp":
-                                        viewModel.KeyboardHotkey.VolumeUp = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.VolumeUp = buttonValue.AsHidType<Key>();
                                            break;
                                        case "VolumeDown":
-                                        viewModel.KeyboardHotkey.VolumeDown = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.VolumeDown = buttonValue.AsHidType<Key>();
                                            break;
                                        case "CustomVSyncIntervalIncrement":
-                                        viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.CustomVSyncIntervalIncrement =
+                                                buttonValue.AsHidType<Key>();
                                            break;
                                        case "CustomVSyncIntervalDecrement":
-                                        viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = buttonValue.AsHidType<Key>();
+                                            ViewModel.KeyboardHotkey.CustomVSyncIntervalDecrement =
+                                                buttonValue.AsHidType<Key>();
                                            break;
                                    }
+                                });
                            }
                        };

--- a/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml.cs
@@ -1,16 +1,14 @@
-using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using System;

 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsNetworkView : UserControl
+    public partial class SettingsNetworkView : RyujinxControl<SettingsViewModel>
    {
        private readonly Random _random;

-        public SettingsViewModel ViewModel;
-
        public SettingsNetworkView()
        {
            _random = new Random();
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -191,15 +191,15 @@
                        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}"/>
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
+                                Width="250"/>
+                        </CheckBox>
                        <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                    </StackPanel>
                    <Separator />
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs
@@ -1,13 +1,12 @@
 using Avalonia.Controls;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;

 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsSystemView : UserControl
+    public partial class SettingsSystemView : RyujinxControl<SettingsViewModel>
    {
-        public SettingsViewModel ViewModel;
-
        public SettingsSystemView()
        {
            InitializeComponent();
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -6,7 +6,6 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
    mc:Ignorable="d"
    x:DataType="viewModels:SettingsViewModel">
    <Design.DataContext>
@@ -19,7 +18,9 @@
        HorizontalScrollBarVisibility="Disabled"
        VerticalScrollBarVisibility="Auto">
        <Border Classes="settings">
+            <Grid ColumnDefinitions="Auto,Auto,*" HorizontalAlignment="Stretch">
                <StackPanel
+                    Grid.Column="0"
                    Margin="10"
                    HorizontalAlignment="Stretch"
                    Orientation="Vertical"
@@ -54,9 +55,10 @@
                        <CheckBox
                            IsEnabled="{Binding !IsGameTitleNotNull}"
                            Opacity="{Binding PanelOpacity}"
-                        IsChecked="{Binding ShowTitleBar}" IsVisible="{x:Static helper:RunningPlatform.IsWindows}">
+                            IsChecked="{Binding ShowOldUI}"
+                            ToolTip.Tip="{ext:Locale SettingsTabGeneralShowOldUIToolTip}">
                            <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowTitleBar}" />
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralShowOldUI}" />
                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                            </StackPanel>
                        </CheckBox>
@@ -79,7 +81,8 @@
                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
                                </ComboBoxItem>
                                <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
+                                    <TextBlock
+                                        Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
                                </ComboBoxItem>
                                <ComboBoxItem>
                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
@@ -101,7 +104,8 @@
                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
                                </ComboBoxItem>
                                <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
+                                    <TextBlock
+                                        Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
                                </ComboBoxItem>
                                <ComboBoxItem>
                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
@@ -154,7 +158,20 @@
                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                        </StackPanel>
                    </StackPanel>
-                <Separator Height="1" />
+                </StackPanel>
+                <Border Grid.Column="1"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        Margin="10, 10, 10, 0"
+                        Height="405"
+                        BorderBrush="Gray"
+                        Background="Gray"
+                        Width="1" />
+                <StackPanel
+                    Margin="10"
+                    Spacing="10"
+                    Grid.Column="2"
+                    Orientation="Vertical" HorizontalAlignment="Stretch">
                    <StackPanel Orientation="Horizontal">
                        <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
                        <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
@@ -210,7 +227,8 @@
                            <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                        </StackPanel>
-                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
+                        <TextBlock Foreground="{DynamicResource SecondaryTextColor}"
+                                   Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
                    </StackPanel>
                    <StackPanel
                        IsEnabled="{Binding !IsGameTitleNotNull}"
@@ -258,6 +276,7 @@
                        </Grid>
                    </StackPanel>
                </StackPanel>
+            </Grid>
        </Border>
    </ScrollViewer>
 </UserControl>
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs
@@ -3,10 +3,10 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using Gommon;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -14,20 +14,18 @@ using System.Threading.Tasks;

 namespace Ryujinx.Ava.UI.Views.Settings
 {
-    public partial class SettingsUiView : UserControl
+    public partial class SettingsUiView : RyujinxControl<SettingsViewModel>
    {
-        public SettingsViewModel ViewModel;
-
        public SettingsUiView()
        {
            InitializeComponent();
            AddGameDirButton.Command =
-                Commands.Create(() => AddDirButton(GameDirPathBox, ViewModel.GameDirectories, true));
+                Commands.Create(() => AddDirButton(GameDirPathBox, ViewModel.GameDirectories));
            AddAutoloadDirButton.Command =
-                Commands.Create(() => AddDirButton(AutoloadDirPathBox, ViewModel.AutoloadDirectories, false));
+                Commands.Create(() => AddDirButton(AutoloadDirPathBox, ViewModel.AutoloadDirectories));
        }

-        private async Task AddDirButton(TextBox addDirBox, AvaloniaList<string> directories, bool isGameList)
+        private async Task AddDirButton(TextBox addDirBox, AvaloniaList<string> directories)
        {
            string path = addDirBox.Text;

--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs
@@ -8,7 +8,6 @@ using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
-using System;
 using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;

 namespace Ryujinx.Ava.UI.Views.User
--- a/src/Ryujinx/UI/Views/User/UserRecovererView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserRecovererView.axaml.cs
@@ -1,4 +1,3 @@
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Navigation;
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs
@@ -1,4 +1,3 @@
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
--- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
+++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
@@ -6,6 +6,7 @@
    xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
+    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    mc:Ignorable="d"
    d:DesignWidth="400"
    d:DesignHeight="350"
@@ -23,7 +24,25 @@
        <viewModels:AmiiboWindowViewModel />
    </Design.DataContext>
    <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
-        <Grid ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
+        <Grid Name="FlushControls" ColumnDefinitions="Auto,Auto" Grid.Row="1" Margin="-15">
+            <controls:RyujinxLogo 
+                Grid.Column="0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Margin="8, 8, 7, 0"
+                ToolTip.Tip="{ext:WindowTitle Amiibo}" />
+            <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0, 0, 0, 100">
+                <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
+                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
+                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
+                </StackPanel>
+                <StackPanel Margin="15, 0, 0, 0" Spacing="10" Orientation="Horizontal" >
+                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboCharacterLabel}" />
+                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding AmiiboSelectedIndex}" MinWidth="100" ItemsSource="{Binding AmiiboList}" />
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+        <Grid Name="NormalControls" ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
            <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
                <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
                <ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
--- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
@@ -1,13 +1,14 @@
 using Avalonia.Interactivity;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models.Amiibo;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;

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

            InitializeComponent();

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

--- a/src/Ryujinx/UI/Windows/CheatWindow.axaml
+++ b/src/Ryujinx/UI/Windows/CheatWindow.axaml
@@ -6,6 +6,7 @@
    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
+    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    Width="600"
    Height="750"
    MinWidth="500"
@@ -20,6 +21,48 @@
        </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"
@@ -52,6 +95,7 @@
                VerticalAlignment="Center"
                Text="{Binding BuildId}"
                IsReadOnly="True" />
+        </Grid>
        <Border
            Grid.Row="3"
            Grid.Column="0"
--- a/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
@@ -1,5 +1,4 @@
 using Avalonia.Collections;
-using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.Systems.AppLibrary;
@@ -32,7 +31,7 @@ namespace Ryujinx.Ava.UI.Windows
            Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
        }

-        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
+        public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath) : base(useCustomTitleBar: true, 46)
        {
            MinWidth = 500;
            MinHeight = 650;
@@ -44,6 +43,9 @@ 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
+++ b/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml
@@ -7,6 +7,7 @@
             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"
@@ -18,11 +19,10 @@
    </window:StyleableAppWindow.DataContext>
    <Grid RowDefinitions="Auto,*">
        <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto" Name="FlushControls">
-            <Image
-                Name="RyuLogo"
+            <controls:RyujinxLogo 
+                Grid.Column="0"
                Margin="15, 0, 7, 0"
-                Height="25"
-                Width="25" />
+                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}" />
@@ -40,7 +40,7 @@
                        <DataTemplate DataType="{x:Type systems:CompatibilityEntry}">
                            <Grid MinWidth="800"
                                  Margin="10"
-                                  ColumnDefinitions="*,Auto,Auto,*"
+                                  ColumnDefinitions="Auto,Auto,Auto,*"
                                  Background="Transparent"
                                  ToolTip.Tip="{Binding  LocalizedLastUpdated}">
                                <TextBlock Grid.Column="0"
--- a/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml.cs
@@ -1,41 +1,37 @@
 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
+        public static async Task Show(string titleId = null)
        {
-                DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary),
+            using CompatibilityViewModel compatWindow = new(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary);
+            
+            await ShowAsync(new CompatibilityListWindow
+            {
+                DataContext = compatWindow,
                SearchBoxFlush = { Text = titleId ?? string.Empty },
                SearchBoxNormal = { Text = titleId ?? string.Empty }
            });
+        }

-        public CompatibilityListWindow()
+        public CompatibilityListWindow() : base(useCustomTitleBar: true, 37)
        {
            Title = RyujinxApp.FormatTitle(LocaleKeys.CompatibilityListTitle);
            
-            TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
-            TitleBar.TitleBarHitTestType = ConfigurationState.Instance.ShowTitleBar ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
-            TitleBar.Height = 37;
-            
            InitializeComponent();
            
-            RyuLogo.Source = MainWindowViewModel.IconBitmap;
-            FlushControls.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
-            NormalControls.IsVisible = ConfigurationState.Instance.ShowTitleBar;
+            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)
--- a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
@@ -13,7 +13,7 @@
    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
    Width="1100"
    Height="910"
-    MinWidth="800"
+    MinWidth="1037"
    MinHeight="480"
    WindowStartupLocation="CenterOwner"
    x:DataType="viewModels:SettingsViewModel"
--- a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
@@ -1,25 +1,9 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
-using Avalonia.Input;
-using Avalonia.Media.Imaging;
-using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
-using Projektanker.Icons.Avalonia;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
-using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Systems.Configuration;
-using Ryujinx.Common.Configuration;
-using Ryujinx.HLE.FileSystem;
-using Ryujinx.HLE.HOS.SystemState;
-using Ryujinx.Input;
 using System;
-using System.IO;
 using System.Linq;
-using Key = Avalonia.Input.Key;


 namespace Ryujinx.Ava.UI.Windows
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -7,13 +7,12 @@ using Avalonia.Platform;
 using Avalonia.Threading;
 using DynamicData;
 using FluentAvalonia.UI.Controls;
-using FluentAvalonia.UI.Windowing;
 using Gommon;
 using LibHac.Ns;
-using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
+using Ryujinx.Ava.Systems;
 using Ryujinx.Ava.UI.Applet;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
@@ -76,7 +75,7 @@ namespace Ryujinx.Ava.UI.Windows
        public readonly double StatusBarHeight;
        public readonly double MenuBarHeight;

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

            ViewModel.Title = RyujinxApp.FormatTitle();

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

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

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

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

            InitializeComponent();
+
+            NavPanel.PaneDisplayMode =
+                ConfigurationState.Instance.ShowOldUI
+                    ? NavigationViewPaneDisplayMode.Left
+                    : NavigationViewPaneDisplayMode.Top;
+
+            Height = ConfigurationState.Instance.ShowOldUI
+                ? 906
+                : 954; // 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,7 +6,8 @@ using Avalonia.Media;
 using Avalonia.Platform;
 using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.Controls;
 using System.Threading.Tasks;

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

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

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

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

        private void LocaleChanged()
Author	SHA1	Message	Date
Daniel Nylander	6b402847d2	Updated Swedish in locales.json (#748 )	2025-03-11 05:16:33 -05:00
shinyoyo	3b06f4cb78	Updated Zh-CN Simplified Chinese. (#737 )	2025-03-11 01:35:19 -05:00
Evan Husted	cdf60eecc0	small readme update (test)	2025-03-11 06:06:10 +00:00
Evan Husted	1219f329c1	misc: chore: [ci skip] fully fix changelog urls for stable	2025-03-10 01:24:06 -05:00
Evan Husted	d5527f87cb	UI: [ci skip] fix changelog urls on new release channel	2025-03-08 21:07:03 -06:00
Evan Husted	fc75dbc8b8	Update release.yml	2025-03-08 20:49:21 -06:00
Evan Husted	04361b864a	stable release channel repo	2025-03-08 20:45:47 -06:00
rrondo	7271e7050d	Ukrainian localization update (#755 )	2025-03-07 23:28:25 -06:00
Evan Husted	1ca4484148	UI: Fix overlapping text when window is made too small	2025-03-06 04:31:28 -06:00
Evan Husted	056f56bc70	UI: Fix off-screen compat entry game names	2025-03-06 04:15:02 -06:00
Evan Husted	bda699f68e	UI: Inline game/autoload dir & motion/rumble/led	2025-03-06 04:12:34 -06:00
Evan Husted	0db85d0aa9	HLE: optional hack: disable IsAnyInternetRequestAccepted	2025-03-05 23:57:48 -06:00
Evan Husted	44632e5d8b	misc: ConfigurationFileFormat version 68	2025-03-05 23:03:55 -06:00
Evan Husted	551d2c1134	misc: chore: add/remove event handler as window is opened/closed	2025-03-05 23:01:37 -06:00
Evan Husted	25cc9b24b4	misc: chore: compat database code cleanups	2025-03-05 22:40:55 -06:00
Evan Husted	638c616ab7	misc: Move systems-like classes out of the base of the Ryujinx project and into Ryujinx.Ava.Systems	2025-03-05 22:27:37 -06:00
Evan Husted	109f0fc659	misc: chore: Cleanup unused using directives	2025-03-05 22:21:05 -06:00
Evan Husted	dfcb8a7fc0	misc: chore: Use RyujinxControl<T> in more places	2025-03-05 22:18:13 -06:00
Evan Husted	d87d3235e9	misc: chore: Move the windows that are shown via ContentDialogs out of Ryujinx.Ava.UI.Windows (they're not windows)	2025-03-05 22:06:20 -06:00
Evan Husted	f3a9cecf72	UI: Rename Show Title Bar + Revamp for global settings window	2025-03-05 18:39:42 -06:00
Evan Husted	97a1bbdd74	UI: Fix consistency of checkboxes in system settings	2025-03-05 17:50:40 -06:00
Evan Husted	e379fad5da	UI: Custom title bar support for Amiibo window	2025-03-05 15:56:43 -06:00
Evan Husted	c76f32a4ee	UI: Give the cheat manager the custom window title bar treatment	2025-03-05 13:59:51 -06:00
Evan Husted	7bdf013ba6	misc: chore: [ci skip] change the initial dynamic values to a proper object initializer	2025-03-05 02:45:34 -06:00
Evan Husted	e07130ecc3	UI: Fix the unformatted title window when not using custom title bar in compat window	2025-03-05 02:35:13 -06:00
Evan Husted	dd02c8e25d	misc: chore: add helper constructor parameter to StyleableWindow to auto use custom title bar based on configuration	2025-03-05 02:34:34 -06:00
Evan Husted	bed3835718	UI: fix ID copying from the Show Game Info popup	2025-03-05 02:23:40 -06:00