Merge daf2771859 into 534f92506b

COMPILING.md

@@ -5,7 +5,7 @@ If you wish to build the emulator yourself, follow these steps:
 
 ### Step 1
 
-Install the [.NET 9.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/9.0).
+Install the [.NET 10.0 (or higher) SDK](https://dotnet.microsoft.com/download/dotnet/10.0).
 Make sure your SDK version is higher or equal to the required version specified in [global.json](global.json).
 
 ### Step 2

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 </Project>

README.md

@@ -97,7 +97,7 @@ If you are planning to contribute or just want to learn more about this project
 
 - **Input**
 
-  We currently have support for keyboard, mouse, touch input, Joy-Con input support, and nearly all controllers.
+  We currently have support for keyboard, mouse, touch input, JoyCon input support, and nearly all controllers.
   Motion controls are natively supported in most cases; for dual-JoyCon motion support, DS4Windows or BetterJoy are currently required.
   In all scenarios, you can set up everything inside the input configuration menu.
 

docs/compatibility.csv

@@ -631,7 +631,6 @@
 010030D012FF6000,"Bus Driver Simulator",,playable,2022-10-17 13:55:27
 0100A9101418C000,"BUSTAFELLOWS",nvdec,playable,2020-10-17 20:04:41
 0100177005C8A000,"BUTCHER",,playable,2021-01-11 18:50:17
-01008c2019598000,"Bluey: The Videogame",,playable,2025-02-11 04:38:00
 01000B900D8B0000,"Cadence of Hyrule: Crypt of the NecroDancer Featuring The Legend of Zelda",slow;nvdec,playable,2024-04-01 22:43:40
 010065700EE06000,"Cadence of Hyrule: Crypt of the NecroDancer Featuring The Legend of Zelda Demo",demo;gpu;nvdec,ingame,2021-02-14 21:48:15
 01005C00117A8000,"Café Enchanté",,playable,2020-11-13 14:54:25
@@ -1383,9 +1382,6 @@
 0100763015C2E000,"Gunvolt Chronicles: Luminous Avenger iX 2",crash;Needs Update,nothing,2022-04-29 15:34:34
 01002C8018554000,"Gurimugurimoa OnceMore Demo",,playable,2022-07-29 22:07:31
 0100AC601DCA8000,"GYLT",crash,ingame,2024-03-18 20:16:51
-0100c3c012718000,"Grand Theft Auto: III – The Definitive Edition",gpu;UE4,ingame,2022-10-31 20:13:52
-0100182014022000,"Grand Theft Auto: Vice City – The Definitive Edition",gpu;UE4,ingame,2022-10-31 20:13:52
-010065a014024000,"Grand Theft Auto: San Andreas – The Definitive Edition",gpu;UE4,ingame,2022-10-31 20:13:52
 0100822012D76000,"HAAK",gpu,ingame,2023-02-19 14:31:05
 01007E100EFA8000,"Habroxia",,playable,2020-06-16 23:04:42
 0100535012974000,"Hades",vulkan,playable,2022-10-05 10:45:21
@@ -2733,7 +2729,7 @@
 0100C2500FC20000,"Splatoon™ 3",ldn-works;opengl-backend-bug;LAN;amd-vendor-bug,playable,2024-08-04 23:49:11
 0100BA0018500000,"Splatoon™ 3: Splatfest World Premiere",gpu;online-broken;demo,ingame,2022-09-19 03:17:12
 010062800D39C000,"SpongeBob SquarePants: Battle for Bikini Bottom - Rehydrated",online-broken;UE4;ldn-broken;vulkan-backend-bug,playable,2023-08-01 19:29:34
-01009FB0172F4000,"SpongeBob SquarePants: The Cosmic Shake",gpu;UE4,ingame,2024-03-04 16:35:00
+01009FB0172F4000,"SpongeBob SquarePants: The Cosmic Shake",gpu;UE4,ingame,2023-08-01 19:29:53
 010097C01336A000,"Spooky Chase",,playable,2022-11-04 12:17:44
 0100C6100D75E000,"Spooky Ghosts Dot Com",,playable,2021-06-15 15:16:11
 0100DE9005170000,"Sports Party",nvdec,playable,2021-03-05 13:40:42

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100-preview.1.25120.13",
     "rollForward": "latestFeature"
   }
 }

src/Ryujinx/Assets/locales.json

@@ -2763,7 +2763,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Создать пользовательскую конфигурацию",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -2788,7 +2788,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Изменить пользовательскую конфигурацию",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -2863,7 +2863,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Отредактировать существующую независимую конфигурацию для выбранной игры.",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -5013,7 +5013,7 @@
         "no_NO": "Lyd Inn/Ut",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Выход/Вход звука",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",
@@ -6563,7 +6563,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Ок",
+        "ru_RU": "",
         "sv_SE": "Ok",
         "th_TH": "ตกลง",
         "tr_TR": "Tamam",
@@ -7013,7 +7013,7 @@
         "no_NO": "",
         "pl_PL": "Pro Kontroler",
         "pt_BR": "",
-        "ru_RU": "Pro контроллер",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "โปรคอนโทรลเลอร์",
         "tr_TR": "Profesyonel Kumanda",
@@ -20013,7 +20013,7 @@
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Амибо",
+        "ru_RU": "",
         "sv_SE": "",
         "th_TH": "",
         "tr_TR": "",

src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml

@@ -17,8 +17,12 @@
         <viewModels:ProfileSelectorDialogViewModel />
     </Design.DataContext>
     
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        
         <Border
             CornerRadius="5"
             BorderBrush="{DynamicResource AppListHoverBackgroundColor}"

src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml.cs

