misc: chore: make some cleaner extensions for converting to/from ui/hle enums

Moved AppLibrary, Configuration, and PlayReport namespaces to Ryujinx.Systems, add the compat list stuff in the base Ryujinx.Systems namespace.
Moved the compatibility UI stuff to the proper UI view/viewmodel folders.

docs/compatibility.csv

@@ -631,6 +631,7 @@
 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
@@ -1382,6 +1383,9 @@
 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
@@ -2729,7 +2733,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,2023-08-01 19:29:53
+01009FB0172F4000,"SpongeBob SquarePants: The Cosmic Shake",gpu;UE4,ingame,2024-03-04 16:35:00
 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

src/Ryujinx.Graphics.GAL/IRenderer.cs

@@ -1,4 +1,6 @@
 using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.GAL.Multithreading;
 using System;
 using System.Threading;
 
@@ -10,6 +12,20 @@ namespace Ryujinx.Graphics.GAL
 
         bool PreferThreading { get; }
 
+        public IRenderer TryMakeThreaded(BackendThreading backendThreading = BackendThreading.Auto)
+        {
+            if (backendThreading is BackendThreading.On ||
+                (backendThreading is BackendThreading.Auto && PreferThreading))
+            {
+                Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({backendThreading}): True");
+                return new ThreadedRenderer(this);
+            }
+            
+            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({backendThreading}): False");
+
+            return this;
+        }
+
         IPipeline Pipeline { get; }
 
         IWindow Window { get; }

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnMitm/LdnMitmClient.cs

@@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnMitm
 
         private readonly LanDiscovery _lanDiscovery;
 
