From 2640f083b6d7bd40c80f81e5fc4660b6748103d2 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Thu, 6 Feb 2025 20:12:56 +1000
Subject: [PATCH 01/20] Added custom setting function for each game

---
 .github/workflows/release.yml                 |   6 +-
 .../Services/SurfaceFlinger/SurfaceFlinger.cs |   1 +
 src/Ryujinx/AppHost.cs                        |   4 +
 src/Ryujinx/Assets/Styles/Styles.xaml         |  23 +-
 src/Ryujinx/Assets/Styles/Themes.xaml         |   8 +-
 src/Ryujinx/Assets/locales.json               |  25 +++
 src/Ryujinx/Program.cs                        |  62 +++++-
 src/Ryujinx/Ryujinx.csproj                    |   7 +-
 .../UI/Controls/ApplicationContextMenu.axaml  |   5 +
 .../Controls/ApplicationContextMenu.axaml.cs  |  34 ++-
 .../UI/Controls/ApplicationGridView.axaml     |  38 +++-
 .../UI/Controls/ApplicationListView.axaml     |   7 +
 .../UI/Controls/ApplicationListView.axaml.cs  |  14 ++
 .../UI/ViewModels/MainWindowViewModel.cs      |  11 +-
 .../UI/ViewModels/SettingsViewModel.cs        | 199 +++++++++++++++---
 .../UI/Windows/UserConfigWindows.axaml        | 139 ++++++++++++
 .../UI/Windows/UserConfigWindows.axaml.cs     | 108 ++++++++++
 .../Utilities/AppLibrary/ApplicationData.cs   |   1 +
 .../AppLibrary/ApplicationLibrary.cs          |   5 +-
 src/Ryujinx/Utilities/CommandLineState.cs     |  57 ++++-
 .../ConfigurationState.Migration.cs           |  99 +++++----
 src/Ryujinx/Utilities/ShortcutHelper.cs       |  27 ++-
 22 files changed, 776 insertions(+), 104 deletions(-)
 create mode 100644 src/Ryujinx/UI/Windows/UserConfigWindows.axaml
 create mode 100644 src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 072c6bf2f..bd302e661 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,9 +10,9 @@ env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   RYUJINX_BASE_VERSION: "1.2"
-  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
-  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
+  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Goodfeat"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx_alt"
   RELEASE: 1
 
 jobs:
diff --git a/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
index 935e9895e..23bf8bcfc 100644
--- a/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
+++ b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
 namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
index 25f451858..d49456b9a 100644
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -582,6 +582,10 @@ namespace Ryujinx.Ava
             Rainbow.Disable();
             Rainbow.Reset();
 
+            //Reload settings when the game is turned off
+            //(resets custom settings if there were any)
+            Program.ReloadConfig();
+
             _isStopped = true;
             Stop();
         }
diff --git a/src/Ryujinx/Assets/Styles/Styles.xaml b/src/Ryujinx/Assets/Styles/Styles.xaml
index 5523f551a..c3bc27efd 100644
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -1,7 +1,8 @@
-<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"
@@ -27,10 +28,11 @@
                             Height="28"
                             HorizontalAlignment="Right"
                             Content="Addy" />
-                        <Button
+                        <Button 
                             Name="btnRem"
                             HorizontalAlignment="Right"
-                            Content="Add" />
+                            Content="Add" 
+                            Classes="red"/>                
                         <TextBox
                             Width="100"
                             VerticalAlignment="Center"
@@ -41,7 +43,12 @@
                     </StackPanel>
                 </Grid>
                 <ui:NumberBox Value="1" />
+                <MenuItem
+                    IconSource="Settings"
+                    Header="123 0000"
+                    ToolTip.Tip="What this"/>
             </StackPanel>
+            
         </Border>
     </Design.PreviewWith>
     <Style Selector="DropDownButton">
@@ -373,6 +380,16 @@
         <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}" />
diff --git a/src/Ryujinx/Assets/Styles/Themes.xaml b/src/Ryujinx/Assets/Styles/Themes.xaml
index 3a0bd4217..de7584240 100644
--- 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,11 +12,13 @@
             <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"
@@ -29,11 +31,13 @@
             <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"
@@ -46,11 +50,13 @@
             <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>
diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index 8cf5b0d7c..a0b899fd5 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -2747,6 +2747,31 @@
         "zh_TW": "在 macOS 的應用程式資料夾中建立捷徑，啟動選取的應用程式"
       }
     },
+    {
+      "ID": "EditGameConfigurationToolTip",
+      "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 current 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": "GameListContextMenuShowCompatEntry",
       "Translations": {
diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
index 831e4294c..39c2aea16 100644
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -23,6 +23,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Ryujinx.Ava
 {
@@ -32,6 +33,7 @@ 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; }
 
@@ -155,11 +157,42 @@ namespace Ryujinx.Ava
             }
         }
 
+        public static void ReloadGameConfig(string gamedir)
+        {
+            if (File.Exists(gamedir))
+            {
+                ConfigurationPath = gamedir;
+            }
+
+        }
+
+        public static string GetDirGameUserConfig(string gameId, bool rememberGlobalDir = false, bool changeFolderForGame = false)
+        {
+            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))
             {
@@ -232,8 +265,35 @@ 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 hardware-acceleration was overridden.
+            // 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. MemoryManagerMode ( outdated! )
             if (CommandLineState.OverrideHardwareAcceleration != null)
                 UseHardwareAcceleration = CommandLineState.OverrideHardwareAcceleration.Value;
         }
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index 174aadeb0..ec1fd6811 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
@@ -172,5 +172,10 @@
   <ItemGroup>
     <Folder Include="Assets\Fonts\Mono\" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="UI\Windows\UserConfigWindows.axaml.cs">
+      <DependentUpon>UserConfigWindows.axaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
 
 </Project>
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
index 3e47a1910..18a4067cf 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
@@ -19,6 +19,11 @@
         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"
+       Header="Edit Game Configuration"
+       Icon="{ext:Icon fa-solid fa-gear}"
+       ToolTip.Tip="{ext:Locale EditGameConfigurationToolTip}" />
     <MenuItem
         IsVisible="{Binding HasCompatibilityEntry}"
         Click="OpenApplicationCompatibility_Click"
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
index e55e74455..37c214952 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -13,6 +13,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -36,6 +37,21 @@ namespace Ryujinx.Ava.UI.Controls
             AvaloniaXamlLoader.Load(this);
         }
 
+        public void ToggleUserControl_Click(object sender, RoutedEventArgs args)
+        {
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
+
+            viewModel.SelectedApplication.Favorite = !viewModel.SelectedApplication.Favorite;
+
+            ApplicationLibrary.LoadAndSaveMetaData(viewModel.SelectedApplication.IdString, appMetadata =>
+            {
+                appMetadata.Favorite = viewModel.SelectedApplication.Favorite;
+            });
+
+            viewModel.RefreshView();
+        }
+
         public void ToggleFavorite_Click(object sender, RoutedEventArgs args)
         {
             if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
@@ -386,13 +402,27 @@ 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 new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
+
+                //just checking for file presence
+                viewModel.SelectedApplication.UserConfig = 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 })
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
index 7f7e3260b..7cf7b2e3c 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -73,12 +73,18 @@
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Stretch"
                                     IsVisible="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding Name}"
-                                        TextAlignment="Center"
-                                        TextWrapping="Wrap" />
+                                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                        <TextBlock
+                                            Text="{Binding Name}"
+                                            TextAlignment="Center"
+                                            TextWrapping="Wrap" />
+                                        <TextBlock
+                                            IsVisible="{Binding UserConfig}"
+                                            Text="User Config"
+                                            TextAlignment="Center"
+                                            TextWrapping="Wrap"
+                                            Foreground="{DynamicResource Warning}" />
+                                    </StackPanel>
                                 </Panel>
                             </Grid>
                         </Border>
@@ -86,10 +92,28 @@
                             Margin="5,5,0,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            FontSize="16"
+                            FontSize="18"
                             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 UserConfig}"
+                                Background="{DynamicResource ThemeContentBackgroundColor}">
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="User Config"
+                                    TextAlignment="Center"
+                                    TextWrapping="Wrap" />   
+                            </Border>
+                        </Grid>
                     </Grid>
                 </DataTemplate>
             </ListBox.ItemTemplate>
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
index 733500338..e781d1fc2 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -145,6 +145,13 @@
                                         Text="{Binding Converter={x:Static helpers:MultiplayerInfoConverter.Instance}}"
                                         TextAlignment="Start"
                                         TextWrapping="Wrap"/>
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        IsVisible="{Binding UserConfig}"
+                                        Text="User Config"
+                                        TextAlignment="Start"
+                                        TextWrapping="Wrap"
+                                        Foreground="{DynamicResource Warning}" />
                                 </StackPanel>
                                 <StackPanel
                                     Grid.Column="4"
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
index 7c6b0cf15..d62cafbba 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
@@ -4,6 +4,7 @@ using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
 using System;
@@ -42,6 +43,19 @@ namespace Ryujinx.Ava.UI.Controls
             await CompatibilityList.Show((string)playabilityLabel.Tag);
         }
 
+        public async void EditGameConfiguration_Click(object sender, RoutedEventArgs args)
+        {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+            {
+                await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
+
+                //viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString));
+
+                viewModel.RefreshView();
+            }
+
+        }
+
         private async void IdString_OnClick(object sender, RoutedEventArgs e)
         {
             if (DataContext is not MainWindowViewModel mwvm)
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 499eedc8d..61ece18dc 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -1076,7 +1076,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             _rendererWaitEvent.WaitOne();
 
             AppHost?.Start();
-
+            
             AppHost?.DisposeContext();
         }
 
@@ -1540,6 +1540,14 @@ namespace Ryujinx.Ava.UI.ViewModels
 #if RELEASE
             await PerformanceCheck();
 #endif
+            // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting.
+            string gameDir = Program.GetDirGameUserConfig(application.IdBaseString, true, true);
+
+            if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
+            {
+                //Program.GetDirGameUserConfig(application.IdBaseString, false);
+                ConfigurationState.Instance.Load(configurationFileFormat, gameDir, application.IdBaseString);
+            }
 
             Logger.RestartTime();
 
@@ -1585,6 +1593,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             Thread gameThread = new(InitializeGame) { Name = "GUI.WindowThread" };
             gameThread.Start();
+            
         }
 
         public void SwitchToRenderer(bool startFullscreen) =>
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index bd649602c..8454eb142 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -1,8 +1,10 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Humanizer;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -26,6 +28,7 @@ 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;
@@ -67,6 +70,49 @@ namespace Ryujinx.Ava.UI.ViewModels
         [ObservableProperty] private string _ldnServer;
 
         public SettingsHacksViewModel DirtyHacks { get; }
+        public string GamePath { get; }
+        public string GameName { get; }
+
+        private Bitmap _gameIcon;
+
+        private string _gameTitle;
+        private string _gameId;
+        public Bitmap GameIcon
+        {
+            get => _gameIcon;
+            set
+            {
+                if (_gameIcon != value)
+                {
+                    _gameIcon = value;
+                }
+            }
+        }
+
+        public string GameTitle
+        {
+            get => _gameTitle;
+            set
+            {
+                if (_gameTitle != value)
+                {
+                    _gameTitle = value;
+                }
+            }
+        }
+
+        public string GameId
+        {
+            get => _gameId;
+            set
+            {
+                if (_gameId != value)
+                {
+                    _gameId = value;
+                }
+            }
+        }
+
 
         public int ResolutionScale
         {
@@ -342,6 +388,37 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager, string gamePath, string gameName, string gameId, byte[] gameIconData) : this()
+        {
+            _virtualFileSystem = virtualFileSystem;
+            _contentManager = contentManager;
+  
+            if (gameIconData != null && gameIconData.Length > 0)
+            {
+                using (var ms = new MemoryStream(gameIconData))
+                {
+                    GameIcon = new Bitmap(ms);
+                }
+            }
+
+            GameTitle = gameName;
+            GameId = gameId;
+
+            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);
+
+                DirtyHacks = new SettingsHacksViewModel(this);
+            }
+        }
+
         public SettingsViewModel()
         {
             GameDirectories = [];
@@ -468,27 +545,30 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             ConfigurationState config = ConfigurationState.Instance;
 
-            // User Interface
-            EnableDiscordIntegration = config.EnableDiscordIntegration;
-            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
-            ShowConfirmExit = config.ShowConfirmExit;
-            RememberWindowState = config.RememberWindowState;
-            ShowTitleBar = config.ShowTitleBar;
-            HideCursor = (int)config.HideCursor.Value;
-
-            GameDirectories.Clear();
-            GameDirectories.AddRange(config.UI.GameDirs.Value);
-
-            AutoloadDirectories.Clear();
-            AutoloadDirectories.AddRange(config.UI.AutoloadDirs.Value);
-
-            BaseStyleIndex = config.UI.BaseStyle.Value switch
+            if (string.IsNullOrEmpty(GameId))
             {
-                "Auto" => 0,
-                "Light" => 1,
-                "Dark" => 2,
-                _ => 0
-            };
+                // User Interface
+                EnableDiscordIntegration = config.EnableDiscordIntegration;
+                CheckUpdatesOnStart = config.CheckUpdatesOnStart;
+                ShowConfirmExit = config.ShowConfirmExit;
+                RememberWindowState = config.RememberWindowState;
+                ShowTitleBar = config.ShowTitleBar;
+                HideCursor = (int)config.HideCursor.Value;
+
+                GameDirectories.Clear();
+                GameDirectories.AddRange(config.UI.GameDirs.Value);
+
+                AutoloadDirectories.Clear();
+                AutoloadDirectories.AddRange(config.UI.AutoloadDirs.Value);
+
+                BaseStyleIndex = config.UI.BaseStyle.Value switch
+                {
+                    "Auto" => 0,
+                    "Light" => 1,
+                    "Dark" => 2,
+                    _ => 0
+                };
+            }
 
             // Input
             EnableDockedMode = config.System.EnableDockedMode;
@@ -569,7 +649,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             LdnServer = config.Multiplayer.LdnServer;
         }
 
-        public void SaveSettings()
+        public void SaveSettings2()
         {
             ConfigurationState config = ConfigurationState.Instance;
 
@@ -583,12 +663,12 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             if (GameDirectoryChanged)
             {
-                config.UI.GameDirs.Value = [..GameDirectories];
+                config.UI.GameDirs.Value = [.. GameDirectories];
             }
 
             if (AutoloadDirectoryChanged)
             {
-                config.UI.AutoloadDirs.Value = [..AutoloadDirectories];
+                config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
             }
 
             config.UI.BaseStyle.Value = BaseStyleIndex switch
@@ -599,6 +679,50 @@ namespace Ryujinx.Ava.UI.ViewModels
                 _ => "Auto"
             };
 
