misc: Move StatusBarSeparator into Controls namespace, rename to MiniVerticalSeparator

add bulk property change event method
give each markup extension its own property name

src/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Ryujinx.Common.Configuration.Hid
 {
     public class KeyboardHotkeys
@@ -15,6 +13,5 @@ namespace Ryujinx.Common.Configuration.Hid
         public Key VolumeDown { get; set; }
         public Key CustomVSyncIntervalIncrement { get; set; }
         public Key CustomVSyncIntervalDecrement { get; set; }
-        public List<Key> CycleControllers { get; set; }
     }
 }

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -1034,16 +1034,16 @@ namespace Ryujinx.HLE.FileSystem
                 switch (fileName)
                 {
                     case "prod.keys":
-                        verified = verifyKeys(lines, genericPattern);
+                        verified = VerifyKeys(lines, genericPattern);
                         break;
                     case "title.keys":
-                        verified = verifyKeys(lines, titlePattern);
+                        verified = VerifyKeys(lines, titlePattern);
                         break;
                     case "console.keys":
-                        verified = verifyKeys(lines, genericPattern);
+                        verified = VerifyKeys(lines, genericPattern);
                         break;
                     case "dev.keys":
-                        verified = verifyKeys(lines, genericPattern);
+                        verified = VerifyKeys(lines, genericPattern);
                         break;
                     default:
                         throw new FormatException($"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.");
@@ -1056,20 +1056,22 @@ namespace Ryujinx.HLE.FileSystem
             {
                 throw new FileNotFoundException($"Keys file not found at \"{filePath}\".");
             }
-        }
 
-        private bool verifyKeys(string[] lines, string regex)
-        {
-            foreach (string line in lines)
+            return;
+            
+            bool VerifyKeys(string[] lines, string regex)
             {
-                if (!Regex.IsMatch(line, regex))
+                foreach (string line in lines)
                 {
-                    return false;
+                    if (!Regex.IsMatch(line, regex))
+                    {
+                        return false;
+                    }
                 }
+                return true;
             }
-            return true;
         }
-
+        
         public bool AreKeysAlredyPresent(string pathToCheck)
         {
             string[] fileNames = { "prod.keys", "title.keys", "console.keys", "dev.keys" };

src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj

@@ -33,7 +33,7 @@
     <EmbeddedResource Include="Resources\Icon_XCI.png" />
     <EmbeddedResource Include="Resources\Logo_Amiibo.png" />
     <EmbeddedResource Include="Resources\Logo_Ryujinx.png" />
-    <EmbeddedResource Include="Resources\Logo_Thiccjinx.png" />
+    <EmbeddedResource Include="Resources\Logo_Ryujinx_AntiAlias.png" />
     <EmbeddedResource Include="Resources\Logo_Discord_Dark.png" />
     <EmbeddedResource Include="Resources\Logo_Discord_Light.png" />
     <EmbeddedResource Include="Resources\Logo_GitHub_Dark.png" />

src/Ryujinx/AppHost.cs

@@ -36,7 +36,6 @@ using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
-using Ryujinx.HLE.HOS.Services.Hid;
 using Ryujinx.HLE.HOS.SystemState;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
@@ -51,7 +50,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -1334,18 +1332,6 @@ namespace Ryujinx.Ava
 
                             _viewModel.Volume = Device.GetVolume();
                             break;
-                        case KeyboardHotkeyState.CycleControllersPlayer1:
-                        case KeyboardHotkeyState.CycleControllersPlayer2:
-                        case KeyboardHotkeyState.CycleControllersPlayer3:
-                        case KeyboardHotkeyState.CycleControllersPlayer4:
-                        case KeyboardHotkeyState.CycleControllersPlayer5:
-                        case KeyboardHotkeyState.CycleControllersPlayer6:
-                        case KeyboardHotkeyState.CycleControllersPlayer7:
-                        case KeyboardHotkeyState.CycleControllersPlayer8:
-                            var player = currentHotkeyState - KeyboardHotkeyState.CycleControllersPlayer1;
-                            var ivm = new UI.ViewModels.Input.InputViewModel();
-                            Dispatcher.UIThread.Invoke(() => ivm.CyclePlayerDevice(player));
-                            break;
                         case KeyboardHotkeyState.None:
                             (_keyboardInterface as AvaloniaKeyboard).Clear();
                             break;
@@ -1428,15 +1414,6 @@ namespace Ryujinx.Ava
                 state = KeyboardHotkeyState.CustomVSyncIntervalDecrement;
             }
 
-            foreach (var cycle in ConfigurationState.Instance.Hid.Hotkeys.Value.CycleControllers?.Select((value, index) => (value, index)) ?? [])
-            {
-                if (_keyboardInterface.IsPressed((Key)cycle.value))
-                {
-                    state = KeyboardHotkeyState.CycleControllersPlayer1 + cycle.index;
-                    break;
-                }
-            }
-
             return state;
         }
     }

src/Ryujinx/Assets/locales.json

@@ -4989,30 +4989,6 @@
         "zh_TW": "啟用警告日誌"
       }
     },
-    {
-      "ID": "SettingsTabHotkeysCycleControllers",
-      "Translations": {
-        "ar_SA": "",
-        "de_DE": "",
-        "el_GR": "",
-        "en_US": "Cycle Controllers",
-        "es_ES": "",
-        "fr_FR": "",
-        "he_IL": "",
-        "it_IT": "",
-        "ja_JP": "",
-        "ko_KR": "",
-        "no_NO": "",
-        "pl_PL": "",
-        "pt_BR": "",
-        "ru_RU": "",
-        "th_TH": "",
-        "tr_TR": "",
-        "uk_UA": "",
-        "zh_CN": "",
-        "zh_TW": ""
-      }
-    },
     {
       "ID": "SettingsTabLoggingEnableErrorLogs",
       "Translations": {

src/Ryujinx/Common/ApplicationHelper.cs

@@ -146,7 +146,7 @@ namespace Ryujinx.Ava.Common
             var cancellationToken = new CancellationTokenSource();
 
             UpdateWaitWindow waitingDialog = new(
-                App.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
+                RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
                 LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogNcaExtractionMessage, ncaSectionType, Path.GetFileName(titleFilePath)),
                 cancellationToken);
 
@@ -268,10 +268,9 @@ namespace Ryujinx.Ava.Common
                         {
                             Dispatcher.UIThread.Post(waitingDialog.Close);
 
-                            NotificationHelper.Show(
-                                App.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
-                                $"{titleName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}",
-                                NotificationType.Information);
+                            NotificationHelper.ShowInformation(
+                                RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
+                                $"{titleName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}");
                         }
                     }
 