-        public LdnMitmClient(HLEConfiguration config)
+        public LdnMitmClient(HleConfiguration config)
         {
             UnicastIPAddressInformation localIpInterface = NetworkHelpers.GetLocalInterface(config.MultiplayerLanInterfaceId).Item2;
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/LdnMasterProxyClient.cs

@@ -51,13 +51,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
         private string _passphrase;
         private byte[] _gameVersion = new byte[0x10];
 
-        private readonly HLEConfiguration _config;
+        private readonly HleConfiguration _config;
 
         public event EventHandler<NetworkChangeEventArgs> NetworkChange;
 
         public ProxyConfig Config { get; private set; }
 
-        public LdnMasterProxyClient(string address, int port, HLEConfiguration config) : base(address, port)
+        public LdnMasterProxyClient(string address, int port, HleConfiguration config) : base(address, port)
         {
             if (ProxyHelpers.SupportsNoDelay())
             {

src/Ryujinx.HLE/HleConfiguration.cs

@@ -15,55 +15,55 @@ namespace Ryujinx.HLE
     /// <summary>
     /// HLE configuration.
     /// </summary>
-    public class HLEConfiguration
+    public class HleConfiguration
     {
         /// <summary>
         /// The virtual file system used by the FS service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly VirtualFileSystem VirtualFileSystem;
+        internal VirtualFileSystem VirtualFileSystem { get; private set; }
 
         /// <summary>
         /// The manager for handling a LibHac Horizon instance.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly LibHacHorizonManager LibHacHorizonManager;
+        internal LibHacHorizonManager LibHacHorizonManager { get; private set; }
 
         /// <summary>
         /// The account manager used by the account service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly AccountManager AccountManager;
+        internal AccountManager AccountManager { get; private set; }
 
         /// <summary>
         /// The content manager used by the NCM service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly ContentManager ContentManager;
+        internal ContentManager ContentManager { get; private set; }
 
         /// <summary>
         /// The persistent information between run for multi-application capabilities.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        public readonly UserChannelPersistence UserChannelPersistence;
+        public UserChannelPersistence UserChannelPersistence { get; private set; }
 
         /// <summary>
         /// The GPU renderer to use for all GPU operations.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly IRenderer GpuRenderer;
+        internal IRenderer GpuRenderer { get; private set; }
 
         /// <summary>
         /// The audio device driver to use for all audio operations.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly IHardwareDeviceDriver AudioDeviceDriver;
+        internal IHardwareDeviceDriver AudioDeviceDriver { get; private set; }
 
         /// <summary>
         /// The handler for various UI related operations needed outside of HLE.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly IHostUIHandler HostUIHandler;
+        internal IHostUIHandler HostUIHandler { get; private set; }
 
         /// <summary>
         /// Control the memory configuration used by the emulation context.
@@ -195,15 +195,7 @@ namespace Ryujinx.HLE
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
         public EnabledDirtyHack[] Hacks { internal get; set; }
 
-        public HLEConfiguration(VirtualFileSystem virtualFileSystem,
-                                LibHacHorizonManager libHacHorizonManager,
-                                ContentManager contentManager,
-                                AccountManager accountManager,
-                                UserChannelPersistence userChannelPersistence,
-                                IRenderer gpuRenderer,
-                                IHardwareDeviceDriver audioDeviceDriver,
-                                MemoryConfiguration memoryConfiguration,
-                                IHostUIHandler hostUIHandler,
+        public HleConfiguration(MemoryConfiguration memoryConfiguration,
                                 SystemLanguage systemLanguage,
                                 RegionCode region,
                                 VSyncMode vSyncMode,
@@ -227,15 +219,7 @@ namespace Ryujinx.HLE
                                 int customVSyncInterval,
                                 EnabledDirtyHack[] dirtyHacks = null)
         {
-            VirtualFileSystem = virtualFileSystem;
-            LibHacHorizonManager = libHacHorizonManager;
-            AccountManager = accountManager;
-            ContentManager = contentManager;
-            UserChannelPersistence = userChannelPersistence;
-            GpuRenderer = gpuRenderer;
-            AudioDeviceDriver = audioDeviceDriver;
             MemoryConfiguration = memoryConfiguration;
-            HostUIHandler = hostUIHandler;
             SystemLanguage = systemLanguage;
             Region = region;
             VSyncMode = vSyncMode;
@@ -259,5 +243,30 @@ namespace Ryujinx.HLE
             MultiplayerLdnServer = multiplayerLdnServer;
             Hacks = dirtyHacks ?? [];
         }
+
+        /// <summary>
+        /// Set the pre-configured services to use for this <see cref="HleConfiguration"/> instance.
+        /// </summary>
+        public HleConfiguration Configure(
+            VirtualFileSystem virtualFileSystem,
+            LibHacHorizonManager libHacHorizonManager,
+            ContentManager contentManager,
+            AccountManager accountManager,
+            UserChannelPersistence userChannelPersistence,
+            IRenderer gpuRenderer,
+            IHardwareDeviceDriver audioDeviceDriver,
+            IHostUIHandler hostUIHandler
+        )
+        {
+            VirtualFileSystem = virtualFileSystem;
+            LibHacHorizonManager = libHacHorizonManager;
+            AccountManager = accountManager;
+            ContentManager = contentManager;
+            UserChannelPersistence = userChannelPersistence;
+            GpuRenderer = gpuRenderer;
+            AudioDeviceDriver = audioDeviceDriver;
+            HostUIHandler = hostUIHandler;
+            return this;
+        }
     }
 }

src/Ryujinx.HLE/Switch.cs

@@ -20,7 +20,7 @@ namespace Ryujinx.HLE
     {
         public static Switch Shared { get; private set; }
         
-        public HLEConfiguration Configuration { get; }
+        public HleConfiguration Configuration { get; }
         public IHardwareDeviceDriver AudioDeviceDriver { get; }
         public MemoryBlock Memory { get; }
         public GpuContext Gpu { get; }
@@ -44,7 +44,7 @@ namespace Ryujinx.HLE
 
         public DirtyHacks DirtyHacks { get; }
 
-        public Switch(HLEConfiguration configuration)
+        public Switch(HleConfiguration configuration)
         {
             ArgumentNullException.ThrowIfNull(configuration.GpuRenderer);
             ArgumentNullException.ThrowIfNull(configuration.AudioDeviceDriver);
@@ -94,16 +94,20 @@ namespace Ryujinx.HLE
             Gpu.GPFifo.DispatchCalls();
         }
 
-        public void IncrementCustomVSyncInterval()
+        public int IncrementCustomVSyncInterval()
         {
             CustomVSyncInterval += 1;
             UpdateVSyncInterval();
+
+            return CustomVSyncInterval;
         }
 
-        public void DecrementCustomVSyncInterval()
+        public int DecrementCustomVSyncInterval()
         {
             CustomVSyncInterval -= 1;
             UpdateVSyncInterval();
+
+            return CustomVSyncInterval;
         }
 
         public void UpdateVSyncInterval()

src/Ryujinx/AppHost.cs

@@ -21,8 +21,8 @@ using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -902,53 +902,19 @@ namespace Ryujinx.Ava
                 _ => new OpenGLRenderer()
             };
 
-            BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
-
-            bool isGALThreaded = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
-            if (isGALThreaded)
-            {
-                renderer = new ThreadedRenderer(renderer);
-            }
-
-            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({threadingMode}): {isGALThreaded}");
-
             // Initialize Configuration.
-            MemoryConfiguration memoryConfiguration = ConfigurationState.Instance.System.DramSize.Value;
-
-            Device = new Switch(new HLEConfiguration(
-                VirtualFileSystem,
-                _viewModel.LibHacHorizonManager,
-                ContentManager,
-                _accountManager,
-                _userChannelPersistence,
-                renderer,
-                InitializeAudio(),
-                memoryConfiguration,
-                _viewModel.UiHandler,
-                (SystemLanguage)ConfigurationState.Instance.System.Language.Value,
-                (RegionCode)ConfigurationState.Instance.System.Region.Value,
-                ConfigurationState.Instance.Graphics.VSyncMode,
-                ConfigurationState.Instance.System.EnableDockedMode,
-                ConfigurationState.Instance.System.EnablePtc,
-                ConfigurationState.Instance.System.EnableInternetAccess,
-                ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
-                ConfigurationState.Instance.System.FsGlobalAccessLogMode,
-                ConfigurationState.Instance.System.MatchSystemTime 
-                    ? 0 
-                    : ConfigurationState.Instance.System.SystemTimeOffset,
-                ConfigurationState.Instance.System.TimeZone,
-                ConfigurationState.Instance.System.MemoryManagerMode,
-                ConfigurationState.Instance.System.IgnoreMissingServices,
-                ConfigurationState.Instance.Graphics.AspectRatio,
-                ConfigurationState.Instance.System.AudioVolume,
-                ConfigurationState.Instance.System.UseHypervisor,
-                ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value,
-                ConfigurationState.Instance.Multiplayer.Mode,
-                ConfigurationState.Instance.Multiplayer.DisableP2p,
-                ConfigurationState.Instance.Multiplayer.LdnPassphrase,
-                ConfigurationState.Instance.Multiplayer.GetLdnServer(),
-                ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value,
-                ConfigurationState.Instance.Hacks.ShowDirtyHacks ? ConfigurationState.Instance.Hacks.EnabledHacks : null));
+            Device = new Switch(ConfigurationState.Instance.CreateHleConfiguration()
+                .Configure(
+                    VirtualFileSystem,
+                    _viewModel.LibHacHorizonManager,
+                    ContentManager,
+                    _accountManager,
+                    _userChannelPersistence,
+                    renderer.TryMakeThreaded(ConfigurationState.Instance.Graphics.BackendThreading),
+                    InitializeAudio(),
+                    _viewModel.UiHandler
+                )
+            );
         }
 
         private static IHardwareDeviceDriver InitializeAudio()
@@ -1182,6 +1148,9 @@ namespace Ryujinx.Ava
 
         private void UpdateShaderCount()
         {
+            if (_displayCount is 0 && _renderer.ProgramCount is 0)
+                return;
+            
             // If there is a mismatch between total program compile and previous count
             // this means new shaders have been compiled and should be displayed.
             if (_renderer.ProgramCount != _previousCount)
@@ -1255,12 +1224,10 @@ namespace Ryujinx.Ava
                             VSyncModeToggle();
                             break;
                         case KeyboardHotkeyState.CustomVSyncIntervalDecrement:
-                            Device.DecrementCustomVSyncInterval();
-                            _viewModel.CustomVSyncInterval -= 1;
+                            _viewModel.CustomVSyncInterval = Device.DecrementCustomVSyncInterval();
                             break;
                         case KeyboardHotkeyState.CustomVSyncIntervalIncrement:
-                            Device.IncrementCustomVSyncInterval();
-                            _viewModel.CustomVSyncInterval += 1;
+                            _viewModel.CustomVSyncInterval = Device.IncrementCustomVSyncInterval();
                             break;
                         case KeyboardHotkeyState.Screenshot:
                             ScreenshotRequested = true;

src/Ryujinx/Common/ApplicationHelper.cs

@@ -13,10 +13,10 @@ using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
+using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.FileSystem;
@@ -216,11 +216,7 @@ namespace Ryujinx.Ava.Common
                     return;
                 }
 
-                IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
-                    ? IntegrityCheckLevel.ErrorOnInvalid
-                    : IntegrityCheckLevel.None;
-
-                (Nca updatePatchNca, _) = mainNca.GetUpdateData(_virtualFileSystem, checkLevel, programIndex, out _);
+                (Nca updatePatchNca, _) = mainNca.GetUpdateData(_virtualFileSystem, ConfigurationState.Instance.System.IntegrityCheckLevel, programIndex, out _);
                 if (updatePatchNca is not null)
                 {
                     patchNca = updatePatchNca;

src/Ryujinx/Common/LocaleManager.cs

@@ -1,6 +1,6 @@
 using Gommon;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Utilities;
 using System;

src/Ryujinx/Common/Models/XCITrimmerFileModel.cs

@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 

src/Ryujinx/DiscordIntegrationModule.cs

@@ -1,9 +1,9 @@
 using DiscordRPC;
 using Gommon;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Ava.Utilities.PlayReport;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Systems.PlayReport;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE;

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -2,7 +2,7 @@ using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -312,49 +312,42 @@ namespace Ryujinx.Headless
             return new OpenGLRenderer();
         }
 
-        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options)
-        {
-            BackendThreading threadingMode = options.BackendThreading;
-
-            bool threadedGAL = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
-
-            if (threadedGAL)
-            {
-                renderer = new ThreadedRenderer(renderer);
-            }
-
-            HLEConfiguration configuration = new(_virtualFileSystem,
-                _libHacHorizonManager,
-                _contentManager,
-                _accountManager,
-                _userChannelPersistence,
-                renderer,
-                new SDL2HardwareDeviceDriver(),
-                options.DramSize,
-                window,
-                options.SystemLanguage,
-                options.SystemRegion,
-                options.VSyncMode,
-                !options.DisableDockedMode,
-                !options.DisablePTC,
-                options.EnableInternetAccess,
-                !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
-                options.FsGlobalAccessLogMode,
-                options.SystemTimeOffset,
-                options.SystemTimeZone,
-                options.MemoryManagerMode,
-                options.IgnoreMissingServices,
-                options.AspectRatio,
-                options.AudioVolume,
-                options.UseHypervisor ?? true,
-                options.MultiplayerLanInterfaceId,
-                Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
-                false,
-                string.Empty,
-                string.Empty,
-                options.CustomVSyncInterval);
-
-            return new Switch(configuration);
-        }
+        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) =>
+            new(
+                new HleConfiguration(
+                        options.DramSize,
+                        options.SystemLanguage,
+                        options.SystemRegion,
+                        options.VSyncMode,
+                        !options.DisableDockedMode,
+                        !options.DisablePTC,
+                        options.EnableInternetAccess,
+                        !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                        options.FsGlobalAccessLogMode,
+                        options.SystemTimeOffset,
+                        options.SystemTimeZone,
+                        options.MemoryManagerMode,
+                        options.IgnoreMissingServices,
+                        options.AspectRatio,
+                        options.AudioVolume,
+                        options.UseHypervisor ?? true,
+                        options.MultiplayerLanInterfaceId,
+                        Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
+                        false,
+                        string.Empty,
+                        string.Empty,
+                        options.CustomVSyncInterval
+                    )
+                    .Configure(
+                        _virtualFileSystem,
+                        _libHacHorizonManager,
+                        _contentManager,
+                        _accountManager,
+                        _userChannelPersistence,
+                        renderer.TryMakeThreaded(options.BackendThreading),
+                        new SDL2HardwareDeviceDriver(),
+                        window
+                    )
+            );
     }
 }

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -1,7 +1,7 @@
 using CommandLine;
 using Gommon;
 using Ryujinx.Ava;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;

