Add support for alpha to coverage dithering (#3069)

* Add support for alpha to coverage dithering

* Shader cache version bump

* Fix wrong alpha register

* Ensure support buffer is cleared

* New shader specialization based approach

ARMeilleure/IntermediateRepresentation/Operand.cs

@@ -14,10 +14,11 @@ namespace ARMeilleure.IntermediateRepresentation
             public byte Kind;
             public byte Type;
             public byte SymbolType;
+            public byte Padding; // Unused space.
             public ushort AssignmentsCount;
             public ushort AssignmentsCapacity;
-            public ushort UsesCount;
-            public ushort UsesCapacity;
+            public uint UsesCount;
+            public uint UsesCapacity;
             public Operation* Assignments;
             public Operation* Uses;
             public ulong Value;
@@ -84,11 +85,11 @@ namespace ARMeilleure.IntermediateRepresentation
             {
                 Debug.Assert(Kind != OperandKind.Memory);
 
-                return new ReadOnlySpan<Operation>(_data->Uses, _data->UsesCount);
+                return new ReadOnlySpan<Operation>(_data->Uses, (int)_data->UsesCount);
             }
         }
 
-        public int UsesCount => _data->UsesCount;
+        public int UsesCount => (int)_data->UsesCount;
         public int AssignmentsCount => _data->AssignmentsCount;
 
         public bool Relocatable => Symbol.Type != SymbolType.None;
@@ -178,7 +179,7 @@ namespace ARMeilleure.IntermediateRepresentation
                 {
                     Add(operation, ref addr._data->Assignments, ref addr._data->AssignmentsCount, ref addr._data->AssignmentsCapacity);
                 }
-                
+
                 if (index != default)
                 {
                     Add(operation, ref index._data->Assignments, ref index._data->AssignmentsCount, ref index._data->AssignmentsCapacity);
@@ -265,6 +266,13 @@ namespace ARMeilleure.IntermediateRepresentation
             data = Allocators.References.Allocate<T>(initialCapacity);
         }
 
+        private static void New<T>(ref T* data, ref uint count, ref uint capacity, uint initialCapacity) where T : unmanaged
+        {
+            count = 0;
+            capacity = initialCapacity;
+            data = Allocators.References.Allocate<T>(initialCapacity);
+        }
+
         private static void Add<T>(T item, ref T* data, ref ushort count, ref ushort capacity) where T : unmanaged
         {
             if (count < capacity)
@@ -294,6 +302,40 @@ namespace ARMeilleure.IntermediateRepresentation
             }
         }
 
+        private static void Add<T>(T item, ref T* data, ref uint count, ref uint capacity) where T : unmanaged
+        {
+            if (count < capacity)
+            {
+                data[count++] = item;
+
+                return;
+            }
+
+            // Could not add item in the fast path, fallback onto the slow path.
+            ExpandAdd(item, ref data, ref count, ref capacity);
+
+            static void ExpandAdd(T item, ref T* data, ref uint count, ref uint capacity)
+            {
+                uint newCount = checked(count + 1);
+                uint newCapacity = (uint)Math.Min(capacity * 2, int.MaxValue);
+
+                if (newCapacity <= capacity)
+                {
+                    throw new OverflowException();
+                }
+
+                var oldSpan = new Span<T>(data, (int)count);
+
+                capacity = newCapacity;
+                data = Allocators.References.Allocate<T>(capacity);
+
+                oldSpan.CopyTo(new Span<T>(data, (int)count));
+
+                data[count] = item;
+                count = newCount;
+            }
+        }
+
         private static void Remove<T>(in T item, ref T* data, ref ushort count) where T : unmanaged
         {
             var span = new Span<T>(data, count);
@@ -314,6 +356,26 @@ namespace ARMeilleure.IntermediateRepresentation
             }
         }
 
+        private static void Remove<T>(in T item, ref T* data, ref uint count) where T : unmanaged
+        {
+            var span = new Span<T>(data, (int)count);
+
+            for (int i = 0; i < span.Length; i++)
+            {
+                if (EqualityComparer<T>.Default.Equals(span[i], item))
+                {
+                    if (i + 1 < count)
+                    {
+                        span.Slice(i + 1).CopyTo(span.Slice(i));
+                    }
+
+                    count--;
+
+                    return;
+                }
+            }
+        }
+
         public override int GetHashCode()
         {
             if (Kind == OperandKind.LocalVariable)

Ryujinx.Ava/App.axaml

@@ -1,9 +1,9 @@
 <Application
     x:Class="Ryujinx.Ava.App"
     xmlns="https://github.com/avaloniaui"
-    xmlns:sty="using:FluentAvalonia.Styling"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sty="using:FluentAvalonia.Styling">
     <Application.Styles>
-        <sty:FluentAvaloniaTheme UseSystemThemeOnWindows="False"/>
+        <sty:FluentAvaloniaTheme UseSystemThemeOnWindows="False" />
     </Application.Styles>
 </Application>

Ryujinx.Ava/App.axaml.cs

@@ -4,16 +4,19 @@ using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.Styling;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Ui.Controls;
 using Ryujinx.Ava.Ui.Windows;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using Ryujinx.Ui.Common.Configuration;
 using System;
+using System.Diagnostics;
 using System.IO;
 
 namespace Ryujinx.Ava
 {
-    public class App : Avalonia.Application
+    public class App : Application
     {
         public override void Initialize()
         {
@@ -46,7 +49,30 @@ namespace Ryujinx.Ava
 
         private void ShowRestartDialog()
         {
-            // TODO. Implement Restart Dialog when SettingsWindow is implemented.
+#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+            Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                {
+                    var result = await ContentDialogHelper.CreateConfirmationDialog(
+                        (desktop.MainWindow as MainWindow).SettingsWindow,
+                        LocaleManager.Instance["DialogThemeRestartMessage"],
+                        LocaleManager.Instance["DialogThemeRestartSubMessage"],
+                        LocaleManager.Instance["InputDialogYes"],
+                        LocaleManager.Instance["InputDialogNo"],
+                        LocaleManager.Instance["DialogRestartRequiredMessage"]);
+
+                    if (result == UserResult.Yes)
+                    {
+                        var path = Process.GetCurrentProcess().MainModule.FileName;
+                        var info = new ProcessStartInfo() { FileName = path, UseShellExecute = false };
+                        var proc = Process.Start(info);
+                        desktop.Shutdown();
+                        Environment.Exit(0);
+                    }
+                }
+            });
+#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
         }
 
         private void ThemeChanged_Event(object sender, ReactiveEventArgs<string> e)

Ryujinx.Ava/AppHost.cs

@@ -50,14 +50,14 @@ using WindowState = Avalonia.Controls.WindowState;
 
 namespace Ryujinx.Ava
 {
-    public class AppHost
+    internal class AppHost
     {
         private const int CursorHideIdleTime = 8; // Hide Cursor seconds
 
         private static readonly Cursor InvisibleCursor = new Cursor(StandardCursorType.None);
 
         private readonly AccountManager _accountManager;
-        private UserChannelPersistence _userChannelPersistence;
+        private readonly UserChannelPersistence _userChannelPersistence;
 
         private readonly InputManager _inputManager;
 
@@ -82,7 +82,6 @@ namespace Ryujinx.Ava
         private bool _dialogShown;
 
         private WindowsMultimediaTimerResolution _windowsMultimediaTimerResolution;
-        private KeyboardStateSnapshot _lastKeyboardSnapshot;
 
         private readonly CancellationTokenSource _gpuCancellationTokenSource;
 
@@ -126,7 +125,6 @@ namespace Ryujinx.Ava
             _glLogLevel = ConfigurationState.Instance.Logger.GraphicsDebugLevel;
             _inputManager.SetMouseDriver(new AvaloniaMouseDriver(renderer));
             _keyboardInterface = (IKeyboard)_inputManager.KeyboardDriver.GetGamepad("0");
-            _lastKeyboardSnapshot = _keyboardInterface.GetKeyboardStateSnapshot();
 
             NpadManager = _inputManager.CreateNpadManager();
             TouchScreenManager = _inputManager.CreateTouchScreenManager();
@@ -722,9 +720,7 @@ namespace Ryujinx.Ava
                 }
             }
 
-            var memoryConfiguration = ConfigurationState.Instance.System.ExpandRam.Value
-                ? HLE.MemoryConfiguration.MemoryConfiguration6GB
-                : HLE.MemoryConfiguration.MemoryConfiguration4GB;
+            var memoryConfiguration = ConfigurationState.Instance.System.ExpandRam.Value ? HLE.MemoryConfiguration.MemoryConfiguration6GB : HLE.MemoryConfiguration.MemoryConfiguration4GB;
 
             IntegrityCheckLevel fsIntegrityCheckLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None;
 
@@ -898,7 +894,7 @@ namespace Ryujinx.Ava
             }
         }
 
-        private void HandleScreenState(KeyboardStateSnapshot keyboard, KeyboardStateSnapshot lastKeyboard)
+        private void HandleScreenState()
         {
             if (ConfigurationState.Instance.Hid.EnableMouse)
             {
@@ -935,19 +931,12 @@ namespace Ryujinx.Ava
             {
                 Dispatcher.UIThread.Post(() =>
                 {
-                    KeyboardStateSnapshot keyboard = _keyboardInterface.GetKeyboardStateSnapshot();
+                    HandleScreenState();
 
-                    HandleScreenState(keyboard, _lastKeyboardSnapshot);
-
-                    if (keyboard.IsPressed(Key.Delete))
+                    if (_keyboardInterface.GetKeyboardStateSnapshot().IsPressed(Key.Delete) && _parent.WindowState != WindowState.FullScreen)
                     {
-                        if (_parent.WindowState != WindowState.FullScreen)
-                        {
-                            Ptc.Continue();
-                        }
+                        Ptc.Continue();
                     }
-
-                    _lastKeyboardSnapshot = keyboard;
                 });
             }
 

Ryujinx.Ava/Assets/Locales/de_DE.json

@@ -20,7 +20,7 @@
   "MenuBarOptionsManageUserProfiles": "_Profilverwaltung",
   "MenuBarActions": "_Aktionen",
   "MenuBarOptionsSimulateWakeUpMessage": "Aufwachnachricht",
-  "MenuBarActionsScanAmiibo": "Amiibo scannen",
+  "MenuBarActionsScanAmiibo": "Virtualisiere Amiibo",
   "MenuBarTools": "_Werkzeuge",
   "MenuBarToolsInstallFirmware": "Firmware installieren",
   "MenuBarFileToolsInstallFirmwareFromFile": "Installiere Firmware von einer XCI oder einer ZIP Datei",
@@ -242,9 +242,7 @@
   "ControllerSettingsExtraButtonsRight": "Rechte Aktionstasten",
   "ControllerSettingsMisc": "Verschiedenes",
   "ControllerSettingsTriggerThreshold": "Empfindlichkeit:",
-  "ControllerSettingsMotion": "Bewegungssteuerung",
-  "ControllerSettingsCemuHook": "CemuHook",
-  "ControllerSettingsMotionEnableMotionControls": "Aktiviere Bewegungssteuerung",
+  "ControllerSettingsMotion": "Bewegung",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "CemuHook kompatible Bewegungssteuerung",
   "ControllerSettingsMotionControllerSlot": "Controller Slot:",
   "ControllerSettingsMotionMirrorInput": "Spiegele Eingabe",
@@ -290,9 +288,8 @@
   "SettingsTabGeneralThemeBaseStyleLight": "Hell",
   "SettingsTabGeneralThemeEnableCustomTheme": "Benutzerdefiniertes Thema",
   "ButtonBrowse": "Durchsuchen",
-  "ControllerSettingsMotionConfigureCemuHookSettings": "CemuHook Motion konfigurieren",
+  "ControllerSettingsConfigureGeneral": "Konfigurieren",
   "ControllerSettingsRumble": "Vibration",
-  "ControllerSettingsRumbleEnable": "Aktiviere Vibration",
   "ControllerSettingsRumbleStrongMultiplier": "Starke Vibration - Multiplikator",
   "ControllerSettingsRumbleWeakMultiplier": "Schwache Vibration - Multiplikator",
   "DialogMessageSaveNotAvailableMessage": "Es existieren keine Speicherdaten für {0} [{1:x16}]",
@@ -329,7 +326,7 @@
   "DialogUpdaterNoInternetMessage": "Es besteht keine Verbindung mit dem Internet!",
   "DialogUpdaterNoInternetSubMessage": "Bitte vergewissern, dass eine funktionierende Internetverbindung existiert!",
   "DialogUpdaterDirtyBuildMessage": "Inoffizielle Versionen von Ryujinx können nicht aktualisiert werden",
-  "DialogUpdaterDirtyBuildSubMessage": "Für eine unterstütze Version: Ryujinx bitte von hier herunterladen https://ryujinx.org/",
+  "DialogUpdaterDirtyBuildSubMessage": "Lade Ryujinx bitte von hier herunter, um eine unterstützte Version zu erhalten: https://ryujinx.org/",
   "DialogRestartRequiredMessage": "Neustart erforderlich",
   "DialogThemeRestartMessage": "Das Thema wurde gespeichert. Ein Neustart ist erforderlich, um das Thema anzuwenden.",
   "DialogThemeRestartSubMessage": "Jetzt neu starten?",
@@ -485,15 +482,13 @@
   "EnableInternetAccessTooltip": "Aktiviert den Gast-Internet-Zugang. Die Anwendung verhält sich so, als ob die emulierte Switch-Konsole mit dem Internet verbunden wäre. Beachte, dass in einigen Fällen Anwendungen auch bei deaktivierter Option auf das Internet zugreifen können",
   "GameListContextMenuManageCheatToolTip": "Öffnet den Cheat-Manager",
   "GameListContextMenuManageCheat": "Cheats verwalten",
-  "ControllerSettingsStickRange": "Bereich",
+  "ControllerSettingsStickRange": "Bereich:",
   "DialogStopEmulationTitle": "Ryujinx - Beende Emulation",
   "DialogStopEmulationMessage": "Emulation wirklich beenden?",
   "SettingsTabCpu": "CPU",
   "SettingsTabAudio": "Audio",
   "SettingsTabNetwork": "Netzwerk",
   "SettingsTabNetworkConnection": "Netwerkverbindung",
-  "SettingsTabGraphicsFrameRate": "Host Aktualisierungsrate:",
-  "SettingsTabGraphicsFrameRateTooltip": "Aktiviert die Host Aktualisierungsrate. Auf 0 setzen, um den Grenzwert aufzuheben.",
   "SettingsTabCpuCache": "CPU-Cache",
   "SettingsTabCpuMemory": "CPU-Speicher",
   "DialogUpdaterFlatpakNotSupportedMessage": "Bitte Aktualisiere Ryujinx mit FlatHub",
@@ -544,6 +539,22 @@
   "LoadingHeading": "{0} wird gestartet",
   "CompilingPPTC": "PTC wird kompiliert",
   "CompilingShaders": "Shader werden kompiliert",
+  "AllKeyboards": "Alle Tastaturen",
+  "OpenFileDialogTitle": "Wähle eine unterstützte Datei",
+  "OpenFolderDialogTitle": "Wähle einen Ordner mit einem entpackten Spiel",
+  "AllSupportedFormats": "Alle unterstützten Formate",
+  "RyujinxUpdater": "Ryujinx - Updater",
+  "SettingsTabHotkeys": "Tastatur Hotkeys",
+  "SettingsTabHotkeysHotkeys": "Tastatur Hotkeys",
+  "SettingsTabHotkeysToggleVsyncHotkey": "Aktiviert/Deaktiviert VSync:",
+  "SettingsTabHotkeysScreenshotHotkey": "Screenshot:",
+  "SettingsTabHotkeysShowUiHotkey": "Zeige UI:",
+  "SettingsTabHotkeysPauseHotkey": "Pausieren:",
+  "SettingsTabHotkeysToggleMuteHotkey": "Stummschalten:",
+  "ControllerMotionTitle": "Bewegungssteuerung - Einstellungen",
+  "ControllerRumbleTitle": "Vibration - Einstellungen",
+  "SettingsSelectThemeFileDialogTitle" : "Wähle ein benutzerdefiniertes Thema",
+  "SettingsXamlThemeFile" : "Xaml Thema-Datei",
   "SettingsTabGraphicsBackend" : "Grafik-Backend",
   "GraphicsBackendTooltip" : "Ändert das Grafik-Backend"
 }

Ryujinx.Ava/Assets/Locales/el_GR.json

@@ -243,8 +243,6 @@
   "ControllerSettingsMisc": "Διάφορα",
   "ControllerSettingsTriggerThreshold": "Κατώφλι Σκανδάλης:",
   "ControllerSettingsMotion": "Κίνηση",
-  "ControllerSettingsCemuHook": "CemuHook",
-  "ControllerSettingsMotionEnableMotionControls": "Ενεργοποίηση Κίνησης",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "Κίνηση συμβατή με CemuHook",
   "ControllerSettingsMotionControllerSlot": "Υποδοχή Χειριστηρίου:",
   "ControllerSettingsMotionMirrorInput": "Καθρεπτισμός Χειρισμού",
@@ -290,9 +288,8 @@
   "SettingsTabGeneralThemeBaseStyleLight": "Ανοιχτό",
   "SettingsTabGeneralThemeEnableCustomTheme": "Ενεργοποίηση Προσαρμοσμένου Θέματος",
   "ButtonBrowse": "Αναζήτηση",
-  "ControllerSettingsMotionConfigureCemuHookSettings": "Ρύθμιση Παραμέτρων Κίνησης CemuHook",
+  "ControllerSettingsConfigureGeneral": "Παραμέτρων",
   "ControllerSettingsRumble": "Δόνηση",
-  "ControllerSettingsRumbleEnable": "Ενεργοποίηση Δόνησης",
   "ControllerSettingsRumbleStrongMultiplier": "Ισχυρός Πολλαπλασιαστής Δόνησης",
   "ControllerSettingsRumbleWeakMultiplier": "Αδύναμος Πολλαπλασιαστής Δόνησης",
   "DialogMessageSaveNotAvailableMessage": "Δεν υπάρχουν αποθηκευμένα δεδομένα για το {0} [{1:x16}]",
@@ -485,15 +482,15 @@
   "EnableInternetAccessTooltip": "Επιτρέπει την πρόσβαση επισκέπτη στο Διαδίκτυο. Εάν ενεργοποιηθεί, η εξομοιωμένη κονσόλα Switch θα συμπεριφέρεται σαν να είναι συνδεδεμένη στο Διαδίκτυο. Λάβετε υπόψη ότι σε ορισμένες περιπτώσεις, οι εφαρμογές ενδέχεται να εξακολουθούν να έχουν πρόσβαση στο Διαδίκτυο, ακόμη και όταν αυτή η επιλογή είναι απενεργοποιημένη",
   "GameListContextMenuManageCheatToolTip" : "Διαχείριση Κόλπων",
   "GameListContextMenuManageCheat" : "Διαχείριση Κόλπων",
-  "ControllerSettingsStickRange" : "Εύρος",
+  "ControllerSettingsStickRange" : "Εύρος:",
   "DialogStopEmulationTitle" : "Ryujinx - Διακοπή εξομοίωσης",
   "DialogStopEmulationMessage": "Είστε βέβαιοι ότι θέλετε να σταματήσετε την εξομοίωση;",
   "SettingsTabCpu": "Επεξεργαστής",
   "SettingsTabAudio": "Ήχος",
   "SettingsTabNetwork": "Δίκτυο",
   "SettingsTabNetworkConnection" : "Σύνδεση δικτύου",
-  "SettingsTabGraphicsFrameRate" : "Ρυθμός Ανανέωσης Υπολογιστή:",
-  "SettingsTabGraphicsFrameRateTooltip" : "Προκαθορίζει το ρυθμό ανανέωσης του υπολογιστή. Ορίστε το στο 0 για να αφαιρέσετε το όριο.",
   "SettingsTabCpuCache" : "Προσωρινή Μνήμη CPU",
-  "SettingsTabCpuMemory" : "Μνήμη CPU"
+  "SettingsTabCpuMemory" : "Μνήμη CPU",
+  "ControllerMotionTitle": "Motion Control Settings",
+  "ControllerRumbleTitle": "Rumble Settings"
 }

Ryujinx.Ava/Assets/Locales/en_US.json

@@ -243,8 +243,6 @@
   "ControllerSettingsMisc": "Miscellaneous",
   "ControllerSettingsTriggerThreshold": "Trigger Threshold:",
   "ControllerSettingsMotion": "Motion",
-  "ControllerSettingsCemuHook": "CemuHook",
-  "ControllerSettingsMotionEnableMotionControls": "Enable Motion Controls",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "Use CemuHook compatible motion",
   "ControllerSettingsMotionControllerSlot": "Controller Slot:",
   "ControllerSettingsMotionMirrorInput": "Mirror Input",
@@ -290,9 +288,8 @@
   "SettingsTabGeneralThemeBaseStyleLight": "Light",
   "SettingsTabGeneralThemeEnableCustomTheme": "Enable Custom Theme",
   "ButtonBrowse": "Browse",
-  "ControllerSettingsMotionConfigureCemuHookSettings": "Configure CemuHook Motion",
+  "ControllerSettingsConfigureGeneral": "Configure",
   "ControllerSettingsRumble": "Rumble",
-  "ControllerSettingsRumbleEnable": "Enable Rumble",
   "ControllerSettingsRumbleStrongMultiplier": "Strong Rumble Multiplier",
   "ControllerSettingsRumbleWeakMultiplier": "Weak Rumble Multiplier",
   "DialogMessageSaveNotAvailableMessage": "There is no savedata for {0} [{1:x16}]",
@@ -485,15 +482,13 @@
   "EnableInternetAccessTooltip": "Enables guest Internet access. If enabled, the application will behave as if the emulated Switch console was connected to the Internet. Note that in some cases, applications may still access the Internet even with this option disabled",
   "GameListContextMenuManageCheatToolTip": "Manage Cheats",
   "GameListContextMenuManageCheat": "Manage Cheats",
-  "ControllerSettingsStickRange": "Range",
+  "ControllerSettingsStickRange": "Range:",
   "DialogStopEmulationTitle": "Ryujinx - Stop Emulation",
   "DialogStopEmulationMessage": "Are you sure you want to stop emulation?",
   "SettingsTabCpu": "CPU",
   "SettingsTabAudio": "Audio",
   "SettingsTabNetwork": "Network",
   "SettingsTabNetworkConnection": "Network Connection",
-  "[REMOVE]SettingsTabGraphicsFrameRate": "Host Refresh Rate:",
-  "[REMOVE]SettingsTabGraphicsFrameRateTooltip": "Sets host refresh rate. Set to 0 to remove limit.",
   "SettingsTabCpuCache": "CPU Cache",
   "SettingsTabCpuMemory": "CPU Memory",
   "DialogUpdaterFlatpakNotSupportedMessage": "Please update Ryujinx via FlatHub.",
@@ -548,5 +543,16 @@
   "OpenFileDialogTitle": "Select a supported file to open",
   "OpenFolderDialogTitle": "Select a folder with an unpacked game",
   "AllSupportedFormats": "All Supported Formats",
-  "RyujinxUpdater": "Ryujinx Updater"
+  "RyujinxUpdater": "Ryujinx Updater",
+  "SettingsTabHotkeys": "Keyboard Hotkeys",
+  "SettingsTabHotkeysHotkeys": "Keyboard Hotkeys",
+  "SettingsTabHotkeysToggleVsyncHotkey": "Toggle VSync:",
+  "SettingsTabHotkeysScreenshotHotkey": "Screenshot:",
+  "SettingsTabHotkeysShowUiHotkey": "Show UI:",
+  "SettingsTabHotkeysPauseHotkey": "Pause:",
+  "SettingsTabHotkeysToggleMuteHotkey": "Mute:",
+  "ControllerMotionTitle": "Motion Control Settings",
+  "ControllerRumbleTitle": "Rumble Settings",
+  "SettingsSelectThemeFileDialogTitle" : "Select Theme File",
+  "SettingsXamlThemeFile" : "Xaml Theme File"
 }

Ryujinx.Ava/Assets/Locales/es_ES.json

@@ -242,8 +242,6 @@
   "ControllerSettingsMisc": "Misceláneo",
   "ControllerSettingsTriggerThreshold": "Límite de gatillos:",
   "ControllerSettingsMotion": "Movimiento",
-  "ControllerSettingsCemuHook": "CemuHook",
-  "ControllerSettingsMotionEnableMotionControls": "Habilitar controles por movimiento",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "Usar movimiento compatible con CemuHook",
   "ControllerSettingsMotionControllerSlot": "Puerto del mando:",
   "ControllerSettingsMotionMirrorInput": "Paralelizar derecho e izquierdo",
@@ -289,9 +287,8 @@
   "SettingsTabGeneralThemeBaseStyleLight": "Claro",
   "SettingsTabGeneralThemeEnableCustomTheme": "Habilitar tema personalizado",
   "ButtonBrowse": "Buscar",
-  "ControllerSettingsMotionConfigureCemuHookSettings": "Configurar controles por movimiento de CemuHook",
+  "ControllerSettingsConfigureGeneral": "Configurar",
   "ControllerSettingsRumble": "Vibración",
-  "ControllerSettingsRumbleEnable": "Habilitar vibraciones",
   "ControllerSettingsRumbleStrongMultiplier": "Multiplicador de vibraciones fuertes",
   "ControllerSettingsRumbleWeakMultiplier": "Multiplicador de vibraciones débiles",
   "DialogMessageSaveNotAvailableMessage": "No hay datos de guardado para {0} [{1:x16}]",
@@ -483,15 +480,15 @@
   "EnableInternetAccessTooltip": "Activa el acceso a Internet del guest. Cuando esté activo, la aplicación actuará como si la Nintendo Switch emulada estuviese conectada a Internet. Ten en cuenta que algunas aplicaciones pueden intentar acceder a Internet incluso con esta opción desactivada.",
   "GameListContextMenuManageCheatToolTip" : "Activa o desactiva los cheats",
   "GameListContextMenuManageCheat" : "Administrar cheats",
-  "ControllerSettingsStickRange" : "Alcance",
+  "ControllerSettingsStickRange" : "Alcance:",
   "DialogStopEmulationTitle" : "Ryujinx - Detener emulación",
   "DialogStopEmulationMessage": "¿Seguro que quieres detener la emulación actual?",
   "SettingsTabCpu": "CPU",
   "SettingsTabAudio": "Audio",
   "SettingsTabNetwork": "Red",
   "SettingsTabNetworkConnection" : "Conexión de red",
-  "SettingsTabGraphicsFrameRate" : "Velocidad máxima de fotogramas:",
-  "SettingsTabGraphicsFrameRateTooltip" : "Fija el límite de fotogramas del host. Elige 0 para deshabilitar el límite.",
   "SettingsTabCpuCache" : "Caché de CPU",
-  "SettingsTabCpuMemory" : "Memoria de CPU"
+  "SettingsTabCpuMemory" : "Memoria de CPU",
+  "ControllerMotionTitle": "Motion Control Settings",
+  "ControllerRumbleTitle": "Rumble Settings"
 }

Ryujinx.Ava/Assets/Locales/fr_FR.json

@@ -235,8 +235,7 @@
   "ControllerSettingsMisc": "Divers",
   "ControllerSettingsTriggerThreshold": "Seuil de gachettes:",
   "ControllerSettingsMotion": "Mouvements",
-  "ControllerSettingsCemuHook": "CemuHook",
-  "ControllerSettingsMotionEnableMotionControls": "Activer le capteur de mouvements",
+  "ControllerSettingsConfigureGeneral": "Configurer",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "Utiliser un capteur de mouvements CemuHook",
   "ControllerSettingsMotionControllerSlot": "Contrôleur ID:",
   "ControllerSettingsMotionMirrorInput": "Inverser les contrôles",
@@ -266,5 +265,7 @@
   "InputDialogAddNewProfileSubtext": "(Longueur max.: {0})",
   "AvatarChoose": "Choisir",
   "AvatarSetBackgroundColor": "Choisir une couleur de fond",
-  "AvatarClose": "Fermer"
+  "AvatarClose": "Fermer",
+  "ControllerMotionTitle": "Motion Control Settings",
+  "ControllerRumbleTitle": "Rumble Settings"
 }

Ryujinx.Ava/Assets/Locales/it_IT.json

@@ -243,8 +243,6 @@
     "ControllerSettingsMisc": "Miscellanee",
     "ControllerSettingsTriggerThreshold": "Sensibilità dei grilletti:",
     "ControllerSettingsMotion": "Movimento",
-    "ControllerSettingsCemuHook": "CemuHook",
-    "ControllerSettingsMotionEnableMotionControls": "Attiva sensore di movimento",
     "ControllerSettingsMotionUseCemuhookCompatibleMotion": "Usa sensore compatibile con CemuHook",
     "ControllerSettingsMotionControllerSlot": "Slot del controller:",
     "ControllerSettingsMotionMirrorInput": "Input specchiato",
@@ -290,9 +288,8 @@
     "SettingsTabGeneralThemeBaseStyleLight": "Chiara",
     "SettingsTabGeneralThemeEnableCustomTheme": "Attiva tema personalizzato",
     "ButtonBrowse": "Sfoglia",
-    "ControllerSettingsMotionConfigureCemuHookSettings": "Configura movimento CemuHook",
+    "ControllerSettingsConfigureGeneral": "Configura",
     "ControllerSettingsRumble": "Vibrazione",
-    "ControllerSettingsRumbleEnable": "Attiva vibrazione",
     "ControllerSettingsRumbleStrongMultiplier": "Moltiplicatore vibrazione forte",
     "ControllerSettingsRumbleWeakMultiplier": "Moltiplicatore vibrazione debole",
     "DialogMessageSaveNotAvailableMessage": "Non ci sono dati di salvataggio per {0} [{1:x16}]",
@@ -461,7 +458,7 @@
     "TraceLogTooltip": "Attiva messaggi trace log",
     "GuestLogTooltip": "Attiva messaggi guest log",
     "FileAccessLogTooltip": "Attiva messaggi file access log",
-    "FSAccessLogModeTooltip": "Attiva output FS access log alla console. Le mpdalità possibili sono 0-3",
+    "FSAccessLogModeTooltip": "Attiva output FS access log alla console. Le modalità possibili sono 0-3",
     "DeveloperOptionTooltip": "Usa con attenzione",
     "OpenGlLogLevel": "Richiede livelli di log appropriati abilitati",
     "DebugLogTooltip": "Attiva messaggi debug log",
@@ -485,15 +482,13 @@
     "EnableInternetAccessTooltip": "Attiva il guest Internet access. Se abilitato, l'applicazione si comporterà come se la console Switch emulata fosse collegata a Internet. Si noti che in alcuni casi, le applicazioni possono comunque accedere a Internet anche con questa opzione disabilitata",
     "GameListContextMenuManageCheatToolTip": "Gestisci Cheats",
     "GameListContextMenuManageCheat": "Gestisci Cheats",
-    "ControllerSettingsStickRange": "Raggio",
+    "ControllerSettingsStickRange": "Raggio:",
     "DialogStopEmulationTitle": "Ryujinx - Ferma emulazione",
     "DialogStopEmulationMessage": "Sei sicuro di voler fermare l'emulazione?",
     "SettingsTabCpu": "CPU",
     "SettingsTabAudio": "Audio",
     "SettingsTabNetwork": "Rete",
     "SettingsTabNetworkConnection": "Connessione di rete",
-    "SettingsTabGraphicsFrameRate": "Frequenza di aggiornamento dell'host:",
-    "SettingsTabGraphicsFrameRateTooltip": "Imposta la frequenza di aggiornamento dell'host. Imposta a 0 per rimuovere il limite.",
     "SettingsTabCpuCache": "Cache CPU",
     "SettingsTabCpuMemory": "Memoria CPU",
     "DialogUpdaterFlatpakNotSupportedMessage": "Per favore aggiorna Ryujinx via FlatHub.",
@@ -543,5 +538,21 @@
     "ApiError": "Errore dell'API.",
     "LoadingHeading": "Caricamento di {0}",
     "CompilingPPTC": "Compilazione PTC",
-    "CompilingShaders": "Compilazione Shaders"
+    "CompilingShaders": "Compilazione Shaders",
+    "AllKeyboards": "Tutte le tastiere",
+    "OpenFileDialogTitle": "Seleziona un file supportato da aprire",
+    "OpenFolderDialogTitle": "Seleziona una cartella con un gioco estratto",
+    "AllSupportedFormats": "Tutti i formati supportati",
+    "RyujinxUpdater": "Ryujinx Updater",
+    "SettingsTabHotkeys": "Tasti di scelta rapida",
+    "SettingsTabHotkeysHotkeys": "Tasti di scelta rapida",
+    "SettingsTabHotkeysToggleVsyncHotkey": "VSync:",
+    "SettingsTabHotkeysScreenshotHotkey": "Screenshot:",
+    "SettingsTabHotkeysShowUiHotkey": "Mostra UI:",
+    "SettingsTabHotkeysPauseHotkey": "Metti in pausa:",
+    "SettingsTabHotkeysToggleMuteHotkey": "Muta:",
+    "ControllerMotionTitle": "Impostazioni dei sensori di movimento",
+    "ControllerRumbleTitle": "Impostazioni di vibrazione",
+    "SettingsSelectThemeFileDialogTitle" : "Seleziona file del tema",
+    "SettingsXamlThemeFile" : "File del tema xaml"
 }

Ryujinx.Ava/Assets/Locales/ko_KR.json

@@ -242,8 +242,6 @@
   "ControllerSettingsMisc": "여러 가지 잡다한",
   "ControllerSettingsTriggerThreshold": "트리거 임계값 :",
   "ControllerSettingsMotion": "운동",
-  "ControllerSettingsCemuHook": "CemuHook",
-  "ControllerSettingsMotionEnableMotionControls": "모션 컨트롤 활성화",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "CemuHook 호환 모션 사용",
   "ControllerSettingsMotionControllerSlot": "컨트롤러 슬롯 :",
   "ControllerSettingsMotionMirrorInput": "미러 입력",
@@ -289,9 +287,8 @@
   "SettingsTabGeneralThemeBaseStyleLight": "빛",
   "SettingsTabGeneralThemeEnableCustomTheme": "사용자 정의 테마 활성화",
   "ButtonBrowse": "검색",
-  "ControllerSettingsMotionConfigureCemuHookSettings": "CemuHook 모션 구성",
+  "ControllerSettingsConfigureGeneral": "션 구성",
   "ControllerSettingsRumble": "하인 좌석",
-  "ControllerSettingsRumbleEnable": "럼블을 활성화",
   "ControllerSettingsRumbleStrongMultiplier": "강력한 럼블 배율기",
   "ControllerSettingsRumbleWeakMultiplier": "약한 럼블 승수",
   "DialogMessageSaveNotAvailableMessage": "에 대한 세이브 데이터가 없습니다 {0} [{1:x16}]",
@@ -483,15 +480,15 @@
   "EnableInternetAccessTooltip": "게스트 인터넷 액세스를 활성화합니다. 활성화된 경우 응용 프로그램은 에뮬레이트된 스위치 콘솔이 인터넷에 연결된 것처럼 작동합니다. 경우에 따라 이 옵션이 비활성화된 경우에도 응용 프로그램이 인터넷에 계속 액세스할 수 있습니다",
   "GameListContextMenuManageCheatToolTip" : "치트 관리",
   "GameListContextMenuManageCheat" : "치트 관리",
-  "ControllerSettingsStickRange" : "범위",
+  "ControllerSettingsStickRange" : "범위:",
   "DialogStopEmulationTitle" : "Ryujinx - 에뮬레이션 중지",
   "DialogStopEmulationMessage": "에뮬레이션을 중지하시겠습니까?",
   "SettingsTabCpu": "CPU",
   "SettingsTabAudio": "오디오",
   "SettingsTabNetwork": "회로망",
   "SettingsTabNetworkConnection" : "네트워크 연결",
-  "SettingsTabGraphicsFrameRate" : "호스트 새로 고침 빈도 :",
-  "SettingsTabGraphicsFrameRateTooltip" : "호스트 새로 고침 빈도를 설정합니다. 제한을 제거하려면 0으로 설정하십시오.",
   "SettingsTabCpuCache" : "CPU 캐시",
-  "SettingsTabCpuMemory" : "CPU 메모리"
+  "SettingsTabCpuMemory" : "CPU 메모리",
+  "ControllerMotionTitle": "Motion Control Settings",
+  "ControllerRumbleTitle": "Rumble Settings"
 }

Ryujinx.Ava/Assets/Locales/pt_BR.json

@@ -243,8 +243,6 @@
   "ControllerSettingsMisc": "Miscelâneas",
   "ControllerSettingsTriggerThreshold": "Sensibilidade do gatilho:",
   "ControllerSettingsMotion": "Sensor de movimento",
-  "ControllerSettingsCemuHook": "CemuHook",
-  "ControllerSettingsMotionEnableMotionControls": "Habilitar sensor de movimento",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "Usar sensor compatível com CemuHook",
   "ControllerSettingsMotionControllerSlot": "Slot do controle:",
   "ControllerSettingsMotionMirrorInput": "Espelhar movimento",
@@ -290,9 +288,8 @@
   "SettingsTabGeneralThemeBaseStyleLight": "Claro",
   "SettingsTabGeneralThemeEnableCustomTheme": "Habilitar tema customizado",
   "ButtonBrowse": "Procurar",
-  "ControllerSettingsMotionConfigureCemuHookSettings": "Configurar sensor de movimento CemuHook",
+  "ControllerSettingsConfigureGeneral": "Configurar",
   "ControllerSettingsRumble": "Vibração",
-  "ControllerSettingsRumbleEnable": "Habilitar vibração",
   "ControllerSettingsRumbleStrongMultiplier": "Multiplicador de vibração forte",
   "ControllerSettingsRumbleWeakMultiplier": "Multiplicador de vibração fraca",
   "DialogMessageSaveNotAvailableMessage": "Não há jogos salvos para {0} [{1:x16}]",
@@ -442,7 +439,7 @@
   "MemoryManagerTooltip": "Muda como a memória do sistema convidado é acessada. Tem um grande impacto na performance da CPU emulada.",
   "MemoryManagerSoftwareTooltip": "Usar uma tabela de página via software para tradução de endereços. Maior precisão, porém performance mais baixa.",
   "MemoryManagerHostTooltip": "Mapeia memória no espaço de endereço hóspede diretamente. Compilação e execução do JIT muito mais rápida.",
-  "MemoryManagerUnsafeTooltip": "Mapeia memória diretamente, mas sem limitar o endereço ao espaço de endereço do sistema convidado antes de acessar. Mais rápido, porém menos seguro. O aplicativo convidado pode acessar memória de qualquer parte do Ryujinx, então apenas rode programas em que você confia nesse modo.",
+  "MemoryManagerUnsafeTooltip": "Mapeia memória diretamente, mas sem limitar o acesso ao espaço de endereçamento do sistema convidado. Mais rápido, porém menos seguro. O aplicativo convidado pode acessar memória de qualquer parte do Ryujinx, então apenas rode programas em que você confia nesse modo.",
   "DRamTooltip": "Expande a memória do sistema emulado de 4GB para 6GB",
   "IgnoreMissingServicesTooltip": "Habilita ou desabilita a opção de ignorar serviços não implementados",
   "GraphicsBackendThreadingTooltip": "Habilita multithreading do backend gráfico",
@@ -485,15 +482,13 @@
   "EnableInternetAccessTooltip": "Habilita acesso à internet do programa convidado. Se habilitado, o aplicativo vai se comportar como se o sistema Switch emulado estivesse conectado a Internet. Note que em alguns casos, aplicativos podem acessar a Internet mesmo com essa opção desabilitada",
   "GameListContextMenuManageCheatToolTip": "Gerenciar Cheats",
   "GameListContextMenuManageCheat": "Gerenciar Cheats",
-  "ControllerSettingsStickRange": "Intervalo",
+  "ControllerSettingsStickRange": "Intervalo:",
   "DialogStopEmulationTitle": "Ryujinx - Parar emulação",
   "DialogStopEmulationMessage": "Tem certeza que deseja parar a emulação?",
   "SettingsTabCpu": "CPU",
   "SettingsTabAudio": "Áudio",
   "SettingsTabNetwork": "Rede",
   "SettingsTabNetworkConnection": "Conexão de rede",
-  "SettingsTabGraphicsFrameRate": "Taxa de atualização do hóspede:",
-  "SettingsTabGraphicsFrameRateTooltip": "Define a taxa de atualização do hóspede. Coloque em 0 para remover o limite.",
   "SettingsTabCpuCache": "Cache da CPU",
   "SettingsTabCpuMemory": "Memória da CPU",
   "DialogUpdaterFlatpakNotSupportedMessage": "Por favor, atualize o Ryujinx pelo FlatHub.",
@@ -540,5 +535,24 @@
   "Handheld": "Portátil",
   "ConnectionError": "Erro de conexão.",
   "AboutPageDeveloperListMore": "{0} e mais...",
-  "ApiError": "Erro de API."
+  "ApiError": "Erro de API.",
+  "LoadingHeading": "Carregando {0}",
+  "CompilingPPTC": "Compilando PTC",
+  "CompilingShaders": "Compilando Shaders",
+  "AllKeyboards": "Todos os teclados",
+  "OpenFileDialogTitle": "Selecione um arquivo suportado para abrir",
+  "OpenFolderDialogTitle": "Selecione um diretório com um jogo extraído",
+  "AllSupportedFormats": "Todos os formatos suportados",
+  "RyujinxUpdater": "Atualizador do Ryujinx",
+  "SettingsTabHotkeys": "Atalhos do teclado",
+  "SettingsTabHotkeysHotkeys": "Atalhos do teclado",
+  "SettingsTabHotkeysToggleVsyncHotkey": "Mudar VSync:",
+  "SettingsTabHotkeysScreenshotHotkey": "Captura de tela:",
+  "SettingsTabHotkeysShowUiHotkey": "Exibir UI:",
+  "SettingsTabHotkeysPauseHotkey": "Pausar:",
+  "SettingsTabHotkeysToggleMuteHotkey": "Mudo:",
+  "ControllerMotionTitle": "Configurações do controle de movimento",
+  "ControllerRumbleTitle": "Configurações de vibração",
+  "SettingsSelectThemeFileDialogTitle" : "Selecionar arquivo do tema",
+  "SettingsXamlThemeFile" : "Arquivo de tema Xaml"
 }

Ryujinx.Ava/Assets/Locales/ru_RU.json

@@ -242,8 +242,6 @@
   "ControllerSettingsMisc": "Разное",
   "ControllerSettingsTriggerThreshold": "Порог срабатывания:",
   "ControllerSettingsMotion": "Движение",
-  "ControllerSettingsCemuHook": "CemuHook",
-  "ControllerSettingsMotionEnableMotionControls": "Включить управление движением",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "Используйте движение, совместимое с CemuHook",
   "ControllerSettingsMotionControllerSlot": "Слот контроллера:",
   "ControllerSettingsMotionMirrorInput": "Зеркальный ввод",
@@ -289,9 +287,8 @@
   "SettingsTabGeneralThemeBaseStyleLight": "Светлая",
   "SettingsTabGeneralThemeEnableCustomTheme": "Включить пользовательскую тему",
   "ButtonBrowse": "Обзор",
-  "ControllerSettingsMotionConfigureCemuHookSettings": "Настройка движения CemuHook",
+  "ControllerSettingsConfigureGeneral": "Настройка",
   "ControllerSettingsRumble": "Вибрация",
-  "ControllerSettingsRumbleEnable": "Включить вибрацию",
   "ControllerSettingsRumbleStrongMultiplier": "Множитель сильной вибрации",
   "ControllerSettingsRumbleWeakMultiplier": "Множитель слабой вибрации",
   "DialogMessageSaveNotAvailableMessage": "Нет сохраненных данных для {0} [{1:x16}]",
@@ -483,15 +480,15 @@
   "EnableInternetAccessTooltip": "Включает гостевой доступ в Интернет. Если этот параметр включен, приложение будет вести себя так, как если бы эмулированная консоль Switch была подключена к Интернету. Обратите внимание, что в некоторых случаях приложения могут по-прежнему получать доступ к Интернету, даже если эта опция отключена.",
   "GameListContextMenuManageCheatToolTip" : "Управление читами",
   "GameListContextMenuManageCheat" : "Управление читами",
-  "ControllerSettingsStickRange" : "Диапазон",
+  "ControllerSettingsStickRange" : "Диапазон:",
   "DialogStopEmulationTitle" : "Ryujinx - Остановить эмуляцию",
   "DialogStopEmulationMessage": "Вы уверены, что хотите остановить эмуляцию?",
   "SettingsTabCpu": "ЦП",
   "SettingsTabAudio": "Аудио",
   "SettingsTabNetwork": "Сеть",
   "SettingsTabNetworkConnection" : "Подключение к сети",
-  "SettingsTabGraphicsFrameRate" : "Частота обновления хоста:",
-  "SettingsTabGraphicsFrameRateTooltip" : "Устанавливает частоту обновления хоста. Установите на 0, чтобы снять ограничение.",
   "SettingsTabCpuCache" : "Кэш ЦП",
-  "SettingsTabCpuMemory" : "Память ЦП"
+  "SettingsTabCpuMemory" : "Память ЦП",
+  "ControllerMotionTitle": "Motion Control Settings",
+  "ControllerRumbleTitle": "Rumble Settings"
 }

Ryujinx.Ava/Assets/Locales/tr_TR.json

@@ -243,8 +243,6 @@
   "ControllerSettingsMisc": "Misc.",
   "ControllerSettingsTriggerThreshold": "Tetik Eşiği:",
   "ControllerSettingsMotion": "Hareket",
-  "ControllerSettingsCemuHook": "CemuHook",
-  "ControllerSettingsMotionEnableMotionControls": "Hareket Kontrollerini Etkinleştir",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "CemuHook Uyumlu Hareket",
   "ControllerSettingsMotionControllerSlot": "Kontrolcü Yuvası:",
   "ControllerSettingsMotionMirrorInput": "Girişi Aynala",
@@ -290,9 +288,8 @@
   "SettingsTabGeneralThemeBaseStyleLight": "Aydınlık",
   "SettingsTabGeneralThemeEnableCustomTheme": "Özel Tema Etkinleştir",
   "ButtonBrowse": "Göz At",
-  "ControllerSettingsMotionConfigureCemuHookSettings": "CemuHook Hareket Ayarla",
+  "ControllerSettingsConfigureGeneral": "Ayarla",
   "ControllerSettingsRumble": "Titreşim",
-  "ControllerSettingsRumbleEnable": "Titreşimi Etkinleştir",
   "ControllerSettingsRumbleStrongMultiplier": "Güçlü Titreşim Çarpanı",
   "ControllerSettingsRumbleWeakMultiplier": "Zayıf Titreşim Çarpanı",
   "DialogMessageSaveNotAvailableMessage": "{0} [{1:x16}] için kayıt verisi yok",
@@ -485,15 +482,13 @@
   "EnableInternetAccessTooltip": "Guest internet erişimini etkinleştirir. Etkinleştirilmişse, uygulama emüle edilen Switch konsolu internete bağlıymış gibi davranır. Not: Bazı durumlarda uygulamalar bu seçenek devre dışı olmasına rağmen internete erişebilir",
   "GameListContextMenuManageCheatToolTip" : "Hileleri Yönet",
   "GameListContextMenuManageCheat" : "Hileleri Yönet",
-  "ControllerSettingsStickRange" : "Bölge (Range)",
+  "ControllerSettingsStickRange" : "Bölge (Range):",
   "DialogStopEmulationTitle" : "Ryujinx - Emülasyonu Durdur",
   "DialogStopEmulationMessage": "Emülasyonu durdurmak istediğinizden emin misiniz?",
   "SettingsTabCpu": "CPU",
   "SettingsTabAudio": "Ses",
   "SettingsTabNetwork": "Ağ",
   "SettingsTabNetworkConnection" : "Ağ Bağlantısı",
-  "SettingsTabGraphicsFrameRate" : "Host Yenileme Hızı:",
-  "SettingsTabGraphicsFrameRateTooltip" : "Host yenileme hızını ayarlar. Limiti kaldırmak için 0'ı seçin.",
   "SettingsTabCpuCache" : "CPU Cache",
   "SettingsTabCpuMemory" : "CPU Hafızası",
   "DialogUpdaterFlatpakNotSupportedMessage": "Lütfen Ryujinx'i FlatHub aracılığıyla güncelleyin.",
@@ -543,5 +538,21 @@
   "ApiError": "API Hatası.",
   "LoadingHeading": "Yükleniyor {0}",
   "CompilingPPTC": "PTC derleniyor",
-  "CompilingShaders": "Shaderlar derleniyor"
+  "CompilingShaders": "Shaderlar derleniyor",
+  "AllKeyboards": "Tüm klavyeler",
+  "OpenFileDialogTitle": "Açılacak desteklenen bir dosya seçin",
+  "OpenFolderDialogTitle": "Sıkıştırılmamış oyun içeren klasör seçin",
+  "AllSupportedFormats": "Tüm Desteklenen Formatlar",
+  "RyujinxUpdater": "Ryujinx Güncelleyicisi",
+  "SettingsTabHotkeys": "Klavye Kısayolları",
+  "SettingsTabHotkeysHotkeys": "Klavye Kısayolları",
+  "SettingsTabHotkeysToggleVsyncHotkey": "VSync'i Etkinleştir:",
+  "SettingsTabHotkeysScreenshotHotkey": "Ekran Görüntüsü Al:",
+  "SettingsTabHotkeysShowUiHotkey": "Arayüzü Göster:",
+  "SettingsTabHotkeysPauseHotkey": "Duraklat:",
+  "SettingsTabHotkeysToggleMuteHotkey": "Sustur:",
+  "ControllerMotionTitle": "Hareket Kontrol Seçenekleri",
+  "ControllerRumbleTitle": "Titreşim Seçenekleri",
+  "SettingsSelectThemeFileDialogTitle" : "Tema Dosyası Seçin",
+  "SettingsXamlThemeFile" : "Xaml Tema Dosyası"
 }

Ryujinx.Ava/Assets/Locales/zh_CN.json

@@ -0,0 +1,550 @@
+{
+  "MenuBarFileOpenApplet": "打开小程序",
+  "MenuBarFileOpenAppletOpenMiiAppletToolTip": "打开独立的Mii小程序",
+  "SettingsTabInputDirectMouseAccess": "直通鼠标操作",
+  "SettingsTabSystemMemoryManagerMode": "内存管理模式:",
+  "SettingsTabSystemMemoryManagerModeSoftware": "软件",
+  "SettingsTabSystemMemoryManagerModeHost": "本机 (快速)",
+  "SettingsTabSystemMemoryManagerModeHostUnchecked": "跳过检查的本机 (最快速)",
+  "MenuBarFile": "文件(_F)",
+  "MenuBarFileOpenFromFile": "加载文件中的程序(_L)",
+  "MenuBarFileOpenUnpacked": "加载解包后的游戏(_U)",
+  "MenuBarFileOpenEmuFolder": "打开Ryujinx文件夹",
+  "MenuBarFileOpenLogsFolder": "打开日志文件夹",
+  "MenuBarFileExit": "退出(_E)",
+  "MenuBarOptions": "选项",
+  "MenuBarOptionsToggleFullscreen": "切换全屏",
+  "MenuBarOptionsStartGamesInFullscreen": "以全屏模式启动游戏",
+  "MenuBarOptionsStopEmulation": "中止模拟",
+  "MenuBarOptionsSettings": "设置(_S)",
+  "MenuBarOptionsManageUserProfiles": "管理用户账户(_M)",
+  "MenuBarActions": "行动(_A)",
+  "MenuBarOptionsSimulateWakeUpMessage": "模拟唤醒消息",
+  "MenuBarActionsScanAmiibo": "扫描Amiibo",
+  "MenuBarTools": "工具(_T)",
+  "MenuBarToolsInstallFirmware": "安装固件",
+  "MenuBarFileToolsInstallFirmwareFromFile": "从 XCI 或 ZIP 安装固件",
+  "MenuBarFileToolsInstallFirmwareFromDirectory": "从文件夹安装固件",
+  "MenuBarHelp": "帮助",
+  "MenuBarHelpCheckForUpdates": "检查更新",
+  "MenuBarHelpAbout": "关于",
+  "MenuSearch": "搜索...",
+  "GameListHeaderFavorite": "收藏",
+  "GameListHeaderIcon": "图标",
+  "GameListHeaderApplication": "名称",
+  "GameListHeaderDeveloper": "制作商",
+  "GameListHeaderVersion": "版本",
+  "GameListHeaderTimePlayed": "游玩时间",
+  "GameListHeaderLastPlayed": "上次游玩",
+  "GameListHeaderFileExtension": "扩展名",
+  "GameListHeaderFileSize": "大小",
+  "GameListHeaderPath": "路径",
+  "GameListContextMenuOpenUserSaveDirectory": "打开应用存档目录",
+  "GameListContextMenuOpenUserSaveDirectoryToolTip": "打开储存游戏存档的目录",
+  "GameListContextMenuOpenUserDeviceDirectory": "打开应用系统目录",
+  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "打开包含游戏系统设置的目录",
+  "GameListContextMenuOpenUserBcatDirectory": "打开BCAT目录",
+  "GameListContextMenuOpenUserBcatDirectoryToolTip": "打开包含游戏BCAT数据的目录",
+  "GameListContextMenuManageTitleUpdates": "管理游戏更新",
+  "GameListContextMenuManageTitleUpdatesToolTip": "打开更新管理窗口",
+  "GameListContextMenuManageDlc": "管理DLC",
+  "GameListContextMenuManageDlcToolTip": "打开 DLC 管理窗口",
+  "GameListContextMenuOpenModsDirectory": "打开MOD目录",
+  "GameListContextMenuOpenModsDirectoryToolTip": "打开存放游戏MOD的目录",
+  "GameListContextMenuCacheManagement": "缓存管理",
+  "GameListContextMenuCacheManagementPurgePptc": "清除 PPTC 缓存",
+  "GameListContextMenuCacheManagementPurgePptcToolTip": "删除游戏的 PPTC 缓存",
+  "GameListContextMenuCacheManagementPurgeShaderCache": "清除着色器缓存",
+  "GameListContextMenuCacheManagementPurgeShaderCacheToolTip": "删除游戏的着色器缓存",
+  "GameListContextMenuCacheManagementOpenPptcDirectory": "打开 PPTC 目录",
+  "GameListContextMenuCacheManagementOpenPptcDirectoryToolTip": "打开包含游戏 PPTC 缓存的目录",
+  "GameListContextMenuCacheManagementOpenShaderCacheDirectory": "打开着色器缓存目录",
+  "GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip": "打开包含应用程序着色器缓存的目录",
+  "GameListContextMenuExtractData": "提取数据",
+  "GameListContextMenuExtractDataExeFS": "ExeFS",
+  "GameListContextMenuExtractDataExeFSToolTip": "从游戏的当前状态中提取 ExeFS 分区（包括更新）",
+  "GameListContextMenuExtractDataRomFS": "RomFS",
+  "GameListContextMenuExtractDataRomFSToolTip": "从游戏的当前状态中提取 RomFS 分区（包括更新）",
+  "GameListContextMenuExtractDataLogo": "图标",
+  "GameListContextMenuExtractDataLogoToolTip": "从游戏的当前状态中提取图标（包括更新）",
+  "StatusBarGamesLoaded": "{0}/{1} 游戏加载完成",
+  "StatusBarSystemVersion": "系统版本: {0}",
+  "Settings": "设置",
+  "SettingsTabGeneral": "用户界面",
+  "SettingsTabGeneralGeneral": "常规",
+  "SettingsTabGeneralEnableDiscordRichPresence": "启用Discord在线状态展示",
+  "SettingsTabGeneralCheckUpdatesOnLaunch": "自动检查更新",
+  "SettingsTabGeneralShowConfirmExitDialog": "显示 \"确认退出\" 对话框",
+  "SettingsTabGeneralHideCursorOnIdle": "空闲时隐藏鼠标",
+  "SettingsTabGeneralGameDirectories": "游戏目录",
+  "SettingsTabGeneralAdd": "添加",
+  "SettingsTabGeneralRemove": "删除",
+  "SettingsTabSystem": "系统",
+  "SettingsTabSystemCore": "核心",
+  "SettingsTabSystemSystemRegion": "系统区域:",
+  "SettingsTabSystemSystemRegionJapan": "日本",
+  "SettingsTabSystemSystemRegionUSA": "美国",
+  "SettingsTabSystemSystemRegionEurope": "欧洲",
+  "SettingsTabSystemSystemRegionAustralia": "澳大利亚",
+  "SettingsTabSystemSystemRegionChina": "中国",
+  "SettingsTabSystemSystemRegionKorea": "韩国",
+  "SettingsTabSystemSystemRegionTaiwan": "台湾地区",
+  "SettingsTabSystemSystemLanguage": "系统语言:",
+  "SettingsTabSystemSystemLanguageJapanese": "日语",
+  "SettingsTabSystemSystemLanguageAmericanEnglish": "美式英语",
+  "SettingsTabSystemSystemLanguageFrench": "法语",
+  "SettingsTabSystemSystemLanguageGerman": "德语",
+  "SettingsTabSystemSystemLanguageItalian": "意大利语",
+  "SettingsTabSystemSystemLanguageSpanish": "西班牙语",
+  "SettingsTabSystemSystemLanguageChinese": "中文(简体)",
+  "SettingsTabSystemSystemLanguageKorean": "韩语",
+  "SettingsTabSystemSystemLanguageDutch": "荷兰语",
+  "SettingsTabSystemSystemLanguagePortuguese": "葡萄牙语",
+  "SettingsTabSystemSystemLanguageRussian": "俄语",
+  "SettingsTabSystemSystemLanguageTaiwanese": "中文(繁体)",
+  "SettingsTabSystemSystemLanguageBritishEnglish": "英式英语",
+  "SettingsTabSystemSystemLanguageCanadianFrench": "加拿大法语",
+  "SettingsTabSystemSystemLanguageLatinAmericanSpanish": "拉美西班牙语",
+  "SettingsTabSystemSystemLanguageSimplifiedChinese": "简体中文(推荐)",
+  "SettingsTabSystemSystemLanguageTraditionalChinese": "繁体中文(推荐)",
+  "SettingsTabSystemSystemTimeZone": "系统时区:",
+  "SettingsTabSystemSystemTime": "系统时钟:",
+  "SettingsTabSystemEnableVsync": "开启 VSync",
+  "SettingsTabSystemEnablePptc": "开启 PPTC 缓存",
+  "SettingsTabSystemEnableFsIntegrityChecks": "开启文件系统完整性检查",
+  "SettingsTabSystemAudioBackend": "音频后端:",
+  "SettingsTabSystemAudioBackendDummy": "无",
+  "SettingsTabSystemAudioBackendOpenAL": "OpenAL",
+  "SettingsTabSystemAudioBackendSoundIO": "SoundIO",
+  "SettingsTabSystemAudioBackendSDL2": "SDL2",
+  "SettingsTabSystemHacks": "修正",
+  "SettingsTabSystemHacksNote": " - 会引起模拟器不稳定",
+  "SettingsTabSystemExpandDramSize": "将模拟RAM大小扩展至 6GB",
+  "SettingsTabSystemIgnoreMissingServices": "忽略缺少的服务",
+  "SettingsTabGraphics": "图像",
+  "SettingsTabGraphicsEnhancements": "增强",
+  "SettingsTabGraphicsEnableShaderCache": "启用着色器缓存",
+  "SettingsTabGraphicsAnisotropicFiltering": "各向异性过滤:",
+  "SettingsTabGraphicsAnisotropicFilteringAuto": "自动",
+  "SettingsTabGraphicsAnisotropicFiltering2x": "2x",
+  "SettingsTabGraphicsAnisotropicFiltering4x": "4x",
+  "SettingsTabGraphicsAnisotropicFiltering8x": "8x",
+  "SettingsTabGraphicsAnisotropicFiltering16x": "16x",
+  "SettingsTabGraphicsResolutionScale": "分辨率缩放:",
+  "SettingsTabGraphicsResolutionScaleCustom": "自定义 (不推荐)",
+  "SettingsTabGraphicsResolutionScaleNative": "原生 (720p/1080p)",
+  "SettingsTabGraphicsResolutionScale2x": "2x (1440p/2160p)",
+  "SettingsTabGraphicsResolutionScale3x": "3x (2160p/3240p)",
+  "SettingsTabGraphicsResolutionScale4x": "4x (2880p/4320p)",
+  "SettingsTabGraphicsAspectRatio": "宽高比:",
+  "SettingsTabGraphicsAspectRatio4x3": "4:3",
+  "SettingsTabGraphicsAspectRatio16x9": "16:9",
+  "SettingsTabGraphicsAspectRatio16x10": "16:10",
+  "SettingsTabGraphicsAspectRatio21x9": "21:9",
+  "SettingsTabGraphicsAspectRatio32x9": "32:9",
+  "SettingsTabGraphicsAspectRatioStretch": "拉伸至屏幕",
+  "SettingsTabGraphicsDeveloperOptions": "开发者选项",
+  "SettingsTabGraphicsShaderDumpPath": "图形着色器转储路径:",
+  "SettingsTabLogging": "日志",
+  "SettingsTabLoggingLogging": "日志",
+  "SettingsTabLoggingEnableLoggingToFile": "保存日志为文件",
+  "SettingsTabLoggingEnableStubLogs": "记录Stub",
+  "SettingsTabLoggingEnableInfoLogs": "记录Info",
+  "SettingsTabLoggingEnableWarningLogs": "记录Warning",
+  "SettingsTabLoggingEnableErrorLogs": "记录Error",
+  "SettingsTabLoggingEnableTraceLogs": "记录Trace",
+  "SettingsTabLoggingEnableGuestLogs": "记录Guest",
+  "SettingsTabLoggingEnableFsAccessLogs": "记录文件访问",
+  "SettingsTabLoggingFsGlobalAccessLogMode": "记录全局文件访问模式:",
+  "SettingsTabLoggingDeveloperOptions": "开发者选项 (警告: 会降低性能)",
+  "SettingsTabLoggingOpenglLogLevel": "OpenGL日志级别:",
+  "SettingsTabLoggingOpenglLogLevelNone": "无",
+  "SettingsTabLoggingOpenglLogLevelError": "错误",
+  "SettingsTabLoggingOpenglLogLevelPerformance": "减速",
+  "SettingsTabLoggingOpenglLogLevelAll": "全部",
+  "SettingsTabLoggingEnableDebugLogs": "启用调试日志",
+  "SettingsTabInput": "输入",
+  "SettingsTabInputEnableDockedMode": "主机模式",
+  "SettingsTabInputDirectKeyboardAccess": "直通键盘控制",
+  "SettingsButtonSave": "保存",
+  "SettingsButtonClose": "关闭",
+  "SettingsButtonApply": "应用",
+  "ControllerSettingsPlayer": "玩家",
+  "ControllerSettingsPlayer1": "玩家 1",
+  "ControllerSettingsPlayer2": "玩家 2",
+  "ControllerSettingsPlayer3": "玩家 3",
+  "ControllerSettingsPlayer4": "玩家 4",
+  "ControllerSettingsPlayer5": "玩家 5",
+  "ControllerSettingsPlayer6": "玩家 6",
+  "ControllerSettingsPlayer7": "玩家 7",
+  "ControllerSettingsPlayer8": "玩家 8",
+  "ControllerSettingsHandheld": "掌机模式",
+  "ControllerSettingsInputDevice": "输入设备",
+  "ControllerSettingsRefresh": "刷新",
+  "ControllerSettingsDeviceDisabled": "关闭",
+  "ControllerSettingsControllerType": "手柄类型",
+  "ControllerSettingsControllerTypeHandheld": "掌机",
+  "ControllerSettingsControllerTypeProController": "Pro手柄",
+  "ControllerSettingsControllerTypeJoyConPair": "JoyCon",
+  "ControllerSettingsControllerTypeJoyConLeft": "左JoyCon",
+  "ControllerSettingsControllerTypeJoyConRight": "右JoyCon",
+  "ControllerSettingsProfile": "预设",
+  "ControllerSettingsProfileDefault": "默认",
+  "ControllerSettingsLoad": "加载",
+  "ControllerSettingsAdd": "新建",
+  "ControllerSettingsRemove": "删除",
+  "ControllerSettingsButtons": "按钮",
+  "ControllerSettingsButtonA": "A",
+  "ControllerSettingsButtonB": "B",
+  "ControllerSettingsButtonX": "X",
+  "ControllerSettingsButtonY": "Y",
+  "ControllerSettingsButtonPlus": "+",
+  "ControllerSettingsButtonMinus": "-",
+  "ControllerSettingsDPad": "方向键",
+  "ControllerSettingsDPadUp": "上",
+  "ControllerSettingsDPadDown": "下",
+  "ControllerSettingsDPadLeft": "左",
+  "ControllerSettingsDPadRight": "右",
+  "ControllerSettingsLStick": "左摇杆",
+  "ControllerSettingsLStickButton": "按下",
+  "ControllerSettingsLStickUp": "上",
+  "ControllerSettingsLStickDown": "下",
+  "ControllerSettingsLStickLeft": "左",
+  "ControllerSettingsLStickRight": "右",
+  "ControllerSettingsLStickStick": "杆",
+  "ControllerSettingsLStickInvertXAxis": "反转 X 方向",
+  "ControllerSettingsLStickInvertYAxis": "反转 Y 方向",
+  "ControllerSettingsLStickDeadzone": "死区:",
+  "ControllerSettingsRStick": "右摇杆",
+  "ControllerSettingsRStickButton": "按下",
+  "ControllerSettingsRStickUp": "上",
+  "ControllerSettingsRStickDown": "下",
+  "ControllerSettingsRStickLeft": "左",
+  "ControllerSettingsRStickRight": "右",
+  "ControllerSettingsRStickStick": "杆",
+  "ControllerSettingsRStickInvertXAxis": "反转 X 方向",
+  "ControllerSettingsRStickInvertYAxis": "反转 Y 方向",
+  "ControllerSettingsRStickDeadzone": "死区:",
+  "ControllerSettingsTriggersLeft": "左扳机",
+  "ControllerSettingsTriggersRight": "右扳机",
+  "ControllerSettingsTriggersButtonsLeft": "左扳机键",
+  "ControllerSettingsTriggersButtonsRight": "右扳机键",
+  "ControllerSettingsTriggers": "扳机",
+  "ControllerSettingsTriggerL": "L",
+  "ControllerSettingsTriggerR": "R",
+  "ControllerSettingsTriggerZL": "ZL",
+  "ControllerSettingsTriggerZR": "ZR",
+  "ControllerSettingsLeftSL": "SL",
+  "ControllerSettingsLeftSR": "SR",
+  "ControllerSettingsRightSL": "SL",
+  "ControllerSettingsRightSR": "SR",
+  "ControllerSettingsExtraButtonsLeft": "左按键",
+  "ControllerSettingsExtraButtonsRight": "右按键",
+  "ControllerSettingsMisc": "其他",
+  "ControllerSettingsTriggerThreshold": "扳机阈值:",
+  "ControllerSettingsMotion": "体感",
+  "ControllerSettingsCemuHook": "CemuHook",
+  "ControllerSettingsMotionEnableMotionControls": "启用体感操作",
+  "ControllerSettingsMotionUseCemuhookCompatibleMotion": "使用CemuHook体感协议",
+  "ControllerSettingsMotionControllerSlot": "手柄:",
+  "ControllerSettingsMotionMirrorInput": "镜像操作",
+  "ControllerSettingsMotionRightJoyConSlot": "右JoyCon:",
+  "ControllerSettingsMotionServerHost": "服务器Host:",
+  "ControllerSettingsMotionGyroSensitivity": "陀螺仪敏感度:",
+  "ControllerSettingsMotionGyroDeadzone": "陀螺仪死区:",
+  "ControllerSettingsSave": "保存",
+  "ControllerSettingsClose": "关闭",
+  "UserProfilesSelectedUserProfile": "选择用户账户:",
+  "UserProfilesSaveProfileName": "保存账户名",
+  "UserProfilesChangeProfileImage": "更换头像",
+  "UserProfilesAvailableUserProfiles": "现有的账户:",
+  "UserProfilesAddNewProfile": "新建账户",
+  "UserProfilesDeleteSelectedProfile": "删除选择的账户",
+  "UserProfilesClose": "关闭",
+  "ProfileImageSelectionTitle": "头像选择",
+  "ProfileImageSelectionHeader": "选择合适的头像图片",
+  "ProfileImageSelectionNote": "您可以导入自定义头像，或从系统中选择头像",
+  "ProfileImageSelectionImportImage": "导入图像文件",
+  "ProfileImageSelectionSelectAvatar": "选择系统头像",
+  "InputDialogTitle": "输入对话框",
+  "InputDialogOk": "完成",
+  "InputDialogCancel": "取消",
+  "InputDialogAddNewProfileTitle": "选择用户名称",
+  "InputDialogAddNewProfileHeader": "请输入账户名称",
+  "InputDialogAddNewProfileSubtext": "(最大长度: {0})",
+  "AvatarChoose": "选择",
+  "AvatarSetBackgroundColor": "设置背景色",
+  "AvatarClose": "关闭",
+  "ControllerSettingsLoadProfileToolTip": "加载预设",
+  "ControllerSettingsAddProfileToolTip": "新增预设",
+  "ControllerSettingsRemoveProfileToolTip": "删除预设",
+  "ControllerSettingsSaveProfileToolTip": "保存预设",
+  "MenuBarFileToolsTakeScreenshot": "保存截图",
+  "MenuBarFileToolsHideUi": "隐藏UI",
+  "GameListContextMenuToggleFavorite": "标记为收藏",
+  "GameListContextMenuToggleFavoriteToolTip": "启用或取消收藏标记",
+  "SettingsTabGeneralTheme": "主题",
+  "SettingsTabGeneralThemeCustomTheme": "自选主题路径",
+  "SettingsTabGeneralThemeBaseStyle": "主题色调",
+  "SettingsTabGeneralThemeBaseStyleDark": "暗黑",
+  "SettingsTabGeneralThemeBaseStyleLight": "浅色",
+  "SettingsTabGeneralThemeEnableCustomTheme": "使用自选主题界面",
+  "ButtonBrowse": "浏览",
+  "ControllerSettingsMotionConfigureCemuHookSettings": "配置CemuHook体感",
+  "ControllerSettingsRumble": "震动",
+  "ControllerSettingsRumbleEnable": "启用震动",
+  "ControllerSettingsRumbleStrongMultiplier": "强震动调节",
+  "ControllerSettingsRumbleWeakMultiplier": "弱震动调节",
+  "DialogMessageSaveNotAvailableMessage": "没有{0} [{1:x16}]的游戏存档",
+  "DialogMessageSaveNotAvailableCreateSaveMessage": "是否创建该游戏的存档文件夹?",
+  "DialogConfirmationTitle": "Ryujinx - 设置",
+  "DialogUpdaterTitle": "Ryujinx - 更新",
+  "DialogErrorTitle": "Ryujinx - 错误",
+  "DialogWarningTitle": "Ryujinx - 警告",
+  "DialogExitTitle": "Ryujinx - 关闭",
+  "DialogErrorMessage": "Ryujinx遇到了错误",
+  "DialogExitMessage": "是否关闭Ryujinx？",
+  "DialogExitSubMessage": "所有未保存的进度会丢失！",
+  "DialogMessageCreateSaveErrorMessage": "创建特定的存档时出错: {0}",
+  "DialogMessageFindSaveErrorMessage": "查找特定的存档时出错: {0}",
+  "FolderDialogExtractTitle": "选择要解压到的文件夹",
+  "DialogNcaExtractionMessage": "提取{1}的{0}分区...",
+  "DialogNcaExtractionTitle": "Ryujinx - NCA分区提取",
+  "DialogNcaExtractionMainNcaNotFoundErrorMessage": "提取失败。所选文件中不含主NCA文件",
+  "DialogNcaExtractionCheckLogErrorMessage": "提取失败。请查看日志文件获取详情。",
+  "DialogNcaExtractionSuccessMessage": "提取成功。",
+  "DialogUpdaterConvertFailedMessage": "无法转换当前 Ryujinx 版本。",
+  "DialogUpdaterCancelUpdateMessage": "更新取消！",
+  "DialogUpdaterAlreadyOnLatestVersionMessage": "您使用的Ryujinx是最新版本。",
+  "DialogUpdaterFailedToGetVersionMessage": "尝试从 Github 获取版本信息时无效。可能由于 GitHub Actions 正在编译新版本。请过几分钟重试。",
+  "DialogUpdaterConvertFailedGithubMessage": "无法转换从 Github 接收到的 Ryujinx 版本转换。",
+  "DialogUpdaterDownloadingMessage": "下载新版本中...",
+  "DialogUpdaterExtractionMessage": "正在提取更新...",
+  "DialogUpdaterRenamingMessage": "正在删除旧文件...",
+  "DialogUpdaterAddingFilesMessage": "安装更新中...",
+  "DialogUpdaterCompleteMessage": "更新成功!",
+  "DialogUpdaterRestartMessage": "立即重启 Ryujinx 完成更新？",
+  "DialogUpdaterArchNotSupportedMessage": "您运行的系统架构不受支持！",
+  "DialogUpdaterArchNotSupportedSubMessage": "(仅支持 x64 系统)",
+  "DialogUpdaterNoInternetMessage": "没有连接到互联网",
+  "DialogUpdaterNoInternetSubMessage": "请确保互联网连接正常。",
+  "DialogUpdaterDirtyBuildMessage": "不能更新第三方版本的 Ryujinx！",
+  "DialogUpdaterDirtyBuildSubMessage": "如果希望使用受支持的版本，请您在 https://ryujinx.org/ 下载。",
+  "DialogRestartRequiredMessage": "需要重启模拟器",
+  "DialogThemeRestartMessage": "主题设置已保存。需要重新启动才能生效。",
+  "DialogThemeRestartSubMessage": "您是否要重启？",
+  "DialogFirmwareInstallEmbeddedMessage": "要安装游戏内置的固件吗？(固件 {0})",
+  "DialogFirmwareInstallEmbeddedSuccessMessage": "未找到已安装的固件，但 Ryujinx 可以从现有的游戏安装固件{0}.\\n模拟器现在可以运行。",
+  "DialogFirmwareNoFirmwareInstalledMessage": "未安装固件",
+  "DialogFirmwareInstalledMessage": "已安装固件{0}",
+  "DialogOpenSettingsWindowLabel": "打开设置窗口",
+  "DialogControllerAppletTitle": "控制器小窗口",
+  "DialogMessageDialogErrorExceptionMessage": "显示消息对话框时出错: {0}",
+  "DialogSoftwareKeyboardErrorExceptionMessage": "显示软件键盘时出错: {0}",
+  "DialogErrorAppletErrorExceptionMessage": "显示错误对话框时出错: {0}",
+  "DialogUserErrorDialogMessage": "{0}: {1}",
+  "DialogUserErrorDialogInfoMessage": "\n有关修复此错误的更多信息，可以遵循我们的设置指南。",
+  "DialogUserErrorDialogTitle": "Ryujinx错误 ({0})",
+  "DialogAmiiboApiTitle": "Amiibo API",
+  "DialogAmiiboApiFailFetchMessage": "从 API 获取信息时出错。",
+  "DialogAmiiboApiConnectErrorMessage": "无法连接到 Amiibo API 服务器。服务器可能已关闭，或者您没有网络连接。",
+  "DialogProfileInvalidProfileErrorMessage": "预设{0} 与当前输入配置系统不兼容。",
+  "DialogProfileDefaultProfileOverwriteErrorMessage": "默认预设无法被覆盖",
+  "DialogProfileDeleteProfileTitle": "删除预设",
+  "DialogProfileDeleteProfileMessage": "删除后不可恢复，确定吗？",
+  "DialogWarning": "警告",
+  "DialogPPTCDeletionMessage": "您即将删除:\n\n{0}的 PPTC 缓存\n\n确定吗？",
+  "DialogPPTCDeletionErrorMessage": "清除位于{0}的 PPTC 缓存时出错: {1}",
+  "DialogShaderDeletionMessage": "您即将删除:\n\n{0}的着色器缓存\n\n确定吗？",
+  "DialogShaderDeletionErrorMessage": "清除位于{0}的着色器缓存时出错: {1}",
+  "DialogRyujinxErrorMessage": "Ryujinx遇到错误",
+  "DialogInvalidTitleIdErrorMessage": "UI 错误:所选游戏没有有效的标题ID",
+  "DialogFirmwareInstallerFirmwareNotFoundErrorMessage": "路径{0}找不到有效的系统固件。",
+  "DialogFirmwareInstallerFirmwareInstallTitle": "安装固件{0}",
+  "DialogFirmwareInstallerFirmwareInstallMessage": "将安装{0}版本的系统。",
+  "DialogFirmwareInstallerFirmwareInstallSubMessage": "\n\n这将替换当前系统版本{0}。",
+  "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\n确认进行?",
+  "DialogFirmwareInstallerFirmwareInstallWaitMessage": "安装固件中...",
+  "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "成功安装系统版本{0}。",
+  "DialogUserProfileDeletionWarningMessage": "删除后将没有可选择的用户账户",
+  "DialogUserProfileDeletionConfirmMessage": "是否删除选择的账户",
+  "DialogControllerSettingsModifiedConfirmMessage": "目前的输入预设已更新",
+  "DialogControllerSettingsModifiedConfirmSubMessage": "要保存吗？",
+  "DialogDlcLoadNcaErrorMessage": "{0}. 错误的文件: {1}",
+  "DialogDlcNoDlcErrorMessage": "选择的文件不包含所选游戏的 DLC！",
+  "DialogPerformanceCheckLoggingEnabledMessage": "您启用了跟踪日志，仅供开发人员使用。",
+  "DialogPerformanceCheckLoggingEnabledConfirmMessage": "为了获得最佳性能，建议禁用跟踪日志记录。您是否要立即禁用？",
+  "DialogPerformanceCheckShaderDumpEnabledMessage": "您启用了着色器转储，仅供开发人员使用。",
+  "DialogPerformanceCheckShaderDumpEnabledConfirmMessage": "为了获得最佳性能，建议禁用着色器转储。您是否要立即禁用？",
+  "DialogLoadAppGameAlreadyLoadedMessage": "当前已加载有游戏",
+  "DialogLoadAppGameAlreadyLoadedSubMessage": "请停止模拟或关闭程序，再启动另一个游戏。",
+  "DialogUpdateAddUpdateErrorMessage": "选择的文件不包含所选游戏的更新！",
+  "DialogSettingsBackendThreadingWarningTitle": "警告 - 后端多线程",
+  "DialogSettingsBackendThreadingWarningMessage": "改变此选项后必须重启 Ryujinx 才能生效。根据您的硬件，您开启该选项时，可能需要手动禁用驱动程序本身的GL多线程。",
+  "SettingsTabGraphicsFeaturesOptions": "功能",
+  "SettingsTabGraphicsBackendMultithreading": "后端多线程:",
+  "CommonAuto": "自动(推荐)",
+  "CommonOff": "关闭",
+  "CommonOn": "打开",
+  "InputDialogYes": "是",
+  "InputDialogNo": "否",
+  "DialogProfileInvalidProfileNameErrorMessage": "文件名包含无效字符，请重试。",
+  "MenuBarOptionsPauseEmulation": "暂停",
+  "MenuBarOptionsResumeEmulation": "继续",
+  "AboutUrlTooltipMessage": "在浏览器中打开Ryujinx的官网。",
+  "AboutDisclaimerMessage": "Ryujinx以任何方式都与Nintendo™以及任何商业伙伴没有关联",
+  "AboutAmiiboDisclaimerMessage": "我们的Amiibo模拟使用了\nAmiiboAPI (www.amiiboapi.com) ",
+  "AboutPatreonUrlTooltipMessage": "在浏览器中打开Ryujinx的Patreon赞助页。",
+  "AboutGithubUrlTooltipMessage": "在浏览器中打开Ryujinx的GitHub代码库。",
+  "AboutDiscordUrlTooltipMessage": "在浏览器中打开Ryujinx的Discord邀请链接。",
+  "AboutTwitterUrlTooltipMessage": "在浏览器中打开Ryujinx的Twitter主页。",
+  "AboutRyujinxAboutTitle": "关于:",
+  "AboutRyujinxAboutContent": "Ryujinx是Nintendo Switch™的模拟器.\n您可以在Patreon上支持Ryujinx。\n关注Twitter或者Discord可以获取模拟器最新动态。\n如果您对开发感兴趣，欢迎来GitHub和Discord加入我们！",
+  "AboutRyujinxMaintainersTitle": "由以下作者维护:",
+  "AboutRyujinxMaintainersContentTooltipMessage": "在浏览器中打开贡献者的网页",
+  "AboutRyujinxSupprtersTitle": "感谢Patreon的赞助者:",
+  "AmiiboSeriesLabel": "Amiibo系列",
+  "AmiiboCharacterLabel": "角色",
+  "AmiiboScanButtonLabel": "扫描",
+  "AmiiboOptionsShowAllLabel": "显示所有 Amiibo",
+  "AmiiboOptionsUsRandomTagLabel": "修正: 使用随机标记的Uuid",
+  "DlcManagerTableHeadingEnabledLabel": "启用",
+  "DlcManagerTableHeadingTitleIdLabel": "游戏ID",
+  "DlcManagerTableHeadingContainerPathLabel": "文件夹路径",
+  "DlcManagerTableHeadingFullPathLabel": "完整路径",
+  "DlcManagerRemoveAllButton": "全部删除",
+  "MenuBarOptionsChangeLanguage": "更改语言",
+  "CommonSort": "排序",
+  "CommonShowNames": "显示名称",
+  "CommonFavorite": "收藏",
+  "OrderAscending": "从小到大",
+  "OrderDescending": "从大到小",
+  "SettingsTabGraphicsFeatures": "额外功能",
+  "ErrorWindowTitle": "错误窗口",
+  "ToggleDiscordTooltip": "启用或关闭Discord详细在线状态展示",
+  "AddGameDirBoxTooltip": "输入要添加的游戏目录",
+  "AddGameDirTooltip": "添加游戏目录到列表中",
+  "RemoveGameDirTooltip": "移除选中的目录",
+  "CustomThemeCheckTooltip": "启用或关闭自定义主题",
+  "CustomThemePathTooltip": "自定义主题的目录",
+  "CustomThemeBrowseTooltip": "查找自定义主题",
+  "DockModeToggleTooltip": "是否开启Swith的主机模式",
+  "DirectKeyboardTooltip": "是否开启\"直连键盘访问(HID)支持\" (部分游戏可以使用您的键盘输入文字)",
+  "DirectMouseTooltip": "是否开启\"直连鼠标访问(HID)支持\" (部分游戏可以使用您的鼠标导航)",
+  "RegionTooltip": "更改系统区域",
+  "LanguageTooltip": "更改系统语言",
+  "TimezoneTooltip": "更改系统时区",
+  "TimeTooltip": "更改系统时钟",
+  "VSyncToggleTooltip": "开启可以消除帧撕裂，关闭可以提高性能",
+  "PptcToggleTooltip": "开启以后减少游戏启动时间",
+  "FsIntegrityToggleTooltip": "是否检查游戏文件内容的完整性",
+  "AudioBackendTooltip": "默认推荐SDL，但每种音频后端对各类游戏兼容性可能不同",
+  "MemoryManagerTooltip": "改变Switch内存映射到电脑内存的方式，会影响CPU性能消耗",
+  "MemoryManagerSoftwareTooltip": "使用软件内存页管理，最精确但是速度最慢",
+  "MemoryManagerHostTooltip": "直接映射内存页到电脑内存，JIT效率很高",
+  "MemoryManagerUnsafeTooltip": "直接映射内存页，但是不检查内存溢出，JIT效率最高。Ryujinx可以访问任何位置的内存，所以相对不安全。此模式下只应运行您信任的游戏或软件（即官方游戏）",
+  "DRamTooltip": "扩展模拟的Switch内存为6GB，某些高清纹理MOD或4K MOD需要此选项",
+  "IgnoreMissingServicesTooltip": "忽略某些未实现的系统服务，少部分游戏需要此选项才能启动",
+  "GraphicsBackendThreadingTooltip": "启用后端多线程",
+  "GalThreadingTooltip": "使用模拟器自带的多线程调度，减少着色器编译的卡顿，并提高驱动程序的性能(尤其是缺失多线程的AMD)。NVIDIA用户需要重启模拟器才能禁用驱动本身的多线程，否则您需手动执行禁用获得最佳性能",
+  "ShaderCacheToggleTooltip": "开启后缓存着色器到硬盘，减少画面卡顿",
+  "ResolutionScaleTooltip": "缩放渲染的分辨率",
+  "ResolutionScaleEntryTooltip": "尽量使用如1.5的浮点倍数。非整数的倍率易引起错误",
+  "AnisotropyTooltip": "各向异性过滤等级。能提高倾斜视角纹理的清晰度('自动'使用游戏默认指定的等级)",
+  "AspectRatioTooltip": "模拟器渲染窗口的宽高比",
+  "ShaderDumpPathTooltip": "转储图形着色器的路径",
+  "FileLogTooltip": "是否保存日志文件到硬盘",
+  "StubLogTooltip": "记录stub消息",
+  "InfoLogTooltip": "记录info消息",
+  "WarnLogTooltip": "记录warning消息",
+  "ErrorLogTooltip": "记录error消息",
+  "TraceLogTooltip": "记录trace消息",
+  "GuestLogTooltip": "记录guest消息",
+  "FileAccessLogTooltip": "记录文件访问消息",
+  "FSAccessLogModeTooltip": "记录FS访问消息，输出到控制台。可选的模式是0-3",
+  "DeveloperOptionTooltip": "使用请谨慎",
+  "OpenGlLogLevel": "需要打开适当的日志等级",
+  "DebugLogTooltip": "记录debug消息",
+  "LoadApplicationFileTooltip": "选择Switch格式的游戏并加载",
+  "LoadApplicationFolderTooltip": "选择一个解包后格式的Switch游戏并加载",
+  "OpenRyujinxFolderTooltip": "打开Ryujinx系统目录",
+  "OpenRyujinxLogsTooltip": "打开日志存放的目录",
+  "ExitTooltip": "关闭Ryujinx",
+  "OpenSettingsTooltip": "打开设置窗口",
+  "OpenProfileManagerTooltip": "打开用户账号管理器",
+  "StopEmulationTooltip": "停止运行当前游戏并回到选择界面",
+  "CheckUpdatesTooltip": "检查新版本Ryujinx",
+  "OpenAboutTooltip": "打开'关于'窗口",
+  "GridSize": "网格尺寸",
+  "GridSizeTooltip": "调整网格模式的大小",
+  "SettingsTabSystemSystemLanguageBrazilianPortuguese": "巴西葡萄牙语",
+  "AboutRyujinxContributorsButtonHeader": "查看所有参与者",
+  "SettingsTabSystemAudioVolume": "音量: ",
+  "AudioVolumeTooltip": "调节音量",
+  "SettingsTabSystemEnableInternetAccess": "启用网络连接",
+  "EnableInternetAccessTooltip": "开启互联网访问。此选项打开后，效果类似于Switch连接到互联网的状态。注意即使此选项关闭，应用程序也偶尔有可能连接到网络",
+  "GameListContextMenuManageCheatToolTip": "管理金手指",
+  "GameListContextMenuManageCheat": "管理金手指",
+  "ControllerSettingsStickRange": "范围",
+  "DialogStopEmulationTitle": "Ryujinx - 停止模拟",
+  "DialogStopEmulationMessage": "是否确定停止模拟?",
+  "SettingsTabCpu": "CPU",
+  "SettingsTabAudio": "音频",
+  "SettingsTabNetwork": "网络",
+  "SettingsTabNetworkConnection": "网络连接",
+  "SettingsTabCpuCache": "CPU 缓存",
+  "SettingsTabCpuMemory": "CPU 内存",
+  "DialogUpdaterFlatpakNotSupportedMessage": "请通过 FlatHub 更新 Ryujinx。",
+  "UpdaterDisabledWarningTitle": "更新已禁用!",
+  "GameListContextMenuOpenSdModsDirectory": "打开Atmosphere MOD目录",
+  "GameListContextMenuOpenSdModsDirectoryToolTip": "打开包含应用程序MOD的其他Atmosphere SD卡目录",
+  "ControllerSettingsRotate90": "顺时针旋转 90°",
+  "IconSize": "图标尺寸",
+  "IconSizeTooltip": "更改游戏图标大小",
+  "MenuBarOptionsShowConsole": "显示控制台",
+  "ShaderCachePurgeError": "清除着色器缓存时出错: {0}: {1}",
+  "UserErrorNoKeys": "找不到密钥",
+  "UserErrorNoFirmware": "找不到固件",
+  "UserErrorFirmwareParsingFailed": "固件解析错误",
+  "UserErrorApplicationNotFound": "找不到应用程序",
+  "UserErrorUnknown": "未知错误",
+  "UserErrorUndefined": "未定义错误",
+  "UserErrorNoKeysDescription": "Ryujinx找不到 'prod.keys' 文件",
+  "UserErrorNoFirmwareDescription": "Ryujinx找不到任何已安装的固件",
+  "UserErrorFirmwareParsingFailedDescription": "Ryujinx无法解密选择的固件。通常是由于过旧的密钥。",
+  "UserErrorApplicationNotFoundDescription": "Ryujinx在选中路径找不到有效的应用程序。",
+  "UserErrorUnknownDescription": "发生未知错误！",
+  "UserErrorUndefinedDescription": "发生了未定义错误！此类错误不应出现，请联系开发人员！",
+  "OpenSetupGuideMessage": "打开设置教程",
+  "NoUpdate": "没有新版",
+  "TitleUpdateVersionLabel": "版本 {0} - {1}",
+  "RyujinxInfo": "Ryujinx - 信息",
+  "RyujinxConfirm": "Ryujinx - 确认",
+  "FileDialogAllTypes": "全部类型",
+  "Never": "从不",
+  "SwkbdMinCharacters": "至少应为 {0} 个字长",
+  "SwkbdMinRangeCharacters": "必须为 {0}-{1} 个字长",
+  "SoftwareKeyboard": "软件键盘",
+  "DialogControllerAppletMessagePlayerRange": "游戏需要 {0} 个玩家()持有:\n\nTYPES: {1}\n\nPLAYERS: {2}\n\n{3}请打开设置界面，配置手柄；或者关闭窗口。",
+  "DialogControllerAppletMessage": "游戏需要刚好 {0} 个玩家()持有 with:\n\nTYPES: {1}\n\nPLAYERS: {2}\n\n{3}请打开设置界面，配置手柄；或者关闭窗口。",
+  "DialogControllerAppletDockModeSet": "现在处于主机模式，无法使用掌机操作方式\n\n",
+  "UpdaterRenaming": "正在删除旧文件...",
+  "UpdaterRenameFailed": "更新过程中无法重命名文件: {0}",
+  "UpdaterAddingFiles": "安装更新中...",
+  "UpdaterExtracting": "正在提取更新...",
+  "UpdaterDownloading": "下载新版本中...",
+  "Game": "游戏",
+  "Docked": "主机模式",
+  "Handheld": "掌机模式",
+  "ConnectionError": "连接错误。",
+  "AboutPageDeveloperListMore": "{0} 以及等人...",
+  "ApiError": "API错误。",
+  "LoadingHeading": "正在加载 {0}",
+  "CompilingPPTC": "编译PPTC中",
+  "CompilingShaders": "编译着色器中",
+  "AllKeyboards": "所有键盘",
+  "OpenFileDialogTitle": "选择支持的文件格式",
+  "OpenFolderDialogTitle": "选择一个包含解包游戏的文件夹",
+  "AllSupportedFormats": "全部支持的格式",
+  "RyujinxUpdater": "Ryujinx 更新程序"
+}

Ryujinx.Ava/Assets/Styles/BaseDark.xaml

@@ -1,9 +1,7 @@
-<Styles
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StyleInclude Source="avares://Ryujinx.Ava/Assets/Styles/Styles.xaml" />
     <Design.PreviewWith>
-        <Border Padding="20" Height="2000">
+        <Border Height="2000" Padding="20">
             <StackPanel Spacing="5">
                 <TextBlock Text="Code Font Family" />
                 <Grid RowDefinitions="*,Auto">
@@ -27,8 +25,12 @@
                             Name="btnRem"
                             HorizontalAlignment="Right"
                             Content="Add" />
-                        <TextBox Width="100" VerticalAlignment="Center" Text="Rrrrr" Watermark="Hello"
-                                 UseFloatingWatermark="True" />
+                        <TextBox
+                            Width="100"
+                            VerticalAlignment="Center"
+                            Text="Rrrrr"
+                            UseFloatingWatermark="True"
+                            Watermark="Hello" />
                         <CheckBox>Test Check</CheckBox>
                     </StackPanel>
                 </Grid>

Ryujinx.Ava/Assets/Styles/BaseLight.xaml

@@ -1,9 +1,7 @@
-<Styles
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StyleInclude Source="avares://Ryujinx.Ava/Assets/Styles/Styles.xaml" />
     <Design.PreviewWith>
-        <Border Padding="20" Height="2000">
+        <Border Height="2000" Padding="20">
             <StackPanel Spacing="5">
                 <TextBlock Text="Code Font Family" />
                 <Grid RowDefinitions="*,Auto">
@@ -27,8 +25,12 @@
                             Name="btnRem"
                             HorizontalAlignment="Right"
                             Content="Add" />
-                        <TextBox Width="100" VerticalAlignment="Center" Text="Rrrrr" Watermark="Hello"
-                                 UseFloatingWatermark="True" />
+                        <TextBox
+                            Width="100"
+                            VerticalAlignment="Center"
+                            Text="Rrrrr"
+                            UseFloatingWatermark="True"
+                            Watermark="Hello" />
                         <CheckBox>Test Check</CheckBox>
                     </StackPanel>
                 </Grid>

Ryujinx.Ava/Assets/Styles/Styles.xaml

@@ -1,10 +1,10 @@
 <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:sys="clr-namespace:System;assembly=netstandard">
+    xmlns:sys="clr-namespace:System;assembly=netstandard"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia">
     <Design.PreviewWith>
-        <Border Padding="20" Height="2000">
+        <Border Height="2000" Padding="20">
             <StackPanel Spacing="5">
                 <TextBlock Text="Code Font Family" />
                 <Grid RowDefinitions="*,Auto">
@@ -22,15 +22,19 @@
                     <StackPanel Orientation="Horizontal">
                         <ToggleButton
                             Name="btnAdd"
-                            HorizontalAlignment="Right"
                             Height="28"
+                            HorizontalAlignment="Right"
                             Content="Addy" />
                         <Button
                             Name="btnRem"
                             HorizontalAlignment="Right"
                             Content="Add" />
-                        <TextBox Width="100" VerticalAlignment="Center" Text="Rrrrr" Watermark="Hello"
-                                 UseFloatingWatermark="True" />
+                        <TextBox
+                            Width="100"
+                            VerticalAlignment="Center"
+                            Text="Rrrrr"
+                            UseFloatingWatermark="True"
+                            Watermark="Hello" />
                         <CheckBox>Test Check</CheckBox>
                     </StackPanel>
                 </Grid>
@@ -62,13 +66,10 @@
     <Style Selector="Image.huge">
         <Setter Property="Width" Value="120" />
     </Style>
-    <Style Selector="RadioButton">
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-    </Style>
-    <Style Selector="#TitleBarHost > Image">
+    <Style Selector="#TitleBarHost &gt; Image">
         <Setter Property="Margin" Value="10" />
     </Style>
-    <Style Selector="#TitleBarHost > Label">
+    <Style Selector="#TitleBarHost &gt; Label">
         <Setter Property="Margin" Value="5" />
         <Setter Property="FontSize" Value="14" />
     </Style>
@@ -160,11 +161,11 @@
         <Setter Property="Background" Value="{DynamicResource ThemeControlBorderColor}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ThemeControlBorderColor}" />
     </Style>
-    <Style Selector="TabItem &gt; ScrollViewer">
+    <Style Selector="TabItem > ScrollViewer">
         <Setter Property="Background" Value="{DynamicResource ThemeBackgroundColor}" />
         <Setter Property="Margin" Value="0,-5,0,0" />
     </Style>
-    <Style Selector="TabItem &gt; ScrollViewer &gt; Border">
+    <Style Selector="TabItem > ScrollViewer > Border">
         <Setter Property="BorderThickness" Value="0,1,0,0" />
         <Setter Property="Background" Value="{DynamicResource ThemeBackgroundColor}" />
         <Setter Property="BorderBrush" Value="{DynamicResource HighlightBrush}" />
@@ -225,12 +226,12 @@
         <StaticResource x:Key="ListViewItemBackgroundPointerOver" ResourceKey="SystemAccentColorDark2" />
         <StaticResource x:Key="ListViewItemBackgroundSelectedPressed" ResourceKey="ThemeAccentColorBrush" />
         <StaticResource x:Key="ListViewItemBackgroundSelectedPointerOver" ResourceKey="SystemAccentColorDark2" />
-        <SolidColorBrush x:Key="DataGridGridLinesBrush"
-                         Color="{DynamicResource SystemBaseMediumLowColor}"
-                         Opacity="0.4" />
+        <SolidColorBrush
+            x:Key="DataGridGridLinesBrush"
+            Opacity="0.4"
+            Color="{DynamicResource SystemBaseMediumLowColor}" />
         <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush" Color="{DynamicResource DataGridSelectionColor}" />
-        <SolidColorBrush x:Key="MenuFlyoutPresenterBorderBrush"
-                         Color="{DynamicResource MenuFlyoutPresenterBorderColor}" />
+        <SolidColorBrush x:Key="MenuFlyoutPresenterBorderBrush" Color="{DynamicResource MenuFlyoutPresenterBorderColor}" />
         <SolidColorBrush x:Key="ThemeAccentColorBrush" Color="{DynamicResource SystemAccentColor}" />
         <SolidColorBrush x:Key="ListBoxBackground" Color="{DynamicResource ThemeContentBackgroundColor}" />
         <SolidColorBrush x:Key="ThemeForegroundBrush" Color="{DynamicResource ThemeForegroundColor}" />
@@ -241,7 +242,6 @@
         <SolidColorBrush x:Key="SplitButtonBackgroundCheckedDisabled" Color="#00E81123" />
         <Thickness x:Key="PageMargin">40 0 40 0</Thickness>
         <Thickness x:Key="Margin">0 5 0 5</Thickness>
-        <Thickness x:Key="TextMargin">0 4 0 0</Thickness>
         <Thickness x:Key="MenuItemPadding">5 0 5 0</Thickness>
         <Color x:Key="MenuFlyoutPresenterBorderColor">#00000000</Color>
         <Color x:Key="SystemAccentColor">#FF00C3E3</Color>

Ryujinx.Ava/Common/ApplicationHelper.cs

@@ -28,7 +28,7 @@ using Path = System.IO.Path;
 
 namespace Ryujinx.Ava.Common
 {
-    public static class ApplicationHelper
+    internal static class ApplicationHelper
     {
         private static HorizonClient _horizonClient;
         private static AccountManager _accountManager;

Ryujinx.Ava/Common/Locale/LocaleExtension.cs

@@ -5,7 +5,7 @@ using System;
 
 namespace Ryujinx.Ava.Common.Locale
 {
-    public class LocaleExtension : MarkupExtension
+    internal class LocaleExtension : MarkupExtension
     {
         public LocaleExtension(string key)
         {

Ryujinx.Ava/Common/Locale/LocaleManager.cs

@@ -40,7 +40,7 @@ namespace Ryujinx.Ava.Common.Locale
             }
 
             // Load english first, if the target language translation is incomplete, we default to english.
-            LoadLanguage(DefaultLanguageCode);
+            LoadDefaultLanguage();
 
             if (localeLanguageCode != DefaultLanguageCode)
             {
@@ -79,6 +79,11 @@ namespace Ryujinx.Ava.Common.Locale
             OnPropertyChanged("Item");
         }
 
+        public void LoadDefaultLanguage()
+        {
+            LoadLanguage(DefaultLanguageCode);
+        }
+
         public void LoadLanguage(string languageCode)
         {
             string languageJson = EmbeddedResources.ReadAllText($"Ryujinx.Ava/Assets/Locales/{languageCode}.json");

Ryujinx.Ava/Input/AvaloniaKeyboard.cs

@@ -10,7 +10,7 @@ using Key = Ryujinx.Input.Key;
 
 namespace Ryujinx.Ava.Input
 {
-    public class AvaloniaKeyboard : IKeyboard
+    internal class AvaloniaKeyboard : IKeyboard
     {
         private readonly List<ButtonMappingEntry> _buttonsUserMapping;
         private readonly AvaloniaKeyboardDriver _driver;

Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs

@@ -10,7 +10,7 @@ using Key = Ryujinx.Input.Key;
 
 namespace Ryujinx.Ava.Input
 {
-    public class AvaloniaKeyboardDriver : IGamepadDriver
+    internal class AvaloniaKeyboardDriver : IGamepadDriver
     {
         private static readonly string[] _keyboardIdentifers = new string[1] { "0" };
         private readonly Control _control;

Ryujinx.Ava/Input/AvaloniaMappingHelper.cs

@@ -5,7 +5,7 @@ using AvaKey = Avalonia.Input.Key;
 
 namespace Ryujinx.Ava.Input
 {
-    public static class AvaloniaMappingHelper
+    internal static class AvaloniaMappingHelper
     {
         private static readonly AvaKey[] _keyMapping = new AvaKey[(int)Key.Count]
         {

Ryujinx.Ava/Input/AvaloniaMouse.cs

@@ -6,7 +6,7 @@ using System.Numerics;
 
 namespace Ryujinx.Ava.Input
 {
-    public class AvaloniaMouse : IMouse
+    internal class AvaloniaMouse : IMouse
     {
         private AvaloniaMouseDriver _driver;
 

Ryujinx.Ava/Input/AvaloniaMouseDriver.cs

@@ -9,7 +9,7 @@ using Size = System.Drawing.Size;
 
 namespace Ryujinx.Ava.Input
 {
-    public class AvaloniaMouseDriver : IGamepadDriver
+    internal class AvaloniaMouseDriver : IGamepadDriver
     {
         private Control _widget;
         private bool _isDisposed;

Ryujinx.Ava/Modules/Updater/Updater.cs

@@ -23,7 +23,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Modules
 {
-    public static class Updater
+    internal static class Updater
     {
         private const string GitHubApiURL = "https://api.github.com";
         internal static bool Running;

Ryujinx.Ava/Program.cs

@@ -185,7 +185,7 @@ namespace Ryujinx.Ava
             }
         }
 
-        private static void ReloadConfig()
+        public static void ReloadConfig()
         {
             string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json");
             string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, "Config.json");

Ryujinx.Ava/Ryujinx.Ava.csproj

@@ -18,16 +18,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.14" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.14" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.14" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.14" />
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.14" />
-    <PackageReference Include="Avalonia.Svg" Version="0.10.13" />
-    <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.13" />
+    <PackageReference Include="Avalonia" Version="0.10.15" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.15" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.15" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.15" />
+    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="0.10.15" />
+    <PackageReference Include="Avalonia.Svg" Version="0.10.14" />
+    <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.14" />
     <PackageReference Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" />
-    <PackageReference Include="DynamicData" Version="7.7.14" />
-    <PackageReference Include="FluentAvaloniaUI" Version="1.3.4" />
+    <PackageReference Include="DynamicData" Version="7.9.4" />
+    <PackageReference Include="FluentAvaloniaUI" Version="1.4.1" />
 
     <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
     <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="4.4.0-build9" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
@@ -123,6 +123,7 @@
     <None Remove="Assets\Locales\pt_BR.json" />
     <None Remove="Assets\Locales\ru_RU.json" />
     <None Remove="Assets\Locales\tr_TR.json" />
+    <None Remove="Assets\Locales\zh_CN.json" />
     <None Remove="Assets\Styles\Styles.xaml" />
     <None Remove="Assets\Styles\BaseDark.xaml" />
     <None Remove="Assets\Styles\BaseLight.xaml" />
@@ -139,6 +140,7 @@
     <EmbeddedResource Include="Assets\Locales\pt_BR.json" />
     <EmbeddedResource Include="Assets\Locales\ru_RU.json" />
     <EmbeddedResource Include="Assets\Locales\tr_TR.json" />
+    <EmbeddedResource Include="Assets\Locales\zh_CN.json" />
     <EmbeddedResource Include="Assets\Styles\Styles.xaml" />
   </ItemGroup>
 </Project>

Ryujinx.Ava/Ui/Applet/AvaHostUiHandler.cs

@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Threading;
+using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Ui.Controls;
 using Ryujinx.Ava.Ui.Windows;
@@ -45,13 +46,61 @@ namespace Ryujinx.Ava.Ui.Applet
 
         public bool DisplayMessageDialog(string title, string message)
         {
-            // TODO : Show controller applet. Needs settings window to be implemented.
-            Dispatcher.UIThread.InvokeAsync(() =>
+            ManualResetEvent dialogCloseEvent = new(false);
+
+            bool okPressed = false;
+
+            Dispatcher.UIThread.InvokeAsync(async () =>
             {
-                ContentDialogHelper.ShowNotAvailableMessage(_parent);
+                try
+                {
+                    ManualResetEvent deferEvent = new(false);
+
+                    bool opened = false;
+
+                    UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent, 
+                       title, 
+                       message, 
+                       "", 
+                       LocaleManager.Instance["DialogOpenSettingsWindowLabel"], 
+                       "", 
+                       LocaleManager.Instance["SettingsButtonClose"], 
+                       (int)Symbol.Important, 
+                       deferEvent,
+                       async (window) =>
+                       {
+                           if (opened)
+                           {
+                               return;
+                           }
+
+                           opened = true;
+
+                           _parent.SettingsWindow = new SettingsWindow(_parent.VirtualFileSystem, _parent.ContentManager);
+
+                           await _parent.SettingsWindow.ShowDialog(window);
+
+                           opened = false;
+                       });
+
+                    if (response == UserResult.Ok)
+                    {
+                        okPressed = true;
+                    }
+
+                    dialogCloseEvent.Set();
+                }
+                catch (Exception ex)
+                {
+                    ContentDialogHelper.CreateErrorDialog(_parent, string.Format(LocaleManager.Instance["DialogMessageDialogErrorExceptionMessage"], ex));
+
+                    dialogCloseEvent.Set();
+                }
             });
 
-            return true;
+            dialogCloseEvent.WaitOne();
+
+            return okPressed;
         }
 
         public bool DisplayInputDialog(SoftwareKeyboardUiArgs args, out string userText)

Ryujinx.Ava/Ui/Applet/ErrorAppletWindow.axaml

@@ -1,17 +1,21 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        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"
-        mc:Ignorable="d"
-        x:Class="Ryujinx.Ava.Ui.Applet.ErrorAppletWindow"
-        xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-        CanResize="False"
-        SizeToContent="Height"
-        Width="450"
-        Height="340"
-        Title="{locale:Locale ErrorWindowTitle}">
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="20">
+<Window
+    x:Class="Ryujinx.Ava.Ui.Applet.ErrorAppletWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
+    Title="{locale:Locale ErrorWindowTitle}"
+    Width="450"
+    Height="340"
+    CanResize="False"
+    SizeToContent="Height"
+    mc:Ignorable="d">
+    <Grid
+        Margin="20"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
@@ -21,11 +25,28 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <Image Grid.Row="1" Grid.RowSpan="2" Margin="5, 10, 20 , 10" Grid.Column="0"
-               Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" Height="80" MinWidth="50" />
-        <TextBlock Grid.Row="1" Margin="10" Grid.Column="1" VerticalAlignment="Stretch" TextWrapping="Wrap"
-                   Text="{Binding Message}" />
-        <StackPanel Name="ButtonStack" Margin="10" Spacing="10" Grid.Row="2" Grid.Column="1"
-                    HorizontalAlignment="Right" Orientation="Horizontal" />
+        <Image
+            Grid.Row="1"
+            Grid.RowSpan="2"
+            Grid.Column="0"
+            Height="80"
+            MinWidth="50"
+            Margin="5,10,20,10"
+            Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" />
+        <TextBlock
+            Grid.Row="1"
+            Grid.Column="1"
+            Margin="10"
+            VerticalAlignment="Stretch"
+            Text="{Binding Message}"
+            TextWrapping="Wrap" />
+        <StackPanel
+            Name="ButtonStack"
+            Grid.Row="2"
+            Grid.Column="1"
+            Margin="10"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal"
+            Spacing="10" />
     </Grid>
 </Window>

Ryujinx.Ava/Ui/Applet/ErrorAppletWindow.axaml.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Applet
 {
-    public class ErrorAppletWindow : StyleableWindow
+    internal class ErrorAppletWindow : StyleableWindow
     {
         private readonly Window _owner;
         private object _buttonResponse;

Ryujinx.Ava/Ui/Applet/SwkbdAppletDialog.axaml

@@ -1,12 +1,16 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
-             mc:Ignorable="d"
-             x:Class="Ryujinx.Ava.Ui.Controls.SwkbdAppletDialog"
-             Width="400">
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="20">
+<UserControl
+    x:Class="Ryujinx.Ava.Ui.Controls.SwkbdAppletDialog"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    Width="400"
+    mc:Ignorable="d">
+    <Grid
+        Margin="20"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -18,15 +22,43 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <Image Grid.Row="1" VerticalAlignment="Center" Grid.RowSpan="5" Margin="5, 10, 20 , 10"
-               Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" Height="80"
-               MinWidth="50" />
-        <TextBlock Grid.Row="1" Margin="5" Grid.Column="1" Text="{Binding MainText}" TextWrapping="Wrap" />
-        <TextBlock Grid.Row="2" Margin="5" Grid.Column="1" Text="{Binding SecondaryText}" TextWrapping="Wrap" />
-        <TextBox Name="Input" KeyUp="Message_KeyUp" UseFloatingWatermark="True" TextInput="Message_TextInput"
-                 Text="{Binding Message}" Grid.Row="2"
-                 Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="Wrap" />
-        <TextBlock Name="Error" Margin="5" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Stretch"
-                   TextWrapping="Wrap" />
+        <Image
+            Grid.Row="1"
+            Grid.RowSpan="5"
+            Height="80"
+            MinWidth="50"
+            Margin="5,10,20,10"
+            VerticalAlignment="Center"
+            Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" />
+        <TextBlock
+            Grid.Row="1"
+            Grid.Column="1"
+            Margin="5"
+            Text="{Binding MainText}"
+            TextWrapping="Wrap" />
+        <TextBlock
+            Grid.Row="2"
+            Grid.Column="1"
+            Margin="5"
+            Text="{Binding SecondaryText}"
+            TextWrapping="Wrap" />
+        <TextBox
+            Name="Input"
+            Grid.Row="2"
+            Grid.Column="1"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Center"
+            KeyUp="Message_KeyUp"
+            Text="{Binding Message}"
+            TextInput="Message_TextInput"
+            TextWrapping="Wrap"
+            UseFloatingWatermark="True" />
+        <TextBlock
+            Name="Error"
+            Grid.Row="4"
+            Grid.Column="1"
+            Margin="5"
+            HorizontalAlignment="Stretch"
+            TextWrapping="Wrap" />
     </Grid>
 </UserControl>

Ryujinx.Ava/Ui/Applet/SwkbdAppletDialog.axaml.cs

@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class SwkbdAppletDialog : UserControl
+    internal class SwkbdAppletDialog : UserControl
     {
         private Predicate<int> _checkLength;
         private int _inputMax;

Ryujinx.Ava/Ui/Controls/AvaloniaGlxContext.cs

@@ -5,7 +5,7 @@ using System.Runtime.Versioning;
 namespace Ryujinx.Ava.Ui.Controls
 {
     [SupportedOSPlatform("linux")]
-    public class AvaloniaGlxContext : SPB.Platform.GLX.GLXOpenGLContext
+    internal class AvaloniaGlxContext : SPB.Platform.GLX.GLXOpenGLContext
     {
         public AvaloniaGlxContext(IntPtr handle)
             : base(FramebufferFormat.Default, 0, 0, 0, false, null)

Ryujinx.Ava/Ui/Controls/AvaloniaWglContext.cs

@@ -5,7 +5,7 @@ using System.Runtime.Versioning;
 namespace Ryujinx.Ava.Ui.Controls
 {
     [SupportedOSPlatform("windows")]
-    public class AvaloniaWglContext : SPB.Platform.WGL.WGLOpenGLContext
+    internal class AvaloniaWglContext : SPB.Platform.WGL.WGLOpenGLContext
     {
         public AvaloniaWglContext(IntPtr handle)
             : base(FramebufferFormat.Default, 0, 0, 0, false, null)

Ryujinx.Ava/Ui/Controls/BitmapArrayValueConverter.cs

@@ -7,7 +7,7 @@ using System.IO;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class BitmapArrayValueConverter : IValueConverter
+    internal class BitmapArrayValueConverter : IValueConverter
     {
         public static BitmapArrayValueConverter Instance = new();
 

Ryujinx.Ava/Ui/Controls/ButtonKeyAssigner.cs

@@ -0,0 +1,118 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.LogicalTree;
+using Avalonia.Threading;
+using Ryujinx.Input;
+using Ryujinx.Input.Assigner;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.Ui.Controls
+{
+    internal class ButtonKeyAssigner
+    {
+        internal class ButtonAssignedEventArgs : EventArgs
+        {
+            public ToggleButton Button { get; }
+            public bool IsAssigned { get; }
+
+            public ButtonAssignedEventArgs(ToggleButton button, bool isAssigned)
+            {
+                Button = button;
+                IsAssigned = isAssigned;
+            }
+        }
+        
+        public ToggleButton ToggledButton { get; set; }
+
+        private bool _isWaitingForInput;
+        private bool _shouldUnbind;
+        public event EventHandler<ButtonAssignedEventArgs> ButtonAssigned;
+
+        public ButtonKeyAssigner(ToggleButton toggleButton)
+        {
+            ToggledButton = toggleButton;
+        }
+
+        public async void GetInputAndAssign(IButtonAssigner assigner, IKeyboard keyboard = null)
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+                ToggledButton.IsChecked = true;
+            });
+
+            if (_isWaitingForInput)
+            {
+                Dispatcher.UIThread.Post(() =>
+                {
+                    Cancel();
+                });
+
+                return;
+            }
+
+            _isWaitingForInput = true;
+
+            assigner.Initialize();
+
+            await Task.Run(async () =>
+            {
+                while (true)
+                {
+                    if (!_isWaitingForInput)
+                    {
+                        return;
+                    }
+
+                    await Task.Delay(10);
+
+                    assigner.ReadInput();
+
+                    if (assigner.HasAnyButtonPressed() || assigner.ShouldCancel() || (keyboard != null && keyboard.IsPressed(Key.Escape)))
+                    {
+                        break;
+                    }
+                }
+            });
+
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                string pressedButton = assigner.GetPressedButton();
+
+                if (_shouldUnbind)
+                {
+                    SetButtonText(ToggledButton, "Unbound");
+                }
+                else if (pressedButton != "")
+                {
+                    SetButtonText(ToggledButton, pressedButton);
+                }
+
+                _shouldUnbind = false;
+                _isWaitingForInput = false;
+
+                ToggledButton.IsChecked = false;
+
+                ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton != null));
+
+                static void SetButtonText(ToggleButton button, string text)
+                {
+                    ILogical textBlock = button.GetLogicalDescendants().First(x => x is TextBlock);
+
+                    if (textBlock != null && textBlock is TextBlock block)
+                    {
+                        block.Text = text;
+                    }
+                }
+            });
+        }
+
+        public void Cancel(bool shouldUnbind = false)
+        {
+            _isWaitingForInput = false;
+            ToggledButton.IsChecked = false;
+            _shouldUnbind = shouldUnbind;
+        }
+    }
+}

Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs

@@ -97,10 +97,12 @@ namespace Ryujinx.Ava.Ui.Controls
                 });
                 contentDialog.SecondaryButtonCommand = MiniCommand.Create(() =>
                 {
+                    contentDialog.PrimaryButtonClick -= DeferClose;
                     result = UserResult.No;
                 });
                 contentDialog.CloseButtonCommand = MiniCommand.Create(() =>
                 {
+                    contentDialog.PrimaryButtonClick -= DeferClose;
                     result = UserResult.Cancel;
                 });
                 await contentDialog.ShowAsync(ContentDialogPlacement.Popup);
@@ -115,6 +117,8 @@ namespace Ryujinx.Ava.Ui.Controls
                     return;
                 }
 
+                contentDialog.PrimaryButtonClick -= DeferClose;
+
                 startedDeferring = true;
 
                 var deferral = args.GetDeferral();

Ryujinx.Ava/Ui/Controls/GameGridView.axaml

@@ -1,188 +1,219 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-             xmlns:controls="clr-namespace:Ryujinx.Ava.Ui.Controls"
-             xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.Ui.Controls.GameGridView">
-	<UserControl.Resources>
-		<controls:BitmapArrayValueConverter x:Key="ByteImage" />
-		<MenuFlyout x:Key="GameContextMenu" Opened="MenuBase_OnMenuOpened">
-			<MenuItem
+<UserControl
+    x:Class="Ryujinx.Ava.Ui.Controls.GameGridView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Ryujinx.Ava.Ui.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox"
+    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+        <controls:BitmapArrayValueConverter x:Key="ByteImage" />
+        <MenuFlyout x:Key="GameContextMenu" Opened="MenuBase_OnMenuOpened">
+            <MenuItem
                 Command="{Binding ToggleFavorite}"
                 Header="{locale:Locale GameListContextMenuToggleFavorite}"
                 ToolTip.Tip="{locale:Locale GameListContextMenuToggleFavoriteToolTip}" />
-			<Separator />
-			<MenuItem
+            <Separator />
+            <MenuItem
                 Command="{Binding OpenUserSaveDirectory}"
                 Header="{locale:Locale GameListContextMenuOpenUserSaveDirectory}"
                 ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
-			<MenuItem
+            <MenuItem
                 Command="{Binding OpenDeviceSaveDirectory}"
                 Header="{locale:Locale GameListContextMenuOpenUserDeviceDirectory}"
                 ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserDeviceDirectoryToolTip}" />
-			<MenuItem
+            <MenuItem
                 Command="{Binding OpenBcatSaveDirectory}"
                 Header="{locale:Locale GameListContextMenuOpenUserBcatDirectory}"
                 ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserBcatDirectoryToolTip}" />
-			<Separator />
-			<MenuItem
+            <Separator />
+            <MenuItem
                 Command="{Binding OpenTitleUpdateManager}"
                 Header="{locale:Locale GameListContextMenuManageTitleUpdates}"
                 ToolTip.Tip="{locale:Locale GameListContextMenuManageTitleUpdatesToolTip}" />
-			<MenuItem
+            <MenuItem
                 Command="{Binding OpenDlcManager}"
                 Header="{locale:Locale GameListContextMenuManageDlc}"
                 ToolTip.Tip="{locale:Locale GameListContextMenuManageDlcToolTip}" />
-			<MenuItem
+            <MenuItem
                 Command="{Binding OpenCheatManager}"
                 Header="{locale:Locale GameListContextMenuManageCheat}"
                 ToolTip.Tip="{locale:Locale GameListContextMenuManageCheatToolTip}" />
-			<MenuItem
+            <MenuItem
                 Command="{Binding OpenModsDirectory}"
                 Header="{locale:Locale GameListContextMenuOpenModsDirectory}"
                 ToolTip.Tip="{locale:Locale GameListContextMenuOpenModsDirectoryToolTip}" />
-			<MenuItem
+            <MenuItem
                 Command="{Binding OpenSdModsDirectory}"
                 Header="{locale:Locale GameListContextMenuOpenSdModsDirectory}"
                 ToolTip.Tip="{locale:Locale GameListContextMenuOpenSdModsDirectoryToolTip}" />
-			<Separator />
-			<MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}">
-				<MenuItem
+            <Separator />
+            <MenuItem Header="{locale:Locale GameListContextMenuCacheManagement}">
+                <MenuItem
                     Command="{Binding PurgePtcCache}"
                     Header="{locale:Locale GameListContextMenuCacheManagementPurgePptc}"
                     ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgePptcToolTip}" />
-				<MenuItem
+                <MenuItem
                     Command="{Binding PurgeShaderCache}"
                     Header="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCache}"
                     ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementPurgeShaderCacheToolTip}" />
-				<MenuItem
+                <MenuItem
                     Command="{Binding OpenPtcDirectory}"
                     Header="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectory}"
                     ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenPptcDirectoryToolTip}" />
-				<MenuItem
+                <MenuItem
                     Command="{Binding OpenShaderCacheDirectory}"
                     Header="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectory}"
                     ToolTip.Tip="{locale:Locale GameListContextMenuCacheManagementOpenShaderCacheDirectoryToolTip}" />
-			</MenuItem>
-			<MenuItem Header="{locale:Locale GameListContextMenuExtractData}">
-				<MenuItem
+            </MenuItem>
+            <MenuItem Header="{locale:Locale GameListContextMenuExtractData}">
+                <MenuItem
                     Command="{Binding ExtractExeFs}"
                     Header="{locale:Locale GameListContextMenuExtractDataExeFS}"
                     ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataExeFSToolTip}" />
-				<MenuItem
+                <MenuItem
                     Command="{Binding ExtractRomFs}"
                     Header="{locale:Locale GameListContextMenuExtractDataRomFS}"
                     ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataRomFSToolTip}" />
-				<MenuItem
+                <MenuItem
                     Command="{Binding ExtractLogo}"
                     Header="{locale:Locale GameListContextMenuExtractDataLogo}"
                     ToolTip.Tip="{locale:Locale GameListContextMenuExtractDataLogoToolTip}" />
-			</MenuItem>
-		</MenuFlyout>
-	</UserControl.Resources>
-	<Grid>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-		<ListBox Grid.Row="0"
-                 Padding="8"
-                 HorizontalAlignment="Stretch"
-                 DoubleTapped="GameList_DoubleTapped"
-                 SelectionChanged="GameList_SelectionChanged"
-                 ContextFlyout="{StaticResource GameContextMenu}"
-                 VerticalAlignment="Stretch"
-                 Items="{Binding AppsObservableList}">
-			<ListBox.ItemsPanel>
-				<ItemsPanelTemplate>
-					<flex:FlexPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch" JustifyContent="Center"
-                                    AlignContent="FlexStart" />
-				</ItemsPanelTemplate>
-			</ListBox.ItemsPanel>
-			<ListBox.Styles>
-				<Style Selector="ListBoxItem">
-					<Setter Property="Padding" Value="0" />
-					<Setter Property="Margin" Value="5" />
-					<Setter Property="CornerRadius" Value="5" />
-					<Setter Property="Background" Value="{DynamicResource SystemAccentColorDark3}" />
-					<Style.Animations>
-						<Animation Duration="0:0:0.7">
-							<KeyFrame Cue="0%">
-								<Setter Property="MaxWidth" Value="0"/>
-								<Setter Property="Opacity" Value="0.0"/>
-							</KeyFrame>
-							<KeyFrame Cue="50%">
-								<Setter Property="MaxWidth" Value="1000"/>
-								<Setter Property="Opacity" Value="0.3"/>
-							</KeyFrame>
-							<KeyFrame Cue="100%">
-								<Setter Property="MaxWidth" Value="1000"/>
-								<Setter Property="Opacity" Value="1.0"/>
-							</KeyFrame>
-						</Animation>
-					</Style.Animations>
-				</Style>
-			</ListBox.Styles>
-			<ListBox.ItemTemplate>
-				<DataTemplate>
-					<Grid>
-						<Grid.Styles>
-							<Style Selector="ui|SymbolIcon.small.icon">
-								<Setter Property="FontSize" Value="15" />
-							</Style>
-							<Style Selector="ui|SymbolIcon.normal.icon">
-								<Setter Property="FontSize" Value="19" />
-							</Style>
-							<Style Selector="ui|SymbolIcon.large.icon">
-								<Setter Property="FontSize" Value="23" />
-							</Style>
-							<Style Selector="ui|SymbolIcon.huge.icon">
-								<Setter Property="FontSize" Value="26" />
-							</Style>
-						</Grid.Styles>
-						<Border
-                            Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
-                            Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
-                            Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
-                            Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
+            </MenuItem>
+        </MenuFlyout>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <ListBox
+            Grid.Row="0"
+            Padding="8"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch"
+            ContextFlyout="{StaticResource GameContextMenu}"
+            DoubleTapped="GameList_DoubleTapped"
+            Items="{Binding AppsObservableList}"
+            SelectionChanged="GameList_SelectionChanged">
+            <ListBox.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <flex:FlexPanel
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        AlignContent="FlexStart"
+                        JustifyContent="Center" />
+                </ItemsPanelTemplate>
+            </ListBox.ItemsPanel>
+            <ListBox.Styles>
+                <Style Selector="ListBoxItem">
+                    <Setter Property="Padding" Value="0" />
+                    <Setter Property="Margin" Value="5" />
+                    <Setter Property="CornerRadius" Value="5" />
+                    <Setter Property="Background" Value="{DynamicResource SystemAccentColorDark3}" />
+                    <Style.Animations>
+                        <Animation Duration="0:0:0.7">
+                            <KeyFrame Cue="0%">
+                                <Setter Property="MaxWidth" Value="0" />
+                                <Setter Property="Opacity" Value="0.0" />
+                            </KeyFrame>
+                            <KeyFrame Cue="50%">
+                                <Setter Property="MaxWidth" Value="1000" />
+                                <Setter Property="Opacity" Value="0.3" />
+                            </KeyFrame>
+                            <KeyFrame Cue="100%">
+                                <Setter Property="MaxWidth" Value="1000" />
+                                <Setter Property="Opacity" Value="1.0" />
+                            </KeyFrame>
+                        </Animation>
+                    </Style.Animations>
+                </Style>
+            </ListBox.Styles>
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.Styles>
+                            <Style Selector="ui|SymbolIcon.small.icon">
+                                <Setter Property="FontSize" Value="15" />
+                            </Style>
+                            <Style Selector="ui|SymbolIcon.normal.icon">
+                                <Setter Property="FontSize" Value="19" />
+                            </Style>
+                            <Style Selector="ui|SymbolIcon.large.icon">
+                                <Setter Property="FontSize" Value="23" />
+                            </Style>
+                            <Style Selector="ui|SymbolIcon.huge.icon">
+                                <Setter Property="FontSize" Value="26" />
+                            </Style>
+                        </Grid.Styles>
+                        <Border
+                            Margin="0"
+                            Padding="{Binding $parent[UserControl].DataContext.GridItemPadding}"
                             HorizontalAlignment="Stretch"
-                            Padding="{Binding $parent[UserControl].DataContext.GridItemPadding}" CornerRadius="5"
-                            VerticalAlignment="Stretch" Margin="0" ClipToBounds="True">
-							<Grid Margin="0">
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" />
-								</Grid.RowDefinitions>
-								<Image HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0" Grid.Row="0"
-                                       Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
-								<StackPanel IsVisible="{Binding $parent[UserControl].DataContext.ShowNames}"
-                                            Height="50" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                            Margin="5" Grid.Row="1">
-									<TextBlock Text="{Binding TitleName}" TextAlignment="Center" TextWrapping="Wrap"
-                                               HorizontalAlignment="Stretch" />
-								</StackPanel>
-							</Grid>
-						</Border>
-						<ui:SymbolIcon Classes.icon="true" Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
-                               Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
-                               Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
-                               Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
-									    Foreground="Yellow" Symbol="StarFilled"
-                               IsVisible="{Binding Favorite}" Margin="5" VerticalAlignment="Top"
-                               HorizontalAlignment="Left" />
-						<ui:SymbolIcon Classes.icon="true" Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
-                               Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
-                               Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
-                               Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
-									    Foreground="Black" Symbol="Star"
-                               IsVisible="{Binding Favorite}" Margin="5" VerticalAlignment="Top"
-                               HorizontalAlignment="Left" />
-					</Grid>
-				</DataTemplate>
-			</ListBox.ItemTemplate>
-		</ListBox>
-	</Grid>
+                            VerticalAlignment="Stretch"
+                            Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
+                            Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
+                            Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
+                            Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
+                            ClipToBounds="True"
+                            CornerRadius="5">
+                            <Grid Margin="0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Image
+                                    Grid.Row="0"
+                                    Margin="0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Top"
+                                    Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Height="50"
+                                    Margin="5"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch"
+                                    IsVisible="{Binding $parent[UserControl].DataContext.ShowNames}">
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        Text="{Binding TitleName}"
+                                        TextAlignment="Center"
+                                        TextWrapping="Wrap" />
+                                </StackPanel>
+                            </Grid>
+                        </Border>
+                        <ui:SymbolIcon
+                            Margin="5"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
+                            Classes.icon="true"
+                            Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
+                            Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
+                            Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
+                            Foreground="Yellow"
+                            IsVisible="{Binding Favorite}"
+                            Symbol="StarFilled" />
+                        <ui:SymbolIcon
+                            Margin="5"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
+                            Classes.icon="true"
+                            Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
+                            Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
+                            Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
+                            Foreground="Black"
+                            IsVisible="{Binding Favorite}"
+                            Symbol="Star" />
+                    </Grid>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+    </Grid>
 </UserControl>

Ryujinx.Ava/Ui/Controls/GameListView.axaml

@@ -1,13 +1,16 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-             xmlns:controls="clr-namespace:Ryujinx.Ava.Ui.Controls"
-             xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.Ui.Controls.GameListView">
+<UserControl
+    x:Class="Ryujinx.Ava.Ui.Controls.GameListView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Ryujinx.Ava.Ui.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox"
+    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <controls:BitmapArrayValueConverter x:Key="ByteImage" />
         <MenuFlyout x:Key="GameContextMenu" Opened="MenuBase_OnMenuOpened">
@@ -88,18 +91,23 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <ListBox Grid.Row="0"
-                 Padding="8"
-                 HorizontalAlignment="Stretch"
-                 DoubleTapped="GameList_DoubleTapped"
-                 SelectionChanged="GameList_SelectionChanged"
-                 ContextFlyout="{StaticResource GameContextMenu}"
-                 VerticalAlignment="Stretch"
-                 Name="GameListBox"
-                 Items="{Binding AppsObservableList}">
+        <ListBox
+            Name="GameListBox"
+            Grid.Row="0"
+            Padding="8"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch"
+            ContextFlyout="{StaticResource GameContextMenu}"
+            DoubleTapped="GameList_DoubleTapped"
+            Items="{Binding AppsObservableList}"
+            SelectionChanged="GameList_SelectionChanged">
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Orientation="Vertical" Spacing="2" />
+                    <StackPanel
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="2" />
                 </ItemsPanelTemplate>
             </ListBox.ItemsPanel>
             <ListBox.Styles>
@@ -112,16 +120,16 @@
                     <Style.Animations>
                         <Animation Duration="0:0:0.7">
                             <KeyFrame Cue="0%">
-                                <Setter Property="MaxHeight" Value="0"/>
-                                <Setter Property="Opacity" Value="0.0"/>
+                                <Setter Property="MaxHeight" Value="0" />
+                                <Setter Property="Opacity" Value="0.0" />
                             </KeyFrame>
                             <KeyFrame Cue="50%">
-                                <Setter Property="MaxHeight" Value="1000"/>
-                                <Setter Property="Opacity" Value="0.3"/>
+                                <Setter Property="MaxHeight" Value="1000" />
+                                <Setter Property="Opacity" Value="0.3" />
                             </KeyFrame>
                             <KeyFrame Cue="100%">
-                                <Setter Property="MaxHeight" Value="1000"/>
-                                <Setter Property="Opacity" Value="1.0"/>
+                                <Setter Property="MaxHeight" Value="1000" />
+                                <Setter Property="Opacity" Value="1.0" />
                             </KeyFrame>
                         </Animation>
                     </Style.Animations>
@@ -130,54 +138,96 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <Grid>
-                        <Border HorizontalAlignment="Stretch"
-                                Padding="10" CornerRadius="5"
-                                VerticalAlignment="Stretch" Margin="0" ClipToBounds="True">
-                            <Grid >
+                        <Border
+                            Margin="0"
+                            Padding="10"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            ClipToBounds="True"
+                            CornerRadius="5">
+                            <Grid>
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="10"/>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="10" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
                                 <Grid.RowDefinitions>
-                                    <RowDefinition/>
+                                    <RowDefinition />
                                 </Grid.RowDefinitions>
-                                <Image 
-                                    Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
-                                    Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
-                                    Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
+                                <Image
+                                    Grid.RowSpan="3"
+                                    Grid.Column="0"
+                                    Margin="0"
                                     Classes.huge="{Binding $parent[UserControl].DataContext.IsGridHuge}"
-                                    Grid.RowSpan="3" Grid.Column="0" Margin="0"
-                                       Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
-								<StackPanel Orientation="Vertical" Spacing="5"  VerticalAlignment="Top" HorizontalAlignment="Left"
-											Grid.Column="2">
-									<TextBlock Text="{Binding TitleName}" TextAlignment="Left" TextWrapping="Wrap"
-                                           HorizontalAlignment="Stretch" />
-									<TextBlock Text="{Binding Developer}" TextAlignment="Left" TextWrapping="Wrap"
-											   HorizontalAlignment="Stretch" />
-									<TextBlock Text="{Binding Version}" TextAlignment="Left" TextWrapping="Wrap"
-											   HorizontalAlignment="Stretch" />
-								</StackPanel>
-								<StackPanel Orientation="Vertical" Spacing="5"  VerticalAlignment="Top" HorizontalAlignment="Right"
-											Grid.Column="3">
-									<TextBlock Text="{Binding TimePlayed}" TextAlignment="Right" TextWrapping="Wrap"
-										  HorizontalAlignment="Stretch" />
-									<TextBlock Text="{Binding LastPlayed}" TextAlignment="Right" TextWrapping="Wrap"
-											   HorizontalAlignment="Stretch" />
-									<TextBlock Text="{Binding FileSize}" TextAlignment="Right" TextWrapping="Wrap"
-											   HorizontalAlignment="Stretch" />
-								</StackPanel>
-                                <ui:SymbolIcon Grid.Row="0" Grid.Column="0" FontSize="20"
-									    Foreground="Yellow"
-									   Symbol="StarFilled"
-                                       IsVisible="{Binding Favorite}" Margin="-5, -5, 0, 0" VerticalAlignment="Top"
-                                       HorizontalAlignment="Left" />
-                                <ui:SymbolIcon Grid.Row="0" Grid.Column="0" FontSize="20"
-									    Foreground="Black"
-									   Symbol="Star"
-                                       IsVisible="{Binding Favorite}" Margin="-5, -5, 0, 0" VerticalAlignment="Top"
-                                       HorizontalAlignment="Left" />
+                                    Classes.large="{Binding $parent[UserControl].DataContext.IsGridLarge}"
+                                    Classes.normal="{Binding $parent[UserControl].DataContext.IsGridMedium}"
+                                    Classes.small="{Binding $parent[UserControl].DataContext.IsGridSmall}"
+                                    Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
+                                <StackPanel
+                                    Grid.Column="2"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Orientation="Vertical"
+                                    Spacing="5">
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        Text="{Binding TitleName}"
+                                        TextAlignment="Left"
+                                        TextWrapping="Wrap" />
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        Text="{Binding Developer}"
+                                        TextAlignment="Left"
+                                        TextWrapping="Wrap" />
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        Text="{Binding Version}"
+                                        TextAlignment="Left"
+                                        TextWrapping="Wrap" />
+                                </StackPanel>
+                                <StackPanel
+                                    Grid.Column="3"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Top"
+                                    Orientation="Vertical"
+                                    Spacing="5">
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        Text="{Binding TimePlayed}"
+                                        TextAlignment="Right"
+                                        TextWrapping="Wrap" />
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        Text="{Binding LastPlayed}"
+                                        TextAlignment="Right"
+                                        TextWrapping="Wrap" />
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        Text="{Binding FileSize}"
+                                        TextAlignment="Right"
+                                        TextWrapping="Wrap" />
+                                </StackPanel>
+                                <ui:SymbolIcon
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Margin="-5,-5,0,0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    FontSize="20"
+                                    Foreground="Yellow"
+                                    IsVisible="{Binding Favorite}"
+                                    Symbol="StarFilled" />
+                                <ui:SymbolIcon
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Margin="-5,-5,0,0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    FontSize="20"
+                                    Foreground="Black"
+                                    IsVisible="{Binding Favorite}"
+                                    Symbol="Star" />
                             </Grid>
                         </Border>
                     </Grid>

Ryujinx.Ava/Ui/Controls/IGlContextExtension.cs

@@ -4,7 +4,7 @@ using System;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public static class IGlContextExtension
+    internal static class IGlContextExtension
     {
         public static OpenGLContextBase AsOpenGLContextBase(this IGlContext context)
         {

Ryujinx.Ava/Ui/Controls/InputDialog.axaml

@@ -1,18 +1,31 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="Ryujinx.Ava.Ui.Controls.InputDialog">
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="5,10,5, 5">
+<UserControl
+    x:Class="Ryujinx.Ava.Ui.Controls.InputDialog"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+    <Grid
+        Margin="5,10,5,5"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Center">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <TextBlock HorizontalAlignment="Center" Text="{Binding Message}" />
-        <TextBox MaxLength="{Binding MaxLength}" Grid.Row="1" Margin="10" Width="300" HorizontalAlignment="Center"
-                 Text="{Binding Input, Mode=TwoWay}" />
-        <TextBlock Grid.Row="2" Margin="5, 5, 5, 10" HorizontalAlignment="Center" Text="{Binding SubMessage}" />
+        <TextBox
+            Grid.Row="1"
+            Width="300"
+            Margin="10"
+            HorizontalAlignment="Center"
+            MaxLength="{Binding MaxLength}"
+            Text="{Binding Input, Mode=TwoWay}" />
+        <TextBlock
+            Grid.Row="2"
+            Margin="5,5,5,10"
+            HorizontalAlignment="Center"
+            Text="{Binding SubMessage}" />
     </Grid>
 </UserControl>

Ryujinx.Ava/Ui/Controls/KeyValueConverter.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class KeyValueConverter : IValueConverter
+    internal class KeyValueConverter : IValueConverter
     {
         public static KeyValueConverter Instance = new();
 

Ryujinx.Ava/Ui/Controls/OpenToolkitBindingsContext.cs

@@ -3,7 +3,7 @@ using System;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class OpenToolkitBindingsContext : IBindingsContext
+    internal class OpenToolkitBindingsContext : IBindingsContext
     {
         private readonly Func<string, IntPtr> _getProcAddress;
 

Ryujinx.Ava/Ui/Controls/RendererControl.cs

@@ -18,7 +18,7 @@ using System;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class RendererControl : Control
+    internal class RendererControl : Control
     {
         private int _image;
 

Ryujinx.Ava/Ui/Controls/UpdateWaitWindow.axaml

@@ -1,14 +1,18 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        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"
-        mc:Ignorable="d"
-        x:Class="Ryujinx.Ava.Ui.Controls.UpdateWaitWindow"
-        WindowStartupLocation="CenterOwner"
-        SizeToContent="WidthAndHeight"
-        Title="Ryujinx - Waiting">
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="20">
+<Window
+    x:Class="Ryujinx.Ava.Ui.Controls.UpdateWaitWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    Title="Ryujinx - Waiting"
+    SizeToContent="WidthAndHeight"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
+    <Grid
+        Margin="20"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -17,12 +21,22 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <Image Grid.Row="1" Margin="5, 10, 20 , 10" Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common"
-               Height="70"
-               MinWidth="50" />
-        <StackPanel Grid.Row="1"  Grid.Column="1" VerticalAlignment="Center" Orientation="Vertical">
-            <TextBlock Margin="5" Name="PrimaryText" />
-            <TextBlock VerticalAlignment="Center" Name="SecondaryText" Margin="5" />
+        <Image
+            Grid.Row="1"
+            Height="70"
+            MinWidth="50"
+            Margin="5,10,20,10"
+            Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" />
+        <StackPanel
+            Grid.Row="1"
+            Grid.Column="1"
+            VerticalAlignment="Center"
+            Orientation="Vertical">
+            <TextBlock Name="PrimaryText" Margin="5" />
+            <TextBlock
+                Name="SecondaryText"
+                Margin="5"
+                VerticalAlignment="Center" />
         </StackPanel>
     </Grid>
 </Window>

Ryujinx.Ava/Ui/Models/ControllerModel.cs

@@ -0,0 +1,6 @@
+using Ryujinx.Common.Configuration.Hid;
+
+namespace Ryujinx.Ava.Ui.Models
+{
+    internal record ControllerModel(ControllerType Type, string Name);
+}

Ryujinx.Ava/Ui/Models/DeviceType.cs

@@ -0,0 +1,9 @@
+namespace Ryujinx.Ava.Ui.Models
+{
+    public enum DeviceType
+    {
+        None,
+        Keyboard,
+        Controller
+    }
+}

Ryujinx.Ava/Ui/Models/FileSizeSortComparer.cs

@@ -3,7 +3,7 @@ using System.Collections;
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class FileSizeSortComparer : IComparer
+    internal class FileSizeSortComparer : IComparer
     {
         public int Compare(object x, object y)
         {

Ryujinx.Ava/Ui/Models/Generic/FileSizeSortComparer.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.Ava.Ui.Models.Generic
 {
-    public class FileSizeSortComparer : IComparer<ApplicationData>
+    internal class FileSizeSortComparer : IComparer<ApplicationData>
     {
         public FileSizeSortComparer() { }
         public FileSizeSortComparer(bool isAscending) { _order = isAscending ? 1 : -1; }

Ryujinx.Ava/Ui/Models/Generic/LastPlayedSortComparer.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.Ava.Ui.Models.Generic
 {
-    public class LastPlayedSortComparer : IComparer<ApplicationData>
+    internal class LastPlayedSortComparer : IComparer<ApplicationData>
     {
         public LastPlayedSortComparer() { }
         public LastPlayedSortComparer(bool isAscending) { IsAscending = isAscending; }

Ryujinx.Ava/Ui/Models/Generic/TimePlayedSortComparer.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.Ava.Ui.Models.Generic
 {
-    public class TimePlayedSortComparer : IComparer<ApplicationData>
+    internal class TimePlayedSortComparer : IComparer<ApplicationData>
     {
         public TimePlayedSortComparer() { }
         public TimePlayedSortComparer(bool isAscending) { _order = isAscending ? 1 : -1; }

Ryujinx.Ava/Ui/Models/InputConfiguration.cs

@@ -7,7 +7,7 @@ using System;
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class InputConfiguration<Key, Stick> : BaseModel
+    internal class InputConfiguration<Key, Stick> : BaseModel
     {
         private float _deadzoneRight;
         private float _triggerThreshold;

Ryujinx.Ava/Ui/Models/LastPlayedSortComparer.cs

@@ -4,7 +4,7 @@ using System.Collections;
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class LastPlayedSortComparer : IComparer
+    internal class LastPlayedSortComparer : IComparer
     {
         public int Compare(object x, object y)
         {

Ryujinx.Ava/Ui/Models/PlayerModel.cs

@@ -0,0 +1,6 @@
+using Ryujinx.Common.Configuration.Hid;
+
+namespace Ryujinx.Ava.Ui.Models
+{
+    public record PlayerModel(PlayerIndex Id, string Name);
+}

Ryujinx.Ava/Ui/Models/ProfileImageModel.cs

@@ -1,6 +1,6 @@
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class ProfileImageModel
+    internal class ProfileImageModel
     {
         public ProfileImageModel(string name, byte[] data)
         {

Ryujinx.Ava/Ui/Models/StatusUpdatedEventArgs.cs

@@ -2,7 +2,7 @@
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class StatusUpdatedEventArgs : EventArgs
+    internal class StatusUpdatedEventArgs : EventArgs
     {
         public bool VSyncEnabled { get; }
         public float Volume { get; }

Ryujinx.Ava/Ui/Models/TimePlayedSortComparer.cs

@@ -3,7 +3,7 @@ using System.Collections;
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class TimePlayedSortComparer : IComparer
+    internal class TimePlayedSortComparer : IComparer
     {
         public int Compare(object x, object y)
         {

Ryujinx.Ava/Ui/Models/TimeZone.cs

@@ -1,6 +1,6 @@
-namespace Ryujinx.Ava.Ui.Windows
+namespace Ryujinx.Ava.Ui.Models
 {
-    public class TimeZone
+    internal class TimeZone
     {
         public TimeZone(string utcDifference, string location, string abbreviation)
         {

Ryujinx.Ava/Ui/Models/TitleUpdateModel.cs

@@ -3,7 +3,7 @@ using Ryujinx.Ava.Common.Locale;
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class TitleUpdateModel
+    internal class TitleUpdateModel
     {
         public bool IsEnabled { get; set; }
         public bool IsNoUpdate { get; }

Ryujinx.Ava/Ui/ViewModels/ControllerSettingsViewModel.cs

@@ -0,0 +1,887 @@
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Svg.Skia;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Input;
+using Ryujinx.Ava.Ui.Controls;
+using Ryujinx.Ava.Ui.Models;
+using Ryujinx.Ava.Ui.Windows;
+using Ryujinx.Common;
+using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Configuration.Hid.Controller;
+using Ryujinx.Common.Configuration.Hid.Controller.Motion;
+using Ryujinx.Common.Configuration.Hid.Keyboard;
+using Ryujinx.Common.Logging;
+using Ryujinx.Common.Utilities;
+using Ryujinx.Input;
+using Ryujinx.Ui.Common.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json;
+using ConfigGamepadInputId = Ryujinx.Common.Configuration.Hid.Controller.GamepadInputId;
+using ConfigStickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
+using Key = Ryujinx.Common.Configuration.Hid.Key;
+
+namespace Ryujinx.Ava.Ui.ViewModels
+{
+    public class ControllerSettingsViewModel : BaseModel, IDisposable
+    {
+        private const string Disabled = "disabled";
+        private const string ProControllerResource = "Ryujinx.Ui.Common/Resources/Controller_ProCon.svg";
+        private const string JoyConPairResource = "Ryujinx.Ui.Common/Resources/Controller_JoyConPair.svg";
+        private const string JoyConLeftResource = "Ryujinx.Ui.Common/Resources/Controller_JoyConLeft.svg";
+        private const string JoyConRightResource = "Ryujinx.Ui.Common/Resources/Controller_JoyConRight.svg";
+        private const string KeyboardString = "keyboard";
+        private const string ControllerString = "controller";
+        private readonly MainWindow _mainWindow;
+
+        private PlayerIndex _playerId;
+        private int _controller;
+        private string _controllerImage;
+        private int _device;
+        private object _configuration;
+        private string _profileName;
+        private bool _isLoaded;
+        private readonly UserControl _owner;
+
+        public IGamepadDriver AvaloniaKeyboardDriver { get; }
+        public IGamepad SelectedGamepad { get; private set; }
+
+        public ObservableCollection<PlayerModel> PlayerIndexes { get; set; }
+        public ObservableCollection<(DeviceType Type, string Id, string Name)> Devices { get; set; }
+        internal ObservableCollection<ControllerModel> Controllers { get; set; }
+        public AvaloniaList<string> ProfilesList { get; set; }
+        public AvaloniaList<string> DeviceList { get; set; }
+
+        // XAML Flags
+        public bool ShowSettings => _device > 0;
+        public bool IsController => _device > 1;
+        public bool IsKeyboard => !IsController;
+        public bool IsRight { get; set; }
+        public bool IsLeft { get; set; }
+
+        public bool IsModified { get; set; }
+
+        public object Configuration
+        {
+            get => _configuration;
+            set
+            {
+                _configuration = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        public PlayerIndex PlayerId
+        {
+            get => _playerId;
+            set
+            {
+                if (IsModified)
+                {
+                    return;
+                }
+
+                IsModified = false;
+                _playerId = value;
+
+                if (!Enum.IsDefined(typeof(PlayerIndex), _playerId))
+                {
+                    _playerId = PlayerIndex.Player1;
+                }
+
+                LoadConfiguration();
+                LoadDevice();
+                LoadProfiles();
+
+                _isLoaded = true;
+
+                OnPropertyChanged();
+            }
+        }
+
+        public int Controller
+        {
+            get => _controller;
+            set
+            {
+                _controller = value;
+
+                if (_controller == -1)
+                {
+                    _controller = 0;
+                }
+
+                if (Controllers.Count > 0 && value < Controllers.Count && _controller > -1)
+                {
+                    ControllerType controller = Controllers[_controller].Type;
+
+                    IsLeft = true;
+                    IsRight = true;
+
+                    switch (controller)
+                    {
+                        case ControllerType.Handheld:
+                            ControllerImage = JoyConPairResource;
+                            break;
+                        case ControllerType.ProController:
+                            ControllerImage = ProControllerResource;
+                            break;
+                        case ControllerType.JoyconPair:
+                            ControllerImage = JoyConPairResource;
+                            break;
+                        case ControllerType.JoyconLeft:
+                            ControllerImage = JoyConLeftResource;
+                            IsRight = false;
+                            break;
+                        case ControllerType.JoyconRight:
+                            ControllerImage = JoyConRightResource;
+                            IsLeft = false;
+                            break;
+                    }
+
+                    LoadInputDriver();
+                    LoadProfiles();
+                }
+
+                OnPropertyChanged();
+                NotifyChanges();
+            }
+        }
+
+        public string ControllerImage
+        {
+            get => _controllerImage;
+            set
+            {
+                _controllerImage = value;
+
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(Image));
+            }
+        }
+
+        public SvgImage Image
+        {
+            get
+            {
+                SvgImage image = new SvgImage();
+
+                if (!string.IsNullOrWhiteSpace(_controllerImage))
+                {
+                    SvgSource source = new SvgSource();
+
+                    source.Load(EmbeddedResources.GetStream(_controllerImage));
+
+                    image.Source = source;
+                }
+
+                return image;
+            }
+        }
+
+        public string ProfileName
+        {
+            get => _profileName; set
+            {
+                _profileName = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        public int Device
+        {
+            get => _device;
+            set
+            {
+                _device = value < 0 ? 0 : value;
+
+                if (_device >= Devices.Count)
+                {
+                    return;
+                }
+
+                var selected = Devices[_device].Type;
+
+                if (selected != DeviceType.None)
+                {
+                    LoadControllers();
+
+                    if (_isLoaded)
+                    {
+                        LoadConfiguration(LoadDefaultConfiguration());
+                    }
+                }
+
+                OnPropertyChanged();
+                NotifyChanges();
+            }
+        }
+
+        public InputConfig Config { get; set; }
+
+        public ControllerSettingsViewModel(UserControl owner) : this()
+        {
+            _owner = owner;
+
+            if (Program.PreviewerDetached)
+            {
+                _mainWindow =
+                    (MainWindow)((IClassicDesktopStyleApplicationLifetime)Avalonia.Application.Current
+                        .ApplicationLifetime).MainWindow;
+
+                AvaloniaKeyboardDriver = new AvaloniaKeyboardDriver(owner);
+
+                _mainWindow.InputManager.GamepadDriver.OnGamepadConnected += HandleOnGamepadConnected;
+                _mainWindow.InputManager.GamepadDriver.OnGamepadDisconnected += HandleOnGamepadDisconnected;
+                if (_mainWindow.AppHost != null)
+                {
+                    _mainWindow.AppHost.NpadManager.BlockInputUpdates();
+                }
+
+                _isLoaded = false;
+
+                LoadDevices();
+
+                PlayerId = PlayerIndex.Player1;
+            }
+        }
+
+        public ControllerSettingsViewModel()
+        {
+            PlayerIndexes = new ObservableCollection<PlayerModel>();
+            Controllers = new ObservableCollection<ControllerModel>();
+            Devices = new ObservableCollection<(DeviceType Type, string Id, string Name)>();
+            ProfilesList = new AvaloniaList<string>();
+            DeviceList = new AvaloniaList<string>();
+
+            ControllerImage = ProControllerResource;
+
+            PlayerIndexes.Add(new(PlayerIndex.Player1, LocaleManager.Instance["ControllerSettingsPlayer1"]));
+            PlayerIndexes.Add(new(PlayerIndex.Player2, LocaleManager.Instance["ControllerSettingsPlayer2"]));
+            PlayerIndexes.Add(new(PlayerIndex.Player3, LocaleManager.Instance["ControllerSettingsPlayer3"]));
+            PlayerIndexes.Add(new(PlayerIndex.Player4, LocaleManager.Instance["ControllerSettingsPlayer4"]));
+            PlayerIndexes.Add(new(PlayerIndex.Player5, LocaleManager.Instance["ControllerSettingsPlayer5"]));
+            PlayerIndexes.Add(new(PlayerIndex.Player6, LocaleManager.Instance["ControllerSettingsPlayer6"]));
+            PlayerIndexes.Add(new(PlayerIndex.Player7, LocaleManager.Instance["ControllerSettingsPlayer7"]));
+            PlayerIndexes.Add(new(PlayerIndex.Player8, LocaleManager.Instance["ControllerSettingsPlayer8"]));
+            PlayerIndexes.Add(new(PlayerIndex.Handheld, LocaleManager.Instance["ControllerSettingsHandheld"]));
+        }
+
+        private void LoadConfiguration(InputConfig inputConfig = null)
+        {
+            Config = inputConfig ?? ConfigurationState.Instance.Hid.InputConfig.Value.Find(inputConfig => inputConfig.PlayerIndex == _playerId);
+
+            if (Config is StandardKeyboardInputConfig keyboardInputConfig)
+            {
+                Configuration = new InputConfiguration<Key, ConfigStickInputId>(keyboardInputConfig);
+            }
+
+            if (Config is StandardControllerInputConfig controllerInputConfig)
+            {
+                Configuration = new InputConfiguration<ConfigGamepadInputId, ConfigStickInputId>(controllerInputConfig);
+            }
+        }
+
+        public void LoadDevice()
+        {
+            if (Config == null || Config.Backend == InputBackendType.Invalid)
+            {
+                Device = 0;
+            }
+            else
+            {
+                var type = DeviceType.None;
+
+                if (Config is StandardKeyboardInputConfig)
+                {
+                    type = DeviceType.Keyboard;
+                }
+
+                if (Config is StandardControllerInputConfig)
+                {
+                    type = DeviceType.Controller;
+                }
+
+                var item = Devices.FirstOrDefault(x => x.Type == type && x.Id == Config.Id);
+                if (item != default)
+                {
+                    Device = Devices.ToList().FindIndex(x => x.Id == item.Id);
+                }
+                else
+                {
+                    Device = 0;
+                }
+            }
+        }
+
+        public async void ShowMotionConfig()
+        {
+            await MotionSettingsWindow.Show(this, _owner.GetVisualRoot() as StyleableWindow);
+        }
+
+        public async void ShowRumbleConfig()
+        {
+            await RumbleSettingsWindow.Show(this, _owner.GetVisualRoot() as StyleableWindow);
+        }
+
+        private void LoadInputDriver()
+        {
+            if (_device < 0)
+            {
+                return;
+            }
+
+            string id = GetCurrentGamepadId();
+            var type = Devices[Device].Type;
+
+            if (type == DeviceType.None)
+            {
+                return;
+            }
+            else if (type == DeviceType.Keyboard)
+            {
+                if (_mainWindow.InputManager.KeyboardDriver is AvaloniaKeyboardDriver)
+                {
+                    // NOTE: To get input in this window, we need to bind a custom keyboard driver instead of using the InputManager one as the main window isn't focused...
+                    SelectedGamepad = AvaloniaKeyboardDriver.GetGamepad(id);
+                }
+                else
+                {
+                    SelectedGamepad = _mainWindow.InputManager.KeyboardDriver.GetGamepad(id);
+                }
+            }
+            else
+            {
+                SelectedGamepad = _mainWindow.InputManager.GamepadDriver.GetGamepad(id);
+            }
+        }
+
+        private void HandleOnGamepadDisconnected(string id)
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+                LoadDevices();
+            });
+        }
+
+        private void HandleOnGamepadConnected(string id)
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+                LoadDevices();
+            });
+        }
+
+        private string GetCurrentGamepadId()
+        {
+            if (_device < 0)
+            {
+                return string.Empty;
+            }
+
+            var device = Devices[Device];
+
+            if (device.Type == DeviceType.None)
+            {
+                return null;
+            }
+
+            return device.Id.Split(" ")[0];
+        }
+
+        public void LoadControllers()
+        {
+            Controllers.Clear();
+
+            if (_playerId == PlayerIndex.Handheld)
+            {
+                Controllers.Add(new(ControllerType.Handheld, LocaleManager.Instance["ControllerSettingsControllerTypeHandheld"]));
+
+                Controller = 0;
+            }
+            else
+            {
+                Controllers.Add(new(ControllerType.ProController, LocaleManager.Instance["ControllerSettingsControllerTypeProController"]));
+                Controllers.Add(new(ControllerType.JoyconPair, LocaleManager.Instance["ControllerSettingsControllerTypeJoyConPair"]));
+                Controllers.Add(new(ControllerType.JoyconLeft, LocaleManager.Instance["ControllerSettingsControllerTypeJoyConLeft"]));
+                Controllers.Add(new(ControllerType.JoyconRight, LocaleManager.Instance["ControllerSettingsControllerTypeJoyConRight"]));
+
+                if (Config != null && Controllers.ToList().FindIndex(x => x.Type == Config.ControllerType) != -1)
+                {
+                    Controller = Controllers.ToList().FindIndex(x => x.Type == Config.ControllerType);
+                }
+                else
+                {
+                    Controller = 0;
+                }
+            }
+        }
+
+        private static string GetShortGamepadName(string str)
+        {
+            const string Ellipsis = "...";
+            const int MaxSize = 50;
+
+            if (str.Length > MaxSize)
+            {
+                return str.Substring(0, MaxSize - Ellipsis.Length) + Ellipsis;
+            }
+
+            return str;
+        }
+
+        public void LoadDevices()
+        {
+            lock (Devices)
+            {
+                Devices.Clear();
+                DeviceList.Clear();
+                Devices.Add((DeviceType.None, Disabled, LocaleManager.Instance["ControllerSettingsDeviceDisabled"]));
+
+                foreach (string id in _mainWindow.InputManager.KeyboardDriver.GamepadsIds)
+                {
+                    using IGamepad gamepad = _mainWindow.InputManager.KeyboardDriver.GetGamepad(id);
+
+                    if (gamepad != null)
+                    {
+                        Devices.Add((DeviceType.Keyboard, id, $"{GetShortGamepadName(gamepad.Name)} ({id})"));
+                    }
+                }
+
+                foreach (string id in _mainWindow.InputManager.GamepadDriver.GamepadsIds)
+                {
+                    using IGamepad gamepad = _mainWindow.InputManager.GamepadDriver.GetGamepad(id);
+
+                    if (gamepad != null)
+                    {
+                        Devices.Add((DeviceType.Controller, id, $"{GetShortGamepadName(gamepad.Name)} ({id})"));
+                    }
+                }
+
+                DeviceList.AddRange(Devices.Select(x => x.Name));
+                Device = Math.Min(Device, DeviceList.Count);
+            }
+        }
+
+        private string GetProfileBasePath()
+        {
+            string path = AppDataManager.ProfilesDirPath;
+            var type = Devices[Device == -1 ? 0 : Device].Type;
+
+            if (type == DeviceType.Keyboard)
+            {
+                path = Path.Combine(path, KeyboardString);
+            }
+            else if (type == DeviceType.Controller)
+            {
+                path = Path.Combine(path, ControllerString);
+            }
+
+            return path;
+        }
+
+        private void LoadProfiles()
+        {
+            ProfilesList.Clear();
+
+            string basePath = GetProfileBasePath();
+
+            if (!Directory.Exists(basePath))
+            {
+                Directory.CreateDirectory(basePath);
+            }
+
+            ProfilesList.Add((LocaleManager.Instance["ControllerSettingsProfileDefault"]));
+
+            foreach (string profile in Directory.GetFiles(basePath, "*.json", SearchOption.AllDirectories))
+            {
+                ProfilesList.Add(Path.GetFileNameWithoutExtension(profile));
+            }
+
+            if (string.IsNullOrWhiteSpace(ProfileName))
+            {
+                ProfileName = LocaleManager.Instance["ControllerSettingsProfileDefault"];
+            }
+        }
+
+        public InputConfig LoadDefaultConfiguration()
+        {
+            var activeDevice = Devices.FirstOrDefault();
+
+            if (Devices.Count > 0 && Device < Devices.Count && Device >= 0)
+            {
+                activeDevice = Devices[Device];
+            }
+
+            InputConfig config;
+            if (activeDevice.Type == DeviceType.Keyboard)
+            {
+                string id = activeDevice.Id;
+
+                config = new StandardKeyboardInputConfig
+                {
+                    Version = Ryujinx.Common.Configuration.Hid.InputConfig.CurrentVersion,
+                    Backend = InputBackendType.WindowKeyboard,
+                    Id = id,
+                    ControllerType = ControllerType.ProController,
+                    LeftJoycon = new LeftJoyconCommonConfig<Key>
+                    {
+                        DpadUp = Key.Up,
+                        DpadDown = Key.Down,
+                        DpadLeft = Key.Left,
+                        DpadRight = Key.Right,
+                        ButtonMinus = Key.Minus,
+                        ButtonL = Key.E,
+                        ButtonZl = Key.Q,
+                        ButtonSl = Key.Unbound,
+                        ButtonSr = Key.Unbound
+                    },
+                    LeftJoyconStick =
+                        new JoyconConfigKeyboardStick<Key>
+                        {
+                            StickUp = Key.W,
+                            StickDown = Key.S,
+                            StickLeft = Key.A,
+                            StickRight = Key.D,
+                            StickButton = Key.F
+                        },
+                    RightJoycon = new RightJoyconCommonConfig<Key>
+                    {
+                        ButtonA = Key.Z,
+                        ButtonB = Key.X,
+                        ButtonX = Key.C,
+                        ButtonY = Key.V,
+                        ButtonPlus = Key.Plus,
+                        ButtonR = Key.U,
+                        ButtonZr = Key.O,
+                        ButtonSl = Key.Unbound,
+                        ButtonSr = Key.Unbound
+                    },
+                    RightJoyconStick = new JoyconConfigKeyboardStick<Key>
+                    {
+                        StickUp = Key.I,
+                        StickDown = Key.K,
+                        StickLeft = Key.J,
+                        StickRight = Key.L,
+                        StickButton = Key.H
+                    }
+                };
+            }
+            else if (activeDevice.Type == DeviceType.Controller)
+            {
+                bool isNintendoStyle = Devices.ToList().Find(x => x.Id == activeDevice.Id).Name.Contains("Nintendo");
+
+                string id = activeDevice.Id.Split(" ")[0];
+
+                config = new StandardControllerInputConfig
+                {
+                    Version = Ryujinx.Common.Configuration.Hid.InputConfig.CurrentVersion,
+                    Backend = InputBackendType.GamepadSDL2,
+                    Id = id,
+                    ControllerType = ControllerType.ProController,
+                    DeadzoneLeft = 0.1f,
+                    DeadzoneRight = 0.1f,
+                    RangeLeft = 1.0f,
+                    RangeRight = 1.0f,
+                    TriggerThreshold = 0.5f,
+                    LeftJoycon = new LeftJoyconCommonConfig<ConfigGamepadInputId>
+                    {
+                        DpadUp = ConfigGamepadInputId.DpadUp,
+                        DpadDown = ConfigGamepadInputId.DpadDown,
+                        DpadLeft = ConfigGamepadInputId.DpadLeft,
+                        DpadRight = ConfigGamepadInputId.DpadRight,
+                        ButtonMinus = ConfigGamepadInputId.Minus,
+                        ButtonL = ConfigGamepadInputId.LeftShoulder,
+                        ButtonZl = ConfigGamepadInputId.LeftTrigger,
+                        ButtonSl = ConfigGamepadInputId.Unbound,
+                        ButtonSr = ConfigGamepadInputId.Unbound
+                    },
+                    LeftJoyconStick = new JoyconConfigControllerStick<ConfigGamepadInputId, ConfigStickInputId>
+                    {
+                        Joystick = ConfigStickInputId.Left,
+                        StickButton = ConfigGamepadInputId.LeftStick,
+                        InvertStickX = false,
+                        InvertStickY = false
+                    },
+                    RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId>
+                    {
+                        ButtonA = isNintendoStyle ? ConfigGamepadInputId.A : ConfigGamepadInputId.B,
+                        ButtonB = isNintendoStyle ? ConfigGamepadInputId.B : ConfigGamepadInputId.A,
+                        ButtonX = isNintendoStyle ? ConfigGamepadInputId.X : ConfigGamepadInputId.Y,
+                        ButtonY = isNintendoStyle ? ConfigGamepadInputId.Y : ConfigGamepadInputId.X,
+                        ButtonPlus = ConfigGamepadInputId.Plus,
+                        ButtonR = ConfigGamepadInputId.RightShoulder,
+                        ButtonZr = ConfigGamepadInputId.RightTrigger,
+                        ButtonSl = ConfigGamepadInputId.Unbound,
+                        ButtonSr = ConfigGamepadInputId.Unbound
+                    },
+                    RightJoyconStick = new JoyconConfigControllerStick<ConfigGamepadInputId, ConfigStickInputId>
+                    {
+                        Joystick = ConfigStickInputId.Right,
+                        StickButton = ConfigGamepadInputId.RightStick,
+                        InvertStickX = false,
+                        InvertStickY = false
+                    },
+                    Motion = new StandardMotionConfigController
+                    {
+                        MotionBackend = MotionInputBackendType.GamepadDriver,
+                        EnableMotion = true,
+                        Sensitivity = 100,
+                        GyroDeadzone = 1
+                    },
+                    Rumble = new RumbleConfigController
+                    {
+                        StrongRumble = 1f,
+                        WeakRumble = 1f,
+                        EnableRumble = false
+                    }
+                };
+            }
+            else
+            {
+                config = new InputConfig();
+            }
+
+            config.PlayerIndex = _playerId;
+
+            return config;
+        }
+
+        public void LoadProfile()
+        {
+            if (Device == 0)
+            {
+                return;
+            }
+
+            InputConfig config = null;
+
+            if (string.IsNullOrWhiteSpace(ProfileName))
+            {
+                return;
+            }
+
+            if (ProfileName == LocaleManager.Instance["ControllerSettingsProfileDefault"])
+            {
+                config = LoadDefaultConfiguration();
+            }
+            else
+            {
+                string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
+
+                if (!File.Exists(path))
+                {
+                    var index = ProfilesList.IndexOf(ProfileName);
+                    if (index != -1)
+                    {
+                        ProfilesList.RemoveAt(index);
+                    }
+                    return;
+                }
+
+                try
+                {
+                    using (Stream stream = File.OpenRead(path))
+                    {
+                        config = JsonHelper.Deserialize<InputConfig>(stream);
+                    }
+                }
+                catch (JsonException) { }
+                catch (InvalidOperationException)
+                {
+                    ContentDialogHelper.CreateErrorDialog(_owner.GetVisualRoot() as StyleableWindow,
+                        String.Format(LocaleManager.Instance["DialogProfileInvalidProfileErrorMessage"], ProfileName));
+                    Logger.Error?.Print(LogClass.Configuration, $"Profile {ProfileName} is incompatible with the current input configuration system.");
+
+                    return;
+                }
+            }
+
+            if (config != null)
+            {
+                _isLoaded = false;
+
+                LoadConfiguration(config);
+
+                LoadDevice();
+
+                _isLoaded = true;
+
+                NotifyChanges();
+            }
+        }
+
+        public async void SaveProfile()
+        {
+            if (Device == 0)
+            {
+                return;
+            }
+
+            if (Configuration == null)
+            {
+                return;
+            }
+
+            if (ProfileName == LocaleManager.Instance["ControllerSettingsProfileDefault"])
+            {
+                ContentDialogHelper.CreateErrorDialog(_owner.GetVisualRoot() as StyleableWindow, LocaleManager.Instance["DialogProfileDefaultProfileOverwriteErrorMessage"]);
+
+                return;
+            }
+            else
+            {
+                bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
+
+                if (validFileName)
+                {
+                    string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
+
+                    InputConfig config = null;
+
+                    if (IsKeyboard)
+                    {
+                        config = (Configuration as InputConfiguration<Key, ConfigStickInputId>).GetConfig();
+                    }
+                    else if (IsController)
+                    {
+                        config = (Configuration as InputConfiguration<GamepadInputId, ConfigStickInputId>).GetConfig();
+                    }
+
+                    config.ControllerType = Controllers[_controller].Type;
+
+                    string jsonString = JsonHelper.Serialize(config, true);
+
+                    await File.WriteAllTextAsync(path, jsonString);
+
+                    LoadProfiles();
+                }
+                else
+                {
+                    ContentDialogHelper.CreateErrorDialog(_owner.GetVisualRoot() as StyleableWindow, LocaleManager.Instance["DialogProfileInvalidProfileNameErrorMessage"]);
+                }
+            }
+        }
+
+        public async void RemoveProfile()
+        {
+            if (Device == 0 || ProfileName == LocaleManager.Instance["ControllerSettingsProfileDefault"] || ProfilesList.IndexOf(ProfileName) == -1)
+            {
+                return;
+            }
+
+            UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
+                _owner.GetVisualRoot() as StyleableWindow,
+                LocaleManager.Instance["DialogProfileDeleteProfileTitle"],
+                LocaleManager.Instance["DialogProfileDeleteProfileMessage"],
+                LocaleManager.Instance["InputDialogYes"],
+                LocaleManager.Instance["InputDialogNo"],
+                LocaleManager.Instance["RyujinxConfirm"]);
+
+            if (result == UserResult.Yes)
+            {
+                string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
+
+                if (File.Exists(path))
+                {
+                    File.Delete(path);
+                }
+
+                LoadProfiles();
+            }
+        }
+
+        public void Save()
+        {
+            IsModified = false;
+
+            List<InputConfig> newConfig = new();
+
+            newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value);
+
+            newConfig.Remove(newConfig.Find(x => x == null));
+
+            if (Device == 0)
+            {
+                newConfig.Remove(newConfig.Find(x => x.PlayerIndex == this.PlayerId));
+            }
+            else
+            {
+                var device = Devices[Device];
+
+                if (device.Type == DeviceType.Keyboard)
+                {
+                    var inputConfig = Configuration as InputConfiguration<Key, ConfigStickInputId>;
+                    inputConfig.Id = device.Id;
+                }
+                else
+                {
+                    var inputConfig = Configuration as InputConfiguration<GamepadInputId, ConfigStickInputId>;
+                    inputConfig.Id = device.Id.Split(" ")[0];
+                }
+
+                var config = !IsController
+                    ? (Configuration as InputConfiguration<Key, ConfigStickInputId>).GetConfig()
+                    : (Configuration as InputConfiguration<GamepadInputId, ConfigStickInputId>).GetConfig();
+                config.ControllerType = Controllers[_controller].Type;
+                config.PlayerIndex = _playerId;
+
+                int i = newConfig.FindIndex(x => x.PlayerIndex == PlayerId);
+                if (i == -1)
+                {
+                    newConfig.Add(config);
+                }
+                else
+                {
+                    newConfig[i] = config;
+                }
+            }
+
+            _mainWindow.AppHost?.NpadManager.ReloadConfiguration(newConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);
+
+            // Atomically replace and signal input change.
+            // NOTE: Do not modify InputConfig.Value directly as other code depends on the on-change event.
+            ConfigurationState.Instance.Hid.InputConfig.Value = newConfig;
+
+            ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+        }
+
+        public void NotifyChange(string property)
+        {
+            OnPropertyChanged(property);
+        }
+
+        public void NotifyChanges()
+        {
+            OnPropertyChanged(nameof(Configuration));
+            OnPropertyChanged(nameof(IsController));
+            OnPropertyChanged(nameof(ShowSettings));
+            OnPropertyChanged(nameof(IsKeyboard));
+            OnPropertyChanged(nameof(IsRight));
+            OnPropertyChanged(nameof(IsLeft));
+        }
+
+        public void Dispose()
+        {
+            _mainWindow.InputManager.GamepadDriver.OnGamepadConnected -= HandleOnGamepadConnected;
+            _mainWindow.InputManager.GamepadDriver.OnGamepadDisconnected -= HandleOnGamepadDisconnected;
+
+            _mainWindow.AppHost?.NpadManager.UnblockInputUpdates();
+
+            SelectedGamepad?.Dispose();
+
+            AvaloniaKeyboardDriver.Dispose();
+        }
+    }
+}

Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs

@@ -11,6 +11,7 @@ using LibHac.FsSystem;
 using LibHac.Ncm;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Input;
 using Ryujinx.Ava.Ui.Controls;
 using Ryujinx.Ava.Ui.Windows;
 using Ryujinx.Common;
@@ -35,7 +36,7 @@ using ShaderCacheLoadingState = Ryujinx.Graphics.Gpu.Shader.ShaderCacheState;
 
 namespace Ryujinx.Ava.Ui.ViewModels
 {
-    public class MainWindowViewModel : BaseModel
+    internal class MainWindowViewModel : BaseModel
     {
         private readonly MainWindow _owner;
         private ObservableCollection<ApplicationData> _applications;
@@ -86,9 +87,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
 
             if (Program.PreviewerDetached)
             {
-                ShowUiKey = KeyGesture.Parse(ConfigurationState.Instance.Hid.Hotkeys.Value.ShowUi.ToString());
-                ScreenshotKey = KeyGesture.Parse(ConfigurationState.Instance.Hid.Hotkeys.Value.Screenshot.ToString());
-                PauseKey = KeyGesture.Parse(ConfigurationState.Instance.Hid.Hotkeys.Value.Pause.ToString());
+                LoadConfigurableHotKeys();
 
                 Volume = ConfigurationState.Instance.System.AudioVolume;
             }
@@ -836,6 +835,22 @@ namespace Ryujinx.Ava.Ui.ViewModels
             }
         }
 
+        public void LoadConfigurableHotKeys()
+        {
+            if (AvaloniaMappingHelper.TryGetAvaKey((Ryujinx.Input.Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ShowUi, out var showUiKey))
+            {
+                ShowUiKey = new KeyGesture(showUiKey, KeyModifiers.None);
+            }
+            if (AvaloniaMappingHelper.TryGetAvaKey((Ryujinx.Input.Key)ConfigurationState.Instance.Hid.Hotkeys.Value.Screenshot, out var screenshotKey))
+            {
+                ScreenshotKey = new KeyGesture(screenshotKey, KeyModifiers.None);
+            }
+            if (AvaloniaMappingHelper.TryGetAvaKey((Ryujinx.Input.Key)ConfigurationState.Instance.Hid.Hotkeys.Value.Pause, out var pauseKey))
+            {
+                PauseKey = new KeyGesture(pauseKey, KeyModifiers.None);
+            }
+        }
+
         public void TakeScreenshot()
         {
             _owner.AppHost.ScreenshotRequested = true;
@@ -930,10 +945,12 @@ namespace Ryujinx.Ava.Ui.ViewModels
             }
         }
 
-        public void OpenSettings()
+        public async void OpenSettings()
         {
-            // TODO : Implement Settings window
-            ContentDialogHelper.ShowNotAvailableMessage(_owner);
+            _owner.SettingsWindow = new(_owner.VirtualFileSystem, _owner.ContentManager);
+
+            await _owner.SettingsWindow.ShowDialog(_owner);
+            LoadConfigurableHotKeys();
         }
 
         public void ManageProfiles()
@@ -951,6 +968,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
 
         public void ChangeLanguage(object obj)
         {
+            LocaleManager.Instance.LoadDefaultLanguage();
             LocaleManager.Instance.LoadLanguage((string)obj);
         }
 
@@ -1350,7 +1368,13 @@ namespace Ryujinx.Ava.Ui.ViewModels
 
                 dialogMessage += LocaleManager.Instance["DialogFirmwareInstallerFirmwareInstallConfirmMessage"];
 
-                UserResult result = await ContentDialogHelper.CreateConfirmationDialog(_owner, dialogTitle, dialogMessage, LocaleManager.Instance["InputDialogYes"], LocaleManager.Instance["InputDialogNo"], LocaleManager.Instance["RyujinxConfirm"]);
+                UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
+                    _owner,
+                    dialogTitle,
+                    dialogMessage,
+                    LocaleManager.Instance["InputDialogYes"],
+                    LocaleManager.Instance["InputDialogNo"],
+                    LocaleManager.Instance["RyujinxConfirm"]);
 
                 UpdateWaitWindow waitingDialog = ContentDialogHelper.CreateWaitingDialog(dialogTitle, LocaleManager.Instance["DialogFirmwareInstallerFirmwareInstallWaitMessage"]);
 

Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs

@@ -0,0 +1,403 @@
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Threading;
+using LibHac.Tools.FsSystem;
+using Ryujinx.Audio.Backends.OpenAL;
+using Ryujinx.Audio.Backends.SDL2;
+using Ryujinx.Audio.Backends.SoundIo;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Input;
+using Ryujinx.Ava.Ui.Controls;
+using Ryujinx.Ava.Ui.Windows;
+using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.GraphicsDriver;
+using Ryujinx.Common.Logging;
+using Ryujinx.HLE.FileSystem;
+using Ryujinx.HLE.HOS.Services.Time.TimeZone;
+using Ryujinx.Input;
+using Ryujinx.Ui.Common.Configuration;
+using Ryujinx.Ui.Common.Configuration.System;
+using System;
+using System.Collections.Generic;
+using TimeZone = Ryujinx.Ava.Ui.Models.TimeZone;
+
+namespace Ryujinx.Ava.Ui.ViewModels
+{
+    internal class SettingsViewModel : BaseModel
+    {
+        private readonly VirtualFileSystem _virtualFileSystem;
+        private readonly ContentManager _contentManager;
+        private readonly StyleableWindow _owner;
+        private TimeZoneContentManager _timeZoneContentManager;
+
+        private readonly List<string> _validTzRegions;
+
+        private float _customResolutionScale;
+        private int _resolutionScale;
+        private int _graphicsBackendMultithreadingIndex;
+        private float _previousVolumeLevel;
+        private float _volume;
+
+        public int ResolutionScale
+        {
+            get => _resolutionScale;
+            set
+            {
+                _resolutionScale = value;
+
+                OnPropertyChanged(nameof(CustomResolutionScale));
+                OnPropertyChanged(nameof(IsCustomResolutionScaleActive));
+            }
+        }
+        public int GraphicsBackendMultithreadingIndex
+        {
+            get => _graphicsBackendMultithreadingIndex;
+            set
+            {
+                _graphicsBackendMultithreadingIndex = value;
+
+                if (_owner != null)
+                {
+                    if (_graphicsBackendMultithreadingIndex != (int)ConfigurationState.Instance.Graphics.BackendThreading.Value)
+                    {
+                        Dispatcher.UIThread.Post(async () =>
+                        {
+                            await ContentDialogHelper.CreateInfoDialog(_owner,
+                                                                       LocaleManager.Instance["DialogSettingsBackendThreadingWarningMessage"],
+                                                                       "",
+                                                                       "",
+                                                                       LocaleManager.Instance["InputDialogOk"],
+                                                                       LocaleManager.Instance["DialogSettingsBackendThreadingWarningTitle"]);
+                        });
+                    }
+                }
+
+                OnPropertyChanged();
+            }
+        }
+
+        public float CustomResolutionScale
+        {
+            get => _customResolutionScale;
+            set
+            {
+                _customResolutionScale = MathF.Round(value, 1);
+
+                OnPropertyChanged();
+            }
+        }
+
+        public bool EnableDiscordIntegration { get; set; }
+        public bool CheckUpdatesOnStart { get; set; }
+        public bool ShowConfirmExit { get; set; }
+        public bool HideCursorOnIdle { get; set; }
+        public bool EnableDockedMode { get; set; }
+        public bool EnableKeyboard { get; set; }
+        public bool EnableMouse { get; set; }
+        public bool EnableVsync { get; set; }
+        public bool EnablePptc { get; set; }
+        public bool EnableInternetAccess { get; set; }
+        public bool EnableFsIntegrityChecks { get; set; }
+        public bool IgnoreMissingServices { get; set; }
+        public bool ExpandDramSize { get; set; }
+        public bool EnableShaderCache { get; set; }
+        public bool EnableFileLog { get; set; }
+        public bool EnableStub { get; set; }
+        public bool EnableInfo { get; set; }
+        public bool EnableWarn { get; set; }
+        public bool EnableError { get; set; }
+        public bool EnableTrace { get; set; }
+        public bool EnableGuest { get; set; }
+        public bool EnableFsAccessLog { get; set; }
+        public bool EnableDebug { get; set; }
+        public bool IsOpenAlEnabled { get; set; }
+        public bool IsSoundIoEnabled { get; set; }
+        public bool IsSDL2Enabled { get; set; }
+        public bool EnableCustomTheme { get; set; }
+        public bool IsCustomResolutionScaleActive => _resolutionScale == 0;
+
+        public string TimeZone { get; set; }
+        public string ShaderDumpPath { get; set; }
+        public string CustomThemePath { get; set; }
+
+        public int Language { get; set; }
+        public int Region { get; set; }
+        public int FsGlobalAccessLogMode { get; set; }
+        public int AudioBackend { get; set; }
+        public int MaxAnisotropy { get; set; }
+        public int AspectRatio { get; set; }
+        public int OpenglDebugLevel { get; set; }
+        public int MemoryMode { get; set; }
+        public int BaseStyleIndex { get; set; }
+
+        public float Volume
+        {
+            get => _volume;
+            set
+            {
+                _volume = value;
+
+                ConfigurationState.Instance.System.AudioVolume.Value = (float)(_volume / 100);
+
+                OnPropertyChanged();
+            }
+        }
+
+        public DateTimeOffset DateOffset { get; set; }
+        public TimeSpan TimeOffset { get; set; }
+        public AvaloniaList<TimeZone> TimeZones { get; set; }
+
+        public AvaloniaList<string> GameDirectories { get; set; }
+
+        private KeyboardHotkeys _keyboardHotkeys;
+
+        public KeyboardHotkeys KeyboardHotkeys
+        {
+            get => _keyboardHotkeys;
+            set
+            {
+                _keyboardHotkeys = value;
+
+                OnPropertyChanged();
+            }
+        }
+
+        public IGamepadDriver AvaloniaKeyboardDriver { get; }
+
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager, StyleableWindow owner) : this()
+        {
+            _virtualFileSystem = virtualFileSystem;
+            _contentManager = contentManager;
+            _owner = owner;
+            if (Program.PreviewerDetached)
+            {
+                LoadTimeZones();
+                AvaloniaKeyboardDriver = new AvaloniaKeyboardDriver(owner);
+            }
+        }
+
+        public SettingsViewModel()
+        {
+            GameDirectories = new AvaloniaList<string>();
+            TimeZones = new AvaloniaList<TimeZone>();
+            _validTzRegions = new List<string>();
+
+            CheckSoundBackends();
+
+            if (Program.PreviewerDetached)
+            {
+                LoadCurrentConfiguration();
+            }
+        }
+
+        public void CheckSoundBackends()
+        {
+            IsOpenAlEnabled = OpenALHardwareDeviceDriver.IsSupported;
+            IsSoundIoEnabled = SoundIoHardwareDeviceDriver.IsSupported;
+            IsSDL2Enabled = SDL2HardwareDeviceDriver.IsSupported;
+        }
+
+        public void LoadTimeZones()
+        {
+            _timeZoneContentManager = new TimeZoneContentManager();
+
+            _timeZoneContentManager.InitializeInstance(_virtualFileSystem, _contentManager, IntegrityCheckLevel.None);
+
+            foreach ((int offset, string location, string abbr) in _timeZoneContentManager.ParseTzOffsets())
+            {
+                int hours = Math.DivRem(offset, 3600, out int seconds);
+                int minutes = Math.Abs(seconds) / 60;
+
+                string abbr2 = abbr.StartsWith('+') || abbr.StartsWith('-') ? string.Empty : abbr;
+
+                TimeZones.Add(new TimeZone($"UTC{hours:+0#;-0#;+00}:{minutes:D2}", location, abbr2));
+
+                _validTzRegions.Add(location);
+            }
+        }
+
+        public void ValidateAndSetTimeZone(string location)
+        {
+            if (_validTzRegions.Contains(location))
+            {
+                TimeZone = location;
+
+                OnPropertyChanged(nameof(TimeZone));
+            }
+        }
+
+        public async void BrowseTheme()
+        {
+            var dialog = new OpenFileDialog()
+            {
+                Title = LocaleManager.Instance["SettingsSelectThemeFileDialogTitle"],
+                AllowMultiple = false
+            };
+
+            dialog.Filters.Add(new FileDialogFilter() { Extensions = { "xaml" }, Name = LocaleManager.Instance["SettingsXamlThemeFile"] });
+
+            var file = await dialog.ShowAsync(_owner);
+
+            if (file != null && file.Length > 0)
+            {
+                CustomThemePath = file[0];
+                OnPropertyChanged(nameof(CustomThemePath));
+            }
+        }
+
+        public void LoadCurrentConfiguration()
+        {
+            ConfigurationState config = ConfigurationState.Instance;
+
+            GameDirectories.Clear();
+            GameDirectories.AddRange(config.Ui.GameDirs.Value);
+
+            EnableDiscordIntegration = config.EnableDiscordIntegration;
+            CheckUpdatesOnStart = config.CheckUpdatesOnStart;
+            ShowConfirmExit = config.ShowConfirmExit;
+            HideCursorOnIdle = config.HideCursorOnIdle;
+            EnableDockedMode = config.System.EnableDockedMode;
+            EnableKeyboard = config.Hid.EnableKeyboard;
+            EnableMouse = config.Hid.EnableMouse;
+            EnableVsync = config.Graphics.EnableVsync;
+            EnablePptc = config.System.EnablePtc;
+            EnableInternetAccess = config.System.EnableInternetAccess;
+            EnableFsIntegrityChecks = config.System.EnableFsIntegrityChecks;
+            IgnoreMissingServices = config.System.IgnoreMissingServices;
+            ExpandDramSize = config.System.ExpandRam;
+            EnableShaderCache = config.Graphics.EnableShaderCache;
+            EnableFileLog = config.Logger.EnableFileLog;
+            EnableStub = config.Logger.EnableStub;
+            EnableInfo = config.Logger.EnableInfo;
+            EnableWarn = config.Logger.EnableWarn;
+            EnableError = config.Logger.EnableError;
+            EnableTrace = config.Logger.EnableTrace;
+            EnableGuest = config.Logger.EnableGuest;
+            EnableDebug = config.Logger.EnableDebug;
+            EnableFsAccessLog = config.Logger.EnableFsAccessLog;
+            EnableCustomTheme = config.Ui.EnableCustomTheme;
+            Volume = config.System.AudioVolume * 100;
+
+            GraphicsBackendMultithreadingIndex = (int)config.Graphics.BackendThreading.Value;
+
+            OpenglDebugLevel = (int)config.Logger.GraphicsDebugLevel.Value;
+
+            TimeZone = config.System.TimeZone;
+            ShaderDumpPath = config.Graphics.ShadersDumpPath;
+            CustomThemePath = config.Ui.CustomThemePath;
+            BaseStyleIndex = config.Ui.BaseStyle == "Light" ? 0 : 1;
+
+            Language = (int)config.System.Language.Value;
+            Region = (int)config.System.Region.Value;
+            FsGlobalAccessLogMode = config.System.FsGlobalAccessLogMode;
+            AudioBackend = (int)config.System.AudioBackend.Value;
+            MemoryMode = (int)config.System.MemoryManagerMode.Value;
+
+            float anisotropy = config.Graphics.MaxAnisotropy;
+
+            MaxAnisotropy = anisotropy == -1 ? 0 : (int)(MathF.Log2(anisotropy));
+            AspectRatio = (int)config.Graphics.AspectRatio.Value;
+
+            int resolution = config.Graphics.ResScale;
+
+            ResolutionScale = resolution == -1 ? 0 : resolution;
+            CustomResolutionScale = config.Graphics.ResScaleCustom;
+
+            DateTime dateTimeOffset = DateTime.Now.AddSeconds(config.System.SystemTimeOffset);
+
+            DateOffset = dateTimeOffset.Date;
+            TimeOffset = dateTimeOffset.TimeOfDay;
+
+            KeyboardHotkeys = config.Hid.Hotkeys.Value;
+
+            _previousVolumeLevel = Volume;
+        }
+
+        public void SaveSettings()
+        {
+            List<string> gameDirs = new List<string>(GameDirectories);
+
+            ConfigurationState config = ConfigurationState.Instance;
+
+            if (_validTzRegions.Contains(TimeZone))
+            {
+                config.System.TimeZone.Value = TimeZone;
+            }
+
+            config.Logger.EnableError.Value = EnableError;
+            config.Logger.EnableTrace.Value = EnableTrace;
+            config.Logger.EnableWarn.Value = EnableWarn;
+            config.Logger.EnableInfo.Value = EnableInfo;
+            config.Logger.EnableStub.Value = EnableStub;
+            config.Logger.EnableDebug.Value = EnableDebug;
+            config.Logger.EnableGuest.Value = EnableGuest;
+            config.Logger.EnableFsAccessLog.Value = EnableFsAccessLog;
+            config.Logger.EnableFileLog.Value = EnableFileLog;
+            config.Logger.GraphicsDebugLevel.Value = (GraphicsDebugLevel)OpenglDebugLevel;
+            config.System.EnableDockedMode.Value = EnableDockedMode;
+            config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
+            config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
+            config.ShowConfirmExit.Value = ShowConfirmExit;
+            config.HideCursorOnIdle.Value = HideCursorOnIdle;
+            config.Graphics.EnableVsync.Value = EnableVsync;
+            config.Graphics.EnableShaderCache.Value = EnableShaderCache;
+            config.System.EnablePtc.Value = EnablePptc;
+            config.System.EnableInternetAccess.Value = EnableInternetAccess;
+            config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
+            config.System.IgnoreMissingServices.Value = IgnoreMissingServices;
+            config.System.ExpandRam.Value = ExpandDramSize;
+            config.Hid.EnableKeyboard.Value = EnableKeyboard;
+            config.Hid.EnableMouse.Value = EnableMouse;
+            config.Ui.CustomThemePath.Value = CustomThemePath;
+            config.Ui.EnableCustomTheme.Value = EnableCustomTheme;
+            config.Ui.BaseStyle.Value = BaseStyleIndex == 0 ? "Light" : "Dark";
+            config.System.Language.Value = (Language)Language;
+            config.System.Region.Value = (Region)Region;
+
+            if (ConfigurationState.Instance.Graphics.BackendThreading != (BackendThreading)GraphicsBackendMultithreadingIndex)
+            {
+                DriverUtilities.ToggleOGLThreading(GraphicsBackendMultithreadingIndex == (int)BackendThreading.Off);
+            }
+
+            config.Graphics.BackendThreading.Value = (BackendThreading)GraphicsBackendMultithreadingIndex;
+
+            TimeSpan systemTimeOffset = DateOffset - DateTime.Now;
+
+            config.System.SystemTimeOffset.Value = systemTimeOffset.Seconds;
+            config.Graphics.ShadersDumpPath.Value = ShaderDumpPath;
+            config.Ui.GameDirs.Value = gameDirs;
+            config.System.FsGlobalAccessLogMode.Value = FsGlobalAccessLogMode;
+            config.System.MemoryManagerMode.Value = (MemoryManagerMode)MemoryMode;
+
+            float anisotropy = MaxAnisotropy == 0 ? -1 : MathF.Pow(2, MaxAnisotropy);
+
+            config.Graphics.MaxAnisotropy.Value = anisotropy;
+            config.Graphics.AspectRatio.Value = (AspectRatio)AspectRatio;
+            config.Graphics.ResScale.Value = ResolutionScale == 0 ? -1 : ResolutionScale;
+            config.Graphics.ResScaleCustom.Value = CustomResolutionScale;
+            config.System.AudioVolume.Value = Volume / 100;
+
+            AudioBackend audioBackend = (AudioBackend)AudioBackend;
+            if (audioBackend != config.System.AudioBackend.Value)
+            {
+                config.System.AudioBackend.Value = audioBackend;
+
+                Logger.Info?.Print(LogClass.Application, $"AudioBackend toggled to: {audioBackend}");
+            }
+
+            config.Hid.Hotkeys.Value = KeyboardHotkeys;
+
+            config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+
+            MainWindow.UpdateGraphicsConfig();
+
+            _previousVolumeLevel = Volume;
+        }
+
+        public void RevertIfNotSaved()
+        {
+            Program.ReloadConfig();
+        }
+    }
+}

Ryujinx.Ava/Ui/Windows/AboutWindow.axaml

@@ -1,28 +1,41 @@
-<window:StyleableWindow xmlns="https://github.com/avaloniaui"
-                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                        mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="350"
-                        x:Class="Ryujinx.Ava.Ui.Windows.AboutWindow"
-                        xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
-                        xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-                        CanResize="False"
-                        WindowStartupLocation="CenterOwner"
-                        Width="850" MinHeight="550" Height="550"
-                        SizeToContent="Width"
-                        MinWidth="500"
-                        Title="Ryujinx - About">
-    <Grid Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+<window:StyleableWindow
+    x:Class="Ryujinx.Ava.Ui.Windows.AboutWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
+    Title="Ryujinx - About"
+    Width="850"
+    Height="550"
+    MinWidth="500"
+    MinHeight="550"
+    d:DesignHeight="350"
+    d:DesignWidth="400"
+    CanResize="False"
+    SizeToContent="Width"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
+    <Grid
+        Margin="15"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <Grid Grid.Row="1" Margin="20" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.Column="0">
+        <Grid
+            Grid.Row="1"
+            Grid.Column="0"
+            Margin="20"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
                 <RowDefinition Height="*" />
@@ -40,93 +53,168 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Image Grid.Row="0" Grid.Column="0" Grid.RowSpan="3" Margin="5, 10, 20 , 10"
-                       Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" Height="110" MinWidth="50" />
-                <TextBlock FontSize="35" TextAlignment="Center" Grid.Row="0" Grid.Column="1" Text="Ryujinx"
-                           Margin="0,20,0,0" />
-                <TextBlock FontSize="16" TextAlignment="Center" Grid.Row="1" Grid.Column="1" Text="(REE-YOU-JINX)"
-                           Margin="0,0,0,0" />
-                <Button Grid.Column="1" Background="Transparent" HorizontalAlignment="Center" Margin="0" Grid.Row="2"
-                        Tag="https://www.ryujinx.org/"
-                        Click="Button_OnClick">
-                    <TextBlock ToolTip.Tip="{locale:Locale AboutUrlTooltipMessage}"
-                               TextAlignment="Center" TextDecorations="Underline" Text="www.ryujinx.org" />
+                <Image
+                    Grid.Row="0"
+                    Grid.RowSpan="3"
+                    Grid.Column="0"
+                    Height="110"
+                    MinWidth="50"
+                    Margin="5,10,20,10"
+                    Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" />
+                <TextBlock
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    Margin="0,20,0,0"
+                    FontSize="35"
+                    Text="Ryujinx"
+                    TextAlignment="Center" />
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="0,0,0,0"
+                    FontSize="16"
+                    Text="(REE-YOU-JINX)"
+                    TextAlignment="Center" />
+                <Button
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="0"
+                    HorizontalAlignment="Center"
+                    Background="Transparent"
+                    Click="Button_OnClick"
+                    Tag="https://www.ryujinx.org/">
+                    <TextBlock
+                        Text="www.ryujinx.org"
+                        TextAlignment="Center"
+                        TextDecorations="Underline"
+                        ToolTip.Tip="{locale:Locale AboutUrlTooltipMessage}" />
                 </Button>
             </Grid>
-            <TextBlock TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"
-                       Text="{Binding Version}" Grid.Row="1" />
-            <TextBlock Grid.Row="2" TextAlignment="Center" HorizontalAlignment="Center" Margin="20"
-                       Text="{locale:Locale AboutDisclaimerMessage}"
-                       MaxLines="2" />
-            <TextBlock Grid.Row="3" TextAlignment="Center" HorizontalAlignment="Center" Margin="20"
-                       Text="{locale:Locale AboutAmiiboDisclaimerMessage}"
-                       Name="AmiiboLabel"
-                       PointerPressed="AmiiboLabel_OnPointerPressed"
-                       MaxLines="2" />
-            <StackPanel Spacing="10" Orientation="Horizontal" Grid.Row="4" HorizontalAlignment="Center">
-                <StackPanel Orientation="Vertical"
-                            ToolTip.Tip="{locale:Locale AboutPatreonUrlTooltipMessage}">
-                    <Button Height="65" Background="Transparent" Tag="https://www.patreon.com/ryujinx"
-                            Click="Button_OnClick">
+            <TextBlock
+                Grid.Row="1"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="{Binding Version}"
+                TextAlignment="Center" />
+            <TextBlock
+                Grid.Row="2"
+                Margin="20"
+                HorizontalAlignment="Center"
+                MaxLines="2"
+                Text="{locale:Locale AboutDisclaimerMessage}"
+                TextAlignment="Center" />
+            <TextBlock
+                Name="AmiiboLabel"
+                Grid.Row="3"
+                Margin="20"
+                HorizontalAlignment="Center"
+                MaxLines="2"
+                PointerPressed="AmiiboLabel_OnPointerPressed"
+                Text="{locale:Locale AboutAmiiboDisclaimerMessage}"
+                TextAlignment="Center" />
+            <StackPanel
+                Grid.Row="4"
+                HorizontalAlignment="Center"
+                Orientation="Horizontal"
+                Spacing="10">
+                <StackPanel Orientation="Vertical" ToolTip.Tip="{locale:Locale AboutPatreonUrlTooltipMessage}">
+                    <Button
+                        Height="65"
+                        Background="Transparent"
+                        Click="Button_OnClick"
+                        Tag="https://www.patreon.com/ryujinx">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_Patreon.png?assembly=Ryujinx.Ui.Common" />
-                            <TextBlock Grid.Row="1" Margin="0,5,0,0" Text="Patreon" HorizontalAlignment="Center" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Margin="0,5,0,0"
+                                HorizontalAlignment="Center"
+                                Text="Patreon" />
                         </Grid>
                     </Button>
                 </StackPanel>
-                <StackPanel Orientation="Vertical"
-                            ToolTip.Tip="{locale:Locale AboutGithubUrlTooltipMessage}">
-                    <Button Height="65" Background="Transparent" Tag="https://github.com/Ryujinx/Ryujinx"
-                            Click="Button_OnClick">
+                <StackPanel Orientation="Vertical" ToolTip.Tip="{locale:Locale AboutGithubUrlTooltipMessage}">
+                    <Button
+                        Height="65"
+                        Background="Transparent"
+                        Click="Button_OnClick"
+                        Tag="https://github.com/Ryujinx/Ryujinx">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_GitHub.png?assembly=Ryujinx.Ui.Common" />
-                            <TextBlock Grid.Row="1" Margin="0,5,0,0" Text="GitHub" HorizontalAlignment="Center" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Margin="0,5,0,0"
+                                HorizontalAlignment="Center"
+                                Text="GitHub" />
                         </Grid>
                     </Button>
                 </StackPanel>
-                <StackPanel Orientation="Vertical"
-                            ToolTip.Tip="{locale:Locale AboutDiscordUrlTooltipMessage}">
-                    <Button Height="65" Background="Transparent" Tag="https://discordapp.com/invite/N2FmfVc"
-                            Click="Button_OnClick">
+                <StackPanel Orientation="Vertical" ToolTip.Tip="{locale:Locale AboutDiscordUrlTooltipMessage}">
+                    <Button
+                        Height="65"
+                        Background="Transparent"
+                        Click="Button_OnClick"
+                        Tag="https://discordapp.com/invite/N2FmfVc">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_Discord.png?assembly=Ryujinx.Ui.Common" />
-                            <TextBlock Grid.Row="1" Margin="0,5,0,0" Text="Discord" HorizontalAlignment="Center" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Margin="0,5,0,0"
+                                HorizontalAlignment="Center"
+                                Text="Discord" />
                         </Grid>
                     </Button>
                 </StackPanel>
-                <StackPanel Orientation="Vertical"
-                            ToolTip.Tip="{locale:Locale AboutTwitterUrlTooltipMessage}">
-                    <Button Height="65" Background="Transparent" Tag="https://twitter.com/RyujinxEmu"
-                            Click="Button_OnClick">
+                <StackPanel Orientation="Vertical" ToolTip.Tip="{locale:Locale AboutTwitterUrlTooltipMessage}">
+                    <Button
+                        Height="65"
+                        Background="Transparent"
+                        Click="Button_OnClick"
+                        Tag="https://twitter.com/RyujinxEmu">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <Image Source="resm:Ryujinx.Ui.Common.Resources.Logo_Twitter.png?assembly=Ryujinx.Ui.Common" />
-                            <TextBlock Grid.Row="1" Margin="0,5,0,0" Text="Twitter" HorizontalAlignment="Center" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Margin="0,5,0,0"
+                                HorizontalAlignment="Center"
+                                Text="Twitter" />
                         </Grid>
                     </Button>
                 </StackPanel>
             </StackPanel>
         </Grid>
-        <Border Grid.Row="1" Grid.Column="1" VerticalAlignment="Stretch" Margin="5" Width="2" BorderBrush="White"
-                BorderThickness="1,0,0,0">
+        <Border
+            Grid.Row="1"
+            Grid.Column="1"
+            Width="2"
+            Margin="5"
+            VerticalAlignment="Stretch"
+            BorderBrush="White"
+            BorderThickness="1,0,0,0">
             <Separator Width="0" />
         </Border>
-        <Grid Grid.Row="1" Margin="20" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.Column="2">
+        <Grid
+            Grid.Row="1"
+            Grid.Column="2"
+            Margin="20"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
@@ -136,27 +224,58 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <TextBlock Text="{locale:Locale AboutRyujinxAboutTitle}" FontWeight="Bold" TextDecorations="Underline" />
-            <TextBlock LineHeight="20" Grid.Row="1" Margin="20,5,5,5"
-                       Text="{locale:Locale AboutRyujinxAboutContent}" />
-            <TextBlock Grid.Row="2" Margin="0,10,0,0" Text="{locale:Locale AboutRyujinxMaintainersTitle}"
-                       FontWeight="Bold"
-                       TextDecorations="Underline" />
-            <TextBlock LineHeight="20" Grid.Row="3" Margin="20,5,5,5"
-                       Text="{Binding Developers}" />
-            <Button Background="Transparent" HorizontalAlignment="Right" Grid.Row="4"
-                    Tag="https://github.com/Ryujinx/Ryujinx/graphs/contributors?type=a" Click="Button_OnClick">
-                <TextBlock ToolTip.Tip="{locale:Locale AboutRyujinxMaintainersContentTooltipMessage}"
-                           TextAlignment="Right" TextDecorations="Underline"
-                           Text="{locale:Locale AboutRyujinxContributorsButtonHeader}" />
+            <TextBlock
+                FontWeight="Bold"
+                Text="{locale:Locale AboutRyujinxAboutTitle}"
+                TextDecorations="Underline" />
+            <TextBlock
+                Grid.Row="1"
+                Margin="20,5,5,5"
+                LineHeight="20"
+                Text="{locale:Locale AboutRyujinxAboutContent}" />
+            <TextBlock
+                Grid.Row="2"
+                Margin="0,10,0,0"
+                FontWeight="Bold"
+                Text="{locale:Locale AboutRyujinxMaintainersTitle}"
+                TextDecorations="Underline" />
+            <TextBlock
+                Grid.Row="3"
+                Margin="20,5,5,5"
+                LineHeight="20"
+                Text="{Binding Developers}" />
+            <Button
+                Grid.Row="4"
+                HorizontalAlignment="Right"
+                Background="Transparent"
+                Click="Button_OnClick"
+                Tag="https://github.com/Ryujinx/Ryujinx/graphs/contributors?type=a">
+                <TextBlock
+                    Text="{locale:Locale AboutRyujinxContributorsButtonHeader}"
+                    TextAlignment="Right"
+                    TextDecorations="Underline"
+                    ToolTip.Tip="{locale:Locale AboutRyujinxMaintainersContentTooltipMessage}" />
             </Button>
-            <TextBlock Grid.Row="5" Margin="0,0,0,0" Text="{locale:Locale AboutRyujinxSupprtersTitle}"
-                       FontWeight="Bold"
-                       TextDecorations="Underline" />
-            <Border Width="460" Grid.Row="6" VerticalAlignment="Stretch" Height="200" BorderThickness="1" Margin="20,5"
-                    BorderBrush="White" Padding="5">
-                <TextBlock TextWrapping="Wrap" VerticalAlignment="Top" Name="SupportersTextBlock"
-                           Text="{Binding Supporters}" />
+            <TextBlock
+                Grid.Row="5"
+                Margin="0,0,0,0"
+                FontWeight="Bold"
+                Text="{locale:Locale AboutRyujinxSupprtersTitle}"
+                TextDecorations="Underline" />
+            <Border
+                Grid.Row="6"
+                Width="460"
+                Height="200"
+                Margin="20,5"
+                Padding="5"
+                VerticalAlignment="Stretch"
+                BorderBrush="White"
+                BorderThickness="1">
+                <TextBlock
+                    Name="SupportersTextBlock"
+                    VerticalAlignment="Top"
+                    Text="{Binding Supporters}"
+                    TextWrapping="Wrap" />
             </Border>
         </Grid>
     </Grid>

Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml.cs

@@ -0,0 +1,200 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Ui.Controls;
+using Ryujinx.Ava.Ui.ViewModels;
+using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Configuration.Hid.Controller;
+using Ryujinx.Input;
+using Ryujinx.Input.Assigner;
+using Ryujinx.Ui.Common.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Key = Ryujinx.Input.Key;
+
+namespace Ryujinx.Ava.Ui.Windows
+{
+    public class ControllerSettingsWindow : UserControl
+    {
+        private bool _dialogOpen;
+
+        public Grid SettingButtons { get; set; }
+        private ButtonKeyAssigner _currentAssigner;
+        internal ControllerSettingsViewModel ViewModel { get; set; }
+
+        public ControllerSettingsWindow()
+        {
+            DataContext = ViewModel = new ControllerSettingsViewModel(this);
+
+            InitializeComponent();
+
+            foreach (ILogical visual in SettingButtons.GetLogicalDescendants())
+            {
+                if (visual is ToggleButton button && !(visual is CheckBox))
+                {
+                    button.Checked += Button_Checked;
+                    button.Unchecked += Button_Unchecked;
+                }
+            }
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+
+            SettingButtons = this.FindControl<Grid>("SettingButtons");
+        }
+
+        protected override void OnPointerReleased(PointerReleasedEventArgs e)
+        {
+            base.OnPointerReleased(e);
+
+            if (_currentAssigner != null && _currentAssigner.ToggledButton != null && !_currentAssigner.ToggledButton.IsPointerOver)
+            {
+                _currentAssigner.Cancel();
+            }
+        }
+
+        private void Button_Checked(object sender, RoutedEventArgs e)
+        {
+            if (sender is ToggleButton button)
+            {
+                if (_currentAssigner != null && button == _currentAssigner.ToggledButton)
+                {
+                    return;
+                }
+
+                bool isStick = button.Tag != null && button.Tag.ToString() == "stick";
+
+                if (_currentAssigner == null && (bool)button.IsChecked)
+                {
+                    _currentAssigner = new ButtonKeyAssigner(button);
+
+                    FocusManager.Instance.Focus(this, NavigationMethod.Pointer);
+
+                    PointerPressed += MouseClick;
+
+                    IKeyboard keyboard = (IKeyboard)ViewModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
+                    IButtonAssigner assigner = CreateButtonAssigner(isStick);
+
+                    _currentAssigner.ButtonAssigned += (sender, e) =>
+                    {
+                        if (e.IsAssigned)
+                        {
+                            ViewModel.IsModified = true;
+                        }
+                    };
+
+                    _currentAssigner.GetInputAndAssign(assigner, keyboard);
+                }
+                else
+                {
+                    if (_currentAssigner != null)
+                    {
+                        ToggleButton oldButton = _currentAssigner.ToggledButton;
+
+                        _currentAssigner.Cancel();
+                        _currentAssigner = null;
+                        button.IsChecked = false;
+                    }
+                }
+            }
+        }
+
+        public void SaveCurrentProfile()
+        {
+            ViewModel.Save();
+        }
+
+        private IButtonAssigner CreateButtonAssigner(bool forStick)
+        {
+            IButtonAssigner assigner;
+
+            var device = ViewModel.Devices[ViewModel.Device];
+
+            if (device.Type == Models.DeviceType.Keyboard)
+            {
+                assigner = new KeyboardKeyAssigner((IKeyboard)ViewModel.SelectedGamepad);
+            }
+            else if (device.Type == Models.DeviceType.Controller)
+            {
+                InputConfig config = ConfigurationState.Instance.Hid.InputConfig.Value.Find(inputConfig => inputConfig.Id == ViewModel.SelectedGamepad.Id);
+
+                assigner = new GamepadButtonAssigner(ViewModel.SelectedGamepad, (config as StandardControllerInputConfig).TriggerThreshold, forStick);
+            }
+            else
+            {
+                throw new Exception("Controller not supported");
+            }
+
+            return assigner;
+        }
+
+        private void Button_Unchecked(object sender, RoutedEventArgs e)
+        {
+            _currentAssigner?.Cancel();
+            _currentAssigner = null;
+        }
+
+        private void MouseClick(object sender, PointerPressedEventArgs e)
+        {
+            bool shouldUnbind = false;
+
+            if (e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed)
+            {
+                shouldUnbind = true;
+            }
+
+            _currentAssigner?.Cancel(shouldUnbind);
+
+            PointerPressed -= MouseClick;
+        }
+
+        private async void PlayerIndexBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (ViewModel.IsModified && !_dialogOpen)
+            {
+                _dialogOpen = true;
+
+                var result = await ContentDialogHelper.CreateConfirmationDialog(
+                    this.GetVisualRoot() as StyleableWindow,
+                    LocaleManager.Instance["DialogControllerSettingsModifiedConfirmMessage"],
+                    LocaleManager.Instance["DialogControllerSettingsModifiedConfirmSubMessage"],
+                    LocaleManager.Instance["InputDialogYes"],
+                    LocaleManager.Instance["InputDialogNo"],
+                    LocaleManager.Instance["RyujinxConfirm"]);
+
+                if (result == UserResult.Yes)
+                {
+                    ViewModel.Save();
+                }
+
+                _dialogOpen = false;
+
+                ViewModel.IsModified = false;
+
+                if (e.AddedItems.Count > 0)
+                {
+                    (PlayerIndex key, _) = (KeyValuePair<PlayerIndex, string>)e.AddedItems[0];
+                    ViewModel.PlayerId = key;
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            _currentAssigner?.Cancel();
+            _currentAssigner = null;
+            ViewModel.Dispose();
+        }
+    }
+}

Ryujinx.Ava/Ui/Windows/MainWindow.axaml

@@ -1,25 +1,25 @@
 <window:StyleableWindow
     x:Class="Ryujinx.Ava.Ui.Windows.MainWindow"
     xmlns="https://github.com/avaloniaui"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
     xmlns:controls="clr-namespace:Ryujinx.Ava.Ui.Controls"
-    xmlns:models="clr-namespace:Ryujinx.Ava.Ui.Models"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="clr-namespace:Ryujinx.Ava.Ui.Models"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.Ui.ViewModels"
     xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
     Title="Ryujinx"
-    Height="785"
     Width="1280"
-    d:DesignHeight="720"
-    d:DesignWidth="1280"
+    Height="785"
     MinWidth="1024"
     MinHeight="680"
-    WindowStartupLocation="CenterScreen"
+    d:DesignHeight="720"
+    d:DesignWidth="1280"
     x:CompileBindings="True"
     x:DataType="viewModels:MainWindowViewModel"
+    WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <Window.Styles>
         <Style Selector="TitleBar:fullscreen">
@@ -38,23 +38,28 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <controls:OffscreenTextBox Name="HiddenTextBox" Grid.Row="0" />
-        <ContentControl Grid.Row="1"
-                        Focusable="False"
-                        IsVisible="False"
-                        KeyboardNavigation.IsTabStop="False">
-            <ui:ContentDialog Name="ContentDialog"
-                              KeyboardNavigation.IsTabStop="False"
-                              IsPrimaryButtonEnabled="True"
-                              IsSecondaryButtonEnabled="True"
-                              IsVisible="True" />
+        <ContentControl
+            Grid.Row="1"
+            Focusable="False"
+            IsVisible="False"
+            KeyboardNavigation.IsTabStop="False">
+            <ui:ContentDialog
+                Name="ContentDialog"
+                IsPrimaryButtonEnabled="True"
+                IsSecondaryButtonEnabled="True"
+                IsVisible="True"
+                KeyboardNavigation.IsTabStop="False" />
         </ContentControl>
-        <StackPanel IsVisible="False" Grid.Row="0">
+        <StackPanel Grid.Row="0" IsVisible="False">
             <controls:HotKeyControl Name="FullscreenHotKey" Command="{ReflectionBinding ToggleFullscreen}" />
             <controls:HotKeyControl Name="FullscreenHotKey2" Command="{ReflectionBinding ToggleFullscreen}" />
             <controls:HotKeyControl Name="DockToggleHotKey" Command="{ReflectionBinding ToggleDockMode}" />
             <controls:HotKeyControl Name="ExitHotKey" Command="{ReflectionBinding ExitCurrentState}" />
         </StackPanel>
-        <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="1">
+        <Grid
+            Grid.Row="1"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
@@ -73,47 +78,51 @@
                 <DockPanel HorizontalAlignment="Stretch">
                     <Menu
                         Name="Menu"
-                        Margin="0"
                         Height="35"
+                        Margin="0"
                         HorizontalAlignment="Left">
                         <Menu.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <DockPanel HorizontalAlignment="Stretch" Margin="0" />
+                                <DockPanel Margin="0" HorizontalAlignment="Stretch" />
                             </ItemsPanelTemplate>
                         </Menu.ItemsPanel>
-                        <MenuItem
-                            VerticalAlignment="Center"
-                            Header="{locale:Locale MenuBarFile}">
-                            <MenuItem IsEnabled="{Binding EnableNonGameRunningControls}"
-                                      Command="{ReflectionBinding OpenFile}"
-                                      Header="{locale:Locale MenuBarFileOpenFromFile}"
-                                      ToolTip.Tip="{locale:Locale LoadApplicationFileTooltip}" />
-                            <MenuItem IsEnabled="{Binding EnableNonGameRunningControls}"
-                                      Command="{ReflectionBinding OpenFolder}"
-                                      Header="{locale:Locale MenuBarFileOpenUnpacked}"
-                                      ToolTip.Tip="{locale:Locale LoadApplicationFolderTooltip}" />
-                            <MenuItem Header="{locale:Locale MenuBarFileOpenApplet}"
-                                      IsEnabled="{Binding IsAppletMenuActive}">
-                                <MenuItem Command="{ReflectionBinding OpenMiiApplet}" Header="Mii Edit Applet"
-                                          ToolTip.Tip="{locale:Locale MenuBarFileOpenAppletOpenMiiAppletToolTip}" />
+                        <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarFile}">
+                            <MenuItem
+                                Command="{ReflectionBinding OpenFile}"
+                                Header="{locale:Locale MenuBarFileOpenFromFile}"
+                                IsEnabled="{Binding EnableNonGameRunningControls}"
+                                ToolTip.Tip="{locale:Locale LoadApplicationFileTooltip}" />
+                            <MenuItem
+                                Command="{ReflectionBinding OpenFolder}"
+                                Header="{locale:Locale MenuBarFileOpenUnpacked}"
+                                IsEnabled="{Binding EnableNonGameRunningControls}"
+                                ToolTip.Tip="{locale:Locale LoadApplicationFolderTooltip}" />
+                            <MenuItem Header="{locale:Locale MenuBarFileOpenApplet}" IsEnabled="{Binding IsAppletMenuActive}">
+                                <MenuItem
+                                    Command="{ReflectionBinding OpenMiiApplet}"
+                                    Header="Mii Edit Applet"
+                                    ToolTip.Tip="{locale:Locale MenuBarFileOpenAppletOpenMiiAppletToolTip}" />
                             </MenuItem>
                             <Separator />
-                            <MenuItem Command="{ReflectionBinding OpenRyujinxFolder}"
-                                      Header="{locale:Locale MenuBarFileOpenEmuFolder}"
-                                      ToolTip.Tip="{locale:Locale OpenRyujinxFolderTooltip}" />
-                            <MenuItem Command="{ReflectionBinding OpenLogsFolder}"
-                                      Header="{locale:Locale MenuBarFileOpenLogsFolder}"
-                                      ToolTip.Tip="{locale:Locale OpenRyujinxLogsTooltip}" />
+                            <MenuItem
+                                Command="{ReflectionBinding OpenRyujinxFolder}"
+                                Header="{locale:Locale MenuBarFileOpenEmuFolder}"
+                                ToolTip.Tip="{locale:Locale OpenRyujinxFolderTooltip}" />
+                            <MenuItem
+                                Command="{ReflectionBinding OpenLogsFolder}"
+                                Header="{locale:Locale MenuBarFileOpenLogsFolder}"
+                                ToolTip.Tip="{locale:Locale OpenRyujinxLogsTooltip}" />
                             <Separator />
-                            <MenuItem Command="{ReflectionBinding CloseWindow}"
-                                      Header="{locale:Locale MenuBarFileExit}"
-                                      ToolTip.Tip="{locale:Locale ExitTooltip}" />
+                            <MenuItem
+                                Command="{ReflectionBinding CloseWindow}"
+                                Header="{locale:Locale MenuBarFileExit}"
+                                ToolTip.Tip="{locale:Locale ExitTooltip}" />
                         </MenuItem>
-                        <MenuItem
-                            VerticalAlignment="Center"
-                            Header="{locale:Locale MenuBarOptions}">
-                            <MenuItem Command="{ReflectionBinding ToggleFullscreen}"
-                                      Header="{locale:Locale MenuBarOptionsToggleFullscreen}" InputGesture="F11" />
+                        <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarOptions}">
+                            <MenuItem
+                                Command="{ReflectionBinding ToggleFullscreen}"
+                                Header="{locale:Locale MenuBarOptionsToggleFullscreen}"
+                                InputGesture="F11" />
                             <MenuItem Header="{locale:Locale MenuBarOptionsStartGamesInFullscreen}">
                                 <MenuItem.Icon>
                                     <CheckBox IsChecked="{Binding StartGamesInFullscreen, Mode=TwoWay}" />
@@ -126,60 +135,86 @@
                             </MenuItem>
                             <Separator />
                             <MenuItem Header="{locale:Locale MenuBarOptionsChangeLanguage}">
-                                <MenuItem Command="{ReflectionBinding ChangeLanguage}" CommandParameter="en_US"
-                                          Header="American English" />
-                                <MenuItem Command="{ReflectionBinding ChangeLanguage}" CommandParameter="pt_BR"
-                                          Header="Brazilian Portuguese" />
-                                <MenuItem Command="{ReflectionBinding ChangeLanguage}" CommandParameter="es_ES"
-                                          Header="Castilian Spanish" />
-                                <MenuItem Command="{ReflectionBinding ChangeLanguage}" CommandParameter="fr_FR"
-                                          Header="French" />
-                                <MenuItem Command="{ReflectionBinding ChangeLanguage}" CommandParameter="de_DE"
-                                          Header="German" />
-                                <MenuItem Command="{ReflectionBinding ChangeLanguage}" CommandParameter="el_GR"
-                                          Header="Greek" />
-                                <MenuItem Command="{ReflectionBinding ChangeLanguage}" CommandParameter="it_IT"
-                                          Header="Italian" />
-                                <MenuItem Command="{ReflectionBinding ChangeLanguage}" CommandParameter="ko_KR"
-                                          Header="Korean" />
-                                <MenuItem Command="{ReflectionBinding ChangeLanguage}" CommandParameter="ru_RU"
-                                          Header="Russian" />
-                                <MenuItem Command="{ReflectionBinding ChangeLanguage}" CommandParameter="tr_TR"
-                                          Header="Turkish" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="en_US"
+                                    Header="American English" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="pt_BR"
+                                    Header="Brazilian Portuguese" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="es_ES"
+                                    Header="Castilian Spanish" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="fr_FR"
+                                    Header="French" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="de_DE"
+                                    Header="German" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="el_GR"
+                                    Header="Greek" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="it_IT"
+                                    Header="Italian" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="ko_KR"
+                                    Header="Korean" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="ru_RU"
+                                    Header="Russian" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="tr_TR"
+                                    Header="Turkish" />
+                                <MenuItem
+                                    Command="{ReflectionBinding ChangeLanguage}"
+                                    CommandParameter="zh_CN"
+                                    Header="Simplified Chinese" />
                             </MenuItem>
                             <Separator />
-                            <MenuItem Command="{ReflectionBinding OpenSettings}"
-                                      Header="{locale:Locale MenuBarOptionsSettings}"
-                                      ToolTip.Tip="{locale:Locale OpenSettingsTooltip}" />
-                            <MenuItem Command="{ReflectionBinding ManageProfiles}"
-                                      IsEnabled="{Binding EnableNonGameRunningControls}"
-                                      Header="{locale:Locale MenuBarOptionsManageUserProfiles}"
-                                      ToolTip.Tip="{locale:Locale OpenProfileManagerTooltip}" />
+                            <MenuItem
+                                Command="{ReflectionBinding OpenSettings}"
+                                Header="{locale:Locale MenuBarOptionsSettings}"
+                                ToolTip.Tip="{locale:Locale OpenSettingsTooltip}" />
+                            <MenuItem
+                                Command="{ReflectionBinding ManageProfiles}"
+                                Header="{locale:Locale MenuBarOptionsManageUserProfiles}"
+                                IsEnabled="{Binding EnableNonGameRunningControls}"
+                                ToolTip.Tip="{locale:Locale OpenProfileManagerTooltip}" />
                         </MenuItem>
                         <MenuItem
+                            Name="ActionsMenuItem"
                             VerticalAlignment="Center"
                             Header="{locale:Locale MenuBarActions}"
-                            Name="ActionsMenuItem"
                             IsEnabled="{Binding IsGameRunning}">
                             <MenuItem
                                 Click="PauseEmulation_Click"
                                 Header="{locale:Locale MenuBarOptionsPauseEmulation}"
+                                InputGesture="{Binding PauseKey}"
                                 IsEnabled="{Binding !IsPaused}"
-                                IsVisible="{Binding !IsPaused}"
-                                InputGesture="{Binding PauseKey}" />
+                                IsVisible="{Binding !IsPaused}" />
                             <MenuItem
                                 Click="ResumeEmulation_Click"
                                 Header="{locale:Locale MenuBarOptionsResumeEmulation}"
+                                InputGesture="{Binding PauseKey}"
                                 IsEnabled="{Binding IsPaused}"
-                                IsVisible="{Binding IsPaused}"
-                                InputGesture="{Binding PauseKey}" />
+                                IsVisible="{Binding IsPaused}" />
                             <MenuItem
                                 Click="StopEmulation_Click"
                                 Header="{locale:Locale MenuBarOptionsStopEmulation}"
-                                ToolTip.Tip="{locale:Locale StopEmulationTooltip}"
-                                IsEnabled="{Binding IsGameRunning}" InputGesture="Escape" />
-                            <MenuItem Command="{ReflectionBinding SimulateWakeUpMessage}"
-                                      Header="{locale:Locale MenuBarOptionsSimulateWakeUpMessage}" />
+                                InputGesture="Escape"
+                                IsEnabled="{Binding IsGameRunning}"
+                                ToolTip.Tip="{locale:Locale StopEmulationTooltip}" />
+                            <MenuItem Command="{ReflectionBinding SimulateWakeUpMessage}" Header="{locale:Locale MenuBarOptionsSimulateWakeUpMessage}" />
                             <Separator />
                             <MenuItem
                                 Name="ScanAmiiboMenuItem"
@@ -187,41 +222,38 @@
                                 Command="{ReflectionBinding OpenAmiiboWindow}"
                                 Header="{locale:Locale MenuBarActionsScanAmiibo}"
                                 IsEnabled="{Binding IsAmiiboRequested}" />
-                            <MenuItem Command="{ReflectionBinding TakeScreenshot}"
-                                      IsEnabled="{Binding IsGameRunning}"
-                                      Header="{locale:Locale MenuBarFileToolsTakeScreenshot}"
-                                      InputGesture="{Binding ScreenshotKey}" />
-                            <MenuItem Command="{ReflectionBinding HideUi}"
-                                      IsEnabled="{Binding IsGameRunning}"
-                                      Header="{locale:Locale MenuBarFileToolsHideUi}"
-                                      InputGesture="{Binding ShowUiKey}" />
-                            <MenuItem Command="{ReflectionBinding  OpenCheatManagerForCurrentApp}"
-                                      IsEnabled="{Binding IsGameRunning}"
-                                      Header="{locale:Locale GameListContextMenuManageCheat}" />
+                            <MenuItem
+                                Command="{ReflectionBinding TakeScreenshot}"
+                                Header="{locale:Locale MenuBarFileToolsTakeScreenshot}"
+                                InputGesture="{Binding ScreenshotKey}"
+                                IsEnabled="{Binding IsGameRunning}" />
+                            <MenuItem
+                                Command="{ReflectionBinding HideUi}"
+                                Header="{locale:Locale MenuBarFileToolsHideUi}"
+                                InputGesture="{Binding ShowUiKey}"
+                                IsEnabled="{Binding IsGameRunning}" />
+                            <MenuItem
+                                Command="{ReflectionBinding OpenCheatManagerForCurrentApp}"
+                                Header="{locale:Locale GameListContextMenuManageCheat}"
+                                IsEnabled="{Binding IsGameRunning}" />
                         </MenuItem>
-                        <MenuItem
-                            VerticalAlignment="Center"
-                            Header="{locale:Locale MenuBarTools}">
-                            <MenuItem Header="{locale:Locale MenuBarToolsInstallFirmware}"
-                                      IsEnabled="{Binding EnableNonGameRunningControls}">
-                                <MenuItem Command="{ReflectionBinding InstallFirmwareFromFile}"
-                                          Header="{locale:Locale MenuBarFileToolsInstallFirmwareFromFile}" />
-                                <MenuItem Command="{ReflectionBinding InstallFirmwareFromFolder}"
-                                          Header="{locale:Locale MenuBarFileToolsInstallFirmwareFromDirectory}" />
+                        <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarTools}">
+                            <MenuItem Header="{locale:Locale MenuBarToolsInstallFirmware}" IsEnabled="{Binding EnableNonGameRunningControls}">
+                                <MenuItem Command="{ReflectionBinding InstallFirmwareFromFile}" Header="{locale:Locale MenuBarFileToolsInstallFirmwareFromFile}" />
+                                <MenuItem Command="{ReflectionBinding InstallFirmwareFromFolder}" Header="{locale:Locale MenuBarFileToolsInstallFirmwareFromDirectory}" />
                             </MenuItem>
                         </MenuItem>
-                        <MenuItem
-                            VerticalAlignment="Center"
-                            Header="{locale:Locale MenuBarHelp}">
+                        <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarHelp}">
                             <MenuItem
                                 Name="UpdateMenuItem"
                                 Command="{ReflectionBinding CheckForUpdates}"
                                 Header="{locale:Locale MenuBarHelpCheckForUpdates}"
                                 ToolTip.Tip="{locale:Locale CheckUpdatesTooltip}" />
                             <Separator />
-                            <MenuItem Command="{ReflectionBinding OpenAboutWindow}"
-                                      Header="{locale:Locale MenuBarHelpAbout}"
-                                      ToolTip.Tip="{locale:Locale OpenAboutTooltip}" />
+                            <MenuItem
+                                Command="{ReflectionBinding OpenAboutWindow}"
+                                Header="{locale:Locale MenuBarHelpAbout}"
+                                ToolTip.Tip="{locale:Locale OpenAboutTooltip}" />
                         </MenuItem>
                     </Menu>
                 </DockPanel>
@@ -230,152 +262,213 @@
                 Name="Content"
                 Grid.Row="1"
                 Padding="0"
-                IsVisible="{Binding ShowContent}"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 BorderBrush="{DynamicResource ThemeControlBorderColor}"
                 BorderThickness="0,0,0,0"
-                DockPanel.Dock="Top">
+                DockPanel.Dock="Top"
+                IsVisible="{Binding ShowContent}">
                 <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
-                    <DockPanel Grid.Row="0" HorizontalAlignment="Stretch" Margin="0,0,0,5">
+                    <DockPanel
+                        Grid.Row="0"
+                        Margin="0,0,0,5"
+                        HorizontalAlignment="Stretch">
                         <Button
-                            IsEnabled="{Binding IsGrid}" VerticalAlignment="Stretch" MinWidth="40" Width="40"
-                            Margin="5,2,0,2" Command="{ReflectionBinding SetListMode}">
-                            <ui:FontIcon FontFamily="avares://FluentAvalonia/Fonts#Symbols"
-                                         VerticalAlignment="Center"
-                                         Margin="0"
-                                         Glyph="{controls:GlyphValueConverter List}"
-                                         HorizontalAlignment="Stretch" />
+                            Width="40"
+                            MinWidth="40"
+                            Margin="5,2,0,2"
+                            VerticalAlignment="Stretch"
+                            Command="{ReflectionBinding SetListMode}"
+                            IsEnabled="{Binding IsGrid}">
+                            <ui:FontIcon
+                                Margin="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                FontFamily="avares://FluentAvalonia/Fonts#Symbols"
+                                Glyph="{controls:GlyphValueConverter List}" />
                         </Button>
                         <Button
-                            IsEnabled="{Binding IsList}" VerticalAlignment="Stretch" MinWidth="40" Width="40"
-                            Margin="5,2,5,2" Command="{ReflectionBinding SetGridMode}">
-                            <ui:FontIcon FontFamily="avares://FluentAvalonia/Fonts#Symbols"
-                                         VerticalAlignment="Center"
-                                         Margin="0"
-                                         Glyph="{controls:GlyphValueConverter Grid}"
-                                         HorizontalAlignment="Stretch" />
+                            Width="40"
+                            MinWidth="40"
+                            Margin="5,2,5,2"
+                            VerticalAlignment="Stretch"
+                            Command="{ReflectionBinding SetGridMode}"
+                            IsEnabled="{Binding IsList}">
+                            <ui:FontIcon
+                                Margin="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                FontFamily="avares://FluentAvalonia/Fonts#Symbols"
+                                Glyph="{controls:GlyphValueConverter Grid}" />
                         </Button>
-                        <TextBlock Text="{locale:Locale IconSize}"
-                                   VerticalAlignment="Center" Margin="10,0"
-                                   ToolTip.Tip="{locale:Locale IconSizeTooltip}" />
-                        <Slider Width="150" Margin="5,-10,5 ,0" Height="35"
-                                ToolTip.Tip="{locale:Locale IconSizeTooltip}"
-                                VerticalAlignment="Center" Minimum="1" Maximum="4" IsSnapToTickEnabled="True"
-                                TickFrequency="1" Value="{Binding GridSizeScale}" />
-                        <CheckBox Margin="0" IsChecked="{Binding ShowNames, Mode=TwoWay}" VerticalAlignment="Center"
-                                  IsVisible="{Binding IsGrid}">
-                            <TextBlock Text="{locale:Locale CommonShowNames}" Margin="5,3,0,0" />
+                        <TextBlock
+                            Margin="10,0"
+                            VerticalAlignment="Center"
+                            Text="{locale:Locale IconSize}"
+                            ToolTip.Tip="{locale:Locale IconSizeTooltip}" />
+                        <Slider
+                            Width="150"
+                            Height="35"
+                            Margin="5,-10,5,0"
+                            VerticalAlignment="Center"
+                            IsSnapToTickEnabled="True"
+                            Maximum="4"
+                            Minimum="1"
+                            TickFrequency="1"
+                            ToolTip.Tip="{locale:Locale IconSizeTooltip}"
+                            Value="{Binding GridSizeScale}" />
+                        <CheckBox
+                            Margin="0"
+                            VerticalAlignment="Center"
+                            IsChecked="{Binding ShowNames, Mode=TwoWay}"
+                            IsVisible="{Binding IsGrid}">
+                            <TextBlock Margin="5,3,0,0" Text="{locale:Locale CommonShowNames}" />
                         </CheckBox>
                         <TextBox
                             Name="SearchBox"
-                            DockPanel.Dock="Right"
-                            VerticalAlignment="Center"
                             MinWidth="200"
                             Margin="5,0,5,0"
                             HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Right"
                             KeyUp="SearchBox_OnKeyUp"
                             Text="{Binding SearchText}"
                             Watermark="{locale:Locale MenuSearch}" />
-                        <ui:DropDownButton DockPanel.Dock="Right"
-                                           HorizontalAlignment="Right" Width="150" VerticalAlignment="Center"
-                                           Content="{Binding SortName}">
+                        <ui:DropDownButton
+                            Width="150"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Content="{Binding SortName}"
+                            DockPanel.Dock="Right">
                             <ui:DropDownButton.Flyout>
                                 <Flyout Placement="Bottom">
-                                    <StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" Margin="0">
+                                    <StackPanel
+                                        Margin="0"
+                                        HorizontalAlignment="Stretch"
+                                        Orientation="Vertical">
                                         <StackPanel>
-                                            <RadioButton Tag="Favorite"
-                                                         IsChecked="{Binding IsSortedByFavorite, Mode=OneTime}"
-                                                         GroupName="Sort"
-                                                         Content="{locale:Locale CommonFavorite}"
-                                                         Checked="Sort_Checked" />
-                                            <RadioButton Tag="Title" GroupName="Sort"
-                                                         IsChecked="{Binding  IsSortedByTitle, Mode=OneTime}"
-                                                         Content="{locale:Locale GameListHeaderApplication}"
-                                                         Checked="Sort_Checked" />
-                                            <RadioButton Tag="Developer" GroupName="Sort"
-                                                         IsChecked="{Binding  IsSortedByDeveloper, Mode=OneTime}"
-                                                         Content="{locale:Locale GameListHeaderDeveloper}"
-                                                         Checked="Sort_Checked" />
-                                            <RadioButton Tag="TotalTimePlayed" GroupName="Sort"
-                                                         IsChecked="{Binding  IsSortedByTimePlayed, Mode=OneTime}"
-                                                         Content="{locale:Locale GameListHeaderTimePlayed}"
-                                                         Checked="Sort_Checked" />
-                                            <RadioButton Tag="LastPlayed" GroupName="Sort"
-                                                         IsChecked="{Binding IsSortedByLastPlayed, Mode=OneTime}"
-                                                         Content="{locale:Locale GameListHeaderLastPlayed}"
-                                                         Checked="Sort_Checked" />
-                                            <RadioButton Tag="FileType" GroupName="Sort"
-                                                         IsChecked="{Binding  IsSortedByType, Mode=OneTime}"
-                                                         Content="{locale:Locale GameListHeaderFileExtension}"
-                                                         Checked="Sort_Checked" />
-                                            <RadioButton Tag="FileSize" GroupName="Sort"
-                                                         IsChecked="{Binding IsSortedBySize, Mode=OneTime}"
-                                                         Content="{locale:Locale GameListHeaderFileSize}"
-                                                         Checked="Sort_Checked" />
-                                            <RadioButton Tag="Path" GroupName="Sort"
-                                                         IsChecked="{Binding IsSortedByPath, Mode=OneTime}"
-                                                         Content="{locale:Locale GameListHeaderPath}"
-                                                         Checked="Sort_Checked" />
+                                            <RadioButton
+                                                Checked="Sort_Checked"
+                                                Content="{locale:Locale CommonFavorite}"
+                                                GroupName="Sort"
+                                                IsChecked="{Binding IsSortedByFavorite, Mode=OneTime}"
+                                                Tag="Favorite" />
+                                            <RadioButton
+                                                Checked="Sort_Checked"
+                                                Content="{locale:Locale GameListHeaderApplication}"
+                                                GroupName="Sort"
+                                                IsChecked="{Binding IsSortedByTitle, Mode=OneTime}"
+                                                Tag="Title" />
+                                            <RadioButton
+                                                Checked="Sort_Checked"
+                                                Content="{locale:Locale GameListHeaderDeveloper}"
+                                                GroupName="Sort"
+                                                IsChecked="{Binding IsSortedByDeveloper, Mode=OneTime}"
+                                                Tag="Developer" />
+                                            <RadioButton
+                                                Checked="Sort_Checked"
+                                                Content="{locale:Locale GameListHeaderTimePlayed}"
+                                                GroupName="Sort"
+                                                IsChecked="{Binding IsSortedByTimePlayed, Mode=OneTime}"
+                                                Tag="TotalTimePlayed" />
+                                            <RadioButton
+                                                Checked="Sort_Checked"
+                                                Content="{locale:Locale GameListHeaderLastPlayed}"
+                                                GroupName="Sort"
+                                                IsChecked="{Binding IsSortedByLastPlayed, Mode=OneTime}"
+                                                Tag="LastPlayed" />
+                                            <RadioButton
+                                                Checked="Sort_Checked"
+                                                Content="{locale:Locale GameListHeaderFileExtension}"
+                                                GroupName="Sort"
+                                                IsChecked="{Binding IsSortedByType, Mode=OneTime}"
+                                                Tag="FileType" />
+                                            <RadioButton
+                                                Checked="Sort_Checked"
+                                                Content="{locale:Locale GameListHeaderFileSize}"
+                                                GroupName="Sort"
+                                                IsChecked="{Binding IsSortedBySize, Mode=OneTime}"
+                                                Tag="FileSize" />
+                                            <RadioButton
+                                                Checked="Sort_Checked"
+                                                Content="{locale:Locale GameListHeaderPath}"
+                                                GroupName="Sort"
+                                                IsChecked="{Binding IsSortedByPath, Mode=OneTime}"
+                                                Tag="Path" />
                                         </StackPanel>
-                                        <Border HorizontalAlignment="Stretch" Margin="5" Height="2" BorderBrush="White"
-                                                Width="60" BorderThickness="0,1,0,0">
-                                            <Separator HorizontalAlignment="Stretch" Height="0" />
+                                        <Border
+                                            Width="60"
+                                            Height="2"
+                                            Margin="5"
+                                            HorizontalAlignment="Stretch"
+                                            BorderBrush="White"
+                                            BorderThickness="0,1,0,0">
+                                            <Separator Height="0" HorizontalAlignment="Stretch" />
                                         </Border>
-                                        <RadioButton Tag="Ascending" IsChecked="{Binding IsAscending, Mode=OneTime}"
-                                                     GroupName="Order"
-                                                     Content="{locale:Locale OrderAscending}" Checked="Order_Checked" />
-                                        <RadioButton Tag="Descending" GroupName="Order"
-                                                     IsChecked="{Binding !IsAscending, Mode=OneTime}"
-                                                     Content="{locale:Locale OrderDescending}" Checked="Order_Checked" />
+                                        <RadioButton
+                                            Checked="Order_Checked"
+                                            Content="{locale:Locale OrderAscending}"
+                                            GroupName="Order"
+                                            IsChecked="{Binding IsAscending, Mode=OneTime}"
+                                            Tag="Ascending" />
+                                        <RadioButton
+                                            Checked="Order_Checked"
+                                            Content="{locale:Locale OrderDescending}"
+                                            GroupName="Order"
+                                            IsChecked="{Binding !IsAscending, Mode=OneTime}"
+                                            Tag="Descending" />
                                     </StackPanel>
                                 </Flyout>
                             </ui:DropDownButton.Flyout>
                         </ui:DropDownButton>
-                        <TextBlock DockPanel.Dock="Right" HorizontalAlignment="Right"
-                                   Text="{locale:Locale CommonSort}" VerticalAlignment="Center" Margin="10,0" />
+                        <TextBlock
+                            Margin="10,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Right"
+                            Text="{locale:Locale CommonSort}" />
                     </DockPanel>
                     <controls:GameListView
                         x:Name="GameList"
                         Grid.Row="1"
-                        HorizontalContentAlignment="Stretch"
                         HorizontalAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
                         VerticalAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Stretch"
                         IsVisible="{Binding IsList}" />
                     <controls:GameGridView
                         x:Name="GameGrid"
                         Grid.Row="1"
-                        HorizontalContentAlignment="Stretch"
                         HorizontalAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
                         VerticalAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Stretch"
                         IsVisible="{Binding IsGrid}" />
                 </Grid>
             </ContentControl>
-            <Grid Grid.Row="1"
-                  VerticalAlignment="Stretch"
-                  Background="{DynamicResource ThemeContentBackgroundColor}"
-                  IsVisible="{Binding ShowLoadProgress}"
-                  ZIndex="1000"
-                  HorizontalAlignment="Stretch">
+            <Grid
+                Grid.Row="1"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Background="{DynamicResource ThemeContentBackgroundColor}"
+                IsVisible="{Binding ShowLoadProgress}"
+                ZIndex="1000">
                 <Grid
-                    HorizontalAlignment="Center"
-                    IsVisible="{Binding ShowLoadProgress}"
                     Margin="40"
-                    VerticalAlignment="Center">
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsVisible="{Binding ShowLoadProgress}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
                     <Border
-                        Grid.Column="0"
                         Grid.RowSpan="2"
-                        IsVisible="{Binding ShowLoadProgress}"
+                        Grid.Column="0"
                         Width="256"
                         Height="256"
                         Margin="10"
@@ -383,62 +476,64 @@
                         BorderBrush="Black"
                         BorderThickness="2"
                         BoxShadow="4 4 32 8 #40000000"
-                        CornerRadius="3">
+                        CornerRadius="3"
+                        IsVisible="{Binding ShowLoadProgress}">
                         <Image
-                            IsVisible="{Binding ShowLoadProgress}"
                             Width="256"
                             Height="256"
+                            IsVisible="{Binding ShowLoadProgress}"
                             Source="{Binding SelectedIcon, Converter={StaticResource ByteImage}}" />
                     </Border>
-                    <Grid Grid.Column="1"
-                          IsVisible="{Binding ShowLoadProgress}"
-                          HorizontalAlignment="Stretch"
-                          VerticalAlignment="Center">
+                    <Grid
+                        Grid.Column="1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center"
+                        IsVisible="{Binding ShowLoadProgress}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <TextBlock
-                            IsVisible="{Binding ShowLoadProgress}"
                             Grid.Row="0"
                             Margin="10"
                             FontSize="30"
                             FontWeight="Bold"
-                            TextWrapping="Wrap"
-                            Text="{Binding LoadHeading}"
-                            TextAlignment="Left" />
-                        <Border
                             IsVisible="{Binding ShowLoadProgress}"
+                            Text="{Binding LoadHeading}"
+                            TextAlignment="Left"
+                            TextWrapping="Wrap" />
+                        <Border
                             Grid.Row="1"
-                            CornerRadius="5"
-                            ClipToBounds="True"
-                            BorderBrush="{Binding ProgressBarBackgroundColor}"
+                            Margin="10"
                             Padding="0"
                             HorizontalAlignment="Stretch"
-                            Margin="10"
-                            BorderThickness="1">
+                            BorderBrush="{Binding ProgressBarBackgroundColor}"
+                            BorderThickness="1"
+                            ClipToBounds="True"
+                            CornerRadius="5"
+                            IsVisible="{Binding ShowLoadProgress}">
                             <ProgressBar
-                                IsVisible="{Binding ShowLoadProgress}"
                                 Height="10"
+                                MinWidth="500"
                                 Margin="0"
                                 Padding="0"
-                                CornerRadius="5"
-                                ClipToBounds="True"
-                                MinWidth="500"
                                 HorizontalAlignment="Stretch"
                                 Background="{Binding ProgressBarBackgroundColor}"
+                                ClipToBounds="True"
+                                CornerRadius="5"
                                 Foreground="{Binding ProgressBarForegroundColor}"
+                                IsIndeterminate="{Binding IsLoadingIndeterminate}"
+                                IsVisible="{Binding ShowLoadProgress}"
                                 Maximum="{Binding ProgressMaximum}"
                                 Minimum="0"
-                                IsIndeterminate="{Binding IsLoadingIndeterminate}"
                                 Value="{Binding ProgressValue}" />
                         </Border>
                         <TextBlock
-                            IsVisible="{Binding ShowLoadProgress}"
                             Grid.Row="2"
                             Margin="10"
                             FontSize="18"
+                            IsVisible="{Binding ShowLoadProgress}"
                             Text="{Binding CacheLoadStatus}"
                             TextAlignment="Left" />
                     </Grid>
@@ -450,8 +545,8 @@
                 Height="30"
                 Margin="0,0"
                 HorizontalAlignment="Stretch"
-                Background="{DynamicResource ThemeContentBackgroundColor}"
                 VerticalAlignment="Bottom"
+                Background="{DynamicResource ThemeContentBackgroundColor}"
                 DockPanel.Dock="Bottom"
                 IsVisible="{Binding ShowMenuAndStatusBar}">
                 <Grid.ColumnDefinitions>
@@ -460,8 +555,11 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <StackPanel Grid.Column="0" IsVisible="{Binding EnableNonGameRunningControls}"
-                            VerticalAlignment="Center" Margin="10,0">
+                <StackPanel
+                    Grid.Column="0"
+                    Margin="10,0"
+                    VerticalAlignment="Center"
+                    IsVisible="{Binding EnableNonGameRunningControls}">
                     <Grid Margin="0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -476,7 +574,10 @@
                             VerticalAlignment="Center"
                             Background="Transparent"
                             Command="{ReflectionBinding LoadApplications}">
-                            <ui:SymbolIcon Symbol="Refresh" Height="100" Width="50" />
+                            <ui:SymbolIcon
+                                Width="50"
+                                Height="100"
+                                Symbol="Refresh" />
                         </Button>
                         <TextBlock
                             Name="LoadStatus"
@@ -489,11 +590,11 @@
                             Name="LoadProgressBar"
                             Grid.Column="2"
                             Height="6"
-                            Maximum="{Binding StatusBarProgressMaximum}"
-                            Value="{Binding StatusBarProgressValue}"
                             VerticalAlignment="Center"
                             Foreground="{DynamicResource HighlightColor}"
-                            IsVisible="{Binding EnableNonGameRunningControls}" />
+                            IsVisible="{Binding EnableNonGameRunningControls}"
+                            Maximum="{Binding StatusBarProgressMaximum}"
+                            Value="{Binding StatusBarProgressValue}" />
                     </Grid>
                 </StackPanel>
                 <StackPanel
@@ -505,135 +606,140 @@
                     Orientation="Horizontal">
                     <TextBlock
                         Name="VsyncStatus"
+                        Margin="0,0,5,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Foreground="{Binding VsyncColor}"
-                        PointerReleased="VsyncStatus_PointerReleased"
                         IsVisible="{Binding !ShowLoadProgress}"
-                        Margin="0,0,5,0"
+                        PointerReleased="VsyncStatus_PointerReleased"
                         Text="VSync"
                         TextAlignment="Left" />
                     <Border
                         Width="2"
-                        Margin="2,0"
-                        IsVisible="{Binding !ShowLoadProgress}"
-                        BorderThickness="1"
                         Height="12"
-                        BorderBrush="Gray" />
+                        Margin="2,0"
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        IsVisible="{Binding !ShowLoadProgress}" />
                     <TextBlock
-                        Margin="5,0,5,0"
                         Name="DockedStatus"
-                        IsVisible="{Binding !ShowLoadProgress}"
+                        Margin="5,0,5,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
+                        IsVisible="{Binding !ShowLoadProgress}"
                         PointerReleased="DockedStatus_PointerReleased"
                         Text="{Binding DockedStatusText}"
                         TextAlignment="Left" />
                     <Border
                         Width="2"
-                        Margin="2,0"
-                        IsVisible="{Binding !ShowLoadProgress}"
-                        BorderThickness="1"
                         Height="12"
-                        BorderBrush="Gray" />
+                        Margin="2,0"
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        IsVisible="{Binding !ShowLoadProgress}" />
                     <TextBlock
-                        Margin="5,0,5,0"
                         Name="AspectRatioStatus"
-                        IsVisible="{Binding !ShowLoadProgress}"
+                        Margin="5,0,5,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
+                        IsVisible="{Binding !ShowLoadProgress}"
                         PointerReleased="AspectRatioStatus_PointerReleased"
                         Text="{Binding AspectRatioStatusText}"
                         TextAlignment="Left" />
                     <Border
                         Width="2"
-                        Margin="2,0"
-                        IsVisible="{Binding !ShowLoadProgress}"
-                        BorderThickness="1"
                         Height="12"
-                        BorderBrush="Gray" />
+                        Margin="2,0"
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        IsVisible="{Binding !ShowLoadProgress}" />
                     <ui:ToggleSplitButton
+                        Name="VolumeStatus"
                         Margin="-2,0,-3,0"
                         Padding="5,0,0,5"
-                        Name="VolumeStatus"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        IsVisible="{Binding !ShowLoadProgress}"
-                        BorderBrush="{DynamicResource ThemeContentBackgroundColor}"
                         Background="{DynamicResource ThemeContentBackgroundColor}"
+                        BorderBrush="{DynamicResource ThemeContentBackgroundColor}"
+                        Content="{Binding VolumeStatusText}"
                         IsChecked="{Binding VolumeMuted}"
-                        Content="{Binding VolumeStatusText}">
+                        IsVisible="{Binding !ShowLoadProgress}">
                         <ui:ToggleSplitButton.Flyout>
                             <Flyout Placement="Bottom" ShowMode="TransientWithDismissOnPointerMoveAway">
                                 <Grid Margin="0">
-                                    <Slider Value="{Binding Volume}"
-                                            ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
-                                            Minimum="0"
-                                            Maximum="1"
-                                            TickFrequency="0.05"
-                                            IsSnapToTickEnabled="True"
-                                            Padding="0"
-                                            Margin="0"
-                                            SmallChange="0.01"
-                                            LargeChange="0.05"
-                                            Width="150" />
+                                    <Slider
+                                        Width="150"
+                                        Margin="0"
+                                        Padding="0"
+                                        IsSnapToTickEnabled="True"
+                                        LargeChange="0.05"
+                                        Maximum="1"
+                                        Minimum="0"
+                                        SmallChange="0.01"
+                                        TickFrequency="0.05"
+                                        ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                                        Value="{Binding Volume}" />
                                 </Grid>
                             </Flyout>
                         </ui:ToggleSplitButton.Flyout>
                     </ui:ToggleSplitButton>
                     <Border
                         Width="2"
-                        Margin="2,0"
-                        IsVisible="{Binding !ShowLoadProgress}"
-                        BorderThickness="1"
                         Height="12"
-                        BorderBrush="Gray" />
+                        Margin="2,0"
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        IsVisible="{Binding !ShowLoadProgress}" />
                     <TextBlock
                         Margin="5,0,5,0"
-                        IsVisible="{Binding !ShowLoadProgress}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
+                        IsVisible="{Binding !ShowLoadProgress}"
                         Text="{Binding GameStatusText}"
                         TextAlignment="Left" />
                     <Border
                         Width="2"
-                        IsVisible="{Binding !ShowLoadProgress}"
-                        Margin="2,0"
-                        BorderThickness="1"
                         Height="12"
-                        BorderBrush="Gray" />
+                        Margin="2,0"
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        IsVisible="{Binding !ShowLoadProgress}" />
                     <TextBlock
                         Margin="5,0,5,0"
-                        IsVisible="{Binding !ShowLoadProgress}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
+                        IsVisible="{Binding !ShowLoadProgress}"
                         Text="{Binding FifoStatusText}"
                         TextAlignment="Left" />
                     <Border
                         Width="2"
-                        Margin="2,0"
-                        IsVisible="{Binding !ShowLoadProgress}"
-                        BorderThickness="1"
                         Height="12"
-                        BorderBrush="Gray" />
+                        Margin="2,0"
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        IsVisible="{Binding !ShowLoadProgress}" />
                     <TextBlock
                         Margin="5,0,5,0"
-                        IsVisible="{Binding !ShowLoadProgress}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
+                        IsVisible="{Binding !ShowLoadProgress}"
                         Text="{Binding GpuStatusText}"
                         TextAlignment="Left" />
                 </StackPanel>
-                <StackPanel VerticalAlignment="Center" IsVisible="{Binding ShowFirmwareStatus}" Grid.Column="3"
-                            Orientation="Horizontal" Margin="10, 0">
+                <StackPanel
+                    Grid.Column="3"
+                    Margin="10,0"
+                    VerticalAlignment="Center"
+                    IsVisible="{Binding ShowFirmwareStatus}"
+                    Orientation="Horizontal">
                     <TextBlock
                         Name="FirmwareStatus"
+                        Margin="0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
-                        Margin="0"
                         Text="{locale:Locale StatusBarSystemVersion}" />
                 </StackPanel>
             </Grid>
         </Grid>
     </Grid>
-</window:StyleableWindow>
+</window:StyleableWindow>

Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs

@@ -58,10 +58,10 @@ namespace Ryujinx.Ava.Ui.Windows
 
         public LibHacHorizonManager LibHacHorizonManager { get; private set; }
 
-        public AppHost AppHost { get; private set; }
+        internal AppHost AppHost { get; private set; }
         public InputManager InputManager { get; private set; }
 
-        public RendererControl GlRenderer { get; private set; }
+        internal RendererControl GlRenderer { get; private set; }
         public ContentControl ContentFrame { get; private set; }
         public TextBlock LoadStatus { get; private set; }
         public TextBlock FirmwareStatus { get; private set; }
@@ -78,7 +78,8 @@ namespace Ryujinx.Ava.Ui.Windows
         public HotKeyControl DockToggleHotKey { get; private set; }
         public HotKeyControl ExitHotKey { get; private set; }
         public ToggleSplitButton VolumeStatus { get; set; }
-        public MainWindowViewModel ViewModel { get; private set; }
+        internal MainWindowViewModel ViewModel { get; private set; }
+        public SettingsWindow SettingsWindow { get; set; }
 
         public bool CanUpdate
         {

Ryujinx.Ava/Ui/Windows/MotionSettingsWindow.axaml

@@ -0,0 +1,140 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:viewModels="clr-namespace:Ryujinx.Ava.Ui.ViewModels"
+             xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+             xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+             mc:Ignorable="d"
+             x:Class="Ryujinx.Ava.Ui.Windows.MotionSettingsWindow">
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <TextBlock
+                    Margin="0"
+                    HorizontalAlignment="Center"
+                    Text="{locale:Locale ControllerSettingsMotionGyroSensitivity}" />
+                <Slider
+                    Margin="0,-5,0,-5"
+                    Width="150"
+                    MaxWidth="150"
+                    TickFrequency="0.01"
+                    IsSnapToTickEnabled="True"
+                    Maximum="100"
+                    Minimum="0"
+                    Value="{Binding Sensitivity, Mode=TwoWay}" />
+                <TextBlock HorizontalAlignment="Center"
+                            Margin="5, 0"
+                            Text="{Binding Sensitivity, StringFormat=\{0:0\}%}" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <TextBlock
+                    Margin="0"
+                    HorizontalAlignment="Center"
+                    Text="{locale:Locale ControllerSettingsMotionGyroDeadzone}" />
+                <Slider
+                    Margin="0,-5,0,-5"
+                    Width="150"
+                    MaxWidth="150"
+                    TickFrequency="0.01"
+                    IsSnapToTickEnabled="True"
+                    Maximum="100"
+                    Minimum="0"
+                    Value="{Binding GyroDeadzone, Mode=TwoWay}" />
+                <TextBlock
+                    VerticalAlignment="Center"
+                    Margin="5, 0"
+                    Text="{Binding GyroDeadzone, StringFormat=\{0:0.00\}}" />
+            </StackPanel>
+            <Separator Height="1" Margin="0,5" />
+            <CheckBox Margin="5" IsChecked="{Binding EnableCemuHookMotion}">
+                <TextBlock Margin="0,3,0,0" VerticalAlignment="Center"
+                        Text="{locale:Locale ControllerSettingsMotionUseCemuhookCompatibleMotion}" />
+            </CheckBox>
+        </StackPanel>
+        <Border Grid.Row="1"
+                Padding="20,5"
+                BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                BorderThickness="1"
+                HorizontalAlignment="Stretch">
+            <Grid VerticalAlignment="Top">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <StackPanel
+                    Grid.Row="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical">
+                    <StackPanel
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <TextBlock
+                            Margin="5"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Text="{locale:Locale ControllerSettingsMotionServerHost}" />
+                        <TextBox
+                            Height="30"
+                            MinWidth="100"
+                            MaxWidth="100"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Text="{Binding DsuServerHost, Mode=TwoWay}" />
+                        <TextBlock
+                            Margin="5"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Text=":" />
+                        <TextBox
+                            Height="30"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Text="{Binding DsuServerPort, Mode=TwoWay}" />
+                    </StackPanel>
+                    <StackPanel Orientation="Vertical">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Margin="0,10,0,0" VerticalAlignment="Center"
+                                       Text="{locale:Locale ControllerSettingsMotionControllerSlot}" />
+                            <ui:NumberBox Grid.Row="0" Grid.Column="1"
+                                          Name="CemuHookSlotUpDown"
+                                          SmallChange="1"
+                                          LargeChange="1"
+                                          Maximum="4"
+                                          Minimum="0"
+                                          Value="{Binding Slot}" />
+                            <TextBlock Margin="0,10,0,0" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
+                                       Text="{locale:Locale ControllerSettingsMotionRightJoyConSlot}" />
+                            <ui:NumberBox Grid.Row="1" Grid.Column="1"
+                                          Name="CemuHookRightJoyConSlotUpDown"
+                                          SmallChange="1"
+                                          LargeChange="1"
+                                          Maximum="4"
+                                          Minimum="0"
+                                          Value="{Binding AltSlot}" />
+                        </Grid>
+                    </StackPanel>
+                    <CheckBox HorizontalAlignment="Center"
+                              IsChecked="{Binding MirrorInput, Mode=TwoWay}">
+                        <TextBlock HorizontalAlignment="Center"
+                                   Text="{locale:Locale ControllerSettingsMotionMirrorInput}" />
+                    </CheckBox>
+                </StackPanel>
+            </Grid>
+        </Border>
+    </Grid>
+</UserControl>

Ryujinx.Ava/Ui/Windows/MotionSettingsWindow.axaml.cs

@@ -0,0 +1,81 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Ui.Models;
+using Ryujinx.Ava.Ui.ViewModels;
+using Ryujinx.Common.Configuration.Hid.Controller;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.Ui.Windows
+{
+    public class MotionSettingsWindow : UserControl
+    {
+        private readonly InputConfiguration<GamepadInputId, StickInputId> _viewmodel;
+
+        public MotionSettingsWindow()
+        {
+            InitializeComponent();
+        }
+
+        public MotionSettingsWindow(ControllerSettingsViewModel viewmodel)
+        {
+            var config = viewmodel.Configuration as InputConfiguration<GamepadInputId, StickInputId>;
+
+            _viewmodel = new InputConfiguration<GamepadInputId, StickInputId>()
+            {
+                Slot = config.Slot,
+                AltSlot = config.AltSlot,
+                DsuServerHost = config.DsuServerHost,
+                DsuServerPort = config.DsuServerPort,
+                MirrorInput = config.MirrorInput,
+                EnableMotion = config.EnableMotion,
+                Sensitivity = config.Sensitivity,
+                GyroDeadzone = config.GyroDeadzone,
+                EnableCemuHookMotion = config.EnableCemuHookMotion
+            };
+
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            DataContext = _viewmodel;
+
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public static async Task Show(ControllerSettingsViewModel viewmodel, StyleableWindow window)
+        {
+            ContentDialog contentDialog = window.ContentDialog;
+
+            string name = string.Empty;
+
+            MotionSettingsWindow content = new MotionSettingsWindow(viewmodel);
+
+            if (contentDialog != null)
+            {
+                contentDialog.Title = LocaleManager.Instance["ControllerMotionTitle"];
+                contentDialog.PrimaryButtonText = LocaleManager.Instance["ControllerSettingsSave"];
+                contentDialog.SecondaryButtonText = "";
+                contentDialog.CloseButtonText = LocaleManager.Instance["ControllerSettingsClose"];
+                contentDialog.Content = content;
+                contentDialog.PrimaryButtonClick += (sender, args) =>
+                {
+                    var config = viewmodel.Configuration as InputConfiguration<GamepadInputId, StickInputId>;
+                    config.Slot = content._viewmodel.Slot;
+                    config.EnableMotion = content._viewmodel.EnableMotion;
+                    config.Sensitivity = content._viewmodel.Sensitivity;
+                    config.GyroDeadzone = content._viewmodel.GyroDeadzone;
+                    config.AltSlot = content._viewmodel.AltSlot;
+                    config.DsuServerHost = content._viewmodel.DsuServerHost;
+                    config.DsuServerPort = content._viewmodel.DsuServerPort;
+                    config.EnableCemuHookMotion = content._viewmodel.EnableCemuHookMotion;
+                    config.MirrorInput = content._viewmodel.MirrorInput;
+                };
+
+                await contentDialog.ShowAsync();
+            }
+        }
+    }
+}

Ryujinx.Ava/Ui/Windows/RumbleSettingsWindow.axaml

@@ -0,0 +1,57 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:viewModels="clr-namespace:Ryujinx.Ava.Ui.ViewModels"
+             xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+             xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+             mc:Ignorable="d"
+             x:Class="Ryujinx.Ava.Ui.Windows.RumbleSettingsWindow">
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock
+                    Width="100"
+                    TextWrapping="WrapWithOverflow"
+                    HorizontalAlignment="Center"
+                    Text="{locale:Locale ControllerSettingsRumbleStrongMultiplier}" />
+                <Slider
+                    Margin="0,-5,0,-5"
+                    Width="200"
+                    TickFrequency="0.01"
+                    IsSnapToTickEnabled="True"
+                    Maximum="10"
+                    Minimum="0"
+                    Value="{Binding StrongRumble, Mode=TwoWay}" />
+                <TextBlock
+                    VerticalAlignment="Center"
+                    Margin="5,0"
+                    Text="{Binding StrongRumble, StringFormat=\{0:0.00\}}" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <TextBlock
+                    Width="100"
+                    TextWrapping="WrapWithOverflow"
+                    HorizontalAlignment="Center"
+                    Text="{locale:Locale ControllerSettingsRumbleWeakMultiplier}" />
+                <Slider
+                    Margin="0,-5,0,-5"
+                    Width="200"
+                    MaxWidth="200"
+                    Maximum="10"
+                    TickFrequency="0.01"
+                    IsSnapToTickEnabled="True"
+                    Minimum="0"
+                    Value="{Binding WeakRumble, Mode=TwoWay}" />
+                <TextBlock
+                    VerticalAlignment="Center"
+                    Margin="5,0"
+                    Text="{Binding WeakRumble, StringFormat=\{0:0.00\}}" />
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</UserControl>

Ryujinx.Ava/Ui/Windows/RumbleSettingsWindow.axaml.cs

@@ -0,0 +1,67 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Ui.Models;
+using Ryujinx.Ava.Ui.ViewModels;
+using Ryujinx.Common.Configuration.Hid.Controller;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.Ui.Windows
+{
+    public class RumbleSettingsWindow : UserControl
+    {
+        private readonly InputConfiguration<GamepadInputId, StickInputId> _viewmodel;
+
+        public RumbleSettingsWindow()
+        {
+            InitializeComponent();
+        }
+
+        public RumbleSettingsWindow(ControllerSettingsViewModel viewmodel)
+        {
+            var config = viewmodel.Configuration as InputConfiguration<GamepadInputId, StickInputId>;
+
+            _viewmodel = new InputConfiguration<GamepadInputId, StickInputId>()
+            {
+                StrongRumble = config.StrongRumble,
+                WeakRumble = config.WeakRumble
+            };
+
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            DataContext = _viewmodel;
+
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public static async Task Show(ControllerSettingsViewModel viewmodel, StyleableWindow window)
+        {
+            ContentDialog contentDialog = window.ContentDialog;
+
+            string name = string.Empty;
+
+            RumbleSettingsWindow content = new RumbleSettingsWindow(viewmodel);
+
+            if (contentDialog != null)
+            {
+                contentDialog.Title = LocaleManager.Instance["ControllerRumbleTitle"];
+                contentDialog.PrimaryButtonText = LocaleManager.Instance["ControllerSettingsSave"];
+                contentDialog.SecondaryButtonText = "";
+                contentDialog.CloseButtonText = LocaleManager.Instance["ControllerSettingsClose"];
+                contentDialog.Content = content;
+                contentDialog.PrimaryButtonClick += (sender, args) =>
+                {
+                    var config = viewmodel.Configuration as InputConfiguration<GamepadInputId, StickInputId>;
+                    config.StrongRumble = content._viewmodel.StrongRumble;
+                    config.WeakRumble = content._viewmodel.WeakRumble;
+                };
+
+                await contentDialog.ShowAsync();
+            }
+        }
+    }
+}

Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml

@@ -0,0 +1,897 @@
+<window:StyleableWindow
+    x:Class="Ryujinx.Ava.Ui.Windows.SettingsWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:controls="clr-namespace:Ryujinx.Ava.Ui.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.Ui.ViewModels"
+    xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
+    Width="1100"
+    Height="768"
+    d:DesignWidth="800"
+    d:DesignHeight="950"
+    MinWidth="800"
+    MinHeight="480"
+    WindowStartupLocation="CenterOwner"
+    x:CompileBindings="True"
+    x:DataType="viewModels:SettingsViewModel"
+    mc:Ignorable="d">
+    <Design.DataContext>
+        <viewModels:SettingsViewModel />
+    </Design.DataContext>
+    <Window.Resources>
+        <controls:KeyValueConverter x:Key="Key" />
+    </Window.Resources>
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinWidth="600">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <ContentControl
+            Grid.Row="1"
+            Focusable="False"
+            IsVisible="False"
+            KeyboardNavigation.IsTabStop="False">
+            <ui:ContentDialog Name="ContentDialog"
+                              IsPrimaryButtonEnabled="True"
+                              IsSecondaryButtonEnabled="True"
+                              IsVisible="False" />
+        </ContentControl>
+        <Grid Name="Pages" IsVisible="False" Grid.Row="2">
+            <ScrollViewer Name="UiPage"
+                          Margin="0,0,10,0"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Stretch"
+                          HorizontalScrollBarVisibility="Disabled"
+                          VerticalScrollBarVisibility="Auto">
+                <Border>
+                    <StackPanel
+                        Margin="10,5"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabGeneralGeneral}" />
+                        <StackPanel Margin="10,0,0,0" Orientation="Vertical">
+                            <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{locale:Locale ToggleDiscordTooltip}"
+                                           Text="{locale:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding CheckUpdatesOnStart}">
+                                <TextBlock Text="{locale:Locale SettingsTabGeneralCheckUpdatesOnLaunch}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding ShowConfirmExit}">
+                                <TextBlock Text="{locale:Locale SettingsTabGeneralShowConfirmExitDialog}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding HideCursorOnIdle}">
+                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
+                            </CheckBox>
+                        </StackPanel>
+                        <Separator Height="1" />
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabGeneralGameDirectories}" />
+                        <StackPanel
+                            Margin="10,0,0,0"
+                            HorizontalAlignment="Stretch"
+                            Orientation="Vertical"
+                            Spacing="10">
+                            <ListBox
+                                Name="GameList"
+                                MinHeight="150"
+                                Items="{Binding GameDirectories}" />
+                            <Grid HorizontalAlignment="Stretch">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <TextBox
+                                    Name="PathBox"
+                                    Margin="0"
+                                    ToolTip.Tip="{locale:Locale AddGameDirBoxTooltip}"
+                                    VerticalAlignment="Stretch" />
+                                <Button
+                                    Name="AddButton"
+                                    Grid.Column="1"
+                                    MinWidth="90"
+                                    Margin="10,0,0,0"
+                                    ToolTip.Tip="{locale:Locale AddGameDirTooltip}"
+                                    Click="AddButton_OnClick">
+                                    <TextBlock HorizontalAlignment="Center"
+                                               Text="{locale:Locale SettingsTabGeneralAdd}" />
+                                </Button>
+                                <Button
+                                    Name="RemoveButton"
+                                    Grid.Column="2"
+                                    MinWidth="90"
+                                    Margin="10,0,0,0"
+                                    ToolTip.Tip="{locale:Locale RemoveGameDirTooltip}"
+                                    Click="RemoveButton_OnClick">
+                                    <TextBlock HorizontalAlignment="Center"
+                                               Text="{locale:Locale SettingsTabGeneralRemove}" />
+                                </Button>
+                            </Grid>
+                        </StackPanel>
+                        <Separator Height="1" />
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabGeneralTheme}" />
+                        <Grid Margin="10,0,0,0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <CheckBox IsChecked="{Binding EnableCustomTheme}"
+                                      ToolTip.Tip="{locale:Locale CustomThemeCheckTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeEnableCustomTheme}" />
+                            </CheckBox>
+                            <TextBlock VerticalAlignment="Center"
+                                       Margin="0,10,0,0"
+                                       Grid.Row="1"
+                                       Text="{locale:Locale SettingsTabGeneralThemeCustomTheme}"
+                                       ToolTip.Tip="{locale:Locale CustomThemePathTooltip}" />
+                            <TextBox Margin="0,10,0,0"
+                                     Grid.Row="1"
+                                     Grid.Column="1"
+                                     Text="{Binding CustomThemePath}" />
+                            <Button Grid.Row="1"
+                                    Grid.Column="2"
+                                    Margin="10,10,0,0"
+                                    Command="{ReflectionBinding BrowseTheme}"
+                                    ToolTip.Tip="{locale:Locale CustomThemeBrowseTooltip}"
+                                    Content="{locale:Locale ButtonBrowse}" />
+                            <TextBlock VerticalAlignment="Center"
+                                       Margin="0,10,0,0"
+                                       Grid.Row="2"
+                                       Text="{locale:Locale SettingsTabGeneralThemeBaseStyle}" />
+                            <ComboBox VerticalAlignment="Center"
+                                      Margin="0,10,0,0"
+                                      Grid.Column="1"
+                                      Grid.Row="2"
+                                      MinWidth="100"
+                                      SelectedIndex="{Binding BaseStyleIndex}">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{locale:Locale SettingsTabGeneralThemeBaseStyleLight}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{locale:Locale SettingsTabGeneralThemeBaseStyleDark}" />
+                                </ComboBoxItem>
+                            </ComboBox>
+                        </Grid>
+                    </StackPanel>
+                </Border>
+            </ScrollViewer>
+            <ScrollViewer Name="InputPage"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Stretch"
+                          Padding="0,0,2,0"
+                          HorizontalScrollBarVisibility="Disabled"
+                          VerticalScrollBarVisibility="Auto">
+                <Border>
+                    <StackPanel Margin="4" Orientation="Vertical">
+                        <StackPanel Orientation="Horizontal">
+                            <CheckBox Margin="5,0"
+                                      ToolTip.Tip="{locale:Locale DockModeToggleTooltip}"
+                                      IsChecked="{Binding EnableDockedMode}">
+                                <TextBlock VerticalAlignment="Center"
+                                           Text="{locale:Locale SettingsTabInputEnableDockedMode}" />
+                            </CheckBox>
+                            <CheckBox Margin="5,0"
+                                      ToolTip.Tip="{locale:Locale DirectKeyboardTooltip}"
+                                      IsChecked="{Binding EnableKeyboard}">
+                                <TextBlock Text="{locale:Locale SettingsTabInputDirectKeyboardAccess}" />
+                            </CheckBox>
+                            <CheckBox Margin="5,0"
+                                      ToolTip.Tip="{locale:Locale DirectMouseTooltip}"
+                                      IsChecked="{Binding EnableMouse}">
+                                <TextBlock Text="{locale:Locale SettingsTabInputDirectMouseAccess}" />
+                            </CheckBox>
+                        </StackPanel>
+                        <window:ControllerSettingsWindow Name="ControllerSettings" Margin="0,0,0,0" MinHeight="600" />
+                    </StackPanel>
+                </Border>
+            </ScrollViewer>
+            <ScrollViewer Name="HotkeysPage"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Stretch"
+                          HorizontalScrollBarVisibility="Disabled"
+                          VerticalScrollBarVisibility="Auto">
+                <Border>
+                    <StackPanel Margin="10,5" Orientation="Vertical" Spacing="10">
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabHotkeysHotkeys}" />
+                        <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysToggleVsyncHotkey}" Width="230" />
+                            <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
+                                <TextBlock
+                                    Text="{Binding KeyboardHotkeys.ToggleVsync, Mode=TwoWay, Converter={StaticResource Key}}"
+                                    TextAlignment="Center" />
+                            </ToggleButton>
+                        </StackPanel>
+                        <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysScreenshotHotkey}" Width="230" />
+                            <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
+                                <TextBlock
+                                    Text="{Binding KeyboardHotkeys.Screenshot, Mode=TwoWay, Converter={StaticResource Key}}"
+                                    TextAlignment="Center" />
+                            </ToggleButton>
+                        </StackPanel>
+                        <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysShowUiHotkey}" Width="230" />
+                            <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
+                                <TextBlock
+                                    Text="{Binding KeyboardHotkeys.ShowUi, Mode=TwoWay, Converter={StaticResource Key}}"
+                                    TextAlignment="Center" />
+                            </ToggleButton>
+                        </StackPanel>
+                        <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysPauseHotkey}" Width="230" />
+                            <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
+                                <TextBlock
+                                    Text="{Binding KeyboardHotkeys.Pause, Mode=TwoWay, Converter={StaticResource Key}}"
+                                    TextAlignment="Center" />
+                            </ToggleButton>
+                        </StackPanel>
+                        <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysToggleMuteHotkey}" Width="230" />
+                            <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
+                                <TextBlock
+                                    Text="{Binding KeyboardHotkeys.ToggleMute, Mode=TwoWay, Converter={StaticResource Key}}"
+                                    TextAlignment="Center" />
+                            </ToggleButton>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+            </ScrollViewer>
+            <ScrollViewer Name="SystemPage"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Stretch"
+                          HorizontalScrollBarVisibility="Disabled"
+                          VerticalScrollBarVisibility="Auto">
+                <Border>
+                    <StackPanel
+                        Margin="10,5"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabSystemCore}" />
+                        <StackPanel Margin="10,0,0,0" Orientation="Vertical">
+                            <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           Text="{locale:Locale SettingsTabSystemSystemRegion}"
+                                           Width="250" />
+                                <ComboBox SelectedIndex="{Binding Region}"
+                                          ToolTip.Tip="{locale:Locale RegionTooltip}"
+                                          HorizontalContentAlignment="Left"
+                                          Width="350">
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionJapan}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionUSA}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionEurope}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionAustralia}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionChina}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionKorea}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionTaiwan}" />
+                                    </ComboBoxItem>
+                                </ComboBox>
+                            </StackPanel>
+                            <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           Text="{locale:Locale SettingsTabSystemSystemLanguage}"
+                                           ToolTip.Tip="{locale:Locale LanguageTooltip}"
+                                           Width="250" />
+                                <ComboBox SelectedIndex="{Binding Language}"
+                                          ToolTip.Tip="{locale:Locale LanguageTooltip}"
+                                          HorizontalContentAlignment="Left"
+                                          Width="350">
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageFrench}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageGerman}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageItalian}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSpanish}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageChinese}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageKorean}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageDutch}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguagePortuguese}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageRussian}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
+                                    </ComboBoxItem>
+                                </ComboBox>
+                            </StackPanel>
+                            <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           Text="{locale:Locale SettingsTabSystemSystemTimeZone}"
+                                           ToolTip.Tip="{locale:Locale TimezoneTooltip}"
+                                           Width="250" />
+                                <AutoCompleteBox
+                                    Name="TimeZoneBox"
+                                    Width="350"
+                                    FilterMode="Contains"
+                                    Items="{Binding TimeZones}"
+                                    SelectionChanged="TimeZoneBox_OnSelectionChanged"
+                                    Text="{Binding Path=TimeZone, Mode=OneWay}"
+                                    TextChanged="TimeZoneBox_OnTextChanged"
+                                    ValueMemberBinding="{ReflectionBinding TzMultiBinding}"
+                                    ToolTip.Tip="{locale:Locale TimezoneTooltip}" />
+                            </StackPanel>
+                            <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           Text="{locale:Locale SettingsTabSystemSystemTime}"
+                                           ToolTip.Tip="{locale:Locale TimeTooltip}"
+                                           Width="250"/>
+                                <DatePicker VerticalAlignment="Center" SelectedDate="{Binding DateOffset}"
+                                            ToolTip.Tip="{locale:Locale TimeTooltip}"
+                                            Width="350" />
+                            </StackPanel>
+                            <StackPanel Margin="250,0,0,10" Orientation="Horizontal">
+                                <TimePicker
+                                    VerticalAlignment="Center"
+                                    ClockIdentifier="24HourClock"
+                                    SelectedTime="{Binding TimeOffset}"
+                                    Width="350"
+                                    ToolTip.Tip="{locale:Locale TimeTooltip}" />
+                            </StackPanel>
+                            <CheckBox IsChecked="{Binding EnableVsync}">
+                                <TextBlock Text="{locale:Locale SettingsTabSystemEnableVsync}"
+                                           ToolTip.Tip="{locale:Locale VSyncToggleTooltip}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding EnableFsIntegrityChecks}">
+                                <TextBlock Text="{locale:Locale SettingsTabSystemEnableFsIntegrityChecks}"
+                                           ToolTip.Tip="{locale:Locale FsIntegrityToggleTooltip}" />
+                            </CheckBox>
+                        </StackPanel>
+                        <Separator Height="1" />
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabSystemHacks}" />
+                            <TextBlock Text="{locale:Locale SettingsTabSystemHacksNote}" />
+                        </StackPanel>
+                        <StackPanel
+                            Margin="10,0,0,0"
+                            HorizontalAlignment="Stretch"
+                            Orientation="Vertical">
+                            <CheckBox IsChecked="{Binding ExpandDramSize}"
+                                      ToolTip.Tip="{locale:Locale DRamTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabSystemExpandDramSize}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding IgnoreMissingServices}"
+                                      ToolTip.Tip="{locale:Locale IgnoreMissingServicesTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabSystemIgnoreMissingServices}" />
+                            </CheckBox>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+            </ScrollViewer>
+            <ScrollViewer
+                Name="CpuPage"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                HorizontalScrollBarVisibility="Disabled"
+                VerticalScrollBarVisibility="Auto">
+                <Border>
+                    <StackPanel
+                        Margin="10,5"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabCpuCache}" />
+                        <StackPanel
+                            Margin="10,0,0,0"
+                            HorizontalAlignment="Stretch"
+                            Orientation="Vertical">
+                            <CheckBox IsChecked="{Binding EnablePptc}">
+                                <TextBlock Text="{locale:Locale SettingsTabSystemEnablePptc}"
+                                           ToolTip.Tip="{locale:Locale PptcToggleTooltip}" />
+                            </CheckBox>
+                        </StackPanel>
+                        <Separator Height="1" />
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabCpuMemory}" />
+                        <StackPanel
+                            Margin="10,0,0,0"
+                            HorizontalAlignment="Stretch"
+                            Orientation="Vertical">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           Text="{locale:Locale SettingsTabSystemMemoryManagerMode}"
+                                           ToolTip.Tip="{locale:Locale MemoryManagerTooltip}"
+                                           Width="250" />
+                                <ComboBox SelectedIndex="{Binding MemoryMode}"
+                                          ToolTip.Tip="{locale:Locale MemoryManagerTooltip}"
+                                          HorizontalContentAlignment="Left"
+                                          Width="350">
+                                    <ComboBoxItem
+                                        ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}">
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem
+                                        ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}">
+                                        <TextBlock Text="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem
+                                        ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}">
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
+                                    </ComboBoxItem>
+                                </ComboBox>
+                            </StackPanel>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+            </ScrollViewer>
+            <ScrollViewer
+                Name="GraphicsPage"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                HorizontalScrollBarVisibility="Disabled"
+                VerticalScrollBarVisibility="Auto">
+                <Border>
+                    <StackPanel
+                        Margin="10, 5"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabGraphicsEnhancements}" />
+                        <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
+                            <CheckBox IsChecked="{Binding EnableShaderCache}"
+                                  ToolTip.Tip="{locale:Locale ShaderCacheToggleTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabGraphicsEnableShaderCache}" />
+                            </CheckBox>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{locale:Locale AnisotropyTooltip}"
+                                           Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering}"
+                                           Width="250" />
+                                <ComboBox SelectedIndex="{Binding MaxAnisotropy}"
+                                          Width="350"
+                                          HorizontalContentAlignment="Left"
+                                          ToolTip.Tip="{locale:Locale AnisotropyTooltip}">
+                                    <ComboBoxItem>
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock
+                                            Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
+                                    </ComboBoxItem>
+                                </ComboBox>
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}"
+                                           Text="{locale:Locale SettingsTabGraphicsResolutionScale}"
+                                           Width="250" />
+                                <ComboBox SelectedIndex="{Binding ResolutionScale}"
+                                          Width="350"
+                                          HorizontalContentAlignment="Left"
+                                          ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}">
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale2x}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale3x}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale4x}" />
+                                    </ComboBoxItem>
+                                </ComboBox>
+                                <ui:NumberBox
+                                    Margin="10,0,0,0"
+                                    ToolTip.Tip="{locale:Locale ResolutionScaleEntryTooltip}"
+                                    MinWidth="150"
+                                    SmallChange="0.1"
+                                    LargeChange="1"
+                                    SimpleNumberFormat="F2"
+                                    SpinButtonPlacementMode="Inline"
+                                    IsVisible="{Binding IsCustomResolutionScaleActive}"
+                                    Maximum="100"
+                                    Minimum="0.1"
+                                    Value="{Binding CustomResolutionScale}" />
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{locale:Locale AspectRatioTooltip}"
+                                           Text="{locale:Locale SettingsTabGraphicsAspectRatio}"
+                                           Width="250" />
+                                <ComboBox SelectedIndex="{Binding AspectRatio}"
+                                          Width="350"
+                                          HorizontalContentAlignment="Left"
+                                          ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" />
+                                    </ComboBoxItem>
+                                </ComboBox>
+                            </StackPanel>
+                        </StackPanel>
+                        <Separator Height="1" />
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabGraphicsFeatures}" />
+                        <StackPanel
+                            Margin="10,0,0,0"
+                            HorizontalAlignment="Stretch"
+                            Orientation="Vertical"
+                            Spacing="10">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{locale:Locale GraphicsBackendThreadingTooltip}"
+                                           Text="{locale:Locale SettingsTabGraphicsBackendMultithreading}"
+                                           Width="250" />
+                                <ComboBox Width="350"
+                                          HorizontalContentAlignment="Left"
+                                          ToolTip.Tip="{locale:Locale GalThreadingTooltip}"
+                                          SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale CommonAuto}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale CommonOff}" />
+                                    </ComboBoxItem>
+                                    <ComboBoxItem>
+                                        <TextBlock Text="{locale:Locale CommonOn}" />
+                                    </ComboBoxItem>
+                                </ComboBox>
+                            </StackPanel>
+                        </StackPanel>
+                        <Separator Height="1" />
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabGraphicsDeveloperOptions}" />
+                        <StackPanel
+                            Margin="10,0,0,0"
+                            HorizontalAlignment="Stretch"
+                            Orientation="Vertical"
+                            Spacing="10">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{locale:Locale ShaderDumpPathTooltip}"
+                                           Text="{locale:Locale SettingsTabGraphicsShaderDumpPath}"
+                                           Width="250" />
+                                <TextBox Text="{Binding ShaderDumpPath}"
+                                         Width="350"
+                                         ToolTip.Tip="{locale:Locale ShaderDumpPathTooltip}" />
+                            </StackPanel>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+            </ScrollViewer>
+            <ScrollViewer
+                Name="AudioPage"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                HorizontalScrollBarVisibility="Disabled"
+                VerticalScrollBarVisibility="Auto">
+                <Border>
+                    <StackPanel
+                        Margin="10,5"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabAudio}" />
+                        <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center"
+                                       Text="{locale:Locale SettingsTabSystemAudioBackend}"
+                                       ToolTip.Tip="{locale:Locale AudioBackendTooltip}"
+                                       Width="250" />
+                            <ComboBox SelectedIndex="{Binding AudioBackend}"
+                                      Width="350"
+                                      HorizontalContentAlignment="Left">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendDummy}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}">
+                                    <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendOpenAL}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}">
+                                    <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSoundIO}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}">
+                                    <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSDL2}" />
+                                </ComboBoxItem>
+                            </ComboBox>
+                        </StackPanel>
+                        <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center"
+                                       Text="{locale:Locale SettingsTabSystemAudioVolume}"
+                                       ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                                       Width="250" />
+                            <ui:NumberBox Value="{Binding Volume}"
+                                    ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                                    Width="350"
+                                    SmallChange="1"
+                                    LargeChange="10"
+                                    SimpleNumberFormat="F0"
+                                    SpinButtonPlacementMode="Inline"
+                                    Minimum="0"
+                                    Maximum="100" />
+                        </StackPanel>
+                        <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                            <Slider Value="{Binding Volume}"
+                                    Margin="250,0,0,0"
+                                    ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
+                                    Minimum="0"
+                                    Maximum="100"
+                                    SmallChange="5"
+                                    TickFrequency="5"
+                                    IsSnapToTickEnabled="True"
+                                    LargeChange="10"
+                                    Width="350" />
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+            </ScrollViewer>
+            <ScrollViewer
+                Name="NetworkPage"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                HorizontalScrollBarVisibility="Disabled"
+                VerticalScrollBarVisibility="Auto">
+                <Border>
+                    <StackPanel
+                        Margin="10,5"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabNetworkConnection}" />
+                        <CheckBox Margin="10,0,0,0" IsChecked="{Binding EnableInternetAccess}">
+                            <TextBlock Text="{locale:Locale SettingsTabSystemEnableInternetAccess}"
+                                       ToolTip.Tip="{locale:Locale EnableInternetAccessTooltip}" />
+                        </CheckBox>
+                    </StackPanel>
+                </Border>
+            </ScrollViewer>
+            <ScrollViewer
+                Name="LoggingPage"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                HorizontalScrollBarVisibility="Disabled"
+                VerticalScrollBarVisibility="Auto">
+                <Border>
+                    <StackPanel
+                        Margin="10,5"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabLoggingLogging}" />
+                        <StackPanel Margin="10,0,0,0" Orientation="Vertical">
+                            <CheckBox IsChecked="{Binding EnableFileLog}"
+                                      ToolTip.Tip="{locale:Locale FileLogTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabLoggingEnableLoggingToFile}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding EnableStub}"
+                                      ToolTip.Tip="{locale:Locale StubLogTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabLoggingEnableStubLogs}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding EnableInfo}"
+                                      ToolTip.Tip="{locale:Locale InfoLogTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabLoggingEnableInfoLogs}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding EnableWarn}"
+                                      ToolTip.Tip="{locale:Locale WarnLogTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabLoggingEnableWarningLogs}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding EnableError}"
+                                      ToolTip.Tip="{locale:Locale ErrorLogTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabLoggingEnableErrorLogs}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding EnableTrace}"
+                                      ToolTip.Tip="{locale:Locale TraceLogTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabLoggingEnableTraceLogs}" />
+                            </CheckBox>
+                            <CheckBox IsChecked="{Binding EnableGuest}"
+                                      ToolTip.Tip="{locale:Locale GuestLogTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabLoggingEnableGuestLogs}" />
+                            </CheckBox>
+                        </StackPanel>
+                        <Separator Height="1" />
+                        <TextBlock FontWeight="Bold" Text="{locale:Locale SettingsTabLoggingDeveloperOptions}" />
+                        <StackPanel
+                            Margin="10,0,0,0"
+                            HorizontalAlignment="Stretch"
+                            Orientation="Vertical"
+                            Spacing="10">
+                            <StackPanel Orientation="Vertical">
+                                <CheckBox IsChecked="{Binding EnableDebug}"
+                                        ToolTip.Tip="{locale:Locale DebugLogTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabLoggingEnableDebugLogs}" />
+                                </CheckBox>
+                                <CheckBox IsChecked="{Binding EnableFsAccessLog}"
+                                        ToolTip.Tip="{locale:Locale FileAccessLogTooltip}">
+                                <TextBlock Text="{locale:Locale SettingsTabLoggingEnableFsAccessLogs}" />
+                                </CheckBox>
+                                <StackPanel Margin="0,10,0,0" Orientation="Horizontal" VerticalAlignment="Stretch">
+                                    <TextBlock VerticalAlignment="Center"
+                                            ToolTip.Tip="{locale:Locale FSAccessLogModeTooltip}"
+                                            Text="{locale:Locale SettingsTabLoggingFsGlobalAccessLogMode}"
+                                            Width="285" />
+                                    <ui:NumberBox
+                                        Maximum="3"
+                                        Minimum="0"
+                                        Width="150"
+                                        SpinButtonPlacementMode="Inline"
+                                        SmallChange="1"
+                                        LargeChange="1"
+                                        Value="{Binding FsGlobalAccessLogMode}" />
+                                </StackPanel>
+                                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                                    <TextBlock VerticalAlignment="Center"
+                                            Text="{locale:Locale SettingsTabLoggingOpenglLogLevel}"
+                                            ToolTip.Tip="{locale:Locale OpenGlLogLevel}"
+                                            Width="285" />
+                                    <ComboBox SelectedIndex="{Binding OpenglDebugLevel}"
+                                            Width="150"
+                                            HorizontalContentAlignment="Left"
+                                            ToolTip.Tip="{locale:Locale OpenGlLogLevel}">
+                                        <ComboBoxItem>
+                                            <TextBlock Text="{locale:Locale SettingsTabLoggingOpenglLogLevelNone}" />
+                                        </ComboBoxItem>
+                                        <ComboBoxItem>
+                                            <TextBlock Text="{locale:Locale SettingsTabLoggingOpenglLogLevelError}" />
+                                        </ComboBoxItem>
+                                        <ComboBoxItem>
+                                            <TextBlock
+                                                Text="{locale:Locale SettingsTabLoggingOpenglLogLevelPerformance}" />
+                                        </ComboBoxItem>
+                                        <ComboBoxItem>
+                                            <TextBlock Text="{locale:Locale SettingsTabLoggingOpenglLogLevelAll}" />
+                                        </ComboBoxItem>
+                                    </ComboBox>
+                                </StackPanel>
+                            </StackPanel>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+            </ScrollViewer>
+        </Grid>
+        <ui:NavigationView Grid.Row="1" IsSettingsVisible="False" Name="NavPanel" IsBackEnabled="False"
+                           PaneDisplayMode="LeftCompact"
+                           Margin="2,10,10,0"
+                           VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+            <ui:NavigationView.MenuItems>
+                <ui:NavigationViewItem IsSelected="True"
+                                       Content="{locale:Locale SettingsTabGeneral}"
+                                       Tag="UiPage"
+                                       Icon="New" />
+                <ui:NavigationViewItem
+                    Content="{locale:Locale SettingsTabInput}"
+                    Tag="InputPage"
+                    Icon="Games" />
+                <ui:NavigationViewItem
+                    Content="{locale:Locale SettingsTabHotkeys}"
+                    Tag="HotkeysPage"
+                    Icon="Keyboard" />
+                <ui:NavigationViewItem
+                    Content="{locale:Locale SettingsTabSystem}"
+                    Tag="SystemPage"
+                    Icon="Settings" />
+                <ui:NavigationViewItem
+                    Content="{locale:Locale SettingsTabCpu}"
+                    Tag="CpuPage">
+                    <ui:NavigationViewItem.Icon>
+                        <ui:FontIcon FontFamily="avares://Ryujinx.Ava/Assets/Fonts#Segoe Fluent Icons"
+                                     Glyph="{controls:GlyphValueConverter Chip}" />
+                    </ui:NavigationViewItem.Icon>
+                </ui:NavigationViewItem>
+                <ui:NavigationViewItem
+                    Content="{locale:Locale SettingsTabGraphics}"
+                    Tag="GraphicsPage"
+                    Icon="Image" />
+                <ui:NavigationViewItem
+                    Content="{locale:Locale SettingsTabAudio}"
+                    Icon="Audio"
+                    Tag="AudioPage" />
+                <ui:NavigationViewItem
+                    Content="{locale:Locale SettingsTabNetwork}"
+                    Tag="NetworkPage"
+                    Icon="Globe" />
+                <ui:NavigationViewItem
+                    Content="{locale:Locale SettingsTabLogging}"
+                    Tag="LoggingPage"
+                    Icon="Document" />
+            </ui:NavigationView.MenuItems>
+        </ui:NavigationView>
+        <StackPanel
+            Grid.Row="2"
+            Margin="10"
+            Spacing="10"
+            Orientation="Horizontal"
+            HorizontalAlignment="Right">
+            <Button Content="{locale:Locale SettingsButtonSave}" Click="SaveButton_Clicked" />
+            <Button Content="{locale:Locale SettingsButtonClose}" Click="CloseButton_Clicked" />
+            <Button Content="{locale:Locale SettingsButtonApply}"
+                    Click="ApplyButton_Clicked" />
+        </StackPanel>
+    </Grid>
+</window:StyleableWindow>

Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs

@@ -0,0 +1,298 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+using FluentAvalonia.Core;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.Ui.Controls;
+using Ryujinx.Ava.Ui.Models;
+using Ryujinx.Ava.Ui.ViewModels;
+using Ryujinx.HLE.FileSystem;
+using Ryujinx.Input;
+using Ryujinx.Input.Assigner;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using TimeZone = Ryujinx.Ava.Ui.Models.TimeZone;
+
+namespace Ryujinx.Ava.Ui.Windows
+{
+    public class SettingsWindow : StyleableWindow
+    {
+        private ListBox _gameList;
+        private TextBox _pathBox;
+        private AutoCompleteBox _timeZoneBox;
+        private ControllerSettingsWindow _controllerSettings;
+
+        // Pages
+        private Control _uiPage;
+        private Control _inputPage;
+        private Control _hotkeysPage;
+        private Control _systemPage;
+        private Control _cpuPage;
+        private Control _graphicsPage;
+        private Control _audioPage;
+        private Control _networkPage;
+        private Control _loggingPage;
+        private NavigationView _navPanel;
+        private ButtonKeyAssigner _currentAssigner;
+
+        internal SettingsViewModel ViewModel { get; set; }
+
+        public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
+        {
+            Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance["Settings"]}";
+
+            ViewModel = new SettingsViewModel(virtualFileSystem, contentManager, this);
+            DataContext = ViewModel;
+
+            InitializeComponent();
+            AttachDebugDevTools();
+
+            FuncMultiValueConverter<string, string> converter = new(parts => string.Format("{0}  {1}   {2}", parts.ToArray()));
+            MultiBinding tzMultiBinding = new() { Converter = converter };
+            tzMultiBinding.Bindings.Add(new Binding("UtcDifference"));
+            tzMultiBinding.Bindings.Add(new Binding("Location"));
+            tzMultiBinding.Bindings.Add(new Binding("Abbreviation"));
+
+            _timeZoneBox.ValueMemberBinding = tzMultiBinding;
+        }
+
+        public SettingsWindow()
+        {
+            ViewModel = new SettingsViewModel();
+            DataContext = ViewModel;
+
+            InitializeComponent();
+            AttachDebugDevTools();
+        }
+
+        [Conditional("DEBUG")]
+        private void AttachDebugDevTools()
+        {
+            this.AttachDevTools();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+
+            _pathBox = this.FindControl<TextBox>("PathBox");
+            _gameList = this.FindControl<ListBox>("GameList");
+            _timeZoneBox = this.FindControl<AutoCompleteBox>("TimeZoneBox");
+            _controllerSettings = this.FindControl<ControllerSettingsWindow>("ControllerSettings");
+
+            _uiPage = this.FindControl<Control>("UiPage");
+            _inputPage = this.FindControl<Control>("InputPage");
+            _hotkeysPage = this.FindControl<Control>("HotkeysPage");
+            _systemPage = this.FindControl<Control>("SystemPage");
+            _cpuPage = this.FindControl<Control>("CpuPage");
+            _graphicsPage = this.FindControl<Control>("GraphicsPage");
+            _audioPage = this.FindControl<Control>("AudioPage");
+            _networkPage = this.FindControl<Control>("NetworkPage");
+            _loggingPage = this.FindControl<Control>("LoggingPage");
+
+            var pageGrid = this.FindControl<Grid>("Pages");
+            pageGrid.Children.Clear();
+
+            _navPanel = this.FindControl<NavigationView>("NavPanel");
+            _navPanel.SelectionChanged += NavPanelOnSelectionChanged;
+            _navPanel.SelectedItem = _navPanel.MenuItems.ElementAt(0);
+        }
+
+        private void Button_Checked(object sender, RoutedEventArgs e)
+        {
+            if (sender is ToggleButton button)
+            {
+                if (_currentAssigner != null && button == _currentAssigner.ToggledButton)
+                {
+                    return;
+                }
+
+                if (_currentAssigner == null && (bool)button.IsChecked)
+                {
+                    _currentAssigner = new ButtonKeyAssigner(button);
+
+                    FocusManager.Instance.Focus(this, NavigationMethod.Pointer);
+
+                    PointerPressed += MouseClick;
+
+                    IKeyboard keyboard = (IKeyboard)ViewModel.AvaloniaKeyboardDriver.GetGamepad(ViewModel.AvaloniaKeyboardDriver.GamepadsIds[0]);
+                    IButtonAssigner assigner = new KeyboardKeyAssigner(keyboard);
+
+                    _currentAssigner.GetInputAndAssign(assigner);
+                }
+                else
+                {
+                    if (_currentAssigner != null)
+                    {
+                        ToggleButton oldButton = _currentAssigner.ToggledButton;
+
+                        _currentAssigner.Cancel();
+                        _currentAssigner = null;
+                        button.IsChecked = false;
+                    }
+                }
+            }
+        }        
+
+        private void Button_Unchecked(object sender, RoutedEventArgs e)
+        {
+            _currentAssigner?.Cancel();
+            _currentAssigner = null;
+        }
+
+        private void MouseClick(object sender, PointerPressedEventArgs e)
+        {
+            bool shouldUnbind = false;
+
+            if (e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed)
+            {
+                shouldUnbind = true;
+            }
+
+            _currentAssigner?.Cancel(shouldUnbind);
+
+            PointerPressed -= MouseClick;
+        }
+
+        private void NavPanelOnSelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
+        {
+            if (e.SelectedItem is NavigationViewItem navitem)
+            {
+                switch (navitem.Tag.ToString())
+                {
+                    case "UiPage":
+                        _navPanel.Content = _uiPage;
+                        break;
+                    case "InputPage":
+                        _navPanel.Content = _inputPage;
+                        break;
+                    case "HotkeysPage":
+                        _navPanel.Content = _hotkeysPage;
+                        break;
+                    case "SystemPage":
+                        _navPanel.Content = _systemPage;
+                        break;
+                    case "CpuPage":
+                        _navPanel.Content = _cpuPage;
+                        break;
+                    case "GraphicsPage":
+                        _navPanel.Content = _graphicsPage;
+                        break;
+                    case "AudioPage":
+                        _navPanel.Content = _audioPage;
+                        break;
+                    case "NetworkPage":
+                        _navPanel.Content = _networkPage;
+                        break;
+                    case "LoggingPage":
+                        _navPanel.Content = _loggingPage;
+                        break;
+                }
+            }
+        }
+
+        private async void AddButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            string path = _pathBox.Text;
+
+            if (!string.IsNullOrWhiteSpace(path) && Directory.Exists(path) && !ViewModel.GameDirectories.Contains(path))
+            {
+                ViewModel.GameDirectories.Add(path);
+            }
+            else
+            {
+                path = await new OpenFolderDialog().ShowAsync(this);
+
+                if (!string.IsNullOrWhiteSpace(path))
+                {
+                    ViewModel.GameDirectories.Add(path);
+                }
+            }
+        }
+
+        private void RemoveButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            List<string> selected = new(_gameList.SelectedItems.Cast<string>());
+
+            foreach (string path in selected)
+            {
+                ViewModel.GameDirectories.Remove(path);
+            }
+        }
+
+        private void TimeZoneBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.AddedItems != null && e.AddedItems.Count > 0)
+            {
+                if (e.AddedItems[0] is TimeZone timeZone)
+                {
+                    e.Handled = true;
+
+                    ViewModel.ValidateAndSetTimeZone(timeZone.Location);
+                }
+            }
+        }
+
+        private void TimeZoneBox_OnTextChanged(object sender, EventArgs e)
+        {
+            if (sender is AutoCompleteBox box)
+            {
+                if (box.SelectedItem != null && box.SelectedItem is TimeZone timeZone)
+                {
+                    ViewModel.ValidateAndSetTimeZone(timeZone.Location);
+                }
+            }
+        }
+
+        private void SaveButton_Clicked(object sender, RoutedEventArgs e)
+        {
+            SaveSettings();
+
+            Close();
+        }
+
+        private void CloseButton_Clicked(object sender, RoutedEventArgs e)
+        {
+            ViewModel.RevertIfNotSaved();
+            Close();
+        }
+
+        private void ApplyButton_Clicked(object sender, RoutedEventArgs e)
+        {
+            SaveSettings();
+        }
+
+        private void SaveSettings()
+        {
+            ViewModel.SaveSettings();
+
+            _controllerSettings?.SaveCurrentProfile();
+
+            if (Owner is MainWindow window)
+            {
+                window.ViewModel.LoadApplications();
+            }
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            _controllerSettings.Dispose();
+            _currentAssigner?.Cancel();
+            _currentAssigner = null;
+            base.OnClosed(e);
+        }
+    }
+}

Ryujinx.Ava/Ui/Windows/UpdaterWindow.axaml

@@ -1,18 +1,26 @@
-<window:StyleableWindow xmlns="https://github.com/avaloniaui"
-                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                        mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="350"
-                        xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-                        x:Class="Ryujinx.Ava.Ui.Windows.UpdaterWindow"
-                        xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
-                        CanResize="False"
-                        SizeToContent="Height"
-                        Width="500" MinHeight="500" Height="500"
-                        WindowStartupLocation="CenterOwner"
-                        MinWidth="500"
-                        Title="Ryujinx Updater">
-    <Grid Margin="20" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+<window:StyleableWindow
+    x:Class="Ryujinx.Ava.Ui.Windows.UpdaterWindow"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
+    Title="Ryujinx Updater"
+    Width="500"
+    Height="500"
+    MinWidth="500"
+    MinHeight="500"
+    d:DesignHeight="350"
+    d:DesignWidth="400"
+    CanResize="False"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
+    <Grid
+        Margin="20"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition />
@@ -20,17 +28,38 @@
             <RowDefinition />
             <RowDefinition />
         </Grid.RowDefinitions>
-        <TextBlock Grid.Row="1" HorizontalAlignment="Stretch" TextAlignment="Center" Height="20" Name="MainText" />
-        <TextBlock Height="20" HorizontalAlignment="Stretch" TextAlignment="Center" Name="SecondaryText" Grid.Row="2" />
-        <ProgressBar IsVisible="False" HorizontalAlignment="Stretch" Name="ProgressBar" Maximum="100" Minimum="0"
-                     Margin="20" Grid.Row="3" />
-        <StackPanel IsVisible="False" Name="ButtonBox" Orientation="Horizontal" Spacing="20" Grid.Row="4"
-                    HorizontalAlignment="Right">
-            <Button Command="{Binding YesPressed}" MinWidth="50">
-                <TextBlock TextAlignment="Center" Text="{locale:Locale InputDialogYes}" />
+        <TextBlock
+            Name="MainText"
+            Grid.Row="1"
+            Height="20"
+            HorizontalAlignment="Stretch"
+            TextAlignment="Center" />
+        <TextBlock
+            Name="SecondaryText"
+            Grid.Row="2"
+            Height="20"
+            HorizontalAlignment="Stretch"
+            TextAlignment="Center" />
+        <ProgressBar
+            Name="ProgressBar"
+            Grid.Row="3"
+            Margin="20"
+            HorizontalAlignment="Stretch"
+            IsVisible="False"
+            Maximum="100"
+            Minimum="0" />
+        <StackPanel
+            Name="ButtonBox"
+            Grid.Row="4"
+            HorizontalAlignment="Right"
+            IsVisible="False"
+            Orientation="Horizontal"
+            Spacing="20">
+            <Button MinWidth="50" Command="{Binding YesPressed}">
+                <TextBlock Text="{locale:Locale InputDialogYes}" TextAlignment="Center" />
             </Button>
-            <Button Command="{Binding NoPressed}" MinWidth="50">
-                <TextBlock TextAlignment="Center" Text="{locale:Locale InputDialogNo}" />
+            <Button MinWidth="50" Command="{Binding NoPressed}">
+                <TextBlock Text="{locale:Locale InputDialogNo}" TextAlignment="Center" />
             </Button>
         </StackPanel>
     </Grid>

Ryujinx.Ava/Ui/Windows/UpdaterWindow.axaml.cs

@@ -58,7 +58,7 @@ namespace Ryujinx.Ava.Ui.Windows
         {
             if (_restartQuery)
             {
-                string ryuName = OperatingSystem.IsWindows() ? "Ryujinx.exe" : "Ryujinx";
+                string ryuName = OperatingSystem.IsWindows() ? "Ryujinx.Ava.exe" : "Ryujinx.Ava";
                 string ryuExe = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ryuName);
                 string ryuArg = string.Join(" ", Environment.GetCommandLineArgs().AsEnumerable().Skip(1).ToArray());
 

Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs

@@ -1,6 +1,6 @@
 namespace Ryujinx.Common.Configuration.Hid
 {
-    public struct KeyboardHotkeys
+    public class KeyboardHotkeys
     {
         public Key ToggleVsync { get; set; }
         public Key Screenshot { get; set; }

Ryujinx.Common/Memory/Box.cs

@@ -0,0 +1,12 @@
+namespace Ryujinx.Common.Memory
+{
+    public class Box<T> where T : unmanaged
+    {
+        public T Data;
+
+        public Box()
+        {
+            Data = new T();
+        }
+    }
+}

Ryujinx.Common/Utilities/BitUtils.cs

@@ -22,7 +22,17 @@ namespace Ryujinx.Common
 
         public static long AlignUp(long value, int size)
         {
-            return (value + (size - 1)) & -(long)size;
+            return AlignUp(value, (long)size);
+        }
+
+        public static ulong AlignUp(ulong value, ulong size)
+        {
+            return (ulong)AlignUp((long)value, (long)size);
+        }
+
+        public static long AlignUp(long value, long size)
+        {
+            return (value + (size - 1)) & -size;
         }
 
         public static uint AlignDown(uint value, int size)
@@ -42,7 +52,17 @@ namespace Ryujinx.Common
 
         public static long AlignDown(long value, int size)
         {
-            return value & -(long)size;
+            return AlignDown(value, (long)size);
+        }
+
+        public static ulong AlignDown(ulong value, ulong size)
+        {
+            return (ulong)AlignDown((long)value, (long)size);
+        }
+
+        public static long AlignDown(long value, long size)
+        {
+            return value & -size;
         }
 
         public static int DivRoundUp(int value, int dividend)

Ryujinx.Graphics.GAL/IPipeline.cs

@@ -10,9 +10,10 @@ namespace Ryujinx.Graphics.GAL
 
         void ClearBuffer(BufferHandle destination, int offset, int size, uint value);
 
-        void ClearRenderTargetColor(int index, uint componentMask, ColorF color);
+        void ClearRenderTargetColor(int index, int layer, uint componentMask, ColorF color);
 
         void ClearRenderTargetDepthStencil(
+            int layer,
             float depthValue,
             bool depthMask,
             int stencilValue,
@@ -59,6 +60,8 @@ namespace Ryujinx.Graphics.GAL
 
         void SetLogicOpState(bool enable, LogicalOp op);
 
+        void SetMultisampleState(MultisampleDescriptor multisample);
+
         void SetPatchParameters(int vertices, ReadOnlySpan<float> defaultOuterLevel, ReadOnlySpan<float> defaultInnerLevel);
         void SetPointParameters(float size, bool isProgramPointSize, bool enablePointSprite, Origin origin);
 

Ryujinx.Graphics.GAL/MultisampleDescriptor.cs

@@ -0,0 +1,19 @@
+namespace Ryujinx.Graphics.GAL
+{
+    public struct MultisampleDescriptor
+    {
+        public bool AlphaToCoverageEnable { get; }
+        public bool AlphaToCoverageDitherEnable { get; }
+        public bool AlphaToOneEnable { get; }
+
+        public MultisampleDescriptor(
+            bool alphaToCoverageEnable,
+            bool alphaToCoverageDitherEnable,
+            bool alphaToOneEnable)
+        {
+            AlphaToCoverageEnable = alphaToCoverageEnable;
+            AlphaToCoverageDitherEnable = alphaToCoverageDitherEnable;
+            AlphaToOneEnable = alphaToOneEnable;
+        }
+    }
+}

Ryujinx.Graphics.GAL/Multithreading/CommandHelper.cs

@@ -179,6 +179,8 @@ namespace Ryujinx.Graphics.GAL.Multithreading
                 SetLineParametersCommand.Run(ref GetCommand<SetLineParametersCommand>(memory), threaded, renderer);
             _lookup[(int)CommandType.SetLogicOpState] = (Span<byte> memory, ThreadedRenderer threaded, IRenderer renderer) =>
                 SetLogicOpStateCommand.Run(ref GetCommand<SetLogicOpStateCommand>(memory), threaded, renderer);
+            _lookup[(int)CommandType.SetMultisampleState] = (Span<byte> memory, ThreadedRenderer threaded, IRenderer renderer) =>
+                SetMultisampleStateCommand.Run(ref GetCommand<SetMultisampleStateCommand>(memory), threaded, renderer);
             _lookup[(int)CommandType.SetPatchParameters] = (Span<byte> memory, ThreadedRenderer threaded, IRenderer renderer) =>
                 SetPatchParametersCommand.Run(ref GetCommand<SetPatchParametersCommand>(memory), threaded, renderer);
             _lookup[(int)CommandType.SetPointParameters] = (Span<byte> memory, ThreadedRenderer threaded, IRenderer renderer) =>

Ryujinx.Graphics.GAL/Multithreading/CommandType.cs

@@ -71,6 +71,7 @@
         SetIndexBuffer,
         SetLineParameters,
         SetLogicOpState,
+        SetMultisampleState,
         SetPatchParameters,
         SetPointParameters,
         SetPolygonMode,

Ryujinx.Graphics.GAL/Multithreading/Commands/ClearRenderTargetColorCommand.cs

@@ -4,19 +4,21 @@
     {
         public CommandType CommandType => CommandType.ClearRenderTargetColor;
         private int _index;
+        private int _layer;
         private uint _componentMask;
         private ColorF _color;
 
-        public void Set(int index, uint componentMask, ColorF color)
+        public void Set(int index, int layer, uint componentMask, ColorF color)
         {
             _index = index;
+            _layer = layer;
             _componentMask = componentMask;
             _color = color;
         }
 
         public static void Run(ref ClearRenderTargetColorCommand command, ThreadedRenderer threaded, IRenderer renderer)
         {
-            renderer.Pipeline.ClearRenderTargetColor(command._index, command._componentMask, command._color);
+            renderer.Pipeline.ClearRenderTargetColor(command._index, command._layer, command._componentMask, command._color);
         }
     }
 }

Ryujinx.Graphics.GAL/Multithreading/Commands/ClearRenderTargetDepthStencilCommand.cs

@@ -3,13 +3,15 @@
     struct ClearRenderTargetDepthStencilCommand : IGALCommand
     {
         public CommandType CommandType => CommandType.ClearRenderTargetDepthStencil;
+        private int _layer;
         private float _depthValue;
         private bool _depthMask;
         private int _stencilValue;
         private int _stencilMask;
 
-        public void Set(float depthValue, bool depthMask, int stencilValue, int stencilMask)
+        public void Set(int layer, float depthValue, bool depthMask, int stencilValue, int stencilMask)
         {
+            _layer = layer;
             _depthValue = depthValue;
             _depthMask = depthMask;
             _stencilValue = stencilValue;
@@ -18,7 +20,7 @@
 
         public static void Run(ref ClearRenderTargetDepthStencilCommand command, ThreadedRenderer threaded, IRenderer renderer)
         {
-            renderer.Pipeline.ClearRenderTargetDepthStencil(command._depthValue, command._depthMask, command._stencilValue, command._stencilMask);
+            renderer.Pipeline.ClearRenderTargetDepthStencil(command._layer, command._depthValue, command._depthMask, command._stencilValue, command._stencilMask);
         }
     }
 }

Ryujinx.Graphics.GAL/Multithreading/Commands/SetMultisampleStateCommand.cs

@@ -0,0 +1,18 @@
+namespace Ryujinx.Graphics.GAL.Multithreading.Commands
+{
+    struct SetMultisampleStateCommand : IGALCommand
+    {
+        public CommandType CommandType => CommandType.SetMultisampleState;
+        private MultisampleDescriptor _multisample;
+
+        public void Set(MultisampleDescriptor multisample)
+        {
+            _multisample = multisample;
+        }
+
+        public static void Run(ref SetMultisampleStateCommand command, ThreadedRenderer threaded, IRenderer renderer)
+        {
+            renderer.Pipeline.SetMultisampleState(command._multisample);
+        }
+    }
+}

Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs

@@ -40,15 +40,15 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             _renderer.QueueCommand();
         }
 
-        public void ClearRenderTargetColor(int index, uint componentMask, ColorF color)
+        public void ClearRenderTargetColor(int index, int layer, uint componentMask, ColorF color)
         {
-            _renderer.New<ClearRenderTargetColorCommand>().Set(index, componentMask, color);
+            _renderer.New<ClearRenderTargetColorCommand>().Set(index, layer, componentMask, color);
             _renderer.QueueCommand();
         }
 
-        public void ClearRenderTargetDepthStencil(float depthValue, bool depthMask, int stencilValue, int stencilMask)
+        public void ClearRenderTargetDepthStencil(int layer, float depthValue, bool depthMask, int stencilValue, int stencilMask)
         {
-            _renderer.New<ClearRenderTargetDepthStencilCommand>().Set(depthValue, depthMask, stencilValue, stencilMask);
+            _renderer.New<ClearRenderTargetDepthStencilCommand>().Set(layer, depthValue, depthMask, stencilValue, stencilMask);
             _renderer.QueueCommand();
         }
 
@@ -184,6 +184,12 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             _renderer.QueueCommand();
         }
 
+        public void SetMultisampleState(MultisampleDescriptor multisample)
+        {
+            _renderer.New<SetMultisampleStateCommand>().Set(multisample);
+            _renderer.QueueCommand();
+        }
+
         public void SetPatchParameters(int vertices, ReadOnlySpan<float> defaultOuterLevel, ReadOnlySpan<float> defaultInnerLevel)
         {
             _renderer.New<SetPatchParametersCommand>().Set(vertices, defaultOuterLevel, defaultInnerLevel);

Ryujinx.Graphics.GAL/SupportBufferUpdater.cs

@@ -18,6 +18,7 @@ namespace Ryujinx.Graphics.GAL
         {
             _renderer = renderer;
             Handle = renderer.CreateBuffer(SupportBuffer.RequiredSize);
+            renderer.Pipeline.ClearBuffer(Handle, 0, SupportBuffer.RequiredSize, 0);
         }
 
         private void MarkDirty(int startOffset, int byteSize)

Ryujinx.Graphics.Gpu/Engine/Compute/ComputeClass.cs

@@ -188,6 +188,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute
             _channel.BufferManager.SetComputeStorageBufferBindings(info.SBuffers);
             _channel.BufferManager.SetComputeUniformBufferBindings(info.CBuffers);
 
+            int maxTextureBinding = -1;
+            int maxImageBinding = -1;
+
             TextureBindingInfo[] textureBindings = _channel.TextureManager.RentComputeTextureBindings(info.Textures.Count);
 
             for (int index = 0; index < info.Textures.Count; index++)
@@ -202,6 +205,11 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute
                     descriptor.CbufSlot,
                     descriptor.HandleIndex,
                     descriptor.Flags);
+
+                if (descriptor.Binding > maxTextureBinding)
+                {
+                    maxTextureBinding = descriptor.Binding;
+                }
             }
 
             TextureBindingInfo[] imageBindings = _channel.TextureManager.RentComputeImageBindings(info.Images.Count);
@@ -220,9 +228,18 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute
                     descriptor.CbufSlot,
                     descriptor.HandleIndex,
                     descriptor.Flags);
+
+                if (descriptor.Binding > maxImageBinding)
+                {
+                    maxImageBinding = descriptor.Binding;
+                }
             }
 
-            _channel.TextureManager.CommitComputeBindings();
+            _channel.TextureManager.SetComputeMaxBindings(maxTextureBinding, maxImageBinding);
+
+            // Should never return false for mismatching spec state, since the shader was fetched above.
+            _channel.TextureManager.CommitComputeBindings(cs.SpecializationState); 
+            
             _channel.BufferManager.CommitComputeBindings();
 
             _context.Renderer.Pipeline.DispatchCompute(qmd.CtaRasterWidth, qmd.CtaRasterHeight, qmd.CtaRasterDepth);

Ryujinx.Graphics.Gpu/Engine/Threed/DrawManager.cs

@@ -18,6 +18,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
         private bool _instancedDrawPending;
         private bool _instancedIndexed;
+        private bool _instancedIndexedInline;
 
         private int _instancedFirstIndex;
         private int _instancedFirstVertex;
@@ -134,13 +135,16 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             {
                 _instancedDrawPending = true;
 
+                int ibCount = _drawState.IbStreamer.InlineIndexCount;
+
                 _instancedIndexed = _drawState.DrawIndexed;
+                _instancedIndexedInline = ibCount != 0;
 
                 _instancedFirstIndex = firstIndex;
                 _instancedFirstVertex = (int)_state.State.FirstVertex;
                 _instancedFirstInstance = (int)_state.State.FirstInstance;
 
-                _instancedIndexCount = indexCount;
+                _instancedIndexCount = ibCount != 0 ? ibCount : indexCount;
 
                 var drawState = _state.State.VertexBufferDrawState;
 
@@ -451,8 +455,18 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             {
                 _instancedDrawPending = false;
 
-                if (_instancedIndexed)
+                bool indexedInline = _instancedIndexedInline;
+
+                if (_instancedIndexed || indexedInline)
                 {
+                    if (indexedInline)
+                    {
+                        int inlineIndexCount = _drawState.IbStreamer.GetAndResetInlineIndexCount();
+                        BufferRange br = new BufferRange(_drawState.IbStreamer.GetInlineIndexBuffer(), 0, inlineIndexCount * 4);
+
+                        _channel.BufferManager.SetIndexBuffer(br, IndexType.UInt);
+                    }
+
                     _context.Renderer.Pipeline.DrawIndexed(
                         _instancedIndexCount,
                         _instanceIndex + 1,
@@ -491,8 +505,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             }
 
             int index = (argument >> 6) & 0xf;
+            int layer = (argument >> 10) & 0x3ff;
 
-            engine.UpdateRenderTargetState(useControl: false, singleUse: index);
+            engine.UpdateRenderTargetState(useControl: false, layered: layer != 0, singleUse: index);
 
             // If there is a mismatch on the host clip region and the one explicitly defined by the guest
             // on the screen scissor state, then we need to force only one texture to be bound to avoid
@@ -567,7 +582,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
                 ColorF color = new ColorF(clearColor.Red, clearColor.Green, clearColor.Blue, clearColor.Alpha);
 
-                _context.Renderer.Pipeline.ClearRenderTargetColor(index, componentMask, color);
+                _context.Renderer.Pipeline.ClearRenderTargetColor(index, layer, componentMask, color);
             }
 
             if (clearDepth || clearStencil)
@@ -588,6 +603,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                 }
 
                 _context.Renderer.Pipeline.ClearRenderTargetDepthStencil(
+                    layer,
                     depthValue,
                     clearDepth,
                     stencilValue,

Ryujinx.Graphics.Gpu/Engine/Threed/IbStreamer.cs

@@ -20,6 +20,11 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         public bool HasInlineIndexData => _inlineIndexCount != 0;
 
+        /// <summary>
+        /// Total numbers of indices that have been pushed.
+        /// </summary>
+        public int InlineIndexCount => _inlineIndexCount;
+
         /// <summary>
         /// Gets the handle for the host buffer currently holding the inline index buffer data.
         /// </summary>

Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs

@@ -166,7 +166,11 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                     nameof(ThreedClassState.BlendEnable),
                     nameof(ThreedClassState.BlendState)),
 
-                new StateUpdateCallbackEntry(UpdateLogicOpState, nameof(ThreedClassState.LogicOpState))
+                new StateUpdateCallbackEntry(UpdateLogicOpState, nameof(ThreedClassState.LogicOpState)),
+
+                new StateUpdateCallbackEntry(UpdateMultisampleState,
+                    nameof(ThreedClassState.AlphaToCoverageDitherEnable),
+                    nameof(ThreedClassState.MultisampleControl))
             });
         }
 
@@ -201,7 +205,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             // of the shader for the new state.
             if (_shaderSpecState != null)
             {
-                if (!_shaderSpecState.MatchesGraphics(_channel, GetPoolState(), GetGraphicsState()))
+                if (!_shaderSpecState.MatchesGraphics(_channel, GetPoolState(), GetGraphicsState(), false))
                 {
                     ForceShaderUpdate();
                 }
@@ -275,7 +279,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         {
             UpdateStorageBuffers();
 
-            _channel.TextureManager.CommitGraphicsBindings();
+            if (!_channel.TextureManager.CommitGraphicsBindings(_shaderSpecState))
+            {
+                // Shader must be reloaded.
+                UpdateShaderState();
+            }
+
             _channel.BufferManager.CommitGraphicsBindings();
         }
 
@@ -362,8 +371,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// Updates render targets (color and depth-stencil buffers) based on current render target state.
         /// </summary>
         /// <param name="useControl">Use draw buffers information from render target control register</param>
+        /// <param name="layered">Indicates if the texture is layered</param>
         /// <param name="singleUse">If this is not -1, it indicates that only the given indexed target will be used.</param>
-        public void UpdateRenderTargetState(bool useControl, int singleUse = -1)
+        public void UpdateRenderTargetState(bool useControl, bool layered = false, int singleUse = -1)
         {
             var memoryManager = _channel.MemoryManager;
             var rtControl = _state.State.RtControl;
@@ -399,7 +409,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                 Image.Texture color = memoryManager.Physical.TextureCache.FindOrCreateTexture(
                     memoryManager,
                     colorState,
-                    _vtgWritesRtLayer,
+                    _vtgWritesRtLayer || layered,
                     samplesInX,
                     samplesInY,
                     sizeHint);
@@ -433,6 +443,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                     memoryManager,
                     dsState,
                     dsSize,
+                    _vtgWritesRtLayer || layered,
                     samplesInX,
                     samplesInY,
                     sizeHint);
@@ -1085,6 +1096,20 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             _context.Renderer.Pipeline.SetLogicOpState(logicOpState.Enable, logicOpState.LogicalOp);
         }
 
+        /// <summary>
+        /// Updates multisample state, based on guest state.
+        /// </summary>
+        private void UpdateMultisampleState()
+        {
+            bool alphaToCoverageEnable = (_state.State.MultisampleControl & 1) != 0;
+            bool alphaToOneEnable = (_state.State.MultisampleControl & 0x10) != 0;
+
+            _context.Renderer.Pipeline.SetMultisampleState(new MultisampleDescriptor(
+                alphaToCoverageEnable,
+                _state.State.AlphaToCoverageDitherEnable,
+                alphaToOneEnable));
+        }
+
         /// <summary>
         /// Updates host shaders based on the guest GPU state.
         /// </summary>
@@ -1148,6 +1173,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                 return;
             }
 
+            int maxTextureBinding = -1;
+            int maxImageBinding = -1;
+
             Span<TextureBindingInfo> textureBindings = _channel.TextureManager.RentGraphicsTextureBindings(stage, info.Textures.Count);
 
             if (info.UsesRtLayer)
@@ -1167,6 +1195,11 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                     descriptor.CbufSlot,
                     descriptor.HandleIndex,
                     descriptor.Flags);
+
+                if (descriptor.Binding > maxTextureBinding)
+                {
+                    maxTextureBinding = descriptor.Binding;
+                }
             }
 
             TextureBindingInfo[] imageBindings = _channel.TextureManager.RentGraphicsImageBindings(stage, info.Images.Count);
@@ -1185,8 +1218,15 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                     descriptor.CbufSlot,
                     descriptor.HandleIndex,
                     descriptor.Flags);
+
+                if (descriptor.Binding > maxImageBinding)
+                {
+                    maxImageBinding = descriptor.Binding;
+                }
             }
 
+            _channel.TextureManager.SetGraphicsMaxBindings(maxTextureBinding, maxImageBinding);
+
             _channel.BufferManager.SetGraphicsStorageBufferBindings(stage, info.SBuffers);
             _channel.BufferManager.SetGraphicsUniformBufferBindings(stage, info.CBuffers);
         }
@@ -1209,7 +1249,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                 _state.State.EarlyZForce,
                 _drawState.Topology,
                 _state.State.TessMode,
-                _state.State.ViewportTransformEnable == 0);
+                _state.State.ViewportTransformEnable == 0,
+                (_state.State.MultisampleControl & 1) != 0,
+                _state.State.AlphaToCoverageDitherEnable);
         }
 
         /// <summary>

Ryujinx.Graphics.Gpu/Engine/Threed/ThreedClass.cs

@@ -131,10 +131,11 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// Updates render targets (color and depth-stencil buffers) based on current render target state.
         /// </summary>
         /// <param name="useControl">Use draw buffers information from render target control register</param>
+        /// <param name="layered">Indicates if the texture is layered</param>
         /// <param name="singleUse">If this is not -1, it indicates that only the given indexed target will be used.</param>
-        public void UpdateRenderTargetState(bool useControl, int singleUse = -1)
+        public void UpdateRenderTargetState(bool useControl, bool layered = false, int singleUse = -1)
         {
-            _stateUpdater.UpdateRenderTargetState(useControl, singleUse);
+            _stateUpdater.UpdateRenderTargetState(useControl, layered, singleUse);
         }
 
         /// <summary>

Ryujinx.Graphics.Gpu/Engine/Threed/ThreedClassState.cs

@@ -767,7 +767,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         public SamplerIndex SamplerIndex;
         public fixed uint Reserved1238[37];
         public Boolean32 DepthTestEnable;
-        public fixed uint Reserved12D0[5];
+        public fixed uint Reserved12D0[4];
+        public Boolean32 AlphaToCoverageDitherEnable;
         public Boolean32 BlendIndependent;
         public Boolean32 DepthWriteEnable;
         public Boolean32 AlphaTestEnable;
@@ -802,9 +803,10 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         public Boolean32 PointSpriteEnable;
         public fixed uint Reserved1524[3];
         public uint ResetCounter;
-        public uint Reserved1534;
+        public Boolean32 MultisampleEnable;
         public Boolean32 RtDepthStencilEnable;
-        public fixed uint Reserved153C[5];
+        public uint MultisampleControl;
+        public fixed uint Reserved1540[4];
         public GpuVa RenderEnableAddress;
         public Condition RenderEnableCondition;
         public PoolState SamplerPoolState;

Ryujinx.Graphics.Gpu/Image/Pool.cs

@@ -1,6 +1,7 @@
 using Ryujinx.Cpu.Tracking;
 using Ryujinx.Graphics.Gpu.Memory;
 using System;
+using System.Runtime.InteropServices;
 
 namespace Ryujinx.Graphics.Gpu.Image
 {
@@ -16,6 +17,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         protected GpuContext Context;
         protected PhysicalMemory PhysicalMemory;
         protected int SequenceNumber;
+        protected int ModifiedSequenceNumber;
 
         protected T1[] Items;
         protected T2[] DescriptorCache;
@@ -41,6 +43,9 @@ namespace Ryujinx.Graphics.Gpu.Image
         private readonly CpuMultiRegionHandle _memoryTracking;
         private readonly Action<ulong, ulong> _modifiedDelegate;
 
+        private int _modifiedSequenceOffset;
+        private bool _modified;
+
         /// <summary>
         /// Creates a new instance of the GPU resource pool.
         /// </summary>
@@ -79,6 +84,16 @@ namespace Ryujinx.Graphics.Gpu.Image
             return PhysicalMemory.Read<T2>(Address + (ulong)id * DescriptorSize);
         }
 
+        /// <summary>
+        /// Gets a reference to the descriptor for a given ID.
+        /// </summary>
+        /// <param name="id">ID of the descriptor. This is effectively a zero-based index</param>
+        /// <returns>A reference to the descriptor</returns>
+        public ref readonly T2 GetDescriptorRef(int id)
+        {
+            return ref MemoryMarshal.Cast<byte, T2>(PhysicalMemory.GetSpan(Address + (ulong)id * DescriptorSize, DescriptorSize))[0];
+        }
+
         /// <summary>
         /// Gets the GPU resource with the given ID.
         /// </summary>
@@ -86,6 +101,16 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <returns>The GPU resource with the given ID</returns>
         public abstract T1 Get(int id);
 
+        /// <summary>
+        /// Checks if a given ID is valid and inside the range of the pool.
+        /// </summary>
+        /// <param name="id">ID of the descriptor. This is effectively a zero-based index</param>
+        /// <returns>True if the specified ID is valid, false otherwise</returns>
+        public bool IsValidId(int id)
+        {
+            return (uint)id <= MaximumId;
+        }
+
         /// <summary>
         /// Synchronizes host memory with guest memory.
         /// This causes invalidation of pool entries,
@@ -93,7 +118,13 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         public void SynchronizeMemory()
         {
+            _modified = false;
             _memoryTracking.QueryModified(_modifiedDelegate);
+
+            if (_modified)
+            {
+                UpdateModifiedSequence();
+            }
         }
 
         /// <summary>
@@ -103,6 +134,8 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="mSize">Size of the modified region</param>
         private void RegionModified(ulong mAddress, ulong mSize)
         {
+            _modified = true;
+
             if (mAddress < Address)
             {
                 mAddress = Address;
@@ -118,6 +151,15 @@ namespace Ryujinx.Graphics.Gpu.Image
             InvalidateRangeImpl(mAddress, mSize);
         }
 
+        /// <summary>
+        /// Updates the modified sequence number using the current sequence number and offset,
+        /// indicating that it has been modified.
+        /// </summary>
+        protected void UpdateModifiedSequence()
+        {
+            ModifiedSequenceNumber = SequenceNumber + _modifiedSequenceOffset;
+        }
+
         /// <summary>
         /// An action to be performed when a precise memory access occurs to this resource.
         /// Makes sure that the dirty flags are checked.
@@ -129,6 +171,16 @@ namespace Ryujinx.Graphics.Gpu.Image
         {
             if (write && Context.SequenceNumber == SequenceNumber)
             {
+                if (ModifiedSequenceNumber == SequenceNumber + _modifiedSequenceOffset)
+                {
+                    // The modified sequence number is offset when PreciseActions occur so that
+                    // users checking it will see an increment and know the pool has changed since
+                    // their last look, even though the main SequenceNumber has not been changed.
+
+                    _modifiedSequenceOffset++;
+                }
+
+                // Force the pool to be checked again the next time it is used.
                 SequenceNumber--;
             }
 

Ryujinx.Graphics.Gpu/Image/Sampler.cs

@@ -8,6 +8,11 @@ namespace Ryujinx.Graphics.Gpu.Image
     /// </summary>
     class Sampler : IDisposable
     {
+        /// <summary>
+        /// True if the sampler is disposed, false otherwise.
+        /// </summary>
+        public bool IsDisposed { get; private set; }
+
         /// <summary>
         /// Host sampler object.
         /// </summary>
@@ -101,6 +106,8 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         public void Dispose()
         {
+            IsDisposed = true;
+
             _hostSampler.Dispose();
             _anisoSampler?.Dispose();
         }

Ryujinx.Graphics.Gpu/Image/SamplerPool.cs

@@ -48,6 +48,8 @@ namespace Ryujinx.Graphics.Gpu.Image
                             Items[i] = null;
                         }
                     }
+
+                    UpdateModifiedSequence();
                 }
 
                 SequenceNumber = Context.SequenceNumber;
@@ -71,6 +73,39 @@ namespace Ryujinx.Graphics.Gpu.Image
             return sampler;
         }
 
+        /// <summary>
+        /// Checks if the pool was modified, and returns the last sequence number where a modification was detected.
+        /// </summary>
+        /// <returns>A number that increments each time a modification is detected</returns>
+        public int CheckModified()
+        {
+            if (SequenceNumber != Context.SequenceNumber)
+            {
+                SequenceNumber = Context.SequenceNumber;
+
+                if (_forcedAnisotropy != GraphicsConfig.MaxAnisotropy)
+                {
+                    _forcedAnisotropy = GraphicsConfig.MaxAnisotropy;
+
+                    for (int i = 0; i < Items.Length; i++)
+                    {
+                        if (Items[i] != null)
+                        {
+                            Items[i].Dispose();
+
+                            Items[i] = null;
+                        }
+                    }
+
+                    UpdateModifiedSequence();
+                }
+
+                SynchronizeMemory();
+            }
+
+            return ModifiedSequenceNumber;
+        }
+
         /// <summary>
         /// Implementation of the sampler pool range invalidation.
         /// </summary>

Ryujinx.Graphics.Gpu/Image/Texture.cs

@@ -100,6 +100,11 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         public bool AlwaysFlushOnOverlap { get; private set; }
 
+        /// <summary>
+        /// Increments when the host texture is swapped, or when the texture is removed from all pools.
+        /// </summary>
+        public int InvalidatedSequence { get; private set; }
+
         private int _depth;
         private int _layers;
         public int FirstLayer { get; private set; }
@@ -1407,6 +1412,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             DisposeTextures();
 
             HostTexture = hostTexture;
+            InvalidatedSequence++;
         }
 
         /// <summary>
@@ -1535,6 +1541,8 @@ namespace Ryujinx.Graphics.Gpu.Image
 
                 _poolOwners.Clear();
             }
+
+            InvalidatedSequence++;
         }
 
         /// <summary>

Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs

@@ -1,8 +1,12 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Engine.Types;
+using Ryujinx.Graphics.Gpu.Memory;
+using Ryujinx.Graphics.Gpu.Shader;
 using Ryujinx.Graphics.Shader;
 using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace Ryujinx.Graphics.Gpu.Image
 {
@@ -28,24 +32,36 @@ namespace Ryujinx.Graphics.Gpu.Image
         private readonly GpuChannel _channel;
         private readonly TexturePoolCache _texturePoolCache;
 
+        private TexturePool _cachedTexturePool;
+        private SamplerPool _cachedSamplerPool;
+
         private readonly TextureBindingInfo[][] _textureBindings;
         private readonly TextureBindingInfo[][] _imageBindings;
 
-        private struct TextureStatePerStage
+        private struct TextureState
         {
             public ITexture Texture;
             public ISampler Sampler;
+
+            public int TextureHandle;
+            public int SamplerHandle;
+            public int InvalidatedSequence;
+            public Texture CachedTexture;
+            public Sampler CachedSampler;
+            public int ScaleIndex;
+            public TextureUsageFlags UsageFlags;
         }
 
-        private readonly TextureStatePerStage[][] _textureState;
-        private readonly TextureStatePerStage[][] _imageState;
+        private TextureState[] _textureState;
+        private TextureState[] _imageState;
 
         private int[] _textureBindingsCount;
         private int[] _imageBindingsCount;
 
-        private int _textureBufferIndex;
+        private int _texturePoolSequence;
+        private int _samplerPoolSequence;
 
-        private bool _rebind;
+        private int _textureBufferIndex;
 
         private readonly float[] _scales;
         private bool _scaleChanged;
@@ -72,8 +88,8 @@ namespace Ryujinx.Graphics.Gpu.Image
             _textureBindings = new TextureBindingInfo[stages][];
             _imageBindings   = new TextureBindingInfo[stages][];
 
-            _textureState = new TextureStatePerStage[stages][];
-            _imageState   = new TextureStatePerStage[stages][];
+            _textureState = new TextureState[InitialTextureStateSize];
+            _imageState   = new TextureState[InitialImageStateSize];
 
             _textureBindingsCount = new int[stages];
             _imageBindingsCount = new int[stages];
@@ -82,9 +98,6 @@ namespace Ryujinx.Graphics.Gpu.Image
             {
                 _textureBindings[stage] = new TextureBindingInfo[InitialTextureStateSize];
                 _imageBindings[stage] = new TextureBindingInfo[InitialImageStateSize];
-
-                _textureState[stage] = new TextureStatePerStage[InitialTextureStateSize];
-                _imageState[stage] = new TextureStatePerStage[InitialImageStateSize];
             }
         }
 
@@ -99,15 +112,6 @@ namespace Ryujinx.Graphics.Gpu.Image
             if (count > _textureBindings[stage].Length)
             {
                 Array.Resize(ref _textureBindings[stage], count);
-                Array.Resize(ref _textureState[stage], count);
-            }
-
-            int toClear = Math.Max(_textureBindingsCount[stage], count);
-            TextureStatePerStage[] state = _textureState[stage];
-
-            for (int i = 0; i < toClear; i++)
-            {
-                state[i] = new TextureStatePerStage();
             }
 
             _textureBindingsCount[stage] = count;
@@ -126,15 +130,6 @@ namespace Ryujinx.Graphics.Gpu.Image
             if (count > _imageBindings[stage].Length)
             {
                 Array.Resize(ref _imageBindings[stage], count);
-                Array.Resize(ref _imageState[stage], count);
-            }
-
-            int toClear = Math.Max(_imageBindingsCount[stage], count);
-            TextureStatePerStage[] state = _imageState[stage];
-
-            for (int i = 0; i < toClear; i++)
-            {
-                state[i] = new TextureStatePerStage();
             }
 
             _imageBindingsCount[stage] = count;
@@ -142,6 +137,24 @@ namespace Ryujinx.Graphics.Gpu.Image
             return _imageBindings[stage];
         }
 
+        /// <summary>
+        /// Sets the max binding indexes for textures and images.
+        /// </summary>
+        /// <param name="maxTextureBinding">The maximum texture binding</param>
+        /// <param name="maxImageBinding">The maximum image binding</param>
+        public void SetMaxBindings(int maxTextureBinding, int maxImageBinding)
+        {
+            if (maxTextureBinding >= _textureState.Length)
+            {
+                Array.Resize(ref _textureState, maxTextureBinding + 1);
+            }
+
+            if (maxImageBinding >= _imageState.Length)
+            {
+                Array.Resize(ref _imageState, maxImageBinding + 1);
+            }
+        }
+
         /// <summary>
         /// Sets the textures constant buffer index.
         /// The constant buffer specified holds the texture handles.
@@ -222,18 +235,18 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// Updates the texture scale for a given texture or image.
         /// </summary>
         /// <param name="texture">Start GPU virtual address of the pool</param>
-        /// <param name="binding">The related texture binding</param>
+        /// <param name="usageFlags">The related texture usage flags</param>
         /// <param name="index">The texture/image binding index</param>
         /// <param name="stage">The active shader stage</param>
         /// <returns>True if the given texture has become blacklisted, indicating that its host texture may have changed.</returns>
-        private bool UpdateScale(Texture texture, TextureBindingInfo binding, int index, ShaderStage stage)
+        private bool UpdateScale(Texture texture, TextureUsageFlags usageFlags, int index, ShaderStage stage)
         {
             float result = 1f;
             bool changed = false;
 
-            if ((binding.Flags & TextureUsageFlags.NeedsScaleValue) != 0 && texture != null)
+            if ((usageFlags & TextureUsageFlags.NeedsScaleValue) != 0 && texture != null)
             {
-                if ((binding.Flags & TextureUsageFlags.ResScaleUnsupported) != 0)
+                if ((usageFlags & TextureUsageFlags.ResScaleUnsupported) != 0)
                 {
                     changed = texture.ScaleMode != TextureScaleMode.Blacklisted;
                     texture.BlacklistScale();
@@ -323,7 +336,9 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// Ensures that the bindings are visible to the host GPU.
         /// Note: this actually performs the binding using the host graphics API.
         /// </summary>
-        public void CommitBindings()
+        /// <param name="specState">Specialization state for the bound shader</param>
+        /// <returns>True if all bound textures match the current shader specialiation state, false otherwise</returns>
+        public bool CommitBindings(ShaderSpecializationState specState)
         {
             ulong texturePoolAddress = _texturePoolAddress;
 
@@ -331,10 +346,43 @@ namespace Ryujinx.Graphics.Gpu.Image
                 ? _texturePoolCache.FindOrCreate(_channel, texturePoolAddress, _texturePoolMaximumId)
                 : null;
 
+            SamplerPool samplerPool = _samplerPool;
+
+            // Check if the texture pool has been modified since bindings were last committed.
+            // If it wasn't, then it's possible to avoid looking up textures again when the handle remains the same.
+            bool poolModified = _cachedTexturePool != texturePool || _cachedSamplerPool != samplerPool;
+
+            _cachedTexturePool = texturePool;
+            _cachedSamplerPool = samplerPool;
+
+            if (texturePool != null)
+            {
+                int texturePoolSequence = texturePool.CheckModified();
+
+                if (_texturePoolSequence != texturePoolSequence)
+                {
+                    poolModified = true;
+                    _texturePoolSequence = texturePoolSequence;
+                }
+            }
+
+            if (samplerPool != null)
+            {
+                int samplerPoolSequence = samplerPool.CheckModified();
+
+                if (_samplerPoolSequence != samplerPoolSequence)
+                {
+                    poolModified = true;
+                    _samplerPoolSequence = samplerPoolSequence;
+                }
+            }
+
+            bool specStateMatches = true;
+
             if (_isCompute)
             {
-                CommitTextureBindings(texturePool, ShaderStage.Compute, 0);
-                CommitImageBindings  (texturePool, ShaderStage.Compute, 0);
+                specStateMatches &= CommitTextureBindings(texturePool, ShaderStage.Compute, 0, poolModified, specState);
+                specStateMatches &= CommitImageBindings(texturePool, ShaderStage.Compute, 0, poolModified, specState);
             }
             else
             {
@@ -342,14 +390,57 @@ namespace Ryujinx.Graphics.Gpu.Image
                 {
                     int stageIndex = (int)stage - 1;
 
-                    CommitTextureBindings(texturePool, stage, stageIndex);
-                    CommitImageBindings  (texturePool, stage, stageIndex);
+                    specStateMatches &= CommitTextureBindings(texturePool, stage, stageIndex, poolModified, specState);
+                    specStateMatches &= CommitImageBindings(texturePool, stage, stageIndex, poolModified, specState);
                 }
             }
 
             CommitRenderScale();
 
-            _rebind = false;
+            return specStateMatches;
+        }
+
+        /// <summary>
+        /// Fetch the constant buffers used for a texture to cache.
+        /// </summary>
+        /// <param name="stageIndex">Stage index of the constant buffer</param>
+        /// <param name="cachedTextureBufferIndex">The currently cached texture buffer index</param>
+        /// <param name="cachedSamplerBufferIndex">The currently cached sampler buffer index</param>
+        /// <param name="cachedTextureBuffer">The currently cached texture buffer data</param>
+        /// <param name="cachedSamplerBuffer">The currently cached sampler buffer data</param>
+        /// <param name="textureBufferIndex">The new texture buffer index</param>
+        /// <param name="samplerBufferIndex">The new sampler buffer index</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void UpdateCachedBuffer(
+            int stageIndex,
+            ref int cachedTextureBufferIndex,
+            ref int cachedSamplerBufferIndex,
+            ref ReadOnlySpan<int> cachedTextureBuffer,
+            ref ReadOnlySpan<int> cachedSamplerBuffer,
+            int textureBufferIndex,
+            int samplerBufferIndex)
+        {
+            if (textureBufferIndex != cachedTextureBufferIndex)
+            {
+                ref BufferBounds bounds = ref _channel.BufferManager.GetUniformBufferBounds(_isCompute, stageIndex, textureBufferIndex);
+
+                cachedTextureBuffer = MemoryMarshal.Cast<byte, int>(_channel.MemoryManager.Physical.GetSpan(bounds.Address, (int)bounds.Size));
+                cachedTextureBufferIndex = textureBufferIndex;
+
+                if (samplerBufferIndex == textureBufferIndex)
+                {
+                    cachedSamplerBuffer = cachedTextureBuffer;
+                    cachedSamplerBufferIndex = samplerBufferIndex;
+                }
+            }
+
+            if (samplerBufferIndex != cachedSamplerBufferIndex)
+            {
+                ref BufferBounds bounds = ref _channel.BufferManager.GetUniformBufferBounds(_isCompute, stageIndex, samplerBufferIndex);
+
+                cachedSamplerBuffer = MemoryMarshal.Cast<byte, int>(_channel.MemoryManager.Physical.GetSpan(bounds.Address, (int)bounds.Size));
+                cachedSamplerBufferIndex = samplerBufferIndex;
+            }
         }
 
         /// <summary>
@@ -358,13 +449,16 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         /// <param name="pool">The current texture pool</param>
         /// <param name="stage">The shader stage using the textures to be bound</param>
-        /// <param name="stageIndex">The stage number of the specified shader stage</param>
-        private void CommitTextureBindings(TexturePool pool, ShaderStage stage, int stageIndex)
+        /// <param name="stageIndex">The stage number of the specified shader stage</param
+        /// <param name="poolModified">True if either the texture or sampler pool was modified, false otherwise</param>
+        /// <param name="specState">Specialization state for the bound shader</param>
+        /// <returns>True if all bound textures match the current shader specialiation state, false otherwise</returns>
+        private bool CommitTextureBindings(TexturePool pool, ShaderStage stage, int stageIndex, bool poolModified, ShaderSpecializationState specState)
         {
             int textureCount = _textureBindingsCount[stageIndex];
             if (textureCount == 0)
             {
-                return;
+                return true;
             }
 
             var samplerPool = _samplerPool;
@@ -372,17 +466,27 @@ namespace Ryujinx.Graphics.Gpu.Image
             if (pool == null)
             {
                 Logger.Error?.Print(LogClass.Gpu, $"Shader stage \"{stage}\" uses textures, but texture pool was not set.");
-                return;
+                return true;
             }
 
+            bool specStateMatches = true;
+
+            int cachedTextureBufferIndex = -1;
+            int cachedSamplerBufferIndex = -1;
+            ReadOnlySpan<int> cachedTextureBuffer = Span<int>.Empty;
+            ReadOnlySpan<int> cachedSamplerBuffer = Span<int>.Empty;
+
             for (int index = 0; index < textureCount; index++)
             {
                 TextureBindingInfo bindingInfo = _textureBindings[stageIndex][index];
+                TextureUsageFlags usageFlags = bindingInfo.Flags;
 
                 (int textureBufferIndex, int samplerBufferIndex) = TextureHandle.UnpackSlots(bindingInfo.CbufSlot, _textureBufferIndex);
 
-                int packedId = ReadPackedId(stageIndex, bindingInfo.Handle, textureBufferIndex, samplerBufferIndex);
-                int textureId = UnpackTextureId(packedId);
+                UpdateCachedBuffer(stageIndex, ref cachedTextureBufferIndex, ref cachedSamplerBufferIndex, ref cachedTextureBuffer, ref cachedSamplerBuffer, textureBufferIndex, samplerBufferIndex);
+
+                int packedId = TextureHandle.ReadPackedId(bindingInfo.Handle, cachedTextureBuffer, cachedSamplerBuffer);
+                int textureId = TextureHandle.UnpackTextureId(packedId);
                 int samplerId;
 
                 if (_samplerIndex == SamplerIndex.ViaHeaderIndex)
@@ -391,10 +495,42 @@ namespace Ryujinx.Graphics.Gpu.Image
                 }
                 else
                 {
-                    samplerId = UnpackSamplerId(packedId);
+                    samplerId = TextureHandle.UnpackSamplerId(packedId);
                 }
 
-                Texture texture = pool.Get(textureId);
+                ref TextureState state = ref _textureState[bindingInfo.Binding];
+
+                if (!poolModified &&
+                    state.TextureHandle == textureId &&
+                    state.SamplerHandle == samplerId &&
+                    state.CachedTexture != null &&
+                    state.CachedTexture.InvalidatedSequence == state.InvalidatedSequence &&
+                    state.CachedSampler?.IsDisposed != true)
+                {
+                    // The texture is already bound.
+                    state.CachedTexture.SynchronizeMemory();
+
+                    if ((state.ScaleIndex != index || state.UsageFlags != usageFlags) &&
+                        UpdateScale(state.CachedTexture, usageFlags, index, stage))
+                    {
+                        ITexture hostTextureRebind = state.CachedTexture.GetTargetTexture(bindingInfo.Target);
+
+                        state.Texture = hostTextureRebind;
+                        state.ScaleIndex = index;
+                        state.UsageFlags = usageFlags;
+
+                        _context.Renderer.Pipeline.SetTexture(bindingInfo.Binding, hostTextureRebind);
+                    }
+
+                    continue;
+                }
+
+                state.TextureHandle = textureId;
+                state.SamplerHandle = samplerId;
+
+                ref readonly TextureDescriptor descriptor = ref pool.GetForBinding(textureId, out Texture texture);
+
+                specStateMatches &= specState.MatchesTexture(stage, index, descriptor);
 
                 ITexture hostTexture = texture?.GetTargetTexture(bindingInfo.Target);
 
@@ -407,30 +543,38 @@ namespace Ryujinx.Graphics.Gpu.Image
                 }
                 else
                 {
-                    if (_textureState[stageIndex][index].Texture != hostTexture || _rebind)
+                    if (state.Texture != hostTexture)
                     {
-                        if (UpdateScale(texture, bindingInfo, index, stage))
+                        if (UpdateScale(texture, usageFlags, index, stage))
                         {
                             hostTexture = texture?.GetTargetTexture(bindingInfo.Target);
                         }
 
-                        _textureState[stageIndex][index].Texture = hostTexture;
+                        state.Texture = hostTexture;
+                        state.ScaleIndex = index;
+                        state.UsageFlags = usageFlags;
 
                         _context.Renderer.Pipeline.SetTexture(bindingInfo.Binding, hostTexture);
                     }
 
                     Sampler sampler = samplerPool?.Get(samplerId);
+                    state.CachedSampler = sampler;
 
                     ISampler hostSampler = sampler?.GetHostSampler(texture);
 
-                    if (_textureState[stageIndex][index].Sampler != hostSampler || _rebind)
+                    if (state.Sampler != hostSampler)
                     {
-                        _textureState[stageIndex][index].Sampler = hostSampler;
+                        state.Sampler = hostSampler;
 
                         _context.Renderer.Pipeline.SetSampler(bindingInfo.Binding, hostSampler);
                     }
+
+                    state.CachedTexture = texture;
+                    state.InvalidatedSequence = texture?.InvalidatedSequence ?? 0;
                 }
             }
+
+            return specStateMatches;
         }
 
         /// <summary>
@@ -440,38 +584,90 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="pool">The current texture pool</param>
         /// <param name="stage">The shader stage using the textures to be bound</param>
         /// <param name="stageIndex">The stage number of the specified shader stage</param>
-        private void CommitImageBindings(TexturePool pool, ShaderStage stage, int stageIndex)
+        /// <param name="poolModified">True if either the texture or sampler pool was modified, false otherwise</param>
+        /// <param name="specState">Specialization state for the bound shader</param>
+        /// <returns>True if all bound images match the current shader specialiation state, false otherwise</returns>
+        private bool CommitImageBindings(TexturePool pool, ShaderStage stage, int stageIndex, bool poolModified, ShaderSpecializationState specState)
         {
             int imageCount = _imageBindingsCount[stageIndex];
             if (imageCount == 0)
             {
-                return;
+                return true;
             }
 
             if (pool == null)
             {
                 Logger.Error?.Print(LogClass.Gpu, $"Shader stage \"{stage}\" uses images, but texture pool was not set.");
-                return;
+                return true;
             }
 
             // Scales for images appear after the texture ones.
             int baseScaleIndex = _textureBindingsCount[stageIndex];
 
+            int cachedTextureBufferIndex = -1;
+            int cachedSamplerBufferIndex = -1;
+            ReadOnlySpan<int> cachedTextureBuffer = Span<int>.Empty;
+            ReadOnlySpan<int> cachedSamplerBuffer = Span<int>.Empty;
+
+            bool specStateMatches = true;
+
             for (int index = 0; index < imageCount; index++)
             {
                 TextureBindingInfo bindingInfo = _imageBindings[stageIndex][index];
+                TextureUsageFlags usageFlags = bindingInfo.Flags;
+                int scaleIndex = baseScaleIndex + index;
 
                 (int textureBufferIndex, int samplerBufferIndex) = TextureHandle.UnpackSlots(bindingInfo.CbufSlot, _textureBufferIndex);
 
-                int packedId = ReadPackedId(stageIndex, bindingInfo.Handle, textureBufferIndex, samplerBufferIndex);
-                int textureId = UnpackTextureId(packedId);
+                UpdateCachedBuffer(stageIndex, ref cachedTextureBufferIndex, ref cachedSamplerBufferIndex, ref cachedTextureBuffer, ref cachedSamplerBuffer, textureBufferIndex, samplerBufferIndex);
 
-                Texture texture = pool.Get(textureId);
+                int packedId = TextureHandle.ReadPackedId(bindingInfo.Handle, cachedTextureBuffer, cachedSamplerBuffer);
+                int textureId = TextureHandle.UnpackTextureId(packedId);
 
-                ITexture hostTexture = texture?.GetTargetTexture(bindingInfo.Target);
+                ref TextureState state = ref _imageState[bindingInfo.Binding];
 
                 bool isStore = bindingInfo.Flags.HasFlag(TextureUsageFlags.ImageStore);
 
+                if (!poolModified &&
+                    state.TextureHandle == textureId &&
+                    state.CachedTexture != null &&
+                    state.CachedTexture.InvalidatedSequence == state.InvalidatedSequence)
+                {
+                    Texture cachedTexture = state.CachedTexture;
+
+                    // The texture is already bound.
+                    cachedTexture.SynchronizeMemory();
+
+                    if (isStore)
+                    {
+                        cachedTexture?.SignalModified();
+                    }
+
+                    if ((state.ScaleIndex != index || state.UsageFlags != usageFlags) &&
+                        UpdateScale(state.CachedTexture, usageFlags, scaleIndex, stage))
+                    {
+                        ITexture hostTextureRebind = state.CachedTexture.GetTargetTexture(bindingInfo.Target);
+
+                        Format format = bindingInfo.Format == 0 ? cachedTexture.Format : bindingInfo.Format;
+
+                        state.Texture = hostTextureRebind;
+                        state.ScaleIndex = scaleIndex;
+                        state.UsageFlags = usageFlags;
+
+                        _context.Renderer.Pipeline.SetImage(bindingInfo.Binding, hostTextureRebind, format);
+                    }
+
+                    continue;
+                }
+
+                state.TextureHandle = textureId;
+
+                ref readonly TextureDescriptor descriptor = ref pool.GetForBinding(textureId, out Texture texture);
+
+                specStateMatches &= specState.MatchesImage(stage, index, descriptor);
+
+                ITexture hostTexture = texture?.GetTargetTexture(bindingInfo.Target);
+
                 if (hostTexture != null && texture.Target == Target.TextureBuffer)
                 {
                     // Ensure that the buffer texture is using the correct buffer as storage.
@@ -494,14 +690,16 @@ namespace Ryujinx.Graphics.Gpu.Image
                         texture?.SignalModified();
                     }
 
-                    if (_imageState[stageIndex][index].Texture != hostTexture || _rebind)
+                    if (state.Texture != hostTexture)
                     {
-                        if (UpdateScale(texture, bindingInfo, baseScaleIndex + index, stage))
+                        if (UpdateScale(texture, usageFlags, scaleIndex, stage))
                         {
                             hostTexture = texture?.GetTargetTexture(bindingInfo.Target);
                         }
 
-                        _imageState[stageIndex][index].Texture = hostTexture;
+                        state.Texture = hostTexture;
+                        state.ScaleIndex = scaleIndex;
+                        state.UsageFlags = usageFlags;
 
                         Format format = bindingInfo.Format;
 
@@ -512,8 +710,13 @@ namespace Ryujinx.Graphics.Gpu.Image
 
                         _context.Renderer.Pipeline.SetImage(bindingInfo.Binding, hostTexture, format);
                     }
+
+                    state.CachedTexture = texture;
+                    state.InvalidatedSequence = texture?.InvalidatedSequence ?? 0;
                 }
             }
+
+            return specStateMatches;
         }
 
         /// <summary>
@@ -537,13 +740,28 @@ namespace Ryujinx.Graphics.Gpu.Image
             (int textureBufferIndex, int samplerBufferIndex) = TextureHandle.UnpackSlots(cbufSlot, bufferIndex);
 
             int packedId = ReadPackedId(stageIndex, handle, textureBufferIndex, samplerBufferIndex);
-            int textureId = UnpackTextureId(packedId);
+            int textureId = TextureHandle.UnpackTextureId(packedId);
 
             ulong poolAddress = _channel.MemoryManager.Translate(poolGpuVa);
 
             TexturePool texturePool = _texturePoolCache.FindOrCreate(_channel, poolAddress, maximumId);
 
-            return texturePool.GetDescriptor(textureId);
+            TextureDescriptor descriptor;
+
+            if (texturePool.IsValidId(textureId))
+            {
+                descriptor = texturePool.GetDescriptor(textureId);
+            }
+            else
+            {
+                // If the ID is not valid, we just return a default descriptor with the most common state.
+                // Since this is used for shader specialization, doing so might avoid the need for recompilations.
+                descriptor = new TextureDescriptor();
+                descriptor.Word4 |= (uint)TextureTarget.Texture2D << 23;
+                descriptor.Word5 |= 1u << 31; // Coords normalized.
+            }
+
+            return descriptor;
         }
 
         /// <summary>
@@ -555,6 +773,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="textureBufferIndex">Index of the constant buffer holding the texture handles</param>
         /// <param name="samplerBufferIndex">Index of the constant buffer holding the sampler handles</param>
         /// <returns>The packed texture and sampler ID (the real texture handle)</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private int ReadPackedId(int stageIndex, int wordOffset, int textureBufferIndex, int samplerBufferIndex)
         {
             (int textureWordOffset, int samplerWordOffset, TextureHandleType handleType) = TextureHandle.UnpackOffsets(wordOffset);
@@ -573,13 +792,23 @@ namespace Ryujinx.Graphics.Gpu.Image
             // turn that into a regular texture access and produce those special handles with values on the higher 16 bits.
             if (handleType != TextureHandleType.CombinedSampler)
             {
-                ulong samplerBufferAddress = _isCompute
-                    ? _channel.BufferManager.GetComputeUniformBufferAddress(samplerBufferIndex)
-                    : _channel.BufferManager.GetGraphicsUniformBufferAddress(stageIndex, samplerBufferIndex);
+                int samplerHandle;
 
-                int samplerHandle = _channel.MemoryManager.Physical.Read<int>(samplerBufferAddress + (uint)samplerWordOffset * 4);
+                if (handleType != TextureHandleType.SeparateConstantSamplerHandle)
+                {
+                    ulong samplerBufferAddress = _isCompute
+                        ? _channel.BufferManager.GetComputeUniformBufferAddress(samplerBufferIndex)
+                        : _channel.BufferManager.GetGraphicsUniformBufferAddress(stageIndex, samplerBufferIndex);
 
-                if (handleType == TextureHandleType.SeparateSamplerId)
+                    samplerHandle = _channel.MemoryManager.Physical.Read<int>(samplerBufferAddress + (uint)samplerWordOffset * 4);
+                }
+                else
+                {
+                    samplerHandle = samplerWordOffset;
+                }
+
+                if (handleType == TextureHandleType.SeparateSamplerId ||
+                    handleType == TextureHandleType.SeparateConstantSamplerHandle)
                 {
                     samplerHandle <<= 20;
                 }
@@ -590,32 +819,13 @@ namespace Ryujinx.Graphics.Gpu.Image
             return handle;
         }
 
-        /// <summary>
-        /// Unpacks the texture ID from the real texture handle.
-        /// </summary>
-        /// <param name="packedId">The real texture handle</param>
-        /// <returns>The texture ID</returns>
-        private static int UnpackTextureId(int packedId)
-        {
-            return (packedId >> 0) & 0xfffff;
-        }
-
-        /// <summary>
-        /// Unpacks the sampler ID from the real texture handle.
-        /// </summary>
-        /// <param name="packedId">The real texture handle</param>
-        /// <returns>The sampler ID</returns>
-        private static int UnpackSamplerId(int packedId)
-        {
-            return (packedId >> 20) & 0xfff;
-        }
-
         /// <summary>
         /// Force all bound textures and images to be rebound the next time CommitBindings is called.
         /// </summary>
         public void Rebind()
         {
-            _rebind = true;
+            Array.Clear(_textureState);
+            Array.Clear(_imageState);
         }
 
         /// <summary>