src/Ryujinx/Common/KeyboardHotkeyState.cs

@@ -14,13 +14,5 @@ namespace Ryujinx.Ava.Common
         VolumeDown,
         CustomVSyncIntervalIncrement,
         CustomVSyncIntervalDecrement,
-        CycleControllersPlayer1,
-        CycleControllersPlayer2,
-        CycleControllersPlayer3,
-        CycleControllersPlayer4,
-        CycleControllersPlayer5,
-        CycleControllersPlayer6,
-        CycleControllersPlayer7,
-        CycleControllersPlayer8
     }
 }

src/Ryujinx/Common/LocaleManager.cs

@@ -109,7 +109,7 @@ namespace Ryujinx.Ava.Common.Locale
         {
             _dynamicValues[key] = values;
 
-            OnPropertyChanged("Item");
+            OnPropertyChanged("Translation");
 
             return this[key];
         }
@@ -138,7 +138,7 @@ namespace Ryujinx.Ava.Common.Locale
                 _localeStrings[key] = val;
             }
 
-            OnPropertyChanged("Item");
+            OnPropertyChanged("Translation");
 
             LocaleChanged?.Invoke();
         }

src/Ryujinx/Common/Markup/BasicMarkupExtension.cs

@@ -14,7 +14,7 @@ namespace Ryujinx.Ava.Common.Markup
 {
     internal abstract class BasicMarkupExtension<T> : MarkupExtension
     {
-        public virtual string Name => "Item";
+        public abstract string Name { get; }
         public virtual Action<object, T?>? Setter => null;
 
         protected abstract T? Value { get; }

src/Ryujinx/Common/Markup/MarkupExtensions.cs

@@ -6,16 +6,19 @@ namespace Ryujinx.Ava.Common.Markup
 {
     internal class IconExtension(string iconString) : BasicMarkupExtension<Icon>
     {
+        public override string Name => "Icon";
         protected override Icon Value => new() { Value = iconString };
     }
     
     internal class SpinningIconExtension(string iconString) : BasicMarkupExtension<Icon>
     {
+        public override string Name => "SIcon";
         protected override Icon Value => new() { Value = iconString, Animation = IconAnimation.Spin };
     }
     
     internal class LocaleExtension(LocaleKeys key) : BasicMarkupExtension<string>
     {
+        public override string Name => "Translation";
         protected override string Value => LocaleManager.Instance[key];
 
         protected override void ConfigureBindingExtension(CompiledBindingExtension bindingExtension) 

src/Ryujinx/Program.cs

@@ -65,7 +65,7 @@ namespace Ryujinx.Ava
         }
 
         public static AppBuilder BuildAvaloniaApp() =>
-            AppBuilder.Configure<App>()
+            AppBuilder.Configure<RyujinxApp>()
                 .UsePlatformDetect()
                 .With(new X11PlatformOptions
                 {
@@ -100,7 +100,7 @@ namespace Ryujinx.Ava
             // Delete backup files after updating.
             Task.Run(Updater.CleanupUpdate);
 
-            Console.Title = $"{App.FullAppName} Console {Version}";
+            Console.Title = $"{RyujinxApp.FullAppName} Console {Version}";
 
             // Hook unhandled exception and process exit events.
             AppDomain.CurrentDomain.UnhandledException += (sender, e)
@@ -225,7 +225,7 @@ namespace Ryujinx.Ava
 
         private static void PrintSystemInfo()
         {
-            Logger.Notice.Print(LogClass.Application, $"{App.FullAppName} Version: {Version}");
+            Logger.Notice.Print(LogClass.Application, $"{RyujinxApp.FullAppName} Version: {Version}");
             SystemInfo.Gather().Print();
 
             var enabledLogLevels = Logger.GetEnabledLevels().ToArray();

src/Ryujinx/RyujinxApp.axaml

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

src/Ryujinx/RyujinxApp.axaml.cs

@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input.Platform;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using Avalonia.Styling;
@@ -19,7 +20,7 @@ using System.Diagnostics;
 
 namespace Ryujinx.Ava
 {
-    public class App : Application
+    public class RyujinxApp : Application
     {
         internal static string FormatTitle(LocaleKeys? windowTitleKey = null)
             => windowTitleKey is null
@@ -32,6 +33,12 @@ namespace Ryujinx.Ava
             .ApplicationLifetime.Cast<IClassicDesktopStyleApplicationLifetime>()
             .MainWindow.Cast<MainWindow>();
 
+        public static bool IsClipboardAvailable(out IClipboard clipboard)
+        {
+            clipboard = MainWindow.Clipboard;
+            return clipboard != null;
+        }
+
         public static void SetTaskbarProgress(TaskBarProgressBarState state) => MainWindow.PlatformFeatures.SetTaskBarProgressBarState(state);
         public static void SetTaskbarProgressValue(ulong current, ulong total) => MainWindow.PlatformFeatures.SetTaskBarProgressBarValue(current, total);
         public static void SetTaskbarProgressValue(long current, long total) => SetTaskbarProgressValue(Convert.ToUInt64(current), Convert.ToUInt64(total));
@@ -132,7 +139,7 @@ namespace Ryujinx.Ava
             };
 
         public static ThemeVariant DetectSystemTheme() =>
-            Current is App { PlatformSettings: not null } app
+            Current is RyujinxApp { PlatformSettings: not null } app
                 ? ConvertThemeVariant(app.PlatformSettings.GetColorValues().ThemeVariant)
                 : ThemeVariant.Default;
     }

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -101,11 +101,21 @@
                                     VerticalAlignment="Top"
                                     Orientation="Vertical"
                                     Spacing="5">
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        Text="{Binding IdString}"
-                                        TextAlignment="Start"
-                                        TextWrapping="Wrap" />
+                                    <Button 
+                                        Click="IdString_OnClick" 
+                                        HorizontalContentAlignment="Left" 
+                                        VerticalAlignment="Center"
+                                        Background="{DynamicResource AppListBackgroundColor}"
+                                        Margin="-1, 0, 0, 0"
+                                        Padding="0" >
+                                        <TextBlock
+                                            Margin="1.5"
+                                            HorizontalAlignment="Stretch"
+                                            Text="{Binding IdString}"
+                                            Tag="{Binding Id}"
+                                            TextAlignment="Start"
+                                            TextWrapping="Wrap" />
+                                    </Button>
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
                                         Text="{Binding FileExtension}"

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

@@ -1,10 +1,13 @@
 using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.UI.App.Common;
 using System;
+using System.Linq;
 
 namespace Ryujinx.Ava.UI.Controls
 {
@@ -32,5 +35,27 @@ namespace Ryujinx.Ava.UI.Controls
             if (DataContext is MainWindowViewModel viewModel && sender is ListBox { SelectedItem: ApplicationData selected })
                 viewModel.ListSelectedApplication = selected;
         }
+
+        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 var clipboard))
+                return;
+            
+            var appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
+            if (appData is null)
+                return;
+            
+            await clipboard.SetTextAsync(appData.IdString);
+                
+            NotificationHelper.ShowInformation(
+                "Copied Title ID", 
+                $"{appData.Name} ({appData.IdString})");
+        }
     }
 }

src/Ryujinx/UI/Controls/StatusBarSeparator.cs

@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+
+namespace Ryujinx.Ava.UI.Controls
+{
+    public class MiniVerticalSeparator : Border
+    {
+        public MiniVerticalSeparator()
+        {
+            Width = 2;
+            Height = 12;
+            Margin = new Thickness();
+            BorderBrush = Brushes.Gray;
+            Background = Brushes.Gray;
+            BorderThickness = new Thickness(1);
+        }
+    }
+}

src/Ryujinx/UI/Helpers/NotificationHelper.cs

@@ -62,9 +62,46 @@ namespace Ryujinx.Ava.UI.Helpers
             _notifications.Add(new Notification(title, text, type, delay, onClick, onClose));
         }
 
