Merge fc12d99716 into 3ffcc72117

Updated Swedish in locales.json
2025-02-25 07:46:44 +01:00 · 2025-02-25 07:46:29 +01:00
57 changed files with 480 additions and 1842 deletions
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ If you are planning to contribute or just want to learn more about this project

 - **Input**

-  We currently have support for keyboard, mouse, touch input, Joy-Con input support, and nearly all controllers.
+  We currently have support for keyboard, mouse, touch input, JoyCon input support, and nearly all controllers.
  Motion controls are natively supported in most cases; for dual-JoyCon motion support, DS4Windows or BetterJoy are currently required.
  In all scenarios, you can set up everything inside the input configuration menu.

--- a/src/ARMeilleure/Translation/Cache/JitCache.cs
+++ b/src/ARMeilleure/Translation/Cache/JitCache.cs
@@ -24,7 +24,7 @@ namespace ARMeilleure.Translation.Cache

        private static JitCacheInvalidation _jitCacheInvalidator;

-        private static List<CacheMemoryAllocator> _cacheAllocators = [];
+        private static CacheMemoryAllocator _cacheAllocator;

        private static readonly List<CacheEntry> _cacheEntries = [];

@@ -40,48 +40,37 @@ namespace ARMeilleure.Translation.Cache

        public static void Initialize(IJitMemoryAllocator allocator)
        {
+            if (_initialized)
+            {
+                return;
+            }
+
            lock (_lock)
            {
                if (_initialized)
                {
-                    if (OperatingSystem.IsWindows())
-                    {
-                        JitUnwindWindows.RemoveFunctionTableHandler(
-                            _jitRegions[0].Pointer);
-                    }
-
-                    for (int i = 0; i < _jitRegions.Count; i++)
-                    {
-                        _jitRegions[i].Dispose();
-                    }
-
-                    _jitRegions.Clear();
-                    _cacheAllocators.Clear();
+                    return;
                }
-                else
-                {
-                    _initialized = true;
-                }
-
-                _activeRegionIndex = 0;

                ReservedRegion firstRegion = new(allocator, CacheSize);
                _jitRegions.Add(firstRegion);
-
-                CacheMemoryAllocator firstCacheAllocator = new(CacheSize);
-                _cacheAllocators.Add(firstCacheAllocator);
+                _activeRegionIndex = 0;

                if (!OperatingSystem.IsWindows() && !OperatingSystem.IsMacOS())
                {
                    _jitCacheInvalidator = new JitCacheInvalidation(allocator);
                }

+                _cacheAllocator = new CacheMemoryAllocator(CacheSize);
+
                if (OperatingSystem.IsWindows())
                {
                    JitUnwindWindows.InstallFunctionTableHandler(
                        firstRegion.Pointer, CacheSize, firstRegion.Pointer + Allocate(_pageSize)
                    );
                }
+
+                _initialized = true;
            }
        }

@@ -147,7 +136,7 @@ namespace ARMeilleure.Translation.Cache

                    if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
                    {
-                        _cacheAllocators[_activeRegionIndex].Free(funcOffset, AlignCodeSize(entry.Size));
+                        _cacheAllocator.Free(funcOffset, AlignCodeSize(entry.Size));
                        _cacheEntries.RemoveAt(entryIndex);
                    }

@@ -178,24 +167,30 @@ namespace ARMeilleure.Translation.Cache
        {
            codeSize = AlignCodeSize(codeSize);

-            int allocOffset = _cacheAllocators[_activeRegionIndex].Allocate(codeSize);
-
-            if (allocOffset >= 0)
+            for (int i = _activeRegionIndex; i < _jitRegions.Count; i++)
            {
-                _jitRegions[_activeRegionIndex].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
-                return allocOffset;
+                int allocOffset = _cacheAllocator.Allocate(codeSize);
+        
+                if (allocOffset >= 0)
+                {
+                    _jitRegions[i].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
+                    _activeRegionIndex = i;
+                    return allocOffset;
+                }
            }

            int exhaustedRegion = _activeRegionIndex;
            ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize);
            _jitRegions.Add(newRegion);
            _activeRegionIndex = _jitRegions.Count - 1;
+            
+            int newRegionNumber = _activeRegionIndex;

-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {_activeRegionIndex} ({((long)(_activeRegionIndex + 1) * CacheSize).Bytes()} Total Allocation).");
+            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((long)(newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
+        
+            _cacheAllocator = new CacheMemoryAllocator(CacheSize);

-            _cacheAllocators.Add(new CacheMemoryAllocator(CacheSize));
-
-            int allocOffsetNew = _cacheAllocators[_activeRegionIndex].Allocate(codeSize);
+            int allocOffsetNew = _cacheAllocator.Allocate(codeSize);
            if (allocOffsetNew < 0)
            {
                throw new OutOfMemoryException("Failed to allocate in new Cache Region!");
--- a/src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs
+++ b/src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs
@@ -52,11 +52,6 @@ namespace ARMeilleure.Translation.Cache
            nint context,
            [MarshalAs(UnmanagedType.LPWStr)] string outOfProcessCallbackDll);

-        [LibraryImport("kernel32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static unsafe partial bool RtlDeleteFunctionTable(
-            ulong tableIdentifier);
-
        private static GetRuntimeFunctionCallback _getRuntimeFunctionCallback;

        private static int _sizeOfRuntimeFunction;
@@ -96,23 +91,6 @@ namespace ARMeilleure.Translation.Cache
            }
        }

-        public static void RemoveFunctionTableHandler(nint codeCachePointer)
-        {
-            ulong codeCachePtr = (ulong)codeCachePointer.ToInt64();
-
-            bool result;
-
-            unsafe
-            {
-                result = RtlDeleteFunctionTable(codeCachePtr | 3);
-            }
-
-            if (!result)
-            {
-                throw new InvalidOperationException("Failure removing function table callback.");
-            }
-        }
-
        private static unsafe RuntimeFunction* FunctionTableHandler(ulong controlPc, nint context)
        {
            int offset = (int)((long)controlPc - context.ToInt64());
--- a/src/Ryujinx.Common/Helpers/RunningPlatform.cs
+++ b/src/Ryujinx.Common/Helpers/RunningPlatform.cs
@@ -5,34 +5,15 @@ using System.Runtime.InteropServices;

 namespace Ryujinx.Common.Helper
 {
-    public enum OperatingSystemType
-    {
-        MacOS,
-        Linux,
-        Windows   
-    }
-    
    public static class RunningPlatform
    {
-        public static readonly OperatingSystemType CurrentOS 
-            = IsMacOS 
-                ? OperatingSystemType.MacOS 
-                : IsWindows
-                    ? OperatingSystemType.Windows
-                    : IsLinux
-                        ? OperatingSystemType.Linux
-                        : throw new PlatformNotSupportedException();
-
-        public static Architecture Architecture => RuntimeInformation.OSArchitecture;
-        public static Architecture CurrentProcessArchitecture => RuntimeInformation.ProcessArchitecture;
-        
        public static bool IsMacOS => OperatingSystem.IsMacOS();
        public static bool IsWindows => OperatingSystem.IsWindows();
        public static bool IsLinux => OperatingSystem.IsLinux();
        
-        public static bool IsArm => Architecture is Architecture.Arm64;
+        public static bool IsArm => RuntimeInformation.OSArchitecture is Architecture.Arm64;
        
-        public static bool IsX64 => Architecture is Architecture.X64;
+        public static bool IsX64 => RuntimeInformation.OSArchitecture is Architecture.X64;

        public static bool IsIntelMac => IsMacOS && IsX64;
        public static bool IsArmMac => IsMacOS && IsArm;
--- a/src/Ryujinx.HLE/Loaders/Mods/MemPatch.cs
+++ b/src/Ryujinx.HLE/Loaders/Mods/MemPatch.cs
@@ -71,24 +71,16 @@ namespace Ryujinx.HLE.Loaders.Mods
                int patchOffset = (int)offset;
                int patchSize = patch.Length;

-                if (patchOffset < protectedOffset)
+                if (patchOffset < protectedOffset || patchOffset > memory.Length)
                {
-                    Logger.Warning?.Print(LogClass.ModLoader, $"Attempted to patch protected memory ({patchOffset:x} is within protected boundary of {protectedOffset:x}).");
-                    continue;
-                }
-                
-                if (patchOffset > memory.Length)
-                {
-                    Logger.Warning?.Print(LogClass.ModLoader, $"Attempted to patch out of bounds memory (offset {patchOffset} ({patchOffset:x}) exceeds memory buffer length {memory.Length}).");
-                    continue;
+                    continue; // Add warning?
                }

                patchOffset -= protectedOffset;

                if (patchOffset + patchSize > memory.Length)
                {
-                    Logger.Warning?.Print(LogClass.ModLoader, $"Patch offset ({patchOffset:x}) + size ({patchSize}) is greater than the size of the memory buffer ({memory.Length}). Attempting to fix this...");
-                    patchSize = memory.Length - patchOffset;
+                    patchSize = memory.Length - patchOffset; // Add warning?
                }

                Logger.Info?.Print(LogClass.ModLoader, $"Patching address offset {patchOffset:x} <= {BitConverter.ToString(patch).Replace('-', ' ')} len={patchSize}");
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -1113,13 +1113,6 @@ namespace Ryujinx.Ava
            });

            (RendererHost.EmbeddedWindow as EmbeddedWindowOpenGL)?.MakeCurrent(true);
-            
-            // Reload settings when the game is turned off
-            // (resets custom settings if there were any)
-            Program.ReloadConfig();
-
-            // Reload application list (changes the status of the user setting if it was added or removed during the game)
-            Dispatcher.UIThread.Post(() => RyujinxApp.MainWindow.LoadApplications());
        }

        public void InitStatus()
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -1,8 +1,7 @@
-<Styles
+<Styles
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia">
    <Design.PreviewWith>
        <Border Height="2000"
@@ -31,8 +30,7 @@
                        <Button
                            Name="btnRem"
                            HorizontalAlignment="Right"
-                            Content="Add" 
-                            Classes="red"/>                
+                            Content="Add" />
                        <TextBox
                            Width="100"
                            VerticalAlignment="Center"
@@ -43,13 +41,7 @@
                    </StackPanel>
                </Grid>
                <ui:NumberBox Value="1" />
-                <MenuItem
-                    Header="123 0000"
-                    ToolTip.Tip="What this"/>
-                <TextBlock
-                         Classes="globalConfigMarker"/>
            </StackPanel>
-            
        </Border>
    </Design.PreviewWith>
    <Style Selector="DropDownButton">
@@ -339,14 +331,6 @@
        <Setter Property="Margin"
                Value="0,5,0,0" />
    </Style>
-    <Style Selector="TextBlock.globalConfigMarker" >
-        <Setter Property="Foreground" Value="SeaGreen"/>
-        <Setter Property="Margin" Value="5,0,0,0"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="Text" Value="{ext:Locale GameSpecificConfigurationGlobal}"/>  
-    </Style>
-    <Style Selector="StackPanel.globalConfigMarker">
-    </Style>
    <Style Selector="ContextMenu">
        <Setter Property="BorderBrush"
                Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
@@ -389,19 +373,6 @@
        <Setter Property="Background"
                Value="{DynamicResource AppListHoverBackgroundColor}" />
    </Style>
-    <Style Selector="Button.red /template/ ContentPresenter">
-        <Setter Property="CornerRadius" Value="4"/>
-            <Setter Property="Background" Value="red"/>
-            <Setter Property="Foreground" Value="White"/>
-        </Style>
-        <Style Selector="Button.red:pointerover /template/ ContentPresenter">
-            <Setter Property="CornerRadius" Value="4"/>
-            <Setter Property="Background" Value="{DynamicResource WarningBackgroundColor}" />
-            <Setter Property="Foreground" Value="White"/>
-    </Style>
-
-
-
    <Styles.Resources>
        <SolidColorBrush x:Key="ThemeAccentColorBrush"
                         Color="{DynamicResource SystemAccentColor}" />
--- a/src/Ryujinx/Assets/Styles/Themes.xaml
+++ b/src/Ryujinx/Assets/Styles/Themes.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <ResourceDictionary.ThemeDictionaries>
        <ResourceDictionary x:Key="Default">
@@ -12,13 +12,11 @@
            <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
            <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
            <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
-            <Color x:Key="WarningBackgroundColor">#FF6347</Color>
            <Color x:Key="SecondaryTextColor">#A0000000</Color>
            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
            <Color x:Key="Switch">#FF2EEAC9</Color>
            <Color x:Key="Unbounded">#FFFF4554</Color>
            <Color x:Key="Custom">#6483F5</Color>
-            <Color x:Key="Warning">#800080</Color>
        </ResourceDictionary>
        <ResourceDictionary x:Key="Light">
            <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -31,13 +29,11 @@
            <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
            <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
            <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
-            <Color x:Key="WarningBackgroundColor">#FF6347</Color>
            <Color x:Key="SecondaryTextColor">#A0000000</Color>
            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
            <Color x:Key="Switch">#13c3a4</Color>
            <Color x:Key="Unbounded">#FFFF4554</Color>
            <Color x:Key="Custom">#6483F5</Color>
-            <Color x:Key="Warning">#800080</Color>
        </ResourceDictionary>
        <ResourceDictionary x:Key="Dark">
            <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -50,13 +46,11 @@
            <Color x:Key="MenuFlyoutPresenterBorderColor">#3D3D3D</Color>
            <Color x:Key="AppListBackgroundColor">#0FFFFFFF</Color>
            <Color x:Key="AppListHoverBackgroundColor">#1EFFFFFF</Color>
-            <Color x:Key="WarningBackgroundColor">#FF6347</Color>
            <Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
            <Color x:Key="Switch">#FF2EEAC9</Color>
            <Color x:Key="Unbounded">#FFFF4554</Color>
            <Color x:Key="Custom">#6483F5</Color>
-            <Color x:Key="Warning">#FFA500</Color>
        </ResourceDictionary>
    </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -2747,56 +2747,6 @@
        "zh_TW": "建立桌面捷徑，啟動選取的應用程式"
      }
    },