src/Ryujinx/Headless/Options.cs

@@ -1,6 +1,7 @@
 using CommandLine;
 using Gommon;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Systems.Configuration.System;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.HLE;
@@ -37,7 +38,7 @@ namespace Ryujinx.Headless
                 EnableInternetAccess = configurationState.System.EnableInternetAccess;
 
             if (NeedsOverride(nameof(DisableFsIntegrityChecks)))
-                DisableFsIntegrityChecks = configurationState.System.EnableFsIntegrityChecks;
+                DisableFsIntegrityChecks = !configurationState.System.EnableFsIntegrityChecks;
             
             if (NeedsOverride(nameof(FsGlobalAccessLogMode)))
                 FsGlobalAccessLogMode = configurationState.System.FsGlobalAccessLogMode;
@@ -58,10 +59,10 @@ namespace Ryujinx.Headless
                 DisableDockedMode = !configurationState.System.EnableDockedMode;
 
             if (NeedsOverride(nameof(SystemLanguage)))
-                SystemLanguage = (SystemLanguage)(int)configurationState.System.Language.Value;
+                SystemLanguage = configurationState.System.Language.Value.ToHLE();
             
             if (NeedsOverride(nameof(SystemRegion)))
-                SystemRegion = (RegionCode)(int)configurationState.System.Region.Value;
+                SystemRegion = configurationState.System.Region.Value.ToHLE();
             
             if (NeedsOverride(nameof(SystemTimeZone)))
                 SystemTimeZone = configurationState.System.TimeZone;

src/Ryujinx/Program.cs

@@ -8,7 +8,8 @@ using Projektanker.Icons.Avalonia.MaterialDesign;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Systems.Configuration.System;
 using Ryujinx.Ava.Utilities.SystemInfo;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
@@ -282,16 +283,16 @@ namespace Ryujinx.Ava
 
             // Check if region was overridden. 
             if (CommandLineState.OverrideSystemRegion is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Ryujinx.HLE.HOS.SystemState.RegionCode result))
+                if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out HLE.HOS.SystemState.RegionCode result))
                 {
-                    ConfigurationState.Instance.System.Region.Value = (Utilities.Configuration.System.Region)result;
+                    ConfigurationState.Instance.System.Region.Value = result.ToUI();
                 }
 
             //Check if language was overridden. 
             if (CommandLineState.OverrideSystemLanguage is not null)
-                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Ryujinx.HLE.HOS.SystemState.SystemLanguage result))
+                if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out HLE.HOS.SystemState.SystemLanguage result))
                 {
-                    ConfigurationState.Instance.System.Language.Value = (Utilities.Configuration.System.Language)result;
+                    ConfigurationState.Instance.System.Language.Value = result.ToUI();
                 }
 
             // Check if hardware-acceleration was overridden.

src/Ryujinx/RyujinxApp.axaml

@@ -17,4 +17,9 @@
         <sty:FluentAvaloniaTheme PreferUserAccentColor="True" PreferSystemTheme="False" />
         <StyleInclude Source="/Assets/Styles/Styles.xaml" />
     </Application.Styles>
+    <NativeMenu.Menu>
+        <NativeMenu>
+            <NativeMenuItem Header="About Ryujinx" Click="AboutRyujinx_OnClick" />
+        </NativeMenu>
+    </NativeMenu.Menu>
 </Application>

src/Ryujinx/RyujinxApp.axaml.cs

@@ -12,7 +12,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using System;
@@ -147,5 +147,10 @@ namespace Ryujinx.Ava
             Current is RyujinxApp { PlatformSettings: not null } app
                 ? ConvertThemeVariant(app.PlatformSettings.GetColorValues().ThemeVariant)
                 : ThemeVariant.Default;
+
+        private async void AboutRyujinx_OnClick(object sender, EventArgs e)
+        {
+            await AboutWindow.Show();
+        }
     }
 }