+            if (!string.IsNullOrEmpty(GameId))
+            {
+                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+            }
+            else
+            {
+                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+            }
+        }
+
+        public void SaveSettings()
+        {
+            ConfigurationState config = ConfigurationState.Instance;
+
+
+            if (string.IsNullOrEmpty(GameId))
+            {
+                // User Interface
+                config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
+                config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
+                config.ShowConfirmExit.Value = ShowConfirmExit;
+                config.RememberWindowState.Value = RememberWindowState;
+                config.ShowTitleBar.Value = ShowTitleBar;
+                config.HideCursor.Value = (HideCursorMode)HideCursor;
+
+                if (GameDirectoryChanged)
+                {
+                    config.UI.GameDirs.Value = [.. GameDirectories];
+                }
+
+                if (AutoloadDirectoryChanged)
+                {
+                    config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
+                }
+
+                config.UI.BaseStyle.Value = BaseStyleIndex switch
+                {
+                    0 => "Auto",
+                    1 => "Light",
+                    2 => "Dark",
+                    _ => "Auto"
+                };
+            }
+
             // Input
             config.System.EnableDockedMode.Value = EnableDockedMode;
             config.Hid.EnableKeyboard.Value = EnableKeyboard;
@@ -693,7 +817,9 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.Hacks.EnableShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelayEnabled;
             config.Hacks.ShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelay;
 
-            config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+
+                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+
 
             MainWindow.UpdateGraphicsConfig();
             RyujinxApp.MainWindow.ViewModel.VSyncModeSettingChanged();
@@ -706,7 +832,11 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private static void RevertIfNotSaved()
         {
-            Program.ReloadConfig();
+            // maybe this is an unnecessary check(all options need to be tested)
+            if (string.IsNullOrEmpty(Program.GlobalConfigurationPath))
+            {
+                Program.ReloadConfig();
+            }
         }
 
         public void ApplyButton()
@@ -714,6 +844,25 @@ 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();
+            CloseWindow?.Invoke();
+        }
+
         public void OkButton()
         {
             SaveSettings();
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
new file mode 100644
index 000000000..f768ec168
--- /dev/null
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
@@ -0,0 +1,139 @@
+<window:StyleableAppWindow
+    x:Class="Ryujinx.Ava.UI.Windows.UserConfigWindows"
+    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="768"
+    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: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">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="5"/>
+                    </Grid.RowDefinitions>
+                    <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
+                    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
+                Content="{ext:Locale UserProfilesDelete}"
+                Command="{Binding DeleteConfigGame}"
+                Classes="red"/>
+        </ReversibleStackPanel>
+    </Grid>
+</window:StyleableAppWindow>
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
new file mode 100644
index 000000000..ec4a296bb
--- /dev/null
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
@@ -0,0 +1,108 @@
+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 UserConfigWindows : StyleableAppWindow
+    {
+        internal readonly SettingsViewModel ViewModel;
+
+        public UserConfigWindows(MainWindowViewModel viewModel)
+        {
+            Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
+
+            DataContext = ViewModel = new SettingsViewModel(
+                viewModel.VirtualFileSystem, 
+                viewModel.ContentManager,
+                viewModel.SelectedApplication.Path,
+                viewModel.SelectedApplication.Name,
+                viewModel.SelectedApplication.IdString,
+                viewModel.SelectedApplication.Icon);
+
+            ViewModel.CloseWindow += Close;
+
+            InitializeComponent();
+            Load();
+
+#if DEBUG
+            this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
+#endif
+           
+        }
+
+
+        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(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)
+        {   
+            base.OnClosing(e);
+        }
+    }
+}
diff --git a/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs b/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
index 18bf39c96..66df0f4c9 100644
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
@@ -21,6 +21,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
     public class ApplicationData
     {
         public bool Favorite { get; set; }
+        public bool UserConfig { get; set; }
         public byte[] Icon { get; set; }
         public string Name { get; set; } = "Unknown";
 
diff --git a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
index 79cac1a0e..05abcdf8d 100644
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
@@ -505,7 +505,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.
@@ -529,10 +529,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 
                         }
                     });
-
+            
                     data.Favorite = appMetadata.Favorite;
                     data.TimePlayed = appMetadata.TimePlayed;
                     data.LastPlayed = appMetadata.LastPlayed;
+                    data.UserConfig = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // just check for file presence
                 }
 
                 data.FileExtension = Path.GetExtension(applicationPath).TrimStart('.').ToUpper();
diff --git a/src/Ryujinx/Utilities/CommandLineState.cs b/src/Ryujinx/Utilities/CommandLineState.cs
index 3eafb8d01..ee242157f 100644
--- a/src/Ryujinx/Utilities/CommandLineState.cs
+++ b/src/Ryujinx/Utilities/CommandLineState.cs
@@ -6,11 +6,15 @@ 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 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 string Profile { get; private set; }
@@ -19,6 +23,11 @@ namespace Ryujinx.Ava.Utilities
         public static bool StartFullscreenArg { get; private set; }
         public static bool HideAvailableUpdates { get; private set; }
 
+        public static void ArgumentsClean()
+        {
+
+        }
+
         public static void ParseArguments(string[] args)
         {
             List<string> arguments = [];
@@ -28,6 +37,11 @@ namespace Ryujinx.Ava.Utilities
             {
                 string arg = args[i];
 
+                if (arg.Contains("-") || arg.Contains("--"))
+                {
+                    CountArguments++; 
+                }
+
                 switch (arg)
                 {
                     case "-r":
@@ -85,6 +99,47 @@ namespace Ryujinx.Ava.Utilities
 
                         OverrideBackendThreading = 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];
diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
index 0fb3fb754..0a355a0ed 100644
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -18,9 +18,15 @@ namespace Ryujinx.Ava.Utilities.Configuration
 {
     public partial class ConfigurationState
     {
-        public void Load(ConfigurationFileFormat cff, string configurationFilePath)
+        public void Load(ConfigurationFileFormat cff, string configurationFilePath, string gameId="")
         {
             bool configurationFileUpdated = false;
+            bool LoadSetting = true;
+
+            if (!string.IsNullOrEmpty(gameId))
+            {
+                LoadSetting = false;
+            }
 
             if (cff.Version is < 0 or > ConfigurationFileFormat.CurrentVersion)
             {
@@ -43,14 +49,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 configurationFileUpdated = true;
             }
             
-            EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
-            CheckUpdatesOnStart.Value = cff.CheckUpdatesOnStart;
-            ShowConfirmExit.Value = cff.ShowConfirmExit;
-            RememberWindowState.Value = cff.RememberWindowState;
-            ShowTitleBar.Value = cff.ShowTitleBar;
-            EnableHardwareAcceleration.Value = cff.EnableHardwareAcceleration;
-            HideCursor.Value = cff.HideCursor;
-            
+            EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value;
+            CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value;
+            ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value;
+            RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value;
+            ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value;
+            EnableHardwareAcceleration.Value = LoadSetting ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value;
+            HideCursor.Value = LoadSetting ? cff.HideCursor : HideCursor.Value;
+
             Logger.EnableFileLog.Value = cff.EnableFileLog;
             Logger.EnableDebug.Value = cff.LoggingEnableDebug;
             Logger.EnableStub.Value = cff.LoggingEnableStub;
@@ -99,43 +105,44 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.IgnoreMissingServices.Value = cff.IgnoreMissingServices;
             System.IgnoreApplet.Value = cff.IgnoreApplet;
             System.UseHypervisor.Value = cff.UseHypervisor;
-            
-            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;
-            
+
+            UI.GuiColumns.FavColumn.Value = LoadSetting ? cff.GuiColumns.FavColumn : UI.GuiColumns.FavColumn.Value;
+            UI.GuiColumns.IconColumn.Value = LoadSetting ? cff.GuiColumns.IconColumn : UI.GuiColumns.IconColumn.Value;
+            UI.GuiColumns.AppColumn.Value = LoadSetting ? cff.GuiColumns.AppColumn : UI.GuiColumns.AppColumn.Value;
+            UI.GuiColumns.DevColumn.Value = LoadSetting ? cff.GuiColumns.DevColumn : UI.GuiColumns.DevColumn.Value;
+            UI.GuiColumns.VersionColumn.Value = LoadSetting ? cff.GuiColumns.VersionColumn : UI.GuiColumns.VersionColumn.Value;
+            UI.GuiColumns.TimePlayedColumn.Value = LoadSetting ? cff.GuiColumns.TimePlayedColumn : UI.GuiColumns.TimePlayedColumn.Value;
+            UI.GuiColumns.LastPlayedColumn.Value = LoadSetting ? cff.GuiColumns.LastPlayedColumn : UI.GuiColumns.LastPlayedColumn.Value;
+            UI.GuiColumns.FileExtColumn.Value = LoadSetting ? cff.GuiColumns.FileExtColumn : UI.GuiColumns.FileExtColumn.Value;
+            UI.GuiColumns.FileSizeColumn.Value = LoadSetting ? cff.GuiColumns.FileSizeColumn : UI.GuiColumns.FileSizeColumn.Value;
+            UI.GuiColumns.PathColumn.Value = LoadSetting ? cff.GuiColumns.PathColumn : UI.GuiColumns.PathColumn.Value;
+            UI.ColumnSort.SortColumnId.Value = LoadSetting ? cff.ColumnSort.SortColumnId : UI.ColumnSort.SortColumnId.Value;
+            UI.ColumnSort.SortAscending.Value = LoadSetting ? cff.ColumnSort.SortAscending : UI.ColumnSort.SortAscending.Value;
+            UI.GameDirs.Value = LoadSetting ? cff.GameDirs : UI.GameDirs.Value;
+            UI.AutoloadDirs.Value = LoadSetting ? (cff.AutoloadDirs ?? []) : UI.AutoloadDirs.Value;
+            UI.ShownFileTypes.NSP.Value = LoadSetting ? cff.ShownFileTypes.NSP : UI.ShownFileTypes.NSP.Value;
+            UI.ShownFileTypes.PFS0.Value = LoadSetting ? cff.ShownFileTypes.PFS0 : UI.ShownFileTypes.PFS0.Value;
+            UI.ShownFileTypes.XCI.Value = LoadSetting ? cff.ShownFileTypes.XCI : UI.ShownFileTypes.XCI.Value;
+            UI.ShownFileTypes.NCA.Value = LoadSetting ? cff.ShownFileTypes.NCA : UI.ShownFileTypes.NCA.Value;
+            UI.ShownFileTypes.NRO.Value = LoadSetting ? cff.ShownFileTypes.NRO : UI.ShownFileTypes.NRO.Value;
+            UI.ShownFileTypes.NSO.Value = LoadSetting ? cff.ShownFileTypes.NSO : UI.ShownFileTypes.NSO.Value;
+            UI.LanguageCode.Value = LoadSetting ? cff.LanguageCode : UI.LanguageCode.Value;
+            UI.BaseStyle.Value = LoadSetting ? cff.BaseStyle : UI.BaseStyle.Value;
+            UI.GameListViewMode.Value = LoadSetting ? cff.GameListViewMode : UI.GameListViewMode.Value;
+            UI.ShowNames.Value = LoadSetting ? cff.ShowNames : UI.ShowNames.Value;
+            UI.IsAscendingOrder.Value = LoadSetting ? cff.IsAscendingOrder : UI.IsAscendingOrder.Value;
+            UI.GridSize.Value = LoadSetting ? cff.GridSize : UI.GridSize.Value;
+            UI.ApplicationSort.Value = LoadSetting ? cff.ApplicationSort : UI.ApplicationSort.Value;
+            UI.StartFullscreen.Value = LoadSetting ? cff.StartFullscreen : UI.StartFullscreen.Value;
+            UI.StartNoUI.Value = LoadSetting ? cff.StartNoUI : UI.StartNoUI.Value;
+            UI.ShowConsole.Value = LoadSetting ? cff.ShowConsole : UI.ShowConsole.Value;
+            UI.WindowStartup.WindowSizeWidth.Value = LoadSetting ? cff.WindowStartup.WindowSizeWidth : UI.WindowStartup.WindowSizeWidth.Value;
+            UI.WindowStartup.WindowSizeHeight.Value = LoadSetting ? cff.WindowStartup.WindowSizeHeight : UI.WindowStartup.WindowSizeHeight.Value;
+            UI.WindowStartup.WindowPositionX.Value = LoadSetting ? cff.WindowStartup.WindowPositionX : UI.WindowStartup.WindowPositionX.Value;
+            UI.WindowStartup.WindowPositionY.Value = LoadSetting ? cff.WindowStartup.WindowPositionY : UI.WindowStartup.WindowPositionY.Value;
+            UI.WindowStartup.WindowMaximized.Value = LoadSetting ? cff.WindowStartup.WindowMaximized : UI.WindowStartup.WindowMaximized.Value;
+
+
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;
             Hid.Hotkeys.Value = cff.Hotkeys;
diff --git a/src/Ryujinx/Utilities/ShortcutHelper.cs b/src/Ryujinx/Utilities/ShortcutHelper.cs
index db843959f..b92f97f55 100644
--- 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)
+        private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath, string args = "")
         {
             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), iconPath, 0);
+            Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId, args), 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)
+        private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName, string args = "")
         {
             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)}");
+            outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId, args)}");
         }
 
         [SupportedOSPlatform("macos")]
-        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName)
+        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName, string args = "")
         {
             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));
+            scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId, args));
 
             // 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)
+        public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData, string args = "")
         {
             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);
+                CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath, args);
 
                 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);
+                CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName, args);
 
                 return;
             }
 
             if (OperatingSystem.IsMacOS())
             {
-                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName);
+                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName, args);
 
                 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)
+        private static string GetArgsString(string appFilePath, string applicationId, string config = "")
         {
             // args are first defined as a list, for easier adjustments in the future
             List<string> argsList = [];
@@ -132,6 +132,11 @@ namespace Ryujinx.Ava.Utilities
                 argsList.Add($"\"{CommandLineState.BaseDirPathArg}\"");
             }
 
+            if (!string.IsNullOrEmpty(config))
+            {
+                argsList.Add(config);
+            }
+
             if (appFilePath.ToLower().EndsWith(".xci"))
             {
                 argsList.Add("--application-id");

From fbe1a7d9660a20672efc6b52c03306850d7a3ded Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Thu, 6 Feb 2025 20:12:56 +1000
Subject: [PATCH 02/20] Added custom setting function for each game

---
 .github/workflows/release.yml                 |   6 +-
 .../Services/SurfaceFlinger/SurfaceFlinger.cs |   1 +
 src/Ryujinx/AppHost.cs                        |   4 +
 src/Ryujinx/Assets/Styles/Styles.xaml         |  23 +-
 src/Ryujinx/Assets/Styles/Themes.xaml         |   8 +-
 src/Ryujinx/Assets/locales.json               |  25 +++
 src/Ryujinx/Program.cs                        |  62 +++++-
 src/Ryujinx/Ryujinx.csproj                    |   7 +-
 .../UI/Controls/ApplicationContextMenu.axaml  |   5 +
 .../Controls/ApplicationContextMenu.axaml.cs  |  34 ++-
 .../UI/Controls/ApplicationGridView.axaml     |  38 +++-
 .../UI/Controls/ApplicationListView.axaml     |   7 +
 .../UI/Controls/ApplicationListView.axaml.cs  |  14 ++
 .../UI/ViewModels/MainWindowViewModel.cs      |  11 +-
 .../UI/ViewModels/SettingsViewModel.cs        | 199 +++++++++++++++---
 .../UI/Windows/UserConfigWindows.axaml        | 139 ++++++++++++
 .../UI/Windows/UserConfigWindows.axaml.cs     | 108 ++++++++++
 .../Utilities/AppLibrary/ApplicationData.cs   |   1 +
 .../AppLibrary/ApplicationLibrary.cs          |   5 +-
 src/Ryujinx/Utilities/CommandLineState.cs     |  57 ++++-
 .../ConfigurationState.Migration.cs           |  99 +++++----
 src/Ryujinx/Utilities/ShortcutHelper.cs       |  27 ++-
 22 files changed, 776 insertions(+), 104 deletions(-)
 create mode 100644 src/Ryujinx/UI/Windows/UserConfigWindows.axaml
 create mode 100644 src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 072c6bf2f..bd302e661 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,9 +10,9 @@ env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   RYUJINX_BASE_VERSION: "1.2"
-  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
-  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
+  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Goodfeat"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx_alt"
   RELEASE: 1
 
 jobs:
diff --git a/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
index 935e9895e..23bf8bcfc 100644
--- a/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
+++ b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
 namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
index 25f451858..d49456b9a 100644
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -582,6 +582,10 @@ namespace Ryujinx.Ava
             Rainbow.Disable();
             Rainbow.Reset();
 
+            //Reload settings when the game is turned off
+            //(resets custom settings if there were any)
+            Program.ReloadConfig();
+
             _isStopped = true;
             Stop();
         }