-        public static void ShowError(string message)
-        {
-            Show(LocaleManager.Instance[LocaleKeys.DialogErrorTitle], $"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}", NotificationType.Error);
-        }
+        public static void ShowError(string message) =>
+            ShowError(
+                LocaleManager.Instance[LocaleKeys.DialogErrorTitle], 
+                $"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}"
+            );
+
+        public static void ShowInformation(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Information,
+                waitingExit, 
+                onClick, 
+                onClose);
+
+        public static void ShowSuccess(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Success,
+                waitingExit, 
+                onClick, 
+                onClose);
+
+        public static void ShowWarning(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Warning,
+                waitingExit, 
+                onClick, 
+                onClose);
+
+        public static void ShowError(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
+            Show(
+                title,
+                text,
+                NotificationType.Error,
+                waitingExit, 
+                onClick, 
+                onClose);
     }
 }

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

@@ -1,10 +1,5 @@
-using DynamicData;
-using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows.Input;
 
 namespace Ryujinx.Ava.UI.Models.Input
 {
@@ -131,15 +126,8 @@ namespace Ryujinx.Ava.UI.Models.Input
             }
         }
 
-        public ObservableCollection<CycleController> CycleControllers { get; set; } = new ObservableCollection<CycleController>();
-        public ICommand AddCycleController { get; set; }
-        public ICommand RemoveCycleController { get; set; }
-        public bool CanRemoveCycleController => CycleControllers.Count > 0 && CycleControllers.Count < 8;
-
         public HotkeyConfig(KeyboardHotkeys config)
         {
-            AddCycleController = MiniCommand.Create(() => CycleControllers.Add(new CycleController(CycleControllers.Count + 1, Key.Unbound)));
-            RemoveCycleController = MiniCommand.Create(() => CycleControllers.Remove(CycleControllers.Last()));
             if (config != null)
             {
                 ToggleVSyncMode = config.ToggleVSyncMode;
@@ -153,9 +141,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                 VolumeDown = config.VolumeDown;
                 CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
                 CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
-                CycleControllers.AddRange((config.CycleControllers ?? []).Select((x, i) => new CycleController(i + 1, x)));
             }
-            CycleControllers.CollectionChanged += (sender, e) => OnPropertyChanged(nameof(CanRemoveCycleController));
         }
 
         public KeyboardHotkeys GetConfig()
@@ -173,7 +159,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                 VolumeDown = VolumeDown,
                 CustomVSyncIntervalIncrement = CustomVSyncIntervalIncrement,
                 CustomVSyncIntervalDecrement = CustomVSyncIntervalDecrement,
-                CycleControllers = CycleControllers.Select(x => x.Hotkey).ToList()
             };
 
             return config;

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -51,7 +51,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public AboutWindowViewModel()
         {
-            Version = App.FullAppName + "\n" + Program.Version;
+            Version = RyujinxApp.FullAppName + "\n" + Program.Version;
             UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);
 
             ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
@@ -64,7 +64,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private void UpdateLogoTheme(string theme)
         {
-            bool isDarkTheme = theme == "Dark" || (theme == "Auto" && App.DetectSystemTheme() == ThemeVariant.Dark);
+            bool isDarkTheme = theme == "Dark" || (theme == "Auto" && RyujinxApp.DetectSystemTheme() == ThemeVariant.Dark);
 
             string basePath = "resm:Ryujinx.UI.Common.Resources.";
             string themeSuffix = isDarkTheme ? "Dark.png" : "Light.png";

src/Ryujinx/UI/ViewModels/BaseModel.cs

@@ -1,3 +1,4 @@
+using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
@@ -11,5 +12,13 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
+        
+        protected void OnPropertiesChanged(params ReadOnlySpan<string> propertyNames)
+        {
+            foreach (var propertyName in propertyNames)
+            {
+                OnPropertyChanged(propertyName);
+            }
+        }
     }
 }

src/Ryujinx/UI/ViewModels/CycleController.cs