-    {
-      "ID": "GameListContextMenuCreateCustomConfiguration",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Create Custom Configuration",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "Создать пользовательскую конфигурацию",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "GameListContextMenuEditCustomConfiguration",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Edit Custom Configuration",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "Изменить пользовательскую конфигурацию",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
    {
      "ID": "GameListContextMenuCreateShortcutToolTipMacOS",
      "Translations": {
@@ -2822,56 +2772,6 @@
        "zh_TW": "在 macOS 的應用程式資料夾中建立捷徑，啟動選取的應用程式"
      }
    },
-    {
-      "ID": "CreateCustomConfigurationToolTip",
-      "Translations": {
-        "ar_SA": "ينشئ تكوينًا مستقلًا للعبة الحالية",
-        "de_DE": "Erstellt eine unabhängige Konfiguration für das aktuelle Spiel",
-        "el_GR": "Δημιουργεί μια ανεξάρτητη διαμόρφωση για το τρέχον παιχνίδι",
-        "en_US": "Creates an independent configuration for the selected game",
-        "es_ES": "Crea una configuración independiente para el juego actual",
-        "fr_FR": "Crée une configuration indépendante pour le jeu en cours",
-        "he_IL": "יוצר תצורה עצמאית למשחק הנוכחי",
-        "it_IT": "Crea una configurazione indipendente per il gioco attuale",
-        "ja_JP": "現在のゲーム用の独立した設定を作成します",
-        "ko_KR": "현재 게임에 대한 독립적인 설정을 생성합니다",
-        "no_NO": "Oppretter en uavhengig konfigurasjon for det gjeldende spillet",
-        "pl_PL": "Tworzy niezależną konfigurację dla bieżącej gry",
-        "pt_BR": "Cria uma configuração independente para o jogo atual",
-        "ru_RU": "Создает независимую конфигурацию для текущей игры",
-        "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": "Створює незалежну конфігурацію для поточної гри",
-        "zh_CN": "为当前游戏创建独立的配置",
-        "zh_TW": "為當前遊戲創建獨立的配置"
-      }
-    },
-    {
-      "ID": "EditCustomConfigurationToolTip",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Edit your existing independent configuration for the selected game",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "Отредактировать существующую независимую конфигурацию для выбранной игры.",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
    {
      "ID": "GameListContextMenuShowCompatEntry",
      "Translations": {
@@ -3397,31 +3297,6 @@
        "zh_TW": "設定"
      }
    },
-    {
-      "ID": "SettingsWithInfo",
-      "Translations": {
-        "ar_SA": "{0} - إعدادات",
-        "de_DE": "Einstellungen - {0}",
-        "el_GR": "Ρυθμίσεις - {0}",
-        "en_US": "Settings - {0}",
-        "es_ES": "Configuración - {0}",
-        "fr_FR": "Paramètres - {0}",
-        "he_IL": "{0} - הגדרות",
-        "it_IT": "Impostazioni - {0}",
-        "ja_JP": "設定 - {0}",
-        "ko_KR": "설정 - {0}",
-        "no_NO": "Innstillinger - {0}",
-        "pl_PL": "Ustawienia - {0}",
-        "pt_BR": "Configurações - {0}",
-        "ru_RU": "Параметры - {0}",
-        "sv_SE": "Inställningar - {0}",
-        "th_TH": "ตั้งค่า - {0}",
-        "tr_TR": "Ayarlar - {0}",
-        "uk_UA": "Налаштування - {0}",
-        "zh_CN": "设置 - {0}",
-        "zh_TW": "設定 - {0}"
-      }
-    },
    {
      "ID": "SettingsTabGeneral",
      "Translations": {
@@ -5013,7 +4888,7 @@
        "no_NO": "Lyd Inn/Ut",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Выход/Вход звука",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -6563,7 +6438,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Ок",
+        "ru_RU": "",
        "sv_SE": "Ok",
        "th_TH": "ตกลง",
        "tr_TR": "Tamam",
@@ -7013,7 +6888,7 @@
        "no_NO": "",
        "pl_PL": "Pro Kontroler",
        "pt_BR": "",
-        "ru_RU": "Pro контроллер",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "โปรคอนโทรลเลอร์",
        "tr_TR": "Profesyonel Kumanda",
@@ -12772,31 +12647,6 @@
        "zh_TW": "正在下載更新..."
      }
    },
-    {
-      "ID": "DialogRebooterMessage",
-      "Translations": {
-        "ar_SA": "من فضلك انتظر، المحاكي في طور إعادة التشغيل",
-        "de_DE": "Bitte warten Sie, der Emulator wird neu gestartet",
-        "el_GR": "Παρακαλώ περιμένετε, ο εξομοιωτής επανεκκινείται",
-        "en_US": "Please wait, the emulator is restarting",
-        "es_ES": "Por favor, espere, el emulador se está reiniciando",
-        "fr_FR": "Veuillez patienter, l'émulateur est en train de redémarrer",
-        "he_IL": "אנא המתן, המחקה מתארגן מחדש",
-        "it_IT": "Attendere prego, l'emulatore si sta riavviando",
-        "ja_JP": "お待ちください、エミュレーターが再起動しています",
-        "ko_KR": "잠시만 기다려 주세요, 에뮬레이터가 재시작 중입니다",
-        "no_NO": "Vennligst vent, emulatoren starter på nytt",
-        "pl_PL": "Proszę czekać, emulator jest w trakcie ponownego uruchamiania",
-        "pt_BR": "Por favor, aguarde, o emulador está reiniciando",
-        "ru_RU": "Пожалуйста, подождите, эмулятор перезапускается",
-        "sv_SE": "Vänligen vänta, emulatorn startar om",
-        "th_TH": "กรุณารอสักครู่, ตัวจำลองกำลังเริ่มใหม่",
-        "tr_TR": "Lütfen bekleyin, emülatör yeniden başlatılıyor",
-        "uk_UA": "Будь ласка, зачекайте, емулятор перезавантажується",
-        "zh_CN": "请稍等，模拟器正在重新启动",
-        "zh_TW": "請稍候，模擬器正在重新啟動"
-      }
-    },
    {
      "ID": "DialogUpdaterExtractionMessage",
      "Translations": {
@@ -19672,31 +19522,6 @@
        "zh_TW": "{0} 更新程式"
      }
    },
-    {
-      "ID": "RyujinxRebooter",
-      "Translations": {
-        "ar_SA": "إعادة تشغيل {0}",
-        "de_DE": "Neustart von {0}",
-        "el_GR": "Επανεκκίνηση {0}",
-        "en_US": "{0} Reboot",
-        "es_ES": "Reinicio de {0}",
-        "fr_FR": "Redémarrage de {0}",
-        "he_IL": "אתחול {0}",
-        "it_IT": "Riavvio di {0}",
-        "ja_JP": "{0} 再起動",
-        "ko_KR": "{0} 재부팅",
-        "no_NO": "Omstart av {0}",
-        "pl_PL": "Ponowne uruchomienie {0}",
-        "pt_BR": "Reinício de {0}",
-        "ru_RU": "{0} Перезагрузка",
-        "sv_SE": "Ominläsning av {0}",
-        "th_TH": "เริ่มต้นใหม่ {0}",
-        "tr_TR": "{0} Yeniden Başlatma",
-        "uk_UA": "Перезавантаження {0}",
-        "zh_CN": "{0} 重启",
-        "zh_TW": "{0} 重新啟動"
-      }
-    },
    {
      "ID": "SettingsTabHotkeys",
      "Translations": {
@@ -20013,7 +19838,7 @@
        "no_NO": "",
        "pl_PL": "",
        "pt_BR": "",
-        "ru_RU": "Амибо",
+        "ru_RU": "",
        "sv_SE": "",
        "th_TH": "",
        "tr_TR": "",
@@ -24172,56 +23997,6 @@
        "zh_TW": ""
      }
    },
-    {
-      "ID": "GameSpecificConfigurationHeader",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Custom Config",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
-    {
-      "ID": "GameSpecificConfigurationGlobal",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "(Global)",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "sv_SE": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
    {
      "ID": "ExtractAocListHeader",
      "Translations": {
--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -54,7 +54,6 @@ namespace Ryujinx.Ava.Common.Locale
            SetDynamicValues(LocaleKeys.RyujinxInfo, RyujinxApp.FullAppName);
            SetDynamicValues(LocaleKeys.RyujinxConfirm, RyujinxApp.FullAppName);
            SetDynamicValues(LocaleKeys.RyujinxUpdater, RyujinxApp.FullAppName);
-            SetDynamicValues(LocaleKeys.RyujinxRebooter, RyujinxApp.FullAppName);
        }

        public string this[LocaleKeys key]
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -32,10 +32,8 @@ namespace Ryujinx.Ava
        public static double DesktopScaleFactor { get; set; } = 1.0;
        public static string Version { get; private set; }
        public static string ConfigurationPath { get; private set; }
-        public static string GlobalConfigurationPath { get; private set; }
        public static bool PreviewerDetached { get; private set; }
        public static bool UseHardwareAcceleration { get; private set; }
-        public static string BackendThreadingArg { get; private set; }

        [LibraryImport("user32.dll", SetLastError = true)]
        public static partial int MessageBoxA(nint hWnd, [MarshalAs(UnmanagedType.LPStr)] string text, [MarshalAs(UnmanagedType.LPStr)] string caption, uint type);
@@ -158,38 +156,11 @@ namespace Ryujinx.Ava
            }
        }

-        public static string GetDirGameUserConfig(string gameId, bool rememberGlobalDir = false, bool changeFolderForGame = false)
-        {
-            if (string.IsNullOrEmpty(gameId))
-            {
-                return "";
-            }
-
-            string gameDir = Path.Combine(AppDataManager.GamesDirPath, gameId, ReleaseInformation.ConfigName);
-
-            // Should load with the game if there is a custom setting for the game
-            if (rememberGlobalDir)
-            {
-                GlobalConfigurationPath = ConfigurationPath;
-            }
-
-            if (changeFolderForGame)
-            {
-                ConfigurationPath = gameDir;
-            }
-
-            return gameDir;
-        }
-
        public static void ReloadConfig()
        {
-            //It is necessary that when a user setting appears, the global setting remains available
-            GlobalConfigurationPath = null;
-
            string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
            string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);

-
            // Now load the configuration as the other subsystems are now registered
            if (File.Exists(localConfigurationPath))
            {
@@ -246,11 +217,6 @@ namespace Ryujinx.Ava
                    _ => ConfigurationState.Instance.Graphics.BackendThreading
                };

-            if (CommandLineState.OverrideBackendThreadingAfterReboot is not null)
-            {
-                BackendThreadingArg = CommandLineState.OverrideBackendThreadingAfterReboot;
-            }
-
            // Check if docked mode was overriden.
            if (CommandLineState.OverrideDockedMode.HasValue)
                ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
@@ -266,33 +232,6 @@ namespace Ryujinx.Ava
                    _ => ConfigurationState.Instance.HideCursor,
                };

-            // Check if memoryManagerMode was overridden. 
-            if (CommandLineState.OverrideMemoryManagerMode is not null)
-                if (Enum.TryParse(CommandLineState.OverrideMemoryManagerMode, true, out MemoryManagerMode result))
-                {
-                    ConfigurationState.Instance.System.MemoryManagerMode.Value = result;
-                }
-
-            // Check if PPTC was overridden. 
-            if (CommandLineState.OverridePPTC is not null)
-                if (Enum.TryParse(CommandLineState.OverridePPTC, true, out bool result))
-                {
-                    ConfigurationState.Instance.System.EnablePtc.Value = result;
-                }
-
-            // Check if region was overridden. 
-            if (CommandLineState.OverrideSystemRegion is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Ryujinx.HLE.HOS.SystemState.RegionCode result))
-                {
-                    ConfigurationState.Instance.System.Region.Value = (Utilities.Configuration.System.Region)result;
-                }
-
-            //Check if language was overridden. 
-            if (CommandLineState.OverrideSystemLanguage is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Ryujinx.HLE.HOS.SystemState.SystemLanguage result))
-                {
-                    ConfigurationState.Instance.System.Language.Value = (Utilities.Configuration.System.Language)result;
-                }

            // Check if hardware-acceleration was overridden.
            if (CommandLineState.OverrideHardwareAcceleration != null)
--- a/src/Ryujinx/Rebooter.cs
+++ b/src/Ryujinx/Rebooter.cs
@@ -1,76 +0,0 @@
-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;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava
-{
-    internal static class Rebooter
-    {
-
-        private static readonly string _updateDir = Path.Combine(Path.GetTempPath(), "Ryujinx", "update");
-
-
-        public static void RebootAppWithGame(string gamePath, List<string> args)
-        {
-            _ = Reboot(gamePath, args);
-
-        }
-
-        private static async Task Reboot(string gamePath, List<string> args)
-        {
-
-            bool shouldRestart = true;
-
-            TaskDialog taskDialog = new()
-            {
-                Header = LocaleManager.Instance[LocaleKeys.RyujinxRebooter],
-                SubHeader = LocaleManager.Instance[LocaleKeys.DialogRebooterMessage],
-                IconSource = new SymbolIconSource { Symbol = Symbol.Games },
-                XamlRoot = RyujinxApp.MainWindow,
-            };
-
-            if (shouldRestart)
-            {
-                List<string> arguments = CommandLineState.Arguments.ToList();
-                string executableDirectory = AppDomain.CurrentDomain.BaseDirectory;
-
-                var dialogTask = taskDialog.ShowAsync(true);
-                await Task.Delay(500);
-
-                // Find the process name.
-                string ryuName = Path.GetFileName(Environment.ProcessPath) ?? string.Empty;
-
-                // Fallback if the executable could not be found.
-                if (ryuName.Length == 0 || !Path.Exists(Path.Combine(executableDirectory, ryuName)))
-                {
-                    ryuName = OperatingSystem.IsWindows() ? "Ryujinx.exe" : "Ryujinx";
-                }
-
-                ProcessStartInfo processStart = new(ryuName)
-                {
-                    UseShellExecute = true,
-                    WorkingDirectory = executableDirectory,
-                };
-
-                foreach (var arg in args)
-                {
-                    processStart.ArgumentList.Add(arg);
-                }
-
-                processStart.ArgumentList.Add(gamePath);
-
-                Process.Start(processStart);
-
-                Environment.Exit(0);
-            }
-        }
-    }
-}
--- a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
+++ b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
@@ -95,7 +95,7 @@ namespace Ryujinx.Ava.UI.Applet
                            _parent.SettingsWindow =
                                new SettingsWindow(_parent.VirtualFileSystem, _parent.ContentManager);

-                            await StyleableAppWindow.ShowAsync(_parent.SettingsWindow, window);
+                            await _parent.SettingsWindow.ShowDialog(window);

                            _parent.SettingsWindow = null;

--- a/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml
+++ b/src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml
@@ -17,8 +17,12 @@
        <viewModels:ProfileSelectorDialogViewModel />
    </Design.DataContext>
    
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
-
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        
        <Border
            CornerRadius="5"
            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
@@ -19,18 +19,6 @@
        Header="{ext:Locale GameListContextMenuCreateShortcut}"
        Icon="{ext:Icon fa-solid fa-bookmark}"
        ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