diff --git a/src/Ryujinx/Assets/Styles/Styles.xaml b/src/Ryujinx/Assets/Styles/Styles.xaml
index 5523f551a..c3bc27efd 100644
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -1,7 +1,8 @@
-<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"
@@ -27,10 +28,11 @@
                             Height="28"
                             HorizontalAlignment="Right"
                             Content="Addy" />
-                        <Button
+                        <Button 
                             Name="btnRem"
                             HorizontalAlignment="Right"
-                            Content="Add" />
+                            Content="Add" 
+                            Classes="red"/>                
                         <TextBox
                             Width="100"
                             VerticalAlignment="Center"
@@ -41,7 +43,12 @@
                     </StackPanel>
                 </Grid>
                 <ui:NumberBox Value="1" />
+                <MenuItem
+                    IconSource="Settings"
+                    Header="123 0000"
+                    ToolTip.Tip="What this"/>
             </StackPanel>
+            
         </Border>
     </Design.PreviewWith>
     <Style Selector="DropDownButton">
@@ -373,6 +380,16 @@
         <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}" />
diff --git a/src/Ryujinx/Assets/Styles/Themes.xaml b/src/Ryujinx/Assets/Styles/Themes.xaml
index 3a0bd4217..de7584240 100644
--- 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,11 +12,13 @@
             <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"
@@ -29,11 +31,13 @@
             <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"
@@ -46,11 +50,13 @@
             <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>
diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index 5afb46c13..5657bb88e 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -2747,6 +2747,31 @@
         "zh_TW": "在 macOS 的應用程式資料夾中建立捷徑，啟動選取的應用程式"
       }
     },
+    {
+      "ID": "EditGameConfigurationToolTip",
+      "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 current 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": "GameListContextMenuShowCompatEntry",
       "Translations": {
diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
index 831e4294c..39c2aea16 100644
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -23,6 +23,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Ryujinx.Ava
 {
@@ -32,6 +33,7 @@ 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; }
 
@@ -155,11 +157,42 @@ namespace Ryujinx.Ava
             }
         }
 
+        public static void ReloadGameConfig(string gamedir)
+        {
+            if (File.Exists(gamedir))
+            {
+                ConfigurationPath = gamedir;
+            }
+
+        }
+
+        public static string GetDirGameUserConfig(string gameId, bool rememberGlobalDir = false, bool changeFolderForGame = false)
+        {
+            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))
             {
@@ -232,8 +265,35 @@ 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 hardware-acceleration was overridden.
+            // 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. MemoryManagerMode ( outdated! )
             if (CommandLineState.OverrideHardwareAcceleration != null)
                 UseHardwareAcceleration = CommandLineState.OverrideHardwareAcceleration.Value;
         }
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index 174aadeb0..ec1fd6811 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
@@ -172,5 +172,10 @@
   <ItemGroup>
     <Folder Include="Assets\Fonts\Mono\" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="UI\Windows\UserConfigWindows.axaml.cs">
+      <DependentUpon>UserConfigWindows.axaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
 
 </Project>
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
index 3e47a1910..18a4067cf 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
@@ -19,6 +19,11 @@
         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"
+       Header="Edit Game Configuration"
+       Icon="{ext:Icon fa-solid fa-gear}"
+       ToolTip.Tip="{ext:Locale EditGameConfigurationToolTip}" />
     <MenuItem
         IsVisible="{Binding HasCompatibilityEntry}"
         Click="OpenApplicationCompatibility_Click"
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
index e55e74455..37c214952 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -13,6 +13,7 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -36,6 +37,21 @@ namespace Ryujinx.Ava.UI.Controls
             AvaloniaXamlLoader.Load(this);
         }
 
+        public void ToggleUserControl_Click(object sender, RoutedEventArgs args)
+        {
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
+
+            viewModel.SelectedApplication.Favorite = !viewModel.SelectedApplication.Favorite;
+
+            ApplicationLibrary.LoadAndSaveMetaData(viewModel.SelectedApplication.IdString, appMetadata =>
+            {
+                appMetadata.Favorite = viewModel.SelectedApplication.Favorite;
+            });
+
+            viewModel.RefreshView();
+        }
+
         public void ToggleFavorite_Click(object sender, RoutedEventArgs args)
         {
             if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
@@ -386,13 +402,27 @@ 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 new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
+
+                //just checking for file presence
+                viewModel.SelectedApplication.UserConfig = 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 })
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
index 7f7e3260b..7cf7b2e3c 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -73,12 +73,18 @@
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Stretch"
                                     IsVisible="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).ShowNames}">
-                                    <TextBlock
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Text="{Binding Name}"
-                                        TextAlignment="Center"
-                                        TextWrapping="Wrap" />
+                                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                        <TextBlock
+                                            Text="{Binding Name}"
+                                            TextAlignment="Center"
+                                            TextWrapping="Wrap" />
+                                        <TextBlock
+                                            IsVisible="{Binding UserConfig}"
+                                            Text="User Config"
+                                            TextAlignment="Center"
+                                            TextWrapping="Wrap"
+                                            Foreground="{DynamicResource Warning}" />
+                                    </StackPanel>
                                 </Panel>
                             </Grid>
                         </Border>
@@ -86,10 +92,28 @@
                             Margin="5,5,0,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            FontSize="16"
+                            FontSize="18"
                             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 UserConfig}"
+                                Background="{DynamicResource ThemeContentBackgroundColor}">
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="User Config"
+                                    TextAlignment="Center"
+                                    TextWrapping="Wrap" />   
+                            </Border>
+                        </Grid>
                     </Grid>
                 </DataTemplate>
             </ListBox.ItemTemplate>
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
index 733500338..e781d1fc2 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -145,6 +145,13 @@
                                         Text="{Binding Converter={x:Static helpers:MultiplayerInfoConverter.Instance}}"
                                         TextAlignment="Start"
                                         TextWrapping="Wrap"/>
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        IsVisible="{Binding UserConfig}"
+                                        Text="User Config"
+                                        TextAlignment="Start"
+                                        TextWrapping="Wrap"
+                                        Foreground="{DynamicResource Warning}" />
                                 </StackPanel>
                                 <StackPanel
                                     Grid.Column="4"
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
index 7c6b0cf15..d62cafbba 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
@@ -4,6 +4,7 @@ using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
 using System;
@@ -42,6 +43,19 @@ namespace Ryujinx.Ava.UI.Controls
             await CompatibilityList.Show((string)playabilityLabel.Tag);
         }
 
+        public async void EditGameConfiguration_Click(object sender, RoutedEventArgs args)
+        {
+            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+            {
+                await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
+
+                //viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString));
+
+                viewModel.RefreshView();
+            }
+
+        }
+
         private async void IdString_OnClick(object sender, RoutedEventArgs e)
         {
             if (DataContext is not MainWindowViewModel mwvm)
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 499eedc8d..61ece18dc 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -1076,7 +1076,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             _rendererWaitEvent.WaitOne();
 
             AppHost?.Start();
-
+            
             AppHost?.DisposeContext();
         }
 
@@ -1540,6 +1540,14 @@ namespace Ryujinx.Ava.UI.ViewModels
 #if RELEASE
             await PerformanceCheck();
 #endif
+            // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting.
+            string gameDir = Program.GetDirGameUserConfig(application.IdBaseString, true, true);
+
+            if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
+            {
+                //Program.GetDirGameUserConfig(application.IdBaseString, false);
+                ConfigurationState.Instance.Load(configurationFileFormat, gameDir, application.IdBaseString);
+            }
 
             Logger.RestartTime();
 
@@ -1585,6 +1593,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             Thread gameThread = new(InitializeGame) { Name = "GUI.WindowThread" };
             gameThread.Start();
+            
         }
 
         public void SwitchToRenderer(bool startFullscreen) =>
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index bd649602c..8454eb142 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -1,8 +1,10 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Humanizer;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -26,6 +28,7 @@ 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;
@@ -67,6 +70,49 @@ namespace Ryujinx.Ava.UI.ViewModels
         [ObservableProperty] private string _ldnServer;
 
         public SettingsHacksViewModel DirtyHacks { get; }
+        public string GamePath { get; }
+        public string GameName { get; }
+
+        private Bitmap _gameIcon;
+
+        private string _gameTitle;
+        private string _gameId;
+        public Bitmap GameIcon
+        {
+            get => _gameIcon;
+            set
+            {
+                if (_gameIcon != value)
+                {
+                    _gameIcon = value;
+                }
+            }
+        }
+
+        public string GameTitle
+        {
+            get => _gameTitle;
+            set
+            {
+                if (_gameTitle != value)
+                {
+                    _gameTitle = value;
+                }
+            }
+        }
+
+        public string GameId
+        {
+            get => _gameId;
+            set
+            {
+                if (_gameId != value)
+                {
+                    _gameId = value;
+                }
+            }
+        }
+
 
         public int ResolutionScale
         {
@@ -342,6 +388,37 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager, string gamePath, string gameName, string gameId, byte[] gameIconData) : this()
+        {
+            _virtualFileSystem = virtualFileSystem;
+            _contentManager = contentManager;
+  
+            if (gameIconData != null && gameIconData.Length > 0)
+            {
+                using (var ms = new MemoryStream(gameIconData))
+                {
+                    GameIcon = new Bitmap(ms);
+                }
+            }
+
+            GameTitle = gameName;
+            GameId = gameId;
+
+            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);
+
+                DirtyHacks = new SettingsHacksViewModel(this);
+            }
+        }
+
         public SettingsViewModel()
         {
             GameDirectories = [];
@@ -468,27 +545,30 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             ConfigurationState config = ConfigurationState.Instance;
 
-            // User Interface
-            EnableDiscordIntegration = config.EnableDiscordIntegration;
-            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
-            ShowConfirmExit = config.ShowConfirmExit;
-            RememberWindowState = config.RememberWindowState;
-            ShowTitleBar = config.ShowTitleBar;
-            HideCursor = (int)config.HideCursor.Value;
-
-            GameDirectories.Clear();
-            GameDirectories.AddRange(config.UI.GameDirs.Value);
-
-            AutoloadDirectories.Clear();
-            AutoloadDirectories.AddRange(config.UI.AutoloadDirs.Value);
-
-            BaseStyleIndex = config.UI.BaseStyle.Value switch
+            if (string.IsNullOrEmpty(GameId))
             {
-                "Auto" => 0,
-                "Light" => 1,
-                "Dark" => 2,
-                _ => 0
-            };
+                // User Interface
+                EnableDiscordIntegration = config.EnableDiscordIntegration;
+                CheckUpdatesOnStart = config.CheckUpdatesOnStart;
+                ShowConfirmExit = config.ShowConfirmExit;
+                RememberWindowState = config.RememberWindowState;
+                ShowTitleBar = config.ShowTitleBar;
+                HideCursor = (int)config.HideCursor.Value;
+
+                GameDirectories.Clear();
+                GameDirectories.AddRange(config.UI.GameDirs.Value);
+
+                AutoloadDirectories.Clear();
+                AutoloadDirectories.AddRange(config.UI.AutoloadDirs.Value);
+
+                BaseStyleIndex = config.UI.BaseStyle.Value switch
+                {
+                    "Auto" => 0,
+                    "Light" => 1,
+                    "Dark" => 2,
+                    _ => 0
+                };
+            }
 
             // Input
             EnableDockedMode = config.System.EnableDockedMode;
@@ -569,7 +649,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             LdnServer = config.Multiplayer.LdnServer;
         }
 
-        public void SaveSettings()
+        public void SaveSettings2()
         {
             ConfigurationState config = ConfigurationState.Instance;
 
@@ -583,12 +663,12 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             if (GameDirectoryChanged)
             {
-                config.UI.GameDirs.Value = [..GameDirectories];
+                config.UI.GameDirs.Value = [.. GameDirectories];
             }
 
             if (AutoloadDirectoryChanged)
             {
-                config.UI.AutoloadDirs.Value = [..AutoloadDirectories];
+                config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
             }
 
             config.UI.BaseStyle.Value = BaseStyleIndex switch
@@ -599,6 +679,50 @@ namespace Ryujinx.Ava.UI.ViewModels
                 _ => "Auto"
             };
 
+            if (!string.IsNullOrEmpty(GameId))
+            {
+                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+            }
+            else
+            {
+                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+            }
+        }
+
+        public void SaveSettings()
+        {
+            ConfigurationState config = ConfigurationState.Instance;
+
+
+            if (string.IsNullOrEmpty(GameId))
+            {
+                // User Interface
+                config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
+                config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
+                config.ShowConfirmExit.Value = ShowConfirmExit;
+                config.RememberWindowState.Value = RememberWindowState;
+                config.ShowTitleBar.Value = ShowTitleBar;
+                config.HideCursor.Value = (HideCursorMode)HideCursor;
+
+                if (GameDirectoryChanged)
+                {
+                    config.UI.GameDirs.Value = [.. GameDirectories];
+                }
+
+                if (AutoloadDirectoryChanged)
+                {
+                    config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
+                }
+
+                config.UI.BaseStyle.Value = BaseStyleIndex switch
+                {
+                    0 => "Auto",
+                    1 => "Light",
+                    2 => "Dark",
+                    _ => "Auto"
+                };
+            }
+
             // Input
             config.System.EnableDockedMode.Value = EnableDockedMode;
             config.Hid.EnableKeyboard.Value = EnableKeyboard;
@@ -693,7 +817,9 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.Hacks.EnableShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelayEnabled;
             config.Hacks.ShaderTranslationDelay.Value = DirtyHacks.ShaderTranslationDelay;
 
-            config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+
+                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+
 
             MainWindow.UpdateGraphicsConfig();
             RyujinxApp.MainWindow.ViewModel.VSyncModeSettingChanged();
@@ -706,7 +832,11 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private static void RevertIfNotSaved()
         {
-            Program.ReloadConfig();
+            // maybe this is an unnecessary check(all options need to be tested)
+            if (string.IsNullOrEmpty(Program.GlobalConfigurationPath))
+            {
+                Program.ReloadConfig();
+            }
         }
 
         public void ApplyButton()
@@ -714,6 +844,25 @@ 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();
+            CloseWindow?.Invoke();
+        }
+
         public void OkButton()
         {
             SaveSettings();
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
new file mode 100644
index 000000000..f768ec168
--- /dev/null
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
@@ -0,0 +1,139 @@
+<window:StyleableAppWindow
+    x:Class="Ryujinx.Ava.UI.Windows.UserConfigWindows"
+    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="768"
+    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: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">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="5"/>
+                    </Grid.RowDefinitions>
+                    <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
+                    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
+                Content="{ext:Locale UserProfilesDelete}"
+                Command="{Binding DeleteConfigGame}"
+                Classes="red"/>
+        </ReversibleStackPanel>
+    </Grid>
+</window:StyleableAppWindow>
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
new file mode 100644
index 000000000..ec4a296bb
--- /dev/null
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
@@ -0,0 +1,108 @@
+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 UserConfigWindows : StyleableAppWindow
+    {
+        internal readonly SettingsViewModel ViewModel;
+
+        public UserConfigWindows(MainWindowViewModel viewModel)
+        {
+            Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
+
+            DataContext = ViewModel = new SettingsViewModel(
+                viewModel.VirtualFileSystem, 
+                viewModel.ContentManager,
+                viewModel.SelectedApplication.Path,
+                viewModel.SelectedApplication.Name,
+                viewModel.SelectedApplication.IdString,
+                viewModel.SelectedApplication.Icon);
+
+            ViewModel.CloseWindow += Close;
+
+            InitializeComponent();
+            Load();
+
+#if DEBUG
+            this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
+#endif
+           
+        }
+
+
+        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(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)
+        {   
+            base.OnClosing(e);
+        }
+    }
+}
diff --git a/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs b/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
index 18bf39c96..66df0f4c9 100644
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
@@ -21,6 +21,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
     public class ApplicationData
     {
         public bool Favorite { get; set; }
+        public bool UserConfig { get; set; }
         public byte[] Icon { get; set; }
         public string Name { get; set; } = "Unknown";
 
diff --git a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
index 79cac1a0e..05abcdf8d 100644
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
@@ -505,7 +505,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.
@@ -529,10 +529,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 
                         }
                     });