@@ -1,48 +0,0 @@
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Common.Configuration.Hid;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    public class CycleController : BaseModel
-    {
-        private string _player;
-        private Key _hotkey;
-
-        public string Player
-        {
-            get => _player;
-            set
-            {
-                _player = value;
-                OnPropertyChanged(nameof(Player));
-            }
-        }
-
-        public Key Hotkey
-        {
-            get => _hotkey;
-            set
-            {
-                _hotkey = value;
-                OnPropertyChanged(nameof(Hotkey));
-            }
-        }
-
-        public CycleController(int v, Key x)
-        {
-            Player = v switch
-            {
-                1 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer1],
-                2 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer2],
-                3 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer3],
-                4 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer4],
-                5 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer5],
-                6 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer6],
-                7 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer7],
-                8 => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer8],
-                _ => LocaleManager.Instance[LocaleKeys.ControllerSettingsPlayer] + " " + v
-            };
-            Hotkey = x;
-        }
-    }
-}

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

@@ -266,10 +266,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public InputViewModel()
         {
-            _mainWindow =
-                 (MainWindow)((IClassicDesktopStyleApplicationLifetime)Application.Current
-                     .ApplicationLifetime).MainWindow;
-            AvaloniaKeyboardDriver = new AvaloniaKeyboardDriver(_mainWindow);
             PlayerIndexes = new ObservableCollection<PlayerModel>();
             Controllers = new ObservableCollection<ControllerModel>();
             Devices = new ObservableCollection<(DeviceType Type, string Id, string Name)>();
@@ -758,34 +754,38 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 return;
             }
-
-            bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
-
-            if (!validFileName)
+            else
             {
-                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
-                return;
+                bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
+
+                if (validFileName)
+                {
+                    string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
+
+                    InputConfig config = null;
+
+                    if (IsKeyboard)
+                    {
+                        config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
+                    }
+                    else if (IsController)
+                    {
+                        config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
+                    }
+
+                    config.ControllerType = Controllers[_controller].Type;
+
+                    string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
+
+                    await File.WriteAllTextAsync(path, jsonString);
+
+                    LoadProfiles();
+                }
+                else
+                {
+                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
+                }
             }
-            string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
-
-            InputConfig config = null;
-
-            if (IsKeyboard)
-            {
-                config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
-            }
-            else if (IsController)
-            {
-                config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
-            }
-
-            config.ControllerType = Controllers[_controller].Type;
-
-            string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
-
-            await File.WriteAllTextAsync(path, jsonString);
-
-            LoadProfiles();
         }
 
         public async void RemoveProfile()
@@ -899,13 +899,5 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
             AvaloniaKeyboardDriver.Dispose();
         }
-
-        public void CyclePlayerDevice(int player)
-        {
-            LoadDevices();
-            PlayerId = (PlayerIndex)player;
-            Device = (Device + 1) % Devices.Count;
-            Save();
-        }
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -131,7 +131,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         // For an example of this, download canary 1.2.95, then open the settings menu, and look at the icon in the top-left.
         // The border gets reduced to colored pixels in the 4 corners.
         public static readonly Bitmap IconBitmap =
-            new(Assembly.GetAssembly(typeof(ConfigurationState))!.GetManifestResourceStream("Ryujinx.UI.Common.Resources.Logo_Thiccjinx.png")!);
+            new(Assembly.GetAssembly(typeof(ConfigurationState))!.GetManifestResourceStream("Ryujinx.UI.Common.Resources.Logo_Ryujinx_AntiAlias.png")!);
 
         public MainWindow Window { get; init; }
 
@@ -2051,7 +2051,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             Dispatcher.UIThread.InvokeAsync(() =>
             {
-                Title = App.FormatTitle();
+                Title = RyujinxApp.FormatTitle();
             });
         }
 

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -71,8 +71,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 _resolutionScale = value;
 
-                OnPropertyChanged(nameof(CustomResolutionScale));
-                OnPropertyChanged(nameof(IsCustomResolutionScaleActive));
+                OnPropertiesChanged(nameof(CustomResolutionScale), nameof(IsCustomResolutionScaleActive));
             }
         }
 
@@ -181,8 +180,9 @@ namespace Ryujinx.Ava.UI.ViewModels
                 int newInterval = (int)((value / 100f) * 60);
                 _customVSyncInterval = newInterval;
                 _customVSyncIntervalPercentageProxy = value;
-                OnPropertyChanged((nameof(CustomVSyncInterval)));
-                OnPropertyChanged((nameof(CustomVSyncIntervalPercentageText)));
+                OnPropertiesChanged(
+                    nameof(CustomVSyncInterval), 
+                    nameof(CustomVSyncIntervalPercentageText));
             }
         }
 
@@ -190,7 +190,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             get
             {
-                string text = CustomVSyncIntervalPercentageProxy.ToString() + "%";
+                string text = CustomVSyncIntervalPercentageProxy + "%";
                 return text;
             }
         }
@@ -221,8 +221,9 @@ namespace Ryujinx.Ava.UI.ViewModels
                 _customVSyncInterval = value;
                 int newPercent = (int)((value / 60f) * 100);
                 _customVSyncIntervalPercentageProxy = newPercent;
-                OnPropertyChanged(nameof(CustomVSyncIntervalPercentageProxy));
-                OnPropertyChanged(nameof(CustomVSyncIntervalPercentageText));
+                OnPropertiesChanged(
+                    nameof(CustomVSyncIntervalPercentageProxy), 
+                    nameof(CustomVSyncIntervalPercentageText));
                 OnPropertyChanged();
             }
         }

src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs

@@ -91,39 +91,42 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private void SortingChanged()
         {
-            OnPropertyChanged(nameof(IsSortedByName));
-            OnPropertyChanged(nameof(IsSortedBySaved));
-            OnPropertyChanged(nameof(SortingAscending));
-            OnPropertyChanged(nameof(SortingField));
-            OnPropertyChanged(nameof(SortingFieldName));
+            OnPropertiesChanged(
+                nameof(IsSortedByName), 
+                nameof(IsSortedBySaved), 
+                nameof(SortingAscending), 
+                nameof(SortingField), 
+                nameof(SortingFieldName));
+            
             SortAndFilter();
         }
 
         private void DisplayedChanged()
         {
-            OnPropertyChanged(nameof(Status));
-            OnPropertyChanged(nameof(DisplayedXCIFiles));
-            OnPropertyChanged(nameof(SelectedDisplayedXCIFiles));
+            OnPropertiesChanged(nameof(Status), nameof(DisplayedXCIFiles), nameof(SelectedDisplayedXCIFiles));
         }
 
         private void ApplicationsChanged()
         {
-            OnPropertyChanged(nameof(AllXCIFiles));
-            OnPropertyChanged(nameof(Status));
-            OnPropertyChanged(nameof(PotentialSavings));
-            OnPropertyChanged(nameof(ActualSavings));
-            OnPropertyChanged(nameof(CanTrim));
-            OnPropertyChanged(nameof(CanUntrim));
+            OnPropertiesChanged(
+                nameof(AllXCIFiles), 
+                nameof(Status), 
+                nameof(PotentialSavings), 
+                nameof(ActualSavings), 
+                nameof(CanTrim), 
+                nameof(CanUntrim));
+            
             DisplayedChanged();
             SortAndFilter();
         }
 
         private void SelectionChanged(bool displayedChanged = true)
         {
-            OnPropertyChanged(nameof(Status));
-            OnPropertyChanged(nameof(CanTrim));
-            OnPropertyChanged(nameof(CanUntrim));
-            OnPropertyChanged(nameof(SelectedXCIFiles));
+            OnPropertiesChanged(
+                nameof(Status), 
+                nameof(CanTrim), 
+                nameof(CanUntrim), 
+                nameof(SelectedXCIFiles));
 
             if (displayedChanged)
                 OnPropertyChanged(nameof(SelectedDisplayedXCIFiles));
@@ -131,11 +134,12 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private void ProcessingChanged()
         {
-            OnPropertyChanged(nameof(Processing));
-            OnPropertyChanged(nameof(Cancel));
-            OnPropertyChanged(nameof(Status));
-            OnPropertyChanged(nameof(CanTrim));
-            OnPropertyChanged(nameof(CanUntrim));
+            OnPropertiesChanged(
+                nameof(Processing), 
+                nameof(Cancel), 
+                nameof(Status), 
+                nameof(CanTrim), 
+                nameof(CanUntrim));
         }
 
         private IEnumerable<XCITrimmerFileModel> GetSelectedDisplayedXCIFiles()

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

@@ -18,7 +18,7 @@
             Height="25"
             Width="25"
             ToolTip.Tip="{Binding Title}"
-            Source="resm:Ryujinx.UI.Common.Resources.Logo_Thiccjinx.png?assembly=Ryujinx.UI.Common" />
+            Source="resm:Ryujinx.UI.Common.Resources.Logo_Ryujinx_AntiAlias.png?assembly=Ryujinx.UI.Common" />
         <Menu
             Name="Menu"
             Height="32"

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

@@ -7,6 +7,7 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    xmlns:local="clr-namespace:Ryujinx.Ava.UI.Views.Main"
     xmlns:config="clr-namespace:Ryujinx.Common.Configuration;assembly=Ryujinx.Common"
     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
     x:Class="Ryujinx.Ava.UI.Views.Main.MainStatusBarView"
@@ -132,14 +133,7 @@
                         </Flyout>
                     </Button.Flyout>
                 </Button>
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
             <TextBlock
                 Name="DockedStatus"
                 Margin="5,0,5,0"
@@ -149,14 +143,7 @@
                 PointerReleased="DockedStatus_PointerReleased"
                 Text="{Binding DockedStatusText}"
                 TextAlignment="Start" />
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
             <SplitButton
                 Name="AspectRatioStatus"
                 Padding="5,0,5,0"
@@ -203,14 +190,7 @@
                     </MenuFlyout>
                 </SplitButton.Flyout>
             </SplitButton>
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
             <ToggleSplitButton
                 Name="VolumeStatus"
                 Padding="5,0,5,0"
@@ -254,14 +234,7 @@
                     </Flyout>
                 </ToggleSplitButton.Flyout>
             </ToggleSplitButton>
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
             <TextBlock
                 Margin="5,0,5,0"
                 HorizontalAlignment="Left"
@@ -269,14 +242,7 @@
                 IsVisible="{Binding !ShowLoadProgress}"
                 Text="{Binding GameStatusText}"
                 TextAlignment="Start" />
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
             <TextBlock
                 Margin="5,0,5,0"
                 HorizontalAlignment="Left"
@@ -298,13 +264,7 @@
                 VerticalAlignment="Center"
                 IsVisible="{Binding ShowShaderCompilationHint}"
                 Text="{Binding ShaderCountText}" />
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding ShowShaderCompilationHint}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding ShowShaderCompilationHint}" />
             <TextBlock
                 Margin="5,0,5,0"
                 HorizontalAlignment="Left"
@@ -312,14 +272,7 @@
                 IsVisible="{Binding !ShowLoadProgress}"
                 Text="{Binding BackendText}"
                 TextAlignment="Start" />
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                Background="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding !ShowLoadProgress}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding !ShowLoadProgress}" />
             <TextBlock
                 Margin="5,0,0,0"
                 HorizontalAlignment="Left"
@@ -334,13 +287,7 @@
             VerticalAlignment="Center"
             IsVisible="{Binding ShowFirmwareStatus}"
             Orientation="Horizontal">
-            <Border
-                Width="2"
-                Height="12"
-                Margin="0"
-                BorderBrush="Gray"
-                BorderThickness="1"
-                IsVisible="{Binding IsGameRunning}" />
+            <controls:MiniVerticalSeparator IsVisible="{Binding IsGameRunning}" />
             <TextBlock
                 Name="FirmwareStatus"
                 Margin="5, 0, 0, 0"

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

@@ -62,12 +62,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             // Change the volume by 5% at a time
             float newValue = Window.ViewModel.Volume + (float)e.Delta.Y * 0.05f;
 
-            Window.ViewModel.Volume = newValue switch
-            {
-                < 0 => 0,
-                > 1 => 1,
-                _ => newValue,
-            };
+            Window.ViewModel.Volume = Math.Clamp(newValue, 0, 1);
 
             e.Handled = true;
         }

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

@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsHotkeysView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -18,18 +18,17 @@
         <helpers:KeyValueConverter x:Key="Key" />
     </UserControl.Resources>
     <UserControl.Styles>