src/Ryujinx/Systems/AppLibrary/ApplicationCountUpdatedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Ava.Utilities.AppLibrary
+namespace Ryujinx.Ava.Systems.AppLibrary
 {
     public class ApplicationCountUpdatedEventArgs : EventArgs
     {

src/Ryujinx/Systems/AppLibrary/ApplicationData.cs

@@ -9,8 +9,8 @@ using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Utilities.Compat;
-using Ryujinx.Ava.Utilities.PlayReport;
+using Ryujinx.Ava.Utilities;
+using Ryujinx.Ava.Systems.PlayReport;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
@@ -18,7 +18,7 @@ using System;
 using System.IO;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Utilities.AppLibrary
+namespace Ryujinx.Ava.Systems.AppLibrary
 {
     public class ApplicationData
     {

src/Ryujinx/Systems/AppLibrary/ApplicationJsonSerializerContext.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Utilities.AppLibrary
+namespace Ryujinx.Ava.Systems.AppLibrary
 {
     [JsonSourceGenerationOptions(WriteIndented = true)]
     [JsonSerializable(typeof(ApplicationMetadata))]

src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs

@@ -12,8 +12,9 @@ using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Models;
-using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Ava.Utilities.Configuration.System;
+using Ryujinx.Ava.Utilities;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Systems.Configuration.System;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -38,7 +39,7 @@ using MissingKeyException = LibHac.Common.Keys.MissingKeyException;
 using Path = System.IO.Path;
 using TimeSpan = System.TimeSpan;
 
-namespace Ryujinx.Ava.Utilities.AppLibrary
+namespace Ryujinx.Ava.Systems.AppLibrary
 {
     public class ApplicationLibrary
     {
@@ -617,15 +618,11 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                     case ".xci":
                     case ".nsp":
                         {
-                            IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
-                                ? IntegrityCheckLevel.ErrorOnInvalid
-                                : IntegrityCheckLevel.None;
-
                             using IFileSystem pfs =
                                 PartitionFileSystemUtils.OpenApplicationFileSystem(filePath, _virtualFileSystem);
 
                             Dictionary<ulong, ContentMetaData> updates =
-                                pfs.GetContentData(ContentMetaType.Patch, _virtualFileSystem, checkLevel);
+                                pfs.GetContentData(ContentMetaType.Patch, _virtualFileSystem, ConfigurationState.Instance.System.IntegrityCheckLevel);
 
                             if (updates.Count == 0)
                             {

src/Ryujinx/Systems/AppLibrary/ApplicationMetadata.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Utilities.AppLibrary
+namespace Ryujinx.Ava.Systems.AppLibrary
 {
     public class ApplicationMetadata
     {

src/Ryujinx/Systems/AppLibrary/LdnGameData.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.AppLibrary
+namespace Ryujinx.Ava.Systems.AppLibrary
 {
     public struct LdnGameData
     {

src/Ryujinx/Systems/AppLibrary/LdnGameDataReceivedEventArgs.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Ava.Utilities.AppLibrary
+namespace Ryujinx.Ava.Systems.AppLibrary
 {
     public class LdnGameDataReceivedEventArgs : EventArgs
     {

src/Ryujinx/Systems/AppLibrary/LdnGameDataSerializerContext.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Utilities.AppLibrary
+namespace Ryujinx.Ava.Systems.AppLibrary
 {
     [JsonSerializable(typeof(IEnumerable<LdnGameData>))]
     internal partial class LdnGameDataSerializerContext : JsonSerializerContext;

src/Ryujinx/Systems/CompatibilityCsv.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 
-namespace Ryujinx.Ava.Utilities.Compat
+namespace Ryujinx.Ava.Systems
 {
     public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
     {

src/Ryujinx/Systems/Configuration/AudioBackend.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     [JsonConverter(typeof(TypedStringEnumConverter<AudioBackend>))]
     public enum AudioBackend

src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs

@@ -1,5 +1,5 @@
-using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Multiplayer;
@@ -8,7 +8,7 @@ using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
 using System.Collections.Generic;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public class ConfigurationFileFormat
     {

src/Ryujinx/Systems/Configuration/ConfigurationFileFormatSettings.cs

@@ -1,6 +1,6 @@
 using Ryujinx.Common.Utilities;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     internal static class ConfigurationFileFormatSettings
     {

src/Ryujinx/Systems/Configuration/ConfigurationJsonSerializerContext.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     [JsonSourceGenerationOptions(WriteIndented = true)]
     [JsonSerializable(typeof(ConfigurationFileFormat))]

src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs

@@ -1,7 +1,7 @@
 using Avalonia.Media;
 using Gommon;
-using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -14,7 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using RyuLogger = Ryujinx.Common.Logging.Logger;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public partial class ConfigurationState
     {

src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs

@@ -1,8 +1,8 @@
 using ARMeilleure;
 using Gommon;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using LibHac.Tools.FsSystem;
+using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -11,15 +11,16 @@ using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
+using Ryujinx.HLE.HOS.SystemState;
 using System.Collections.Generic;
 using System.Linq;
 using RyuLogger = Ryujinx.Common.Logging.Logger;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public partial class ConfigurationState
     {
-                /// <summary>
+        /// <summary>
         /// UI configuration section
         /// </summary>
         public class UISection
@@ -351,6 +352,10 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// </summary>
             public ReactiveObject<bool> EnableFsIntegrityChecks { get; private set; }
 
+            public IntegrityCheckLevel IntegrityCheckLevel => EnableFsIntegrityChecks
+                ? IntegrityCheckLevel.ErrorOnInvalid
+                : IntegrityCheckLevel.None;
+
             /// <summary>
             /// Enables FS access log output to the console. Possible modes are 0-3
             /// </summary>
@@ -838,5 +843,35 @@ namespace Ryujinx.Ava.Utilities.Configuration
             EnableHardwareAcceleration = new ReactiveObject<bool>();
             HideCursor = new ReactiveObject<HideCursorMode>();
         }
+
+        public HleConfiguration CreateHleConfiguration() =>
+            new(
+                System.DramSize,
+                System.Language.Value.ToHLE(),
+                System.Region.Value.ToHLE(),
+                Graphics.VSyncMode,
+                System.EnableDockedMode,
+                System.EnablePtc,
+                System.EnableInternetAccess,
+                System.EnableFsIntegrityChecks 
+                    ? IntegrityCheckLevel.ErrorOnInvalid 
+                    : IntegrityCheckLevel.None,
+                System.FsGlobalAccessLogMode,
+                System.MatchSystemTime
+                    ? 0
+                    : System.SystemTimeOffset,
+                System.TimeZone,
+                System.MemoryManagerMode,
+                System.IgnoreMissingServices,
+                Graphics.AspectRatio,
+                System.AudioVolume,
+                System.UseHypervisor,
+                Multiplayer.LanInterfaceId,
+                Multiplayer.Mode,
+                Multiplayer.DisableP2p,
+                Multiplayer.LdnPassphrase,
+                Instance.Multiplayer.GetLdnServer(),
+                Instance.Graphics.CustomVSyncInterval,
+                Instance.Hacks.ShowDirtyHacks ? Instance.Hacks.EnabledHacks : null);
     }
 }

src/Ryujinx/Systems/Configuration/ConfigurationState.cs

@@ -1,5 +1,5 @@
-using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
@@ -9,7 +9,7 @@ using Ryujinx.HLE;
 using System;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public partial class ConfigurationState
     {
@@ -327,5 +327,5 @@ namespace Ryujinx.Ava.Utilities.Configuration
 
             return GraphicsBackend.OpenGl;
         }
-            }
-        }
+    }
+}

src/Ryujinx/Systems/Configuration/FileTypes.cs

@@ -1,8 +1,8 @@
 using System;
 
-using static Ryujinx.Ava.Utilities.Configuration.ConfigurationState.UISection;
+using static Ryujinx.Ava.Systems.Configuration.ConfigurationState.UISection;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public enum FileTypes
     {
@@ -17,12 +17,12 @@ namespace Ryujinx.Ava.Utilities.Configuration
     public static class FileTypesExtensions
     {
         /// <summary>
-        /// Gets the current <see cref="ShownFileTypeSettings"/> value for the correlating FileType name.
+        /// Gets the current <see cref="ConfigurationState.UISection.ShownFileTypeSettings"/> value for the correlating FileType name.
         /// </summary>
-        /// <param name="type">The name of the <see cref="ShownFileTypeSettings"/> parameter to get the value of.</param>
+        /// <param name="type">The name of the <see cref="ConfigurationState.UISection.ShownFileTypeSettings"/> parameter to get the value of.</param>
         /// <param name="config">The config instance to get the value from.</param>
         /// <returns>The current value of the setting. Value is <see langword="true"/> if the file type is to be shown on the games list, <see langword="false"/> otherwise.</returns>
-        public static bool GetConfigValue(this FileTypes type, ShownFileTypeSettings config) => type switch
+        public static bool GetConfigValue(this FileTypes type, ConfigurationState.UISection.ShownFileTypeSettings config) => type switch
         {
             FileTypes.NSP => config.NSP.Value,
             FileTypes.PFS0 => config.PFS0.Value,

src/Ryujinx/Systems/Configuration/LoggerModule.cs

@@ -4,7 +4,7 @@ using Ryujinx.Common.Logging.Targets;
 using System;
 using System.IO;
 
-namespace Ryujinx.Ava.Utilities.Configuration
+namespace Ryujinx.Ava.Systems.Configuration
 {
     public static class LoggerModule
     {

src/Ryujinx/Systems/Configuration/System/Language.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Utilities.Configuration.System
+namespace Ryujinx.Ava.Systems.Configuration.System
 {
     [JsonConverter(typeof(TypedStringEnumConverter<Language>))]
     public enum Language
@@ -25,4 +25,13 @@ namespace Ryujinx.Ava.Utilities.Configuration.System
         TraditionalChinese,
         BrazilianPortuguese,
     }
+
+    public static class LanguageEnumHelper
+    {
+        public static Language ToUI(this HLE.HOS.SystemState.SystemLanguage hleLanguage)
+            => (Language)hleLanguage;
+
+        public static HLE.HOS.SystemState.SystemLanguage ToHLE(this Language uiLanguage)
+            => (HLE.HOS.SystemState.SystemLanguage)uiLanguage;
+    }
 }

src/Ryujinx/Systems/Configuration/System/Region.cs

@@ -0,0 +1,26 @@
+using Ryujinx.Common.Utilities;
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Ava.Systems.Configuration.System
+{
+    [JsonConverter(typeof(TypedStringEnumConverter<Region>))]
+    public enum Region
+    {
+        Japan,
+        USA,
+        Europe,
+        Australia,
+        China,
+        Korea,
+        Taiwan,
+    }
+    
+    public static class RegionEnumHelper
+    {
+        public static Region ToUI(this HLE.HOS.SystemState.RegionCode hleRegion)
+            => (Region)hleRegion;
+
+        public static HLE.HOS.SystemState.RegionCode ToHLE(this Region uiRegion)
+            => (HLE.HOS.SystemState.RegionCode)uiRegion;
+    }
+}

src/Ryujinx/Systems/Configuration/UI/ColumnSort.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.Utilities.Configuration.UI
+namespace Ryujinx.Ava.Systems.Configuration.UI
 {
     public struct ColumnSort
     {

src/Ryujinx/Systems/Configuration/UI/FocusLostType.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Utilities.Configuration.UI
+namespace Ryujinx.Ava.Systems.Configuration.UI
 {
     [JsonConverter(typeof(TypedStringEnumConverter<FocusLostType>))]
     public enum FocusLostType

src/Ryujinx/Systems/Configuration/UI/GuiColumns.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.Utilities.Configuration.UI
+namespace Ryujinx.Ava.Systems.Configuration.UI
 {
     public struct GuiColumns
     {

src/Ryujinx/Systems/Configuration/UI/ShownFileTypes.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.Utilities.Configuration.UI
+namespace Ryujinx.Ava.Systems.Configuration.UI
 {
     public struct ShownFileTypes
     {

src/Ryujinx/Systems/Configuration/UI/UpdaterType.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Common.Utilities;
 using System.Text.Json.Serialization;
 
-namespace Ryujinx.Ava.Utilities.Configuration.UI
+namespace Ryujinx.Ava.Systems.Configuration.UI
 {
     [JsonConverter(typeof(TypedStringEnumConverter<UpdaterType>))]
     public enum UpdaterType

src/Ryujinx/Systems/Configuration/UI/WindowStartup.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.Utilities.Configuration.UI
+namespace Ryujinx.Ava.Systems.Configuration.UI
 {
     public struct WindowStartup
     {

src/Ryujinx/Systems/PlayReport/Analyzer.cs

@@ -1,5 +1,5 @@
 using Gommon;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Logging;
 using System;
 using System.Collections.Generic;
@@ -7,7 +7,7 @@ using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     /// <summary>
     /// The entrypoint for the Play Report analysis system.

src/Ryujinx/Systems/PlayReport/Delegates.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     /// <summary>
     /// The delegate type that powers single value formatters.<br/>

src/Ryujinx/Systems/PlayReport/MatchedValues.cs

@@ -1,8 +1,8 @@
 using MsgPack;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Collections.Generic;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     public abstract class MatchedValue<T>
     {

src/Ryujinx/Systems/PlayReport/PlayReports.Formatters.cs

@@ -5,7 +5,7 @@ using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     public partial class PlayReports
     {

src/Ryujinx/Systems/PlayReport/PlayReports.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     public static partial class PlayReports
     {

src/Ryujinx/Systems/PlayReport/Specs.cs

@@ -1,10 +1,10 @@
 using MsgPack;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     /// <summary>
     /// A mapping of title IDs to value formatter specs.
@@ -103,7 +103,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
         /// <br/><br/>
         /// The 'Sparse' multi-value formatters do not require every key to be present.
-        /// If you need this requirement, use <see cref="AddMultiValueFormatter(string[], Ryujinx.Ava.Utilities.PlayReport.MultiValueFormatter)"/>.
+        /// If you need this requirement, use <see cref="AddMultiValueFormatter(string[], MultiValueFormatter)"/>.
         /// </summary>
         /// <param name="reportKeys">The key names to match.</param>
         /// <param name="valueFormatter">The function which can format the values.</param>
@@ -118,7 +118,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         /// matching a specific set of keys that could exist in a Play Report for the previously specified title IDs.
         /// <br/><br/>
         /// The 'Sparse' multi-value formatters do not require every key to be present.
-        /// If you need this requirement, use <see cref="AddMultiValueFormatter(int, string[], Ryujinx.Ava.Utilities.PlayReport.MultiValueFormatter)"/>.
+        /// If you need this requirement, use <see cref="AddMultiValueFormatter(int, string[], MultiValueFormatter)"/>.
         /// </summary>
         /// <param name="priority">The resolution priority of this value formatter. Higher resolves sooner.</param>
         /// <param name="reportKeys">The key names to match.</param>

src/Ryujinx/Systems/PlayReport/Value.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.PlayReport
+namespace Ryujinx.Ava.Systems.PlayReport
 {
     /// <summary>
     /// The base input data to a ValueFormatter delegate,

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -7,7 +7,7 @@ using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.Applets;

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

@@ -9,17 +9,14 @@ 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 : UserControl
+    public partial class ProfileSelectorDialog : RyujinxControl<ProfileSelectorDialogViewModel>
     {
-        public ProfileSelectorDialogViewModel ViewModel { get; set; }
-
         public ProfileSelectorDialog(ProfileSelectorDialogViewModel viewModel)
         {
             DataContext = ViewModel = viewModel;

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

@@ -9,10 +9,10 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -26,6 +26,7 @@ namespace Ryujinx.Ava.UI.Controls
 {
     public class ApplicationContextMenu : MenuFlyout
     {
+        
         public ApplicationContextMenu()
         {
             InitializeComponent();

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

@@ -23,13 +23,12 @@ using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
 
 namespace Ryujinx.Ava.UI.Controls
 {
-    public partial class NavigationDialogHost : UserControl
+    public partial class NavigationDialogHost : RyujinxControl<UserProfileViewModel>
     {
         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

@@ -0,0 +1,24 @@
+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
+            {
+                if (DataContext is not TViewModel viewModel)
+                    throw new InvalidOperationException(
+                        $"Underlying DataContext is not of type {typeof(TViewModel).AsPrettyString()}; " +
+                        $"Actual type is {DataContext?.GetType().AsPrettyString()}");
+
+                return viewModel;
+            }
+            set => DataContext = value;
+        }
+    }
+}

src/Ryujinx/UI/Helpers/ApplicationOpenedEventArgs.cs

@@ -1,5 +1,5 @@
 using Avalonia.Interactivity;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 
 namespace Ryujinx.Ava.UI.Helpers
 {

src/Ryujinx/UI/Helpers/ContentDialogHelper.cs

@@ -4,6 +4,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
+using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
@@ -21,6 +22,23 @@ namespace Ryujinx.Ava.UI.Helpers
         private static bool _isChoiceDialogOpen;
         private static ContentDialogOverlayWindow _contentDialogOverlayWindow;
 
+        public static ContentDialog ApplyStyles(
+            this ContentDialog contentDialog, 
+            double closeButtonWidth = 80, 
+            HorizontalAlignment buttonSpaceAlignment = HorizontalAlignment.Right)
+        {
+            Style closeButton = new(x => x.Name("CloseButton"));
+            closeButton.Setters.Add(new Setter(Layoutable.WidthProperty, closeButtonWidth));
+            
+            Style closeButtonParent = new(x => x.Name("CommandSpace"));
+            closeButtonParent.Setters.Add(new Setter(Layoutable.HorizontalAlignmentProperty, buttonSpaceAlignment));
+
+            contentDialog.Styles.Add(closeButton);
+            contentDialog.Styles.Add(closeButtonParent);
+
+            return contentDialog;
+        }
+
         private async static Task<UserResult> ShowContentDialog(
              string title,
              object content,
@@ -40,19 +58,19 @@ namespace Ryujinx.Ava.UI.Helpers
                 SecondaryButtonText = secondaryButton,
                 CloseButtonText = closeButton,
                 Content = content,
-                PrimaryButtonCommand = MiniCommand.Create(() =>
+                PrimaryButtonCommand = Commands.Create(() =>
                 {
                     result = primaryButtonResult;
                 })
             };
 
-            contentDialog.SecondaryButtonCommand = MiniCommand.Create(() =>
+            contentDialog.SecondaryButtonCommand = Commands.Create(() =>
             {
                 result = UserResult.No;
                 contentDialog.PrimaryButtonClick -= deferCloseAction;
             });
 
-            contentDialog.CloseButtonCommand = MiniCommand.Create(() =>
+            contentDialog.CloseButtonCommand = Commands.Create(() =>
             {
                 result = UserResult.Cancel;
                 contentDialog.PrimaryButtonClick -= deferCloseAction;

src/Ryujinx/UI/Helpers/Converters/MultiplayerInfoConverter.cs

@@ -2,7 +2,7 @@ using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System;
 using System.Globalization;
 using System.Text;

src/Ryujinx/UI/Helpers/LoggerAdapter.cs

@@ -1,7 +1,7 @@
 using Avalonia.Logging;
 using Avalonia.Utilities;
 using Gommon;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Logging;
 using System;
 using System.Text;

src/Ryujinx/UI/Helpers/MiniCommand.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace Ryujinx.Ava.UI.Helpers
-{
-    public sealed class MiniCommand<T> : MiniCommand, ICommand
-    {
-        private readonly Action<T> _callback;
-        private bool _busy;
-        private readonly Func<T, Task> _asyncCallback;
-
-        public MiniCommand(Action<T> callback)
-        {
-            _callback = callback;
-        }
-
-        public MiniCommand(Func<T, Task> callback)
-        {
-            _asyncCallback = callback;
-        }
-
-        private bool Busy
-        {
-            get => _busy;
-            set
-            {
-                _busy = value;
-                CanExecuteChanged?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        public override event EventHandler CanExecuteChanged;
-        public override bool CanExecute(object parameter) => !_busy;
-
-        public override async void Execute(object parameter)
-        {
-            if (Busy)
-            {
-                return;
-            }
-            try
-            {
-                Busy = true;
-                if (_callback != null)
-                {
-                    _callback((T)parameter);
-                }
-                else
-                {
-                    await _asyncCallback((T)parameter);
-                }
-            }
-            finally
-            {
-                Busy = false;
-            }
-        }
-    }
-
-    public abstract class MiniCommand : ICommand
-    {
-        public static MiniCommand Create(Action callback) => new MiniCommand<object>(_ => callback());
-        public static MiniCommand Create<TArg>(Action<TArg> callback) => new MiniCommand<TArg>(callback);
-        public static MiniCommand CreateFromTask(Func<Task> callback) => new MiniCommand<object>(_ => callback());
-        public static MiniCommand CreateFromTask<TArg>(Func<TArg, Task> callback) => new MiniCommand<TArg>(callback);
-
-        public abstract bool CanExecute(object parameter);
-        public abstract void Execute(object parameter);
-        public abstract event EventHandler CanExecuteChanged;
-    }
-}

src/Ryujinx/UI/Models/Generic/LastPlayedSortComparer.cs

@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System;
 using System.Collections.Generic;
 

src/Ryujinx/UI/Models/Generic/TimePlayedSortComparer.cs

@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System;
 using System.Collections.Generic;
 

src/Ryujinx/UI/Models/SaveModel.cs

@@ -3,7 +3,7 @@ using LibHac.Fs;
 using LibHac.Ncm;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.HLE.FileSystem;
 using System.IO;
 using System.Linq;

src/Ryujinx/UI/Renderer/EmbeddedWindow.cs

@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Platform;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using SPB.Graphics;

src/Ryujinx/UI/Renderer/EmbeddedWindowOpenGL.cs

@@ -1,5 +1,5 @@
 using OpenTK.Graphics.OpenGL;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;

src/Ryujinx/UI/Renderer/RendererHost.cs

@@ -1,10 +1,8 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
-using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Common;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Logging;
 using System;
 
 namespace Ryujinx.Ava.UI.Renderer
@@ -39,32 +37,6 @@ namespace Ryujinx.Ava.UI.Renderer
                 _ => 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/AboutWindowViewModel.cs

@@ -5,7 +5,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
 using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using System;
 
 namespace Ryujinx.Ava.UI.ViewModels

src/Ryujinx/UI/ViewModels/AppListFavoriteComparable.cs

@@ -1,4 +1,4 @@
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System;
 
 namespace Ryujinx.Ava.UI.ViewModels

src/Ryujinx/UI/ViewModels/ApplicationDataViewModel.cs

@@ -1,7 +1,7 @@
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.PlayReport;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.PlayReport;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {

src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs

@@ -1,10 +1,10 @@
 using Gommon;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Ava.Utilities.Compat
+namespace Ryujinx.Ava.UI.ViewModels
 {
     public class CompatibilityViewModel : BaseModel
     {

src/Ryujinx/UI/ViewModels/DlcSelectViewModel.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.Common.Models;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Linq;
 
 namespace Ryujinx.Ava.UI.ViewModels

src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs

@@ -7,7 +7,7 @@ using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;

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

@@ -10,7 +10,7 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;

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

@@ -3,7 +3,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Humanizer;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using System.Globalization;
 
 namespace Ryujinx.Ava.UI.ViewModels.Input

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -23,8 +23,8 @@ using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Models.Generic;
 using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;

src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs

@@ -7,7 +7,7 @@ using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;

src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Gommon;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -12,9 +12,9 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Ava.Utilities.Configuration.System;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Systems.Configuration.System;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.GraphicsDriver;

src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs

@@ -6,7 +6,7 @@ using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs

@@ -21,7 +21,7 @@ using Image = SkiaSharp.SKImage;
 
 namespace Ryujinx.Ava.UI.ViewModels
 {
-    internal partial class UserFirmwareAvatarSelectorViewModel : BaseModel
+    public 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
 {
-    internal partial class UserProfileImageSelectorViewModel : BaseModel
+    public partial class UserProfileImageSelectorViewModel : BaseModel
     {
         [ObservableProperty] private bool _firmwareFound;
     }

src/Ryujinx/UI/ViewModels/XCITrimmerViewModel.cs

@@ -6,7 +6,7 @@ using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Utilities;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

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

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

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 : UserControl
+    public partial class InputView : RyujinxControl<InputViewModel>
     {
         private bool _dialogOpen;
-        private InputViewModel ViewModel { get; set; }
 
         public InputView()
         {
-            DataContext = ViewModel = new InputViewModel(this);
+            ViewModel = new InputViewModel(this);
 
             InitializeComponent();
         }

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

@@ -4,6 +4,7 @@ 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;
@@ -13,7 +14,7 @@ using Key = Ryujinx.Common.Configuration.Hid.Key;
 
 namespace Ryujinx.Ava.UI.Views.Input
 {
-    public partial class KeyboardInputView : UserControl
+    public partial class KeyboardInputView : RyujinxControl<KeyboardInputViewModel>
     {
         private ButtonKeyAssigner _currentAssigner;
 
@@ -60,106 +61,103 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                     PointerPressed += MouseClick;
 
-                    if (DataContext is not KeyboardInputViewModel viewModel)
-                        return;
-
                     IKeyboard keyboard =
-                        (IKeyboard)viewModel.ParentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
+                        (IKeyboard)ViewModel.ParentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
                     IButtonAssigner assigner = 
-                        new KeyboardKeyAssigner((IKeyboard)viewModel.ParentModel.SelectedGamepad);
+                        new KeyboardKeyAssigner((IKeyboard)ViewModel.ParentModel.SelectedGamepad);
 
-                    _currentAssigner.ButtonAssigned += (_, e) =>
+                    _currentAssigner.ButtonAssigned += (_, be) =>
                     {
-                        if (e.ButtonValue.HasValue)
+                        if (be.ButtonValue.HasValue)
                         {
-                            Button buttonValue = e.ButtonValue.Value;
-                            viewModel.ParentModel.IsModified = true;
+                            Button buttonValue = be.ButtonValue.Value;
+                            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,19 +2,18 @@
 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 : UserControl
+    public partial class LedInputView : RyujinxControl<LedInputViewModel>
     {
-        private readonly LedInputViewModel _viewModel;
-        
         public LedInputView(ControllerInputViewModel viewModel)
         {
-            DataContext = _viewModel = new LedInputViewModel
+            ViewModel = new LedInputViewModel
             {
                 ParentModel = viewModel.ParentModel,
                 TurnOffLed = viewModel.Config.TurnOffLed,
@@ -29,20 +28,18 @@ namespace Ryujinx.UI.Views.Input
         private void ColorPickerButton_OnColorChanged(ColorPickerButton sender, ColorButtonColorChangedEventArgs args)
         {
             if (!args.NewColor.HasValue) return;
-            if (DataContext is not LedInputViewModel lvm) return;
-            if (!lvm.EnableLedChanging) return;
-            if (lvm.TurnOffLed) return;
+            if (!ViewModel.EnableLedChanging) return;
+            if (ViewModel.TurnOffLed) return;
             
-            lvm.ParentModel.SelectedGamepad.SetLed(args.NewColor.Value.ToUInt32());
+            ViewModel.ParentModel.SelectedGamepad.SetLed(args.NewColor.Value.ToUInt32());
         }
 
         private void ColorPickerButton_OnAttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
         {
-            if (DataContext is not LedInputViewModel lvm) return;
-            if (!lvm.EnableLedChanging) return;
-            if (lvm.TurnOffLed) return;
+            if (!ViewModel.EnableLedChanging) return;
+            if (ViewModel.TurnOffLed) return;
             
-            lvm.ParentModel.SelectedGamepad.SetLed(lvm.LedColor.ToUInt32());
+            ViewModel.ParentModel.SelectedGamepad.SetLed(ViewModel.LedColor.ToUInt32());
         }
         
         public static async Task Show(ControllerInputViewModel viewModel)
@@ -57,13 +54,13 @@ namespace Ryujinx.UI.Views.Input
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.ControllerSettingsClose],
                 Content = content,
             };
-            contentDialog.PrimaryButtonClick += (sender, args) =>
+            contentDialog.PrimaryButtonClick += (_, _) =>
             {
                 GamepadInputConfig config = viewModel.Config;
-                config.EnableLedChanging = content._viewModel.EnableLedChanging;
-                config.LedColor = content._viewModel.LedColor;
-                config.UseRainbowLed = content._viewModel.UseRainbowLed;
-                config.TurnOffLed = content._viewModel.TurnOffLed;
+                config.EnableLedChanging = content.ViewModel.EnableLedChanging;
+                config.LedColor = content.ViewModel.LedColor;
+                config.UseRainbowLed = content.ViewModel.UseRainbowLed;
+                config.TurnOffLed = content.ViewModel.TurnOffLed;
             };
 
             await contentDialog.ShowAsync();

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

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

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

@@ -1,16 +1,15 @@
 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 : UserControl
+    public partial class RumbleInputView : RyujinxControl<RumbleInputViewModel>
     {
-        private readonly RumbleInputViewModel _viewModel;
-
         public RumbleInputView()
         {
             InitializeComponent();
@@ -20,15 +19,13 @@ 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)
@@ -44,11 +41,11 @@ namespace Ryujinx.Ava.UI.Views.Input
                 Content = content,
             };
 
-            contentDialog.PrimaryButtonClick += (sender, args) =>
+            contentDialog.PrimaryButtonClick += (_, _) =>
             {
                 GamepadInputConfig config = viewModel.Config;
-                config.StrongRumble = content._viewModel.StrongRumble;
-                config.WeakRumble = content._viewModel.WeakRumble;
+                config.StrongRumble = content.ViewModel.StrongRumble;
+                config.WeakRumble = content.ViewModel.WeakRumble;
             };
 
             await contentDialog.ShowAsync();

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

@@ -6,13 +6,14 @@ 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;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Utilities;
@@ -25,10 +26,9 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Main
 {
-    public partial class MainMenuBarView : UserControl
+    public partial class MainMenuBarView : RyujinxControl<MainWindowViewModel>
     {
         public MainWindow Window { get; private set; }
-        public MainWindowViewModel ViewModel { get; private set; }
 
         public MainMenuBarView()
         {
@@ -73,7 +73,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                     {
                         Content = $".{it.FileName}",
                         IsChecked = it.FileType.GetConfigValue(ConfigurationState.Instance.UI.ShownFileTypes),
-                        Command = MiniCommand.Create(() => Window.ToggleFileType(it.FileName))
+                        Command = Commands.Create(() => Window.ToggleFileType(it.FileName))
                     }
                 );
 
@@ -108,7 +108,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                     Margin = new Thickness(3, 0, 3, 0),
                     HorizontalAlignment = HorizontalAlignment.Stretch,
                     Header = languageName,
-                    Command = MiniCommand.Create(() => MainWindowViewModel.ChangeLanguage(language))
+                    Command = Commands.Create(() => MainWindowViewModel.ChangeLanguage(language))
                 };
 
                 yield return menuItem;

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

@@ -4,8 +4,10 @@ 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.Ava.Systems.Configuration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
@@ -13,7 +15,7 @@ using System;
 
 namespace Ryujinx.Ava.UI.Views.Main
 {
-    public partial class MainStatusBarView : UserControl
+    public partial class MainStatusBarView : RyujinxControl<MainWindowViewModel>
     {
         public MainWindow Window;
 
@@ -29,7 +31,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             if (VisualRoot is MainWindow window)
             {
                 Window = window;
-                DataContext = window.ViewModel;
+                ViewModel = window.ViewModel;
                 LocaleManager.Instance.LocaleChanged += () => Dispatcher.UIThread.Post(() =>
                 {
                     if (Window.ViewModel.EnableNonGameRunningControls)

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

@@ -3,16 +3,15 @@ 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 : UserControl
+    public partial class MainViewControls : RyujinxControl<MainWindowViewModel>
     {
-        public MainWindowViewModel ViewModel;
-
         public MainViewControls()
         {
             InitializeComponent();
@@ -24,7 +23,7 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             if (VisualRoot is MainWindow window)
             {
-                DataContext = ViewModel = window.ViewModel;
+                ViewModel = window.ViewModel;
             }
         }
 

src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml

@@ -7,7 +7,7 @@
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Controls.ApplicationDataView"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationDataView"
              x:DataType="viewModels:ApplicationDataViewModel">
     <StackPanel Orientation="Horizontal">
         <Image Margin="0"

src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml.cs

@@ -1,20 +1,20 @@
 using Avalonia.Controls;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
-using Avalonia.Styling;
+using Avalonia.Layout;
 using FluentAvalonia.UI.Controls;
 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;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Views.Misc
 {
-    public partial class ApplicationDataView : UserControl
+    public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
     {
         public static async Task Show(ApplicationData appData)
         {
@@ -25,20 +25,10 @@ namespace Ryujinx.Ava.UI.Controls
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
                 MinWidth = 256,
-                Content = new ApplicationDataView { DataContext = new ApplicationDataViewModel(appData) }
+                Content = new ApplicationDataView { ViewModel = new ApplicationDataViewModel(appData) }
             };
 
-            Style closeButton = new(x => x.Name("CloseButton"));
-            closeButton.Setters.Add(new Setter(WidthProperty, 160d));
-
-            Style closeButtonParent = new(x => x.Name("CommandSpace"));
-            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty,
-                Avalonia.Layout.HorizontalAlignment.Center));
-
-            contentDialog.Styles.Add(closeButton);
-            contentDialog.Styles.Add(closeButtonParent);
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
+            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles(160, HorizontalAlignment.Center));
         }
         
         public ApplicationDataView()

src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Controls.ApplicationGridView"
+    x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationGridView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"

src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml.cs

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

src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Controls.ApplicationListView"
+    x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationListView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml.cs

@@ -2,16 +2,16 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System;
 using System.Linq;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Views.Misc
 {
-    public partial class ApplicationListView : UserControl
+    public partial class ApplicationListView : RyujinxControl<MainWindowViewModel>
     {
         public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
             RoutedEvent.Register<ApplicationListView, ApplicationOpenedEventArgs>(nameof(ApplicationOpened), RoutingStrategies.Bubble);
@@ -32,9 +32,6 @@ 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;
 
@@ -43,16 +40,13 @@ 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 = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
+            ApplicationData appData = ViewModel.Applications.FirstOrDefault(it => it.IdString == idText.Text);
             if (appData is null)
                 return;
             

src/Ryujinx/UI/Views/Misc/CompatibilityList.axaml

@@ -1,16 +1,17 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="using:Ryujinx.Ava.Utilities.Compat"
              xmlns:helpers="using:Ryujinx.Ava.UI.Helpers"
              xmlns:ext="using:Ryujinx.Ava.Common.Markup"
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+             xmlns:systems="clr-namespace:Ryujinx.Ava.Systems"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.Utilities.Compat.CompatibilityList"
-             x:DataType="local:CompatibilityViewModel">
+             x:Class="Ryujinx.Ava.UI.Views.Misc.CompatibilityList"
+             x:DataType="viewModels:CompatibilityViewModel">
     <UserControl.DataContext>
-        <local:CompatibilityViewModel />
+        <viewModels:CompatibilityViewModel />
     </UserControl.DataContext>
     <Grid RowDefinitions="*,Auto,*">
         <Grid 
@@ -43,7 +44,7 @@
                          Background="Transparent"
                          ItemsSource="{Binding CurrentEntries}">
                     <ListBox.ItemTemplate>
-                        <DataTemplate DataType="{x:Type local:CompatibilityEntry}">
+                        <DataTemplate DataType="{x:Type systems:CompatibilityEntry}">
                             <Grid Width="750"
                                   Margin="5"
                                   ColumnDefinitions="Auto,Auto,Auto,*"

src/Ryujinx/UI/Views/Misc/CompatibilityList.axaml.cs

@@ -3,9 +3,10 @@ using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.ViewModels;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.Utilities.Compat
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class CompatibilityList : UserControl
     {
@@ -25,16 +26,7 @@ namespace Ryujinx.Ava.Utilities.Compat
                 }
             };
 
-            Style closeButton = new(x => x.Name("CloseButton"));
-            closeButton.Setters.Add(new Setter(WidthProperty, 80d));
-            
-            Style closeButtonParent = new(x => x.Name("CommandSpace"));
-            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty, Avalonia.Layout.HorizontalAlignment.Right));
-
-            contentDialog.Styles.Add(closeButton);
-            contentDialog.Styles.Add(closeButtonParent);
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
+            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());
         }
         
         public CompatibilityList()

src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml

@@ -7,7 +7,7 @@
              xmlns:models="using:Ryujinx.Ava.Common.Models"
              xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Controls.DlcSelectView"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.DlcSelectView"
              x:DataType="viewModels:DlcSelectViewModel">
     <Grid RowDefinitions="*,Auto,*">
         <TextBlock