-
+            
                     data.Favorite = appMetadata.Favorite;
                     data.TimePlayed = appMetadata.TimePlayed;
                     data.LastPlayed = appMetadata.LastPlayed;
+                    data.UserConfig = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // just check for file presence
                 }
 
                 data.FileExtension = Path.GetExtension(applicationPath).TrimStart('.').ToUpper();
diff --git a/src/Ryujinx/Utilities/CommandLineState.cs b/src/Ryujinx/Utilities/CommandLineState.cs
index 3eafb8d01..ee242157f 100644
--- a/src/Ryujinx/Utilities/CommandLineState.cs
+++ b/src/Ryujinx/Utilities/CommandLineState.cs
@@ -6,11 +6,15 @@ 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 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 string Profile { get; private set; }
@@ -19,6 +23,11 @@ namespace Ryujinx.Ava.Utilities
         public static bool StartFullscreenArg { get; private set; }
         public static bool HideAvailableUpdates { get; private set; }
 
+        public static void ArgumentsClean()
+        {
+
+        }
+
         public static void ParseArguments(string[] args)
         {
             List<string> arguments = [];
@@ -28,6 +37,11 @@ namespace Ryujinx.Ava.Utilities
             {
                 string arg = args[i];
 
+                if (arg.Contains("-") || arg.Contains("--"))
+                {
+                    CountArguments++; 
+                }
+
                 switch (arg)
                 {
                     case "-r":
@@ -85,6 +99,47 @@ namespace Ryujinx.Ava.Utilities
 
                         OverrideBackendThreading = 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];
diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
index 0fb3fb754..0a355a0ed 100644
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -18,9 +18,15 @@ namespace Ryujinx.Ava.Utilities.Configuration
 {
     public partial class ConfigurationState
     {
-        public void Load(ConfigurationFileFormat cff, string configurationFilePath)
+        public void Load(ConfigurationFileFormat cff, string configurationFilePath, string gameId="")
         {
             bool configurationFileUpdated = false;
+            bool LoadSetting = true;
+
+            if (!string.IsNullOrEmpty(gameId))
+            {
+                LoadSetting = false;
+            }
 
             if (cff.Version is < 0 or > ConfigurationFileFormat.CurrentVersion)
             {
@@ -43,14 +49,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 configurationFileUpdated = true;
             }
             
-            EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
-            CheckUpdatesOnStart.Value = cff.CheckUpdatesOnStart;
-            ShowConfirmExit.Value = cff.ShowConfirmExit;
-            RememberWindowState.Value = cff.RememberWindowState;
-            ShowTitleBar.Value = cff.ShowTitleBar;
-            EnableHardwareAcceleration.Value = cff.EnableHardwareAcceleration;
-            HideCursor.Value = cff.HideCursor;
-            
+            EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value;
+            CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value;
+            ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value;
+            RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value;
+            ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value;
+            EnableHardwareAcceleration.Value = LoadSetting ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value;
+            HideCursor.Value = LoadSetting ? cff.HideCursor : HideCursor.Value;
+
             Logger.EnableFileLog.Value = cff.EnableFileLog;
             Logger.EnableDebug.Value = cff.LoggingEnableDebug;
             Logger.EnableStub.Value = cff.LoggingEnableStub;
@@ -99,43 +105,44 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.IgnoreMissingServices.Value = cff.IgnoreMissingServices;
             System.IgnoreApplet.Value = cff.IgnoreApplet;
             System.UseHypervisor.Value = cff.UseHypervisor;
-            
-            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;
-            
+
+            UI.GuiColumns.FavColumn.Value = LoadSetting ? cff.GuiColumns.FavColumn : UI.GuiColumns.FavColumn.Value;
+            UI.GuiColumns.IconColumn.Value = LoadSetting ? cff.GuiColumns.IconColumn : UI.GuiColumns.IconColumn.Value;
+            UI.GuiColumns.AppColumn.Value = LoadSetting ? cff.GuiColumns.AppColumn : UI.GuiColumns.AppColumn.Value;
+            UI.GuiColumns.DevColumn.Value = LoadSetting ? cff.GuiColumns.DevColumn : UI.GuiColumns.DevColumn.Value;
+            UI.GuiColumns.VersionColumn.Value = LoadSetting ? cff.GuiColumns.VersionColumn : UI.GuiColumns.VersionColumn.Value;
+            UI.GuiColumns.TimePlayedColumn.Value = LoadSetting ? cff.GuiColumns.TimePlayedColumn : UI.GuiColumns.TimePlayedColumn.Value;
+            UI.GuiColumns.LastPlayedColumn.Value = LoadSetting ? cff.GuiColumns.LastPlayedColumn : UI.GuiColumns.LastPlayedColumn.Value;
+            UI.GuiColumns.FileExtColumn.Value = LoadSetting ? cff.GuiColumns.FileExtColumn : UI.GuiColumns.FileExtColumn.Value;
+            UI.GuiColumns.FileSizeColumn.Value = LoadSetting ? cff.GuiColumns.FileSizeColumn : UI.GuiColumns.FileSizeColumn.Value;
+            UI.GuiColumns.PathColumn.Value = LoadSetting ? cff.GuiColumns.PathColumn : UI.GuiColumns.PathColumn.Value;
+            UI.ColumnSort.SortColumnId.Value = LoadSetting ? cff.ColumnSort.SortColumnId : UI.ColumnSort.SortColumnId.Value;
+            UI.ColumnSort.SortAscending.Value = LoadSetting ? cff.ColumnSort.SortAscending : UI.ColumnSort.SortAscending.Value;
+            UI.GameDirs.Value = LoadSetting ? cff.GameDirs : UI.GameDirs.Value;
+            UI.AutoloadDirs.Value = LoadSetting ? (cff.AutoloadDirs ?? []) : UI.AutoloadDirs.Value;
+            UI.ShownFileTypes.NSP.Value = LoadSetting ? cff.ShownFileTypes.NSP : UI.ShownFileTypes.NSP.Value;
+            UI.ShownFileTypes.PFS0.Value = LoadSetting ? cff.ShownFileTypes.PFS0 : UI.ShownFileTypes.PFS0.Value;
+            UI.ShownFileTypes.XCI.Value = LoadSetting ? cff.ShownFileTypes.XCI : UI.ShownFileTypes.XCI.Value;
+            UI.ShownFileTypes.NCA.Value = LoadSetting ? cff.ShownFileTypes.NCA : UI.ShownFileTypes.NCA.Value;
+            UI.ShownFileTypes.NRO.Value = LoadSetting ? cff.ShownFileTypes.NRO : UI.ShownFileTypes.NRO.Value;
+            UI.ShownFileTypes.NSO.Value = LoadSetting ? cff.ShownFileTypes.NSO : UI.ShownFileTypes.NSO.Value;
+            UI.LanguageCode.Value = LoadSetting ? cff.LanguageCode : UI.LanguageCode.Value;
+            UI.BaseStyle.Value = LoadSetting ? cff.BaseStyle : UI.BaseStyle.Value;
+            UI.GameListViewMode.Value = LoadSetting ? cff.GameListViewMode : UI.GameListViewMode.Value;
+            UI.ShowNames.Value = LoadSetting ? cff.ShowNames : UI.ShowNames.Value;
+            UI.IsAscendingOrder.Value = LoadSetting ? cff.IsAscendingOrder : UI.IsAscendingOrder.Value;
+            UI.GridSize.Value = LoadSetting ? cff.GridSize : UI.GridSize.Value;
+            UI.ApplicationSort.Value = LoadSetting ? cff.ApplicationSort : UI.ApplicationSort.Value;
+            UI.StartFullscreen.Value = LoadSetting ? cff.StartFullscreen : UI.StartFullscreen.Value;
+            UI.StartNoUI.Value = LoadSetting ? cff.StartNoUI : UI.StartNoUI.Value;
+            UI.ShowConsole.Value = LoadSetting ? cff.ShowConsole : UI.ShowConsole.Value;
+            UI.WindowStartup.WindowSizeWidth.Value = LoadSetting ? cff.WindowStartup.WindowSizeWidth : UI.WindowStartup.WindowSizeWidth.Value;
+            UI.WindowStartup.WindowSizeHeight.Value = LoadSetting ? cff.WindowStartup.WindowSizeHeight : UI.WindowStartup.WindowSizeHeight.Value;
+            UI.WindowStartup.WindowPositionX.Value = LoadSetting ? cff.WindowStartup.WindowPositionX : UI.WindowStartup.WindowPositionX.Value;
+            UI.WindowStartup.WindowPositionY.Value = LoadSetting ? cff.WindowStartup.WindowPositionY : UI.WindowStartup.WindowPositionY.Value;
+            UI.WindowStartup.WindowMaximized.Value = LoadSetting ? cff.WindowStartup.WindowMaximized : UI.WindowStartup.WindowMaximized.Value;
+
+
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;
             Hid.Hotkeys.Value = cff.Hotkeys;
diff --git a/src/Ryujinx/Utilities/ShortcutHelper.cs b/src/Ryujinx/Utilities/ShortcutHelper.cs
index db843959f..b92f97f55 100644
--- 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)
+        private static void CreateShortcutWindows(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string cleanedAppName, string desktopPath, string args = "")
         {
             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), iconPath, 0);
+            Shortcut shortcut = Shortcut.CreateShortcut(basePath, GetArgsString(applicationFilePath, applicationId, args), 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)
+        private static void CreateShortcutLinux(string applicationFilePath, string applicationId, byte[] iconData, string iconPath, string desktopPath, string cleanedAppName, string args = "")
         {
             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)}");
+            outputFile.Write(desktopFile, cleanedAppName, iconPath, $"{basePath} {GetArgsString(applicationFilePath, applicationId, args)}");
         }
 
         [SupportedOSPlatform("macos")]
-        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName)
+        private static void CreateShortcutMacos(string appFilePath, string applicationId, byte[] iconData, string desktopPath, string cleanedAppName, string args = "")
         {
             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));
+            scriptFile.Write(shortcutScript, basePath, GetArgsString(appFilePath, applicationId, args));
 
             // 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)
+        public static void CreateAppShortcut(string applicationFilePath, string applicationName, string applicationId, byte[] iconData, string args = "")
         {
             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);
+                CreateShortcutWindows(applicationFilePath, applicationId, iconData, iconPath, cleanedAppName, desktopPath, args);
 
                 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);
+                CreateShortcutLinux(applicationFilePath, applicationId, iconData, Path.Combine(iconPath, applicationId), desktopPath, cleanedAppName, args);
 
                 return;
             }
 
             if (OperatingSystem.IsMacOS())
             {
-                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName);
+                CreateShortcutMacos(applicationFilePath, applicationId, iconData, desktopPath, cleanedAppName, args);
 
                 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)
+        private static string GetArgsString(string appFilePath, string applicationId, string config = "")
         {
             // args are first defined as a list, for easier adjustments in the future
             List<string> argsList = [];
@@ -132,6 +132,11 @@ namespace Ryujinx.Ava.Utilities
                 argsList.Add($"\"{CommandLineState.BaseDirPathArg}\"");
             }
 
+            if (!string.IsNullOrEmpty(config))
+            {
+                argsList.Add(config);
+            }
+
             if (appFilePath.ToLower().EndsWith(".xci"))
             {
                 argsList.Add("--application-id");

From fe94224d01e855c502a351e82339709676ae41c5 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Thu, 6 Feb 2025 22:51:08 +1000
Subject: [PATCH 03/20] keys returned to their place, minor fixes, local ones
 added

---
 .github/workflows/release.yml                 |  6 ++---
 src/Ryujinx/Assets/locales.json               | 25 +++++++++++++++++++
 src/Ryujinx/Program.cs                        |  1 -
 .../UI/Controls/ApplicationGridView.axaml     |  5 ++--
 .../UI/Controls/ApplicationListView.axaml     |  3 ++-
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bd302e661..072c6bf2f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,9 +10,9 @@ env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   RYUJINX_BASE_VERSION: "1.2"
-  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master"
-  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Goodfeat"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx_alt"
+  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
   RELEASE: 1
 
 jobs:
diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index 5657bb88e..523f4828a 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -23697,6 +23697,31 @@
         "zh_TW": ""
       }
     },
+    {
+      "ID": "UserConfigurationHeader",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "User 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": "ExtractAocListHeader",
       "Translations": {
diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
index 39c2aea16..241aa42b9 100644
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -23,7 +23,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Ryujinx.Ava
 {
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
index 7cf7b2e3c..b8ab11bd8 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -7,6 +7,7 @@
     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"
@@ -80,7 +81,7 @@
                                             TextWrapping="Wrap" />
                                         <TextBlock
                                             IsVisible="{Binding UserConfig}"
-                                            Text="User Config"
+                                            Text="{ext:Locale UserConfigurationHeader}"
                                             TextAlignment="Center"
                                             TextWrapping="Wrap"
                                             Foreground="{DynamicResource Warning}" />
@@ -109,7 +110,7 @@
                                 <TextBlock
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="User Config"
+                                    Text="{ext:Locale UserConfigurationHeader}"
                                     TextAlignment="Center"
                                     TextWrapping="Wrap" />   
                             </Border>
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
index e781d1fc2..bd89b2100 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -6,6 +6,7 @@
     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"
@@ -148,7 +149,7 @@
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
                                         IsVisible="{Binding UserConfig}"
-                                        Text="User Config"
+                                        Text="{ext:Locale UserConfigurationHeader}"
                                         TextAlignment="Start"
                                         TextWrapping="Wrap"
                                         Foreground="{DynamicResource Warning}" />

From 6d37d79cc72c8815192aec952e595465c7c7c135 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Thu, 6 Feb 2025 22:58:43 +1000
Subject: [PATCH 04/20] Ops

---
 .github/workflows/release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bd302e661..072c6bf2f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,9 +10,9 @@ env:
   POWERSHELL_TELEMETRY_OPTOUT: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   RYUJINX_BASE_VERSION: "1.2"
-  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "master"
-  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Goodfeat"
-  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx_alt"
+  RYUJINX_TARGET_RELEASE_CHANNEL_NAME: "release"
+  RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: "Ryubing"
+  RYUJINX_TARGET_RELEASE_CHANNEL_REPO: "Ryujinx"
   RELEASE: 1
 
 jobs:

From df1c7613e846b9f9225043f281b9813a114a826e Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Thu, 6 Feb 2025 23:24:52 +1000
Subject: [PATCH 05/20] returned the deleted field

---
 src/Ryujinx/Assets/locales.json               | 25 +++++++++++++++++++
 .../UI/Controls/ApplicationContextMenu.axaml  |  2 +-
 .../UI/Controls/ApplicationGridView.axaml     | 18 +++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index 523f4828a..c52c449be 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -2722,6 +2722,31 @@
         "zh_TW": "建立桌面捷徑，啟動選取的應用程式"
       }
     },
+    {
+      "ID": "GameListContextMenuEditGameConfiguration",
+      "Translations": {
+        "ar_SA": "تعديل تكوين اللعبة",
+        "de_DE": "Spielkonfiguration bearbeiten",
+        "el_GR": "Επεξεργασία ρυθμίσεων παιχνιδιού",
+        "en_US": "Edit Game Configuration",
+        "es_ES": "Editar configuración del juego",
+        "fr_FR": "Modifier la configuration du jeu",
+        "he_IL": "ערוך את הגדרת המשחק",
+        "it_IT": "Modifica configurazione gioco",
+        "ja_JP": "ゲーム設定を編集",
+        "ko_KR": "게임 설정 편집",
+        "no_NO": "Rediger spillkonfig.",
+        "pl_PL": "Edytuj konfigurację gry",
+        "pt_BR": "Editar configuração do jogo",
+        "ru_RU": "Редактировать конфигурацию игры",
+        "sv_SE": "Redigera spelkonfiguration",
+        "th_TH": "แก้ไขการตั้งค่าเกม",
+        "tr_TR": "Oyunun yapılandırmasını düzenle",
+        "uk_UA": "Редагувати конфігурацію гри",
+        "zh_CN": "编辑游戏配置",
+        "zh_TW": "編輯遊戲設定"
+      }
+    },
     {
       "ID": "GameListContextMenuCreateShortcutToolTipMacOS",
       "Translations": {
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
index 18a4067cf..0befd36af 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
@@ -21,7 +21,7 @@
         ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
     <MenuItem
        Click="EditGameConfiguration_Click"
-       Header="Edit Game Configuration"
+       Header="{ext:Locale GameListContextMenuEditGameConfiguration}"
        Icon="{ext:Icon fa-solid fa-gear}"
        ToolTip.Tip="{ext:Locale EditGameConfigurationToolTip}" />
     <MenuItem
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
index 5f6707aaf..62eb44b1a 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -97,6 +97,24 @@
                             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 UserConfig}"
+                                Background="{DynamicResource ThemeContentBackgroundColor}">
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Text="{ext:Locale UserConfigurationHeader}"
+                                    TextAlignment="Center"
+                                    TextWrapping="Wrap" />
+                            </Border>
+                        </Grid>
                     </Grid>
                 </DataTemplate>
             </ListBox.ItemTemplate>

From 3a8e6e311713cc9855897f6f0948e04c3c10e3e9 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Fri, 7 Feb 2025 21:48:51 +1000
Subject: [PATCH 06/20] Added gamepad configuration for custom configuration

---
 src/Ryujinx/UI/Windows/UserConfigWindows.axaml    |  5 +++++
 src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
index f768ec168..ed3ab66f8 100644
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
@@ -29,6 +29,7 @@
             IsVisible="False"
             KeyboardNavigation.IsTabStop="False"/>
         <Grid Name="Pages" IsVisible="False" Grid.Row="2">
+            <settings:SettingsInputView Name="InputPage" />
             <settings:SettingsSystemView Name="SystemPage" />
             <settings:SettingsCPUView Name="CpuPage" />
             <settings:SettingsGraphicsView Name="GraphicsPage" />
@@ -79,6 +80,10 @@
             </ui:NavigationView.PaneHeader>
                       
             <ui:NavigationView.MenuItems>
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabInput}"
+                    Tag="InputPage"
+                    IconSource="Games" />
                 <ui:NavigationViewItem
                     Content="{ext:Locale SettingsTabSystem}"
                     Tag="SystemPage"
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
index ec4a296bb..b259797ba 100644
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
@@ -41,6 +41,7 @@ namespace Ryujinx.Ava.UI.Windows
                 viewModel.SelectedApplication.Icon);
 
             ViewModel.CloseWindow += Close;