-        <Style Selector="StackPanel StackPanel">
+        <Style Selector="StackPanel > StackPanel">
             <Setter Property="Margin" Value="10, 0, 0, 0" />
             <Setter Property="Orientation" Value="Horizontal" />
         </Style>
-        <Style Selector="StackPanel StackPanel > TextBlock">
+        <Style Selector="StackPanel > StackPanel > TextBlock">
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="Width" Value="230" />
         </Style>
-        <Style Selector="ToggleButton, Button">
+        <Style Selector="ToggleButton">
             <Setter Property="Width" Value="90" />
             <Setter Property="Height" Value="27" />
-            <Setter Property="Padding" Value="0,5,0,5" /> <!-- Added vertical padding -->
         </Style>
         <Style Selector="ToggleButton > TextBlock">
             <Setter Property="TextAlignment" Value="Center" />
@@ -43,123 +42,79 @@
         VerticalScrollBarVisibility="Auto">
         <Border Classes="settings">
             <StackPanel
+                Name="SettingButtons"
                 Margin="10"
-                HorizontalAlignment="Stretch"
                 Orientation="Vertical"
-                Spacing="10"
-                Name="SettingButtons">
+                Spacing="10">
                 <TextBlock
                     Classes="h1"
                     Text="{ext:Locale SettingsTabHotkeysHotkeys}" />
-                <StackPanel
-                    Margin="10,0,0,0"
-                    Spacing="10"
-                    Orientation="Vertical">
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" />
-                        <ToggleButton Name="ToggleVSyncMode">
-                            <TextBlock Text="{Binding KeyboardHotkey.ToggleVSyncMode, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" />
-                        <ToggleButton Name="Screenshot">
-                            <TextBlock Text="{Binding KeyboardHotkey.Screenshot, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" />
-                        <ToggleButton Name="ShowUI">
-                            <TextBlock Text="{Binding KeyboardHotkey.ShowUI, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" />
-                        <ToggleButton Name="Pause">
-                            <TextBlock Text="{Binding KeyboardHotkey.Pause, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" />
-                        <ToggleButton Name="ToggleMute">
-                            <TextBlock Text="{Binding KeyboardHotkey.ToggleMute, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" />
-                        <ToggleButton Name="ResScaleUp">
-                            <TextBlock Text="{Binding KeyboardHotkey.ResScaleUp, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" />
-                        <ToggleButton Name="ResScaleDown">
-                            <TextBlock Text="{Binding KeyboardHotkey.ResScaleDown, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" />
-                        <ToggleButton Name="VolumeUp">
-                            <TextBlock Text="{Binding KeyboardHotkey.VolumeUp, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" />
-                        <ToggleButton Name="VolumeDown">
-                            <TextBlock Text="{Binding KeyboardHotkey.VolumeDown, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" />
-                        <ToggleButton Name="CustomVSyncIntervalIncrement">
-                            <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalIncrement, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
-                    <StackPanel>
-                        <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" />
-                        <ToggleButton Name="CustomVSyncIntervalDecrement">
-                            <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalDecrement, Converter={StaticResource Key}}" />
-                        </ToggleButton>
-                    </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleVSyncModeHotkey}" />
+                    <ToggleButton Name="ToggleVSyncMode">
+                        <TextBlock Text="{Binding KeyboardHotkey.ToggleVSyncMode, Converter={StaticResource Key}}" />
+                    </ToggleButton>
                 </StackPanel>
-                <Separator Height="1" />
-                <StackPanel Margin="0">
-                    <TextBlock
-                        Classes="h1"
-                        Text="{ext:Locale SettingsTabHotkeysCycleControllers}" />
-                    <StackPanel Orientation="Horizontal" Spacing="10">
-                        <Button
-                            Content="{ext:Locale SettingsTabGeneralAdd}"
-                            Margin="10,0,0,0"
-                            Command="{Binding KeyboardHotkey.AddCycleController}" />
-                        <Button
-                            Content="{ext:Locale SettingsTabGeneralRemove}"
-                            IsEnabled="{Binding KeyboardHotkey.CanRemoveCycleController}"
-                            Command="{Binding KeyboardHotkey.RemoveCycleController}" />
-                    </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysScreenshotHotkey}" />
+                    <ToggleButton Name="Screenshot">
+                        <TextBlock Text="{Binding KeyboardHotkey.Screenshot, Converter={StaticResource Key}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysShowUiHotkey}" />
+                    <ToggleButton Name="ShowUI">
+                        <TextBlock Text="{Binding KeyboardHotkey.ShowUI, Converter={StaticResource Key}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysPauseHotkey}" />
+                    <ToggleButton Name="Pause">
+                        <TextBlock Text="{Binding KeyboardHotkey.Pause, Converter={StaticResource Key}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysToggleMuteHotkey}" />
+                    <ToggleButton Name="ToggleMute">
+                        <TextBlock Text="{Binding KeyboardHotkey.ToggleMute, Converter={StaticResource Key}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleUpHotkey}" />
+                    <ToggleButton Name="ResScaleUp">
+                        <TextBlock Text="{Binding KeyboardHotkey.ResScaleUp, Converter={StaticResource Key}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysResScaleDownHotkey}" />
+                    <ToggleButton Name="ResScaleDown">
+                        <TextBlock Text="{Binding KeyboardHotkey.ResScaleDown, Converter={StaticResource Key}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeUpHotkey}" />
+                    <ToggleButton Name="VolumeUp">
+                        <TextBlock Text="{Binding KeyboardHotkey.VolumeUp, Converter={StaticResource Key}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel>
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysVolumeDownHotkey}" />
+                    <ToggleButton Name="VolumeDown">
+                        <TextBlock Text="{Binding KeyboardHotkey.VolumeDown, Converter={StaticResource Key}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysIncrementCustomVSyncIntervalHotkey}" />
+                    <ToggleButton Name="CustomVSyncIntervalIncrement">
+                        <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalIncrement, Converter={StaticResource Key}}" />
+                    </ToggleButton>
+                </StackPanel>
+                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
+                    <TextBlock Text="{ext:Locale SettingsTabHotkeysDecrementCustomVSyncIntervalHotkey}" />
+                    <ToggleButton Name="CustomVSyncIntervalDecrement">
+                        <TextBlock Text="{Binding KeyboardHotkey.CustomVSyncIntervalDecrement, Converter={StaticResource Key}}" />
+                    </ToggleButton>
                 </StackPanel>