-    <MenuItem
-        Click="EditGameConfiguration_Click"
-        IsVisible="{Binding SelectedApplication.HasIndependentConfiguration}"
-        Header="{ext:Locale GameListContextMenuEditCustomConfiguration}"
-        Icon="{ext:Icon fa-solid fa-gear}"
-        ToolTip.Tip="{ext:Locale EditCustomConfigurationToolTip}" />
-    <MenuItem
-       Click="EditGameConfiguration_Click"
-       IsVisible="{Binding !SelectedApplication.HasIndependentConfiguration}"
-       Header="{ext:Locale GameListContextMenuCreateCustomConfiguration}"
-       Icon="{ext:Icon fa-solid fa-gear}"
-       ToolTip.Tip="{ext:Locale CreateCustomConfigurationToolTip}" />
    <MenuItem
        IsVisible="{Binding HasCompatibilityEntry}"
        Click="OpenApplicationCompatibility_Click"
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -91,14 +91,11 @@ namespace Ryujinx.Ava.UI.Controls
        public async void OpenCheatManager_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await StyleableAppWindow.ShowAsync(
-                    new CheatWindow(
-                        viewModel.VirtualFileSystem,
-                        viewModel.SelectedApplication.IdString,
-                        viewModel.SelectedApplication.Name,
-                        viewModel.SelectedApplication.Path
-                    )
-                );
+                await new CheatWindow(
+                    viewModel.VirtualFileSystem,
+                    viewModel.SelectedApplication.IdString,
+                    viewModel.SelectedApplication.Name,
+                    viewModel.SelectedApplication.Path).ShowDialog((Window)viewModel.TopLevel);
        }

        public void OpenModsDirectory_Click(object sender, RoutedEventArgs args)
@@ -203,7 +200,7 @@ namespace Ryujinx.Ava.UI.Controls
                if (backupDir.Exists)
                {
                    cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
-                    cacheFiles.AddRange(backupDir.EnumerateFiles("*.info"));
+                    cacheFiles.AddRange(mainDir.EnumerateFiles("*.info"));
                }

                if (cacheFiles.Count > 0)
@@ -389,26 +386,13 @@ namespace Ryujinx.Ava.UI.Controls
                    viewModel.SelectedApplication.Icon
                );
        }
-
-        public async void EditGameConfiguration_Click(object sender, RoutedEventArgs args)
-        {
-            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-            {
-                await StyleableAppWindow.ShowAsync(new GameSpecificSettingsWindow(viewModel));
-
-                // just checking for file presence
-                viewModel.SelectedApplication.HasIndependentConfiguration = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
-
-                viewModel.RefreshView();
-            }
-        }
-
+        
        public async void OpenApplicationCompatibility_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
                await CompatibilityList.Show(viewModel.SelectedApplication.IdString);
        }
-               
+        
        public async void OpenApplicationData_Click(object sender, RoutedEventArgs args)
        {
            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -7,14 +7,16 @@
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    d:DesignHeight="450"
    d:DesignWidth="800"
    Focusable="True"
    mc:Ignorable="d"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    x:DataType="viewModels:MainWindowViewModel">
-    <Grid RowDefinitions="*">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
        <ListBox
            Grid.Row="0"
            Padding="8"
@@ -54,7 +56,11 @@
                            Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
                            ClipToBounds="True"
                            CornerRadius="4">
-                            <Grid RowDefinitions="Auto,Auto">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
                                <Image
                                    Grid.Row="0"
                                    HorizontalAlignment="Stretch"
@@ -67,18 +73,12 @@
                                    HorizontalAlignment="Stretch"
                                    VerticalAlignment="Stretch"
                                    IsVisible="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
-                                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                        <TextBlock
-                                            Text="{Binding Name}"
-                                            TextAlignment="Center"
-                                            TextWrapping="Wrap" />
-                                        <TextBlock
-                                            IsVisible="{Binding HasIndependentConfiguration}"
-                                            Text="{ext:Locale GameSpecificConfigurationHeader}"
-                                            TextAlignment="Center"
-                                            TextWrapping="Wrap"
-                                            Foreground="{DynamicResource Warning}" />
-                                    </StackPanel>
+                                    <TextBlock
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding Name}"
+                                        TextAlignment="Center"
+                                        TextWrapping="Wrap" />
                                </Panel>
                            </Grid>
                        </Border>
@@ -86,28 +86,10 @@
                            Margin="5,5,0,0"
                            HorizontalAlignment="Left"
                            VerticalAlignment="Top"
-                            FontSize="18"
+                            FontSize="16"
                            Foreground="{DynamicResource FavoriteApplicationIconColor}"
                            IsVisible="{Binding Favorite}"
                            Symbol="StarFilled" />
-                        <Grid IsVisible="{Binding !$parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
-                            <Border
-                                Margin="15,35,5,15"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Bottom"
-                                Width="90"
-                                Height="20"
-                                CornerRadius="4"
-                                IsVisible="{Binding HasIndependentConfiguration}"
-                                Background="{DynamicResource ThemeContentBackgroundColor}">
-                                <TextBlock
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Text="{ext:Locale GameSpecificConfigurationHeader}"
-                                    TextAlignment="Center"
-                                    TextWrapping="Wrap" />
-                            </Border>
-                        </Grid>
                    </Grid>
                </DataTemplate>
            </ListBox.ItemTemplate>
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -6,14 +6,16 @@
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
    d:DesignHeight="450"
    d:DesignWidth="800"
    Focusable="True"
    mc:Ignorable="d"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    x:DataType="viewModels:MainWindowViewModel">
-    <Grid RowDefinitions="*">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
        <ListBox
            Name="GameListBox"
            Grid.Row="0"
@@ -154,13 +156,6 @@
                                        Text="{Binding Converter={x:Static helpers:MultiplayerInfoConverter.Instance}}"
                                        TextAlignment="Start"
                                        TextWrapping="Wrap"/>
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        IsVisible="{Binding HasIndependentConfiguration}"
-                                        Text="{ext:Locale GameSpecificConfigurationHeader}"
-                                        TextAlignment="Start"
-                                        TextWrapping="Wrap"
-                                        Foreground="{DynamicResource Warning}" />
                                </StackPanel>
                                <StackPanel
                                    Grid.Column="4"
--- a/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
+++ b/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
@@ -13,7 +13,15 @@
    <Grid
        Margin="20"
        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch" ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
+        VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
        <Image
            Grid.Row="1"
            Height="70"
--- a/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
+++ b/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Threading;
@@ -385,10 +384,6 @@ namespace Ryujinx.Ava.UI.Helpers
                    Position = parent.PointToScreen(new Point()),
                    ShowInTaskbar = false,
                };
-                
-#if DEBUG
-                _contentDialogOverlayWindow.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Control));
-#endif

                parent.PositionChanged += OverlayOnPositionChanged;

--- a/src/Ryujinx/UI/Models/Input/StickVisualizer.cs
+++ b/src/Ryujinx/UI/Models/Input/StickVisualizer.cs
@@ -1,260 +0,0 @@
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
-using Ryujinx.Input;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.Models.Input
-{
-    public class StickVisualizer : BaseModel, IDisposable
-    {
-        public const int DrawStickPollRate = 50; // Milliseconds per poll.
-        public const int DrawStickCircumference = 5;
-        public const float DrawStickScaleFactor = DrawStickCanvasCenter;
-        public const int DrawStickCanvasSize = 100;
-        public const int DrawStickBorderSize = DrawStickCanvasSize + 5;
-        public const float DrawStickCanvasCenter = (DrawStickCanvasSize - DrawStickCircumference) / 2;
-        public const float MaxVectorLength = DrawStickCanvasSize / 2;
-
-        public CancellationTokenSource PollTokenSource;
-        public CancellationToken PollToken;
-
-        private static float _vectorLength;
-        private static float _vectorMultiplier;
-
-        private bool disposedValue;
-
-        private DeviceType _type;
-        public DeviceType Type
-        {
-            get => _type;
-            set
-            {
-                _type = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        private GamepadInputConfig _gamepadConfig;
-        public GamepadInputConfig GamepadConfig
-        {
-            get => _gamepadConfig;
-            set
-            {
-                _gamepadConfig = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        private KeyboardInputConfig _keyboardConfig;
-        public KeyboardInputConfig KeyboardConfig
-        {
-            get => _keyboardConfig;
-            set
-            {
-                _keyboardConfig = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        private (float, float) _uiStickLeft;
-        public (float, float) UiStickLeft
-        {
-            get => (_uiStickLeft.Item1 * DrawStickScaleFactor, _uiStickLeft.Item2 * DrawStickScaleFactor);
-            set
-            {
-                _uiStickLeft = value;
-
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(UiStickRightX));
-                OnPropertyChanged(nameof(UiStickRightY));
-                OnPropertyChanged(nameof(UiDeadzoneRight));
-            }
-        }
-
-        private (float, float) _uiStickRight;
-        public (float, float) UiStickRight
-        {
-            get => (_uiStickRight.Item1 * DrawStickScaleFactor, _uiStickRight.Item2 * DrawStickScaleFactor);
-            set
-            {
-                _uiStickRight = value;
-
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(UiStickLeftX));
-                OnPropertyChanged(nameof(UiStickLeftY));
-                OnPropertyChanged(nameof(UiDeadzoneLeft));
-            }
-        }
-
-        public float UiStickLeftX => ClampVector(UiStickLeft).Item1;
-        public float UiStickLeftY => ClampVector(UiStickLeft).Item2;
-        public float UiStickRightX => ClampVector(UiStickRight).Item1;
-        public float UiStickRightY => ClampVector(UiStickRight).Item2;
-
-        public int UiStickCircumference => DrawStickCircumference;
-        public int UiCanvasSize => DrawStickCanvasSize;
-        public int UiStickBorderSize => DrawStickBorderSize;
-
-        public float? UiDeadzoneLeft => _gamepadConfig?.DeadzoneLeft * DrawStickCanvasSize - DrawStickCircumference;
-        public float? UiDeadzoneRight => _gamepadConfig?.DeadzoneRight * DrawStickCanvasSize - DrawStickCircumference;
-
-        private InputViewModel Parent;
-
-        public StickVisualizer(InputViewModel parent)
-        {
-            Parent = parent;
-
-            PollTokenSource = new CancellationTokenSource();
-            PollToken = PollTokenSource.Token;
-
-            Task.Run(Initialize, PollToken);
-        }
-
-        public void UpdateConfig(object config)
-        {
-            if (config is ControllerInputViewModel padConfig)
-            {
-                GamepadConfig = padConfig.Config;
-                Type = DeviceType.Controller;
-
-                return;
-            }
-            else if (config is KeyboardInputViewModel keyConfig)
-            {
-                KeyboardConfig = keyConfig.Config;
-                Type = DeviceType.Keyboard;
-
-                return;
-            }
-
-            Type = DeviceType.None;
-        }
-
-        public async Task Initialize()
-        {
-            (float, float) leftBuffer;
-            (float, float) rightBuffer;
-
-            while (!PollToken.IsCancellationRequested)
-            {
-                leftBuffer = (0f, 0f);
-                rightBuffer = (0f, 0f);
-
-                switch (Type)
-                {
-                    case DeviceType.Keyboard:
-                        IKeyboard keyboard = (IKeyboard)Parent.AvaloniaKeyboardDriver.GetGamepad("0");
-
-                        if (keyboard != null)
-                        {
-                            KeyboardStateSnapshot snapshot = keyboard.GetKeyboardStateSnapshot();
-
-                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickRight))
-                            {
-                                leftBuffer.Item1 += 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickLeft))
-                            {
-                                leftBuffer.Item1 -= 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickUp))
-                            {
-                                leftBuffer.Item2 += 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.LeftStickDown))
-                            {
-                                leftBuffer.Item2 -= 1;
-                            }
-
-                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickRight))
-                            {
-                                rightBuffer.Item1 += 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickLeft))
-                            {
-                                rightBuffer.Item1 -= 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickUp))
-                            {
-                                rightBuffer.Item2 += 1;
-                            }
-                            if (snapshot.IsPressed((Key)KeyboardConfig.RightStickDown))
-                            {
-                                rightBuffer.Item2 -= 1;
-                            }
-
-                            UiStickLeft = leftBuffer;
-                            UiStickRight = rightBuffer;
-                        }
-                        break;
-
-                    case DeviceType.Controller:
-                        IGamepad controller = Parent.SelectedGamepad;
-
-                        if (controller != null)
-                        {
-                            leftBuffer = controller.GetStick((StickInputId)GamepadConfig.LeftJoystick);
-                            rightBuffer = controller.GetStick((StickInputId)GamepadConfig.RightJoystick);
-                        }
-                        break;
-
-                    case DeviceType.None:
-                        break;
-                    default:
-                        throw new ArgumentException($"Unable to poll device type \"{Type}\"");
-                }
-
-                UiStickLeft = leftBuffer;
-                UiStickRight = rightBuffer;
-
-                await Task.Delay(DrawStickPollRate, PollToken);
-            }
-
-            PollTokenSource.Dispose();
-        }
-
-        public static (float, float) ClampVector((float, float) vect)
-        {
-            _vectorMultiplier = 1;
-            _vectorLength = MathF.Sqrt((vect.Item1 * vect.Item1) + (vect.Item2 * vect.Item2));
-
-            if (_vectorLength > MaxVectorLength)
-            {
-                _vectorMultiplier = MaxVectorLength / _vectorLength;
-            }
-
-            vect.Item1 = vect.Item1 * _vectorMultiplier + DrawStickCanvasCenter;
-            vect.Item2 = vect.Item2 * _vectorMultiplier + DrawStickCanvasCenter;
-
-            return vect;
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!disposedValue)
-            {
-                if (disposing)
-                {
-                    PollTokenSource.Cancel();
-                }
-
-                KeyboardConfig = null;
-                GamepadConfig = null;
-                Parent = null;
-
-                disposedValue = true;
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}
--- 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;
@@ -14,30 +10,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 {
    public partial class ControllerInputViewModel : BaseModel
    {
-        private GamepadInputConfig _config;
-        public GamepadInputConfig Config
-        {
-            get => _config;
-            set
-            {
-                _config = value;
+        [ObservableProperty] private GamepadInputConfig _config;

-                OnPropertyChanged();
-            }
-        }
-
-        private StickVisualizer _visualizer;
-        public StickVisualizer Visualizer
-        {
-            get => _visualizer;
-            set
-            {
-                _visualizer = value;
-
-                OnPropertyChanged();
-            }
-        }
-        
        private bool _isLeft;
        public bool IsLeft
        {
@@ -63,15 +37,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        }

        public bool HasSides => IsLeft ^ IsRight;
-        
+
        [ObservableProperty] private SvgImage _image;
-        
+
        public InputViewModel ParentModel { get; }
-        
-        public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config, StickVisualizer visualizer)
+
+        public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
        {
            ParentModel = model;
-            Visualizer = visualizer;
            model.NotifyChangesEvent += OnParentModelChanged;
            OnParentModelChanged();
            config.PropertyChanged += (_, args) =>
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        private int _controller;
        private string _controllerImage;
        private int _device;
-        private object _configViewModel;
+        [ObservableProperty] private object _configViewModel;
        [ObservableProperty] private string _profileName;
        private bool _isLoaded;

@@ -74,7 +74,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                OnPropertiesChanged(nameof(HasLed), nameof(CanClearLed));
            }
        }
