misc: small Avalonia project restructure

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.

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;

src/Ryujinx/Common/ApplicationHelper.cs

@@ -16,7 +16,7 @@ using Ryujinx.Ava.Common.Locale;
 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;

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;

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,6 @@
 using CommandLine;
 using Gommon;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.HLE;

src/Ryujinx/Program.cs

@@ -8,7 +8,7 @@ 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.Utilities.SystemInfo;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
@@ -284,14 +284,14 @@ namespace Ryujinx.Ava
             if (CommandLineState.OverrideSystemRegion is not null)
                 if (Enum.TryParse(CommandLineState.OverrideSystemRegion, true, out Ryujinx.HLE.HOS.SystemState.RegionCode result))
                 {
-                    ConfigurationState.Instance.System.Region.Value = (Utilities.Configuration.System.Region)result;
+                    ConfigurationState.Instance.System.Region.Value = (Systems.Configuration.System.Region)result;
                 }
 
             //Check if language was overridden. 
             if (CommandLineState.OverrideSystemLanguage is not null)
                 if (Enum.TryParse(CommandLineState.OverrideSystemLanguage, true, out Ryujinx.HLE.HOS.SystemState.SystemLanguage result))
                 {
-                    ConfigurationState.Instance.System.Language.Value = (Utilities.Configuration.System.Language)result;
+                    ConfigurationState.Instance.System.Language.Value = (Systems.Configuration.System.Language)result;
                 }
 
             // 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
     {

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 LibHac.Tools.FsSystem;
-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;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -16,7 +16,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.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
     {

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

src/Ryujinx/Systems/Configuration/System/Region.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<Region>))]
     public enum Region

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/Controls/ApplicationContextMenu.axaml.cs

@@ -12,8 +12,7 @@ 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;

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,

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/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,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Media;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using System;
 

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/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/Main/MainMenuBarView.axaml.cs

@@ -11,9 +11,9 @@ 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;

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

@@ -7,7 +7,7 @@ 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;

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

@@ -1,15 +1,14 @@
 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;
 
@@ -29,17 +28,7 @@ namespace Ryujinx.Ava.UI.Views.Misc
                 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.cs

@@ -4,7 +4,7 @@ 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.Systems.AppLibrary;
 using System;
 
 namespace Ryujinx.Ava.UI.Views.Misc

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

@@ -5,8 +5,7 @@ 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;
 

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.cs

@@ -6,7 +6,7 @@ using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Misc
@@ -32,17 +32,7 @@ namespace Ryujinx.Ava.UI.Views.Misc
                 Content = new DlcSelectView { ViewModel = viewModel }
             };
 
-            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());
 
             return viewModel.SelectedDlc;
         }

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

@@ -5,6 +5,7 @@ using Avalonia.Layout;
 using Avalonia.Styling;
 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.Common;
@@ -14,7 +15,7 @@ using Button = Avalonia.Controls.Button;
 
 namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class AboutWindow : UserControl
+    public partial class AboutWindow : RyujinxControl<AboutWindowViewModel>
     {
         public AboutWindow()
         {
@@ -33,19 +34,10 @@ namespace Ryujinx.Ava.UI.Windows
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.UserProfilesClose],
-                Content = new AboutWindow { DataContext = viewModel }
+                Content = new AboutWindow { ViewModel = viewModel }
             };
 
-            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, HorizontalAlignment.Right));
-
-            contentDialog.Styles.Add(closeButton);
-            contentDialog.Styles.Add(closeButtonParent);
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
+            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());
         }
 
         private void Button_OnClick(object sender, RoutedEventArgs e)

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

@@ -2,8 +2,8 @@ using Avalonia.Collections;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
 using System.Collections.Generic;

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

@@ -5,7 +5,7 @@ using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 

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

@@ -11,7 +11,7 @@ using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS.SystemState;

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

@@ -18,9 +18,9 @@ using Ryujinx.Ava.UI.Applet;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities;
-using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Ava.Utilities.Configuration.UI;
+using Ryujinx.Ava.Systems.AppLibrary;
+using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Systems.Configuration.UI;
 using Ryujinx.Common;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;

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

@@ -6,7 +6,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 using Button = Avalonia.Controls.Button;

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

@@ -5,7 +5,7 @@ using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 

src/Ryujinx/Utilities/AppletMetadata.cs

@@ -2,7 +2,7 @@
 using LibHac.Ncm;
 using LibHac.Ns;
 using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using Ryujinx.Ava.Systems.AppLibrary;
 using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 

src/Ryujinx/Utilities/TitleUpdatesHelper.cs

@@ -7,7 +7,7 @@ using LibHac.Ns;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Models;
-using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;