-                <ItemsControl ItemsSource="{Binding KeyboardHotkey.CycleControllers}"
-                    Name="CycleControllers">
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <StackPanel
-                                Margin="10,0,0,0"
-                                Orientation="Vertical"
-                                Spacing="10" />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel>
-                                <TextBlock Text="{Binding Player}" />
-                                <ToggleButton>
-                                    <TextBlock
-                                        Text="{Binding Hotkey, Converter={StaticResource Key}}" />
-                                </ToggleButton>
-                            </StackPanel>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
             </StackPanel>
         </Border>
    </ScrollViewer>

src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs

@@ -3,17 +3,11 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using Avalonia.VisualTree;
-using DynamicData.Kernel;
-using FluentAvalonia.Core;
 using Ryujinx.Ava.Input;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System;
-using System.Collections.Specialized;
-using System.Linq;
 using Key = Ryujinx.Common.Configuration.Hid.Key;
 
 namespace Ryujinx.Ava.UI.Views.Settings
@@ -26,21 +20,16 @@ namespace Ryujinx.Ava.UI.Views.Settings
         public SettingsHotkeysView()
         {
             InitializeComponent();
-            RegisterEvents();
-            _avaloniaKeyboardDriver = new AvaloniaKeyboardDriver(this);
-            CycleControllers.LayoutUpdated += (_, _1) => RegisterEvents();
-        }
 
-        private void RegisterEvents()
-        {
             foreach (ILogical visual in SettingButtons.GetLogicalDescendants())
             {
                 if (visual is ToggleButton button and not CheckBox)
                 {
-                    button.IsCheckedChanged -= Button_IsCheckedChanged;
                     button.IsCheckedChanged += Button_IsCheckedChanged;
                 }
             }
+
+            _avaloniaKeyboardDriver = new AvaloniaKeyboardDriver(this);
         }
 
         protected override void OnPointerReleased(PointerReleasedEventArgs e)
@@ -64,96 +53,90 @@ namespace Ryujinx.Ava.UI.Views.Settings
 
         private void Button_IsCheckedChanged(object sender, RoutedEventArgs e)
         {
-            if (sender is not ToggleButton button)
+            if (sender is ToggleButton button)
             {
-                return;
-            }
-
-            if (!button.IsChecked.ValueOr(default))
-            {
-                _currentAssigner?.Cancel();
-                _currentAssigner = null;
-                return;
-            }
-
-            if (_currentAssigner != null && button == _currentAssigner.ToggledButton)
-            {
-                return;
-            }
-
-            if (_currentAssigner != null)
-            {
-                _currentAssigner.Cancel();
-                _currentAssigner = null;
-                button.IsChecked = false;
-                return;
-            }
-
-            _currentAssigner = new ButtonKeyAssigner(button);
-
-            this.Focus(NavigationMethod.Pointer);
-
-            PointerPressed += MouseClick;
-
-            var keyboard = (IKeyboard)_avaloniaKeyboardDriver.GetGamepad("0");
-            IButtonAssigner assigner = new KeyboardKeyAssigner(keyboard);
-
-            _currentAssigner.ButtonAssigned += (sender, e) =>
-            {
-                if (!e.ButtonValue.HasValue)
+                if ((bool)button.IsChecked)
                 {
-                    return;
-                }
+                    if (_currentAssigner != null && button == _currentAssigner.ToggledButton)
+                    {
+                        return;
+                    }
 
-                var viewModel = (DataContext) as SettingsViewModel;
-                var buttonValue = e.ButtonValue.Value;
+                    if (_currentAssigner == null)
+                    {
+                        _currentAssigner = new ButtonKeyAssigner(button);
 
-                switch (button.Name)
-                {
-                    case "ToggleVSyncMode":
-                        viewModel.KeyboardHotkey.ToggleVSyncMode = buttonValue.AsHidType<Key>();
-                        break;
-                    case "Screenshot":
-                        viewModel.KeyboardHotkey.Screenshot = buttonValue.AsHidType<Key>();
-                        break;
-                    case "ShowUI":
-                        viewModel.KeyboardHotkey.ShowUI = buttonValue.AsHidType<Key>();
-                        break;
-                    case "Pause":
-                        viewModel.KeyboardHotkey.Pause = buttonValue.AsHidType<Key>();
-                        break;
-                    case "ToggleMute":
-                        viewModel.KeyboardHotkey.ToggleMute = buttonValue.AsHidType<Key>();
-                        break;
-                    case "ResScaleUp":
-                        viewModel.KeyboardHotkey.ResScaleUp = buttonValue.AsHidType<Key>();
-                        break;
-                    case "ResScaleDown":
-                        viewModel.KeyboardHotkey.ResScaleDown = buttonValue.AsHidType<Key>();
-                        break;
-                    case "VolumeUp":
-                        viewModel.KeyboardHotkey.VolumeUp = buttonValue.AsHidType<Key>();
-                        break;
-                    case "VolumeDown":
-                        viewModel.KeyboardHotkey.VolumeDown = buttonValue.AsHidType<Key>();
-                        break;
-                    case "CustomVSyncIntervalIncrement":
-                        viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = buttonValue.AsHidType<Key>();
-                        break;
-                    case "CustomVSyncIntervalDecrement":
-                        viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = buttonValue.AsHidType<Key>();
-                        break;
-                    default:
-                        var index = button.FindAncestorOfType<ItemsControl>().GetLogicalDescendants().OfType<ToggleButton>().IndexOf(button);
-                        if (index >= 0 && viewModel.KeyboardHotkey.CycleControllers != null)
+                        this.Focus(NavigationMethod.Pointer);
+
+                        PointerPressed += MouseClick;
+
+                        var keyboard = (IKeyboard)_avaloniaKeyboardDriver.GetGamepad("0");
+                        IButtonAssigner assigner = new KeyboardKeyAssigner(keyboard);
+
+                        _currentAssigner.ButtonAssigned += (sender, e) =>
                         {
-                            viewModel.KeyboardHotkey.CycleControllers[index].Hotkey = buttonValue.AsHidType<Key>();
-                        }
-                        break;
-                }
-            };
+                            if (e.ButtonValue.HasValue)
+                            {
+                                var viewModel = (DataContext) as SettingsViewModel;
+                                var buttonValue = e.ButtonValue.Value;
 
-            _currentAssigner.GetInputAndAssign(assigner, keyboard);
+                                switch (button.Name)
+                                {
+                                    case "ToggleVSyncMode":
+                                        viewModel.KeyboardHotkey.ToggleVSyncMode = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "Screenshot":
+                                        viewModel.KeyboardHotkey.Screenshot = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "ShowUI":
+                                        viewModel.KeyboardHotkey.ShowUI = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "Pause":
+                                        viewModel.KeyboardHotkey.Pause = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "ToggleMute":
+                                        viewModel.KeyboardHotkey.ToggleMute = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "ResScaleUp":
+                                        viewModel.KeyboardHotkey.ResScaleUp = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "ResScaleDown":
+                                        viewModel.KeyboardHotkey.ResScaleDown = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "VolumeUp":
+                                        viewModel.KeyboardHotkey.VolumeUp = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "VolumeDown":
+                                        viewModel.KeyboardHotkey.VolumeDown = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "CustomVSyncIntervalIncrement":
+                                        viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = buttonValue.AsHidType<Key>();
+                                        break;
+                                    case "CustomVSyncIntervalDecrement":
+                                        viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = buttonValue.AsHidType<Key>();
+                                        break;
+                                }
+                            }
+                        };
+
+                        _currentAssigner.GetInputAndAssign(assigner, keyboard);
+                    }
+                    else
+                    {
+                        if (_currentAssigner != null)
+                        {
+                            _currentAssigner.Cancel();
+                            _currentAssigner = null;
+                            button.IsChecked = false;
+                        }
+                    }
+                }
+                else
+                {
+                    _currentAssigner?.Cancel();
+                    _currentAssigner = null;
+                }
+            }
         }
 
         public void Dispose()