-        public StickVisualizer VisualStick { get; private set; }

        public ObservableCollection<PlayerModel> PlayerIndexes { get; set; }
        public ObservableCollection<(DeviceType Type, string Id, string Name)> Devices { get; set; }
@@ -95,19 +94,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        public bool IsModified { get; set; }
        public event Action NotifyChangesEvent;

-        public object ConfigViewModel
-        {
-            get => _configViewModel;
-            set
-            {
-                _configViewModel = value;
-
-                VisualStick.UpdateConfig(value);
-
-                OnPropertyChanged();
-            }
-        }
-
        public PlayerIndex PlayerIdChoose
        {
            get => _playerIdChoose;
@@ -283,7 +269,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            Devices = [];
            ProfilesList = [];
            DeviceList = [];
-            VisualStick = new StickVisualizer(this);

            ControllerImage = ProControllerResource;

@@ -304,12 +289,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

            if (Config is StandardKeyboardInputConfig keyboardInputConfig)
            {
-                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig), VisualStick);
+                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig));
            }

            if (Config is StandardControllerInputConfig controllerInputConfig)
            {
-                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
+                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig));
            }
        }

@@ -908,8 +893,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

            _mainWindow.ViewModel.AppHost?.NpadManager.UnblockInputUpdates();

-            VisualStick.Dispose();
-
            SelectedGamepad?.Dispose();

            AvaloniaKeyboardDriver.Dispose();