@@ -9,14 +9,17 @@ using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Threading.Tasks;
 using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
 using UserProfileSft = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
 
 namespace Ryujinx.Ava.UI.Applet
 {
-    public partial class ProfileSelectorDialog : RyujinxControl<ProfileSelectorDialogViewModel>
+    public partial class ProfileSelectorDialog : UserControl
     {
+        public ProfileSelectorDialogViewModel ViewModel { get; set; }
+
         public ProfileSelectorDialog(ProfileSelectorDialogViewModel viewModel)
         {
             DataContext = ViewModel = viewModel;

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -26,7 +26,6 @@ namespace Ryujinx.Ava.UI.Controls
 {
     public class ApplicationContextMenu : MenuFlyout
     {
-        
         public ApplicationContextMenu()
         {
             InitializeComponent();

src/Ryujinx/UI/Controls/ApplicationDataView.axaml.cs

@@ -14,7 +14,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
+    public partial class ApplicationDataView : UserControl
     {
         public static async Task Show(ApplicationData appData)
         {
@@ -25,7 +25,7 @@ namespace Ryujinx.Ava.UI.Controls
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
                 MinWidth = 256,
-                Content = new ApplicationDataView { ViewModel = new ApplicationDataViewModel(appData) }
+                Content = new ApplicationDataView { DataContext = new ApplicationDataViewModel(appData) }
             };
 
             Style closeButton = new(x => x.Name("CloseButton"));

src/Ryujinx/UI/Controls/ApplicationGridView.axaml

@@ -14,7 +14,10 @@
     mc:Ignorable="d"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     x:DataType="viewModels:MainWindowViewModel">
-    <Grid RowDefinitions="*">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
         <ListBox
             Grid.Row="0"
             Padding="8"
@@ -54,7 +57,11 @@
                             Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
                             ClipToBounds="True"
                             CornerRadius="4">
-                            <Grid RowDefinitions="Auto,Auto">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
                                 <Image
                                     Grid.Row="0"
                                     HorizontalAlignment="Stretch"

src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs

@@ -2,13 +2,12 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 
 namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class ApplicationGridView : RyujinxControl<MainWindowViewModel>
+    public partial class ApplicationGridView : UserControl
     {
         public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
             RoutedEvent.Register<ApplicationGridView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -13,7 +13,10 @@
     mc:Ignorable="d"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     x:DataType="viewModels:MainWindowViewModel">
-    <Grid RowDefinitions="*">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
         <ListBox
             Name="GameListBox"
             Grid.Row="0"

src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs

@@ -11,7 +11,7 @@ using System.Linq;
 
 namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class ApplicationListView : RyujinxControl<MainWindowViewModel>
+    public partial class ApplicationListView : UserControl
     {
         public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
             RoutedEvent.Register<ApplicationListView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);
@@ -32,6 +32,9 @@ namespace Ryujinx.Ava.UI.Controls
         
         private async void PlayabilityStatus_OnClick(object sender, RoutedEventArgs e)
         {
+            if (DataContext is not MainWindowViewModel mwvm)
+                return;
+            
             if (sender is not Button { Content: TextBlock playabilityLabel })
                 return;
 
@@ -40,13 +43,16 @@ namespace Ryujinx.Ava.UI.Controls
 
         private async void IdString_OnClick(object sender, RoutedEventArgs e)
         {
+            if (DataContext is not MainWindowViewModel mwvm)
+                return;
+            
             if (sender is not Button { Content: TextBlock idText })
                 return;
 
             if (!RyujinxApp.IsClipboardAvailable(out IClipboard clipboard))
                 return;
             
-            ApplicationData appData = ViewModel.Applications.FirstOrDefault(it => it.IdString == idText.Text);
+            ApplicationData appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
             if (appData is null)
                 return;
             

src/Ryujinx/UI/Controls/DlcSelectView.axaml.cs

@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class DlcSelectView : RyujinxControl<DlcSelectViewModel>
+    public partial class DlcSelectView : UserControl
     {
         public DlcSelectView()
         {
@@ -28,7 +28,7 @@ namespace Ryujinx.Ava.UI.Controls
                 PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue],
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
-                Content = new DlcSelectView { ViewModel = viewModel }
+                Content = new DlcSelectView { DataContext = viewModel }
             };
 
             Style closeButton = new(x => x.Name("CloseButton"));

src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs

@@ -23,12 +23,13 @@ using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
 
 namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class NavigationDialogHost : RyujinxControl<UserProfileViewModel>
+    public partial class NavigationDialogHost : UserControl
     {
         public AccountManager AccountManager { get; }
         public ContentManager ContentManager { get; }
         public VirtualFileSystem VirtualFileSystem { get; }
         public HorizonClient HorizonClient { get; }
+        public UserProfileViewModel ViewModel { get; set; }
 
         public NavigationDialogHost()
         {

src/Ryujinx/UI/Controls/RyujinxControl.cs

@@ -1,18 +0,0 @@
-using Avalonia.Controls;
-using Gommon;
-using Ryujinx.Ava.UI.ViewModels;
-using System;
-
-namespace Ryujinx.Ava.UI.Controls
-{
-    public class RyujinxControl<TViewModel> : UserControl where TViewModel : BaseModel
-    {
-        public TViewModel ViewModel
-        {
-            get => (TViewModel)DataContext ?? throw new InvalidOperationException(
-                $"Underlying DataContext is not of type {typeof(TViewModel).AsPrettyString()}; " +
-                $"Actual type is {DataContext?.GetType().AsPrettyString()}");
-            set => DataContext = value;
-        }
-    }
-}

src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml

@@ -13,7 +13,15 @@
     <Grid
         Margin="20"
         HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch" ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
+        VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
         <Image
             Grid.Row="1"
             Height="70"

src/Ryujinx/UI/Models/Input/StickVisualizer.cs

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

src/Ryujinx/UI/Renderer/RendererHost.cs

@@ -2,7 +2,9 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Logging;
 using System;
 
 namespace Ryujinx.Ava.UI.Renderer
@@ -36,6 +38,32 @@ namespace Ryujinx.Ava.UI.Renderer
                 EmbeddedWindowOpenGL => GraphicsBackend.OpenGl,
                 _ => throw new NotImplementedException()
             };
+
+        public RendererHost(string titleId)
+        {
+            Focusable = true;
+            FlowDirection = FlowDirection.LeftToRight;
+
+            EmbeddedWindow =
+#pragma warning disable CS8524
+                ConfigurationState.Instance.Graphics.GraphicsBackend.Value switch
+#pragma warning restore CS8524
+                {
+                    GraphicsBackend.OpenGl => new EmbeddedWindowOpenGL(),
+                    GraphicsBackend.Vulkan => new EmbeddedWindowVulkan(),
+                };
+
+            string backendText = EmbeddedWindow switch
+            {
+                EmbeddedWindowVulkan => "Vulkan",
+                EmbeddedWindowOpenGL => "OpenGL",
+                _ => throw new NotImplementedException()
+            };
+                    
+            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend ({ConfigurationState.Instance.Graphics.GraphicsBackend.Value}): {backendText}");
+
+            Initialize();
+        }
         
         
         private void Initialize()

src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs

@@ -1,9 +1,5 @@
 using Avalonia.Svg.Skia;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava.Input;
-using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
 using Ryujinx.Common.Utilities;
@@ -14,30 +10,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 {
     public partial class ControllerInputViewModel : BaseModel
     {
-        private GamepadInputConfig _config;
+        [ObservableProperty] private GamepadInputConfig _config;
-        public GamepadInputConfig Config
-        {
-            get => _config;
-            set
-            {
-                _config = value;
 
-                OnPropertyChanged();
-            }
-        }
-
-        private StickVisualizer _visualizer;
-        public StickVisualizer Visualizer
-        {
-            get => _visualizer;
-            set
-            {
-                _visualizer = value;
-
-                OnPropertyChanged();
-            }
-        }
-        
         private bool _isLeft;
         public bool IsLeft
         {
@@ -63,15 +37,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         }
 
         public bool HasSides => IsLeft ^ IsRight;
-        
+
         [ObservableProperty] private SvgImage _image;
-        
+
         public InputViewModel ParentModel { get; }
-        
+
-        public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config, StickVisualizer visualizer)
+        public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
         {
             ParentModel = model;
-            Visualizer = visualizer;
             model.NotifyChangesEvent += OnParentModelChanged;
             OnParentModelChanged();
             config.PropertyChanged += (_, args) =>

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private int _controller;
         private string _controllerImage;
         private int _device;
-        private object _configViewModel;
+        [ObservableProperty] private object _configViewModel;
         [ObservableProperty] private string _profileName;
         private bool _isLoaded;
 
@@ -74,7 +74,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 OnPropertiesChanged(nameof(HasLed), nameof(CanClearLed));
             }
         }
-        public StickVisualizer VisualStick { get; private set; }
 
         public ObservableCollection<PlayerModel> PlayerIndexes { get; set; }
         public ObservableCollection<(DeviceType Type, string Id, string Name)> Devices { get; set; }
@@ -95,19 +94,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsModified { get; set; }
         public event Action NotifyChangesEvent;
 
-        public object ConfigViewModel
-        {
-            get => _configViewModel;
-            set
-            {
-                _configViewModel = value;
-
-                VisualStick.UpdateConfig(value);
-
-                OnPropertyChanged();
-            }
-        }
-
         public PlayerIndex PlayerIdChoose
         {
             get => _playerIdChoose;
@@ -283,7 +269,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             Devices = [];
             ProfilesList = [];
             DeviceList = [];
-            VisualStick = new StickVisualizer(this);
 
             ControllerImage = ProControllerResource;
 
@@ -304,12 +289,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
             if (Config is StandardKeyboardInputConfig keyboardInputConfig)
             {
-                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig), VisualStick);
+                ConfigViewModel = new KeyboardInputViewModel(this, new KeyboardInputConfig(keyboardInputConfig));
             }
 
             if (Config is StandardControllerInputConfig controllerInputConfig)
             {
-                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
+                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig));
             }
         }
 
@@ -908,8 +893,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
             _mainWindow.ViewModel.AppHost?.NpadManager.UnblockInputUpdates();
 
-            VisualStick.Dispose();
-
             SelectedGamepad?.Dispose();
 
             AvaloniaKeyboardDriver.Dispose();

src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs

@@ -6,29 +6,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 {
     public partial class KeyboardInputViewModel : BaseModel
     {
-        private KeyboardInputConfig _config;
+        [ObservableProperty] private KeyboardInputConfig _config;
-        public KeyboardInputConfig Config
-        {
-            get => _config;
-            set
-            {
-                _config = value;
-
-                OnPropertyChanged();
-            }
-        }
-
-        private StickVisualizer _visualizer;
-        public StickVisualizer Visualizer
-        {
-            get => _visualizer;
-            set
-            {
-                _visualizer = value;
-
-                OnPropertyChanged();
-            }
-        }
 
         private bool _isLeft;
         public bool IsLeft
@@ -60,10 +38,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public readonly InputViewModel ParentModel;
 
-        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config, StickVisualizer visualizer)
+        public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config)
         {
             ParentModel = model;
-            Visualizer = visualizer;
             model.NotifyChangesEvent += OnParentModelChanged;
             OnParentModelChanged();
             Config = config;

src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs

@@ -21,7 +21,7 @@ using Image = SkiaSharp.SKImage;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public partial class UserFirmwareAvatarSelectorViewModel : BaseModel
+    internal partial class UserFirmwareAvatarSelectorViewModel : BaseModel
     {
         private static readonly Dictionary<string, byte[]> _avatarStore = new();
 

src/Ryujinx/UI/ViewModels/UserProfileImageSelectorViewModel.cs

@@ -2,7 +2,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    public partial class UserProfileImageSelectorViewModel : BaseModel
+    internal partial class UserProfileImageSelectorViewModel : BaseModel
     {
         [ObservableProperty] private bool _firmwareFound;
     }

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml

@@ -34,7 +34,12 @@
         <!-- Button / JoyStick Settings -->
         <Grid
             Name="SettingButtons"
-            MinHeight="450" ColumnDefinitions="Auto,*,Auto">
+            MinHeight="450">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
             <!-- Left Controls -->
             <StackPanel
                 Orientation="Vertical"
@@ -49,7 +54,15 @@
                     CornerRadius="5">
                     <Grid
                         Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                         <StackPanel
                             Grid.Column="0"
                             Grid.Row="0"
@@ -303,99 +316,17 @@
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
                 <!-- Controller Picture -->
+                <Image
+                    Margin="0,10"
+                    MaxHeight="300"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Source="{Binding Image}" />
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
                     CornerRadius="5"
-                    Margin="0,0, 0, 5"
                     MinHeight="90">
-                    <StackPanel Orientation="Vertical">
-                        <Image
-                            Margin="5,10"
-                            MaxHeight="300"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            Source="{Binding Image}" />
-                        <StackPanel
-                            Margin="10"
-                            Orientation="Horizontal"
-                            Spacing="20"
-                            HorizontalAlignment="Center">
-                            <Border
-                                BorderBrush="Transparent"
-                                Height="{Binding Visualizer.UiStickBorderSize}"
-                                Width="{Binding Visualizer.UiStickBorderSize}"
-                                IsVisible="{Binding IsLeft}">
-                                <Canvas
-                                    Background="{DynamicResource ThemeBackgroundColor}"
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}">
-                                    <Grid
-                                        Height="{Binding Visualizer.UiCanvasSize}"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Background="{DynamicResource ThemeBackgroundColor}">
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Stroke="{DynamicResource ThemeControlBorderColor}"
-                                            StrokeThickness="1"
-                                            Width="{Binding Visualizer.UiCanvasSize}"
-                                            Height="{Binding Visualizer.UiCanvasSize}" />
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Fill="Black"
-                                            Opacity="100"
-                                            Height="{Binding Visualizer.UiDeadzoneLeft}"
-                                            Width="{Binding Visualizer.UiDeadzoneLeft}" />
-                                    </Grid>
-                                    <Ellipse
-                                        Fill="{DynamicResource Warning}"
-                                        Width="{Binding Visualizer.UiStickCircumference}"
-                                        Height="{Binding Visualizer.UiStickCircumference}"
-                                        Canvas.Bottom="{Binding Visualizer.UiStickLeftY}"
-                                        Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
-                                </Canvas>
-                            </Border>
-                            <Border
-                                BorderBrush="Transparent"
-                                Height="{Binding Visualizer.UiStickBorderSize}"
-                                Width="{Binding Visualizer.UiStickBorderSize}"
-                                IsVisible="{Binding IsRight}">
-                                <Canvas
-                                    Background="{DynamicResource ThemeBackgroundColor}"
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}">
-                                    <Grid
-                                        Height="{Binding Visualizer.UiCanvasSize}"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Background="{DynamicResource ThemeBackgroundColor}">
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Stroke="{DynamicResource ThemeControlBorderColor}"
-                                            StrokeThickness="1"
-                                            Width="{Binding Visualizer.UiCanvasSize}"
-                                            Height="{Binding Visualizer.UiCanvasSize}" />
-                                        <Ellipse
-                                            HorizontalAlignment="Center"
-                                            Fill="Black"
-                                            Opacity="100"
-                                            Height="{Binding Visualizer.UiDeadzoneRight}"
-                                            Width="{Binding Visualizer.UiDeadzoneRight}" />
-                                    </Grid>
-                                    <Ellipse
-                                        Fill="{DynamicResource Warning}"
-                                        Width="{Binding Visualizer.UiStickCircumference}"
-                                        Height="{Binding Visualizer.UiStickCircumference}"
-                                        Canvas.Bottom="{Binding Visualizer.UiStickRightY}"
-                                        Canvas.Left="{Binding Visualizer.UiStickRightX}" />
-                                </Canvas>
-                            </Border>
-                        </StackPanel>
-                    </StackPanel>
-                </Border>
-                <Border
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    CornerRadius="5">
                     <StackPanel
                         Margin="8"
                         Orientation="Vertical">
@@ -414,8 +345,8 @@
                                 Minimum="0"
                                 Value="{Binding Config.TriggerThreshold, Mode=TwoWay}" />
                             <TextBlock
-                                Width="25"
+                              Width="25"
-                                Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
+                              Text="{Binding Config.TriggerThreshold, StringFormat=\{0:0.00\}}" />
                         </StackPanel>
                         <StackPanel
                             Orientation="Vertical"
@@ -497,7 +428,7 @@
                 </Border>
                 <!-- Motion, Rumble, LED -->
                 <StackPanel
-                    Margin="0,5,0,0"
+                    Margin="0,10,0,0"
                     Spacing="5"
                     Orientation="Vertical"
                     VerticalAlignment="Bottom">
@@ -507,7 +438,11 @@
                         CornerRadius="5"
                         VerticalAlignment="Bottom"
                         HorizontalAlignment="Stretch">
-                        <Grid ColumnDefinitions="*,Auto">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
                             <CheckBox
                                 Margin="10"
                                 MinWidth="0"
@@ -529,7 +464,11 @@
                         CornerRadius="5"
                         HorizontalAlignment="Stretch"
                         Margin="0,-1,0,0">
-                        <Grid ColumnDefinitions="*,Auto">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
                             <CheckBox
                                 Margin="10"
                                 MinWidth="0"
@@ -551,7 +490,11 @@
                         CornerRadius="5"
                         HorizontalAlignment="Stretch"
                         Margin="0,-1,0,0">
-                        <Grid IsVisible="{Binding ParentModel.HasLed}" ColumnDefinitions="*,Auto">
+                        <Grid IsVisible="{Binding ParentModel.HasLed}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
                             <CheckBox
                                 Margin="10, 10, 5, 10"
                                 MinWidth="0"
@@ -583,7 +526,15 @@
                     CornerRadius="5">
                     <Grid
                         Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                         <StackPanel
                             Grid.Column="1"
                             Grid.Row="0"

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs

@@ -4,7 +4,6 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -15,7 +14,7 @@ using StickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
 
 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class ControllerInputView : RyujinxControl<ControllerInputViewModel>
+    public partial class ControllerInputView : UserControl
     {
         private ButtonKeyAssigner _currentAssigner;
 
@@ -218,12 +217,20 @@ namespace Ryujinx.Ava.UI.Views.Input
             PointerPressed -= MouseClick;
         }
 
-        private IButtonAssigner CreateButtonAssigner(bool forStick) =>
+        private IButtonAssigner CreateButtonAssigner(bool forStick)
-            new GamepadButtonAssigner(
+        {
-                ViewModel.ParentModel.SelectedGamepad,
+            IButtonAssigner assigner;
-                (ViewModel.ParentModel.Config as StandardControllerInputConfig).TriggerThreshold,
+
+            ControllerInputViewModel controllerInputViewModel = DataContext as ControllerInputViewModel;
+
+            assigner = new GamepadButtonAssigner(
+                controllerInputViewModel.ParentModel.SelectedGamepad,
+                (controllerInputViewModel.ParentModel.Config as StandardControllerInputConfig).TriggerThreshold,
                 forStick);
 
+            return assigner;
+        }
+
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTree(e);

src/Ryujinx/UI/Views/Input/InputView.axaml

@@ -35,13 +35,22 @@
             Margin="0 0 0 5"
             Orientation="Vertical"
             Spacing="5">
-            <Grid ColumnDefinitions="*,10,*">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
                 <!-- Player Selection -->
                 <Grid
                     Grid.Column="0"
                     Margin="2"
                     HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*">
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
                     <TextBlock
                         Margin="5,0,10,0"
                         Width="90"
@@ -68,7 +77,14 @@
                     Grid.Column="2"
                     Margin="2"
                     HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
                     <TextBlock
                         Margin="5,0,10,0"
                         Width="90"
@@ -123,12 +139,22 @@
                 </Grid>
             </Grid>
             <Separator />
-            <Grid ColumnDefinitions="*,10,*">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
                 <!-- Input Device -->
                 <Grid
                     Grid.Column="0"
                     Margin="2"
-                    HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*,Auto">
+                    HorizontalAlignment="Stretch">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
                     <TextBlock
                         Grid.Column="0"
                         Margin="5,0,10,0"
@@ -160,7 +186,11 @@
                     Grid.Column="2"
                     Margin="2"
                     HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center" ColumnDefinitions="Auto,*">
+                    VerticalAlignment="Center">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
                     <TextBlock
                         Margin="5,0,10,0"
                         Width="90"

src/Ryujinx/UI/Views/Input/InputView.axaml.cs

@@ -1,19 +1,19 @@
 using Avalonia.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels.Input;
 
 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class InputView : RyujinxControl<InputViewModel>
+    public partial class InputView : UserControl
     {
         private bool _dialogOpen;
+        private InputViewModel ViewModel { get; set; }
 
         public InputView()
         {
-            ViewModel = new InputViewModel(this);
+            DataContext = ViewModel = new InputViewModel(this);
 
             InitializeComponent();
         }

src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml

@@ -32,7 +32,12 @@
         <!-- Button / JoyStick Settings -->
         <Grid
             Name="SettingButtons"
-            MinHeight="450" ColumnDefinitions="Auto,*,Auto">
+            MinHeight="450">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
             <!-- Left Controls -->
             <StackPanel
                 Orientation="Vertical"
@@ -47,7 +52,15 @@
                     CornerRadius="5">
                     <Grid
                         Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                         <StackPanel
                             Grid.Column="0"
                             Grid.Row="0"
@@ -296,79 +309,12 @@
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch">
                 <!-- Controller Picture -->
-                <Border
+                <Image
-                    BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                    BorderThickness="1"
-                    CornerRadius="5"
                     Margin="0,10"
-                    MinHeight="90">
+                    MaxHeight="300"
-                    <StackPanel
+                    HorizontalAlignment="Stretch"
-                        Margin="10"
+                    VerticalAlignment="Stretch"
-                        Orientation="Horizontal"
+                    Source="{Binding Image}" />
-                        Spacing="20"
-                        HorizontalAlignment="Center">
-                        <Border
-                            BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                            BorderThickness="1"
-                            CornerRadius="5"
-                            Height="{Binding Visualizer.UiStickBorderSize}"
-                            Width="{Binding Visualizer.UiStickBorderSize}"
-                            IsVisible="{Binding IsLeft}">
-                            <Canvas
-                                Background="{DynamicResource ThemeBackgroundColor}"
-                                Height="{Binding Visualizer.UiCanvasSize}"
-                                Width="{Binding Visualizer.UiCanvasSize}">
-                                <Grid
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}"
-                                    Background="{DynamicResource ThemeBackgroundColor}">
-                                    <Ellipse
-                                        HorizontalAlignment="Center"
-                                        Stroke="Black"
-                                        StrokeThickness="1"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Height="{Binding Visualizer.UiCanvasSize}"/>
-                                </Grid>
-                                <Ellipse
-                                        Fill="Red" 
-                                        Width="{Binding Visualizer.UiStickCircumference}" 
-                                        Height="{Binding Visualizer.UiStickCircumference}" 
-                                        Canvas.Bottom="{Binding Visualizer.UiStickLeftY}" 
-                                        Canvas.Left="{Binding Visualizer.UiStickLeftX}" />
-                            </Canvas>
-                        </Border>        
-                        <Border
-                            BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                            BorderThickness="1"
-                            CornerRadius="5"
-                            Height="{Binding Visualizer.UiStickBorderSize}"
-                            Width="{Binding Visualizer.UiStickBorderSize}"
-                            IsVisible="{Binding IsRight}">
-                            <Canvas
-                                Background="{DynamicResource ThemeBackgroundColor}"
-                                Height="{Binding Visualizer.UiCanvasSize}"
-                                Width="{Binding Visualizer.UiCanvasSize}">
-                                <Grid
-                                    Height="{Binding Visualizer.UiCanvasSize}"
-                                    Width="{Binding Visualizer.UiCanvasSize}"
-                                    Background="{DynamicResource ThemeBackgroundColor}">
-                                    <Ellipse
-                                        HorizontalAlignment="Center"
-                                        Stroke="Black"
-                                        StrokeThickness="1"
-                                        Width="{Binding Visualizer.UiCanvasSize}"
-                                        Height="{Binding Visualizer.UiCanvasSize}"/>
-                                </Grid>
-                                <Ellipse
-                                        Fill="Red" 
-                                        Width="{Binding Visualizer.UiStickCircumference}" 
-                                        Height="{Binding Visualizer.UiStickCircumference}" 
-                                        Canvas.Bottom="{Binding Visualizer.UiStickRightY}" 
-                                        Canvas.Left="{Binding Visualizer.UiStickRightX}" />
-                            </Canvas>
-                        </Border>        
-                    </StackPanel>
-                </Border>
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
@@ -467,7 +413,15 @@
                     CornerRadius="5">
                     <Grid
                         Margin="10"
-                        HorizontalAlignment="Stretch" ColumnDefinitions="*,*" RowDefinitions="*,*">
+                        HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
                         <StackPanel
                             Grid.Column="1"
                             Grid.Row="0"

src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs

@@ -4,7 +4,6 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Input;
@@ -14,7 +13,7 @@ using Key = Ryujinx.Common.Configuration.Hid.Key;
 
 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class KeyboardInputView : RyujinxControl<KeyboardInputViewModel>
+    public partial class KeyboardInputView : UserControl
     {
         private ButtonKeyAssigner _currentAssigner;
 
@@ -61,103 +60,106 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                     PointerPressed += MouseClick;
 
-                    IKeyboard keyboard =
+                    if (DataContext is not KeyboardInputViewModel viewModel)
-                        (IKeyboard)ViewModel.ParentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
+                        return;
-                    IButtonAssigner assigner = 
-                        new KeyboardKeyAssigner((IKeyboard)ViewModel.ParentModel.SelectedGamepad);
 
-                    _currentAssigner.ButtonAssigned += (_, be) =>
+                    IKeyboard keyboard =
+                        (IKeyboard)viewModel.ParentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
+                    IButtonAssigner assigner = 
+                        new KeyboardKeyAssigner((IKeyboard)viewModel.ParentModel.SelectedGamepad);
+
+                    _currentAssigner.ButtonAssigned += (_, e) =>
                     {
-                        if (be.ButtonValue.HasValue)
+                        if (e.ButtonValue.HasValue)
                         {
-                            Button buttonValue = be.ButtonValue.Value;
+                            Button buttonValue = e.ButtonValue.Value;
-                            ViewModel.ParentModel.IsModified = true;
+                            viewModel.ParentModel.IsModified = true;
 
                             switch (button.Name)
                             {
                                 case "ButtonZl":
-                                    ViewModel.Config.ButtonZl = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonZl = buttonValue.AsHidType<Key>();
                                     break;
                                 case "ButtonL":
-                                    ViewModel.Config.ButtonL = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonL = buttonValue.AsHidType<Key>();
                                     break;
                                 case "ButtonMinus":
-                                    ViewModel.Config.ButtonMinus = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonMinus = buttonValue.AsHidType<Key>();
                                     break;
                                 case "LeftStickButton":
-                                    ViewModel.Config.LeftStickButton = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftStickButton = buttonValue.AsHidType<Key>();
                                     break;
                                 case "LeftStickUp":
-                                    ViewModel.Config.LeftStickUp = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftStickUp = buttonValue.AsHidType<Key>();
                                     break;
                                 case "LeftStickDown":
-                                    ViewModel.Config.LeftStickDown = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftStickDown = buttonValue.AsHidType<Key>();
                                     break;
                                 case "LeftStickRight":
-                                    ViewModel.Config.LeftStickRight = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftStickRight = buttonValue.AsHidType<Key>();
                                     break;
                                 case "LeftStickLeft":
-                                    ViewModel.Config.LeftStickLeft = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftStickLeft = buttonValue.AsHidType<Key>();
                                     break;
                                 case "DpadUp":
-                                    ViewModel.Config.DpadUp = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.DpadUp = buttonValue.AsHidType<Key>();
                                     break;
                                 case "DpadDown":
-                                    ViewModel.Config.DpadDown = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.DpadDown = buttonValue.AsHidType<Key>();
                                     break;
                                 case "DpadLeft":
-                                    ViewModel.Config.DpadLeft = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.DpadLeft = buttonValue.AsHidType<Key>();
                                     break;
                                 case "DpadRight":
-                                    ViewModel.Config.DpadRight = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.DpadRight = buttonValue.AsHidType<Key>();
                                     break;
                                 case "LeftButtonSr":
-                                    ViewModel.Config.LeftButtonSr = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftButtonSr = buttonValue.AsHidType<Key>();
                                     break;
                                 case "LeftButtonSl":
-                                    ViewModel.Config.LeftButtonSl = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.LeftButtonSl = buttonValue.AsHidType<Key>();
                                     break;
                                 case "RightButtonSr":
-                                    ViewModel.Config.RightButtonSr = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightButtonSr = buttonValue.AsHidType<Key>();
                                     break;
                                 case "RightButtonSl":
-                                    ViewModel.Config.RightButtonSl = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightButtonSl = buttonValue.AsHidType<Key>();
                                     break;
                                 case "ButtonZr":
-                                    ViewModel.Config.ButtonZr = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonZr = buttonValue.AsHidType<Key>();
                                     break;
                                 case "ButtonR":
-                                    ViewModel.Config.ButtonR = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonR = buttonValue.AsHidType<Key>();
                                     break;
                                 case "ButtonPlus":
-                                    ViewModel.Config.ButtonPlus = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonPlus = buttonValue.AsHidType<Key>();
                                     break;
                                 case "ButtonA":
-                                    ViewModel.Config.ButtonA = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonA = buttonValue.AsHidType<Key>();
                                     break;
                                 case "ButtonB":
-                                    ViewModel.Config.ButtonB = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonB = buttonValue.AsHidType<Key>();
                                     break;
                                 case "ButtonX":
-                                    ViewModel.Config.ButtonX = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonX = buttonValue.AsHidType<Key>();
                                     break;
                                 case "ButtonY":
-                                    ViewModel.Config.ButtonY = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.ButtonY = buttonValue.AsHidType<Key>();
                                     break;
                                 case "RightStickButton":
-                                    ViewModel.Config.RightStickButton = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightStickButton = buttonValue.AsHidType<Key>();
                                     break;
                                 case "RightStickUp":
-                                    ViewModel.Config.RightStickUp = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightStickUp = buttonValue.AsHidType<Key>();
                                     break;
                                 case "RightStickDown":
-                                    ViewModel.Config.RightStickDown = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightStickDown = buttonValue.AsHidType<Key>();
                                     break;
                                 case "RightStickRight":
-                                    ViewModel.Config.RightStickRight = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightStickRight = buttonValue.AsHidType<Key>();
                                     break;
                                 case "RightStickLeft":
-                                    ViewModel.Config.RightStickLeft = buttonValue.AsHidType<Key>();
+                                    viewModel.Config.RightStickLeft = buttonValue.AsHidType<Key>();
                                     break;
                             }
                         }

src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs

@@ -2,18 +2,19 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using System.Threading.Tasks;
 
 namespace Ryujinx.UI.Views.Input
 {
-    public partial class LedInputView : RyujinxControl<LedInputViewModel>
+    public partial class LedInputView : UserControl
     {
+        private readonly LedInputViewModel _viewModel;
+        
         public LedInputView(ControllerInputViewModel viewModel)
         {
-            ViewModel = new LedInputViewModel
+            DataContext = _viewModel = new LedInputViewModel
             {
                 ParentModel = viewModel.ParentModel,
                 TurnOffLed = viewModel.Config.TurnOffLed,
@@ -28,18 +29,20 @@ namespace Ryujinx.UI.Views.Input
         private void ColorPickerButton_OnColorChanged(ColorPickerButton sender, ColorButtonColorChangedEventArgs args)
         {
             if (!args.NewColor.HasValue) return;
-            if (!ViewModel.EnableLedChanging) return;
+            if (DataContext is not LedInputViewModel lvm) return;
-            if (ViewModel.TurnOffLed) return;
+            if (!lvm.EnableLedChanging) return;
+            if (lvm.TurnOffLed) return;
             
-            ViewModel.ParentModel.SelectedGamepad.SetLed(args.NewColor.Value.ToUInt32());
+            lvm.ParentModel.SelectedGamepad.SetLed(args.NewColor.Value.ToUInt32());
         }
 
         private void ColorPickerButton_OnAttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
         {
-            if (!ViewModel.EnableLedChanging) return;
+            if (DataContext is not LedInputViewModel lvm) return;
-            if (ViewModel.TurnOffLed) return;
+            if (!lvm.EnableLedChanging) return;
+            if (lvm.TurnOffLed) return;
             
-            ViewModel.ParentModel.SelectedGamepad.SetLed(ViewModel.LedColor.ToUInt32());
+            lvm.ParentModel.SelectedGamepad.SetLed(lvm.LedColor.ToUInt32());
         }
         
         public static async Task Show(ControllerInputViewModel viewModel)
@@ -54,13 +57,13 @@ namespace Ryujinx.UI.Views.Input
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsClose],
                 Content = content,
             };
-            contentDialog.PrimaryButtonClick += (_, _) =>
+            contentDialog.PrimaryButtonClick += (sender, args) =>
             {
                 GamepadInputConfig config = viewModel.Config;
-                config.EnableLedChanging = content.ViewModel.EnableLedChanging;
+                config.EnableLedChanging = content._viewModel.EnableLedChanging;
-                config.LedColor = content.ViewModel.LedColor;
+                config.LedColor = content._viewModel.LedColor;
-                config.UseRainbowLed = content.ViewModel.UseRainbowLed;
+                config.UseRainbowLed = content._viewModel.UseRainbowLed;
-                config.TurnOffLed = content.ViewModel.TurnOffLed;
+                config.TurnOffLed = content._viewModel.TurnOffLed;
             };
 
             await contentDialog.ShowAsync();

src/Ryujinx/UI/Views/Input/MotionInputView.axaml

@@ -11,7 +11,11 @@
     x:Class="Ryujinx.Ava.UI.Views.Input.MotionInputView"
     x:DataType="viewModels:MotionInputViewModel"
     Focusable="True">
-    <Grid Margin="10" RowDefinitions="Auto,*">
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
         <StackPanel Orientation="Vertical">
             <StackPanel
                 Orientation="Horizontal"
@@ -76,7 +80,11 @@
             BorderThickness="1"
             CornerRadius="5"
             HorizontalAlignment="Stretch">
-            <Grid VerticalAlignment="Top" RowDefinitions="Auto,*">
+            <Grid VerticalAlignment="Top">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
                 <StackPanel
                     Grid.Row="1"
                     HorizontalAlignment="Center"
@@ -110,7 +118,15 @@
                             Text="{Binding DsuServerPort, Mode=TwoWay}" />
                     </StackPanel>
                     <StackPanel Orientation="Vertical">
-                        <Grid RowDefinitions="*,*" ColumnDefinitions="*,*">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
                             <TextBlock
                                 Margin="0,10,0,0"
                                 VerticalAlignment="Center"

src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs

@@ -1,15 +1,16 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class MotionInputView : RyujinxControl<MotionInputViewModel>
+    public partial class MotionInputView : UserControl
     {
+        private readonly MotionInputViewModel _viewModel;
+
         public MotionInputView()
         {
             InitializeComponent();
@@ -19,7 +20,7 @@ namespace Ryujinx.Ava.UI.Views.Input
         {
             GamepadInputConfig config = viewModel.Config;
 
-            ViewModel = new MotionInputViewModel
+            _viewModel = new MotionInputViewModel
             {
                 Slot = config.Slot,
                 AltSlot = config.AltSlot,
@@ -32,6 +33,7 @@ namespace Ryujinx.Ava.UI.Views.Input
             };
 
             InitializeComponent();
+            DataContext = _viewModel;
         }
 
         public static async Task Show(ControllerInputViewModel viewModel)
@@ -46,17 +48,17 @@ namespace Ryujinx.Ava.UI.Views.Input
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsClose],
                 Content = content,
             };
-            contentDialog.PrimaryButtonClick += (_, _) =>
+            contentDialog.PrimaryButtonClick += (sender, args) =>
             {
                 GamepadInputConfig config = viewModel.Config;
-                config.Slot = content.ViewModel.Slot;
+                config.Slot = content._viewModel.Slot;
-                config.Sensitivity = content.ViewModel.Sensitivity;
+                config.Sensitivity = content._viewModel.Sensitivity;
-                config.GyroDeadzone = content.ViewModel.GyroDeadzone;
+                config.GyroDeadzone = content._viewModel.GyroDeadzone;
-                config.AltSlot = content.ViewModel.AltSlot;
+                config.AltSlot = content._viewModel.AltSlot;
-                config.DsuServerHost = content.ViewModel.DsuServerHost;
+                config.DsuServerHost = content._viewModel.DsuServerHost;
-                config.DsuServerPort = content.ViewModel.DsuServerPort;
+                config.DsuServerPort = content._viewModel.DsuServerPort;
-                config.EnableCemuHookMotion = content.ViewModel.EnableCemuHookMotion;
+                config.EnableCemuHookMotion = content._viewModel.EnableCemuHookMotion;
-                config.MirrorInput = content.ViewModel.MirrorInput;
+                config.MirrorInput = content._viewModel.MirrorInput;
             };
 
             await contentDialog.ShowAsync();

src/Ryujinx/UI/Views/Input/RumbleInputView.axaml

@@ -10,7 +10,11 @@
     x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView"
     x:DataType="viewModels:RumbleInputViewModel"
     Focusable="True">
-    <Grid Margin="10" RowDefinitions="Auto,*">
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
         <StackPanel Orientation="Vertical">
             <StackPanel Orientation="Horizontal">
                 <TextBlock

src/Ryujinx/UI/Views/Input/RumbleInputView.axaml.cs

@@ -1,15 +1,16 @@
 using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class RumbleInputView : RyujinxControl<RumbleInputViewModel>
+    public partial class RumbleInputView : UserControl
     {
+        private readonly RumbleInputViewModel _viewModel;
+
         public RumbleInputView()
         {
             InitializeComponent();
@@ -19,13 +20,15 @@ namespace Ryujinx.Ava.UI.Views.Input
         {
             GamepadInputConfig config = viewModel.Config;
 
-            ViewModel = new RumbleInputViewModel
+            _viewModel = new RumbleInputViewModel
             {
                 StrongRumble = config.StrongRumble,
                 WeakRumble = config.WeakRumble,
             };
 
             InitializeComponent();
+
+            DataContext = _viewModel;
         }
 
         public static async Task Show(ControllerInputViewModel viewModel)
@@ -41,11 +44,11 @@ namespace Ryujinx.Ava.UI.Views.Input
                 Content = content,
             };
 
-            contentDialog.PrimaryButtonClick += (_, _) =>
+            contentDialog.PrimaryButtonClick += (sender, args) =>
             {
                 GamepadInputConfig config = viewModel.Config;
-                config.StrongRumble = content.ViewModel.StrongRumble;
+                config.StrongRumble = content._viewModel.StrongRumble;
-                config.WeakRumble = content.ViewModel.WeakRumble;
+                config.WeakRumble = content._viewModel.WeakRumble;
             };
 
             await contentDialog.ShowAsync();

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -6,7 +6,6 @@ using Gommon;
 using LibHac.Common;
 using LibHac.Ns;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
@@ -26,9 +25,10 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Main
 {
-    public partial class MainMenuBarView : RyujinxControl<MainWindowViewModel>
+    public partial class MainMenuBarView : UserControl
     {
         public MainWindow Window { get; private set; }
+        public MainWindowViewModel ViewModel { get; private set; }
 
         public MainMenuBarView()
         {

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs

@@ -4,8 +4,6 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
@@ -15,7 +13,7 @@ using System;
 
 namespace Ryujinx.Ava.UI.Views.Main
 {
-    public partial class MainStatusBarView : RyujinxControl<MainWindowViewModel>
+    public partial class MainStatusBarView : UserControl
     {
         public MainWindow Window;
 
@@ -31,7 +29,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             if (VisualRoot is MainWindow window)
             {
                 Window = window;
-                ViewModel = window.ViewModel;
+                DataContext = window.ViewModel;
                 LocaleManager.Instance.LocaleChanged += () => Dispatcher.UIThread.Post(() =>
                 {
                     if (Window.ViewModel.EnableNonGameRunningControls)

src/Ryujinx/UI/Views/Main/MainViewControls.axaml.cs

@@ -3,15 +3,16 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Ryujinx.Ava.Common;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using System;
 
 namespace Ryujinx.Ava.UI.Views.Main
 {
-    public partial class MainViewControls : RyujinxControl<MainWindowViewModel>
+    public partial class MainViewControls : UserControl
     {
+        public MainWindowViewModel ViewModel;
+
         public MainViewControls()
         {
             InitializeComponent();
@@ -23,7 +24,7 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             if (VisualRoot is MainWindow window)
             {
-                ViewModel = window.ViewModel;
+                DataContext = ViewModel = window.ViewModel;
             }
         }
 

src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml

@@ -21,7 +21,12 @@
         <Border Classes="settings">
             <Panel
                 Margin="10">
-                <Grid RowDefinitions="Auto,*,Auto">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
                     <views:InputView
                         Grid.Row="0"
                         Name="InputView" />

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml

@@ -177,7 +177,12 @@
                             </Style>
                         </ListBox.Styles>
                     </ListBox>
-                    <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
+                    <Grid HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
                         <TextBox
                             Name="GameDirPathBox"
                             Margin="0"
@@ -230,7 +235,12 @@
                             </Style>
                         </ListBox.Styles>
                     </ListBox>
-                    <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
+                    <Grid HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
                         <TextBox
                             Name="AutoloadDirPathBox"
                             Margin="0"

src/Ryujinx/UI/Views/User/UserEditorView.axaml

@@ -14,7 +14,15 @@
     mc:Ignorable="d"
     Focusable="True"
     x:DataType="models:TempProfile">
-    <Grid Margin="0" ColumnDefinitions="Auto,*" RowDefinitions="*,Auto">
+    <Grid Margin="0">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
         <StackPanel
             Grid.Row="0"
             Grid.Column="0"

src/Ryujinx/UI/Views/User/UserEditorView.axaml.cs

@@ -13,12 +13,13 @@ using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
 
 namespace Ryujinx.Ava.UI.Views.User
 {
-    public partial class UserEditorView : RyujinxControl<TempProfile>
+    public partial class UserEditorView : UserControl
     {
         private NavigationDialogHost _parent;
         private UserProfile _profile;
         private bool _isNewUser;
-        
+
+        public TempProfile TempProfile { get; set; }
         public static uint MaxProfileNameLength => 0x20;
         public bool IsDeletable => _profile.UserId != AccountManager.DefaultUserId;
 
@@ -41,7 +42,7 @@ namespace Ryujinx.Ava.UI.Views.User
                         (NavigationDialogHost parent, UserProfile profile, bool isNewUser) = ((NavigationDialogHost parent, UserProfile profile, bool isNewUser))arg.Parameter;
                         _isNewUser = isNewUser;
                         _profile = profile;
-                        ViewModel = new TempProfile(_profile);
+                        TempProfile = new TempProfile(_profile);
 
                         _parent = parent;
                         break;
@@ -50,6 +51,8 @@ namespace Ryujinx.Ava.UI.Views.User
                 ((ContentDialog)_parent.Parent).Title = $"{LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle]} - " +
                                                         $"{(_isNewUser ? LocaleManager.Instance[LocaleKeys.UserEditorTitleCreate] : LocaleManager.Instance[LocaleKeys.UserEditorTitle])}";
 
+                DataContext = TempProfile;
+
                 AddPictureButton.IsVisible = _isNewUser;
                 ChangePictureButton.IsVisible = !_isNewUser;
                 IdLabel.IsVisible = _profile != null;
@@ -69,7 +72,7 @@ namespace Ryujinx.Ava.UI.Views.User
         {
             if (_isNewUser)
             {
-                if (ViewModel.Name != string.Empty || ViewModel.Image != null)
+                if (TempProfile.Name != String.Empty || TempProfile.Image != null)
                 {
                     if (await ContentDialogHelper.CreateChoiceDialog(
                             LocaleManager.Instance[LocaleKeys.DialogUserProfileUnsavedChangesTitle],
@@ -86,7 +89,7 @@ namespace Ryujinx.Ava.UI.Views.User
             }
             else
             {
-                if (_profile.Name != ViewModel.Name || _profile.Image != ViewModel.Image)
+                if (_profile.Name != TempProfile.Name || _profile.Image != TempProfile.Image)
                 {
                     if (await ContentDialogHelper.CreateChoiceDialog(
                             LocaleManager.Instance[LocaleKeys.DialogUserProfileUnsavedChangesTitle],
@@ -112,31 +115,31 @@ namespace Ryujinx.Ava.UI.Views.User
         {
             DataValidationErrors.ClearErrors(NameBox);
 
-            if (string.IsNullOrWhiteSpace(ViewModel.Name))
+            if (string.IsNullOrWhiteSpace(TempProfile.Name))
             {
                 DataValidationErrors.SetError(NameBox, new DataValidationException(LocaleManager.Instance[LocaleKeys.UserProfileEmptyNameError]));
 
                 return;
             }
 
-            if (ViewModel.Image == null)
+            if (TempProfile.Image == null)
             {
-                _parent.Navigate(typeof(UserProfileImageSelectorView), (_parent, ViewModel));
+                _parent.Navigate(typeof(UserProfileImageSelectorView), (_parent, TempProfile));
 
                 return;
             }
 
             if (_profile != null && !_isNewUser)
             {
-                _profile.Name = ViewModel.Name;
+                _profile.Name = TempProfile.Name;
-                _profile.Image = ViewModel.Image;
+                _profile.Image = TempProfile.Image;
                 _profile.UpdateState();
                 _parent.AccountManager.SetUserName(_profile.UserId, _profile.Name);
                 _parent.AccountManager.SetUserImage(_profile.UserId, _profile.Image);
             }
             else if (_isNewUser)
             {
-                _parent.AccountManager.AddUser(ViewModel.Name, ViewModel.Image, ViewModel.UserId);
+                _parent.AccountManager.AddUser(TempProfile.Name, TempProfile.Image, TempProfile.UserId);
             }
             else
             {
@@ -148,7 +151,7 @@ namespace Ryujinx.Ava.UI.Views.User
 
         public void SelectProfileImage()
         {
-            _parent.Navigate(typeof(UserProfileImageSelectorView), (_parent, ViewModel));
+            _parent.Navigate(typeof(UserProfileImageSelectorView), (_parent, TempProfile));
         }
 
         private void ChangePictureButton_Click(object sender, RoutedEventArgs e)

src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml

@@ -20,7 +20,13 @@
     <Grid
         Margin="0"
         HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch" RowDefinitions="Auto,*,Auto,Auto">
+        VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
         <ListBox
             Grid.Row="1"
             BorderThickness="0"

src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml.cs

@@ -1,3 +1,4 @@
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Navigation;
@@ -10,7 +11,7 @@ using System.IO;
 
 namespace Ryujinx.Ava.UI.Views.User
 {
-    public partial class UserFirmwareAvatarSelectorView : RyujinxControl<UserFirmwareAvatarSelectorViewModel>
+    public partial class UserFirmwareAvatarSelectorView : UserControl
     {
         private NavigationDialogHost _parent;
         private TempProfile _profile;
@@ -19,6 +20,8 @@ namespace Ryujinx.Ava.UI.Views.User
         {
             ContentManager = contentManager;
 
+            DataContext = ViewModel;
+
             InitializeComponent();
         }
 
@@ -52,6 +55,8 @@ namespace Ryujinx.Ava.UI.Views.User
 
         public ContentManager ContentManager { get; private set; }
 
+        internal UserFirmwareAvatarSelectorViewModel ViewModel { get; set; }
+
         private void GoBack(object sender, RoutedEventArgs e)
         {
             _parent.GoBack();

src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml

@@ -17,7 +17,12 @@
     </Design.DataContext>
     <Grid
         HorizontalAlignment="Stretch"
-        VerticalAlignment="Center" RowDefinitions="Auto,70,Auto">
+        VerticalAlignment="Center">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="70" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
         <TextBlock
             Grid.Row="0"
             TextWrapping="Wrap"

src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml.cs

@@ -15,12 +15,14 @@ using System.IO;
 
 namespace Ryujinx.Ava.UI.Views.User
 {
-    public partial class UserProfileImageSelectorView : RyujinxControl<UserProfileImageSelectorViewModel>
+    public partial class UserProfileImageSelectorView : UserControl
     {
         private ContentManager _contentManager;
         private NavigationDialogHost _parent;
         private TempProfile _profile;
 
+        internal UserProfileImageSelectorViewModel ViewModel { get; private set; }
+
         public UserProfileImageSelectorView()
         {
             InitializeComponent();

src/Ryujinx/UI/Views/User/UserRecovererView.axaml

@@ -18,7 +18,11 @@
         <viewModels:UserProfileViewModel />
     </Design.DataContext>
     <Grid HorizontalAlignment="Stretch"
-          VerticalAlignment="Stretch" RowDefinitions="*,Auto">
+          VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
         <Border
             CornerRadius="5"
             BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
@@ -37,7 +41,11 @@
                                 VerticalAlignment="Stretch"
                                 ClipToBounds="True"
                                 CornerRadius="5">
-                                <Grid Margin="0" ColumnDefinitions="*,Auto">
+                                <Grid Margin="0">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
                                         Text="{Binding UserId}"

src/Ryujinx/UI/Views/User/UserRecovererView.axaml.cs

@@ -4,11 +4,10 @@ using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Navigation;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.ViewModels;
 
 namespace Ryujinx.Ava.UI.Views.User
 {
-    public partial class UserRecovererView : RyujinxControl<UserProfileViewModel>
+    public partial class UserRecovererView : UserControl
     {
         private NavigationDialogHost _parent;
 

src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml

@@ -19,10 +19,19 @@
     <Design.DataContext>
         <viewModels:UserSaveManagerViewModel />
     </Design.DataContext>
-    <Grid RowDefinitions="Auto,*,Auto">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
         <Grid
             Grid.Row="0"
-            HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*">
+            HorizontalAlignment="Stretch">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
             <StackPanel
                 Spacing="10"
                 Orientation="Horizontal"
@@ -71,7 +80,11 @@
             <Grid
                 Grid.Column="1"
                 HorizontalAlignment="Stretch"
-                Margin="10,0, 0, 0" ColumnDefinitions="Auto,*">
+                Margin="10,0, 0, 0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
                 <Label Content="{ext:Locale Search}" VerticalAlignment="Center" />
                 <TextBox
                     Margin="5,0,0,0"
@@ -105,7 +118,11 @@
                 </ListBox.Styles>
                 <ListBox.ItemTemplate>
                     <DataTemplate x:DataType="models:SaveModel">
-                        <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto">
+                        <Grid HorizontalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
                             <StackPanel
                                 Grid.Column="0"
                                 Orientation="Horizontal"

src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml.cs

@@ -23,8 +23,10 @@ using UserId = LibHac.Fs.UserId;
 
 namespace Ryujinx.Ava.UI.Views.User
 {
-    public partial class UserSaveManagerView : RyujinxControl<UserSaveManagerViewModel>
+    public partial class UserSaveManagerView : UserControl
     {
+        internal UserSaveManagerViewModel ViewModel { get; private set; }
+
         private AccountManager _accountManager;
         private HorizonClient _horizonClient;
         private VirtualFileSystem _virtualFileSystem;
@@ -64,7 +66,7 @@ namespace Ryujinx.Ava.UI.Views.User
 
         public void LoadSaves()
         {
-            Dispatcher.UIThread.Post(() => ViewModel.Saves.Clear());
+            ViewModel.Saves.Clear();
             ObservableCollection<SaveModel> saves = [];
             SaveDataFilter saveDataFilter = SaveDataFilter.Make(
                 programId: default,

src/Ryujinx/UI/Views/User/UserSelectorView.axaml

@@ -18,7 +18,11 @@
     <Design.DataContext>
         <viewModels:UserProfileViewModel />
     </Design.DataContext>
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="*,Auto">
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
         <Border
             CornerRadius="5"
             BorderBrush="{DynamicResource AppListHoverBackgroundColor}"

src/Ryujinx/UI/Views/User/UserSelectorView.axaml.cs

@@ -11,10 +11,12 @@ using Button = Avalonia.Controls.Button;
 
 namespace Ryujinx.Ava.UI.Views.User
 {
-    public partial class UserSelectorViews : RyujinxControl<UserProfileViewModel>
+    public partial class UserSelectorViews : UserControl
     {
         private NavigationDialogHost _parent;
 
+        public UserProfileViewModel ViewModel { get; set; }
+
         public UserSelectorViews()
         {
             InitializeComponent();

src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml

@@ -53,12 +53,18 @@
 
             <!-- For image -->
             <ui:NavigationView.PaneHeader>
-                <Grid HorizontalAlignment="Center" VerticalAlignment="Center" RowDefinitions="Auto,Auto,Auto,5">
+                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="5"/>
+                    </Grid.RowDefinitions>
                     <TextBlock Text="{Binding GameId}"
-                               HorizontalAlignment="Center"
+                        HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
+                        VerticalAlignment="Center"
-                               Margin="0,0,0,10"
+                        Margin="0,0,0,10"
-                               TextAlignment="Center" Grid.Row="0" />
+                        TextAlignment="Center" Grid.Row="0" />
                     <Image Source="{Binding GameIcon}" 
                         Width="160" 
                         Height="160" 

src/Ryujinx/UI/Windows/ModManagerWindow.axaml

@@ -70,7 +70,11 @@
                     <DataTemplate
                         DataType="models:ModModel">
                         <Panel Margin="10">
-                            <Grid ColumnDefinitions="*,Auto">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
                                 <TextBlock
                                     HorizontalAlignment="Left"
                                     VerticalAlignment="Center"

src/Ryujinx/UI/Windows/SettingsWindow.axaml

@@ -12,7 +12,7 @@
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     Width="1100"
-    Height="927"
+    Height="918"
     MinWidth="800"
     MinHeight="480"
     WindowStartupLocation="CenterOwner"

src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml

@@ -13,7 +13,14 @@
     x:DataType="viewModels:XCITrimmerViewModel"
     Focusable="True"
     mc:Ignorable="d">    
-    <Grid Margin="20 0 20 0" RowDefinitions="Auto,Auto,*,Auto,Auto">
+    <Grid Margin="20 0 20 0">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
         <Panel
             Margin="10 10 10 10"
             Grid.Row="0">
@@ -23,7 +30,12 @@
             Margin="0 0 10 10"
             IsVisible="{Binding !Processing}"
             Grid.Row="1">
-            <Grid ColumnDefinitions="Auto,*,Auto">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
                 <StackPanel 
                     Grid.Column="0"
                     Orientation="Horizontal">
@@ -133,7 +145,11 @@
                     <DataTemplate
                         DataType="models:XCITrimmerFileModel">
                         <Panel Margin="10">
-                            <Grid ColumnDefinitions="65*,35*">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="65*" />
+                                    <ColumnDefinition Width="35*" />
+                                </Grid.ColumnDefinitions>
                                 <TextBlock
                                     Grid.Column="0"
                                     Margin="10 0 10 0"
@@ -144,7 +160,11 @@
                                     TextTrimming="CharacterEllipsis"
                                     Text="{Binding Name}">
                                 </TextBlock>
-                                <Grid Grid.Column="1" ColumnDefinitions="45*,55*">
+                                <Grid Grid.Column="1">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="45*" />
+                                        <ColumnDefinition Width="55*" />
+                                    </Grid.ColumnDefinitions>
                                     <ProgressBar
                                         Height="10"
                                         Margin="10 0 10 0"
@@ -206,7 +226,15 @@
             BorderThickness="1"
             CornerRadius="5"
             Padding="2.5">
-            <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
                 <TextBlock
                     Grid.Column="0"
                     Grid.Row="0"
@@ -246,7 +274,11 @@
         <Panel
             Grid.Row="4"
             HorizontalAlignment="Stretch">
-            <Grid ColumnDefinitions="*,Auto">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
                 <StackPanel
                     Grid.Column="0"
                     Orientation="Horizontal"