+            ViewModel.SaveSettingsEvent += SaveSettings;
 
             InitializeComponent();
             Load();
@@ -51,6 +52,11 @@ namespace Ryujinx.Ava.UI.Windows
            
         }
 
+        public void SaveSettings()
+        {
+            InputPage.InputView?.SaveCurrentProfile();
+        }
+
 
         private void Load()
         {
@@ -67,9 +73,9 @@ namespace Ryujinx.Ava.UI.Windows
             {
                 switch (navItem.Tag.ToString())
                 {
-                    //case nameof(InputPage):
-                    //   NavPanel.Content = InputPage;
-                    //   break;
+                    case nameof(InputPage):
+                       NavPanel.Content = InputPage;
+                       break;
                     case nameof(SystemPage):
                         SystemPage.ViewModel = ViewModel;
                         NavPanel.Content = SystemPage;

From fa463c51f8e2b8756fe076437fa3d5805ba9a85d Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Fri, 7 Feb 2025 23:37:35 +1000
Subject: [PATCH 07/20] code cleaning

---
 .../HOS/Services/SurfaceFlinger/SurfaceFlinger.cs          | 1 -
 src/Ryujinx/Ryujinx.csproj                                 | 7 +------
 src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs          | 4 ++--
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
index 23bf8bcfc..935e9895e 100644
--- a/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
+++ b/src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs
@@ -10,7 +10,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
 namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index ec1fd6811..174aadeb0 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
@@ -172,10 +172,5 @@
   <ItemGroup>
     <Folder Include="Assets\Fonts\Mono\" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="UI\Windows\UserConfigWindows.axaml.cs">
-      <DependentUpon>UserConfigWindows.axaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
 
 </Project>
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
index b259797ba..c40a42e8a 100644
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
@@ -74,8 +74,8 @@ namespace Ryujinx.Ava.UI.Windows
                 switch (navItem.Tag.ToString())
                 {
                     case nameof(InputPage):
-                       NavPanel.Content = InputPage;
-                       break;
+                        NavPanel.Content = InputPage;
+                        break;
                     case nameof(SystemPage):
                         SystemPage.ViewModel = ViewModel;
                         NavPanel.Content = SystemPage;

From 4d5ae23b0b498d9c3bc1e60ee5354a4a437cd261 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sat, 8 Feb 2025 10:51:39 +1000
Subject: [PATCH 08/20] Added game name to user settings window

---
 src/Ryujinx/Assets/locales.json               | 25 +++++++++++++++++++
 .../UI/Windows/UserConfigWindows.axaml.cs     |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index 5422e1f6d..8330e1123 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -3322,6 +3322,31 @@
         "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": {
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
index c40a42e8a..c25f3bbeb 100644
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
@@ -30,7 +30,7 @@ namespace Ryujinx.Ava.UI.Windows
 
         public UserConfigWindows(MainWindowViewModel viewModel)
         {
-            Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
+            Title = string.Format(LocaleManager.Instance[LocaleKeys.SettingsWithInfo], viewModel.SelectedApplication.Name, viewModel.SelectedApplication.IdString);
 
             DataContext = ViewModel = new SettingsViewModel(
                 viewModel.VirtualFileSystem, 

From 5f5c76107c969709d39396d2bf4a77cd60276ffc Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sat, 8 Feb 2025 18:29:31 +1000
Subject: [PATCH 09/20] Fixed a ban where a custom setting was mistakenly
 created when starting the game if it did not exist. Now when starting the
 game, if a custom setting was created, the current game will be displayed in
 the settings window. Code cleanup.

---
 src/Ryujinx/AppHost.cs                        |  6 ++--
 src/Ryujinx/Assets/Styles/Styles.xaml         |  3 +-
 src/Ryujinx/Program.cs                        |  8 ++---
 .../Controls/ApplicationContextMenu.axaml.cs  | 15 ---------
 .../UI/Controls/ApplicationListView.axaml.cs  | 13 --------
 .../UI/ViewModels/MainWindowViewModel.cs      | 12 +++----
 .../UI/ViewModels/SettingsViewModel.cs        | 31 +++++++++++--------
 .../UI/Views/Main/MainMenuBarView.axaml.cs    | 22 +++++++++++--
 .../UI/Windows/UserConfigWindows.axaml.cs     |  5 +--
 9 files changed, 55 insertions(+), 60 deletions(-)

diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
index d49456b9a..98c0771e1 100644
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -469,6 +469,8 @@ namespace Ryujinx.Ava
 
             _viewModel.IsGameRunning = true;
 
+           
+
             Dispatcher.UIThread.InvokeAsync(() =>
             {
                 _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
@@ -582,8 +584,8 @@ namespace Ryujinx.Ava
             Rainbow.Disable();
             Rainbow.Reset();
 
-            //Reload settings when the game is turned off
-            //(resets custom settings if there were any)
+            // Reload settings when the game is turned off
+            // (resets custom settings if there were any)
             Program.ReloadConfig();
 
             _isStopped = true;
diff --git a/src/Ryujinx/Assets/Styles/Styles.xaml b/src/Ryujinx/Assets/Styles/Styles.xaml
index c3bc27efd..cf9f28f02 100644
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -28,7 +28,7 @@
                             Height="28"
                             HorizontalAlignment="Right"
                             Content="Addy" />
-                        <Button 
+                        <Button
                             Name="btnRem"
                             HorizontalAlignment="Right"
                             Content="Add" 
@@ -44,7 +44,6 @@
                 </Grid>
                 <ui:NumberBox Value="1" />
                 <MenuItem
-                    IconSource="Settings"
                     Header="123 0000"
                     ToolTip.Tip="What this"/>
             </StackPanel>
diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
index 39c2aea16..298442b9f 100644
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -23,7 +23,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Ryujinx.Ava
 {
@@ -157,13 +156,14 @@ namespace Ryujinx.Ava
             }
         }
 
-        public static void ReloadGameConfig(string gamedir)
+        public static bool FindGameConfig(string gameDir)
         {
-            if (File.Exists(gamedir))
+            if (File.Exists(gameDir))
             {
-                ConfigurationPath = gamedir;
+                return true;
             }
 
+            return false;
         }
 
         public static string GetDirGameUserConfig(string gameId, bool rememberGlobalDir = false, bool changeFolderForGame = false)
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
index 37c214952..7c5a0cea5 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -37,21 +37,6 @@ namespace Ryujinx.Ava.UI.Controls
             AvaloniaXamlLoader.Load(this);
         }
 
-        public void ToggleUserControl_Click(object sender, RoutedEventArgs args)
-        {
-            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                return;
-
-            viewModel.SelectedApplication.Favorite = !viewModel.SelectedApplication.Favorite;
-
-            ApplicationLibrary.LoadAndSaveMetaData(viewModel.SelectedApplication.IdString, appMetadata =>
-            {
-                appMetadata.Favorite = viewModel.SelectedApplication.Favorite;
-            });
-
-            viewModel.RefreshView();
-        }
-
         public void ToggleFavorite_Click(object sender, RoutedEventArgs args)
         {
             if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
index d62cafbba..a103d43b0 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
@@ -43,19 +43,6 @@ namespace Ryujinx.Ava.UI.Controls
             await CompatibilityList.Show((string)playabilityLabel.Tag);
         }
 
-        public async void EditGameConfiguration_Click(object sender, RoutedEventArgs args)
-        {
-            if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-            {
-                await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
-
-                //viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString));
-
-                viewModel.RefreshView();
-            }
-
-        }
-
         private async void IdString_OnClick(object sender, RoutedEventArgs e)
         {
             if (DataContext is not MainWindowViewModel mwvm)
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 61ece18dc..02016166b 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -7,6 +7,7 @@ using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
+using DiscordRPC;
 using DynamicData;
 using DynamicData.Binding;
 using FluentAvalonia.UI.Controls;
@@ -1540,15 +1541,14 @@ namespace Ryujinx.Ava.UI.ViewModels
 #if RELEASE
             await PerformanceCheck();
 #endif
-            // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting.
-            string gameDir = Program.GetDirGameUserConfig(application.IdBaseString, true, true);
 
-            if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
+            // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting. 
+            if (ConfigurationFileFormat.TryLoad(Program.GetDirGameUserConfig(application.IdBaseString), out ConfigurationFileFormat configurationFileFormat))
             {
-                //Program.GetDirGameUserConfig(application.IdBaseString, false);
-                ConfigurationState.Instance.Load(configurationFileFormat, gameDir, application.IdBaseString);
+                // Loads the user configuration, having previously changed the global configuration to the user configuration
+                ConfigurationState.Instance.Load(configurationFileFormat, Program.GetDirGameUserConfig(application.IdBaseString, true, true), application.IdBaseString);
             }
-
+         
             Logger.RestartTime();
 
             SelectedIcon ??= ApplicationLibrary.GetApplicationIcon(application.Path, ConfigurationState.Instance.System.Language, application.Id);
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 8454eb142..9ab790714 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -4,7 +4,6 @@ using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Humanizer;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -70,11 +69,8 @@ namespace Ryujinx.Ava.UI.ViewModels
         [ObservableProperty] private string _ldnServer;
 
         public SettingsHacksViewModel DirtyHacks { get; }
-        public string GamePath { get; }
-        public string GameName { get; }
 
         private Bitmap _gameIcon;
-
         private string _gameTitle;
         private string _gameId;
         public Bitmap GameIcon
@@ -375,7 +371,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool IsInvalidLdnPassphraseVisible { get; set; }
 
-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this()
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager) : this(false)
         {
             _virtualFileSystem = virtualFileSystem;
             _contentManager = contentManager;
@@ -388,7 +384,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager, string gamePath, string gameName, string gameId, byte[] gameIconData) : this()
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager, string gamePath, string gameName, string gameId, byte[] gameIconData, bool userDirFind) : this(userDirFind)
         {
             _virtualFileSystem = virtualFileSystem;
             _contentManager = contentManager;
@@ -404,11 +400,14 @@ namespace Ryujinx.Ava.UI.ViewModels
             GameTitle = gameName;
             GameId = gameId;
 
-            string gameDir = Program.GetDirGameUserConfig(gameId,false,true);
-            if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
+            if (userDirFind)
             {
-                ConfigurationState.Instance.Load(configurationFileFormat, gameDir, gameId);
-                LoadCurrentConfiguration(); // Needed to load custom configuration
+                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)
@@ -419,7 +418,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public SettingsViewModel()
+        public SettingsViewModel(bool noLoadGlobalConfig = false)
         {
             GameDirectories = [];
             AutoloadDirectories = [];
@@ -434,7 +433,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             if (Program.PreviewerDetached)
             {
                 Task.Run(LoadAvailableGpus);
-                LoadCurrentConfiguration();
+
+                if (!noLoadGlobalConfig)
+                {
+                    LoadCurrentConfiguration();
+                }
 
                 DirtyHacks = new SettingsHacksViewModel(this);
             }
@@ -545,7 +548,8 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             ConfigurationState config = ConfigurationState.Instance;
 
-            if (string.IsNullOrEmpty(GameId))
+            //It is necessary that the data is used from the global configuration file
+            if (string.IsNullOrEmpty(GameId)) 
             {
                 // User Interface
                 EnableDiscordIntegration = config.EnableDiscordIntegration;
@@ -568,6 +572,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                     "Dark" => 2,
                     _ => 0
                 };
+
             }
 
             // Input
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
index a0bcd1aa2..8e8301ea4 100644
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -134,9 +134,25 @@ namespace Ryujinx.Ava.UI.Views.Main
             Window.SettingsWindow = new(Window.VirtualFileSystem, Window.ContentManager);
 
             Rainbow.Enable();
-            
-            await Window.SettingsWindow.ShowDialog(Window);
-            
+
+            if (ViewModel.SelectedApplication is null)
+            {
+                await Window.SettingsWindow.ShowDialog(Window);
+            }
+            else
+            { 
+                bool userConfigExist = Program.FindGameConfig(Program.GetDirGameUserConfig(ViewModel.SelectedApplication.IdString, false, false));
+
+                if (!ViewModel.IsGameRunning || !userConfigExist)
+                {
+                    await Window.SettingsWindow.ShowDialog(Window);
+                }
+                else
+                {
+                    await new UserConfigWindows(ViewModel, userConfigExist).ShowDialog((Window)ViewModel.TopLevel);
+                }
+            }
+
             Rainbow.Disable();
             Rainbow.Reset();
 
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
index c25f3bbeb..854242ecc 100644
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
@@ -28,7 +28,7 @@ namespace Ryujinx.Ava.UI.Windows
     {
         internal readonly SettingsViewModel ViewModel;
 
-        public UserConfigWindows(MainWindowViewModel viewModel)
+        public UserConfigWindows(MainWindowViewModel viewModel, bool findUserConfigDir = true)
         {
             Title = string.Format(LocaleManager.Instance[LocaleKeys.SettingsWithInfo], viewModel.SelectedApplication.Name, viewModel.SelectedApplication.IdString);
 
@@ -38,7 +38,8 @@ namespace Ryujinx.Ava.UI.Windows
                 viewModel.SelectedApplication.Path,
                 viewModel.SelectedApplication.Name,
                 viewModel.SelectedApplication.IdString,
-                viewModel.SelectedApplication.Icon);
+                viewModel.SelectedApplication.Icon,
+                findUserConfigDir);
 
             ViewModel.CloseWindow += Close;
             ViewModel.SaveSettingsEvent += SaveSettings;

From 11a68a204f4499e60fba899012c166bc23c732e9 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sat, 8 Feb 2025 20:16:38 +1000
Subject: [PATCH 10/20] Fixed bug crash due to incorrect
 System.SystemTimeOffset.Value,

hotkeys should now also be read from the global configuration file
---
 src/Ryujinx/UI/ViewModels/SettingsViewModel.cs | 16 +++++++++-------
 .../ConfigurationState.Migration.cs            | 18 +++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 9ab790714..0661bfd8f 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -405,9 +405,10 @@ namespace Ryujinx.Ava.UI.ViewModels
                 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
+                    ConfigurationState.Instance.Load(configurationFileFormat, gameDir, gameId);                 
                 }
+
+                LoadCurrentConfiguration(); // Needed to load custom configuration
             }
 
             if (Program.PreviewerDetached)
@@ -547,6 +548,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         public void LoadCurrentConfiguration()
         {
             ConfigurationState config = ConfigurationState.Instance;
+            bool userconfigIsNull = string.IsNullOrEmpty(GameId);
 
             //It is necessary that the data is used from the global configuration file
             if (string.IsNullOrEmpty(GameId)) 
@@ -593,7 +595,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             DateTime currentDateTime = currentHostDateTime.Add(systemDateTimeOffset);
             CurrentDate = currentDateTime.Date;
             CurrentTime = currentDateTime.TimeOfDay;
-
             MatchSystemTime = config.System.MatchSystemTime;
 
             EnableCustomVSyncInterval = config.Graphics.EnableCustomVSyncInterval;
@@ -697,9 +698,9 @@ namespace Ryujinx.Ava.UI.ViewModels
         public void SaveSettings()
         {
             ConfigurationState config = ConfigurationState.Instance;
+            bool userConfigFile = string.IsNullOrEmpty(GameId);
 
-
-            if (string.IsNullOrEmpty(GameId))
+            if (userConfigFile)
             {
                 // User Interface
                 config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
@@ -734,7 +735,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.Hid.EnableMouse.Value = EnableMouse;
 
             // Keyboard Hotkeys
-            config.Hid.Hotkeys.Value = KeyboardHotkey.GetConfig();
+            config.Hid.Hotkeys.Value = userConfigFile ? KeyboardHotkey.GetConfig() : config.Hid.Hotkeys.Value;
+
 
             // System
             config.System.Region.Value = (Region)Region;
@@ -746,7 +748,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
 
             config.System.MatchSystemTime.Value = MatchSystemTime;
-            config.System.SystemTimeOffset.Value = Convert.ToInt64((CurrentDate.ToUnixTimeSeconds() + CurrentTime.TotalSeconds) - DateTimeOffset.Now.ToUnixTimeSeconds());
+            config.System.SystemTimeOffset.Value = config.System.SystemTimeOffset.Value;
             config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
             config.System.DramSize.Value = DramSize;
             config.System.IgnoreMissingServices.Value = IgnoreMissingServices;
diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
index 0a355a0ed..9fb56d03f 100644
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -49,13 +49,13 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 configurationFileUpdated = true;
             }
             
-            EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value;
-            CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value;
-            ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value;
-            RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value;
-            ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value;
-            EnableHardwareAcceleration.Value = LoadSetting ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value;
-            HideCursor.Value = LoadSetting ? cff.HideCursor : HideCursor.Value;
+            EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value; // Get from global config only
+            CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
+            ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
+            RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
+            ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only
+            EnableHardwareAcceleration.Value = LoadSetting ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
+            HideCursor.Value = LoadSetting ? cff.HideCursor : HideCursor.Value; // Get from global config only
 
             Logger.EnableFileLog.Value = cff.EnableFileLog;
             Logger.EnableDebug.Value = cff.LoggingEnableDebug;
@@ -91,7 +91,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.Language.Value = cff.SystemLanguage;
             System.Region.Value = cff.SystemRegion;
             System.TimeZone.Value = cff.SystemTimeZone;
-            System.SystemTimeOffset.Value = cff.SystemTimeOffset;
+            System.SystemTimeOffset.Value = LoadSetting ? cff.SystemTimeOffset : System.SystemTimeOffset.Value; // Get from global config only
             System.EnableDockedMode.Value = cff.DockedMode;
             System.EnablePtc.Value = cff.EnablePtc;
             System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
@@ -145,7 +145,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
 
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;
-            Hid.Hotkeys.Value = cff.Hotkeys;
+            Hid.Hotkeys.Value = LoadSetting ? cff.Hotkeys: Hid.Hotkeys.Value; // Get from global config only
             Hid.InputConfig.Value = cff.InputConfig ?? [];
             Hid.RainbowSpeed.Value = cff.RainbowSpeed;
 

From 45b1794a45ffecb7295508e8de255c019c19a34d Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sat, 8 Feb 2025 20:41:16 +1000
Subject: [PATCH 11/20] Returned an erroneously modified Convert time string

---
 src/Ryujinx/UI/ViewModels/SettingsViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 0661bfd8f..2bbc66cb4 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -748,7 +748,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
 
             config.System.MatchSystemTime.Value = MatchSystemTime;
-            config.System.SystemTimeOffset.Value = config.System.SystemTimeOffset.Value;
+            config.System.SystemTimeOffset.Value = Convert.ToInt64((CurrentDate.ToUnixTimeSeconds() + CurrentTime.TotalSeconds) - DateTimeOffset.Now.ToUnixTimeSeconds());
             config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
             config.System.DramSize.Value = DramSize;
             config.System.IgnoreMissingServices.Value = IgnoreMissingServices;

From ae163606857caef6379cef4bf568d537f4e9ae9a Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sat, 8 Feb 2025 22:27:38 +1000
Subject: [PATCH 12/20] Code cleaning

---
 src/Ryujinx/AppHost.cs                        |  2 -
 .../Controls/ApplicationContextMenu.axaml.cs  |  2 -
 .../UI/Controls/ApplicationListView.axaml.cs  |  1 -
 .../UI/ViewModels/MainWindowViewModel.cs      |  1 -
 .../UI/ViewModels/SettingsViewModel.cs        | 62 +++++--------------
 .../UI/Views/Main/MainMenuBarView.axaml.cs    |  5 +-
 .../AppLibrary/ApplicationLibrary.cs          |  2 +-
 .../ConfigurationState.Migration.cs           |  2 +-
 8 files changed, 19 insertions(+), 58 deletions(-)

diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
index 98c0771e1..62a1aff7d 100644
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -469,8 +469,6 @@ namespace Ryujinx.Ava
 
             _viewModel.IsGameRunning = true;
 
-           
-
             Dispatcher.UIThread.InvokeAsync(() =>
             {
                 _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
index 7c5a0cea5..63ccda468 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -13,7 +13,6 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
-using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -399,7 +398,6 @@ namespace Ryujinx.Ava.UI.Controls
 
                 viewModel.RefreshView();
             }
-
         }
 
         public async void OpenApplicationCompatibility_Click(object sender, RoutedEventArgs args)
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
index a103d43b0..7c6b0cf15 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
@@ -4,7 +4,6 @@ using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
 using System;
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 02016166b..4246a57a3 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -7,7 +7,6 @@ using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
-using DiscordRPC;
 using DynamicData;
 using DynamicData.Binding;
 using FluentAvalonia.UI.Controls;
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 2bbc66cb4..5305a3f72 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -4,6 +4,7 @@ using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Humanizer;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -384,7 +385,13 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager, string gamePath, string gameName, string gameId, byte[] gameIconData, bool userDirFind) : this(userDirFind)
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, 
+            ContentManager contentManager,
+            string gamePath,
+            string gameName, 
+            string gameId, 
+            byte[] gameIconData, 
+            bool enableToLoadCustomConfig) : this(enableToLoadCustomConfig)
         {
             _virtualFileSystem = virtualFileSystem;
             _contentManager = contentManager;
@@ -400,7 +407,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             GameTitle = gameName;
             GameId = gameId;
 
-            if (userDirFind)
+            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))
@@ -435,7 +442,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 Task.Run(LoadAvailableGpus);
 
-                if (!noLoadGlobalConfig)
+                if (!noLoadGlobalConfig)// Default is false, but loading custom config avoids double call
                 {
                     LoadCurrentConfiguration();
                 }
@@ -548,7 +555,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         public void LoadCurrentConfiguration()
         {
             ConfigurationState config = ConfigurationState.Instance;
-            bool userconfigIsNull = string.IsNullOrEmpty(GameId);
 
             //It is necessary that the data is used from the global configuration file
             if (string.IsNullOrEmpty(GameId)) 
@@ -654,47 +660,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             LdnPassphrase = config.Multiplayer.LdnPassphrase;
             LdnServer = config.Multiplayer.LdnServer;
         }
-
-        public void SaveSettings2()
-        {
-            ConfigurationState config = ConfigurationState.Instance;
-
-            // User Interface
-            config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
-            config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
-            config.ShowConfirmExit.Value = ShowConfirmExit;
-            config.RememberWindowState.Value = RememberWindowState;
-            config.ShowTitleBar.Value = ShowTitleBar;
-            config.HideCursor.Value = (HideCursorMode)HideCursor;
-
-            if (GameDirectoryChanged)
-            {
-                config.UI.GameDirs.Value = [.. GameDirectories];
-            }
-
-            if (AutoloadDirectoryChanged)
-            {
-                config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
-            }
-
-            config.UI.BaseStyle.Value = BaseStyleIndex switch
-            {
-                0 => "Auto",
-                1 => "Light",
-                2 => "Dark",
-                _ => "Auto"
-            };
-
-            if (!string.IsNullOrEmpty(GameId))
-            {
-                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
-            }
-            else
-            {
-                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
-            }
-        }
-
+     
         public void SaveSettings()
         {
             ConfigurationState config = ConfigurationState.Instance;
@@ -735,8 +701,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.Hid.EnableMouse.Value = EnableMouse;
 
             // Keyboard Hotkeys
-            config.Hid.Hotkeys.Value = userConfigFile ? KeyboardHotkey.GetConfig() : config.Hid.Hotkeys.Value;
-
+            config.Hid.Hotkeys.Value = KeyboardHotkey.GetConfig();
 
             // System
             config.System.Region.Value = (Region)Region;
@@ -859,6 +824,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 File.Delete(gameDir);
             }
+
             RevertIfNotSaved();
             CloseWindow?.Invoke();
         }
@@ -866,7 +832,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         public void SaveUserConfig()
         {
             SaveSettings();
-            RevertIfNotSaved();
+            RevertIfNotSaved(); // Revert global configuration after saving user configuration
             CloseWindow?.Invoke();
         }
 
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
index 8e8301ea4..4db662f0a 100644
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -135,7 +135,7 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             Rainbow.Enable();
 
-            if (ViewModel.SelectedApplication is null)
+            if (ViewModel.SelectedApplication is null) // Checks if game data exists
             {
                 await Window.SettingsWindow.ShowDialog(Window);
             }
@@ -145,10 +145,11 @@ namespace Ryujinx.Ava.UI.Views.Main
 
                 if (!ViewModel.IsGameRunning || !userConfigExist)
                 {
-                    await Window.SettingsWindow.ShowDialog(Window);
+                    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 new UserConfigWindows(ViewModel, userConfigExist).ShowDialog((Window)ViewModel.TopLevel);
                 }
             }
diff --git a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
index 05abcdf8d..ac402a00e 100644
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
@@ -533,7 +533,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                     data.Favorite = appMetadata.Favorite;
                     data.TimePlayed = appMetadata.TimePlayed;
                     data.LastPlayed = appMetadata.LastPlayed;
-                    data.UserConfig = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // just check for file presence
+                    data.UserConfig = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // Just check user config
                 }
 
                 data.FileExtension = Path.GetExtension(applicationPath).TrimStart('.').ToUpper();
diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
index 9fb56d03f..8a1b03853 100644
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -145,7 +145,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
 
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;
-            Hid.Hotkeys.Value = LoadSetting ? cff.Hotkeys: Hid.Hotkeys.Value; // Get from global config only
+            Hid.Hotkeys.Value = LoadSetting ? cff.Hotkeys : Hid.Hotkeys.Value; // Get from global config only
             Hid.InputConfig.Value = cff.InputConfig ?? [];
             Hid.RainbowSpeed.Value = cff.RainbowSpeed;
 

From 4bbcec20765dc6602e10aaf097e736e1a95f95cb Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sun, 9 Feb 2025 15:30:33 +1000
Subject: [PATCH 13/20] Fixed a bug where control would not return after
 changing settings. Added a function to update the gamelist status after the
 game is released

---
 src/Ryujinx/AppHost.cs                            | 3 +++
 src/Ryujinx/UI/Windows/MainWindow.axaml.cs        | 5 +++++
 src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
index 62a1aff7d..c64e831cc 100644
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -586,6 +586,9 @@ namespace Ryujinx.Ava
             // (resets custom settings if there were any)
             Program.ReloadConfig();
 
+            //Updates the gameList (changes the status of the user setting if it was added or removed during the game)
+            RyujinxApp.MainWindow.GameListUpdate();
+
             _isStopped = true;
             Stop();
         }
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index 669e338df..120b82ff3 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -645,6 +645,11 @@ namespace Ryujinx.Ava.UI.Windows
             ReloadGameList();
         }
 