--- a/src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs
@@ -6,29 +6,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 {
    public partial class KeyboardInputViewModel : BaseModel
    {
-        private KeyboardInputConfig _config;
-        public KeyboardInputConfig Config
-        {
-            get => _config;
-            set
-            {
-                _config = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        private StickVisualizer _visualizer;
-        public StickVisualizer Visualizer
-        {
-            get => _visualizer;
-            set
-            {
-                _visualizer = value;
-
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private KeyboardInputConfig _config;

        private bool _isLeft;
        public bool IsLeft
@@ -60,10 +38,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

        public readonly InputViewModel ParentModel;

-        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config, StickVisualizer visualizer)
+        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config)
        {
            ParentModel = model;
-            Visualizer = visualizer;
            model.NotifyChangesEvent += OnParentModelChanged;
            OnParentModelChanged();
            Config = config;
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -356,11 +356,6 @@ namespace Ryujinx.Ava.UI.ViewModels
                    _ => null,
                };
            }
-            set
-            {
-                ListSelectedApplication = value;
-                GridSelectedApplication = value;
-            }        
        }

        public bool HasCompatibilityEntry => SelectedApplication.HasPlayabilityInfo;
@@ -1090,7 +1085,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            _rendererWaitEvent.WaitOne();

            AppHost?.Start();
-            
+
            AppHost?.DisposeContext();
        }

@@ -1556,50 +1551,8 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public bool InitializeUserConfig(ApplicationData application)
-        {
-            // Code where conditions will be met before loading the user configuration (Global Config)      
-            BackendThreading backendThreadingValue = ConfigurationState.Instance.Graphics.BackendThreading.Value;
-            string BackendThreadingInit = Program.BackendThreadingArg;
-
-            if (BackendThreadingInit is null)
-            {
-                BackendThreadingInit = ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString();
-            }
-            
-            // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting. 
-            string idGame = application.IdBaseString;
-            if (ConfigurationFileFormat.TryLoad(Program.GetDirGameUserConfig(idGame), out ConfigurationFileFormat configurationFileFormat))
-            {
-                // Loads the user configuration, having previously changed the global configuration to the user configuration
-                ConfigurationState.Instance.Load(configurationFileFormat, Program.GetDirGameUserConfig(idGame, true, true), idGame);
-            }
-
-            // Code where conditions will be executed after loading user configuration
-            if (ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString() != BackendThreadingInit)
-            {
-
-                List<string> Arguments = new List<string>
-                {
-                    "--bt", ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString() // BackendThreading
-                };
-
-                Rebooter.RebootAppWithGame(application.Path, Arguments);
- 
-                return true;
-            }
-
-            return false;
-        }
-
        public async Task LoadApplication(ApplicationData application, bool startFullscreen = false, BlitStruct<ApplicationControlProperty>? customNacpData = null)
        {
-
-            if (InitializeUserConfig(application))
-            {
-                return;
-            }
-
            if (AppHost != null)
            {
                await ContentDialogHelper.CreateInfoDialog(
@@ -1615,7 +1568,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 #if RELEASE
            await PerformanceCheck();
 #endif
-         
+
            Logger.RestartTime();

            SelectedIcon ??= ApplicationLibrary.GetApplicationIcon(application.Path, ConfigurationState.Instance.System.Language, application.Id);
@@ -1660,7 +1613,6 @@ namespace Ryujinx.Ava.UI.ViewModels

            Thread gameThread = new(InitializeGame) { Name = "GUI.WindowThread" };
            gameThread.Start();
-            
        }

        public void SwitchToRenderer(bool startFullscreen) =>
@@ -1747,7 +1699,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                string titleId = AppHost.Device.Processes.ActiveApplication.ProgramIdText.ToUpper();
                AmiiboWindow window = new(ShowAll, LastScannedAmiiboId, titleId);

-                await StyleableAppWindow.ShowAsync(window);
+                await window.ShowDialog(Window);

                if (window.IsScanned)
                {
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -1,6 +1,5 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -28,7 +27,6 @@ using Ryujinx.HLE.HOS.Services.Time.TimeZone;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
 using System.Net.NetworkInformation;
 using System.Threading.Tasks;
@@ -70,19 +68,6 @@ namespace Ryujinx.Ava.UI.ViewModels

        public SettingsHacksViewModel DirtyHacks { get; }

-        private readonly bool _isGameRunning;
-        private Bitmap _gameIcon;
-        private string _gameTitle;
-        private string _gamePath;
-        private string _gameId;
-        public bool IsGameRunning => _isGameRunning;
-        public Bitmap GameIcon => _gameIcon;
-        public string GamePath => _gamePath;
-        public string GameTitle => _gameTitle;
-        public string GameId => _gameId;
-        public bool IsGameTitleNotNull => !string.IsNullOrEmpty(GameTitle);
-        public double PanelOpacity => IsGameTitleNotNull ? 0.5 : 1;
-
        public int ResolutionScale
        {
            get => _resolutionScale;
@@ -350,7 +335,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        public bool IsInvalidLdnPassphraseVisible { get; set; }

-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this(false)
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
        {
            _virtualFileSystem = virtualFileSystem;
            _contentManager = contentManager;
@@ -363,51 +348,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            }
        }

-        public SettingsViewModel(
-            VirtualFileSystem virtualFileSystem, 
-            ContentManager contentManager,
-            bool gameRunning,
-            string gamePath,
-            string gameName, 
-            string gameId, 
-            byte[] gameIconData, 
-            bool enableToLoadCustomConfig) : this(enableToLoadCustomConfig)
-        {
-            _virtualFileSystem = virtualFileSystem;
-            _contentManager = contentManager;
-  
-            if (gameIconData != null && gameIconData.Length > 0)
-            {
-                using (var ms = new MemoryStream(gameIconData))
-                {
-                    _gameIcon = new Bitmap(ms);
-                }
-            }
-
-            _isGameRunning = gameRunning;
-            _gamePath = gamePath;
-            _gameTitle = gameName;           
-            _gameId = gameId;
-
-            if (enableToLoadCustomConfig) // During the game. If there is no user config, then load the global config window
-            {
-                string gameDir = Program.GetDirGameUserConfig(gameId, false, true);
-                if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
-                {
-                    ConfigurationState.Instance.Load(configurationFileFormat, gameDir, gameId);                 
-                }
-
-                LoadCurrentConfiguration(); // Needed to load custom configuration
-            }
-
-            if (Program.PreviewerDetached)
-            {
-                Task.Run(LoadTimeZones);
-
-            }
-        }
-
-        public SettingsViewModel(bool noLoadGlobalConfig = false)
+        public SettingsViewModel()
        {
            GameDirectories = [];
            AutoloadDirectories = [];
@@ -422,9 +363,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            if (Program.PreviewerDetached)
            {
                Task.Run(LoadAvailableGpus);
-
-               // if (!noLoadGlobalConfig)// Default is false, but loading custom config avoids double call
-                    LoadCurrentConfiguration();
+                LoadCurrentConfiguration();

                DirtyHacks = new SettingsHacksViewModel(this);
            }
@@ -653,8 +592,8 @@ namespace Ryujinx.Ava.UI.ViewModels
            config.HideCursor.Value = (HideCursorMode)HideCursor;
            config.UpdateCheckerType.Value = (UpdaterType)UpdateCheckerType;
            config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType;
-            config.UI.GameDirs.Value = [.. GameDirectories];
-            config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
+            config.UI.GameDirs.Value = [..GameDirectories];
+            config.UI.AutoloadDirs.Value = [..AutoloadDirectories];

            config.UI.BaseStyle.Value = BaseStyleIndex switch
            {
@@ -675,10 +614,10 @@ namespace Ryujinx.Ava.UI.ViewModels

            // System
            config.System.Region.Value = (Region)Region;
-
+            
            if (config.System.Language.Value != (Language)Language)
                GameListNeedsRefresh = true;
-
+            
            config.System.Language.Value = (Language)Language;
            if (_validTzRegions.Contains(TimeZone))
            {
@@ -757,7 +696,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            config.Multiplayer.DisableP2p.Value = DisableP2P;
            config.Multiplayer.LdnPassphrase.Value = LdnPassphrase;
            config.Multiplayer.LdnServer.Value = LdnServer;
-
+            
            // Dirty Hacks
            config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFix;

@@ -773,11 +712,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        private static void RevertIfNotSaved()
        {
-            // maybe this is an unnecessary check(all options need to be tested)
-            if (string.IsNullOrEmpty(Program.GlobalConfigurationPath))
-            {
-                Program.ReloadConfig();
-            }
+            Program.ReloadConfig();
        }

        public void ApplyButton()
@@ -785,26 +720,6 @@ namespace Ryujinx.Ava.UI.ViewModels
            SaveSettings();
        }

-        public void DeleteConfigGame()
-        {
-            string gameDir = Program.GetDirGameUserConfig(GameId,false,false);
-
-            if (File.Exists(gameDir))
-            {
-                File.Delete(gameDir);
-            }
-
-            RevertIfNotSaved();
-            CloseWindow?.Invoke();
-        }
-
-        public void SaveUserConfig()
-        {
-            SaveSettings();
-            RevertIfNotSaved(); // Revert global configuration after saving user configuration
-            CloseWindow?.Invoke();
-        }
-
        public void OkButton()
        {
            SaveSettings();
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
@@ -34,7 +34,12 @@
        <!-- Button / JoyStick Settings -->
        <Grid
            Name="SettingButtons"
-            MinHeight="450" ColumnDefinitions="Auto,*,Auto">
+            MinHeight="450">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
            <!-- Left Controls -->
            <StackPanel
                Orientation="Vertical"
@@ -49,7 +54,15 @@
                    CornerRadius="5">
                    <Grid
                        Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                        <StackPanel
                            Grid.Column="0"
                            Grid.Row="0"
@@ -303,99 +316,17 @@
                HorizontalAlignment="Stretch"
                VerticalAlignment="Stretch">
                <!-- Controller Picture -->
+                <Image
+                    Margin="0,10"
+                    MaxHeight="300"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Source="{Binding Image}" />
                <Border
                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
                    BorderThickness="1"
                    CornerRadius="5"
-                    Margin="0,0, 0, 5"
                    MinHeight="90">
-                    <StackPanel Orientation="Vertical">
-                        <Image
-                            Margin="5,10"
-                            MaxHeight="300"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Source="{Binding Image}" />
-                        <StackPanel
-                            Margin="10"
-                            Orientation="Horizontal"
-                            Spacing="20"
-                            HorizontalAlignment="Center">
-                            <Border
-                                BorderBrush="Transparent"
-                                Height="{Binding Visualizer.UiStickBorderSize}"
-                                Width="{Binding Visualizer.UiStickBorderSize}"
-                                IsVisible="{Binding IsLeft}">
-                                <Canvas
-                                    Background="{DynamicResource ThemeBackgroundColor}"
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}">
-                                    <Grid
-                                        Height="{Binding Visualizer.UiCanvasSize}"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Background="{DynamicResource ThemeBackgroundColor}">
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Stroke="{DynamicResource ThemeControlBorderColor}"
-                                            StrokeThickness="1"
-                                            Width="{Binding Visualizer.UiCanvasSize}"
-                                            Height="{Binding Visualizer.UiCanvasSize}" />
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Fill="Black"
-                                            Opacity="100"
-                                            Height="{Binding Visualizer.UiDeadzoneLeft}"
-                                            Width="{Binding Visualizer.UiDeadzoneLeft}" />
-                                    </Grid>
-                                    <Ellipse
-                                        Fill="{DynamicResource Warning}"
-                                        Width="{Binding Visualizer.UiStickCircumference}"
-                                        Height="{Binding Visualizer.UiStickCircumference}"
-                                        Canvas.Bottom="{Binding Visualizer.UiStickLeftY}"
-                                        Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
-                                </Canvas>
-                            </Border>
-                            <Border
-                                BorderBrush="Transparent"
-                                Height="{Binding Visualizer.UiStickBorderSize}"
-                                Width="{Binding Visualizer.UiStickBorderSize}"
-                                IsVisible="{Binding IsRight}">
-                                <Canvas
-                                    Background="{DynamicResource ThemeBackgroundColor}"
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}">
-                                    <Grid
-                                        Height="{Binding Visualizer.UiCanvasSize}"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Background="{DynamicResource ThemeBackgroundColor}">
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Stroke="{DynamicResource ThemeControlBorderColor}"
-                                            StrokeThickness="1"
-                                            Width="{Binding Visualizer.UiCanvasSize}"
-                                            Height="{Binding Visualizer.UiCanvasSize}" />
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Fill="Black"
-                                            Opacity="100"
-                                            Height="{Binding Visualizer.UiDeadzoneRight}"
-                                            Width="{Binding Visualizer.UiDeadzoneRight}" />
-                                    </Grid>
-                                    <Ellipse
-                                        Fill="{DynamicResource Warning}"
-                                        Width="{Binding Visualizer.UiStickCircumference}"
-                                        Height="{Binding Visualizer.UiStickCircumference}"
-                                        Canvas.Bottom="{Binding Visualizer.UiStickRightY}"
-                                        Canvas.Left="{Binding Visualizer.UiStickRightX}" />
-                                </Canvas>
-                            </Border>
-                        </StackPanel>
-                    </StackPanel>
-                </Border>
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    CornerRadius="5">
                    <StackPanel
                        Margin="8"
                        Orientation="Vertical">
@@ -414,8 +345,8 @@
                                Minimum="0"
                                Value="{Binding Config.TriggerThreshold, Mode=TwoWay}" />
                            <TextBlock
-                                Width="25"
-                                Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
+                              Width="25"
+                              Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
                        </StackPanel>
                        <StackPanel
                            Orientation="Vertical"
@@ -497,7 +428,7 @@
                </Border>
                <!-- Motion, Rumble, LED -->
                <StackPanel
-                    Margin="0,5,0,0"
+                    Margin="0,10,0,0"
                    Spacing="5"
                    Orientation="Vertical"
                    VerticalAlignment="Bottom">
@@ -507,7 +438,11 @@
                        CornerRadius="5"
                        VerticalAlignment="Bottom"
                        HorizontalAlignment="Stretch">
-                        <Grid ColumnDefinitions="*,Auto">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
                            <CheckBox
                                Margin="10"
                                MinWidth="0"
@@ -529,7 +464,11 @@
                        CornerRadius="5"
                        HorizontalAlignment="Stretch"
                        Margin="0,-1,0,0">
-                        <Grid ColumnDefinitions="*,Auto">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
                            <CheckBox
                                Margin="10"
                                MinWidth="0"
@@ -551,7 +490,11 @@
                        CornerRadius="5"
                        HorizontalAlignment="Stretch"
                        Margin="0,-1,0,0">
-                        <Grid IsVisible="{Binding ParentModel.HasLed}" ColumnDefinitions="*,Auto">
+                        <Grid IsVisible="{Binding ParentModel.HasLed}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
                            <CheckBox
                                Margin="10, 10, 5, 10"
                                MinWidth="0"
@@ -583,7 +526,15 @@
                    CornerRadius="5">
                    <Grid
                        Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                        <StackPanel
                            Grid.Column="1"
                            Grid.Row="0"
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -35,13 +35,22 @@
            Margin="0 0 0 5"
            Orientation="Vertical"
            Spacing="5">
-            <Grid ColumnDefinitions="*,10,*">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
                <!-- Player Selection -->
                <Grid
                    Grid.Column="0"
                    Margin="2"
                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*">
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
                    <TextBlock
                        Margin="5,0,10,0"
                        Width="90"
@@ -68,7 +77,14 @@
                    Grid.Column="2"
                    Margin="2"
                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
                    <TextBlock
                        Margin="5,0,10,0"
                        Width="90"
@@ -123,12 +139,22 @@
                </Grid>
            </Grid>
            <Separator />
-            <Grid ColumnDefinitions="*,10,*">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
                <!-- Input Device -->
                <Grid
                    Grid.Column="0"
                    Margin="2"
-                    HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*,Auto">
+                    HorizontalAlignment="Stretch">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
                    <TextBlock
                        Grid.Column="0"
                        Margin="5,0,10,0"
@@ -160,7 +186,11 @@
                    Grid.Column="2"
                    Margin="2"
                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*">
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
                    <TextBlock
                        Margin="5,0,10,0"
                        Width="90"
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
@@ -32,7 +32,12 @@
        <!-- Button / JoyStick Settings -->
        <Grid
            Name="SettingButtons"
-            MinHeight="450" ColumnDefinitions="Auto,*,Auto">
+            MinHeight="450">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
            <!-- Left Controls -->
            <StackPanel
                Orientation="Vertical"
@@ -47,7 +52,15 @@
                    CornerRadius="5">
                    <Grid
                        Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                        <StackPanel
                            Grid.Column="0"
                            Grid.Row="0"
@@ -296,79 +309,12 @@
                HorizontalAlignment="Stretch"
                VerticalAlignment="Stretch">
                <!-- Controller Picture -->
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    CornerRadius="5"
+                <Image
                    Margin="0,10"
-                    MinHeight="90">
-                    <StackPanel
-                        Margin="10"
-                        Orientation="Horizontal"
-                        Spacing="20"
-                        HorizontalAlignment="Center">
-                        <Border
-                            BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                            BorderThickness="1"
-                            CornerRadius="5"
-                            Height="{Binding Visualizer.UiStickBorderSize}"
-                            Width="{Binding Visualizer.UiStickBorderSize}"
-                            IsVisible="{Binding IsLeft}">
-                            <Canvas
-                                Background="{DynamicResource ThemeBackgroundColor}"
-                                Height="{Binding Visualizer.UiCanvasSize}"
-                                Width="{Binding Visualizer.UiCanvasSize}">
-                                <Grid
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}"
-                                    Background="{DynamicResource ThemeBackgroundColor}">
-                                    <Ellipse
-                                        HorizontalAlignment="Center"
-                                        Stroke="Black"
-                                        StrokeThickness="1"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Height="{Binding Visualizer.UiCanvasSize}"/>
-                                </Grid>
-                                <Ellipse
-                                        Fill="Red" 
-                                        Width="{Binding Visualizer.UiStickCircumference}" 
-                                        Height="{Binding Visualizer.UiStickCircumference}" 
-                                        Canvas.Bottom="{Binding Visualizer.UiStickLeftY}" 
-                                        Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
-                            </Canvas>
-                        </Border>        
-                        <Border
-                            BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                            BorderThickness="1"
-                            CornerRadius="5"
-                            Height="{Binding Visualizer.UiStickBorderSize}"
-                            Width="{Binding Visualizer.UiStickBorderSize}"
-                            IsVisible="{Binding IsRight}">
-                            <Canvas
-                                Background="{DynamicResource ThemeBackgroundColor}"
-                                Height="{Binding Visualizer.UiCanvasSize}"
-                                Width="{Binding Visualizer.UiCanvasSize}">
-                                <Grid
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}"
-                                    Background="{DynamicResource ThemeBackgroundColor}">
-                                    <Ellipse
-                                        HorizontalAlignment="Center"
-                                        Stroke="Black"
-                                        StrokeThickness="1"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Height="{Binding Visualizer.UiCanvasSize}"/>
-                                </Grid>
-                                <Ellipse
-                                        Fill="Red" 
-                                        Width="{Binding Visualizer.UiStickCircumference}" 
-                                        Height="{Binding Visualizer.UiStickCircumference}" 
-                                        Canvas.Bottom="{Binding Visualizer.UiStickRightY}" 
-                                        Canvas.Left="{Binding Visualizer.UiStickRightX}" />
-                            </Canvas>
-                        </Border>        
-                    </StackPanel>
-                </Border>
+                    MaxHeight="300"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Source="{Binding Image}" />
                <Border
                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
                    BorderThickness="1"
@@ -467,7 +413,15 @@
                    CornerRadius="5">
                    <Grid
                        Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                        <StackPanel
                            Grid.Column="1"
                            Grid.Row="0"
--- a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
@@ -11,7 +11,11 @@
    x:Class="Ryujinx.Ava.UI.Views.Input.MotionInputView"
    x:DataType="viewModels:MotionInputViewModel"
    Focusable="True">
-    <Grid Margin="10" RowDefinitions="Auto,*">
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
        <StackPanel Orientation="Vertical">
            <StackPanel
                Orientation="Horizontal"
@@ -76,7 +80,11 @@
            BorderThickness="1"
            CornerRadius="5"
            HorizontalAlignment="Stretch">
-            <Grid VerticalAlignment="Top" RowDefinitions="Auto,*">
+            <Grid VerticalAlignment="Top">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
                <StackPanel
                    Grid.Row="1"
                    HorizontalAlignment="Center"
@@ -110,7 +118,15 @@
                            Text="{Binding DsuServerPort, Mode=TwoWay}" />
                    </StackPanel>
                    <StackPanel Orientation="Vertical">
-                        <Grid RowDefinitions="*,*" ColumnDefinitions="*,*">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
                            <TextBlock
                                Margin="0,10,0,0"
                                VerticalAlignment="Center"
--- a/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
@@ -10,7 +10,11 @@
    x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView"
    x:DataType="viewModels:RumbleInputViewModel"
    Focusable="True">
-    <Grid Margin="10" RowDefinitions="Auto,*">
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
        <StackPanel Orientation="Vertical">
            <StackPanel Orientation="Horizontal">
                <TextBlock
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -19,7 +19,6 @@ using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;

@@ -131,26 +130,9 @@ namespace Ryujinx.Ava.UI.Views.Main
            Window.SettingsWindow = new(Window.VirtualFileSystem, Window.ContentManager);

            Rainbow.Enable();
-
-            if (ViewModel.SelectedApplication is null) // Checks if game data exists
-            {
-                await StyleableAppWindow.ShowAsync(Window.SettingsWindow);
-            }
-            else
-            { 
-                bool customConfigExists = File.Exists(Program.GetDirGameUserConfig(ViewModel.SelectedApplication.IdString));
-
-                if (!ViewModel.IsGameRunning || !customConfigExists)
-                {
-                    await Window.SettingsWindow.ShowDialog(Window); // The game is not running, or if the user configuration does not exist
-                }
-                else
-                {
-                    // If there is a custom configuration in the folder
-                    await StyleableAppWindow.ShowAsync(new GameSpecificSettingsWindow(ViewModel, customConfigExists));
-                }
-            }
-
+            
+            await Window.SettingsWindow.ShowDialog(Window);
+            
            Rainbow.Disable();
            Rainbow.Reset();

@@ -176,13 +158,11 @@ namespace Ryujinx.Ava.UI.Views.Main

            string name = ViewModel.AppHost.Device.Processes.ActiveApplication.ApplicationControlProperties.Title[(int)ViewModel.AppHost.Device.System.State.DesiredTitleLanguage].NameString.ToString();

-            await StyleableAppWindow.ShowAsync(
-                new CheatWindow(
-                    Window.VirtualFileSystem,
-                    ViewModel.AppHost.Device.Processes.ActiveApplication.ProgramIdText,
-                    name,
-                    ViewModel.SelectedApplication.Path)
-            );
+            await new CheatWindow(
+                Window.VirtualFileSystem,
+                ViewModel.AppHost.Device.Processes.ActiveApplication.ProgramIdText,
+                name,
+                ViewModel.SelectedApplication.Path).ShowDialog(Window);

            ViewModel.AppHost.Device.EnableCheats();
        }
--- a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
@@ -21,7 +21,12 @@
        <Border Classes="settings">
            <Panel
                Margin="10">
-                <Grid RowDefinitions="Auto,*,Auto">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
                    <views:InputView
                        Grid.Row="0"
                        Name="InputView" />
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -156,8 +156,6 @@
                            ValueMemberBinding="{Binding Mode=OneWay, Converter={x:Static helpers:TimeZoneConverter.Instance}}" />
                    </StackPanel>
                    <StackPanel
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
                        Margin="0,0,0,10"
                        Orientation="Horizontal">
                        <TextBlock
@@ -171,11 +169,8 @@
                            SelectedDate="{Binding CurrentDate}"
                            ToolTip.Tip="{ext:Locale TimeTooltip}"
                            Width="350" />
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                    </StackPanel>
                    <StackPanel
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
                        Margin="250,0,0,10"
                        Orientation="Horizontal">
                        <TimePicker
@@ -185,12 +180,8 @@
                            SelectedTime="{Binding CurrentTime}"
                            Width="350"
                            ToolTip.Tip="{ext:Locale TimeTooltip}" />
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                    </StackPanel>
-                    <StackPanel
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        Orientation="Horizontal">
+                    <StackPanel Orientation="Horizontal">
                        <TextBlock
                            VerticalAlignment="Center"
                            Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
@@ -200,7 +191,6 @@
                            VerticalAlignment="Center"
                            IsChecked="{Binding MatchSystemTime}"
                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}"/>
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                    </StackPanel>
                    <Separator />
                    <StackPanel Margin="0,10,0,10"
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -27,42 +27,20 @@
                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
                <StackPanel Margin="10,0,0,0" Orientation="Vertical">
                    <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock VerticalAlignment="Center"
-                                       ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
-                                       Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
-                        </StackPanel>
+                        <TextBlock VerticalAlignment="Center"
+                                   ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                   Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
                    </CheckBox>
-                    <CheckBox 
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        IsChecked="{Binding ShowConfirmExit}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
-                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                        </StackPanel>
+                    <CheckBox IsChecked="{Binding ShowConfirmExit}">
+                        <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
                    </CheckBox>
-                    <CheckBox 
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        IsChecked="{Binding RememberWindowState}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
-                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                            </StackPanel>
+                    <CheckBox IsChecked="{Binding RememberWindowState}">
+                        <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
                    </CheckBox>
-                    <CheckBox
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        IsChecked="{Binding ShowTitleBar}" IsVisible="{x:Static helper:RunningPlatform.IsWindows}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowTitleBar}" />
-                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                        </StackPanel>
+                    <CheckBox IsChecked="{Binding ShowTitleBar}" IsVisible="{x:Static helper:RunningPlatform.IsWindows}">
+                        <TextBlock Text="{ext:Locale SettingsTabGeneralShowTitleBar}" />
                    </CheckBox>
-                    <StackPanel 
-                        Margin="0, 15, 0, 0" 
-                        Orientation="Horizontal">
+                    <StackPanel Margin="0, 15, 0, 0" Orientation="Horizontal">
                        <TextBlock VerticalAlignment="Center"
                                   Text="{ext:Locale SettingsTabGeneralFocusLossType}"
                                   Width="150" />
@@ -86,11 +64,7 @@
                            </ComboBoxItem>
                        </ComboBox>
                    </StackPanel>
-                    <StackPanel 
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        Margin="0, 15, 0, 0" 
-                        Orientation="Horizontal">
+                    <StackPanel Margin="0, 15, 0, 0" Orientation="Horizontal">
                        <TextBlock VerticalAlignment="Center"
                                   Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}"
                                   Width="150" />
@@ -107,11 +81,8 @@
                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
                            </ComboBoxItem>
                        </ComboBox>
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                    </StackPanel>
-                    <StackPanel 
-                        Margin="0, 15, 0, 0" 
-                        Orientation="Horizontal">
+                    <StackPanel Margin="0, 15, 0, 0" Orientation="Horizontal">
                        <TextBlock VerticalAlignment="Center"
                                   Text="{ext:Locale SettingsTabGeneralHideCursor}"
                                   Width="150" />