src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs

@@ -16,7 +16,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
 
-            Title = App.FormatTitle(LocaleKeys.Amiibo);
+            Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
         }
 
         public AmiiboWindow()
@@ -27,7 +27,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             if (Program.PreviewerDetached)
             {
-                Title = App.FormatTitle(LocaleKeys.Amiibo);
+                Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
             }
         }
 

src/Ryujinx/UI/Windows/CheatWindow.axaml.cs

@@ -28,7 +28,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
 
-            Title = App.FormatTitle(LocaleKeys.CheatWindowTitle);
+            Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
         }
 
         public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
@@ -93,7 +93,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             DataContext = this;
 
-            Title = App.FormatTitle(LocaleKeys.CheatWindowTitle);
+            Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
         }
 
         public void Save()

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -86,17 +86,22 @@ namespace Ryujinx.Ava.UI.Windows
 
             UiHandler = new AvaHostUIHandler(this);
 
-            ViewModel.Title = App.FormatTitle();
+            ViewModel.Title = RyujinxApp.FormatTitle();
 
             TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
             TitleBar.TitleBarHitTestType = (ConfigurationState.Instance.ShowTitleBar) ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
 
-            // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
-            TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);
-
             // NOTE: Height of MenuBar and StatusBar is not usable here, since it would still be 0 at this point.
             StatusBarHeight = StatusBarView.StatusBar.MinHeight;
             MenuBarHeight = MenuBar.MinHeight;
+            
+            TitleBar.Height = MenuBarHeight;
+            
+            // Correctly size window when 'TitleBar' is enabled (Nov. 14, 2024)
+            TitleBarHeight = (ConfigurationState.Instance.ShowTitleBar ? TitleBar.Height : 0);
+
+            ApplicationList.DataContext = DataContext;
+            ApplicationGrid.DataContext = DataContext;
 
             SetWindowSizePosition();
 
@@ -114,7 +119,7 @@ namespace Ryujinx.Ava.UI.Windows
         /// </summary>
         private static void OnPlatformColorValuesChanged(object sender, PlatformColorValues e)
         {
-            if (Application.Current is App app)
+            if (Application.Current is RyujinxApp app)
                 app.ApplyConfiguredTheme(ConfigurationState.Instance.UI.BaseStyle);
         }
 

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -14,7 +14,7 @@ namespace Ryujinx.Ava.UI.Windows
 
         public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
         {
-            Title = App.FormatTitle(LocaleKeys.Settings);
+            Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
 
             DataContext = ViewModel = new SettingsViewModel(virtualFileSystem, contentManager);
 

src/Ryujinx/Updater.cs

@@ -76,7 +76,7 @@ namespace Ryujinx.Ava
 
             if (!Version.TryParse(Program.Version, out Version currentVersion))
             {
-                Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {App.FullAppName} version!");
+                Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {RyujinxApp.FullAppName} version!");
 
                 await ContentDialogHelper.CreateWarningDialog(
                     LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedMessage],
@@ -159,7 +159,7 @@ namespace Ryujinx.Ava
 
             if (!Version.TryParse(_buildVer, out Version newVersion))
             {
-                Logger.Error?.Print(LogClass.Application, $"Failed to convert the received {App.FullAppName} version from GitHub!");
+                Logger.Error?.Print(LogClass.Application, $"Failed to convert the received {RyujinxApp.FullAppName} version from GitHub!");
 
                 await ContentDialogHelper.CreateWarningDialog(
                     LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedGithubMessage],
@@ -266,7 +266,7 @@ namespace Ryujinx.Ava
                 SubHeader = LocaleManager.Instance[LocaleKeys.UpdaterDownloading],
                 IconSource = new SymbolIconSource { Symbol = Symbol.Download },
                 ShowProgressBar = true,
-                XamlRoot = App.MainWindow,
+                XamlRoot = RyujinxApp.MainWindow,
             };
 
             taskDialog.Opened += (s, e) =>
@@ -490,7 +490,7 @@ namespace Ryujinx.Ava
                 bytesWritten += readSize;
 
                 taskDialog.SetProgressBarState(GetPercentage(bytesWritten, totalBytes), TaskDialogProgressState.Normal);
-                App.SetTaskbarProgressValue(bytesWritten, totalBytes);
+                RyujinxApp.SetTaskbarProgressValue(bytesWritten, totalBytes);
 
                 updateFileStream.Write(buffer, 0, readSize);
             }