+        public void GameListUpdate()
+        {
+            ReloadGameList();
+        }
+
         public void ToggleFileType(string fileType)
         {
             switch (fileType)
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
index 854242ecc..6fd35825a 100644
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
@@ -108,7 +108,8 @@ namespace Ryujinx.Ava.UI.Windows
         }
 
         protected override void OnClosing(WindowClosingEventArgs e)
-        {   
+        {
+            InputPage.Dispose(); // You need to unload the gamepad settings, otherwise the controls will be blocked
             base.OnClosing(e);
         }
     }

From 966860a4643a5adfb669135d8f1ac1f5de5cc150 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Mon, 10 Feb 2025 15:25:19 +1000
Subject: [PATCH 14/20] Change: initialization of user configuration is now a
 separate function

---
 .../UI/ViewModels/MainWindowViewModel.cs      | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 4246a57a3..73455aa24 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -1523,8 +1523,34 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public void InitializeUserConfig(ApplicationData application)
+        {
+            // Code where conditions will be met before loading the user configuration        
+            BackendThreading backendThreadingValue = ConfigurationState.Instance.Graphics.BackendThreading.Value;
+
+            // 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 != backendThreadingValue)
+            {
+                /*                 
+                 * The function to restart the emulator together with the selected game
+                Task.Run(async () => await Rebooter.RebootAppWithGame(application.Path)); 
+                */
+            }
+        }
+
         public async Task LoadApplication(ApplicationData application, bool startFullscreen = false, BlitStruct<ApplicationControlProperty>? customNacpData = null)
         {
+
+            InitializeUserConfig(application);
+
             if (AppHost != null)
             {
                 await ContentDialogHelper.CreateInfoDialog(
@@ -1540,13 +1566,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 #if RELEASE
             await PerformanceCheck();
 #endif
-
-            // If a configuration is found in the "/games/xxxxxxxxxxxxxx" folder, the program will load the user setting. 
-            if (ConfigurationFileFormat.TryLoad(Program.GetDirGameUserConfig(application.IdBaseString), out ConfigurationFileFormat configurationFileFormat))
-            {
-                // Loads the user configuration, having previously changed the global configuration to the user configuration
-                ConfigurationState.Instance.Load(configurationFileFormat, Program.GetDirGameUserConfig(application.IdBaseString, true, true), application.IdBaseString);
-            }
          
             Logger.RestartTime();
 

From 0399af0ff958d57c7931a649da941ec42c3b99a7 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Mon, 10 Feb 2025 21:02:26 +1000
Subject: [PATCH 15/20] Replace the "delete" button with "apply" during the
 game in the custom configuration.

---
 .../UI/ViewModels/SettingsViewModel.cs        | 51 +++++--------------
 .../UI/Windows/UserConfigWindows.axaml        |  5 ++
 .../UI/Windows/UserConfigWindows.axaml.cs     |  3 +-
 3 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 5305a3f72..e5f6460ac 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -74,42 +74,12 @@ namespace Ryujinx.Ava.UI.ViewModels
         private Bitmap _gameIcon;
         private string _gameTitle;
         private string _gameId;
-        public Bitmap GameIcon
-        {
-            get => _gameIcon;
-            set
-            {
-                if (_gameIcon != value)
-                {
-                    _gameIcon = value;
-                }
-            }
-        }
-
-        public string GameTitle
-        {
-            get => _gameTitle;
-            set
-            {
-                if (_gameTitle != value)
-                {
-                    _gameTitle = value;
-                }
-            }
-        }
-
-        public string GameId
-        {
-            get => _gameId;
-            set
-            {
-                if (_gameId != value)
-                {
-                    _gameId = value;
-                }
-            }
-        }
+        private readonly bool _isGameRunning;
 
+        public bool IsGameRunning => _isGameRunning;
+        public Bitmap GameIcon => _gameIcon;
+        public string GameTitle => _gameTitle;
+        public string GameId => _gameId;
 
         public int ResolutionScale
         {
@@ -385,8 +355,10 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, 
+        public SettingsViewModel(
+            VirtualFileSystem virtualFileSystem, 
             ContentManager contentManager,
+            bool gameRunning,
             string gamePath,
             string gameName, 
             string gameId, 
@@ -400,12 +372,13 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 using (var ms = new MemoryStream(gameIconData))
                 {
-                    GameIcon = new Bitmap(ms);
+                    _gameIcon = new Bitmap(ms);
                 }
             }
 
-            GameTitle = gameName;
-            GameId = gameId;
+            _isGameRunning = gameRunning;
+            _gameTitle = gameName;
+            _gameId = gameId;
 
             if (enableToLoadCustomConfig) // During the game. If there is no user config, then load the global config window
             {
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
index ed3ab66f8..3a9f3cff8 100644
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
@@ -136,6 +136,11 @@
                 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"/>
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
index 6fd35825a..4247c1cfb 100644
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
+++ b/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
@@ -35,6 +35,7 @@ namespace Ryujinx.Ava.UI.Windows
             DataContext = ViewModel = new SettingsViewModel(
                 viewModel.VirtualFileSystem, 
                 viewModel.ContentManager,
+                viewModel.IsGameRunning,
                 viewModel.SelectedApplication.Path,
                 viewModel.SelectedApplication.Name,
                 viewModel.SelectedApplication.IdString,
@@ -46,7 +47,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
             Load();
-
+           
 #if DEBUG
             this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
 #endif

From 1ca5407c2229a7b7531d27157652ae9e575ba810 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Tue, 11 Feb 2025 14:06:31 +1000
Subject: [PATCH 16/20] Added autorestart of the emulator if it is necessary to
 change the graphic multi-thread. Code cleaning

---
 src/Ryujinx/Assets/locales.json               | 50 ++++++++++
 src/Ryujinx/Common/LocaleManager.cs           |  1 +
 src/Ryujinx/Program.cs                        |  6 ++
 src/Ryujinx/Rebooter.cs                       | 95 +++++++++++++++++++
 .../UI/ViewModels/MainWindowViewModel.cs      | 32 +++++--
 .../UI/ViewModels/SettingsViewModel.cs        |  8 +-
 src/Ryujinx/Utilities/CommandLineState.cs     | 11 +++
 7 files changed, 192 insertions(+), 11 deletions(-)
 create mode 100644 src/Ryujinx/Rebooter.cs

diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index 7f6bf5b56..6bbb88706 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -12472,6 +12472,31 @@
         "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": {
@@ -19272,6 +19297,31 @@
         "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": {
diff --git a/src/Ryujinx/Common/LocaleManager.cs b/src/Ryujinx/Common/LocaleManager.cs
index 4c86a6177..f60cff49b 100644
--- a/src/Ryujinx/Common/LocaleManager.cs
+++ b/src/Ryujinx/Common/LocaleManager.cs
@@ -54,6 +54,7 @@ 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]
diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
index 298442b9f..f1adbe25a 100644
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -35,6 +35,7 @@ namespace Ryujinx.Ava
         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);
@@ -250,6 +251,11 @@ 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;
diff --git a/src/Ryujinx/Rebooter.cs b/src/Ryujinx/Rebooter.cs
new file mode 100644
index 000000000..21fa650bd
--- /dev/null
+++ b/src/Ryujinx/Rebooter.cs
@@ -0,0 +1,95 @@
+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;
+
+                // On macOS we perform the update at relaunch.
+                if (OperatingSystem.IsMacOS())
+                {
+                    string baseBundlePath = Path.GetFullPath(Path.Combine(executableDirectory, "..", ".."));
+                    string newBundlePath = Path.Combine(_updateDir, "Ryujinx.app");
+                    string updaterScriptPath = Path.Combine(newBundlePath, "Contents", "Resources", "updater.sh");
+                    string currentPid = Environment.ProcessId.ToString();
+
+                    arguments.InsertRange(0, new List<string> { updaterScriptPath, baseBundlePath, newBundlePath, currentPid });
+                    Process.Start("/bin/bash", arguments);
+                }
+                else
+                {
+                    var dialogTask = taskDialog.ShowAsync(true);
+                    await Task.Delay(500);
+
+                    // Find the process name.
+                    string ryuName = Path.GetFileName(Environment.ProcessPath) ?? string.Empty;
+
+                    // Some operating systems can see the renamed executable, so strip off the .ryuold if found.
+                    if (ryuName.EndsWith(".ryuold"))
+                    {
+                        ryuName = ryuName[..^7];
+                    }
+
+                    // 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);
+            }
+        }
+    }
+}
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 73455aa24..219048401 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -1523,10 +1523,16 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public void InitializeUserConfig(ApplicationData application)
+        public bool InitializeUserConfig(ApplicationData application)
         {
-            // Code where conditions will be met before loading the user configuration        
+            // 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;
@@ -1537,19 +1543,29 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
 
             // Code where conditions will be executed after loading user configuration
-            if (ConfigurationState.Instance.Graphics.BackendThreading != backendThreadingValue)
+            if (ConfigurationState.Instance.Graphics.BackendThreading.Value.ToString() != BackendThreadingInit)
             {
-                /*                 
-                 * The function to restart the emulator together with the selected game
-                Task.Run(async () => await Rebooter.RebootAppWithGame(application.Path)); 
-                */
+
+                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)
         {
 
-            InitializeUserConfig(application);
+            if (InitializeUserConfig(application))
+            {
+                return;
+            }
 
             if (AppHost != null)
             {
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index e5f6460ac..aea2afec7 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -71,13 +71,14 @@ 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;
-        private readonly bool _isGameRunning;
-
         public bool IsGameRunning => _isGameRunning;
         public Bitmap GameIcon => _gameIcon;
+        public string GamePath => _gamePath;
         public string GameTitle => _gameTitle;
         public string GameId => _gameId;
 
@@ -377,7 +378,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
 
             _isGameRunning = gameRunning;
-            _gameTitle = gameName;
+            _gamePath = gamePath;
+            _gameTitle = gameName;           
             _gameId = gameId;
 
             if (enableToLoadCustomConfig) // During the game. If there is no user config, then load the global config window
diff --git a/src/Ryujinx/Utilities/CommandLineState.cs b/src/Ryujinx/Utilities/CommandLineState.cs
index ee242157f..6c54e78a5 100644
--- a/src/Ryujinx/Utilities/CommandLineState.cs
+++ b/src/Ryujinx/Utilities/CommandLineState.cs
@@ -11,6 +11,7 @@ namespace Ryujinx.Ava.Utilities
         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; } 
@@ -99,6 +100,16 @@ namespace Ryujinx.Ava.Utilities
 
                         OverrideBackendThreading = args[++i];
                         break;
+                    case "--bt":
+                        if (i + 1 >= args.Length)
+                        {
+                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
+
+                            continue;
+                        }
+
+                        OverrideBackendThreadingCustom = args[++i];
+                        break;
                     case "--pptc":
                         if (i + 1 >= args.Length)
                         {

From af13f4bb3b351e6b925a258a1a5b569d586b8d82 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Tue, 11 Feb 2025 15:32:17 +1000
Subject: [PATCH 17/20] fix latest changes

---
 src/Ryujinx/Utilities/CommandLineState.cs                       | 2 +-
 .../Utilities/Configuration/ConfigurationState.Migration.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Ryujinx/Utilities/CommandLineState.cs b/src/Ryujinx/Utilities/CommandLineState.cs
index 6c54e78a5..beac6137a 100644
--- a/src/Ryujinx/Utilities/CommandLineState.cs
+++ b/src/Ryujinx/Utilities/CommandLineState.cs
@@ -108,7 +108,7 @@ namespace Ryujinx.Ava.Utilities
                             continue;
                         }
 
-                        OverrideBackendThreadingCustom = args[++i];
+                        OverrideBackendThreadingAfterReboot = args[++i];
                         break;
                     case "--pptc":
                         if (i + 1 >= args.Length)
diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
index 571e93991..08daa12d9 100644
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -52,7 +52,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
 
             EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value; // Get from global config only
             CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
-            UpdateCheckerType.Value = cff.UpdateCheckerType;
+            UpdateCheckerType.Value = LoadSetting ? cff.UpdateCheckerType : UpdateCheckerType.Value; // Get from global config only
             ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
             RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
             ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only

From c21e63eb023b5a1faedfb816c486d53d7ecb7b90 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Wed, 12 Feb 2025 12:44:38 +1000
Subject: [PATCH 18/20] Removed irrelevant functions. Renamed variables to
 correct names

---
 src/Ryujinx/AppHost.cs                        |  1 +
 src/Ryujinx/Program.cs                        |  2 +-
 .../Controls/ApplicationContextMenu.axaml.cs  |  4 +-
 .../UI/Controls/ApplicationGridView.axaml     |  4 +-
 .../UI/Controls/ApplicationListView.axaml     |  2 +-
 .../UI/ViewModels/MainWindowViewModel.cs      |  2 +-
 .../UI/ViewModels/SettingsViewModel.cs        |  1 -
 .../UI/Views/Main/MainMenuBarView.axaml.cs    | 10 +-
 .../UI/Views/Main/MainStatusBarView.axaml     |  4 +-
 src/Ryujinx/UI/Windows/AboutWindow.axaml      |  2 +-
 ...axaml => GameSpecificSettingsWindow.axaml} |  2 +-
 ...cs => GameSpecificSettingsWindow.axaml.cs} |  4 +-
 .../Utilities/AppLibrary/ApplicationData.cs   |  2 +-
 .../AppLibrary/ApplicationLibrary.cs          |  2 +-
 src/Ryujinx/Utilities/AppletMetadata.cs       |  2 +-
 src/Ryujinx/Utilities/CommandLineState.cs     |  4 -
 .../ConfigurationState.Migration.cs           | 98 +++++++++----------
 17 files changed, 70 insertions(+), 76 deletions(-)
 rename src/Ryujinx/UI/Windows/{UserConfigWindows.axaml => GameSpecificSettingsWindow.axaml} (99%)
 rename src/Ryujinx/UI/Windows/{UserConfigWindows.axaml.cs => GameSpecificSettingsWindow.axaml.cs} (95%)

diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
index c64e831cc..a3e765a2d 100644
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -1048,6 +1048,7 @@ namespace Ryujinx.Ava
                 if (_viewModel.StartGamesInFullscreen)
                 {
                     _viewModel.WindowState = WindowState.FullScreen;
+                    _viewModel.Window.TitleBar.ExtendsContentIntoTitleBar = true;
                 }
 
                 if (_viewModel.WindowState is WindowState.FullScreen || _viewModel.StartGamesWithoutUI)
diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
index f1adbe25a..cc748087e 100644
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -299,7 +299,7 @@ namespace Ryujinx.Ava
                     ConfigurationState.Instance.System.Language.Value = (Utilities.Configuration.System.Language)result;
                 }
 
-            // Check if hardware-acceleration was overridden. MemoryManagerMode ( outdated! )
+            // Check if hardware-acceleration was overridden.
             if (CommandLineState.OverrideHardwareAcceleration != null)
                 UseHardwareAcceleration = CommandLineState.OverrideHardwareAcceleration.Value;
         }
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
index 63ccda468..216cb10d3 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -391,10 +391,10 @@ namespace Ryujinx.Ava.UI.Controls
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
             {
-                await new UserConfigWindows(viewModel).ShowDialog((Window)viewModel.TopLevel);
+                await new GameSpecificSettingsWindow(viewModel).ShowDialog((Window)viewModel.TopLevel);
 
                 //just checking for file presence
-                viewModel.SelectedApplication.UserConfig = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
+                viewModel.SelectedApplication.HasIndependentConfiguration = File.Exists(Program.GetDirGameUserConfig(viewModel.SelectedApplication.IdString,false,false));
 
                 viewModel.RefreshView();
             }
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
index 62eb44b1a..a7b126230 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -80,7 +80,7 @@
                                             TextAlignment="Center"
                                             TextWrapping="Wrap" />
                                         <TextBlock
-                                            IsVisible="{Binding UserConfig}"
+                                            IsVisible="{Binding HasIndependentConfiguration}"
                                             Text="{ext:Locale UserConfigurationHeader}"
                                             TextAlignment="Center"
                                             TextWrapping="Wrap"
@@ -105,7 +105,7 @@
                                 Width="90"
                                 Height="20"
                                 CornerRadius="4"
-                                IsVisible="{Binding UserConfig}"
+                                IsVisible="{Binding HasIndependentConfiguration}"
                                 Background="{DynamicResource ThemeContentBackgroundColor}">
                                 <TextBlock
                                     HorizontalAlignment="Center"
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
index 79f535b33..62619913f 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -159,7 +159,7 @@
                                         TextWrapping="Wrap"/>
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        IsVisible="{Binding UserConfig}"
+                                        IsVisible="{Binding HasIndependentConfiguration}"
                                         Text="{ext:Locale UserConfigurationHeader}"
                                         TextAlignment="Start"
                                         TextWrapping="Wrap"
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index db04e687b..d881bff98 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -107,7 +107,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         [ObservableProperty] private ApplicationContextMenu _gridAppContextMenu;
         [ObservableProperty] private bool _updateAvailable;
 
-        public static AsyncRelayCommand UpdateCommand => Commands.Create(async () =>
+        public static AsyncRelayCommand UpdateCommand { get; } = Commands.Create(async () =>
         {
             if (Updater.CanUpdate(true))
                 await Updater.BeginUpdateAsync(true);
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 5e8fb0a83..ad3729ec8 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -400,7 +400,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 Task.Run(LoadTimeZones);
 
-                DirtyHacks = new SettingsHacksViewModel(this);
             }
         }
 
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
index 4db662f0a..f1bb2de55 100644
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -51,12 +51,8 @@ namespace Ryujinx.Ava.UI.Views.Main
             XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
             AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
             CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());
-            
-            UpdateMenuItem.Command = Commands.Create(async () =>
-            {
-                if (Updater.CanUpdate(true))
-                    await Updater.BeginUpdateAsync(true);
-            });
+
+            UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;
 
             FaqMenuItem.Command = 
                 SetupGuideMenuItem.Command = 
@@ -150,7 +146,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                 else
                 {
                     // If there is a custom configuration in the folder
-                    await new UserConfigWindows(ViewModel, userConfigExist).ShowDialog((Window)ViewModel.TopLevel);
+                    await new GameSpecificSettingsWindow(ViewModel, userConfigExist).ShowDialog((Window)ViewModel.TopLevel);
                 }
             }
 