@@ -129,11 +100,7 @@
                            </ComboBoxItem>
                        </ComboBox>
                    </StackPanel>
-                    <StackPanel 
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        Margin="0, 15, 0, 10" 
-                        Orientation="Horizontal">
+                    <StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal">
                        <TextBlock
                            VerticalAlignment="Center"
                            Text="{ext:Locale SettingsTabGeneralTheme}"
@@ -151,17 +118,11 @@
                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
                            </ComboBoxItem>
                        </ComboBox>
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                    </StackPanel>
                </StackPanel>
                <Separator Height="1" />
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
-                    <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
-                </StackPanel>
+                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
                <StackPanel
-                    IsEnabled="{Binding !IsGameTitleNotNull}"
-                    Opacity="{Binding PanelOpacity}"
                    Margin="10,0,0,0"
                    HorizontalAlignment="Stretch"
                    Orientation="Vertical"
@@ -177,7 +138,12 @@
                            </Style>
                        </ListBox.Styles>
                    </ListBox>
-                    <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
+                    <Grid HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
                        <TextBox
                            Name="GameDirPathBox"
                            Margin="0"
@@ -206,15 +172,10 @@
                </StackPanel>
                <Separator Height="1" />
               <StackPanel Orientation="Vertical" Spacing="5">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
-                    </StackPanel>
+                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
                </StackPanel>
                <StackPanel
-                    IsEnabled="{Binding !IsGameTitleNotNull}"
-                    Opacity="{Binding PanelOpacity}"
                    Margin="10,0,0,0"
                    HorizontalAlignment="Stretch"
                    Orientation="Vertical"
@@ -230,7 +191,12 @@
                            </Style>
                        </ListBox.Styles>
                    </ListBox>
-                    <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
+                    <Grid HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
                        <TextBox
                            Name="AutoloadDirPathBox"
                            Margin="0"
--- a/src/Ryujinx/UI/Views/User/UserEditorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserEditorView.axaml
@@ -14,7 +14,15 @@
    mc:Ignorable="d"
    Focusable="True"
    x:DataType="models:TempProfile">
-    <Grid Margin="0" ColumnDefinitions="Auto,*" RowDefinitions="*,Auto">
+    <Grid Margin="0">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
        <StackPanel
            Grid.Row="0"
            Grid.Column="0"
--- a/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
@@ -20,7 +20,13 @@
    <Grid
        Margin="0"
        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch" RowDefinitions="Auto,*,Auto,Auto">
+        VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
        <ListBox
            Grid.Row="1"
            BorderThickness="0"
--- a/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml
@@ -17,7 +17,12 @@
    </Design.DataContext>
    <Grid
        HorizontalAlignment="Stretch"
-        VerticalAlignment="Center" RowDefinitions="Auto,70,Auto">
+        VerticalAlignment="Center">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="70" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
        <TextBlock
            Grid.Row="0"
            TextWrapping="Wrap"
--- a/src/Ryujinx/UI/Views/User/UserRecovererView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserRecovererView.axaml
@@ -18,7 +18,11 @@
        <viewModels:UserProfileViewModel />
    </Design.DataContext>
    <Grid HorizontalAlignment="Stretch"
-          VerticalAlignment="Stretch" RowDefinitions="*,Auto">
+          VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
        <Border
            CornerRadius="5"
            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
@@ -37,7 +41,11 @@
                                VerticalAlignment="Stretch"
                                ClipToBounds="True"
                                CornerRadius="5">
-                                <Grid Margin="0" ColumnDefinitions="*,Auto">
+                                <Grid Margin="0">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
                                    <TextBlock
                                        HorizontalAlignment="Stretch"
                                        Text="{Binding UserId}"
--- a/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
@@ -19,10 +19,19 @@
    <Design.DataContext>
        <viewModels:UserSaveManagerViewModel />
    </Design.DataContext>
-    <Grid RowDefinitions="Auto,*,Auto">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
        <Grid
            Grid.Row="0"
-            HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*">
+            HorizontalAlignment="Stretch">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
            <StackPanel
                Spacing="10"
                Orientation="Horizontal"
@@ -71,7 +80,11 @@
            <Grid
                Grid.Column="1"
                HorizontalAlignment="Stretch"
-                Margin="10,0, 0, 0" ColumnDefinitions="Auto,*">
+                Margin="10,0, 0, 0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
                <Label Content="{ext:Locale Search}" VerticalAlignment="Center" />
                <TextBox
                    Margin="5,0,0,0"
@@ -105,7 +118,11 @@
                </ListBox.Styles>
                <ListBox.ItemTemplate>
                    <DataTemplate x:DataType="models:SaveModel">
-                        <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto">
+                        <Grid HorizontalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
                            <StackPanel
                                Grid.Column="0"
                                Orientation="Horizontal"
--- a/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+++ b/src/Ryujinx/UI/Views/User/UserSelectorView.axaml
@@ -18,7 +18,11 @@
    <Design.DataContext>
        <viewModels:UserProfileViewModel />
    </Design.DataContext>
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
        <Border
            CornerRadius="5"
            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
--- a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
@@ -1,149 +0,0 @@
-<window:StyleableAppWindow
-    x:Class="Ryujinx.Ava.UI.Windows.GameSpecificSettingsWindow"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    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:window="clr-namespace:Ryujinx.Ava.UI.Windows"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    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"
-    Width="1100"
-    Height="910"
-    MinWidth="800"
-    MinHeight="480"
-    WindowStartupLocation="CenterOwner"
-    x:DataType="viewModels:SettingsViewModel"
-    mc:Ignorable="d"
-    Focusable="True">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600" RowDefinitions="Auto,*,Auto">
-        <ContentPresenter
-            x:Name="ContentPresenter"
-            Grid.Row="1"
-            IsVisible="False"
-            KeyboardNavigation.IsTabStop="False"/>
-        <Grid Name="Pages" IsVisible="False" Grid.Row="2">
-            <settings:SettingsUiView Name="UiPage" />
-            <settings:SettingsInputView Name="InputPage" />
-            <settings:SettingsSystemView Name="SystemPage" />
-            <settings:SettingsCPUView Name="CpuPage" />
-            <settings:SettingsGraphicsView Name="GraphicsPage" />
-            <settings:SettingsAudioView Name="AudioPage" />
-            <settings:SettingsNetworkView Name="NetworkPage" />
-            <settings:SettingsLoggingView Name="LoggingPage" />
-            <settings:SettingsHacksView Name="HacksPage" />
-        </Grid>
-        <ui:NavigationView
-            Grid.Row="1"
-            IsSettingsVisible="False"
-            Name="NavPanel"
-            IsBackEnabled="False"
-            PaneDisplayMode="Left"
-            Margin="2,10,10,0"
-            VerticalAlignment="Stretch"
-            HorizontalAlignment="Stretch"
-            OpenPaneLength="200"
-            IsPaneToggleButtonVisible="False">
-
-            <!-- For image -->
-            <ui:NavigationView.PaneHeader>
-                <Grid HorizontalAlignment="Center" VerticalAlignment="Center" RowDefinitions="Auto,Auto,Auto,5">
-                    <TextBlock Text="{Binding GameId}"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Margin="0,0,0,10"
-                               TextAlignment="Center" Grid.Row="0" />
-                    <Image Source="{Binding GameIcon}" 
-                        Width="160" 
-                        Height="160" 
-                        Grid.Row="1" 
-                        Margin="0,0,0,10"
-                        HorizontalAlignment="Center" />
-                    <TextBlock Text="{Binding GameTitle}"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Margin="0,0,0,10"
-                        TextAlignment="Center" Grid.Row="2" />
-                    <Separator Height="1" Grid.Row="3" Margin="0,0,0,10" HorizontalAlignment="Stretch"/>
-                </Grid>
-            </ui:NavigationView.PaneHeader>
-                      
-            <ui:NavigationView.MenuItems>
-                <ui:NavigationViewItem
-                    IsSelected="True"
-                    Content="{ext:Locale SettingsTabGeneral}"
-                    Tag="UiPage"
-                    IconSource="New" />
-                <ui:NavigationViewItem
-                    Content="{ext:Locale SettingsTabInput}"
-                    Tag="InputPage"
-                    IconSource="Games" />
-                <ui:NavigationViewItem
-                    Content="{ext:Locale SettingsTabSystem}"
-                    Tag="SystemPage"
-                    IconSource="Settings" />
-                <ui:NavigationViewItem
-                    Content="{ext:Locale SettingsTabCpu}"
-                    Tag="CpuPage">
-                    <ui:NavigationViewItem.IconSource>
-                        <ui:FontIconSource
-                            FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
-                            Glyph="{helpers:GlyphValueConverter Chip}" />
-                    </ui:NavigationViewItem.IconSource>
-                </ui:NavigationViewItem>
-                <ui:NavigationViewItem
-                    Content="{ext:Locale SettingsTabGraphics}"
-                    Tag="GraphicsPage"
-                    IconSource="Image" />
-                <ui:NavigationViewItem
-                    Content="{ext:Locale SettingsTabAudio}"
-                    IconSource="Audio"
-                    Tag="AudioPage" />
-                <ui:NavigationViewItem
-                    Content="{ext:Locale SettingsTabNetwork}"
-                    Tag="NetworkPage"
-                    IconSource="Globe" />
-                <ui:NavigationViewItem
-                    Content="{ext:Locale SettingsTabLogging}"
-                    Tag="LoggingPage"
-                    IconSource="Document" />
-                <ui:NavigationViewItem
-                    IsVisible="{Binding ShowDirtyHacks}"
-                    Content="Dirty Hacks"
-                    Tag="HacksPage"
-                    IconSource="Code" />
-            </ui:NavigationView.MenuItems>
-        </ui:NavigationView>
-       
-        <ReversibleStackPanel
-            Grid.Row="2"
-            Margin="10"
-            Spacing="10"
-            Orientation="Horizontal"
-            HorizontalAlignment="Right"
-            ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
-            <Button
-                Content="{ext:Locale SettingsButtonSave}"
-                Command="{Binding SaveUserConfig}" />
-            <Button
-                HotKey="Escape"
-                Content="{ext:Locale SettingsButtonClose}"
-                Command="{Binding CancelButton}" />
-            <Button
-                IsVisible="{Binding IsGameRunning}"
-                Content="{ext:Locale SettingsButtonApply}"
-                Command="{Binding ApplyButton}" />
-            <Button
-                IsVisible="{Binding !IsGameRunning}"
-                Content="{ext:Locale UserProfilesDelete}"
-                Command="{Binding DeleteConfigGame}"
-                Classes="red"/>
-        </ReversibleStackPanel>
-    </Grid>
-</window:StyleableAppWindow>
--- a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
@@ -1,115 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
-using Avalonia.Input;
-using Avalonia.Media.Imaging;
-using FluentAvalonia.Core;
-using FluentAvalonia.UI.Controls;
-using Projektanker.Icons.Avalonia;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
-using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Common.Configuration;
-using Ryujinx.HLE.FileSystem;
-using Ryujinx.HLE.HOS.SystemState;
-using Ryujinx.Input;
-using System;
-using System.IO;
-using System.Linq;
-using Key = Avalonia.Input.Key;
-
-
-namespace Ryujinx.Ava.UI.Windows
-{
-    public partial class GameSpecificSettingsWindow : StyleableAppWindow
-    {
-        internal readonly SettingsViewModel ViewModel;
-
-        public GameSpecificSettingsWindow(MainWindowViewModel viewModel, bool findUserConfigDir = true)
-        {
-            Title = string.Format(LocaleManager.Instance[LocaleKeys.SettingsWithInfo], viewModel.SelectedApplication.Name, viewModel.SelectedApplication.IdString);
-
-            DataContext = ViewModel = new SettingsViewModel(
-                viewModel.VirtualFileSystem, 
-                viewModel.ContentManager,
-                viewModel.IsGameRunning,
-                viewModel.SelectedApplication.Path,
-                viewModel.SelectedApplication.Name,
-                viewModel.SelectedApplication.IdString,
-                viewModel.SelectedApplication.Icon,
-                findUserConfigDir);
-
-            ViewModel.CloseWindow += Close;
-            ViewModel.SaveSettingsEvent += SaveSettings;
-
-            InitializeComponent();
-            Load();
-        }
-
-        public void SaveSettings()
-        {
-            InputPage.InputView?.SaveCurrentProfile();
-        }
-
-
-        private void Load()
-        {
-            Pages.Children.Clear();
-            NavPanel.SelectionChanged += NavPanelOnSelectionChanged;
-            NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0);
-        }
-
-        private void NavPanelOnSelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
-        {
-            
-            if (e.SelectedItem is NavigationViewItem navItem && navItem.Tag is not null)
-            {
-                switch (navItem.Tag.ToString())
-                {
-                    case nameof(UiPage):
-                        UiPage.ViewModel = ViewModel;
-                        NavPanel.Content = UiPage;
-                        break;
-                    case nameof(InputPage):
-                        NavPanel.Content = InputPage;
-                        break;
-                    case nameof(SystemPage):
-                        SystemPage.ViewModel = ViewModel;
-                        NavPanel.Content = SystemPage;
-                        break;
-                    case nameof(CpuPage):
-                        NavPanel.Content = CpuPage;
-                        break;
-                    case nameof(GraphicsPage):
-                        NavPanel.Content = GraphicsPage;
-                        break;
-                    case nameof(AudioPage):
-                        NavPanel.Content = AudioPage;
-                        break;
-                    case nameof(NetworkPage):
-                        NetworkPage.ViewModel = ViewModel;
-                        NavPanel.Content = NetworkPage;
-                        break;
-                    case nameof(LoggingPage):
-                        NavPanel.Content = LoggingPage;
-                        break;
-                    case nameof(HacksPage):
-                        HacksPage.DataContext = ViewModel;
-                        NavPanel.Content = HacksPage;
-                        break;
-                    default:
-                        throw new NotImplementedException();
-                }
-            }        
-        }
-
-        protected override void OnClosing(WindowClosingEventArgs e)
-        {
-            InputPage.Dispose(); // You need to unload the gamepad settings, otherwise the controls will be blocked
-            base.OnClosing(e);
-        }
-    }
-}
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -234,7 +234,7 @@ namespace Ryujinx.Ava.UI.Windows
            _deferLoad = true;
            _launchPath = launchPathArg;
            _launchApplicationId = launchApplicationId;
-            _startFullscreen = startFullscreenArg;          
+            _startFullscreen = startFullscreenArg;
        }

        public void SwitchToGameControl(bool startFullscreen = false)
@@ -385,7 +385,6 @@ namespace Ryujinx.Ava.UI.Windows

                            if (applicationData != null)
                            {
-                                ViewModel.SelectedApplication = applicationData;
                                await ViewModel.LoadApplication(applicationData, _startFullscreen);
                            }
                            else
@@ -397,7 +396,6 @@ namespace Ryujinx.Ava.UI.Windows
                        else
                        {
                            applicationData = applications[0];
-                            ViewModel.SelectedApplication = applicationData;
                            await ViewModel.LoadApplication(applicationData, _startFullscreen);
                        }
                    }
--- a/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
+++ b/src/Ryujinx/UI/Windows/ModManagerWindow.axaml
@@ -70,7 +70,11 @@
                    <DataTemplate
                        DataType="models:ModModel">
                        <Panel Margin="10">
-                            <Grid ColumnDefinitions="*,Auto">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
                                <TextBlock
                                    HorizontalAlignment="Left"
                                    VerticalAlignment="Center"
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
@@ -12,7 +12,7 @@
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
    Width="1100"
-    Height="927"
+    Height="768"
    MinWidth="800"
    MinHeight="480"
    WindowStartupLocation="CenterOwner"
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
@@ -6,6 +8,7 @@ using Ryujinx.HLE.FileSystem;
 using Ryujinx.Input;
 using System;
 using System.Linq;
+using Key = Avalonia.Input.Key;

 namespace Ryujinx.Ava.UI.Windows
 {
@@ -24,6 +27,10 @@ namespace Ryujinx.Ava.UI.Windows

            InitializeComponent();
            Load();
+
+#if DEBUG
+            this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
+#endif
        }

        public SettingsWindow()
--- a/src/Ryujinx/UI/Windows/StyleableWindow.cs
+++ b/src/Ryujinx/UI/Windows/StyleableWindow.cs
@@ -1,26 +1,15 @@
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
-using Avalonia.Input;
 using Avalonia.Media;
 using Avalonia.Platform;
 using FluentAvalonia.UI.Windowing;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
-using System.Threading.Tasks;

 namespace Ryujinx.Ava.UI.Windows
 {
    public abstract class StyleableAppWindow : AppWindow
    {
-        public static async Task ShowAsync(StyleableAppWindow appWindow, Window owner = null)
-        {
-#if DEBUG
-            appWindow.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Control));   
-#endif
-            await appWindow.ShowDialog(owner ?? RyujinxApp.MainWindow);
-        }
-        
        protected StyleableAppWindow()
        {
            WindowStartupLocation = WindowStartupLocation.CenterOwner;
@@ -47,14 +36,6 @@ namespace Ryujinx.Ava.UI.Windows

    public abstract class StyleableWindow : Window
    {
-        public static async Task ShowAsync(StyleableWindow window, Window owner = null)
-        {
-#if DEBUG
-            window.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Control));   
-#endif
-            await window.ShowDialog(owner ?? RyujinxApp.MainWindow);
-        }
-
        protected StyleableWindow()
        {
            WindowStartupLocation = WindowStartupLocation.CenterOwner;
--- a/src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml
+++ b/src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml
@@ -13,7 +13,14 @@
    x:DataType="viewModels:XCITrimmerViewModel"
    Focusable="True"
    mc:Ignorable="d">    
-    <Grid Margin="20 0 20 0" RowDefinitions="Auto,Auto,*,Auto,Auto">
+    <Grid Margin="20 0 20 0">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
        <Panel
            Margin="10 10 10 10"
            Grid.Row="0">
@@ -23,7 +30,12 @@
            Margin="0 0 10 10"
            IsVisible="{Binding !Processing}"
            Grid.Row="1">
-            <Grid ColumnDefinitions="Auto,*,Auto">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
                <StackPanel 
                    Grid.Column="0"
                    Orientation="Horizontal">
@@ -133,7 +145,11 @@
                    <DataTemplate
                        DataType="models:XCITrimmerFileModel">
                        <Panel Margin="10">
-                            <Grid ColumnDefinitions="65*,35*">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="65*" />
+                                    <ColumnDefinition Width="35*" />
+                                </Grid.ColumnDefinitions>
                                <TextBlock
                                    Grid.Column="0"
                                    Margin="10 0 10 0"
@@ -144,7 +160,11 @@
                                    TextTrimming="CharacterEllipsis"
                                    Text="{Binding Name}">
                                </TextBlock>
-                                <Grid Grid.Column="1" ColumnDefinitions="45*,55*">
+                                <Grid Grid.Column="1">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="45*" />
+                                        <ColumnDefinition Width="55*" />
+                                    </Grid.ColumnDefinitions>
                                    <ProgressBar
                                        Height="10"
                                        Margin="10 0 10 0"
@@ -206,7 +226,15 @@
            BorderThickness="1"
            CornerRadius="5"
            Padding="2.5">
-            <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
                <TextBlock
                    Grid.Column="0"
                    Grid.Row="0"
@@ -246,7 +274,11 @@
        <Panel
            Grid.Row="4"
            HorizontalAlignment="Stretch">
-            <Grid ColumnDefinitions="*,Auto">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
                <StackPanel
                    Grid.Column="0"
                    Orientation="Horizontal"
--- a/src/Ryujinx/Updater.cs
+++ b/src/Ryujinx/Updater.cs
@@ -43,9 +43,17 @@ namespace Ryujinx.Ava
        private const int ConnectionCount = 4;

        private static string _buildVer;
-        

-        private static readonly string _platformExt = BuildPlatformExtension();
+        private static readonly string _platformExt = 
+            RunningPlatform.IsMacOS 
+                ? "macos_universal.app.tar.gz"
+                : RunningPlatform.IsWindows
+                    ? "win_x64.zip"
+                    : RunningPlatform.IsX64Linux
+                        ? "linux_x64.tar.gz"
+                        : RunningPlatform.IsArmLinux
+                            ? "linux_arm64.tar.gz"
+                            : throw new PlatformNotSupportedException();
        
        private static string _buildUrl;
        private static long _buildSize;
@@ -772,34 +780,5 @@ namespace Ryujinx.Ava
        public static void CleanupUpdate() =>
            Directory.GetFiles(_homeDir, "*.ryuold", SearchOption.AllDirectories)
                .ForEach(File.Delete);
-        
-        private static string BuildPlatformExtension()
-        {
-            if (RunningPlatform.IsMacOS)
-                return "macos_universal.app.tar.gz";
-
-#pragma warning disable CS8509 // It is exhaustive for any values this can contain.
-            string osPrefix = RunningPlatform.CurrentOS switch
-            {
-                OperatingSystemType.Linux => "linux",
-                OperatingSystemType.Windows => "win"
-            };
-
-            string archSuffix = RunningPlatform.Architecture switch
-            {
-                Architecture.Arm64 => "arm64",
-                Architecture.X64 => "x64",
-                _ => throw new PlatformNotSupportedException($"Unknown architecture {Enum.GetName(RunningPlatform.Architecture)}."),
-            };
-            
-            string fileExtension = RunningPlatform.CurrentOS switch
-#pragma warning restore CS8509
-            {
-                OperatingSystemType.Linux => "tar.gz",
-                OperatingSystemType.Windows => "zip"
-            };
-
-            return $"{osPrefix}_{archSuffix}.{fileExtension}";
-        }
    }
 }
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
@@ -23,7 +23,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
    public class ApplicationData
    {
        public bool Favorite { get; set; }
-        public bool HasIndependentConfiguration { get; set; }
        public byte[] Icon { get; set; }
        public string Name { get; set; } = "Unknown";

--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
@@ -504,7 +504,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                if (data.Id != 0)
                {
                    ApplicationMetadata appMetadata = LoadAndSaveMetaData(data.IdString, appMetadata =>
-                    {                        
+                    {
                        appMetadata.Title = data.Name;

                        // Only do the migration if time_played has a value and timespan_played hasn't been updated yet.
@@ -528,11 +528,10 @@ namespace Ryujinx.Ava.Utilities.AppLibrary

                        }
                    });
-            
+
                    data.Favorite = appMetadata.Favorite;
                    data.TimePlayed = appMetadata.TimePlayed;
                    data.LastPlayed = appMetadata.LastPlayed;
-                    data.HasIndependentConfiguration = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // Just check user config
                }

                data.FileExtension = Path.GetExtension(applicationPath).TrimStart('.').ToUpper();
--- a/src/Ryujinx/Utilities/CommandLineState.cs
+++ b/src/Ryujinx/Utilities/CommandLineState.cs
@@ -7,16 +7,11 @@ namespace Ryujinx.Ava.Utilities
    public static class CommandLineState
    {
        public static string[] Arguments { get; private set; }
-        public static int CountArguments { get; private set; }
+
        public static bool? OverrideDockedMode { get; private set; }
        public static bool? OverrideHardwareAcceleration { get; private set; }
        public static string OverrideGraphicsBackend { get; private set; }
        public static string OverrideBackendThreading { get; private set; }
-        public static string OverrideBackendThreadingAfterReboot { get; private set; }
-        public static string OverridePPTC { get; private set; }
-        public static string OverrideMemoryManagerMode { get; private set; } 
-        public static string OverrideSystemRegion { get; private set; } 
-        public static string OverrideSystemLanguage { get; private set; } 
        public static string OverrideHideCursor { get; private set; }
        public static string BaseDirPathArg { get; private set; }
        public static FilePath FirmwareToInstallPathArg { get; set; }
@@ -26,7 +21,6 @@ namespace Ryujinx.Ava.Utilities
        public static bool StartFullscreenArg { get; private set; }
        public static bool HideAvailableUpdates { get; private set; }

-
        public static void ParseArguments(string[] args)
        {
            List<string> arguments = [];
@@ -36,11 +30,6 @@ namespace Ryujinx.Ava.Utilities
            {
                string arg = args[i];

-                if (arg.Contains("-") || arg.Contains("--"))
-                {
-                    CountArguments++; 
-                }
-
                switch (arg)
                {
                    case "-r":
@@ -111,57 +100,6 @@ namespace Ryujinx.Ava.Utilities

                        OverrideBackendThreading = args[++i];
                        break;
-                    case "--bt":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideBackendThreadingAfterReboot = args[++i];
-                        break;
-                    case "--pptc":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverridePPTC = args[++i];
-                        break;
-                    case "-m":
-                    case "--memory-manager-mode":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideMemoryManagerMode = args[++i];
-                        break;
-                    case "--system-region":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideSystemRegion = args[++i];
-                        break;
-                    case "--system-language":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        OverrideSystemLanguage = args[++i];
-                        break;
                    case "-i":
                    case "--application-id":
                        LaunchApplicationId = args[++i];
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -18,10 +18,9 @@ namespace Ryujinx.Ava.Utilities.Configuration
 {
    public partial class ConfigurationState
    {
-        public void Load(ConfigurationFileFormat cff, string configurationFilePath, string titleId = "")
+        public void Load(ConfigurationFileFormat cff, string configurationFilePath)
        {
            bool configurationFileUpdated = false;
-            bool shouldLoadFromFile = string.IsNullOrEmpty(titleId);

            if (cff.Version is < 0 or > ConfigurationFileFormat.CurrentVersion)
            {
@@ -44,17 +43,16 @@ namespace Ryujinx.Ava.Utilities.Configuration
                configurationFileUpdated = true;
            }
            
-          
            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
+            CheckUpdatesOnStart.Value = cff.CheckUpdatesOnStart;
+            UpdateCheckerType.Value = cff.UpdateCheckerType;
            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
-            EnableHardwareAcceleration.Value = shouldLoadFromFile ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
+            ShowConfirmExit.Value = cff.ShowConfirmExit;
+            RememberWindowState.Value = cff.RememberWindowState;
+            ShowTitleBar.Value = cff.ShowTitleBar;
+            EnableHardwareAcceleration.Value = cff.EnableHardwareAcceleration;
            HideCursor.Value = cff.HideCursor;
-          
+            
            Logger.EnableFileLog.Value = cff.EnableFileLog;
            Logger.EnableDebug.Value = cff.LoggingEnableDebug;
            Logger.EnableStub.Value = cff.LoggingEnableStub;
@@ -89,8 +87,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
            System.Language.Value = cff.SystemLanguage;
            System.Region.Value = cff.SystemRegion;
            System.TimeZone.Value = cff.SystemTimeZone;
-            System.SystemTimeOffset.Value = shouldLoadFromFile ? cff.SystemTimeOffset : System.SystemTimeOffset.Value; // Get from global config only
-            System.MatchSystemTime.Value = shouldLoadFromFile ? cff.MatchSystemTime : System.MatchSystemTime.Value; // Get from global config only
+            System.SystemTimeOffset.Value = cff.SystemTimeOffset;
+            System.MatchSystemTime.Value = cff.MatchSystemTime;
            System.EnableDockedMode.Value = cff.DockedMode;
            System.EnablePtc.Value = cff.EnablePtc;
            System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
@@ -104,48 +102,47 @@ namespace Ryujinx.Ava.Utilities.Configuration
            System.IgnoreMissingServices.Value = cff.IgnoreMissingServices;
            System.IgnoreControllerApplet.Value = cff.IgnoreApplet;
            System.UseHypervisor.Value = cff.UseHypervisor;
-
-            UI.GuiColumns.FavColumn.Value = shouldLoadFromFile ? cff.GuiColumns.FavColumn : UI.GuiColumns.FavColumn.Value;
-            UI.GuiColumns.IconColumn.Value = shouldLoadFromFile ? cff.GuiColumns.IconColumn : UI.GuiColumns.IconColumn.Value;
-            UI.GuiColumns.AppColumn.Value = shouldLoadFromFile ? cff.GuiColumns.AppColumn : UI.GuiColumns.AppColumn.Value;
-            UI.GuiColumns.DevColumn.Value = shouldLoadFromFile ? cff.GuiColumns.DevColumn : UI.GuiColumns.DevColumn.Value;
-            UI.GuiColumns.VersionColumn.Value = shouldLoadFromFile ? cff.GuiColumns.VersionColumn : UI.GuiColumns.VersionColumn.Value;
-            UI.GuiColumns.TimePlayedColumn.Value = shouldLoadFromFile ? cff.GuiColumns.TimePlayedColumn : UI.GuiColumns.TimePlayedColumn.Value;
-            UI.GuiColumns.LastPlayedColumn.Value = shouldLoadFromFile ? cff.GuiColumns.LastPlayedColumn : UI.GuiColumns.LastPlayedColumn.Value;
-            UI.GuiColumns.FileExtColumn.Value = shouldLoadFromFile ? cff.GuiColumns.FileExtColumn : UI.GuiColumns.FileExtColumn.Value;
-            UI.GuiColumns.FileSizeColumn.Value = shouldLoadFromFile ? cff.GuiColumns.FileSizeColumn : UI.GuiColumns.FileSizeColumn.Value;
-            UI.GuiColumns.PathColumn.Value = shouldLoadFromFile ? cff.GuiColumns.PathColumn : UI.GuiColumns.PathColumn.Value;
-            UI.ColumnSort.SortColumnId.Value = shouldLoadFromFile ? cff.ColumnSort.SortColumnId : UI.ColumnSort.SortColumnId.Value;
-            UI.ColumnSort.SortAscending.Value = shouldLoadFromFile ? cff.ColumnSort.SortAscending : UI.ColumnSort.SortAscending.Value;
-            UI.GameDirs.Value = shouldLoadFromFile ? cff.GameDirs : UI.GameDirs.Value;
-            UI.AutoloadDirs.Value = shouldLoadFromFile ? (cff.AutoloadDirs ?? []) : UI.AutoloadDirs.Value;
-            UI.ShownFileTypes.NSP.Value = shouldLoadFromFile ? cff.ShownFileTypes.NSP : UI.ShownFileTypes.NSP.Value;
-            UI.ShownFileTypes.PFS0.Value = shouldLoadFromFile ? cff.ShownFileTypes.PFS0 : UI.ShownFileTypes.PFS0.Value;
-            UI.ShownFileTypes.XCI.Value = shouldLoadFromFile ? cff.ShownFileTypes.XCI : UI.ShownFileTypes.XCI.Value;
-            UI.ShownFileTypes.NCA.Value = shouldLoadFromFile ? cff.ShownFileTypes.NCA : UI.ShownFileTypes.NCA.Value;
-            UI.ShownFileTypes.NRO.Value = shouldLoadFromFile ? cff.ShownFileTypes.NRO : UI.ShownFileTypes.NRO.Value;
-            UI.ShownFileTypes.NSO.Value = shouldLoadFromFile ? cff.ShownFileTypes.NSO : UI.ShownFileTypes.NSO.Value;
-            UI.LanguageCode.Value = shouldLoadFromFile ? cff.LanguageCode : UI.LanguageCode.Value;
-            UI.BaseStyle.Value = shouldLoadFromFile ? cff.BaseStyle : UI.BaseStyle.Value;
-            UI.GameListViewMode.Value = shouldLoadFromFile ? cff.GameListViewMode : UI.GameListViewMode.Value;
-            UI.ShowNames.Value = shouldLoadFromFile ? cff.ShowNames : UI.ShowNames.Value;
-            UI.IsAscendingOrder.Value = shouldLoadFromFile ? cff.IsAscendingOrder : UI.IsAscendingOrder.Value;
-            UI.GridSize.Value = shouldLoadFromFile ? cff.GridSize : UI.GridSize.Value;
-            UI.ApplicationSort.Value = shouldLoadFromFile ? cff.ApplicationSort : UI.ApplicationSort.Value;
-            UI.StartFullscreen.Value = shouldLoadFromFile ? cff.StartFullscreen : UI.StartFullscreen.Value;
-            UI.StartNoUI.Value = shouldLoadFromFile ? cff.StartNoUI : UI.StartNoUI.Value;
-            UI.ShowConsole.Value = shouldLoadFromFile ? cff.ShowConsole : UI.ShowConsole.Value;
-            UI.WindowStartup.WindowSizeWidth.Value = shouldLoadFromFile ? cff.WindowStartup.WindowSizeWidth : UI.WindowStartup.WindowSizeWidth.Value;
-            UI.WindowStartup.WindowSizeHeight.Value = shouldLoadFromFile ? cff.WindowStartup.WindowSizeHeight : UI.WindowStartup.WindowSizeHeight.Value;
-            UI.WindowStartup.WindowPositionX.Value = shouldLoadFromFile ? cff.WindowStartup.WindowPositionX : UI.WindowStartup.WindowPositionX.Value;
-            UI.WindowStartup.WindowPositionY.Value = shouldLoadFromFile ? cff.WindowStartup.WindowPositionY : UI.WindowStartup.WindowPositionY.Value;
-            UI.WindowStartup.WindowMaximized.Value = shouldLoadFromFile ? cff.WindowStartup.WindowMaximized : UI.WindowStartup.WindowMaximized.Value;
-
-
+            
+            UI.GuiColumns.FavColumn.Value = cff.GuiColumns.FavColumn;
+            UI.GuiColumns.IconColumn.Value = cff.GuiColumns.IconColumn;
+            UI.GuiColumns.AppColumn.Value = cff.GuiColumns.AppColumn;
+            UI.GuiColumns.DevColumn.Value = cff.GuiColumns.DevColumn;
+            UI.GuiColumns.VersionColumn.Value = cff.GuiColumns.VersionColumn;
+            UI.GuiColumns.TimePlayedColumn.Value = cff.GuiColumns.TimePlayedColumn;
+            UI.GuiColumns.LastPlayedColumn.Value = cff.GuiColumns.LastPlayedColumn;
+            UI.GuiColumns.FileExtColumn.Value = cff.GuiColumns.FileExtColumn;
+            UI.GuiColumns.FileSizeColumn.Value = cff.GuiColumns.FileSizeColumn;
+            UI.GuiColumns.PathColumn.Value = cff.GuiColumns.PathColumn;
+            UI.ColumnSort.SortColumnId.Value = cff.ColumnSort.SortColumnId;
+            UI.ColumnSort.SortAscending.Value = cff.ColumnSort.SortAscending;
+            UI.GameDirs.Value = cff.GameDirs;
+            UI.AutoloadDirs.Value = cff.AutoloadDirs ?? [];
+            UI.ShownFileTypes.NSP.Value = cff.ShownFileTypes.NSP;
+            UI.ShownFileTypes.PFS0.Value = cff.ShownFileTypes.PFS0;
+            UI.ShownFileTypes.XCI.Value = cff.ShownFileTypes.XCI;
+            UI.ShownFileTypes.NCA.Value = cff.ShownFileTypes.NCA;
+            UI.ShownFileTypes.NRO.Value = cff.ShownFileTypes.NRO;
+            UI.ShownFileTypes.NSO.Value = cff.ShownFileTypes.NSO;
+            UI.LanguageCode.Value = cff.LanguageCode;
+            UI.BaseStyle.Value = cff.BaseStyle;
+            UI.GameListViewMode.Value = cff.GameListViewMode;
+            UI.ShowNames.Value = cff.ShowNames;
+            UI.IsAscendingOrder.Value = cff.IsAscendingOrder;
+            UI.GridSize.Value = cff.GridSize;
+            UI.ApplicationSort.Value = cff.ApplicationSort;
+            UI.StartFullscreen.Value = cff.StartFullscreen;
+            UI.StartNoUI.Value = cff.StartNoUI;
+            UI.ShowConsole.Value = cff.ShowConsole;
+            UI.WindowStartup.WindowSizeWidth.Value = cff.WindowStartup.WindowSizeWidth;
+            UI.WindowStartup.WindowSizeHeight.Value = cff.WindowStartup.WindowSizeHeight;
+            UI.WindowStartup.WindowPositionX.Value = cff.WindowStartup.WindowPositionX;
+            UI.WindowStartup.WindowPositionY.Value = cff.WindowStartup.WindowPositionY;
+            UI.WindowStartup.WindowMaximized.Value = cff.WindowStartup.WindowMaximized;
+            
            Hid.EnableKeyboard.Value = cff.EnableKeyboard;
            Hid.EnableMouse.Value = cff.EnableMouse;
-            Hid.DisableInputWhenOutOfFocus.Value = shouldLoadFromFile ? cff.DisableInputWhenOutOfFocus: Hid.DisableInputWhenOutOfFocus.Value; // Get from global config only
-            Hid.Hotkeys.Value = shouldLoadFromFile ? cff.Hotkeys : Hid.Hotkeys.Value; // Get from global config only
+            Hid.DisableInputWhenOutOfFocus.Value = cff.DisableInputWhenOutOfFocus;
+            Hid.Hotkeys.Value = cff.Hotkeys;
            Hid.InputConfig.Value = cff.InputConfig ?? [];
            Hid.RainbowSpeed.Value = cff.RainbowSpeed;

--- a/src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs
+++ b/src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs
@@ -59,13 +59,12 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                "Race" => "Racing",
                _ => FormattedValue.ForceReset
            };
-        
-        private static FormattedValue PokemonSV(MultiValue values)
-        {
-            
-            string playStatus = values.Matched[0].BoxedValue is 0 ? "Playing Alone" : "Playing in a group";
-            
-            FormattedValue locations = values.Matched[1].ToString()  switch
+
+        private static FormattedValue PokemonSVUnionCircle(SingleValue value)
+            => value.Matched.BoxedValue is 0 ? "Playing Alone" : "Playing in a group";
+
+        private static FormattedValue PokemonSVArea(SingleValue value)
+            => value.Matched.StringValue switch
            {
                // Base Game Locations
                "a_w01" => "South Area One",
@@ -93,13 +92,10 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                "a_w24" => "South Paldean Sea",
                "a_w25" => "West Paldean Sea",
                "a_w26" => "East Paldean Sea",
-                "a_w27" => "North Paldean Sea",
+                "a_w27" => "Nouth Paldean Sea",
                //TODO DLC Locations
                _ => FormattedValue.ForceReset
            };
-            
-            return$"{playStatus} in {locations}";
-        }

        private static FormattedValue SuperSmashBrosUltimate_Mode(SparseMultiValue values)
        {
@@ -119,11 +115,6 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                return $"Achievement Unlocked - ID: {anniversary}";
            }

-            if (values.Matched.ContainsKey("is_created"))
-            {
-                return "Edited a Custom Stage!"; 
-            }
-
            if (values.Matched.ContainsKey("adv_slot"))
            {
                return
--- a/src/Ryujinx/Utilities/PlayReport/PlayReports.cs
+++ b/src/Ryujinx/Utilities/PlayReport/PlayReports.cs
@@ -59,8 +59,9 @@ namespace Ryujinx.Ava.Utilities.PlayReport
            .AddSpec(
                ["0100a3d008c5c000", "01008f6008c5e000"],
                spec => spec
-                    .WithDescription("based on if you're playing alone or in a group and what area of Paldea you're exploring.")
-                    .AddMultiValueFormatter(["team_circle", "area_no"], PokemonSV)
+                    .WithDescription("based on what area of Paldea you're exploring.")
+                    .AddValueFormatter("area_no", PokemonSVArea)
+                    .AddValueFormatter("team_circle", PokemonSVUnionCircle)
            )
            .AddSpec(
                "01006a800016e000",
@@ -70,7 +71,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                        [
                            // Metadata to figure out what PlayReport we have.
                            "match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count",
-                            "adv_slot", "is_created",
+                            "adv_slot",
                            // List of Fighters
                            "player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter",
                            "player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter",
--- a/src/Ryujinx/Utilities/ShortcutHelper.cs
+++ b/src/Ryujinx/Utilities/ShortcutHelper.cs
@@ -12,7 +12,7 @@ namespace Ryujinx.Ava.Utilities
    public static class ShortcutHelper
    {
        [SupportedOSPlatform("windows")]
-        private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath, string args = "")
+        private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath)
        {
            string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AppDomain.CurrentDomain.FriendlyName + ".exe");
            iconPath += ".ico";
@@ -22,13 +22,13 @@ namespace Ryujinx.Ava.Utilities
            image.Resize(new SKImageInfo(128, 128), SKFilterQuality.High);
            SaveBitmapAsIcon(image, iconPath);

-            Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId, args), iconPath, 0);
+            Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId), iconPath, 0);
            shortcut.StringData.NameString = cleanedAppName;
            shortcut.WriteToFile(Path.Combine(desktopPath, cleanedAppName + ".lnk"));
        }

        [SupportedOSPlatform("linux")]
-        private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName, string args = "")
+        private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName)
        {
            string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Ryujinx.sh");
            string desktopFile = EmbeddedResources.ReadAllText("Ryujinx/Assets/ShortcutFiles/shortcut-template.desktop");
@@ -40,11 +40,11 @@ namespace Ryujinx.Ava.Utilities
            data.SaveTo(file);

            using StreamWriter outputFile = new(Path.Combine(desktopPath, cleanedAppName + ".desktop"));
-            outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId, args)}");
+            outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId)}");
        }

        [SupportedOSPlatform("macos")]