diff --git a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
index 98416654b..7265086c4 100644
--- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
@@ -291,9 +291,11 @@
                 </MultiBinding>
             </StackPanel.IsVisible>
             <Button Margin="0, 0, 5, 0"
-                    Command="{Binding UpdateCommand}">
+                    Command="{Binding UpdateCommand}"
+                    Background="{DynamicResource SystemAccentColor}">
                 <TextBlock
                     Margin="-5"
+                    Foreground="Black"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
                     Text="{ext:Locale UpdaterBackgroundStatusBarButtonText}" />
diff --git a/src/Ryujinx/UI/Windows/AboutWindow.axaml b/src/Ryujinx/UI/Windows/AboutWindow.axaml
index df880160f..2226883fc 100644
--- a/src/Ryujinx/UI/Windows/AboutWindow.axaml
+++ b/src/Ryujinx/UI/Windows/AboutWindow.axaml
@@ -125,7 +125,7 @@
                         Background="Transparent"
                         Click="Button_OnClick"
                         CornerRadius="15"
-                        Tag="https://discord.gg/dHPrkBkkyA"
+                        Tag="https://discord.gg/PEuzjrFXUA"
                         ToolTip.Tip="{ext:Locale AboutDiscordUrlTooltipMessage}">
                         <Image Source="{Binding DiscordLogo}" />
                     </Button>
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
similarity index 99%
rename from src/Ryujinx/UI/Windows/UserConfigWindows.axaml
rename to src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
index 3a9f3cff8..c7a5d1fa4 100644
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
@@ -1,5 +1,5 @@
 <window:StyleableAppWindow