-        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName, string args = "")
+        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName)
        {
            string basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Ryujinx");
            string plistFile = EmbeddedResources.ReadAllText("Ryujinx/Assets/ShortcutFiles/shortcut-template.plist");
@@ -63,7 +63,7 @@ namespace Ryujinx.Ava.Utilities
            string scriptPath = Path.Combine(scriptFolderPath, ScriptName);
            using StreamWriter scriptFile = new(scriptPath);

-            scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId, args));
+            scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId));

            // Set execute permission
            FileInfo fileInfo = new(scriptPath);
@@ -87,7 +87,7 @@ namespace Ryujinx.Ava.Utilities
            outputFile.Write(plistFile, ScriptName, cleanedAppName, IconName);
        }

-        public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData, string args = "")
+        public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData)
        {
            string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
            string cleanedAppName = string.Join("_", applicationName.Split(Path.GetInvalidFileNameChars()));
@@ -96,7 +96,7 @@ namespace Ryujinx.Ava.Utilities
            {
                string iconPath = Path.Combine(AppDataManager.BaseDirPath, "games", applicationId, "app");

-                CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath, args);
+                CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath);

                return;
            }
@@ -106,14 +106,14 @@ namespace Ryujinx.Ava.Utilities
                string iconPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share", "icons", "Ryujinx");

                Directory.CreateDirectory(iconPath);
-                CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName, args);
+                CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName);

                return;
            }

            if (OperatingSystem.IsMacOS())
            {
-                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName, args);
+                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName);

                return;
            }
@@ -121,7 +121,7 @@ namespace Ryujinx.Ava.Utilities
            throw new NotImplementedException("Shortcut support has not been implemented yet for this OS.");
        }

-        private static string GetArgsString(string appFilePath, string applicationId, string config = "")
+        private static string GetArgsString(string appFilePath, string applicationId)
        {
            // args are first defined as a list, for easier adjustments in the future
            List<string> argsList = [];
@@ -132,11 +132,6 @@ namespace Ryujinx.Ava.Utilities
                argsList.Add($"\"{CommandLineState.BaseDirPathArg}\"");
            }

-            if (!string.IsNullOrEmpty(config))
-            {
-                argsList.Add(config);
-            }
-
            if (appFilePath.ToLower().EndsWith(".xci"))
            {
                argsList.Add("--application-id");
Author	SHA1	Message	Date
Daniel Nylander	2576c99b8d	Merge `fc12d99716` into `3ffcc72117`	2025-02-25 07:46:44 +01:00
Daniel Nylander	fc12d99716	Updated Swedish in locales.json	2025-02-25 07:46:29 +01:00