-    x:Class="Ryujinx.Ava.UI.Windows.UserConfigWindows"
+    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"
diff --git a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
similarity index 95%
rename from src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
rename to src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
index 4247c1cfb..f5e8d3733 100644
--- a/src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
@@ -24,11 +24,11 @@ using Key = Avalonia.Input.Key;
 
 namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class UserConfigWindows : StyleableAppWindow
+    public partial class GameSpecificSettingsWindow : StyleableAppWindow
     {
         internal readonly SettingsViewModel ViewModel;
 
-        public UserConfigWindows(MainWindowViewModel viewModel, bool findUserConfigDir = true)
+        public GameSpecificSettingsWindow(MainWindowViewModel viewModel, bool findUserConfigDir = true)
         {
             Title = string.Format(LocaleManager.Instance[LocaleKeys.SettingsWithInfo], viewModel.SelectedApplication.Name, viewModel.SelectedApplication.IdString);
 
diff --git a/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs b/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
index e2c85c072..4c74d262f 100644
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs
@@ -23,7 +23,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
     public class ApplicationData
     {
         public bool Favorite { get; set; }
-        public bool UserConfig { get; set; }
+        public bool HasIndependentConfiguration { get; set; }
         public byte[] Icon { get; set; }
         public string Name { get; set; } = "Unknown";
 
diff --git a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
index ac402a00e..a9f831111 100644
--- a/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs
@@ -533,7 +533,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                     data.Favorite = appMetadata.Favorite;
                     data.TimePlayed = appMetadata.TimePlayed;
                     data.LastPlayed = appMetadata.LastPlayed;
-                    data.UserConfig = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // Just check user config
+                    data.HasIndependentConfiguration = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // Just check user config
                 }
 
                 data.FileExtension = Path.GetExtension(applicationPath).TrimStart('.').ToUpper();
diff --git a/src/Ryujinx/Utilities/AppletMetadata.cs b/src/Ryujinx/Utilities/AppletMetadata.cs
index a165487a3..50f01b4c0 100644
--- a/src/Ryujinx/Utilities/AppletMetadata.cs
+++ b/src/Ryujinx/Utilities/AppletMetadata.cs
@@ -45,7 +45,7 @@ namespace Ryujinx.Ava.Utilities
             if (string.IsNullOrEmpty(contentPath)) 
                 goto BadData;
 
-            appData = new() { Name = Name, Id = ProgramId, Path = GetContentPath(contentManager) };
+            appData = new() { Name = Name, Id = ProgramId, Path = contentPath };
             appControl = StructHelpers.CreateCustomNacpData(Name, Version);
             return true;
             
diff --git a/src/Ryujinx/Utilities/CommandLineState.cs b/src/Ryujinx/Utilities/CommandLineState.cs
index beac6137a..eb266c38c 100644
--- a/src/Ryujinx/Utilities/CommandLineState.cs
+++ b/src/Ryujinx/Utilities/CommandLineState.cs
@@ -24,10 +24,6 @@ namespace Ryujinx.Ava.Utilities
         public static bool StartFullscreenArg { get; private set; }
         public static bool HideAvailableUpdates { get; private set; }
 
-        public static void ArgumentsClean()
-        {
-
-        }
 
         public static void ParseArguments(string[] args)
         {
diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
index 08daa12d9..6c6b85bc8 100644
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -18,14 +18,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
 {
     public partial class ConfigurationState
     {
-        public void Load(ConfigurationFileFormat cff, string configurationFilePath, string gameId="")
+        public void Load(ConfigurationFileFormat cff, string configurationFilePath, string titleId = "")
         {
             bool configurationFileUpdated = false;
-            bool LoadSetting = true;
+            bool shouldLoadFromFile = true;
 
-            if (!string.IsNullOrEmpty(gameId))
+            if (!string.IsNullOrEmpty(titleId))
             {
-                LoadSetting = false;
+                shouldLoadFromFile = false;
             }
 
             if (cff.Version is < 0 or > ConfigurationFileFormat.CurrentVersion)
@@ -50,14 +50,14 @@ namespace Ryujinx.Ava.Utilities.Configuration
             }
             
 
-            EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value; // Get from global config only
-            CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
-            UpdateCheckerType.Value = LoadSetting ? cff.UpdateCheckerType : UpdateCheckerType.Value; // Get from global config only
-            ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
-            RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
-            ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only
-            EnableHardwareAcceleration.Value = LoadSetting ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
-            HideCursor.Value = LoadSetting ? cff.HideCursor : HideCursor.Value; // Get from global config only
+            EnableDiscordIntegration.Value = shouldLoadFromFile ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value; // Get from global config only
+            CheckUpdatesOnStart.Value = shouldLoadFromFile ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
+            UpdateCheckerType.Value = shouldLoadFromFile ? cff.UpdateCheckerType : UpdateCheckerType.Value; // Get from global config only
+            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
+            HideCursor.Value = shouldLoadFromFile ? cff.HideCursor : HideCursor.Value; // Get from global config only
           
             Logger.EnableFileLog.Value = cff.EnableFileLog;
             Logger.EnableDebug.Value = cff.LoggingEnableDebug;
@@ -93,7 +93,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.Language.Value = cff.SystemLanguage;
             System.Region.Value = cff.SystemRegion;
             System.TimeZone.Value = cff.SystemTimeZone;
-            System.SystemTimeOffset.Value = LoadSetting ? cff.SystemTimeOffset : System.SystemTimeOffset.Value; // Get from global config only
+            System.SystemTimeOffset.Value = shouldLoadFromFile ? cff.SystemTimeOffset : System.SystemTimeOffset.Value; // Get from global config only
             System.EnableDockedMode.Value = cff.DockedMode;
             System.EnablePtc.Value = cff.EnablePtc;
             System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
@@ -108,46 +108,46 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.IgnoreApplet.Value = cff.IgnoreApplet;
             System.UseHypervisor.Value = cff.UseHypervisor;
 
-            UI.GuiColumns.FavColumn.Value = LoadSetting ? cff.GuiColumns.FavColumn : UI.GuiColumns.FavColumn.Value;
-            UI.GuiColumns.IconColumn.Value = LoadSetting ? cff.GuiColumns.IconColumn : UI.GuiColumns.IconColumn.Value;
-            UI.GuiColumns.AppColumn.Value = LoadSetting ? cff.GuiColumns.AppColumn : UI.GuiColumns.AppColumn.Value;
-            UI.GuiColumns.DevColumn.Value = LoadSetting ? cff.GuiColumns.DevColumn : UI.GuiColumns.DevColumn.Value;
-            UI.GuiColumns.VersionColumn.Value = LoadSetting ? cff.GuiColumns.VersionColumn : UI.GuiColumns.VersionColumn.Value;
-            UI.GuiColumns.TimePlayedColumn.Value = LoadSetting ? cff.GuiColumns.TimePlayedColumn : UI.GuiColumns.TimePlayedColumn.Value;
-            UI.GuiColumns.LastPlayedColumn.Value = LoadSetting ? cff.GuiColumns.LastPlayedColumn : UI.GuiColumns.LastPlayedColumn.Value;
-            UI.GuiColumns.FileExtColumn.Value = LoadSetting ? cff.GuiColumns.FileExtColumn : UI.GuiColumns.FileExtColumn.Value;
-            UI.GuiColumns.FileSizeColumn.Value = LoadSetting ? cff.GuiColumns.FileSizeColumn : UI.GuiColumns.FileSizeColumn.Value;
-            UI.GuiColumns.PathColumn.Value = LoadSetting ? cff.GuiColumns.PathColumn : UI.GuiColumns.PathColumn.Value;
-            UI.ColumnSort.SortColumnId.Value = LoadSetting ? cff.ColumnSort.SortColumnId : UI.ColumnSort.SortColumnId.Value;
-            UI.ColumnSort.SortAscending.Value = LoadSetting ? cff.ColumnSort.SortAscending : UI.ColumnSort.SortAscending.Value;
-            UI.GameDirs.Value = LoadSetting ? cff.GameDirs : UI.GameDirs.Value;
-            UI.AutoloadDirs.Value = LoadSetting ? (cff.AutoloadDirs ?? []) : UI.AutoloadDirs.Value;
-            UI.ShownFileTypes.NSP.Value = LoadSetting ? cff.ShownFileTypes.NSP : UI.ShownFileTypes.NSP.Value;
-            UI.ShownFileTypes.PFS0.Value = LoadSetting ? cff.ShownFileTypes.PFS0 : UI.ShownFileTypes.PFS0.Value;
-            UI.ShownFileTypes.XCI.Value = LoadSetting ? cff.ShownFileTypes.XCI : UI.ShownFileTypes.XCI.Value;
-            UI.ShownFileTypes.NCA.Value = LoadSetting ? cff.ShownFileTypes.NCA : UI.ShownFileTypes.NCA.Value;
-            UI.ShownFileTypes.NRO.Value = LoadSetting ? cff.ShownFileTypes.NRO : UI.ShownFileTypes.NRO.Value;
-            UI.ShownFileTypes.NSO.Value = LoadSetting ? cff.ShownFileTypes.NSO : UI.ShownFileTypes.NSO.Value;
-            UI.LanguageCode.Value = LoadSetting ? cff.LanguageCode : UI.LanguageCode.Value;
-            UI.BaseStyle.Value = LoadSetting ? cff.BaseStyle : UI.BaseStyle.Value;
-            UI.GameListViewMode.Value = LoadSetting ? cff.GameListViewMode : UI.GameListViewMode.Value;
-            UI.ShowNames.Value = LoadSetting ? cff.ShowNames : UI.ShowNames.Value;
-            UI.IsAscendingOrder.Value = LoadSetting ? cff.IsAscendingOrder : UI.IsAscendingOrder.Value;
-            UI.GridSize.Value = LoadSetting ? cff.GridSize : UI.GridSize.Value;
-            UI.ApplicationSort.Value = LoadSetting ? cff.ApplicationSort : UI.ApplicationSort.Value;
-            UI.StartFullscreen.Value = LoadSetting ? cff.StartFullscreen : UI.StartFullscreen.Value;
-            UI.StartNoUI.Value = LoadSetting ? cff.StartNoUI : UI.StartNoUI.Value;
-            UI.ShowConsole.Value = LoadSetting ? cff.ShowConsole : UI.ShowConsole.Value;
-            UI.WindowStartup.WindowSizeWidth.Value = LoadSetting ? cff.WindowStartup.WindowSizeWidth : UI.WindowStartup.WindowSizeWidth.Value;
-            UI.WindowStartup.WindowSizeHeight.Value = LoadSetting ? cff.WindowStartup.WindowSizeHeight : UI.WindowStartup.WindowSizeHeight.Value;
-            UI.WindowStartup.WindowPositionX.Value = LoadSetting ? cff.WindowStartup.WindowPositionX : UI.WindowStartup.WindowPositionX.Value;
-            UI.WindowStartup.WindowPositionY.Value = LoadSetting ? cff.WindowStartup.WindowPositionY : UI.WindowStartup.WindowPositionY.Value;
-            UI.WindowStartup.WindowMaximized.Value = LoadSetting ? cff.WindowStartup.WindowMaximized : UI.WindowStartup.WindowMaximized.Value;
+            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;
 
 
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;
-            Hid.Hotkeys.Value = LoadSetting ? cff.Hotkeys : Hid.Hotkeys.Value; // Get from global config only
+            Hid.Hotkeys.Value = shouldLoadFromFile ? cff.Hotkeys : Hid.Hotkeys.Value; // Get from global config only
             Hid.InputConfig.Value = cff.InputConfig ?? [];
             Hid.RainbowSpeed.Value = cff.RainbowSpeed;
 

From 2dd787fb7ba849013750fea0e03b6b282153bcb8 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Wed, 12 Feb 2025 16:00:37 +1000
Subject: [PATCH 19/20] Changed: Hid.DisableInputWhenOutOfFocus only for global
 config

---
 .../Utilities/Configuration/ConfigurationState.Migration.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
index f1fcf7fcf..386abcbe5 100644
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -147,7 +147,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
 
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;
-            Hid.DisableInputWhenOutOfFocus.Value = cff.DisableInputWhenOutOfFocus;
+            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.InputConfig.Value = cff.InputConfig ?? [];
             Hid.RainbowSpeed.Value = cff.RainbowSpeed;

From 1dedf4c8d53f6694e7780d39b86ad4b68fd65865 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Thu, 13 Feb 2025 16:34:03 +1000
Subject: [PATCH 20/20] fixed: when loading a game with a custom configuration
 via a shortcut or rebooting, when entering the settings menu, a menu for
 global configuration was displayed.

---
 src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs | 7 ++++++-
 src/Ryujinx/UI/Windows/MainWindow.axaml.cs       | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index d881bff98..5eca7f498 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -355,6 +355,11 @@ namespace Ryujinx.Ava.UI.ViewModels
                     _ => null,
                 };
             }
+            set
+            {
+                ListSelectedApplication = value;
+                GridSelectedApplication = value;
+            }        
         }
 
         public bool HasCompatibilityEntry => SelectedApplication.HasPlayabilityInfo;
@@ -1541,7 +1546,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 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))
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index 8f50aa965..bf55fac57 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -223,7 +223,7 @@ namespace Ryujinx.Ava.UI.Windows
             _deferLoad = true;
             _launchPath = launchPathArg;
             _launchApplicationId = launchApplicationId;
-            _startFullscreen = startFullscreenArg;
+            _startFullscreen = startFullscreenArg;          
         }
 
         public void SwitchToGameControl(bool startFullscreen = false)
@@ -374,6 +374,7 @@ namespace Ryujinx.Ava.UI.Windows
 
                             if (applicationData != null)
                             {
+                                ViewModel.SelectedApplication = applicationData;
                                 await ViewModel.LoadApplication(applicationData, _startFullscreen);
                             }
                             else
@@ -385,6 +386,7 @@ namespace Ryujinx.Ava.UI.Windows
                         else
                         {
                             applicationData = applications[0];
+                            ViewModel.SelectedApplication = applicationData;
                             await ViewModel.LoadApplication(applicationData, _startFullscreen);
                         }
                     }