diff --git a/Dalamud/ClientLanguage.cs b/Dalamud/ClientLanguage.cs
index ddd69576d..4e04d4a54 100644
--- a/Dalamud/ClientLanguage.cs
+++ b/Dalamud/ClientLanguage.cs
@@ -1,28 +1,27 @@
-namespace Dalamud
+namespace Dalamud;
+
+/// <summary>
+/// Enum describing the language the game loads in.
+/// </summary>
+public enum ClientLanguage
 {
     /// <summary>
-    /// Enum describing the language the game loads in.
+    /// Indicating a Japanese game client.
     /// </summary>
-    public enum ClientLanguage
-    {
-        /// <summary>
-        /// Indicating a Japanese game client.
-        /// </summary>
-        Japanese,
+    Japanese,
 
-        /// <summary>
-        /// Indicating an English game client.
-        /// </summary>
-        English,
+    /// <summary>
+    /// Indicating an English game client.
+    /// </summary>
+    English,
 
-        /// <summary>
-        /// Indicating a German game client.
-        /// </summary>
-        German,
+    /// <summary>
+    /// Indicating a German game client.
+    /// </summary>
+    German,
 
-        /// <summary>
-        /// Indicating a French game client.
-        /// </summary>
-        French,
-    }
+    /// <summary>
+    /// Indicating a French game client.
+    /// </summary>
+    French,
 }
diff --git a/Dalamud/ClientLanguageExtensions.cs b/Dalamud/ClientLanguageExtensions.cs
index abfba3ad5..e19ca1eb1 100644
--- a/Dalamud/ClientLanguageExtensions.cs
+++ b/Dalamud/ClientLanguageExtensions.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud
+namespace Dalamud;
+
+/// <summary>
+/// Extension methods for the <see cref="ClientLanguage"/> class.
+/// </summary>
+public static class ClientLanguageExtensions
 {
     /// <summary>
-    /// Extension methods for the <see cref="ClientLanguage"/> class.
+    /// Converts a Dalamud ClientLanguage to the corresponding Lumina variant.
     /// </summary>
-    public static class ClientLanguageExtensions
+    /// <param name="language">Language to convert.</param>
+    /// <returns>Converted language.</returns>
+    public static Lumina.Data.Language ToLumina(this ClientLanguage language)
     {
-        /// <summary>
-        /// Converts a Dalamud ClientLanguage to the corresponding Lumina variant.
-        /// </summary>
-        /// <param name="language">Language to convert.</param>
-        /// <returns>Converted language.</returns>
-        public static Lumina.Data.Language ToLumina(this ClientLanguage language)
+        return language switch
         {
-            return language switch
-            {
-                ClientLanguage.Japanese => Lumina.Data.Language.Japanese,
-                ClientLanguage.English => Lumina.Data.Language.English,
-                ClientLanguage.German => Lumina.Data.Language.German,
-                ClientLanguage.French => Lumina.Data.Language.French,
-                _ => throw new ArgumentOutOfRangeException(nameof(language)),
-            };
-        }
+            ClientLanguage.Japanese => Lumina.Data.Language.Japanese,
+            ClientLanguage.English => Lumina.Data.Language.English,
+            ClientLanguage.German => Lumina.Data.Language.German,
+            ClientLanguage.French => Lumina.Data.Language.French,
+            _ => throw new ArgumentOutOfRangeException(nameof(language)),
+        };
     }
 }
diff --git a/Dalamud/Configuration/IPluginConfiguration.cs b/Dalamud/Configuration/IPluginConfiguration.cs
index 884e38871..dcc93d8d7 100644
--- a/Dalamud/Configuration/IPluginConfiguration.cs
+++ b/Dalamud/Configuration/IPluginConfiguration.cs
@@ -1,13 +1,12 @@
-namespace Dalamud.Configuration
+namespace Dalamud.Configuration;
+
+/// <summary>
+/// Configuration to store settings for a dalamud plugin.
+/// </summary>
+public interface IPluginConfiguration
 {
     /// <summary>
-    /// Configuration to store settings for a dalamud plugin.
+    /// Gets or sets configuration version.
     /// </summary>
-    public interface IPluginConfiguration
-    {
-        /// <summary>
-        /// Gets or sets configuration version.
-        /// </summary>
-        int Version { get; set; }
-    }
+    int Version { get; set; }
 }
diff --git a/Dalamud/Configuration/Internal/DalamudConfiguration.cs b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
index 9ec6712aa..d4efde61c 100644
--- a/Dalamud/Configuration/Internal/DalamudConfiguration.cs
+++ b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
@@ -10,368 +10,367 @@ using Newtonsoft.Json;
 using Serilog;
 using Serilog.Events;
 
-namespace Dalamud.Configuration.Internal
+namespace Dalamud.Configuration.Internal;
+
+/// <summary>
+/// Class containing Dalamud settings.
+/// </summary>
+[Serializable]
+internal sealed class DalamudConfiguration : IServiceType
 {
-    /// <summary>
-    /// Class containing Dalamud settings.
-    /// </summary>
-    [Serializable]
-    internal sealed class DalamudConfiguration : IServiceType
+    private static readonly JsonSerializerSettings SerializerSettings = new()
     {
-        private static readonly JsonSerializerSettings SerializerSettings = new()
+        TypeNameHandling = TypeNameHandling.All,
+        TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
+        Formatting = Formatting.Indented,
+    };
+
+    [JsonIgnore]
+    private string configPath;
+
+    /// <summary>
+    /// Delegate for the <see cref="DalamudConfiguration.DalamudConfigurationSaved"/> event that occurs when the dalamud configuration is saved.
+    /// </summary>
+    /// <param name="dalamudConfiguration">The current dalamud configuration.</param>
+    public delegate void DalamudConfigurationSavedDelegate(DalamudConfiguration dalamudConfiguration);
+
+    /// <summary>
+    /// Event that occurs when dalamud configuration is saved.
+    /// </summary>
+    public event DalamudConfigurationSavedDelegate DalamudConfigurationSaved;
+
+    /// <summary>
+    /// Gets or sets a list of muted works.
+    /// </summary>
+    public List<string> BadWords { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not the taskbar should flash once a duty is found.
+    /// </summary>
+    public bool DutyFinderTaskbarFlash { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not a message should be sent in chat once a duty is found.
+    /// </summary>
+    public bool DutyFinderChatMessage { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the language code to load Dalamud localization with.
+    /// </summary>
+    public string LanguageOverride { get; set; } = null;
+
+    /// <summary>
+    /// Gets or sets the last loaded Dalamud version.
+    /// </summary>
+    public string LastVersion { get; set; } = null;
+
+    /// <summary>
+    /// Gets or sets the last loaded Dalamud version.
+    /// </summary>
+    public string LastChangelogMajorMinor { get; set; } = null;
+
+    /// <summary>
+    /// Gets or sets the chat type used by default for plugin messages.
+    /// </summary>
+    public XivChatType GeneralChatType { get; set; } = XivChatType.Debug;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not plugin testing builds should be shown.
+    /// </summary>
+    public bool DoPluginTest { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets a key to opt into Dalamud staging builds.
+    /// </summary>
+    public string? DalamudBetaKey { get; set; } = null;
+
+    /// <summary>
+    /// Gets or sets a list of custom repos.
+    /// </summary>
+    public List<ThirdPartyRepoSettings> ThirdRepoList { get; set; } = new();
+
+    /// <summary>
+    /// Gets or sets a list of hidden plugins.
+    /// </summary>
+    public List<string> HiddenPluginInternalName { get; set; } = new();
+
+    /// <summary>
+    /// Gets or sets a list of seen plugins.
+    /// </summary>
+    public List<string> SeenPluginInternalName { get; set; } = new();
+
+    /// <summary>
+    /// Gets or sets a list of additional settings for devPlugins. The key is the absolute path
+    /// to the plugin DLL. This is automatically generated for any plugins in the devPlugins folder.
+    /// However by specifiying this value manually, you can add arbitrary files outside the normal
+    /// file paths.
+    /// </summary>
+    public Dictionary<string, DevPluginSettings> DevPluginSettings { get; set; } = new();
+
+    /// <summary>
+    /// Gets or sets a list of additional locations that dev plugins should be loaded from. This can
+    /// be either a DLL or folder, but should be the absolute path, or a path relative to the currently
+    /// injected Dalamud instance.
+    /// </summary>
+    public List<DevPluginLocationSettings> DevPluginLoadLocations { get; set; } = new();
+
+    /// <summary>
+    /// Gets or sets the global UI scale.
+    /// </summary>
+    public float GlobalUiScale { get; set; } = 1.0f;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to use AXIS fonts from the game.
+    /// </summary>
+    public bool UseAxisFontsFromGame { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets the gamma value to apply for Dalamud fonts. Effects text thickness.
+    ///
+    /// Before gamma is applied...
+    /// * ...TTF fonts loaded with stb or FreeType are in linear space.
+    /// * ...the game's prebaked AXIS fonts are in gamma space with gamma value of 1.4.
+    /// </summary>
+    public float FontGammaLevel { get; set; } = 1.4f;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not plugin UI should be hidden.
+    /// </summary>
+    public bool ToggleUiHide { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not plugin UI should be hidden during cutscenes.
+    /// </summary>
+    public bool ToggleUiHideDuringCutscenes { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not plugin UI should be hidden during GPose.
+    /// </summary>
+    public bool ToggleUiHideDuringGpose { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not a message containing detailed plugin information should be sent at login.
+    /// </summary>
+    public bool PrintPluginsWelcomeMsg { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not plugins should be auto-updated.
+    /// </summary>
+    public bool AutoUpdatePlugins { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not Dalamud should add buttons to the system menu.
+    /// </summary>
+    public bool DoButtonsSystemMenu { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the default Dalamud debug log level on startup.
+    /// </summary>
+    public LogEventLevel LogLevel { get; set; } = LogEventLevel.Information;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to write to log files synchronously.
+    /// </summary>
+    public bool LogSynchronously { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not the debug log should scroll automatically.
+    /// </summary>
+    public bool LogAutoScroll { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not the debug log should open at startup.
+    /// </summary>
+    public bool LogOpenAtStartup { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not the dev bar should open at startup.
+    /// </summary>
+    public bool DevBarOpenAtStartup { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not ImGui asserts should be enabled at startup.
+    /// </summary>
+    public bool AssertsEnabledAtStartup { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not docking should be globally enabled in ImGui.
+    /// </summary>
+    public bool IsDocking { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether viewports should always be disabled.
+    /// </summary>
+    public bool IsDisableViewport { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not navigation via a gamepad should be globally enabled in ImGui.
+    /// </summary>
+    public bool IsGamepadNavigationEnabled { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not focus management is enabled.
+    /// </summary>
+    public bool IsFocusManagementEnabled { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not the anti-anti-debug check is enabled on startup.
+    /// </summary>
+    public bool IsAntiAntiDebugEnabled { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to resume game main thread after plugins load.
+    /// </summary>
+    public bool IsResumeGameAfterPluginLoad { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets the kind of beta to download when <see cref="DalamudBetaKey"/> matches the server value.
+    /// </summary>
+    public string DalamudBetaKind { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not any plugin should be loaded when the game is started.
+    /// It is reset immediately when read.
+    /// </summary>
+    public bool PluginSafeMode { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating the wait time between plugin unload and plugin assembly unload.
+    /// Uses default value that may change between versions if set to null.
+    /// </summary>
+    public int? PluginWaitBeforeFree { get; set; }
+
+    /// <summary>
+    /// Gets or sets a list of saved styles.
+    /// </summary>
+    [JsonProperty("SavedStyles")]
+    public List<StyleModelV1>? SavedStylesOld { get; set; }
+
+    /// <summary>
+    /// Gets or sets a list of saved styles.
+    /// </summary>
+    [JsonProperty("SavedStylesVersioned")]
+    public List<StyleModel>? SavedStyles { get; set; }
+
+    /// <summary>
+    /// Gets or sets the name of the currently chosen style.
+    /// </summary>
+    public string ChosenStyle { get; set; } = "Dalamud Standard";
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not Dalamud RMT filtering should be disabled.
+    /// </summary>
+    public bool DisableRmtFiltering { get; set; }
+
+    /// <summary>
+    /// Gets or sets the order of DTR elements, by title.
+    /// </summary>
+    public List<string>? DtrOrder { get; set; }
+
+    /// <summary>
+    /// Gets or sets the list of ignored DTR elements, by title.
+    /// </summary>
+    public List<string>? DtrIgnore { get; set; }
+
+    /// <summary>
+    /// Gets or sets the spacing used for DTR entries.
+    /// </summary>
+    public int DtrSpacing { get; set; } = 10;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to swap the
+    /// direction in which elements are drawn in the DTR.
+    /// False indicates that elements will be drawn from the end of
+    /// the left side of the Server Info bar, and continue leftwards.
+    /// True indicates the opposite.
+    /// </summary>
+    public bool DtrSwapDirection { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the title screen menu is shown.
+    /// </summary>
+    public bool ShowTsm { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not market board data should be uploaded.
+    /// </summary>
+    public bool IsMbCollect { get; set; } = true;
+
+    /// <summary>
+    /// Gets the ISO 639-1 two-letter code for the language of the effective Dalamud display language.
+    /// </summary>
+    public string EffectiveLanguage
+    {
+        get
         {
-            TypeNameHandling = TypeNameHandling.All,
-            TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
-            Formatting = Formatting.Indented,
-        };
-
-        [JsonIgnore]
-        private string configPath;
-
-        /// <summary>
-        /// Delegate for the <see cref="DalamudConfiguration.DalamudConfigurationSaved"/> event that occurs when the dalamud configuration is saved.
-        /// </summary>
-        /// <param name="dalamudConfiguration">The current dalamud configuration.</param>
-        public delegate void DalamudConfigurationSavedDelegate(DalamudConfiguration dalamudConfiguration);
-
-        /// <summary>
-        /// Event that occurs when dalamud configuration is saved.
-        /// </summary>
-        public event DalamudConfigurationSavedDelegate DalamudConfigurationSaved;
-
-        /// <summary>
-        /// Gets or sets a list of muted works.
-        /// </summary>
-        public List<string> BadWords { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not the taskbar should flash once a duty is found.
-        /// </summary>
-        public bool DutyFinderTaskbarFlash { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not a message should be sent in chat once a duty is found.
-        /// </summary>
-        public bool DutyFinderChatMessage { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the language code to load Dalamud localization with.
-        /// </summary>
-        public string LanguageOverride { get; set; } = null;
-
-        /// <summary>
-        /// Gets or sets the last loaded Dalamud version.
-        /// </summary>
-        public string LastVersion { get; set; } = null;
-
-        /// <summary>
-        /// Gets or sets the last loaded Dalamud version.
-        /// </summary>
-        public string LastChangelogMajorMinor { get; set; } = null;
-
-        /// <summary>
-        /// Gets or sets the chat type used by default for plugin messages.
-        /// </summary>
-        public XivChatType GeneralChatType { get; set; } = XivChatType.Debug;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not plugin testing builds should be shown.
-        /// </summary>
-        public bool DoPluginTest { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets a key to opt into Dalamud staging builds.
-        /// </summary>
-        public string? DalamudBetaKey { get; set; } = null;
-
-        /// <summary>
-        /// Gets or sets a list of custom repos.
-        /// </summary>
-        public List<ThirdPartyRepoSettings> ThirdRepoList { get; set; } = new();
-
-        /// <summary>
-        /// Gets or sets a list of hidden plugins.
-        /// </summary>
-        public List<string> HiddenPluginInternalName { get; set; } = new();
-
-        /// <summary>
-        /// Gets or sets a list of seen plugins.
-        /// </summary>
-        public List<string> SeenPluginInternalName { get; set; } = new();
-
-        /// <summary>
-        /// Gets or sets a list of additional settings for devPlugins. The key is the absolute path
-        /// to the plugin DLL. This is automatically generated for any plugins in the devPlugins folder.
-        /// However by specifiying this value manually, you can add arbitrary files outside the normal
-        /// file paths.
-        /// </summary>
-        public Dictionary<string, DevPluginSettings> DevPluginSettings { get; set; } = new();
-
-        /// <summary>
-        /// Gets or sets a list of additional locations that dev plugins should be loaded from. This can
-        /// be either a DLL or folder, but should be the absolute path, or a path relative to the currently
-        /// injected Dalamud instance.
-        /// </summary>
-        public List<DevPluginLocationSettings> DevPluginLoadLocations { get; set; } = new();
-
-        /// <summary>
-        /// Gets or sets the global UI scale.
-        /// </summary>
-        public float GlobalUiScale { get; set; } = 1.0f;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to use AXIS fonts from the game.
-        /// </summary>
-        public bool UseAxisFontsFromGame { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets the gamma value to apply for Dalamud fonts. Effects text thickness.
-        ///
-        /// Before gamma is applied...
-        /// * ...TTF fonts loaded with stb or FreeType are in linear space.
-        /// * ...the game's prebaked AXIS fonts are in gamma space with gamma value of 1.4.
-        /// </summary>
-        public float FontGammaLevel { get; set; } = 1.4f;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not plugin UI should be hidden.
-        /// </summary>
-        public bool ToggleUiHide { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not plugin UI should be hidden during cutscenes.
-        /// </summary>
-        public bool ToggleUiHideDuringCutscenes { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not plugin UI should be hidden during GPose.
-        /// </summary>
-        public bool ToggleUiHideDuringGpose { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not a message containing detailed plugin information should be sent at login.
-        /// </summary>
-        public bool PrintPluginsWelcomeMsg { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not plugins should be auto-updated.
-        /// </summary>
-        public bool AutoUpdatePlugins { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not Dalamud should add buttons to the system menu.
-        /// </summary>
-        public bool DoButtonsSystemMenu { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the default Dalamud debug log level on startup.
-        /// </summary>
-        public LogEventLevel LogLevel { get; set; } = LogEventLevel.Information;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to write to log files synchronously.
-        /// </summary>
-        public bool LogSynchronously { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not the debug log should scroll automatically.
-        /// </summary>
-        public bool LogAutoScroll { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not the debug log should open at startup.
-        /// </summary>
-        public bool LogOpenAtStartup { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not the dev bar should open at startup.
-        /// </summary>
-        public bool DevBarOpenAtStartup { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not ImGui asserts should be enabled at startup.
-        /// </summary>
-        public bool AssertsEnabledAtStartup { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not docking should be globally enabled in ImGui.
-        /// </summary>
-        public bool IsDocking { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether viewports should always be disabled.
-        /// </summary>
-        public bool IsDisableViewport { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not navigation via a gamepad should be globally enabled in ImGui.
-        /// </summary>
-        public bool IsGamepadNavigationEnabled { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not focus management is enabled.
-        /// </summary>
-        public bool IsFocusManagementEnabled { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not the anti-anti-debug check is enabled on startup.
-        /// </summary>
-        public bool IsAntiAntiDebugEnabled { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to resume game main thread after plugins load.
-        /// </summary>
-        public bool IsResumeGameAfterPluginLoad { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets the kind of beta to download when <see cref="DalamudBetaKey"/> matches the server value.
-        /// </summary>
-        public string DalamudBetaKind { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not any plugin should be loaded when the game is started.
-        /// It is reset immediately when read.
-        /// </summary>
-        public bool PluginSafeMode { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating the wait time between plugin unload and plugin assembly unload.
-        /// Uses default value that may change between versions if set to null.
-        /// </summary>
-        public int? PluginWaitBeforeFree { get; set; }
-
-        /// <summary>
-        /// Gets or sets a list of saved styles.
-        /// </summary>
-        [JsonProperty("SavedStyles")]
-        public List<StyleModelV1>? SavedStylesOld { get; set; }
-
-        /// <summary>
-        /// Gets or sets a list of saved styles.
-        /// </summary>
-        [JsonProperty("SavedStylesVersioned")]
-        public List<StyleModel>? SavedStyles { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the currently chosen style.
-        /// </summary>
-        public string ChosenStyle { get; set; } = "Dalamud Standard";
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not Dalamud RMT filtering should be disabled.
-        /// </summary>
-        public bool DisableRmtFiltering { get; set; }
-
-        /// <summary>
-        /// Gets or sets the order of DTR elements, by title.
-        /// </summary>
-        public List<string>? DtrOrder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the list of ignored DTR elements, by title.
-        /// </summary>
-        public List<string>? DtrIgnore { get; set; }
-
-        /// <summary>
-        /// Gets or sets the spacing used for DTR entries.
-        /// </summary>
-        public int DtrSpacing { get; set; } = 10;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to swap the
-        /// direction in which elements are drawn in the DTR.
-        /// False indicates that elements will be drawn from the end of
-        /// the left side of the Server Info bar, and continue leftwards.
-        /// True indicates the opposite.
-        /// </summary>
-        public bool DtrSwapDirection { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the title screen menu is shown.
-        /// </summary>
-        public bool ShowTsm { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not market board data should be uploaded.
-        /// </summary>
-        public bool IsMbCollect { get; set; } = true;
-
-        /// <summary>
-        /// Gets the ISO 639-1 two-letter code for the language of the effective Dalamud display language.
-        /// </summary>
-        public string EffectiveLanguage
-        {
-            get
-            {
-                var languages = Localization.ApplicableLangCodes.Prepend("en").ToArray();
-                try
-                {
-                    if (string.IsNullOrEmpty(this.LanguageOverride))
-                    {
-                        var currentUiLang = CultureInfo.CurrentUICulture;
-
-                        if (Localization.ApplicableLangCodes.Any(x => currentUiLang.TwoLetterISOLanguageName == x))
-                            return currentUiLang.TwoLetterISOLanguageName;
-                        else
-                            return languages[0];
-                    }
-                    else
-                    {
-                        return this.LanguageOverride;
-                    }
-                }
-                catch (Exception)
-                {
-                    return languages[0];
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not to show info on dev bar.
-        /// </summary>
-        public bool ShowDevBarInfo { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the last-used contact details for the plugin feedback form.
-        /// </summary>
-        public string LastFeedbackContactDetails { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets a list of plugins that testing builds should be downloaded for.
-        /// </summary>
-        public List<PluginTestingOptIn>? PluginTestingOptIns { get; set; }
-
-        /// <summary>
-        /// Load a configuration from the provided path.
-        /// </summary>
-        /// <param name="path">The path to load the configuration file from.</param>
-        /// <returns>The deserialized configuration file.</returns>
-        public static DalamudConfiguration Load(string path)
-        {
-            DalamudConfiguration deserialized = null;
+            var languages = Localization.ApplicableLangCodes.Prepend("en").ToArray();
             try
             {
-                deserialized = JsonConvert.DeserializeObject<DalamudConfiguration>(File.ReadAllText(path), SerializerSettings);
+                if (string.IsNullOrEmpty(this.LanguageOverride))
+                {
+                    var currentUiLang = CultureInfo.CurrentUICulture;
+
+                    if (Localization.ApplicableLangCodes.Any(x => currentUiLang.TwoLetterISOLanguageName == x))
+                        return currentUiLang.TwoLetterISOLanguageName;
+                    else
+                        return languages[0];
+                }
+                else
+                {
+                    return this.LanguageOverride;
+                }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                Log.Warning(ex, "Failed to load DalamudConfiguration at {0}", path);
+                return languages[0];
             }
-
-            deserialized ??= new DalamudConfiguration();
-            deserialized.configPath = path;
-
-            return deserialized;
-        }
-
-        /// <summary>
-        /// Save the configuration at the path it was loaded from.
-        /// </summary>
-        public void Save()
-        {
-            File.WriteAllText(this.configPath, JsonConvert.SerializeObject(this, SerializerSettings));
-            this.DalamudConfigurationSaved?.Invoke(this);
         }
     }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not to show info on dev bar.
+    /// </summary>
+    public bool ShowDevBarInfo { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the last-used contact details for the plugin feedback form.
+    /// </summary>
+    public string LastFeedbackContactDetails { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets or sets a list of plugins that testing builds should be downloaded for.
+    /// </summary>
+    public List<PluginTestingOptIn>? PluginTestingOptIns { get; set; }
+
+    /// <summary>
+    /// Load a configuration from the provided path.
+    /// </summary>
+    /// <param name="path">The path to load the configuration file from.</param>
+    /// <returns>The deserialized configuration file.</returns>
+    public static DalamudConfiguration Load(string path)
+    {
+        DalamudConfiguration deserialized = null;
+        try
+        {
+            deserialized = JsonConvert.DeserializeObject<DalamudConfiguration>(File.ReadAllText(path), SerializerSettings);
+        }
+        catch (Exception ex)
+        {
+            Log.Warning(ex, "Failed to load DalamudConfiguration at {0}", path);
+        }
+
+        deserialized ??= new DalamudConfiguration();
+        deserialized.configPath = path;
+
+        return deserialized;
+    }
+
+    /// <summary>
+    /// Save the configuration at the path it was loaded from.
+    /// </summary>
+    public void Save()
+    {
+        File.WriteAllText(this.configPath, JsonConvert.SerializeObject(this, SerializerSettings));
+        this.DalamudConfigurationSaved?.Invoke(this);
+    }
 }
diff --git a/Dalamud/Configuration/Internal/DevPluginLocationSettings.cs b/Dalamud/Configuration/Internal/DevPluginLocationSettings.cs
index 995fb1a23..de083858d 100644
--- a/Dalamud/Configuration/Internal/DevPluginLocationSettings.cs
+++ b/Dalamud/Configuration/Internal/DevPluginLocationSettings.cs
@@ -1,24 +1,23 @@
-namespace Dalamud.Configuration
+namespace Dalamud.Configuration;
+
+/// <summary>
+/// Additional locations to load dev plugins from.
+/// </summary>
+internal sealed class DevPluginLocationSettings
 {
     /// <summary>
-    /// Additional locations to load dev plugins from.
+    /// Gets or sets the dev pluign path.
     /// </summary>
-    internal sealed class DevPluginLocationSettings
-    {
-        /// <summary>
-        /// Gets or sets the dev pluign path.
-        /// </summary>
-        public string Path { get; set; }
+    public string Path { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the third party repo is enabled.
-        /// </summary>
-        public bool IsEnabled { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether the third party repo is enabled.
+    /// </summary>
+    public bool IsEnabled { get; set; }
 
-        /// <summary>
-        /// Clone this object.
-        /// </summary>
-        /// <returns>A shallow copy of this object.</returns>
-        public DevPluginLocationSettings Clone() => this.MemberwiseClone() as DevPluginLocationSettings;
-    }
+    /// <summary>
+    /// Clone this object.
+    /// </summary>
+    /// <returns>A shallow copy of this object.</returns>
+    public DevPluginLocationSettings Clone() => this.MemberwiseClone() as DevPluginLocationSettings;
 }
diff --git a/Dalamud/Configuration/Internal/DevPluginSettings.cs b/Dalamud/Configuration/Internal/DevPluginSettings.cs
index 17350cba0..939b03eca 100644
--- a/Dalamud/Configuration/Internal/DevPluginSettings.cs
+++ b/Dalamud/Configuration/Internal/DevPluginSettings.cs
@@ -1,18 +1,17 @@
-namespace Dalamud.Configuration.Internal
+namespace Dalamud.Configuration.Internal;
+
+/// <summary>
+/// Settings for DevPlugins.
+/// </summary>
+internal sealed class DevPluginSettings
 {
     /// <summary>
-    /// Settings for DevPlugins.
+    /// Gets or sets a value indicating whether this plugin should automatically start when Dalamud boots up.
     /// </summary>
-    internal sealed class DevPluginSettings
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether this plugin should automatically start when Dalamud boots up.
-        /// </summary>
-        public bool StartOnBoot { get; set; } = true;
+    public bool StartOnBoot { get; set; } = true;
 
-        /// <summary>
-        /// Gets or sets a value indicating whether this plugin should automatically reload on file change.
-        /// </summary>
-        public bool AutomaticReloading { get; set; } = false;
-    }
+    /// <summary>
+    /// Gets or sets a value indicating whether this plugin should automatically reload on file change.
+    /// </summary>
+    public bool AutomaticReloading { get; set; } = false;
 }
diff --git a/Dalamud/Configuration/Internal/EnvironmentConfiguration.cs b/Dalamud/Configuration/Internal/EnvironmentConfiguration.cs
index 99a4c6709..a251da763 100644
--- a/Dalamud/Configuration/Internal/EnvironmentConfiguration.cs
+++ b/Dalamud/Configuration/Internal/EnvironmentConfiguration.cs
@@ -1,38 +1,37 @@
 using System;
 
-namespace Dalamud.Configuration.Internal
+namespace Dalamud.Configuration.Internal;
+
+/// <summary>
+/// Environmental configuration settings.
+/// </summary>
+internal class EnvironmentConfiguration
 {
     /// <summary>
-    /// Environmental configuration settings.
+    /// Gets a value indicating whether the XL_WINEONLINUX setting has been enabled.
     /// </summary>
-    internal class EnvironmentConfiguration
-    {
-        /// <summary>
-        /// Gets a value indicating whether the XL_WINEONLINUX setting has been enabled.
-        /// </summary>
-        public static bool XlWineOnLinux { get; } = GetEnvironmentVariable("XL_WINEONLINUX");
+    public static bool XlWineOnLinux { get; } = GetEnvironmentVariable("XL_WINEONLINUX");
 
-        /// <summary>
-        /// Gets a value indicating whether the DALAMUD_NOT_HAVE_PLUGINS setting has been enabled.
-        /// </summary>
-        public static bool DalamudNoPlugins { get; } = GetEnvironmentVariable("DALAMUD_NOT_HAVE_PLUGINS");
+    /// <summary>
+    /// Gets a value indicating whether the DALAMUD_NOT_HAVE_PLUGINS setting has been enabled.
+    /// </summary>
+    public static bool DalamudNoPlugins { get; } = GetEnvironmentVariable("DALAMUD_NOT_HAVE_PLUGINS");
 
-        /// <summary>
-        /// Gets a value indicating whether the DalamudForceReloaded setting has been enabled.
-        /// </summary>
-        public static bool DalamudForceReloaded { get; } = GetEnvironmentVariable("DALAMUD_FORCE_RELOADED");
+    /// <summary>
+    /// Gets a value indicating whether the DalamudForceReloaded setting has been enabled.
+    /// </summary>
+    public static bool DalamudForceReloaded { get; } = GetEnvironmentVariable("DALAMUD_FORCE_RELOADED");
 
-        /// <summary>
-        /// Gets a value indicating whether the DalamudForceMinHook setting has been enabled.
-        /// </summary>
-        public static bool DalamudForceMinHook { get; } = GetEnvironmentVariable("DALAMUD_FORCE_MINHOOK");
+    /// <summary>
+    /// Gets a value indicating whether the DalamudForceMinHook setting has been enabled.
+    /// </summary>
+    public static bool DalamudForceMinHook { get; } = GetEnvironmentVariable("DALAMUD_FORCE_MINHOOK");
 
-        /// <summary>
-        /// Gets a value indicating whether or not Dalamud context menus should be disabled.
-        /// </summary>
-        public static bool DalamudDoContextMenu { get; } = GetEnvironmentVariable("DALAMUD_ENABLE_CONTEXTMENU");
+    /// <summary>
+    /// Gets a value indicating whether or not Dalamud context menus should be disabled.
+    /// </summary>
+    public static bool DalamudDoContextMenu { get; } = GetEnvironmentVariable("DALAMUD_ENABLE_CONTEXTMENU");
 
-        private static bool GetEnvironmentVariable(string name)
-            => bool.Parse(Environment.GetEnvironmentVariable(name) ?? "false");
-    }
+    private static bool GetEnvironmentVariable(string name)
+        => bool.Parse(Environment.GetEnvironmentVariable(name) ?? "false");
 }
diff --git a/Dalamud/Configuration/Internal/ThirdPartyRepoSettings.cs b/Dalamud/Configuration/Internal/ThirdPartyRepoSettings.cs
index cafb96a47..070fda408 100644
--- a/Dalamud/Configuration/Internal/ThirdPartyRepoSettings.cs
+++ b/Dalamud/Configuration/Internal/ThirdPartyRepoSettings.cs
@@ -1,29 +1,28 @@
-namespace Dalamud.Configuration
+namespace Dalamud.Configuration;
+
+/// <summary>
+/// Third party repository for dalamud plugins.
+/// </summary>
+internal sealed class ThirdPartyRepoSettings
 {
     /// <summary>
-    /// Third party repository for dalamud plugins.
+    /// Gets or sets the third party repo url.
     /// </summary>
-    internal sealed class ThirdPartyRepoSettings
-    {
-        /// <summary>
-        /// Gets or sets the third party repo url.
-        /// </summary>
-        public string Url { get; set; }
+    public string Url { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the third party repo is enabled.
-        /// </summary>
-        public bool IsEnabled { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether the third party repo is enabled.
+    /// </summary>
+    public bool IsEnabled { get; set; }
 
-        /// <summary>
-        /// Gets or sets a short name for the repo url.
-        /// </summary>
-        public string Name { get; set; }
+    /// <summary>
+    /// Gets or sets a short name for the repo url.
+    /// </summary>
+    public string Name { get; set; }
 
-        /// <summary>
-        /// Clone this object.
-        /// </summary>
-        /// <returns>A shallow copy of this object.</returns>
-        public ThirdPartyRepoSettings Clone() => this.MemberwiseClone() as ThirdPartyRepoSettings;
-    }
+    /// <summary>
+    /// Clone this object.
+    /// </summary>
+    /// <returns>A shallow copy of this object.</returns>
+    public ThirdPartyRepoSettings Clone() => this.MemberwiseClone() as ThirdPartyRepoSettings;
 }
diff --git a/Dalamud/Configuration/PluginConfigurations.cs b/Dalamud/Configuration/PluginConfigurations.cs
index 48522ea56..b917a9e79 100644
--- a/Dalamud/Configuration/PluginConfigurations.cs
+++ b/Dalamud/Configuration/PluginConfigurations.cs
@@ -2,149 +2,148 @@ using System.IO;
 
 using Newtonsoft.Json;
 
-namespace Dalamud.Configuration
+namespace Dalamud.Configuration;
+
+/// <summary>
+/// Configuration to store settings for a dalamud plugin.
+/// </summary>
+public sealed class PluginConfigurations
 {
+    private readonly DirectoryInfo configDirectory;
+
     /// <summary>
-    /// Configuration to store settings for a dalamud plugin.
+    /// Initializes a new instance of the <see cref="PluginConfigurations"/> class.
     /// </summary>
-    public sealed class PluginConfigurations
+    /// <param name="storageFolder">Directory for storage of plugin configuration files.</param>
+    public PluginConfigurations(string storageFolder)
     {
-        private readonly DirectoryInfo configDirectory;
+        this.configDirectory = new DirectoryInfo(storageFolder);
+        this.configDirectory.Create();
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PluginConfigurations"/> class.
-        /// </summary>
-        /// <param name="storageFolder">Directory for storage of plugin configuration files.</param>
-        public PluginConfigurations(string storageFolder)
+    /// <summary>
+    /// Save/Load plugin configuration.
+    /// NOTE: Save/Load are still using Type information for now,
+    /// despite LoadForType superseding Load and not requiring or using it.
+    /// It might be worth removing the Type info from Save, to strip it from all future saved configs,
+    /// and then Load() can probably be removed entirely.
+    /// </summary>
+    /// <param name="config">Plugin configuration.</param>
+    /// <param name="pluginName">Plugin name.</param>
+    public void Save(IPluginConfiguration config, string pluginName)
+    {
+        File.WriteAllText(this.GetConfigFile(pluginName).FullName, SerializeConfig(config));
+    }
+
+    /// <summary>
+    /// Load plugin configuration.
+    /// </summary>
+    /// <param name="pluginName">Plugin name.</param>
+    /// <returns>Plugin configuration.</returns>
+    public IPluginConfiguration? Load(string pluginName)
+    {
+        var path = this.GetConfigFile(pluginName);
+
+        if (!path.Exists)
+            return null;
+
+        return DeserializeConfig(File.ReadAllText(path.FullName));
+    }
+
+    /// <summary>
+    /// Delete the configuration file and folder for the specified plugin.
+    /// This will throw an <see cref="IOException"/> if the plugin did not correctly close its handles.
+    /// </summary>
+    /// <param name="pluginName">The name of the plugin.</param>
+    public void Delete(string pluginName)
+    {
+        var directory = this.GetDirectoryPath(pluginName);
+        if (directory.Exists)
+            directory.Delete(true);
+
+        var file = this.GetConfigFile(pluginName);
+        if (file.Exists)
+            file.Delete();
+    }
+
+    /// <summary>
+    /// Get plugin directory.
+    /// </summary>
+    /// <param name="pluginName">Plugin name.</param>
+    /// <returns>Plugin directory path.</returns>
+    public string GetDirectory(string pluginName)
+    {
+        try
         {
-            this.configDirectory = new DirectoryInfo(storageFolder);
-            this.configDirectory.Create();
-        }
-
-        /// <summary>
-        /// Save/Load plugin configuration.
-        /// NOTE: Save/Load are still using Type information for now,
-        /// despite LoadForType superseding Load and not requiring or using it.
-        /// It might be worth removing the Type info from Save, to strip it from all future saved configs,
-        /// and then Load() can probably be removed entirely.
-        /// </summary>
-        /// <param name="config">Plugin configuration.</param>
-        /// <param name="pluginName">Plugin name.</param>
-        public void Save(IPluginConfiguration config, string pluginName)
-        {
-            File.WriteAllText(this.GetConfigFile(pluginName).FullName, SerializeConfig(config));
-        }
-
-        /// <summary>
-        /// Load plugin configuration.
-        /// </summary>
-        /// <param name="pluginName">Plugin name.</param>
-        /// <returns>Plugin configuration.</returns>
-        public IPluginConfiguration? Load(string pluginName)
-        {
-            var path = this.GetConfigFile(pluginName);
-
+            var path = this.GetDirectoryPath(pluginName);
             if (!path.Exists)
-                return null;
-
-            return DeserializeConfig(File.ReadAllText(path.FullName));
-        }
-
-        /// <summary>
-        /// Delete the configuration file and folder for the specified plugin.
-        /// This will throw an <see cref="IOException"/> if the plugin did not correctly close its handles.
-        /// </summary>
-        /// <param name="pluginName">The name of the plugin.</param>
-        public void Delete(string pluginName)
-        {
-            var directory = this.GetDirectoryPath(pluginName);
-            if (directory.Exists)
-                directory.Delete(true);
-
-            var file = this.GetConfigFile(pluginName);
-            if (file.Exists)
-                file.Delete();
-        }
-
-        /// <summary>
-        /// Get plugin directory.
-        /// </summary>
-        /// <param name="pluginName">Plugin name.</param>
-        /// <returns>Plugin directory path.</returns>
-        public string GetDirectory(string pluginName)
-        {
-            try
             {
-                var path = this.GetDirectoryPath(pluginName);
-                if (!path.Exists)
-                {
-                    path.Create();
-                }
-
-                return path.FullName;
-            }
-            catch
-            {
-                return string.Empty;
+                path.Create();
             }
+
+            return path.FullName;
         }
-
-        /// <summary>
-        /// Load Plugin configuration. Parameterized deserialization.
-        /// Currently this is called via reflection from DalamudPluginInterface.GetPluginConfig().
-        /// Eventually there may be an additional pluginInterface method that can call this directly
-        /// without reflection - for now this is in support of the existing plugin api.
-        /// </summary>
-        /// <param name="pluginName">Plugin Name.</param>
-        /// <typeparam name="T">Configuration Type.</typeparam>
-        /// <returns>Plugin Configuration.</returns>
-        public T LoadForType<T>(string pluginName) where T : IPluginConfiguration
+        catch
         {
-            var path = this.GetConfigFile(pluginName);
-
-            return !path.Exists ? default : JsonConvert.DeserializeObject<T>(File.ReadAllText(path.FullName));
-
-            // intentionally no type handling - it will break when updating a plugin at runtime
-            // and turns out to be unnecessary when we fully qualify the object type
+            return string.Empty;
         }
+    }
 
-        /// <summary>
-        /// Get FileInfo to plugin config file.
-        /// </summary>
-        /// <param name="pluginName">InternalName of the plugin.</param>
-        /// <returns>FileInfo of the config file.</returns>
-        public FileInfo GetConfigFile(string pluginName) => new(Path.Combine(this.configDirectory.FullName, $"{pluginName}.json"));
+    /// <summary>
+    /// Load Plugin configuration. Parameterized deserialization.
+    /// Currently this is called via reflection from DalamudPluginInterface.GetPluginConfig().
+    /// Eventually there may be an additional pluginInterface method that can call this directly
+    /// without reflection - for now this is in support of the existing plugin api.
+    /// </summary>
+    /// <param name="pluginName">Plugin Name.</param>
+    /// <typeparam name="T">Configuration Type.</typeparam>
+    /// <returns>Plugin Configuration.</returns>
+    public T LoadForType<T>(string pluginName) where T : IPluginConfiguration
+    {
+        var path = this.GetConfigFile(pluginName);
 
-        /// <summary>
-        /// Serializes a plugin configuration object.
-        /// </summary>
-        /// <param name="config">The configuration object.</param>
-        /// <returns>A string representing the serialized configuration object.</returns>
-        internal static string SerializeConfig(object? config)
+        return !path.Exists ? default : JsonConvert.DeserializeObject<T>(File.ReadAllText(path.FullName));
+
+        // intentionally no type handling - it will break when updating a plugin at runtime
+        // and turns out to be unnecessary when we fully qualify the object type
+    }
+
+    /// <summary>
+    /// Get FileInfo to plugin config file.
+    /// </summary>
+    /// <param name="pluginName">InternalName of the plugin.</param>
+    /// <returns>FileInfo of the config file.</returns>
+    public FileInfo GetConfigFile(string pluginName) => new(Path.Combine(this.configDirectory.FullName, $"{pluginName}.json"));
+
+    /// <summary>
+    /// Serializes a plugin configuration object.
+    /// </summary>
+    /// <param name="config">The configuration object.</param>
+    /// <returns>A string representing the serialized configuration object.</returns>
+    internal static string SerializeConfig(object? config)
+    {
+        return JsonConvert.SerializeObject(config, Formatting.Indented, new JsonSerializerSettings
         {
-            return JsonConvert.SerializeObject(config, Formatting.Indented, new JsonSerializerSettings
+            TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
+            TypeNameHandling = TypeNameHandling.Objects,
+        });
+    }
+
+    /// <summary>
+    /// Deserializes a plugin configuration from a string.
+    /// </summary>
+    /// <param name="data">The serialized configuration.</param>
+    /// <returns>The configuration object, or null.</returns>
+    internal static IPluginConfiguration? DeserializeConfig(string data)
+    {
+        return JsonConvert.DeserializeObject<IPluginConfiguration>(
+            data,
+            new JsonSerializerSettings
             {
                 TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
                 TypeNameHandling = TypeNameHandling.Objects,
             });
-        }
-
-        /// <summary>
-        /// Deserializes a plugin configuration from a string.
-        /// </summary>
-        /// <param name="data">The serialized configuration.</param>
-        /// <returns>The configuration object, or null.</returns>
-        internal static IPluginConfiguration? DeserializeConfig(string data)
-        {
-            return JsonConvert.DeserializeObject<IPluginConfiguration>(
-                data,
-                new JsonSerializerSettings
-                {
-                    TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
-                    TypeNameHandling = TypeNameHandling.Objects,
-                });
-        }
-
-        private DirectoryInfo GetDirectoryPath(string pluginName) => new(Path.Combine(this.configDirectory.FullName, pluginName));
     }
+
+    private DirectoryInfo GetDirectoryPath(string pluginName) => new(Path.Combine(this.configDirectory.FullName, pluginName));
 }
diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs
index d78c36692..37375d87b 100644
--- a/Dalamud/Dalamud.cs
+++ b/Dalamud/Dalamud.cs
@@ -19,131 +19,130 @@ using Serilog;
 [assembly: InternalsVisibleTo("Dalamud.Test")]
 [assembly: InternalsVisibleTo("Dalamud.DevHelpers")]
 
-namespace Dalamud
+namespace Dalamud;
+
+/// <summary>
+/// The main Dalamud class containing all subsystems.
+/// </summary>
+internal sealed class Dalamud : IServiceType
 {
+    #region Internals
+
+    private readonly ManualResetEvent unloadSignal;
+
+    #endregion
+
     /// <summary>
-    /// The main Dalamud class containing all subsystems.
+    /// Initializes a new instance of the <see cref="Dalamud"/> class.
     /// </summary>
-    internal sealed class Dalamud : IServiceType
+    /// <param name="info">DalamudStartInfo instance.</param>
+    /// <param name="configuration">The Dalamud configuration.</param>
+    /// <param name="mainThreadContinueEvent">Event used to signal the main thread to continue.</param>
+    public Dalamud(DalamudStartInfo info, DalamudConfiguration configuration, IntPtr mainThreadContinueEvent)
     {
-        #region Internals
+        this.unloadSignal = new ManualResetEvent(false);
+        this.unloadSignal.Reset();
 
-        private readonly ManualResetEvent unloadSignal;
+        ServiceManager.InitializeProvidedServicesAndClientStructs(this, info, configuration);
 
-        #endregion
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Dalamud"/> class.
-        /// </summary>
-        /// <param name="info">DalamudStartInfo instance.</param>
-        /// <param name="configuration">The Dalamud configuration.</param>
-        /// <param name="mainThreadContinueEvent">Event used to signal the main thread to continue.</param>
-        public Dalamud(DalamudStartInfo info, DalamudConfiguration configuration, IntPtr mainThreadContinueEvent)
+        if (!configuration.IsResumeGameAfterPluginLoad)
         {
-            this.unloadSignal = new ManualResetEvent(false);
-            this.unloadSignal.Reset();
-
-            ServiceManager.InitializeProvidedServicesAndClientStructs(this, info, configuration);
-
-            if (!configuration.IsResumeGameAfterPluginLoad)
+            NativeFunctions.SetEvent(mainThreadContinueEvent);
+            try
+            {
+                _ = ServiceManager.InitializeEarlyLoadableServices();
+            }
+            catch (Exception e)
+            {
+                Log.Error(e, "Service initialization failure");
+            }
+        }
+        else
+        {
+            Task.Run(async () =>
             {
-                NativeFunctions.SetEvent(mainThreadContinueEvent);
                 try
                 {
-                    _ = ServiceManager.InitializeEarlyLoadableServices();
+                    var tasks = new[]
+                    {
+                        ServiceManager.InitializeEarlyLoadableServices(),
+                        ServiceManager.BlockingResolved,
+                    };
+
+                    await Task.WhenAny(tasks);
+                    var faultedTasks = tasks.Where(x => x.IsFaulted).Select(x => (Exception)x.Exception!).ToArray();
+                    if (faultedTasks.Any())
+                        throw new AggregateException(faultedTasks);
+
+                    NativeFunctions.SetEvent(mainThreadContinueEvent);
+
+                    await Task.WhenAll(tasks);
                 }
                 catch (Exception e)
                 {
                     Log.Error(e, "Service initialization failure");
                 }
-            }
-            else
-            {
-                Task.Run(async () =>
+                finally
                 {
-                    try
-                    {
-                        var tasks = new[]
-                        {
-                            ServiceManager.InitializeEarlyLoadableServices(),
-                            ServiceManager.BlockingResolved,
-                        };
-
-                        await Task.WhenAny(tasks);
-                        var faultedTasks = tasks.Where(x => x.IsFaulted).Select(x => (Exception)x.Exception!).ToArray();
-                        if (faultedTasks.Any())
-                            throw new AggregateException(faultedTasks);
-
-                        NativeFunctions.SetEvent(mainThreadContinueEvent);
-
-                        await Task.WhenAll(tasks);
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Error(e, "Service initialization failure");
-                    }
-                    finally
-                    {
-                        NativeFunctions.SetEvent(mainThreadContinueEvent);
-                    }
-                });
-            }
-        }
-
-        /// <summary>
-        /// Gets location of stored assets.
-        /// </summary>
-        internal DirectoryInfo AssetDirectory => new(Service<DalamudStartInfo>.Get().AssetDirectory!);
-
-        /// <summary>
-        /// Queue an unload of Dalamud when it gets the chance.
-        /// </summary>
-        public void Unload()
-        {
-            Log.Information("Trigger unload");
-            this.unloadSignal.Set();
-        }
-
-        /// <summary>
-        /// Wait for an unload request to start.
-        /// </summary>
-        public void WaitForUnload()
-        {
-            this.unloadSignal.WaitOne();
-        }
-
-        /// <summary>
-        /// Dispose subsystems related to plugin handling.
-        /// </summary>
-        public void DisposePlugins()
-        {
-            // this must be done before unloading interface manager, in order to do rebuild
-            // the correct cascaded WndProc (IME -> RawDX11Scene -> Game). Otherwise the game
-            // will not receive any windows messages
-            Service<DalamudIME>.GetNullable()?.Dispose();
-
-            // this must be done before unloading plugins, or it can cause a race condition
-            // due to rendering happening on another thread, where a plugin might receive
-            // a render call after it has been disposed, which can crash if it attempts to
-            // use any resources that it freed in its own Dispose method
-            Service<InterfaceManager>.GetNullable()?.Dispose();
-
-            Service<DalamudInterface>.GetNullable()?.Dispose();
-
-            Service<PluginManager>.GetNullable()?.Dispose();
-        }
-
-        /// <summary>
-        /// Replace the built-in exception handler with a debug one.
-        /// </summary>
-        internal void ReplaceExceptionHandler()
-        {
-            var releaseSig = "40 55 53 56 48 8D AC 24 ?? ?? ?? ?? B8 ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 2B E0 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 85 ?? ?? ?? ?? 48 83 3D ?? ?? ?? ?? ??";
-            var releaseFilter = Service<SigScanner>.Get().ScanText(releaseSig);
-            Log.Debug($"SE debug filter at {releaseFilter.ToInt64():X}");
-
-            var oldFilter = NativeFunctions.SetUnhandledExceptionFilter(releaseFilter);
-            Log.Debug("Reset ExceptionFilter, old: {0}", oldFilter);
+                    NativeFunctions.SetEvent(mainThreadContinueEvent);
+                }
+            });
         }
     }
+
+    /// <summary>
+    /// Gets location of stored assets.
+    /// </summary>
+    internal DirectoryInfo AssetDirectory => new(Service<DalamudStartInfo>.Get().AssetDirectory!);
+
+    /// <summary>
+    /// Queue an unload of Dalamud when it gets the chance.
+    /// </summary>
+    public void Unload()
+    {
+        Log.Information("Trigger unload");
+        this.unloadSignal.Set();
+    }
+
+    /// <summary>
+    /// Wait for an unload request to start.
+    /// </summary>
+    public void WaitForUnload()
+    {
+        this.unloadSignal.WaitOne();
+    }
+
+    /// <summary>
+    /// Dispose subsystems related to plugin handling.
+    /// </summary>
+    public void DisposePlugins()
+    {
+        // this must be done before unloading interface manager, in order to do rebuild
+        // the correct cascaded WndProc (IME -> RawDX11Scene -> Game). Otherwise the game
+        // will not receive any windows messages
+        Service<DalamudIME>.GetNullable()?.Dispose();
+
+        // this must be done before unloading plugins, or it can cause a race condition
+        // due to rendering happening on another thread, where a plugin might receive
+        // a render call after it has been disposed, which can crash if it attempts to
+        // use any resources that it freed in its own Dispose method
+        Service<InterfaceManager>.GetNullable()?.Dispose();
+
+        Service<DalamudInterface>.GetNullable()?.Dispose();
+
+        Service<PluginManager>.GetNullable()?.Dispose();
+    }
+
+    /// <summary>
+    /// Replace the built-in exception handler with a debug one.
+    /// </summary>
+    internal void ReplaceExceptionHandler()
+    {
+        var releaseSig = "40 55 53 56 48 8D AC 24 ?? ?? ?? ?? B8 ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 2B E0 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 85 ?? ?? ?? ?? 48 83 3D ?? ?? ?? ?? ??";
+        var releaseFilter = Service<SigScanner>.Get().ScanText(releaseSig);
+        Log.Debug($"SE debug filter at {releaseFilter.ToInt64():X}");
+
+        var oldFilter = NativeFunctions.SetUnhandledExceptionFilter(releaseFilter);
+        Log.Debug("Reset ExceptionFilter, old: {0}", oldFilter);
+    }
 }
diff --git a/Dalamud/DalamudStartInfo.cs b/Dalamud/DalamudStartInfo.cs
index 434624b3b..0010741bf 100644
--- a/Dalamud/DalamudStartInfo.cs
+++ b/Dalamud/DalamudStartInfo.cs
@@ -4,167 +4,166 @@ using System.Collections.Generic;
 using Dalamud.Game;
 using Newtonsoft.Json;
 
-namespace Dalamud
+namespace Dalamud;
+
+/// <summary>
+/// Struct containing information needed to initialize Dalamud.
+/// </summary>
+[Serializable]
+public record DalamudStartInfo : IServiceType
 {
     /// <summary>
-    /// Struct containing information needed to initialize Dalamud.
+    /// Initializes a new instance of the <see cref="DalamudStartInfo"/> class.
     /// </summary>
-    [Serializable]
-    public record DalamudStartInfo : IServiceType
+    public DalamudStartInfo()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DalamudStartInfo"/> class.
-        /// </summary>
-        public DalamudStartInfo()
-        {
-            // ignored
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DalamudStartInfo"/> class.
-        /// </summary>
-        /// <param name="other">Object to copy values from.</param>
-        public DalamudStartInfo(DalamudStartInfo other)
-        {
-            this.WorkingDirectory = other.WorkingDirectory;
-            this.ConfigurationPath = other.ConfigurationPath;
-            this.PluginDirectory = other.PluginDirectory;
-            this.DefaultPluginDirectory = other.DefaultPluginDirectory;
-            this.AssetDirectory = other.AssetDirectory;
-            this.Language = other.Language;
-            this.GameVersion = other.GameVersion;
-            this.DelayInitializeMs = other.DelayInitializeMs;
-            this.TroubleshootingPackData = other.TroubleshootingPackData;
-            this.NoLoadPlugins = other.NoLoadPlugins;
-            this.NoLoadThirdPartyPlugins = other.NoLoadThirdPartyPlugins;
-            this.BootLogPath = other.BootLogPath;
-            this.BootShowConsole = other.BootShowConsole;
-            this.BootDisableFallbackConsole = other.BootDisableFallbackConsole;
-            this.BootWaitMessageBox = other.BootWaitMessageBox;
-            this.BootWaitDebugger = other.BootWaitDebugger;
-            this.BootVehEnabled = other.BootVehEnabled;
-            this.BootVehFull = other.BootVehFull;
-            this.BootEnableEtw = other.BootEnableEtw;
-            this.BootDotnetOpenProcessHookMode = other.BootDotnetOpenProcessHookMode;
-            this.BootEnabledGameFixes = other.BootEnabledGameFixes;
-            this.BootUnhookDlls = other.BootUnhookDlls;
-            this.CrashHandlerShow = other.CrashHandlerShow;
-        }
-
-        /// <summary>
-        /// Gets or sets the working directory of the XIVLauncher installations.
-        /// </summary>
-        public string? WorkingDirectory { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path to the configuration file.
-        /// </summary>
-        public string? ConfigurationPath { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path to the directory for installed plugins.
-        /// </summary>
-        public string? PluginDirectory { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path to the directory for developer plugins.
-        /// </summary>
-        public string? DefaultPluginDirectory { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path to core Dalamud assets.
-        /// </summary>
-        public string? AssetDirectory { get; set; }
-
-        /// <summary>
-        /// Gets or sets the language of the game client.
-        /// </summary>
-        public ClientLanguage Language { get; set; } = ClientLanguage.English;
-
-        /// <summary>
-        /// Gets or sets the current game version code.
-        /// </summary>
-        [JsonConverter(typeof(GameVersionConverter))]
-        public GameVersion? GameVersion { get; set; }
-
-        /// <summary>
-        /// Gets or sets troubleshooting information to attach when generating a tspack file.
-        /// </summary>
-        public string TroubleshootingPackData { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value that specifies how much to wait before a new Dalamud session.
-        /// </summary>
-        public int DelayInitializeMs { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether no plugins should be loaded.
-        /// </summary>
-        public bool NoLoadPlugins { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether no third-party plugins should be loaded.
-        /// </summary>
-        public bool NoLoadThirdPartyPlugins { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path the boot log file is supposed to be written to.
-        /// </summary>
-        public string? BootLogPath { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether a Boot console should be shown.
-        /// </summary>
-        public bool BootShowConsole { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the fallback console should be shown, if needed.
-        /// </summary>
-        public bool BootDisableFallbackConsole { get; set; }
-
-        /// <summary>
-        /// Gets or sets a flag indicating where Dalamud should wait with a message box.
-        /// </summary>
-        public int BootWaitMessageBox { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether Dalamud should wait for a debugger to be attached before initializing.
-        /// </summary>
-        public bool BootWaitDebugger { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the VEH should be enabled.
-        /// </summary>
-        public bool BootVehEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the VEH should be doing full crash dumps.
-        /// </summary>
-        public bool BootVehFull { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not ETW should be enabled.
-        /// </summary>
-        public bool BootEnableEtw { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value choosing the OpenProcess hookmode.
-        /// </summary>
-        public int BootDotnetOpenProcessHookMode { get; set; }
-
-        /// <summary>
-        /// Gets or sets a list of enabled game fixes.
-        /// </summary>
-        public List<string>? BootEnabledGameFixes { get; set; }
-
-        /// <summary>
-        /// Gets or sets a list of DLLs that should be unhooked.
-        /// </summary>
-        public List<string>? BootUnhookDlls { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to show crash handler console window.
-        /// </summary>
-        public bool CrashHandlerShow { get; set; }
+        // ignored
     }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DalamudStartInfo"/> class.
+    /// </summary>
+    /// <param name="other">Object to copy values from.</param>
+    public DalamudStartInfo(DalamudStartInfo other)
+    {
+        this.WorkingDirectory = other.WorkingDirectory;
+        this.ConfigurationPath = other.ConfigurationPath;
+        this.PluginDirectory = other.PluginDirectory;
+        this.DefaultPluginDirectory = other.DefaultPluginDirectory;
+        this.AssetDirectory = other.AssetDirectory;
+        this.Language = other.Language;
+        this.GameVersion = other.GameVersion;
+        this.DelayInitializeMs = other.DelayInitializeMs;
+        this.TroubleshootingPackData = other.TroubleshootingPackData;
+        this.NoLoadPlugins = other.NoLoadPlugins;
+        this.NoLoadThirdPartyPlugins = other.NoLoadThirdPartyPlugins;
+        this.BootLogPath = other.BootLogPath;
+        this.BootShowConsole = other.BootShowConsole;
+        this.BootDisableFallbackConsole = other.BootDisableFallbackConsole;
+        this.BootWaitMessageBox = other.BootWaitMessageBox;
+        this.BootWaitDebugger = other.BootWaitDebugger;
+        this.BootVehEnabled = other.BootVehEnabled;
+        this.BootVehFull = other.BootVehFull;
+        this.BootEnableEtw = other.BootEnableEtw;
+        this.BootDotnetOpenProcessHookMode = other.BootDotnetOpenProcessHookMode;
+        this.BootEnabledGameFixes = other.BootEnabledGameFixes;
+        this.BootUnhookDlls = other.BootUnhookDlls;
+        this.CrashHandlerShow = other.CrashHandlerShow;
+    }
+
+    /// <summary>
+    /// Gets or sets the working directory of the XIVLauncher installations.
+    /// </summary>
+    public string? WorkingDirectory { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to the configuration file.
+    /// </summary>
+    public string? ConfigurationPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to the directory for installed plugins.
+    /// </summary>
+    public string? PluginDirectory { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to the directory for developer plugins.
+    /// </summary>
+    public string? DefaultPluginDirectory { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to core Dalamud assets.
+    /// </summary>
+    public string? AssetDirectory { get; set; }
+
+    /// <summary>
+    /// Gets or sets the language of the game client.
+    /// </summary>
+    public ClientLanguage Language { get; set; } = ClientLanguage.English;
+
+    /// <summary>
+    /// Gets or sets the current game version code.
+    /// </summary>
+    [JsonConverter(typeof(GameVersionConverter))]
+    public GameVersion? GameVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets troubleshooting information to attach when generating a tspack file.
+    /// </summary>
+    public string TroubleshootingPackData { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value that specifies how much to wait before a new Dalamud session.
+    /// </summary>
+    public int DelayInitializeMs { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether no plugins should be loaded.
+    /// </summary>
+    public bool NoLoadPlugins { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether no third-party plugins should be loaded.
+    /// </summary>
+    public bool NoLoadThirdPartyPlugins { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path the boot log file is supposed to be written to.
+    /// </summary>
+    public string? BootLogPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether a Boot console should be shown.
+    /// </summary>
+    public bool BootShowConsole { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the fallback console should be shown, if needed.
+    /// </summary>
+    public bool BootDisableFallbackConsole { get; set; }
+
+    /// <summary>
+    /// Gets or sets a flag indicating where Dalamud should wait with a message box.
+    /// </summary>
+    public int BootWaitMessageBox { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether Dalamud should wait for a debugger to be attached before initializing.
+    /// </summary>
+    public bool BootWaitDebugger { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the VEH should be enabled.
+    /// </summary>
+    public bool BootVehEnabled { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the VEH should be doing full crash dumps.
+    /// </summary>
+    public bool BootVehFull { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not ETW should be enabled.
+    /// </summary>
+    public bool BootEnableEtw { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value choosing the OpenProcess hookmode.
+    /// </summary>
+    public int BootDotnetOpenProcessHookMode { get; set; }
+
+    /// <summary>
+    /// Gets or sets a list of enabled game fixes.
+    /// </summary>
+    public List<string>? BootEnabledGameFixes { get; set; }
+
+    /// <summary>
+    /// Gets or sets a list of DLLs that should be unhooked.
+    /// </summary>
+    public List<string>? BootUnhookDlls { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to show crash handler console window.
+    /// </summary>
+    public bool CrashHandlerShow { get; set; }
 }
diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs
index 48cd0d325..8cdb58dcd 100644
--- a/Dalamud/Data/DataManager.cs
+++ b/Dalamud/Data/DataManager.cs
@@ -19,331 +19,330 @@ using Lumina.Excel;
 using Newtonsoft.Json;
 using Serilog;
 
-namespace Dalamud.Data
+namespace Dalamud.Data;
+
+/// <summary>
+/// This class provides data for Dalamud-internal features, but can also be used by plugins if needed.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed class DataManager : IDisposable, IServiceType
 {
-    /// <summary>
-    /// This class provides data for Dalamud-internal features, but can also be used by plugins if needed.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed class DataManager : IDisposable, IServiceType
+    private const string IconFileFormat = "ui/icon/{0:D3}000/{1}{2:D6}.tex";
+
+    private readonly Thread luminaResourceThread;
+    private readonly CancellationTokenSource luminaCancellationTokenSource;
+
+    [ServiceManager.ServiceConstructor]
+    private DataManager(DalamudStartInfo dalamudStartInfo, Dalamud dalamud)
     {
-        private const string IconFileFormat = "ui/icon/{0:D3}000/{1}{2:D6}.tex";
+        this.Language = dalamudStartInfo.Language;
 
-        private readonly Thread luminaResourceThread;
-        private readonly CancellationTokenSource luminaCancellationTokenSource;
+        // Set up default values so plugins do not null-reference when data is being loaded.
+        this.ClientOpCodes = this.ServerOpCodes = new ReadOnlyDictionary<string, ushort>(new Dictionary<string, ushort>());
 
-        [ServiceManager.ServiceConstructor]
-        private DataManager(DalamudStartInfo dalamudStartInfo, Dalamud dalamud)
+        var baseDir = dalamud.AssetDirectory.FullName;
+        try
         {
-            this.Language = dalamudStartInfo.Language;
+            Log.Verbose("Starting data load...");
 
-            // Set up default values so plugins do not null-reference when data is being loaded.
-            this.ClientOpCodes = this.ServerOpCodes = new ReadOnlyDictionary<string, ushort>(new Dictionary<string, ushort>());
+            var zoneOpCodeDict = JsonConvert.DeserializeObject<Dictionary<string, ushort>>(
+                File.ReadAllText(Path.Combine(baseDir, "UIRes", "serveropcode.json")))!;
+            this.ServerOpCodes = new ReadOnlyDictionary<string, ushort>(zoneOpCodeDict);
 
-            var baseDir = dalamud.AssetDirectory.FullName;
-            try
+            Log.Verbose("Loaded {0} ServerOpCodes.", zoneOpCodeDict.Count);
+
+            var clientOpCodeDict = JsonConvert.DeserializeObject<Dictionary<string, ushort>>(
+                File.ReadAllText(Path.Combine(baseDir, "UIRes", "clientopcode.json")))!;
+            this.ClientOpCodes = new ReadOnlyDictionary<string, ushort>(clientOpCodeDict);
+
+            Log.Verbose("Loaded {0} ClientOpCodes.", clientOpCodeDict.Count);
+
+            using (Timings.Start("Lumina Init"))
             {
-                Log.Verbose("Starting data load...");
-
-                var zoneOpCodeDict = JsonConvert.DeserializeObject<Dictionary<string, ushort>>(
-                    File.ReadAllText(Path.Combine(baseDir, "UIRes", "serveropcode.json")))!;
-                this.ServerOpCodes = new ReadOnlyDictionary<string, ushort>(zoneOpCodeDict);
-
-                Log.Verbose("Loaded {0} ServerOpCodes.", zoneOpCodeDict.Count);
-
-                var clientOpCodeDict = JsonConvert.DeserializeObject<Dictionary<string, ushort>>(
-                    File.ReadAllText(Path.Combine(baseDir, "UIRes", "clientopcode.json")))!;
-                this.ClientOpCodes = new ReadOnlyDictionary<string, ushort>(clientOpCodeDict);
-
-                Log.Verbose("Loaded {0} ClientOpCodes.", clientOpCodeDict.Count);
-
-                using (Timings.Start("Lumina Init"))
+                var luminaOptions = new LuminaOptions
                 {
-                    var luminaOptions = new LuminaOptions
-                    {
-                        LoadMultithreaded = true,
-                        CacheFileResources = true,
+                    LoadMultithreaded = true,
+                    CacheFileResources = true,
 #if DEBUG
                         PanicOnSheetChecksumMismatch = true,
 #else
-                        PanicOnSheetChecksumMismatch = false,
+                    PanicOnSheetChecksumMismatch = false,
 #endif
-                        DefaultExcelLanguage = this.Language.ToLumina(),
-                    };
+                    DefaultExcelLanguage = this.Language.ToLumina(),
+                };
 
-                    var processModule = Process.GetCurrentProcess().MainModule;
-                    if (processModule != null)
+                var processModule = Process.GetCurrentProcess().MainModule;
+                if (processModule != null)
+                {
+                    this.GameData = new GameData(Path.Combine(Path.GetDirectoryName(processModule.FileName)!, "sqpack"), luminaOptions);
+                }
+                else
+                {
+                    throw new Exception("Could not main module.");
+                }
+
+                Log.Information("Lumina is ready: {0}", this.GameData.DataPath);
+            }
+
+            this.IsDataReady = true;
+
+            this.luminaCancellationTokenSource = new();
+
+            var luminaCancellationToken = this.luminaCancellationTokenSource.Token;
+            this.luminaResourceThread = new(() =>
+            {
+                while (!luminaCancellationToken.IsCancellationRequested)
+                {
+                    if (this.GameData.FileHandleManager.HasPendingFileLoads)
                     {
-                        this.GameData = new GameData(Path.Combine(Path.GetDirectoryName(processModule.FileName)!, "sqpack"), luminaOptions);
+                        this.GameData.ProcessFileHandleQueue();
                     }
                     else
                     {
-                        throw new Exception("Could not main module.");
+                        Thread.Sleep(5);
                     }
-
-                    Log.Information("Lumina is ready: {0}", this.GameData.DataPath);
                 }
-
-                this.IsDataReady = true;
-
-                this.luminaCancellationTokenSource = new();
-
-                var luminaCancellationToken = this.luminaCancellationTokenSource.Token;
-                this.luminaResourceThread = new(() =>
-                {
-                    while (!luminaCancellationToken.IsCancellationRequested)
-                    {
-                        if (this.GameData.FileHandleManager.HasPendingFileLoads)
-                        {
-                            this.GameData.ProcessFileHandleQueue();
-                        }
-                        else
-                        {
-                            Thread.Sleep(5);
-                        }
-                    }
-                });
-                this.luminaResourceThread.Start();
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Could not download data.");
-            }
+            });
+            this.luminaResourceThread.Start();
         }
-
-        /// <summary>
-        /// Gets the current game client language.
-        /// </summary>
-        public ClientLanguage Language { get; private set; }
-
-        /// <summary>
-        /// Gets the OpCodes sent by the server to the client.
-        /// </summary>
-        public ReadOnlyDictionary<string, ushort> ServerOpCodes { get; private set; }
-
-        /// <summary>
-        /// Gets the OpCodes sent by the client to the server.
-        /// </summary>
-        [UsedImplicitly]
-        public ReadOnlyDictionary<string, ushort> ClientOpCodes { get; private set; }
-
-        /// <summary>
-        /// Gets a <see cref="Lumina"/> object which gives access to any excel/game data.
-        /// </summary>
-        public GameData GameData { get; private set; }
-
-        /// <summary>
-        /// Gets an <see cref="ExcelModule"/> object which gives access to any of the game's sheet data.
-        /// </summary>
-        public ExcelModule Excel => this.GameData.Excel;
-
-        /// <summary>
-        /// Gets a value indicating whether Game Data is ready to be read.
-        /// </summary>
-        public bool IsDataReady { get; private set; }
-
-        #region Lumina Wrappers
-
-        /// <summary>
-        /// Get an <see cref="ExcelSheet{T}"/> with the given Excel sheet row type.
-        /// </summary>
-        /// <typeparam name="T">The excel sheet type to get.</typeparam>
-        /// <returns>The <see cref="ExcelSheet{T}"/>, giving access to game rows.</returns>
-        public ExcelSheet<T>? GetExcelSheet<T>() where T : ExcelRow
+        catch (Exception ex)
         {
-            return this.Excel.GetSheet<T>();
-        }
-
-        /// <summary>
-        /// Get an <see cref="ExcelSheet{T}"/> with the given Excel sheet row type with a specified language.
-        /// </summary>
-        /// <param name="language">Language of the sheet to get.</param>
-        /// <typeparam name="T">The excel sheet type to get.</typeparam>
-        /// <returns>The <see cref="ExcelSheet{T}"/>, giving access to game rows.</returns>
-        public ExcelSheet<T>? GetExcelSheet<T>(ClientLanguage language) where T : ExcelRow
-        {
-            return this.Excel.GetSheet<T>(language.ToLumina());
-        }
-
-        /// <summary>
-        /// Get a <see cref="FileResource"/> with the given path.
-        /// </summary>
-        /// <param name="path">The path inside of the game files.</param>
-        /// <returns>The <see cref="FileResource"/> of the file.</returns>
-        public FileResource? GetFile(string path)
-        {
-            return this.GetFile<FileResource>(path);
-        }
-
-        /// <summary>
-        /// Get a <see cref="FileResource"/> with the given path, of the given type.
-        /// </summary>
-        /// <typeparam name="T">The type of resource.</typeparam>
-        /// <param name="path">The path inside of the game files.</param>
-        /// <returns>The <see cref="FileResource"/> of the file.</returns>
-        public T? GetFile<T>(string path) where T : FileResource
-        {
-            var filePath = GameData.ParseFilePath(path);
-            if (filePath == null)
-                return default;
-            return this.GameData.Repositories.TryGetValue(filePath.Repository, out var repository) ? repository.GetFile<T>(filePath.Category, filePath) : default;
-        }
-
-        /// <summary>
-        /// Check if the file with the given path exists within the game's index files.
-        /// </summary>
-        /// <param name="path">The path inside of the game files.</param>
-        /// <returns>True if the file exists.</returns>
-        public bool FileExists(string path)
-        {
-            return this.GameData.FileExists(path);
-        }
-
-        /// <summary>
-        /// Get a <see cref="TexFile"/> containing the icon with the given ID.
-        /// </summary>
-        /// <param name="iconId">The icon ID.</param>
-        /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
-        public TexFile? GetIcon(uint iconId)
-        {
-            return this.GetIcon(this.Language, iconId);
-        }
-
-        /// <summary>
-        /// Get a <see cref="TexFile"/> containing the icon with the given ID, of the given quality.
-        /// </summary>
-        /// <param name="isHq">A value indicating whether the icon should be HQ.</param>
-        /// <param name="iconId">The icon ID.</param>
-        /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
-        public TexFile? GetIcon(bool isHq, uint iconId)
-        {
-            var type = isHq ? "hq/" : string.Empty;
-            return this.GetIcon(type, iconId);
-        }
-
-        /// <summary>
-        /// Get a <see cref="TexFile"/> containing the icon with the given ID, of the given language.
-        /// </summary>
-        /// <param name="iconLanguage">The requested language.</param>
-        /// <param name="iconId">The icon ID.</param>
-        /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
-        public TexFile? GetIcon(ClientLanguage iconLanguage, uint iconId)
-        {
-            var type = iconLanguage switch
-            {
-                ClientLanguage.Japanese => "ja/",
-                ClientLanguage.English => "en/",
-                ClientLanguage.German => "de/",
-                ClientLanguage.French => "fr/",
-                _ => throw new ArgumentOutOfRangeException(nameof(iconLanguage), $"Unknown Language: {iconLanguage}"),
-            };
-
-            return this.GetIcon(type, iconId);
-        }
-
-        /// <summary>
-        /// Get a <see cref="TexFile"/> containing the icon with the given ID, of the given type.
-        /// </summary>
-        /// <param name="type">The type of the icon (e.g. 'hq' to get the HQ variant of an item icon).</param>
-        /// <param name="iconId">The icon ID.</param>
-        /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
-        public TexFile? GetIcon(string? type, uint iconId)
-        {
-            type ??= string.Empty;
-            if (type.Length > 0 && !type.EndsWith("/"))
-                type += "/";
-
-            var filePath = string.Format(IconFileFormat, iconId / 1000, type, iconId);
-            var file = this.GetFile<TexFile>(filePath);
-
-            if (type == string.Empty || file != default)
-                return file;
-
-            // Couldn't get specific type, try for generic version.
-            filePath = string.Format(IconFileFormat, iconId / 1000, string.Empty, iconId);
-            file = this.GetFile<TexFile>(filePath);
-            return file;
-        }
-
-        /// <summary>
-        /// Get a <see cref="TexFile"/> containing the HQ icon with the given ID.
-        /// </summary>
-        /// <param name="iconId">The icon ID.</param>
-        /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
-        public TexFile? GetHqIcon(uint iconId)
-            => this.GetIcon(true, iconId);
-
-        /// <summary>
-        /// Get the passed <see cref="TexFile"/> as a drawable ImGui TextureWrap.
-        /// </summary>
-        /// <param name="tex">The Lumina <see cref="TexFile"/>.</param>
-        /// <returns>A <see cref="TextureWrap"/> that can be used to draw the texture.</returns>
-        public TextureWrap? GetImGuiTexture(TexFile? tex)
-        {
-            return tex == null ? null : Service<InterfaceManager>.Get().LoadImageRaw(tex.GetRgbaImageData(), tex.Header.Width, tex.Header.Height, 4);
-        }
-
-        /// <summary>
-        /// Get the passed texture path as a drawable ImGui TextureWrap.
-        /// </summary>
-        /// <param name="path">The internal path to the texture.</param>
-        /// <returns>A <see cref="TextureWrap"/> that can be used to draw the texture.</returns>
-        public TextureWrap? GetImGuiTexture(string path)
-            => this.GetImGuiTexture(this.GetFile<TexFile>(path));
-
-        /// <summary>
-        /// Get a <see cref="TextureWrap"/> containing the icon with the given ID.
-        /// </summary>
-        /// <param name="iconId">The icon ID.</param>
-        /// <returns>The <see cref="TextureWrap"/> containing the icon.</returns>
-        public TextureWrap? GetImGuiTextureIcon(uint iconId)
-            => this.GetImGuiTexture(this.GetIcon(iconId));
-
-        /// <summary>
-        /// Get a <see cref="TextureWrap"/> containing the icon with the given ID, of the given quality.
-        /// </summary>
-        /// <param name="isHq">A value indicating whether the icon should be HQ.</param>
-        /// <param name="iconId">The icon ID.</param>
-        /// <returns>The <see cref="TextureWrap"/> containing the icon.</returns>
-        public TextureWrap? GetImGuiTextureIcon(bool isHq, uint iconId)
-            => this.GetImGuiTexture(this.GetIcon(isHq, iconId));
-
-        /// <summary>
-        /// Get a <see cref="TextureWrap"/> containing the icon with the given ID, of the given language.
-        /// </summary>
-        /// <param name="iconLanguage">The requested language.</param>
-        /// <param name="iconId">The icon ID.</param>
-        /// <returns>The <see cref="TextureWrap"/> containing the icon.</returns>
-        public TextureWrap? GetImGuiTextureIcon(ClientLanguage iconLanguage, uint iconId)
-            => this.GetImGuiTexture(this.GetIcon(iconLanguage, iconId));
-
-        /// <summary>
-        /// Get a <see cref="TextureWrap"/> containing the icon with the given ID, of the given type.
-        /// </summary>
-        /// <param name="type">The type of the icon (e.g. 'hq' to get the HQ variant of an item icon).</param>
-        /// <param name="iconId">The icon ID.</param>
-        /// <returns>The <see cref="TextureWrap"/> containing the icon.</returns>
-        public TextureWrap? GetImGuiTextureIcon(string type, uint iconId)
-            => this.GetImGuiTexture(this.GetIcon(type, iconId));
-
-        /// <summary>
-        /// Get a <see cref="TextureWrap"/> containing the HQ icon with the given ID.
-        /// </summary>
-        /// <param name="iconId">The icon ID.</param>
-        /// <returns>The <see cref="TextureWrap"/> containing the icon.</returns>
-        public TextureWrap? GetImGuiTextureHqIcon(uint iconId)
-            => this.GetImGuiTexture(this.GetHqIcon(iconId));
-
-        #endregion
-
-        /// <summary>
-        /// Dispose this DataManager.
-        /// </summary>
-        void IDisposable.Dispose()
-        {
-            this.luminaCancellationTokenSource.Cancel();
+            Log.Error(ex, "Could not download data.");
         }
     }
+
+    /// <summary>
+    /// Gets the current game client language.
+    /// </summary>
+    public ClientLanguage Language { get; private set; }
+
+    /// <summary>
+    /// Gets the OpCodes sent by the server to the client.
+    /// </summary>
+    public ReadOnlyDictionary<string, ushort> ServerOpCodes { get; private set; }
+
+    /// <summary>
+    /// Gets the OpCodes sent by the client to the server.
+    /// </summary>
+    [UsedImplicitly]
+    public ReadOnlyDictionary<string, ushort> ClientOpCodes { get; private set; }
+
+    /// <summary>
+    /// Gets a <see cref="Lumina"/> object which gives access to any excel/game data.
+    /// </summary>
+    public GameData GameData { get; private set; }
+
+    /// <summary>
+    /// Gets an <see cref="ExcelModule"/> object which gives access to any of the game's sheet data.
+    /// </summary>
+    public ExcelModule Excel => this.GameData.Excel;
+
+    /// <summary>
+    /// Gets a value indicating whether Game Data is ready to be read.
+    /// </summary>
+    public bool IsDataReady { get; private set; }
+
+    #region Lumina Wrappers
+
+    /// <summary>
+    /// Get an <see cref="ExcelSheet{T}"/> with the given Excel sheet row type.
+    /// </summary>
+    /// <typeparam name="T">The excel sheet type to get.</typeparam>
+    /// <returns>The <see cref="ExcelSheet{T}"/>, giving access to game rows.</returns>
+    public ExcelSheet<T>? GetExcelSheet<T>() where T : ExcelRow
+    {
+        return this.Excel.GetSheet<T>();
+    }
+
+    /// <summary>
+    /// Get an <see cref="ExcelSheet{T}"/> with the given Excel sheet row type with a specified language.
+    /// </summary>
+    /// <param name="language">Language of the sheet to get.</param>
+    /// <typeparam name="T">The excel sheet type to get.</typeparam>
+    /// <returns>The <see cref="ExcelSheet{T}"/>, giving access to game rows.</returns>
+    public ExcelSheet<T>? GetExcelSheet<T>(ClientLanguage language) where T : ExcelRow
+    {
+        return this.Excel.GetSheet<T>(language.ToLumina());
+    }
+
+    /// <summary>
+    /// Get a <see cref="FileResource"/> with the given path.
+    /// </summary>
+    /// <param name="path">The path inside of the game files.</param>
+    /// <returns>The <see cref="FileResource"/> of the file.</returns>
+    public FileResource? GetFile(string path)
+    {
+        return this.GetFile<FileResource>(path);
+    }
+
+    /// <summary>
+    /// Get a <see cref="FileResource"/> with the given path, of the given type.
+    /// </summary>
+    /// <typeparam name="T">The type of resource.</typeparam>
+    /// <param name="path">The path inside of the game files.</param>
+    /// <returns>The <see cref="FileResource"/> of the file.</returns>
+    public T? GetFile<T>(string path) where T : FileResource
+    {
+        var filePath = GameData.ParseFilePath(path);
+        if (filePath == null)
+            return default;
+        return this.GameData.Repositories.TryGetValue(filePath.Repository, out var repository) ? repository.GetFile<T>(filePath.Category, filePath) : default;
+    }
+
+    /// <summary>
+    /// Check if the file with the given path exists within the game's index files.
+    /// </summary>
+    /// <param name="path">The path inside of the game files.</param>
+    /// <returns>True if the file exists.</returns>
+    public bool FileExists(string path)
+    {
+        return this.GameData.FileExists(path);
+    }
+
+    /// <summary>
+    /// Get a <see cref="TexFile"/> containing the icon with the given ID.
+    /// </summary>
+    /// <param name="iconId">The icon ID.</param>
+    /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
+    public TexFile? GetIcon(uint iconId)
+    {
+        return this.GetIcon(this.Language, iconId);
+    }
+
+    /// <summary>
+    /// Get a <see cref="TexFile"/> containing the icon with the given ID, of the given quality.
+    /// </summary>
+    /// <param name="isHq">A value indicating whether the icon should be HQ.</param>
+    /// <param name="iconId">The icon ID.</param>
+    /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
+    public TexFile? GetIcon(bool isHq, uint iconId)
+    {
+        var type = isHq ? "hq/" : string.Empty;
+        return this.GetIcon(type, iconId);
+    }
+
+    /// <summary>
+    /// Get a <see cref="TexFile"/> containing the icon with the given ID, of the given language.
+    /// </summary>
+    /// <param name="iconLanguage">The requested language.</param>
+    /// <param name="iconId">The icon ID.</param>
+    /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
+    public TexFile? GetIcon(ClientLanguage iconLanguage, uint iconId)
+    {
+        var type = iconLanguage switch
+        {
+            ClientLanguage.Japanese => "ja/",
+            ClientLanguage.English => "en/",
+            ClientLanguage.German => "de/",
+            ClientLanguage.French => "fr/",
+            _ => throw new ArgumentOutOfRangeException(nameof(iconLanguage), $"Unknown Language: {iconLanguage}"),
+        };
+
+        return this.GetIcon(type, iconId);
+    }
+
+    /// <summary>
+    /// Get a <see cref="TexFile"/> containing the icon with the given ID, of the given type.
+    /// </summary>
+    /// <param name="type">The type of the icon (e.g. 'hq' to get the HQ variant of an item icon).</param>
+    /// <param name="iconId">The icon ID.</param>
+    /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
+    public TexFile? GetIcon(string? type, uint iconId)
+    {
+        type ??= string.Empty;
+        if (type.Length > 0 && !type.EndsWith("/"))
+            type += "/";
+
+        var filePath = string.Format(IconFileFormat, iconId / 1000, type, iconId);
+        var file = this.GetFile<TexFile>(filePath);
+
+        if (type == string.Empty || file != default)
+            return file;
+
+        // Couldn't get specific type, try for generic version.
+        filePath = string.Format(IconFileFormat, iconId / 1000, string.Empty, iconId);
+        file = this.GetFile<TexFile>(filePath);
+        return file;
+    }
+
+    /// <summary>
+    /// Get a <see cref="TexFile"/> containing the HQ icon with the given ID.
+    /// </summary>
+    /// <param name="iconId">The icon ID.</param>
+    /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
+    public TexFile? GetHqIcon(uint iconId)
+        => this.GetIcon(true, iconId);
+
+    /// <summary>
+    /// Get the passed <see cref="TexFile"/> as a drawable ImGui TextureWrap.
+    /// </summary>
+    /// <param name="tex">The Lumina <see cref="TexFile"/>.</param>
+    /// <returns>A <see cref="TextureWrap"/> that can be used to draw the texture.</returns>
+    public TextureWrap? GetImGuiTexture(TexFile? tex)
+    {
+        return tex == null ? null : Service<InterfaceManager>.Get().LoadImageRaw(tex.GetRgbaImageData(), tex.Header.Width, tex.Header.Height, 4);
+    }
+
+    /// <summary>
+    /// Get the passed texture path as a drawable ImGui TextureWrap.
+    /// </summary>
+    /// <param name="path">The internal path to the texture.</param>
+    /// <returns>A <see cref="TextureWrap"/> that can be used to draw the texture.</returns>
+    public TextureWrap? GetImGuiTexture(string path)
+        => this.GetImGuiTexture(this.GetFile<TexFile>(path));
+
+    /// <summary>
+    /// Get a <see cref="TextureWrap"/> containing the icon with the given ID.
+    /// </summary>
+    /// <param name="iconId">The icon ID.</param>
+    /// <returns>The <see cref="TextureWrap"/> containing the icon.</returns>
+    public TextureWrap? GetImGuiTextureIcon(uint iconId)
+        => this.GetImGuiTexture(this.GetIcon(iconId));
+
+    /// <summary>
+    /// Get a <see cref="TextureWrap"/> containing the icon with the given ID, of the given quality.
+    /// </summary>
+    /// <param name="isHq">A value indicating whether the icon should be HQ.</param>
+    /// <param name="iconId">The icon ID.</param>
+    /// <returns>The <see cref="TextureWrap"/> containing the icon.</returns>
+    public TextureWrap? GetImGuiTextureIcon(bool isHq, uint iconId)
+        => this.GetImGuiTexture(this.GetIcon(isHq, iconId));
+
+    /// <summary>
+    /// Get a <see cref="TextureWrap"/> containing the icon with the given ID, of the given language.
+    /// </summary>
+    /// <param name="iconLanguage">The requested language.</param>
+    /// <param name="iconId">The icon ID.</param>
+    /// <returns>The <see cref="TextureWrap"/> containing the icon.</returns>
+    public TextureWrap? GetImGuiTextureIcon(ClientLanguage iconLanguage, uint iconId)
+        => this.GetImGuiTexture(this.GetIcon(iconLanguage, iconId));
+
+    /// <summary>
+    /// Get a <see cref="TextureWrap"/> containing the icon with the given ID, of the given type.
+    /// </summary>
+    /// <param name="type">The type of the icon (e.g. 'hq' to get the HQ variant of an item icon).</param>
+    /// <param name="iconId">The icon ID.</param>
+    /// <returns>The <see cref="TextureWrap"/> containing the icon.</returns>
+    public TextureWrap? GetImGuiTextureIcon(string type, uint iconId)
+        => this.GetImGuiTexture(this.GetIcon(type, iconId));
+
+    /// <summary>
+    /// Get a <see cref="TextureWrap"/> containing the HQ icon with the given ID.
+    /// </summary>
+    /// <param name="iconId">The icon ID.</param>
+    /// <returns>The <see cref="TextureWrap"/> containing the icon.</returns>
+    public TextureWrap? GetImGuiTextureHqIcon(uint iconId)
+        => this.GetImGuiTexture(this.GetHqIcon(iconId));
+
+    #endregion
+
+    /// <summary>
+    /// Dispose this DataManager.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.luminaCancellationTokenSource.Cancel();
+    }
 }
diff --git a/Dalamud/EntryPoint.cs b/Dalamud/EntryPoint.cs
index a4275afcd..219b71a64 100644
--- a/Dalamud/EntryPoint.cs
+++ b/Dalamud/EntryPoint.cs
@@ -18,341 +18,340 @@ using Serilog.Events;
 
 using static Dalamud.NativeFunctions;
 
-namespace Dalamud
+namespace Dalamud;
+
+/// <summary>
+/// The main entrypoint for the Dalamud system.
+/// </summary>
+public sealed class EntryPoint
 {
     /// <summary>
-    /// The main entrypoint for the Dalamud system.
+    /// Log level switch for runtime log level change.
     /// </summary>
-    public sealed class EntryPoint
+    public static readonly LoggingLevelSwitch LogLevelSwitch = new(LogEventLevel.Verbose);
+
+    /// <summary>
+    /// A delegate used during initialization of the CLR from Dalamud.Boot.
+    /// </summary>
+    /// <param name="infoPtr">Pointer to a serialized <see cref="DalamudStartInfo"/> data.</param>
+    /// <param name="mainThreadContinueEvent">Event used to signal the main thread to continue.</param>
+    public delegate void InitDelegate(IntPtr infoPtr, IntPtr mainThreadContinueEvent);
+
+    /// <summary>
+    /// A delegate used from VEH handler on exception which CoreCLR will fast fail by default.
+    /// </summary>
+    /// <returns>HGLOBAL for message.</returns>
+    public delegate IntPtr VehDelegate();
+
+    /// <summary>
+    /// Initialize Dalamud.
+    /// </summary>
+    /// <param name="infoPtr">Pointer to a serialized <see cref="DalamudStartInfo"/> data.</param>
+    /// <param name="mainThreadContinueEvent">Event used to signal the main thread to continue.</param>
+    public static void Initialize(IntPtr infoPtr, IntPtr mainThreadContinueEvent)
     {
-        /// <summary>
-        /// Log level switch for runtime log level change.
-        /// </summary>
-        public static readonly LoggingLevelSwitch LogLevelSwitch = new(LogEventLevel.Verbose);
+        var infoStr = Marshal.PtrToStringUTF8(infoPtr)!;
+        var info = JsonConvert.DeserializeObject<DalamudStartInfo>(infoStr)!;
 
-        /// <summary>
-        /// A delegate used during initialization of the CLR from Dalamud.Boot.
-        /// </summary>
-        /// <param name="infoPtr">Pointer to a serialized <see cref="DalamudStartInfo"/> data.</param>
-        /// <param name="mainThreadContinueEvent">Event used to signal the main thread to continue.</param>
-        public delegate void InitDelegate(IntPtr infoPtr, IntPtr mainThreadContinueEvent);
+        if ((info.BootWaitMessageBox & 4) != 0)
+            MessageBoxW(IntPtr.Zero, "Press OK to continue (BeforeDalamudConstruct)", "Dalamud Boot", MessageBoxType.Ok);
 
-        /// <summary>
-        /// A delegate used from VEH handler on exception which CoreCLR will fast fail by default.
-        /// </summary>
-        /// <returns>HGLOBAL for message.</returns>
-        public delegate IntPtr VehDelegate();
+        new Thread(() => RunThread(info, mainThreadContinueEvent)).Start();
+    }
 
-        /// <summary>
-        /// Initialize Dalamud.
-        /// </summary>
-        /// <param name="infoPtr">Pointer to a serialized <see cref="DalamudStartInfo"/> data.</param>
-        /// <param name="mainThreadContinueEvent">Event used to signal the main thread to continue.</param>
-        public static void Initialize(IntPtr infoPtr, IntPtr mainThreadContinueEvent)
+    /// <summary>
+    /// Returns stack trace.
+    /// </summary>
+    /// <returns>HGlobal to wchar_t* stack trace c-string.</returns>
+    public static IntPtr VehCallback()
+    {
+        try
         {
-            var infoStr = Marshal.PtrToStringUTF8(infoPtr)!;
-            var info = JsonConvert.DeserializeObject<DalamudStartInfo>(infoStr)!;
-
-            if ((info.BootWaitMessageBox & 4) != 0)
-                MessageBoxW(IntPtr.Zero, "Press OK to continue (BeforeDalamudConstruct)", "Dalamud Boot", MessageBoxType.Ok);
-
-            new Thread(() => RunThread(info, mainThreadContinueEvent)).Start();
+            return Marshal.StringToHGlobalUni(Environment.StackTrace);
         }
-
-        /// <summary>
-        /// Returns stack trace.
-        /// </summary>
-        /// <returns>HGlobal to wchar_t* stack trace c-string.</returns>
-        public static IntPtr VehCallback()
+        catch (Exception e)
         {
-            try
-            {
-                return Marshal.StringToHGlobalUni(Environment.StackTrace);
-            }
-            catch (Exception e)
-            {
-                return Marshal.StringToHGlobalUni("Fail: " + e);
-            }
+            return Marshal.StringToHGlobalUni("Fail: " + e);
         }
+    }
 
-        /// <summary>
-        /// Sets up logging.
-        /// </summary>
-        /// <param name="baseDirectory">Base directory.</param>
-        /// <param name="logConsole">Whether to log to console.</param>
-        /// <param name="logSynchronously">Log synchronously.</param>
-        internal static void InitLogging(string baseDirectory, bool logConsole, bool logSynchronously)
-        {
+    /// <summary>
+    /// Sets up logging.
+    /// </summary>
+    /// <param name="baseDirectory">Base directory.</param>
+    /// <param name="logConsole">Whether to log to console.</param>
+    /// <param name="logSynchronously">Log synchronously.</param>
+    internal static void InitLogging(string baseDirectory, bool logConsole, bool logSynchronously)
+    {
 #if DEBUG
             var logPath = Path.Combine(baseDirectory, "dalamud.log");
             var oldPath = Path.Combine(baseDirectory, "dalamud.old.log");
             var oldPathOld = Path.Combine(baseDirectory, "dalamud.log.old");
 #else
-            var logPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.log");
-            var oldPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.old.log");
-            var oldPathOld = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.log.old");
+        var logPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.log");
+        var oldPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.old.log");
+        var oldPathOld = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.log.old");
 #endif
-            Log.CloseAndFlush();
+        Log.CloseAndFlush();
 
-            var oldFileOld = new FileInfo(oldPathOld);
-            if (oldFileOld.Exists)
-            {
-                var oldFile = new FileInfo(oldPath);
-                if (oldFile.Exists)
-                    oldFileOld.Delete();
-                else
-                    oldFileOld.MoveTo(oldPath);
-            }
-
-            CullLogFile(logPath, 1 * 1024 * 1024, oldPath, 10 * 1024 * 1024);
-
-            var config = new LoggerConfiguration()
-                         .WriteTo.Sink(SerilogEventSink.Instance)
-                         .MinimumLevel.ControlledBy(LogLevelSwitch);
-
-            if (logSynchronously)
-            {
-                config = config.WriteTo.File(logPath, fileSizeLimitBytes: null);
-            }
-            else
-            {
-                config = config.WriteTo.Async(a => a.File(
-                                                  logPath,
-                                                  fileSizeLimitBytes: null,
-                                                  buffered: false,
-                                                  flushToDiskInterval: TimeSpan.FromSeconds(1)));
-            }
-
-            if (logConsole)
-                config = config.WriteTo.Console();
-
-            Log.Logger = config.CreateLogger();
-        }
-
-        /// <summary>
-        /// Initialize all Dalamud subsystems and start running on the main thread.
-        /// </summary>
-        /// <param name="info">The <see cref="DalamudStartInfo"/> containing information needed to initialize Dalamud.</param>
-        /// <param name="mainThreadContinueEvent">Event used to signal the main thread to continue.</param>
-        private static void RunThread(DalamudStartInfo info, IntPtr mainThreadContinueEvent)
+        var oldFileOld = new FileInfo(oldPathOld);
+        if (oldFileOld.Exists)
         {
-            // Setup logger
-            InitLogging(info.WorkingDirectory!, info.BootShowConsole, true);
-            SerilogEventSink.Instance.LogLine += SerilogOnLogLine;
-
-            // Load configuration first to get some early persistent state, like log level
-            var configuration = DalamudConfiguration.Load(info.ConfigurationPath!);
-
-            // Set the appropriate logging level from the configuration
-#if !DEBUG
-            if (!configuration.LogSynchronously)
-                InitLogging(info.WorkingDirectory!, info.BootShowConsole, configuration.LogSynchronously);
-            LogLevelSwitch.MinimumLevel = configuration.LogLevel;
-#endif
-
-            // Log any unhandled exception.
-            AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
-            TaskScheduler.UnobservedTaskException += OnUnobservedTaskException;
-
-            try
-            {
-                if (info.DelayInitializeMs > 0)
-                {
-                    Log.Information(string.Format("Waiting for {0}ms before starting a session.", info.DelayInitializeMs));
-                    Thread.Sleep(info.DelayInitializeMs);
-                }
-
-                Log.Information(new string('-', 80));
-                Log.Information("Initializing a session..");
-
-                // This is due to GitHub not supporting TLS 1.0, so we enable all TLS versions globally
-                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls;
-
-                if (!Util.IsLinux())
-                    InitSymbolHandler(info);
-
-                var dalamud = new Dalamud(info, configuration, mainThreadContinueEvent);
-                Log.Information("This is Dalamud - Core: {GitHash}, CS: {CsGitHash}", Util.GetGitHash(), Util.GetGitHashClientStructs());
-
-                dalamud.WaitForUnload();
-
-                ServiceManager.UnloadAllServices();
-            }
-            catch (Exception ex)
-            {
-                Log.Fatal(ex, "Unhandled exception on main thread.");
-            }
-            finally
-            {
-                TaskScheduler.UnobservedTaskException -= OnUnobservedTaskException;
-                AppDomain.CurrentDomain.UnhandledException -= OnUnhandledException;
-
-                Log.Information("Session has ended.");
-                Log.CloseAndFlush();
-                SerilogEventSink.Instance.LogLine -= SerilogOnLogLine;
-            }
-        }
-
-        private static void SerilogOnLogLine(object? sender, (string Line, LogEvent LogEvent) ev)
-        {
-            if (ev.LogEvent.Exception == null)
-                return;
-
-            // Don't pass verbose/debug/info exceptions to the troubleshooter, as the developer is probably doing
-            // something intentionally (or this is known).
-            if (ev.LogEvent.Level < LogEventLevel.Warning)
-                return;
-
-            Troubleshooting.LogException(ev.LogEvent.Exception, ev.Line);
-        }
-
-        private static void InitSymbolHandler(DalamudStartInfo info)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(info.AssetDirectory))
-                    return;
-
-                var symbolPath = Path.Combine(info.AssetDirectory, "UIRes", "pdb");
-                var searchPath = $".;{symbolPath}";
-
-                // Remove any existing Symbol Handler and Init a new one with our search path added
-                SymCleanup(GetCurrentProcess());
-
-                if (!SymInitialize(GetCurrentProcess(), searchPath, true))
-                    throw new Win32Exception();
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "SymbolHandler Initialize Failed.");
-            }
-        }
-
-        /// <summary>
-        /// Trim existing log file to a specified length, and optionally move the excess data to another file.
-        /// </summary>
-        /// <param name="logPath">Target log file to trim.</param>
-        /// <param name="logMaxSize">Maximum size of target log file.</param>
-        /// <param name="oldPath">.old file to move excess data to.</param>
-        /// <param name="oldMaxSize">Maximum size of .old file.</param>
-        private static void CullLogFile(string logPath, int logMaxSize, string oldPath, int oldMaxSize)
-        {
-            var logFile = new FileInfo(logPath);
             var oldFile = new FileInfo(oldPath);
-            var targetFiles = new[]
-            {
-                (logFile, logMaxSize),
-                (oldFile, oldMaxSize),
-            };
-            var buffer = new byte[4096];
-
-            try
-            {
-                if (!logFile.Exists)
-                    logFile.Create().Close();
-
-                // 1. Move excess data from logFile to oldFile
-                if (logFile.Length > logMaxSize)
-                {
-                    using var reader = logFile.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-                    using var writer = oldFile.Open(FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
-
-                    var amountToMove = (int)Math.Min(logFile.Length - logMaxSize, oldMaxSize);
-                    reader.Seek(-(logMaxSize + amountToMove), SeekOrigin.End);
-
-                    for (var i = 0; i < amountToMove; i += buffer.Length)
-                        writer.Write(buffer, 0, reader.Read(buffer, 0, Math.Min(buffer.Length, amountToMove - i)));
-                }
-
-                // 2. Cull each of .log and .old files
-                foreach (var (file, maxSize) in targetFiles)
-                {
-                    if (!file.Exists || file.Length <= maxSize)
-                        continue;
-
-                    using var reader = file.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-                    using var writer = file.Open(FileMode.Open, FileAccess.Write, FileShare.ReadWrite);
-
-                    reader.Seek(file.Length - maxSize, SeekOrigin.Begin);
-                    for (int read; (read = reader.Read(buffer, 0, buffer.Length)) > 0;)
-                        writer.Write(buffer, 0, read);
-
-                    writer.SetLength(maxSize);
-                }
-            }
-            catch (Exception ex)
-            {
-                if (ex is IOException)
-                {
-                    foreach (var (file, _) in targetFiles)
-                    {
-                        try
-                        {
-                            if (file.Exists)
-                                file.Delete();
-                        }
-                        catch (Exception ex2)
-                        {
-                            Log.Error(ex2, "Failed to delete {file}", file.FullName);
-                        }
-                    }
-                }
-
-                Log.Error(ex, "Log cull failed");
-
-                /*
-                var caption = "XIVLauncher Error";
-                var message = $"Log cull threw an exception: {ex.Message}\n{ex.StackTrace ?? string.Empty}";
-                _ = MessageBoxW(IntPtr.Zero, message, caption, MessageBoxType.IconError | MessageBoxType.Ok);
-                */
-            }
+            if (oldFile.Exists)
+                oldFileOld.Delete();
+            else
+                oldFileOld.MoveTo(oldPath);
         }
 
-        private static void OnUnhandledException(object sender, UnhandledExceptionEventArgs args)
+        CullLogFile(logPath, 1 * 1024 * 1024, oldPath, 10 * 1024 * 1024);
+
+        var config = new LoggerConfiguration()
+                     .WriteTo.Sink(SerilogEventSink.Instance)
+                     .MinimumLevel.ControlledBy(LogLevelSwitch);
+
+        if (logSynchronously)
         {
-            switch (args.ExceptionObject)
-            {
-                case Exception ex:
-                    Log.Fatal(ex, "Unhandled exception on AppDomain");
-                    Troubleshooting.LogException(ex, "DalamudUnhandled");
-
-                    var info = "Further information could not be obtained";
-                    if (ex.TargetSite != null && ex.TargetSite.DeclaringType != null)
-                    {
-                        info = $"{ex.TargetSite.DeclaringType.Assembly.GetName().Name}, {ex.TargetSite.DeclaringType.FullName}::{ex.TargetSite.Name}";
-                    }
-
-                    const MessageBoxType flags = NativeFunctions.MessageBoxType.YesNo | NativeFunctions.MessageBoxType.IconError | NativeFunctions.MessageBoxType.SystemModal;
-                    var result = MessageBoxW(
-                        Process.GetCurrentProcess().MainWindowHandle,
-                        $"An internal error in a Dalamud plugin occurred.\nThe game must close.\n\nType: {ex.GetType().Name}\n{info}\n\nMore information has been recorded separately, please contact us in our Discord or on GitHub.\n\nDo you want to disable all plugins the next time you start the game?",
-                        "Dalamud",
-                        flags);
-
-                    if (result == (int)User32.MessageBoxResult.IDYES)
-                    {
-                        Log.Information("User chose to disable plugins on next launch...");
-                        var config = Service<DalamudConfiguration>.Get();
-                        config.PluginSafeMode = true;
-                        config.Save();
-                    }
-
-                    Log.CloseAndFlush();
-                    Environment.Exit(-1);
-                    break;
-                default:
-                    Log.Fatal("Unhandled SEH object on AppDomain: {Object}", args.ExceptionObject);
-
-                    Log.CloseAndFlush();
-                    Environment.Exit(-1);
-                    break;
-            }
+            config = config.WriteTo.File(logPath, fileSizeLimitBytes: null);
+        }
+        else
+        {
+            config = config.WriteTo.Async(a => a.File(
+                                              logPath,
+                                              fileSizeLimitBytes: null,
+                                              buffered: false,
+                                              flushToDiskInterval: TimeSpan.FromSeconds(1)));
         }
 
-        private static void OnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs args)
+        if (logConsole)
+            config = config.WriteTo.Console();
+
+        Log.Logger = config.CreateLogger();
+    }
+
+    /// <summary>
+    /// Initialize all Dalamud subsystems and start running on the main thread.
+    /// </summary>
+    /// <param name="info">The <see cref="DalamudStartInfo"/> containing information needed to initialize Dalamud.</param>
+    /// <param name="mainThreadContinueEvent">Event used to signal the main thread to continue.</param>
+    private static void RunThread(DalamudStartInfo info, IntPtr mainThreadContinueEvent)
+    {
+        // Setup logger
+        InitLogging(info.WorkingDirectory!, info.BootShowConsole, true);
+        SerilogEventSink.Instance.LogLine += SerilogOnLogLine;
+
+        // Load configuration first to get some early persistent state, like log level
+        var configuration = DalamudConfiguration.Load(info.ConfigurationPath!);
+
+        // Set the appropriate logging level from the configuration
+#if !DEBUG
+        if (!configuration.LogSynchronously)
+            InitLogging(info.WorkingDirectory!, info.BootShowConsole, configuration.LogSynchronously);
+        LogLevelSwitch.MinimumLevel = configuration.LogLevel;
+#endif
+
+        // Log any unhandled exception.
+        AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
+        TaskScheduler.UnobservedTaskException += OnUnobservedTaskException;
+
+        try
         {
-            if (!args.Observed)
-                Log.Error(args.Exception, "Unobserved exception in Task.");
+            if (info.DelayInitializeMs > 0)
+            {
+                Log.Information(string.Format("Waiting for {0}ms before starting a session.", info.DelayInitializeMs));
+                Thread.Sleep(info.DelayInitializeMs);
+            }
+
+            Log.Information(new string('-', 80));
+            Log.Information("Initializing a session..");
+
+            // This is due to GitHub not supporting TLS 1.0, so we enable all TLS versions globally
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls;
+
+            if (!Util.IsLinux())
+                InitSymbolHandler(info);
+
+            var dalamud = new Dalamud(info, configuration, mainThreadContinueEvent);
+            Log.Information("This is Dalamud - Core: {GitHash}, CS: {CsGitHash}", Util.GetGitHash(), Util.GetGitHashClientStructs());
+
+            dalamud.WaitForUnload();
+
+            ServiceManager.UnloadAllServices();
+        }
+        catch (Exception ex)
+        {
+            Log.Fatal(ex, "Unhandled exception on main thread.");
+        }
+        finally
+        {
+            TaskScheduler.UnobservedTaskException -= OnUnobservedTaskException;
+            AppDomain.CurrentDomain.UnhandledException -= OnUnhandledException;
+
+            Log.Information("Session has ended.");
+            Log.CloseAndFlush();
+            SerilogEventSink.Instance.LogLine -= SerilogOnLogLine;
         }
     }
+
+    private static void SerilogOnLogLine(object? sender, (string Line, LogEvent LogEvent) ev)
+    {
+        if (ev.LogEvent.Exception == null)
+            return;
+
+        // Don't pass verbose/debug/info exceptions to the troubleshooter, as the developer is probably doing
+        // something intentionally (or this is known).
+        if (ev.LogEvent.Level < LogEventLevel.Warning)
+            return;
+
+        Troubleshooting.LogException(ev.LogEvent.Exception, ev.Line);
+    }
+
+    private static void InitSymbolHandler(DalamudStartInfo info)
+    {
+        try
+        {
+            if (string.IsNullOrEmpty(info.AssetDirectory))
+                return;
+
+            var symbolPath = Path.Combine(info.AssetDirectory, "UIRes", "pdb");
+            var searchPath = $".;{symbolPath}";
+
+            // Remove any existing Symbol Handler and Init a new one with our search path added
+            SymCleanup(GetCurrentProcess());
+
+            if (!SymInitialize(GetCurrentProcess(), searchPath, true))
+                throw new Win32Exception();
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "SymbolHandler Initialize Failed.");
+        }
+    }
+
+    /// <summary>
+    /// Trim existing log file to a specified length, and optionally move the excess data to another file.
+    /// </summary>
+    /// <param name="logPath">Target log file to trim.</param>
+    /// <param name="logMaxSize">Maximum size of target log file.</param>
+    /// <param name="oldPath">.old file to move excess data to.</param>
+    /// <param name="oldMaxSize">Maximum size of .old file.</param>
+    private static void CullLogFile(string logPath, int logMaxSize, string oldPath, int oldMaxSize)
+    {
+        var logFile = new FileInfo(logPath);
+        var oldFile = new FileInfo(oldPath);
+        var targetFiles = new[]
+        {
+            (logFile, logMaxSize),
+            (oldFile, oldMaxSize),
+        };
+        var buffer = new byte[4096];
+
+        try
+        {
+            if (!logFile.Exists)
+                logFile.Create().Close();
+
+            // 1. Move excess data from logFile to oldFile
+            if (logFile.Length > logMaxSize)
+            {
+                using var reader = logFile.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                using var writer = oldFile.Open(FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
+
+                var amountToMove = (int)Math.Min(logFile.Length - logMaxSize, oldMaxSize);
+                reader.Seek(-(logMaxSize + amountToMove), SeekOrigin.End);
+
+                for (var i = 0; i < amountToMove; i += buffer.Length)
+                    writer.Write(buffer, 0, reader.Read(buffer, 0, Math.Min(buffer.Length, amountToMove - i)));
+            }
+
+            // 2. Cull each of .log and .old files
+            foreach (var (file, maxSize) in targetFiles)
+            {
+                if (!file.Exists || file.Length <= maxSize)
+                    continue;
+
+                using var reader = file.Open(FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                using var writer = file.Open(FileMode.Open, FileAccess.Write, FileShare.ReadWrite);
+
+                reader.Seek(file.Length - maxSize, SeekOrigin.Begin);
+                for (int read; (read = reader.Read(buffer, 0, buffer.Length)) > 0;)
+                    writer.Write(buffer, 0, read);
+
+                writer.SetLength(maxSize);
+            }
+        }
+        catch (Exception ex)
+        {
+            if (ex is IOException)
+            {
+                foreach (var (file, _) in targetFiles)
+                {
+                    try
+                    {
+                        if (file.Exists)
+                            file.Delete();
+                    }
+                    catch (Exception ex2)
+                    {
+                        Log.Error(ex2, "Failed to delete {file}", file.FullName);
+                    }
+                }
+            }
+
+            Log.Error(ex, "Log cull failed");
+
+            /*
+            var caption = "XIVLauncher Error";
+            var message = $"Log cull threw an exception: {ex.Message}\n{ex.StackTrace ?? string.Empty}";
+            _ = MessageBoxW(IntPtr.Zero, message, caption, MessageBoxType.IconError | MessageBoxType.Ok);
+            */
+        }
+    }
+
+    private static void OnUnhandledException(object sender, UnhandledExceptionEventArgs args)
+    {
+        switch (args.ExceptionObject)
+        {
+            case Exception ex:
+                Log.Fatal(ex, "Unhandled exception on AppDomain");
+                Troubleshooting.LogException(ex, "DalamudUnhandled");
+
+                var info = "Further information could not be obtained";
+                if (ex.TargetSite != null && ex.TargetSite.DeclaringType != null)
+                {
+                    info = $"{ex.TargetSite.DeclaringType.Assembly.GetName().Name}, {ex.TargetSite.DeclaringType.FullName}::{ex.TargetSite.Name}";
+                }
+
+                const MessageBoxType flags = NativeFunctions.MessageBoxType.YesNo | NativeFunctions.MessageBoxType.IconError | NativeFunctions.MessageBoxType.SystemModal;
+                var result = MessageBoxW(
+                    Process.GetCurrentProcess().MainWindowHandle,
+                    $"An internal error in a Dalamud plugin occurred.\nThe game must close.\n\nType: {ex.GetType().Name}\n{info}\n\nMore information has been recorded separately, please contact us in our Discord or on GitHub.\n\nDo you want to disable all plugins the next time you start the game?",
+                    "Dalamud",
+                    flags);
+
+                if (result == (int)User32.MessageBoxResult.IDYES)
+                {
+                    Log.Information("User chose to disable plugins on next launch...");
+                    var config = Service<DalamudConfiguration>.Get();
+                    config.PluginSafeMode = true;
+                    config.Save();
+                }
+
+                Log.CloseAndFlush();
+                Environment.Exit(-1);
+                break;
+            default:
+                Log.Fatal("Unhandled SEH object on AppDomain: {Object}", args.ExceptionObject);
+
+                Log.CloseAndFlush();
+                Environment.Exit(-1);
+                break;
+        }
+    }
+
+    private static void OnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs args)
+    {
+        if (!args.Observed)
+            Log.Error(args.Exception, "Unobserved exception in Task.");
+    }
 }
diff --git a/Dalamud/Game/BaseAddressResolver.cs b/Dalamud/Game/BaseAddressResolver.cs
index 81449bb07..24e7dffe8 100644
--- a/Dalamud/Game/BaseAddressResolver.cs
+++ b/Dalamud/Game/BaseAddressResolver.cs
@@ -5,114 +5,113 @@ using System.Runtime.InteropServices;
 
 using JetBrains.Annotations;
 
-namespace Dalamud.Game
+namespace Dalamud.Game;
+
+/// <summary>
+/// Base memory address resolver.
+/// </summary>
+public abstract class BaseAddressResolver
 {
     /// <summary>
-    /// Base memory address resolver.
+    /// Gets a list of memory addresses that were found, to list in /xldata.
     /// </summary>
-    public abstract class BaseAddressResolver
+    public static Dictionary<string, List<(string ClassName, IntPtr Address)>> DebugScannedValues { get; } = new();
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the resolver has successfully run <see cref="Setup32Bit(SigScanner)"/> or <see cref="Setup64Bit(SigScanner)"/>.
+    /// </summary>
+    protected bool IsResolved { get; set; }
+
+    /// <summary>
+    /// Setup the resolver, calling the appropriate method based on the process architecture,
+    /// using the default SigScanner.
+    ///
+    /// For plugins. Not intended to be called from Dalamud Service{T} constructors.
+    /// </summary>
+    [UsedImplicitly]
+    public void Setup() => this.Setup(Service<SigScanner>.Get());
+
+    /// <summary>
+    /// Setup the resolver, calling the appropriate method based on the process architecture.
+    /// </summary>
+    /// <param name="scanner">The SigScanner instance.</param>
+    public void Setup(SigScanner scanner)
     {
-        /// <summary>
-        /// Gets a list of memory addresses that were found, to list in /xldata.
-        /// </summary>
-        public static Dictionary<string, List<(string ClassName, IntPtr Address)>> DebugScannedValues { get; } = new();
+        // Because C# don't allow to call virtual function while in ctor
+        // we have to do this shit :\
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the resolver has successfully run <see cref="Setup32Bit(SigScanner)"/> or <see cref="Setup64Bit(SigScanner)"/>.
-        /// </summary>
-        protected bool IsResolved { get; set; }
-
-        /// <summary>
-        /// Setup the resolver, calling the appropriate method based on the process architecture,
-        /// using the default SigScanner.
-        ///
-        /// For plugins. Not intended to be called from Dalamud Service{T} constructors.
-        /// </summary>
-        [UsedImplicitly]
-        public void Setup() => this.Setup(Service<SigScanner>.Get());
-
-        /// <summary>
-        /// Setup the resolver, calling the appropriate method based on the process architecture.
-        /// </summary>
-        /// <param name="scanner">The SigScanner instance.</param>
-        public void Setup(SigScanner scanner)
+        if (this.IsResolved)
         {
-            // Because C# don't allow to call virtual function while in ctor
-            // we have to do this shit :\
-
-            if (this.IsResolved)
-            {
-                return;
-            }
-
-            if (scanner.Is32BitProcess)
-            {
-                this.Setup32Bit(scanner);
-            }
-            else
-            {
-                this.Setup64Bit(scanner);
-            }
-
-            this.SetupInternal(scanner);
-
-            var className = this.GetType().Name;
-            var list = new List<(string, IntPtr)>();
-            lock (DebugScannedValues)
-                DebugScannedValues[className] = list;
-
-            foreach (var property in this.GetType().GetProperties().Where(x => x.PropertyType == typeof(IntPtr)))
-            {
-                list.Add((property.Name, (IntPtr)property.GetValue(this)));
-            }
-
-            this.IsResolved = true;
+            return;
         }
 
-        /// <summary>
-        /// Fetch vfunc N from a pointer to the vtable and return a delegate function pointer.
-        /// </summary>
-        /// <typeparam name="T">The delegate to marshal the function pointer to.</typeparam>
-        /// <param name="address">The address of the virtual table.</param>
-        /// <param name="vtableOffset">The offset from address to the vtable pointer.</param>
-        /// <param name="count">The vfunc index.</param>
-        /// <returns>A delegate function pointer that can be invoked.</returns>
-        public T GetVirtualFunction<T>(IntPtr address, int vtableOffset, int count) where T : class
+        if (scanner.Is32BitProcess)
         {
-            // Get vtable
-            var vtable = Marshal.ReadIntPtr(address, vtableOffset);
-
-            // Get an address to the function
-            var functionAddress = Marshal.ReadIntPtr(vtable, IntPtr.Size * count);
-
-            return Marshal.GetDelegateForFunctionPointer<T>(functionAddress);
+            this.Setup32Bit(scanner);
+        }
+        else
+        {
+            this.Setup64Bit(scanner);
         }
 
-        /// <summary>
-        /// Setup the resolver by finding any necessary memory addresses.
-        /// </summary>
-        /// <param name="scanner">The SigScanner instance.</param>
-        protected virtual void Setup32Bit(SigScanner scanner)
+        this.SetupInternal(scanner);
+
+        var className = this.GetType().Name;
+        var list = new List<(string, IntPtr)>();
+        lock (DebugScannedValues)
+            DebugScannedValues[className] = list;
+
+        foreach (var property in this.GetType().GetProperties().Where(x => x.PropertyType == typeof(IntPtr)))
         {
-            throw new NotSupportedException("32 bit version is not supported.");
+            list.Add((property.Name, (IntPtr)property.GetValue(this)));
         }
 
-        /// <summary>
-        /// Setup the resolver by finding any necessary memory addresses.
-        /// </summary>
-        /// <param name="scanner">The SigScanner instance.</param>
-        protected virtual void Setup64Bit(SigScanner scanner)
-        {
-            throw new NotSupportedException("64 bit version is not supported.");
-        }
+        this.IsResolved = true;
+    }
 
-        /// <summary>
-        /// Setup the resolver by finding any necessary memory addresses.
-        /// </summary>
-        /// <param name="scanner">The SigScanner instance.</param>
-        protected virtual void SetupInternal(SigScanner scanner)
-        {
-            // Do nothing
-        }
+    /// <summary>
+    /// Fetch vfunc N from a pointer to the vtable and return a delegate function pointer.
+    /// </summary>
+    /// <typeparam name="T">The delegate to marshal the function pointer to.</typeparam>
+    /// <param name="address">The address of the virtual table.</param>
+    /// <param name="vtableOffset">The offset from address to the vtable pointer.</param>
+    /// <param name="count">The vfunc index.</param>
+    /// <returns>A delegate function pointer that can be invoked.</returns>
+    public T GetVirtualFunction<T>(IntPtr address, int vtableOffset, int count) where T : class
+    {
+        // Get vtable
+        var vtable = Marshal.ReadIntPtr(address, vtableOffset);
+
+        // Get an address to the function
+        var functionAddress = Marshal.ReadIntPtr(vtable, IntPtr.Size * count);
+
+        return Marshal.GetDelegateForFunctionPointer<T>(functionAddress);
+    }
+
+    /// <summary>
+    /// Setup the resolver by finding any necessary memory addresses.
+    /// </summary>
+    /// <param name="scanner">The SigScanner instance.</param>
+    protected virtual void Setup32Bit(SigScanner scanner)
+    {
+        throw new NotSupportedException("32 bit version is not supported.");
+    }
+
+    /// <summary>
+    /// Setup the resolver by finding any necessary memory addresses.
+    /// </summary>
+    /// <param name="scanner">The SigScanner instance.</param>
+    protected virtual void Setup64Bit(SigScanner scanner)
+    {
+        throw new NotSupportedException("64 bit version is not supported.");
+    }
+
+    /// <summary>
+    /// Setup the resolver by finding any necessary memory addresses.
+    /// </summary>
+    /// <param name="scanner">The SigScanner instance.</param>
+    protected virtual void SetupInternal(SigScanner scanner)
+    {
+        // Do nothing
     }
 }
diff --git a/Dalamud/Game/ChatHandlers.cs b/Dalamud/Game/ChatHandlers.cs
index 3e489af82..03e28073a 100644
--- a/Dalamud/Game/ChatHandlers.cs
+++ b/Dalamud/Game/ChatHandlers.cs
@@ -20,314 +20,313 @@ using Dalamud.Plugin.Internal;
 using Dalamud.Utility;
 using Serilog;
 
-namespace Dalamud.Game
+namespace Dalamud.Game;
+
+/// <summary>
+/// Chat events and public helper functions.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public class ChatHandlers : IServiceType
 {
-    /// <summary>
-    /// Chat events and public helper functions.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public class ChatHandlers : IServiceType
+    // private static readonly Dictionary<string, string> UnicodeToDiscordEmojiDict = new()
+    // {
+    //     { "", "<:ffxive071:585847382210642069>" },
+    //     { "", "<:ffxive083:585848592699490329>" },
+    // };
+
+    // private readonly Dictionary<XivChatType, Color> handledChatTypeColors = new()
+    // {
+    //     { XivChatType.CrossParty, Color.DodgerBlue },
+    //     { XivChatType.Party, Color.DodgerBlue },
+    //     { XivChatType.FreeCompany, Color.DeepSkyBlue },
+    //     { XivChatType.CrossLinkShell1, Color.ForestGreen },
+    //     { XivChatType.CrossLinkShell2, Color.ForestGreen },
+    //     { XivChatType.CrossLinkShell3, Color.ForestGreen },
+    //     { XivChatType.CrossLinkShell4, Color.ForestGreen },
+    //     { XivChatType.CrossLinkShell5, Color.ForestGreen },
+    //     { XivChatType.CrossLinkShell6, Color.ForestGreen },
+    //     { XivChatType.CrossLinkShell7, Color.ForestGreen },
+    //     { XivChatType.CrossLinkShell8, Color.ForestGreen },
+    //     { XivChatType.Ls1, Color.ForestGreen },
+    //     { XivChatType.Ls2, Color.ForestGreen },
+    //     { XivChatType.Ls3, Color.ForestGreen },
+    //     { XivChatType.Ls4, Color.ForestGreen },
+    //     { XivChatType.Ls5, Color.ForestGreen },
+    //     { XivChatType.Ls6, Color.ForestGreen },
+    //     { XivChatType.Ls7, Color.ForestGreen },
+    //     { XivChatType.Ls8, Color.ForestGreen },
+    //     { XivChatType.TellIncoming, Color.HotPink },
+    //     { XivChatType.PvPTeam, Color.SandyBrown },
+    //     { XivChatType.Urgent, Color.DarkViolet },
+    //     { XivChatType.NoviceNetwork, Color.SaddleBrown },
+    //     { XivChatType.Echo, Color.Gray },
+    // };
+
+    private readonly Regex rmtRegex = new(
+        @"4KGOLD|We have sufficient stock|VPK\.OM|[Gg]il for free|[Gg]il [Cc]heap|5GOLD|www\.so9\.com|Fast & Convenient|Cheap & Safety Guarantee|【Code|A O A U E|igfans|4KGOLD\.COM|Cheapest Gil with|pvp and bank on google|Selling Cheap GIL|ff14mogstation\.com|Cheap Gil 1000k|gilsforyou|server 1000K =|gils_selling|E A S Y\.C O M|bonus code|mins delivery guarantee|Sell cheap|Salegm\.com|cheap Mog|Off Code:|FF14Mog.com|使用する5％オ|[Oo][Ff][Ff] [Cc]ode( *)[:;]|offers Fantasia",
+        RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+    private readonly Dictionary<ClientLanguage, Regex[]> retainerSaleRegexes = new()
     {
-        // private static readonly Dictionary<string, string> UnicodeToDiscordEmojiDict = new()
-        // {
-        //     { "", "<:ffxive071:585847382210642069>" },
-        //     { "", "<:ffxive083:585848592699490329>" },
-        // };
-
-        // private readonly Dictionary<XivChatType, Color> handledChatTypeColors = new()
-        // {
-        //     { XivChatType.CrossParty, Color.DodgerBlue },
-        //     { XivChatType.Party, Color.DodgerBlue },
-        //     { XivChatType.FreeCompany, Color.DeepSkyBlue },
-        //     { XivChatType.CrossLinkShell1, Color.ForestGreen },
-        //     { XivChatType.CrossLinkShell2, Color.ForestGreen },
-        //     { XivChatType.CrossLinkShell3, Color.ForestGreen },
-        //     { XivChatType.CrossLinkShell4, Color.ForestGreen },
-        //     { XivChatType.CrossLinkShell5, Color.ForestGreen },
-        //     { XivChatType.CrossLinkShell6, Color.ForestGreen },
-        //     { XivChatType.CrossLinkShell7, Color.ForestGreen },
-        //     { XivChatType.CrossLinkShell8, Color.ForestGreen },
-        //     { XivChatType.Ls1, Color.ForestGreen },
-        //     { XivChatType.Ls2, Color.ForestGreen },
-        //     { XivChatType.Ls3, Color.ForestGreen },
-        //     { XivChatType.Ls4, Color.ForestGreen },
-        //     { XivChatType.Ls5, Color.ForestGreen },
-        //     { XivChatType.Ls6, Color.ForestGreen },
-        //     { XivChatType.Ls7, Color.ForestGreen },
-        //     { XivChatType.Ls8, Color.ForestGreen },
-        //     { XivChatType.TellIncoming, Color.HotPink },
-        //     { XivChatType.PvPTeam, Color.SandyBrown },
-        //     { XivChatType.Urgent, Color.DarkViolet },
-        //     { XivChatType.NoviceNetwork, Color.SaddleBrown },
-        //     { XivChatType.Echo, Color.Gray },
-        // };
-
-        private readonly Regex rmtRegex = new(
-                @"4KGOLD|We have sufficient stock|VPK\.OM|[Gg]il for free|[Gg]il [Cc]heap|5GOLD|www\.so9\.com|Fast & Convenient|Cheap & Safety Guarantee|【Code|A O A U E|igfans|4KGOLD\.COM|Cheapest Gil with|pvp and bank on google|Selling Cheap GIL|ff14mogstation\.com|Cheap Gil 1000k|gilsforyou|server 1000K =|gils_selling|E A S Y\.C O M|bonus code|mins delivery guarantee|Sell cheap|Salegm\.com|cheap Mog|Off Code:|FF14Mog.com|使用する5％オ|[Oo][Ff][Ff] [Cc]ode( *)[:;]|offers Fantasia",
-                RegexOptions.Compiled | RegexOptions.IgnoreCase);
-
-        private readonly Dictionary<ClientLanguage, Regex[]> retainerSaleRegexes = new()
         {
+            ClientLanguage.Japanese,
+            new Regex[]
             {
-                ClientLanguage.Japanese,
-                new Regex[]
-                {
-                    new Regex(@"^(?:.+)マーケットに(?<origValue>[\d,.]+)ギルで出品した(?<item>.*)×(?<count>[\d,.]+)が売れ、(?<value>[\d,.]+)ギルを入手しました。$", RegexOptions.Compiled),
-                    new Regex(@"^(?:.+)マーケットに(?<origValue>[\d,.]+)ギルで出品した(?<item>.*)が売れ、(?<value>[\d,.]+)ギルを入手しました。$", RegexOptions.Compiled),
-                }
-            },
-            {
-                ClientLanguage.English,
-                new Regex[]
-                {
-                    new Regex(@"^(?<item>.+) you put up for sale in the (?:.+) markets (?:have|has) sold for (?<value>[\d,.]+) gil \(after fees\)\.$", RegexOptions.Compiled),
-                }
-            },
-            {
-                ClientLanguage.German,
-                new Regex[]
-                {
-                    new Regex(@"^Dein Gehilfe hat (?<item>.+) auf dem Markt von (?:.+) für (?<value>[\d,.]+) Gil verkauft\.$", RegexOptions.Compiled),
-                    new Regex(@"^Dein Gehilfe hat (?<item>.+) auf dem Markt von (?:.+) verkauft und (?<value>[\d,.]+) Gil erhalten\.$", RegexOptions.Compiled),
-                }
-            },
-            {
-                ClientLanguage.French,
-                new Regex[]
-                {
-                    new Regex(@"^Un servant a vendu (?<item>.+) pour (?<value>[\d,.]+) gil à (?:.+)\.$", RegexOptions.Compiled),
-                }
-            },
-        };
-
-        private readonly Regex urlRegex = new(@"(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?", RegexOptions.Compiled);
-
-        private readonly DalamudLinkPayload openInstallerWindowLink;
-
-        [ServiceManager.ServiceDependency]
-        private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
-
-        private bool hasSeenLoadingMsg;
-        private bool hasAutoUpdatedPlugins;
-
-        [ServiceManager.ServiceConstructor]
-        private ChatHandlers(ChatGui chatGui)
-        {
-            chatGui.CheckMessageHandled += this.OnCheckMessageHandled;
-            chatGui.ChatMessage += this.OnChatMessage;
-
-            this.openInstallerWindowLink = chatGui.AddChatLinkHandler("Dalamud", 1001, (i, m) =>
-            {
-                Service<DalamudInterface>.GetNullable()?.OpenPluginInstaller();
-            });
-        }
-
-        /// <summary>
-        /// Gets the last URL seen in chat.
-        /// </summary>
-        public string? LastLink { get; private set; }
-
-        /// <summary>
-        /// Convert a TextPayload to SeString and wrap in italics payloads.
-        /// </summary>
-        /// <param name="text">Text to convert.</param>
-        /// <returns>SeString payload of italicized text.</returns>
-        public static SeString MakeItalics(string text)
-            => MakeItalics(new TextPayload(text));
-
-        /// <summary>
-        /// Convert a TextPayload to SeString and wrap in italics payloads.
-        /// </summary>
-        /// <param name="text">Text to convert.</param>
-        /// <returns>SeString payload of italicized text.</returns>
-        public static SeString MakeItalics(TextPayload text)
-            => new(EmphasisItalicPayload.ItalicsOn, text, EmphasisItalicPayload.ItalicsOff);
-
-        private void OnCheckMessageHandled(XivChatType type, uint senderid, ref SeString sender, ref SeString message, ref bool isHandled)
-        {
-            var textVal = message.TextValue;
-
-            if (!this.configuration.DisableRmtFiltering)
-            {
-                var matched = this.rmtRegex.IsMatch(textVal);
-                if (matched)
-                {
-                    // This seems to be a RMT ad - let's not show it
-                    Log.Debug("Handled RMT ad: " + message.TextValue);
-                    isHandled = true;
-                    return;
-                }
+                new Regex(@"^(?:.+)マーケットに(?<origValue>[\d,.]+)ギルで出品した(?<item>.*)×(?<count>[\d,.]+)が売れ、(?<value>[\d,.]+)ギルを入手しました。$", RegexOptions.Compiled),
+                new Regex(@"^(?:.+)マーケットに(?<origValue>[\d,.]+)ギルで出品した(?<item>.*)が売れ、(?<value>[\d,.]+)ギルを入手しました。$", RegexOptions.Compiled),
             }
-
-            if (this.configuration.BadWords != null &&
-                this.configuration.BadWords.Any(x => !string.IsNullOrEmpty(x) && textVal.Contains(x)))
+        },
+        {
+            ClientLanguage.English,
+            new Regex[]
             {
-                // This seems to be in the user block list - let's not show it
-                Log.Debug("Blocklist triggered");
+                new Regex(@"^(?<item>.+) you put up for sale in the (?:.+) markets (?:have|has) sold for (?<value>[\d,.]+) gil \(after fees\)\.$", RegexOptions.Compiled),
+            }
+        },
+        {
+            ClientLanguage.German,
+            new Regex[]
+            {
+                new Regex(@"^Dein Gehilfe hat (?<item>.+) auf dem Markt von (?:.+) für (?<value>[\d,.]+) Gil verkauft\.$", RegexOptions.Compiled),
+                new Regex(@"^Dein Gehilfe hat (?<item>.+) auf dem Markt von (?:.+) verkauft und (?<value>[\d,.]+) Gil erhalten\.$", RegexOptions.Compiled),
+            }
+        },
+        {
+            ClientLanguage.French,
+            new Regex[]
+            {
+                new Regex(@"^Un servant a vendu (?<item>.+) pour (?<value>[\d,.]+) gil à (?:.+)\.$", RegexOptions.Compiled),
+            }
+        },
+    };
+
+    private readonly Regex urlRegex = new(@"(http|ftp|https)://([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:/~+#-]*[\w@?^=%&/~+#-])?", RegexOptions.Compiled);
+
+    private readonly DalamudLinkPayload openInstallerWindowLink;
+
+    [ServiceManager.ServiceDependency]
+    private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
+
+    private bool hasSeenLoadingMsg;
+    private bool hasAutoUpdatedPlugins;
+
+    [ServiceManager.ServiceConstructor]
+    private ChatHandlers(ChatGui chatGui)
+    {
+        chatGui.CheckMessageHandled += this.OnCheckMessageHandled;
+        chatGui.ChatMessage += this.OnChatMessage;
+
+        this.openInstallerWindowLink = chatGui.AddChatLinkHandler("Dalamud", 1001, (i, m) =>
+        {
+            Service<DalamudInterface>.GetNullable()?.OpenPluginInstaller();
+        });
+    }
+
+    /// <summary>
+    /// Gets the last URL seen in chat.
+    /// </summary>
+    public string? LastLink { get; private set; }
+
+    /// <summary>
+    /// Convert a TextPayload to SeString and wrap in italics payloads.
+    /// </summary>
+    /// <param name="text">Text to convert.</param>
+    /// <returns>SeString payload of italicized text.</returns>
+    public static SeString MakeItalics(string text)
+        => MakeItalics(new TextPayload(text));
+
+    /// <summary>
+    /// Convert a TextPayload to SeString and wrap in italics payloads.
+    /// </summary>
+    /// <param name="text">Text to convert.</param>
+    /// <returns>SeString payload of italicized text.</returns>
+    public static SeString MakeItalics(TextPayload text)
+        => new(EmphasisItalicPayload.ItalicsOn, text, EmphasisItalicPayload.ItalicsOff);
+
+    private void OnCheckMessageHandled(XivChatType type, uint senderid, ref SeString sender, ref SeString message, ref bool isHandled)
+    {
+        var textVal = message.TextValue;
+
+        if (!this.configuration.DisableRmtFiltering)
+        {
+            var matched = this.rmtRegex.IsMatch(textVal);
+            if (matched)
+            {
+                // This seems to be a RMT ad - let's not show it
+                Log.Debug("Handled RMT ad: " + message.TextValue);
                 isHandled = true;
                 return;
             }
         }
 
-        private void OnChatMessage(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled)
+        if (this.configuration.BadWords != null &&
+            this.configuration.BadWords.Any(x => !string.IsNullOrEmpty(x) && textVal.Contains(x)))
         {
-            var startInfo = Service<DalamudStartInfo>.Get();
-            var clientState = Service<ClientState.ClientState>.GetNullable();
-            if (clientState == null)
-                return;
+            // This seems to be in the user block list - let's not show it
+            Log.Debug("Blocklist triggered");
+            isHandled = true;
+            return;
+        }
+    }
 
-            if (type == XivChatType.Notice && !this.hasSeenLoadingMsg)
-                this.PrintWelcomeMessage();
+    private void OnChatMessage(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled)
+    {
+        var startInfo = Service<DalamudStartInfo>.Get();
+        var clientState = Service<ClientState.ClientState>.GetNullable();
+        if (clientState == null)
+            return;
 
-            // For injections while logged in
-            if (clientState.LocalPlayer != null && clientState.TerritoryType == 0 && !this.hasSeenLoadingMsg)
-                this.PrintWelcomeMessage();
+        if (type == XivChatType.Notice && !this.hasSeenLoadingMsg)
+            this.PrintWelcomeMessage();
 
-            if (!this.hasAutoUpdatedPlugins)
-                this.AutoUpdatePlugins();
+        // For injections while logged in
+        if (clientState.LocalPlayer != null && clientState.TerritoryType == 0 && !this.hasSeenLoadingMsg)
+            this.PrintWelcomeMessage();
+
+        if (!this.hasAutoUpdatedPlugins)
+            this.AutoUpdatePlugins();
 
 #if !DEBUG && false
             if (!this.hasSeenLoadingMsg)
                 return;
 #endif
 
-            if (type == XivChatType.RetainerSale)
+        if (type == XivChatType.RetainerSale)
+        {
+            foreach (var regex in this.retainerSaleRegexes[startInfo.Language])
             {
-                foreach (var regex in this.retainerSaleRegexes[startInfo.Language])
+                var matchInfo = regex.Match(message.TextValue);
+
+                // we no longer really need to do/validate the item matching since we read the id from the byte array
+                // but we'd be checking the main match anyway
+                var itemInfo = matchInfo.Groups["item"];
+                if (!itemInfo.Success)
+                    continue;
+
+                var itemLink = message.Payloads.FirstOrDefault(x => x.Type == PayloadType.Item) as ItemPayload;
+                if (itemLink == default)
                 {
-                    var matchInfo = regex.Match(message.TextValue);
-
-                    // we no longer really need to do/validate the item matching since we read the id from the byte array
-                    // but we'd be checking the main match anyway
-                    var itemInfo = matchInfo.Groups["item"];
-                    if (!itemInfo.Success)
-                        continue;
-
-                    var itemLink = message.Payloads.FirstOrDefault(x => x.Type == PayloadType.Item) as ItemPayload;
-                    if (itemLink == default)
-                    {
-                        Log.Error("itemLink was null. Msg: {0}", BitConverter.ToString(message.Encode()));
-                        break;
-                    }
-
-                    Log.Debug($"Probable retainer sale: {message}, decoded item {itemLink.Item.RowId}, HQ {itemLink.IsHQ}");
-
-                    var valueInfo = matchInfo.Groups["value"];
-                    // not sure if using a culture here would work correctly, so just strip symbols instead
-                    if (!valueInfo.Success || !int.TryParse(valueInfo.Value.Replace(",", string.Empty).Replace(".", string.Empty), out var itemValue))
-                        continue;
-
-                    // Task.Run(() => this.dalamud.BotManager.ProcessRetainerSale(itemLink.Item.RowId, itemValue, itemLink.IsHQ));
+                    Log.Error("itemLink was null. Msg: {0}", BitConverter.ToString(message.Encode()));
                     break;
                 }
+
+                Log.Debug($"Probable retainer sale: {message}, decoded item {itemLink.Item.RowId}, HQ {itemLink.IsHQ}");
+
+                var valueInfo = matchInfo.Groups["value"];
+                // not sure if using a culture here would work correctly, so just strip symbols instead
+                if (!valueInfo.Success || !int.TryParse(valueInfo.Value.Replace(",", string.Empty).Replace(".", string.Empty), out var itemValue))
+                    continue;
+
+                // Task.Run(() => this.dalamud.BotManager.ProcessRetainerSale(itemLink.Item.RowId, itemValue, itemLink.IsHQ));
+                break;
             }
-
-            var messageCopy = message;
-            var senderCopy = sender;
-
-            var linkMatch = this.urlRegex.Match(message.TextValue);
-            if (linkMatch.Value.Length > 0)
-                this.LastLink = linkMatch.Value;
         }
 
-        private void PrintWelcomeMessage()
+        var messageCopy = message;
+        var senderCopy = sender;
+
+        var linkMatch = this.urlRegex.Match(message.TextValue);
+        if (linkMatch.Value.Length > 0)
+            this.LastLink = linkMatch.Value;
+    }
+
+    private void PrintWelcomeMessage()
+    {
+        var chatGui = Service<ChatGui>.GetNullable();
+        var pluginManager = Service<PluginManager>.GetNullable();
+        var dalamudInterface = Service<DalamudInterface>.GetNullable();
+
+        if (chatGui == null || pluginManager == null || dalamudInterface == null)
+            return;
+
+        var assemblyVersion = Assembly.GetAssembly(typeof(ChatHandlers)).GetName().Version.ToString();
+
+        chatGui.Print(string.Format(Loc.Localize("DalamudWelcome", "Dalamud vD{0} loaded."), assemblyVersion)
+                      + string.Format(Loc.Localize("PluginsWelcome", " {0} plugin(s) loaded."), pluginManager.InstalledPlugins.Count(x => x.IsLoaded)));
+
+        if (this.configuration.PrintPluginsWelcomeMsg)
         {
-            var chatGui = Service<ChatGui>.GetNullable();
-            var pluginManager = Service<PluginManager>.GetNullable();
-            var dalamudInterface = Service<DalamudInterface>.GetNullable();
-
-            if (chatGui == null || pluginManager == null || dalamudInterface == null)
-                return;
-
-            var assemblyVersion = Assembly.GetAssembly(typeof(ChatHandlers)).GetName().Version.ToString();
-
-            chatGui.Print(string.Format(Loc.Localize("DalamudWelcome", "Dalamud vD{0} loaded."), assemblyVersion)
-                        + string.Format(Loc.Localize("PluginsWelcome", " {0} plugin(s) loaded."), pluginManager.InstalledPlugins.Count(x => x.IsLoaded)));
-
-            if (this.configuration.PrintPluginsWelcomeMsg)
+            foreach (var plugin in pluginManager.InstalledPlugins.OrderBy(plugin => plugin.Name).Where(x => x.IsLoaded))
             {
-                foreach (var plugin in pluginManager.InstalledPlugins.OrderBy(plugin => plugin.Name).Where(x => x.IsLoaded))
-                {
-                    chatGui.Print(string.Format(Loc.Localize("DalamudPluginLoaded", "    》 {0} v{1} loaded."), plugin.Name, plugin.Manifest.AssemblyVersion));
-                }
+                chatGui.Print(string.Format(Loc.Localize("DalamudPluginLoaded", "    》 {0} v{1} loaded."), plugin.Name, plugin.Manifest.AssemblyVersion));
             }
-
-            if (string.IsNullOrEmpty(this.configuration.LastVersion) || !assemblyVersion.StartsWith(this.configuration.LastVersion))
-            {
-                chatGui.PrintChat(new XivChatEntry
-                {
-                    Message = Loc.Localize("DalamudUpdated", "Dalamud has been updated successfully! Please check the discord for a full changelog."),
-                    Type = XivChatType.Notice,
-                });
-
-                if (string.IsNullOrEmpty(this.configuration.LastChangelogMajorMinor) || (!ChangelogWindow.WarrantsChangelogForMajorMinor.StartsWith(this.configuration.LastChangelogMajorMinor) && assemblyVersion.StartsWith(ChangelogWindow.WarrantsChangelogForMajorMinor)))
-                {
-                    dalamudInterface.OpenChangelogWindow();
-                    this.configuration.LastChangelogMajorMinor = ChangelogWindow.WarrantsChangelogForMajorMinor;
-                }
-
-                this.configuration.LastVersion = assemblyVersion;
-                this.configuration.Save();
-            }
-
-            this.hasSeenLoadingMsg = true;
         }
 
-        private void AutoUpdatePlugins()
+        if (string.IsNullOrEmpty(this.configuration.LastVersion) || !assemblyVersion.StartsWith(this.configuration.LastVersion))
         {
-            var chatGui = Service<ChatGui>.GetNullable();
-            var pluginManager = Service<PluginManager>.GetNullable();
-            var notifications = Service<NotificationManager>.GetNullable();
-
-            if (chatGui == null || pluginManager == null || notifications == null)
-                return;
-
-            if (!pluginManager.ReposReady || pluginManager.InstalledPlugins.Count == 0 || pluginManager.AvailablePlugins.Count == 0)
+            chatGui.PrintChat(new XivChatEntry
             {
-                // Plugins aren't ready yet.
-                return;
-            }
-
-            this.hasAutoUpdatedPlugins = true;
-
-            Task.Run(() => pluginManager.UpdatePluginsAsync(true, !this.configuration.AutoUpdatePlugins)).ContinueWith(task =>
-            {
-                if (task.IsFaulted)
-                {
-                    Log.Error(task.Exception, Loc.Localize("DalamudPluginUpdateCheckFail", "Could not check for plugin updates."));
-                    return;
-                }
-
-                var updatedPlugins = task.Result;
-                if (updatedPlugins.Any())
-                {
-                    if (this.configuration.AutoUpdatePlugins)
-                    {
-                        Service<PluginManager>.Get().PrintUpdatedPlugins(updatedPlugins, Loc.Localize("DalamudPluginAutoUpdate", "Auto-update:"));
-                        notifications.AddNotification(Loc.Localize("NotificationUpdatedPlugins", "{0} of your plugins were updated.").Format(updatedPlugins.Count), Loc.Localize("NotificationAutoUpdate", "Auto-Update"), NotificationType.Info);
-                    }
-                    else
-                    {
-                        chatGui.PrintChat(new XivChatEntry
-                        {
-                            Message = new SeString(new List<Payload>()
-                                {
-                                    new TextPayload(Loc.Localize("DalamudPluginUpdateRequired", "One or more of your plugins needs to be updated. Please use the /xlplugins command in-game to update them!")),
-                                    new TextPayload("  ["),
-                                    new UIForegroundPayload(500),
-                                    this.openInstallerWindowLink,
-                                    new TextPayload(Loc.Localize("DalamudInstallerHelp", "Open the plugin installer")),
-                                    RawPayload.LinkTerminator,
-                                    new UIForegroundPayload(0),
-                                    new TextPayload("]"),
-                                }),
-                            Type = XivChatType.Urgent,
-                        });
-                    }
-                }
+                Message = Loc.Localize("DalamudUpdated", "Dalamud has been updated successfully! Please check the discord for a full changelog."),
+                Type = XivChatType.Notice,
             });
+
+            if (string.IsNullOrEmpty(this.configuration.LastChangelogMajorMinor) || (!ChangelogWindow.WarrantsChangelogForMajorMinor.StartsWith(this.configuration.LastChangelogMajorMinor) && assemblyVersion.StartsWith(ChangelogWindow.WarrantsChangelogForMajorMinor)))
+            {
+                dalamudInterface.OpenChangelogWindow();
+                this.configuration.LastChangelogMajorMinor = ChangelogWindow.WarrantsChangelogForMajorMinor;
+            }
+
+            this.configuration.LastVersion = assemblyVersion;
+            this.configuration.Save();
         }
+
+        this.hasSeenLoadingMsg = true;
+    }
+
+    private void AutoUpdatePlugins()
+    {
+        var chatGui = Service<ChatGui>.GetNullable();
+        var pluginManager = Service<PluginManager>.GetNullable();
+        var notifications = Service<NotificationManager>.GetNullable();
+
+        if (chatGui == null || pluginManager == null || notifications == null)
+            return;
+
+        if (!pluginManager.ReposReady || pluginManager.InstalledPlugins.Count == 0 || pluginManager.AvailablePlugins.Count == 0)
+        {
+            // Plugins aren't ready yet.
+            return;
+        }
+
+        this.hasAutoUpdatedPlugins = true;
+
+        Task.Run(() => pluginManager.UpdatePluginsAsync(true, !this.configuration.AutoUpdatePlugins)).ContinueWith(task =>
+        {
+            if (task.IsFaulted)
+            {
+                Log.Error(task.Exception, Loc.Localize("DalamudPluginUpdateCheckFail", "Could not check for plugin updates."));
+                return;
+            }
+
+            var updatedPlugins = task.Result;
+            if (updatedPlugins.Any())
+            {
+                if (this.configuration.AutoUpdatePlugins)
+                {
+                    Service<PluginManager>.Get().PrintUpdatedPlugins(updatedPlugins, Loc.Localize("DalamudPluginAutoUpdate", "Auto-update:"));
+                    notifications.AddNotification(Loc.Localize("NotificationUpdatedPlugins", "{0} of your plugins were updated.").Format(updatedPlugins.Count), Loc.Localize("NotificationAutoUpdate", "Auto-Update"), NotificationType.Info);
+                }
+                else
+                {
+                    chatGui.PrintChat(new XivChatEntry
+                    {
+                        Message = new SeString(new List<Payload>()
+                        {
+                            new TextPayload(Loc.Localize("DalamudPluginUpdateRequired", "One or more of your plugins needs to be updated. Please use the /xlplugins command in-game to update them!")),
+                            new TextPayload("  ["),
+                            new UIForegroundPayload(500),
+                            this.openInstallerWindowLink,
+                            new TextPayload(Loc.Localize("DalamudInstallerHelp", "Open the plugin installer")),
+                            RawPayload.LinkTerminator,
+                            new UIForegroundPayload(0),
+                            new TextPayload("]"),
+                        }),
+                        Type = XivChatType.Urgent,
+                    });
+                }
+            }
+        });
     }
 }
diff --git a/Dalamud/Game/ClientState/Aetherytes/AetheryteEntry.cs b/Dalamud/Game/ClientState/Aetherytes/AetheryteEntry.cs
index 9ada955f2..8113e0593 100644
--- a/Dalamud/Game/ClientState/Aetherytes/AetheryteEntry.cs
+++ b/Dalamud/Game/ClientState/Aetherytes/AetheryteEntry.cs
@@ -1,72 +1,71 @@
 using Dalamud.Game.ClientState.Resolvers;
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
 
-namespace Dalamud.Game.ClientState.Aetherytes
+namespace Dalamud.Game.ClientState.Aetherytes;
+
+/// <summary>
+/// This class represents an entry in the Aetheryte list.
+/// </summary>
+public sealed class AetheryteEntry
 {
+    private readonly TeleportInfo data;
+
     /// <summary>
-    /// This class represents an entry in the Aetheryte list.
+    /// Initializes a new instance of the <see cref="AetheryteEntry"/> class.
     /// </summary>
-    public sealed class AetheryteEntry
+    /// <param name="data">Data read from the Aetheryte List.</param>
+    internal AetheryteEntry(TeleportInfo data)
     {
-        private readonly TeleportInfo data;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AetheryteEntry"/> class.
-        /// </summary>
-        /// <param name="data">Data read from the Aetheryte List.</param>
-        internal AetheryteEntry(TeleportInfo data)
-        {
-            this.data = data;
-        }
-
-        /// <summary>
-        /// Gets the Aetheryte ID.
-        /// </summary>
-        public uint AetheryteId => this.data.AetheryteId;
-
-        /// <summary>
-        /// Gets the Territory ID.
-        /// </summary>
-        public uint TerritoryId => this.data.TerritoryId;
-
-        /// <summary>
-        /// Gets the SubIndex used when there can be multiple Aetherytes with the same ID (Private/Shared Estates etc.).
-        /// </summary>
-        public byte SubIndex => this.data.SubIndex;
-
-        /// <summary>
-        /// Gets the Ward. Zero if not a Shared Estate.
-        /// </summary>
-        public byte Ward => this.data.Ward;
-
-        /// <summary>
-        /// Gets the Plot. Zero if not a Shared Estate.
-        /// </summary>
-        public byte Plot => this.data.Plot;
-
-        /// <summary>
-        /// Gets the Cost in Gil to Teleport to this location.
-        /// </summary>
-        public uint GilCost => this.data.GilCost;
-
-        /// <summary>
-        /// Gets a value indicating whether the LocalPlayer has set this Aetheryte as Favorite or not.
-        /// </summary>
-        public bool IsFavourite => this.data.IsFavourite != 0;
-
-        /// <summary>
-        /// Gets a value indicating whether this Aetheryte is a Shared Estate or not.
-        /// </summary>
-        public bool IsSharedHouse => this.data.IsSharedHouse;
-
-        /// <summary>
-        /// Gets a value indicating whether this Aetheryte is an Appartment or not.
-        /// </summary>
-        public bool IsAppartment => this.data.IsAppartment;
-
-        /// <summary>
-        /// Gets the Aetheryte data related to this aetheryte.
-        /// </summary>
-        public ExcelResolver<Lumina.Excel.GeneratedSheets.Aetheryte> AetheryteData => new(this.AetheryteId);
+        this.data = data;
     }
+
+    /// <summary>
+    /// Gets the Aetheryte ID.
+    /// </summary>
+    public uint AetheryteId => this.data.AetheryteId;
+
+    /// <summary>
+    /// Gets the Territory ID.
+    /// </summary>
+    public uint TerritoryId => this.data.TerritoryId;
+
+    /// <summary>
+    /// Gets the SubIndex used when there can be multiple Aetherytes with the same ID (Private/Shared Estates etc.).
+    /// </summary>
+    public byte SubIndex => this.data.SubIndex;
+
+    /// <summary>
+    /// Gets the Ward. Zero if not a Shared Estate.
+    /// </summary>
+    public byte Ward => this.data.Ward;
+
+    /// <summary>
+    /// Gets the Plot. Zero if not a Shared Estate.
+    /// </summary>
+    public byte Plot => this.data.Plot;
+
+    /// <summary>
+    /// Gets the Cost in Gil to Teleport to this location.
+    /// </summary>
+    public uint GilCost => this.data.GilCost;
+
+    /// <summary>
+    /// Gets a value indicating whether the LocalPlayer has set this Aetheryte as Favorite or not.
+    /// </summary>
+    public bool IsFavourite => this.data.IsFavourite != 0;
+
+    /// <summary>
+    /// Gets a value indicating whether this Aetheryte is a Shared Estate or not.
+    /// </summary>
+    public bool IsSharedHouse => this.data.IsSharedHouse;
+
+    /// <summary>
+    /// Gets a value indicating whether this Aetheryte is an Appartment or not.
+    /// </summary>
+    public bool IsAppartment => this.data.IsAppartment;
+
+    /// <summary>
+    /// Gets the Aetheryte data related to this aetheryte.
+    /// </summary>
+    public ExcelResolver<Lumina.Excel.GeneratedSheets.Aetheryte> AetheryteData => new(this.AetheryteId);
 }
diff --git a/Dalamud/Game/ClientState/Aetherytes/AetheryteList.cs b/Dalamud/Game/ClientState/Aetherytes/AetheryteList.cs
index dd735bd42..46b285c68 100644
--- a/Dalamud/Game/ClientState/Aetherytes/AetheryteList.cs
+++ b/Dalamud/Game/ClientState/Aetherytes/AetheryteList.cs
@@ -7,105 +7,104 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.ClientState.Aetherytes
+namespace Dalamud.Game.ClientState.Aetherytes;
+
+/// <summary>
+/// This collection represents the list of available Aetherytes in the Teleport window.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed partial class AetheryteList : IServiceType
 {
-    /// <summary>
-    /// This collection represents the list of available Aetherytes in the Teleport window.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed partial class AetheryteList : IServiceType
+    [ServiceManager.ServiceDependency]
+    private readonly ClientState clientState = Service<ClientState>.Get();
+    private readonly ClientStateAddressResolver address;
+    private readonly UpdateAetheryteListDelegate updateAetheryteListFunc;
+
+    [ServiceManager.ServiceConstructor]
+    private AetheryteList()
     {
-        [ServiceManager.ServiceDependency]
-        private readonly ClientState clientState = Service<ClientState>.Get();
-        private readonly ClientStateAddressResolver address;
-        private readonly UpdateAetheryteListDelegate updateAetheryteListFunc;
+        this.address = this.clientState.AddressResolver;
+        this.updateAetheryteListFunc = Marshal.GetDelegateForFunctionPointer<UpdateAetheryteListDelegate>(this.address.UpdateAetheryteList);
 
-        [ServiceManager.ServiceConstructor]
-        private AetheryteList()
+        Log.Verbose($"Teleport address 0x{this.address.Telepo.ToInt64():X}");
+    }
+
+    private delegate void UpdateAetheryteListDelegate(IntPtr telepo, byte arg1);
+
+    /// <summary>
+    /// Gets the amount of Aetherytes the local player has unlocked.
+    /// </summary>
+    public unsafe int Length
+    {
+        get
         {
-            this.address = this.clientState.AddressResolver;
-            this.updateAetheryteListFunc = Marshal.GetDelegateForFunctionPointer<UpdateAetheryteListDelegate>(this.address.UpdateAetheryteList);
-
-            Log.Verbose($"Teleport address 0x{this.address.Telepo.ToInt64():X}");
-        }
-
-        private delegate void UpdateAetheryteListDelegate(IntPtr telepo, byte arg1);
-
-        /// <summary>
-        /// Gets the amount of Aetherytes the local player has unlocked.
-        /// </summary>
-        public unsafe int Length
-        {
-            get
-            {
-                if (this.clientState.LocalPlayer == null)
-                    return 0;
-
-                this.Update();
-
-                if (TelepoStruct->TeleportList.First == TelepoStruct->TeleportList.Last)
-                    return 0;
-
-                return (int)TelepoStruct->TeleportList.Size();
-            }
-        }
-
-        private unsafe FFXIVClientStructs.FFXIV.Client.Game.UI.Telepo* TelepoStruct => (FFXIVClientStructs.FFXIV.Client.Game.UI.Telepo*)this.address.Telepo;
-
-        /// <summary>
-        /// Gets a Aetheryte Entry at the specified index.
-        /// </summary>
-        /// <param name="index">Index.</param>
-        /// <returns>A <see cref="AetheryteEntry"/> at the specified index.</returns>
-        public unsafe AetheryteEntry? this[int index]
-        {
-            get
-            {
-                if (index < 0 || index >= this.Length)
-                {
-                    return null;
-                }
-
-                if (this.clientState.LocalPlayer == null)
-                    return null;
-
-                return new AetheryteEntry(TelepoStruct->TeleportList.Get((ulong)index));
-            }
-        }
-
-        private void Update()
-        {
-            // this is very very important as otherwise it crashes
             if (this.clientState.LocalPlayer == null)
-                return;
+                return 0;
 
-            this.updateAetheryteListFunc(this.address.Telepo, 0);
+            this.Update();
+
+            if (TelepoStruct->TeleportList.First == TelepoStruct->TeleportList.Last)
+                return 0;
+
+            return (int)TelepoStruct->TeleportList.Size();
         }
     }
 
+    private unsafe FFXIVClientStructs.FFXIV.Client.Game.UI.Telepo* TelepoStruct => (FFXIVClientStructs.FFXIV.Client.Game.UI.Telepo*)this.address.Telepo;
+
     /// <summary>
-    /// This collection represents the list of available Aetherytes in the Teleport window.
+    /// Gets a Aetheryte Entry at the specified index.
     /// </summary>
-    public sealed partial class AetheryteList : IReadOnlyCollection<AetheryteEntry>
+    /// <param name="index">Index.</param>
+    /// <returns>A <see cref="AetheryteEntry"/> at the specified index.</returns>
+    public unsafe AetheryteEntry? this[int index]
     {
-        /// <inheritdoc/>
-        public int Count => this.Length;
-
-        /// <inheritdoc/>
-        public IEnumerator<AetheryteEntry> GetEnumerator()
+        get
         {
-            for (var i = 0; i < this.Length; i++)
+            if (index < 0 || index >= this.Length)
             {
-                yield return this[i];
+                return null;
             }
-        }
 
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return this.GetEnumerator();
+            if (this.clientState.LocalPlayer == null)
+                return null;
+
+            return new AetheryteEntry(TelepoStruct->TeleportList.Get((ulong)index));
         }
     }
+
+    private void Update()
+    {
+        // this is very very important as otherwise it crashes
+        if (this.clientState.LocalPlayer == null)
+            return;
+
+        this.updateAetheryteListFunc(this.address.Telepo, 0);
+    }
+}
+
+/// <summary>
+/// This collection represents the list of available Aetherytes in the Teleport window.
+/// </summary>
+public sealed partial class AetheryteList : IReadOnlyCollection<AetheryteEntry>
+{
+    /// <inheritdoc/>
+    public int Count => this.Length;
+
+    /// <inheritdoc/>
+    public IEnumerator<AetheryteEntry> GetEnumerator()
+    {
+        for (var i = 0; i < this.Length; i++)
+        {
+            yield return this[i];
+        }
+    }
+
+    /// <inheritdoc/>
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return this.GetEnumerator();
+    }
 }
diff --git a/Dalamud/Game/ClientState/Buddy/BuddyList.cs b/Dalamud/Game/ClientState/Buddy/BuddyList.cs
index a345d27e2..0566a1f76 100644
--- a/Dalamud/Game/ClientState/Buddy/BuddyList.cs
+++ b/Dalamud/Game/ClientState/Buddy/BuddyList.cs
@@ -7,179 +7,178 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.ClientState.Buddy
+namespace Dalamud.Game.ClientState.Buddy;
+
+/// <summary>
+/// This collection represents the buddies present in your squadron or trust party.
+/// It does not include the local player.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed partial class BuddyList : IServiceType
 {
-    /// <summary>
-    /// This collection represents the buddies present in your squadron or trust party.
-    /// It does not include the local player.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed partial class BuddyList : IServiceType
+    private const uint InvalidObjectID = 0xE0000000;
+
+    [ServiceManager.ServiceDependency]
+    private readonly ClientState clientState = Service<ClientState>.Get();
+
+    private readonly ClientStateAddressResolver address;
+
+    [ServiceManager.ServiceConstructor]
+    private BuddyList()
     {
-        private const uint InvalidObjectID = 0xE0000000;
+        this.address = this.clientState.AddressResolver;
 
-        [ServiceManager.ServiceDependency]
-        private readonly ClientState clientState = Service<ClientState>.Get();
+        Log.Verbose($"Buddy list address 0x{this.address.BuddyList.ToInt64():X}");
+    }
 
-        private readonly ClientStateAddressResolver address;
-
-        [ServiceManager.ServiceConstructor]
-        private BuddyList()
+    /// <summary>
+    /// Gets the amount of battle buddies the local player has.
+    /// </summary>
+    public int Length
+    {
+        get
         {
-            this.address = this.clientState.AddressResolver;
-
-            Log.Verbose($"Buddy list address 0x{this.address.BuddyList.ToInt64():X}");
-        }
-
-        /// <summary>
-        /// Gets the amount of battle buddies the local player has.
-        /// </summary>
-        public int Length
-        {
-            get
+            var i = 0;
+            for (; i < 3; i++)
             {
-                var i = 0;
-                for (; i < 3; i++)
-                {
-                    var addr = this.GetBattleBuddyMemberAddress(i);
-                    var member = this.CreateBuddyMemberReference(addr);
-                    if (member == null)
-                        break;
-                }
-
-                return i;
+                var addr = this.GetBattleBuddyMemberAddress(i);
+                var member = this.CreateBuddyMemberReference(addr);
+                if (member == null)
+                    break;
             }
-        }
 
-        /// <summary>
-        /// Gets a value indicating whether the local player's companion is present.
-        /// </summary>
-        public bool CompanionBuddyPresent => this.CompanionBuddy != null;
-
-        /// <summary>
-        /// Gets a value indicating whether the local player's pet is present.
-        /// </summary>
-        public bool PetBuddyPresent => this.PetBuddy != null;
-
-        /// <summary>
-        /// Gets the active companion buddy.
-        /// </summary>
-        public BuddyMember? CompanionBuddy
-        {
-            get
-            {
-                var addr = this.GetCompanionBuddyMemberAddress();
-                return this.CreateBuddyMemberReference(addr);
-            }
-        }
-
-        /// <summary>
-        /// Gets the active pet buddy.
-        /// </summary>
-        public BuddyMember? PetBuddy
-        {
-            get
-            {
-                var addr = this.GetPetBuddyMemberAddress();
-                return this.CreateBuddyMemberReference(addr);
-            }
-        }
-
-        /// <summary>
-        /// Gets the address of the buddy list.
-        /// </summary>
-        internal IntPtr BuddyListAddress => this.address.BuddyList;
-
-        private static int BuddyMemberSize { get; } = Marshal.SizeOf<FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy>();
-
-        private unsafe FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy* BuddyListStruct => (FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy*)this.BuddyListAddress;
-
-        /// <summary>
-        /// Gets a battle buddy at the specified spawn index.
-        /// </summary>
-        /// <param name="index">Spawn index.</param>
-        /// <returns>A <see cref="BuddyMember"/> at the specified spawn index.</returns>
-        public BuddyMember? this[int index]
-        {
-            get
-            {
-                var address = this.GetBattleBuddyMemberAddress(index);
-                return this.CreateBuddyMemberReference(address);
-            }
-        }
-
-        /// <summary>
-        /// Gets the address of the companion buddy.
-        /// </summary>
-        /// <returns>The memory address of the companion buddy.</returns>
-        public unsafe IntPtr GetCompanionBuddyMemberAddress()
-        {
-            return (IntPtr)(&this.BuddyListStruct->Companion);
-        }
-
-        /// <summary>
-        /// Gets the address of the pet buddy.
-        /// </summary>
-        /// <returns>The memory address of the pet buddy.</returns>
-        public unsafe IntPtr GetPetBuddyMemberAddress()
-        {
-            return (IntPtr)(&this.BuddyListStruct->Pet);
-        }
-
-        /// <summary>
-        /// Gets the address of the battle buddy at the specified index of the buddy list.
-        /// </summary>
-        /// <param name="index">The index of the battle buddy.</param>
-        /// <returns>The memory address of the battle buddy.</returns>
-        public unsafe IntPtr GetBattleBuddyMemberAddress(int index)
-        {
-            if (index < 0 || index >= 3)
-                return IntPtr.Zero;
-
-            return (IntPtr)(this.BuddyListStruct->BattleBuddies + (index * BuddyMemberSize));
-        }
-
-        /// <summary>
-        /// Create a reference to a buddy.
-        /// </summary>
-        /// <param name="address">The address of the buddy in memory.</param>
-        /// <returns><see cref="BuddyMember"/> object containing the requested data.</returns>
-        public BuddyMember? CreateBuddyMemberReference(IntPtr address)
-        {
-            if (this.clientState.LocalContentId == 0)
-                return null;
-
-            if (address == IntPtr.Zero)
-                return null;
-
-            var buddy = new BuddyMember(address);
-            if (buddy.ObjectId == InvalidObjectID)
-                return null;
-
-            return buddy;
+            return i;
         }
     }
 
     /// <summary>
-    /// This collection represents the buddies present in your squadron or trust party.
+    /// Gets a value indicating whether the local player's companion is present.
     /// </summary>
-    public sealed partial class BuddyList : IReadOnlyCollection<BuddyMember>
+    public bool CompanionBuddyPresent => this.CompanionBuddy != null;
+
+    /// <summary>
+    /// Gets a value indicating whether the local player's pet is present.
+    /// </summary>
+    public bool PetBuddyPresent => this.PetBuddy != null;
+
+    /// <summary>
+    /// Gets the active companion buddy.
+    /// </summary>
+    public BuddyMember? CompanionBuddy
     {
-        /// <inheritdoc/>
-        int IReadOnlyCollection<BuddyMember>.Count => this.Length;
-
-        /// <inheritdoc/>
-        public IEnumerator<BuddyMember> GetEnumerator()
+        get
         {
-            for (var i = 0; i < this.Length; i++)
-            {
-                yield return this[i];
-            }
+            var addr = this.GetCompanionBuddyMemberAddress();
+            return this.CreateBuddyMemberReference(addr);
         }
+    }
 
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+    /// <summary>
+    /// Gets the active pet buddy.
+    /// </summary>
+    public BuddyMember? PetBuddy
+    {
+        get
+        {
+            var addr = this.GetPetBuddyMemberAddress();
+            return this.CreateBuddyMemberReference(addr);
+        }
+    }
+
+    /// <summary>
+    /// Gets the address of the buddy list.
+    /// </summary>
+    internal IntPtr BuddyListAddress => this.address.BuddyList;
+
+    private static int BuddyMemberSize { get; } = Marshal.SizeOf<FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy>();
+
+    private unsafe FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy* BuddyListStruct => (FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy*)this.BuddyListAddress;
+
+    /// <summary>
+    /// Gets a battle buddy at the specified spawn index.
+    /// </summary>
+    /// <param name="index">Spawn index.</param>
+    /// <returns>A <see cref="BuddyMember"/> at the specified spawn index.</returns>
+    public BuddyMember? this[int index]
+    {
+        get
+        {
+            var address = this.GetBattleBuddyMemberAddress(index);
+            return this.CreateBuddyMemberReference(address);
+        }
+    }
+
+    /// <summary>
+    /// Gets the address of the companion buddy.
+    /// </summary>
+    /// <returns>The memory address of the companion buddy.</returns>
+    public unsafe IntPtr GetCompanionBuddyMemberAddress()
+    {
+        return (IntPtr)(&this.BuddyListStruct->Companion);
+    }
+
+    /// <summary>
+    /// Gets the address of the pet buddy.
+    /// </summary>
+    /// <returns>The memory address of the pet buddy.</returns>
+    public unsafe IntPtr GetPetBuddyMemberAddress()
+    {
+        return (IntPtr)(&this.BuddyListStruct->Pet);
+    }
+
+    /// <summary>
+    /// Gets the address of the battle buddy at the specified index of the buddy list.
+    /// </summary>
+    /// <param name="index">The index of the battle buddy.</param>
+    /// <returns>The memory address of the battle buddy.</returns>
+    public unsafe IntPtr GetBattleBuddyMemberAddress(int index)
+    {
+        if (index < 0 || index >= 3)
+            return IntPtr.Zero;
+
+        return (IntPtr)(this.BuddyListStruct->BattleBuddies + (index * BuddyMemberSize));
+    }
+
+    /// <summary>
+    /// Create a reference to a buddy.
+    /// </summary>
+    /// <param name="address">The address of the buddy in memory.</param>
+    /// <returns><see cref="BuddyMember"/> object containing the requested data.</returns>
+    public BuddyMember? CreateBuddyMemberReference(IntPtr address)
+    {
+        if (this.clientState.LocalContentId == 0)
+            return null;
+
+        if (address == IntPtr.Zero)
+            return null;
+
+        var buddy = new BuddyMember(address);
+        if (buddy.ObjectId == InvalidObjectID)
+            return null;
+
+        return buddy;
     }
 }
+
+/// <summary>
+/// This collection represents the buddies present in your squadron or trust party.
+/// </summary>
+public sealed partial class BuddyList : IReadOnlyCollection<BuddyMember>
+{
+    /// <inheritdoc/>
+    int IReadOnlyCollection<BuddyMember>.Count => this.Length;
+
+    /// <inheritdoc/>
+    public IEnumerator<BuddyMember> GetEnumerator()
+    {
+        for (var i = 0; i < this.Length; i++)
+        {
+            yield return this[i];
+        }
+    }
+
+    /// <inheritdoc/>
+    IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+}
diff --git a/Dalamud/Game/ClientState/Buddy/BuddyMember.cs b/Dalamud/Game/ClientState/Buddy/BuddyMember.cs
index 4cad665e1..80a510ce5 100644
--- a/Dalamud/Game/ClientState/Buddy/BuddyMember.cs
+++ b/Dalamud/Game/ClientState/Buddy/BuddyMember.cs
@@ -4,73 +4,72 @@ using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.ClientState.Resolvers;
 
-namespace Dalamud.Game.ClientState.Buddy
+namespace Dalamud.Game.ClientState.Buddy;
+
+/// <summary>
+/// This class represents a buddy such as the chocobo companion, summoned pets, squadron groups and trust parties.
+/// </summary>
+public unsafe class BuddyMember
 {
+    [ServiceManager.ServiceDependency]
+    private readonly ObjectTable objectTable = Service<ObjectTable>.Get();
+
     /// <summary>
-    /// This class represents a buddy such as the chocobo companion, summoned pets, squadron groups and trust parties.
+    /// Initializes a new instance of the <see cref="BuddyMember"/> class.
     /// </summary>
-    public unsafe class BuddyMember
+    /// <param name="address">Buddy address.</param>
+    internal BuddyMember(IntPtr address)
     {
-        [ServiceManager.ServiceDependency]
-        private readonly ObjectTable objectTable = Service<ObjectTable>.Get();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BuddyMember"/> class.
-        /// </summary>
-        /// <param name="address">Buddy address.</param>
-        internal BuddyMember(IntPtr address)
-        {
-            this.Address = address;
-        }
-
-        /// <summary>
-        /// Gets the address of the buddy in memory.
-        /// </summary>
-        public IntPtr Address { get; }
-
-        /// <summary>
-        /// Gets the object ID of this buddy.
-        /// </summary>
-        public uint ObjectId => this.Struct->ObjectID;
-
-        /// <summary>
-        /// Gets the actor associated with this buddy.
-        /// </summary>
-        /// <remarks>
-        /// This iterates the actor table, it should be used with care.
-        /// </remarks>
-        public GameObject? GameObject => this.objectTable.SearchById(this.ObjectId);
-
-        /// <summary>
-        /// Gets the current health of this buddy.
-        /// </summary>
-        public uint CurrentHP => this.Struct->CurrentHealth;
-
-        /// <summary>
-        /// Gets the maximum health of this buddy.
-        /// </summary>
-        public uint MaxHP => this.Struct->MaxHealth;
-
-        /// <summary>
-        /// Gets the data ID of this buddy.
-        /// </summary>
-        public uint DataID => this.Struct->DataID;
-
-        /// <summary>
-        /// Gets the Mount data related to this buddy. It should only be used with companion buddies.
-        /// </summary>
-        public ExcelResolver<Lumina.Excel.GeneratedSheets.Mount> MountData => new(this.DataID);
-
-        /// <summary>
-        /// Gets the Pet data related to this buddy. It should only be used with pet buddies.
-        /// </summary>
-        public ExcelResolver<Lumina.Excel.GeneratedSheets.Pet> PetData => new(this.DataID);
-
-        /// <summary>
-        /// Gets the Trust data related to this buddy. It should only be used with battle buddies.
-        /// </summary>
-        public ExcelResolver<Lumina.Excel.GeneratedSheets.DawnGrowMember> TrustData => new(this.DataID);
-
-        private FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy.BuddyMember* Struct => (FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy.BuddyMember*)this.Address;
+        this.Address = address;
     }
+
+    /// <summary>
+    /// Gets the address of the buddy in memory.
+    /// </summary>
+    public IntPtr Address { get; }
+
+    /// <summary>
+    /// Gets the object ID of this buddy.
+    /// </summary>
+    public uint ObjectId => this.Struct->ObjectID;
+
+    /// <summary>
+    /// Gets the actor associated with this buddy.
+    /// </summary>
+    /// <remarks>
+    /// This iterates the actor table, it should be used with care.
+    /// </remarks>
+    public GameObject? GameObject => this.objectTable.SearchById(this.ObjectId);
+
+    /// <summary>
+    /// Gets the current health of this buddy.
+    /// </summary>
+    public uint CurrentHP => this.Struct->CurrentHealth;
+
+    /// <summary>
+    /// Gets the maximum health of this buddy.
+    /// </summary>
+    public uint MaxHP => this.Struct->MaxHealth;
+
+    /// <summary>
+    /// Gets the data ID of this buddy.
+    /// </summary>
+    public uint DataID => this.Struct->DataID;
+
+    /// <summary>
+    /// Gets the Mount data related to this buddy. It should only be used with companion buddies.
+    /// </summary>
+    public ExcelResolver<Lumina.Excel.GeneratedSheets.Mount> MountData => new(this.DataID);
+
+    /// <summary>
+    /// Gets the Pet data related to this buddy. It should only be used with pet buddies.
+    /// </summary>
+    public ExcelResolver<Lumina.Excel.GeneratedSheets.Pet> PetData => new(this.DataID);
+
+    /// <summary>
+    /// Gets the Trust data related to this buddy. It should only be used with battle buddies.
+    /// </summary>
+    public ExcelResolver<Lumina.Excel.GeneratedSheets.DawnGrowMember> TrustData => new(this.DataID);
+
+    private FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy.BuddyMember* Struct => (FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy.BuddyMember*)this.Address;
 }
diff --git a/Dalamud/Game/ClientState/ClientState.cs b/Dalamud/Game/ClientState/ClientState.cs
index b58da8ad5..491d2aeae 100644
--- a/Dalamud/Game/ClientState/ClientState.cs
+++ b/Dalamud/Game/ClientState/ClientState.cs
@@ -13,193 +13,192 @@ using Dalamud.Utility;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using Serilog;
 
-namespace Dalamud.Game.ClientState
+namespace Dalamud.Game.ClientState;
+
+/// <summary>
+/// This class represents the state of the game client at the time of access.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed class ClientState : IDisposable, IServiceType
 {
-    /// <summary>
-    /// This class represents the state of the game client at the time of access.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed class ClientState : IDisposable, IServiceType
+    private readonly ClientStateAddressResolver address;
+    private readonly Hook<SetupTerritoryTypeDelegate> setupTerritoryTypeHook;
+
+    [ServiceManager.ServiceDependency]
+    private readonly Framework framework = Service<Framework>.Get();
+
+    [ServiceManager.ServiceDependency]
+    private readonly NetworkHandlers networkHandlers = Service<NetworkHandlers>.Get();
+
+    private bool lastConditionNone = true;
+    private bool lastFramePvP = false;
+
+    [ServiceManager.ServiceConstructor]
+    private ClientState(SigScanner sigScanner, DalamudStartInfo startInfo)
     {
-        private readonly ClientStateAddressResolver address;
-        private readonly Hook<SetupTerritoryTypeDelegate> setupTerritoryTypeHook;
+        this.address = new ClientStateAddressResolver();
+        this.address.Setup(sigScanner);
 
-        [ServiceManager.ServiceDependency]
-        private readonly Framework framework = Service<Framework>.Get();
+        Log.Verbose("===== C L I E N T  S T A T E =====");
 
-        [ServiceManager.ServiceDependency]
-        private readonly NetworkHandlers networkHandlers = Service<NetworkHandlers>.Get();
+        this.ClientLanguage = startInfo.Language;
 
-        private bool lastConditionNone = true;
-        private bool lastFramePvP = false;
+        Log.Verbose($"SetupTerritoryType address 0x{this.address.SetupTerritoryType.ToInt64():X}");
 
-        [ServiceManager.ServiceConstructor]
-        private ClientState(SigScanner sigScanner, DalamudStartInfo startInfo)
+        this.setupTerritoryTypeHook = Hook<SetupTerritoryTypeDelegate>.FromAddress(this.address.SetupTerritoryType, this.SetupTerritoryTypeDetour);
+
+        this.framework.Update += this.FrameworkOnOnUpdateEvent;
+
+        this.networkHandlers.CfPop += this.NetworkHandlersOnCfPop;
+    }
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr SetupTerritoryTypeDelegate(IntPtr manager, ushort terriType);
+
+    /// <summary>
+    /// Event that gets fired when the current Territory changes.
+    /// </summary>
+    public event EventHandler<ushort> TerritoryChanged;
+
+    /// <summary>
+    /// Event that fires when a character is logging in.
+    /// </summary>
+    public event EventHandler Login;
+
+    /// <summary>
+    /// Event that fires when a character is logging out.
+    /// </summary>
+    public event EventHandler Logout;
+
+    /// <summary>
+    /// Event that fires when a character is entering PvP.
+    /// </summary>
+    public event Action EnterPvP;
+
+    /// <summary>
+    /// Event that fires when a character is leaving PvP.
+    /// </summary>
+    public event Action LeavePvP;
+
+    /// <summary>
+    /// Event that gets fired when a duty is ready.
+    /// </summary>
+    public event EventHandler<Lumina.Excel.GeneratedSheets.ContentFinderCondition> CfPop;
+
+    /// <summary>
+    /// Gets the language of the client.
+    /// </summary>
+    public ClientLanguage ClientLanguage { get; }
+
+    /// <summary>
+    /// Gets the current Territory the player resides in.
+    /// </summary>
+    public ushort TerritoryType { get; private set; }
+
+    /// <summary>
+    /// Gets the local player character, if one is present.
+    /// </summary>
+    public PlayerCharacter? LocalPlayer => Service<ObjectTable>.GetNullable()?[0] as PlayerCharacter;
+
+    /// <summary>
+    /// Gets the content ID of the local character.
+    /// </summary>
+    public ulong LocalContentId => (ulong)Marshal.ReadInt64(this.address.LocalContentId);
+
+    /// <summary>
+    /// Gets a value indicating whether a character is logged in.
+    /// </summary>
+    public bool IsLoggedIn { get; private set; }
+
+    /// <summary>
+    /// Gets a value indicating whether or not the user is playing PvP.
+    /// </summary>
+    public bool IsPvP { get; private set; }
+
+    /// <summary>
+    /// Gets a value indicating whether or not the user is playing PvP, excluding the Wolves' Den.
+    /// </summary>
+    public bool IsPvPExcludingDen { get; private set; }
+
+    /// <summary>
+    /// Gets client state address resolver.
+    /// </summary>
+    internal ClientStateAddressResolver AddressResolver => this.address;
+
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.setupTerritoryTypeHook.Dispose();
+        this.framework.Update -= this.FrameworkOnOnUpdateEvent;
+        this.networkHandlers.CfPop -= this.NetworkHandlersOnCfPop;
+    }
+
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction()
+    {
+        this.setupTerritoryTypeHook.Enable();
+    }
+
+    private IntPtr SetupTerritoryTypeDetour(IntPtr manager, ushort terriType)
+    {
+        this.TerritoryType = terriType;
+        this.TerritoryChanged?.InvokeSafely(this, terriType);
+
+        Log.Debug("TerritoryType changed: {0}", terriType);
+
+        return this.setupTerritoryTypeHook.Original(manager, terriType);
+    }
+
+    private void NetworkHandlersOnCfPop(object sender, Lumina.Excel.GeneratedSheets.ContentFinderCondition e)
+    {
+        this.CfPop?.InvokeSafely(this, e);
+    }
+
+    private void FrameworkOnOnUpdateEvent(Framework framework1)
+    {
+        var condition = Service<Conditions.Condition>.GetNullable();
+        var gameGui = Service<GameGui>.GetNullable();
+        var data = Service<DataManager>.GetNullable();
+
+        if (condition == null || gameGui == null || data == null)
+            return;
+
+        if (condition.Any() && this.lastConditionNone == true)
         {
-            this.address = new ClientStateAddressResolver();
-            this.address.Setup(sigScanner);
-
-            Log.Verbose("===== C L I E N T  S T A T E =====");
-
-            this.ClientLanguage = startInfo.Language;
-
-            Log.Verbose($"SetupTerritoryType address 0x{this.address.SetupTerritoryType.ToInt64():X}");
-
-            this.setupTerritoryTypeHook = Hook<SetupTerritoryTypeDelegate>.FromAddress(this.address.SetupTerritoryType, this.SetupTerritoryTypeDetour);
-
-            this.framework.Update += this.FrameworkOnOnUpdateEvent;
-
-            this.networkHandlers.CfPop += this.NetworkHandlersOnCfPop;
+            Log.Debug("Is login");
+            this.lastConditionNone = false;
+            this.IsLoggedIn = true;
+            this.Login?.InvokeSafely(this, null);
+            gameGui.ResetUiHideState();
         }
 
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr SetupTerritoryTypeDelegate(IntPtr manager, ushort terriType);
-
-        /// <summary>
-        /// Event that gets fired when the current Territory changes.
-        /// </summary>
-        public event EventHandler<ushort> TerritoryChanged;
-
-        /// <summary>
-        /// Event that fires when a character is logging in.
-        /// </summary>
-        public event EventHandler Login;
-
-        /// <summary>
-        /// Event that fires when a character is logging out.
-        /// </summary>
-        public event EventHandler Logout;
-
-        /// <summary>
-        /// Event that fires when a character is entering PvP.
-        /// </summary>
-        public event Action EnterPvP;
-
-        /// <summary>
-        /// Event that fires when a character is leaving PvP.
-        /// </summary>
-        public event Action LeavePvP;
-
-        /// <summary>
-        /// Event that gets fired when a duty is ready.
-        /// </summary>
-        public event EventHandler<Lumina.Excel.GeneratedSheets.ContentFinderCondition> CfPop;
-
-        /// <summary>
-        /// Gets the language of the client.
-        /// </summary>
-        public ClientLanguage ClientLanguage { get; }
-
-        /// <summary>
-        /// Gets the current Territory the player resides in.
-        /// </summary>
-        public ushort TerritoryType { get; private set; }
-
-        /// <summary>
-        /// Gets the local player character, if one is present.
-        /// </summary>
-        public PlayerCharacter? LocalPlayer => Service<ObjectTable>.GetNullable()?[0] as PlayerCharacter;
-
-        /// <summary>
-        /// Gets the content ID of the local character.
-        /// </summary>
-        public ulong LocalContentId => (ulong)Marshal.ReadInt64(this.address.LocalContentId);
-
-        /// <summary>
-        /// Gets a value indicating whether a character is logged in.
-        /// </summary>
-        public bool IsLoggedIn { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether or not the user is playing PvP.
-        /// </summary>
-        public bool IsPvP { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether or not the user is playing PvP, excluding the Wolves' Den.
-        /// </summary>
-        public bool IsPvPExcludingDen { get; private set; }
-
-        /// <summary>
-        /// Gets client state address resolver.
-        /// </summary>
-        internal ClientStateAddressResolver AddressResolver => this.address;
-
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        void IDisposable.Dispose()
+        if (!condition.Any() && this.lastConditionNone == false)
         {
-            this.setupTerritoryTypeHook.Dispose();
-            this.framework.Update -= this.FrameworkOnOnUpdateEvent;
-            this.networkHandlers.CfPop -= this.NetworkHandlersOnCfPop;
+            Log.Debug("Is logout");
+            this.lastConditionNone = true;
+            this.IsLoggedIn = false;
+            this.Logout?.InvokeSafely(this, null);
+            gameGui.ResetUiHideState();
         }
 
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction()
+        this.IsPvP = GameMain.IsInPvPArea();
+        this.IsPvPExcludingDen = this.IsPvP && this.TerritoryType != 250;
+
+        if (this.IsPvP != this.lastFramePvP)
         {
-            this.setupTerritoryTypeHook.Enable();
-        }
+            this.lastFramePvP = this.IsPvP;
 
-        private IntPtr SetupTerritoryTypeDetour(IntPtr manager, ushort terriType)
-        {
-            this.TerritoryType = terriType;
-            this.TerritoryChanged?.InvokeSafely(this, terriType);
-
-            Log.Debug("TerritoryType changed: {0}", terriType);
-
-            return this.setupTerritoryTypeHook.Original(manager, terriType);
-        }
-
-        private void NetworkHandlersOnCfPop(object sender, Lumina.Excel.GeneratedSheets.ContentFinderCondition e)
-        {
-            this.CfPop?.InvokeSafely(this, e);
-        }
-
-        private void FrameworkOnOnUpdateEvent(Framework framework1)
-        {
-            var condition = Service<Conditions.Condition>.GetNullable();
-            var gameGui = Service<GameGui>.GetNullable();
-            var data = Service<DataManager>.GetNullable();
-
-            if (condition == null || gameGui == null || data == null)
-                return;
-
-            if (condition.Any() && this.lastConditionNone == true)
+            if (this.IsPvP)
             {
-                Log.Debug("Is login");
-                this.lastConditionNone = false;
-                this.IsLoggedIn = true;
-                this.Login?.InvokeSafely(this, null);
-                gameGui.ResetUiHideState();
+                this.EnterPvP?.InvokeSafely();
             }
-
-            if (!condition.Any() && this.lastConditionNone == false)
+            else
             {
-                Log.Debug("Is logout");
-                this.lastConditionNone = true;
-                this.IsLoggedIn = false;
-                this.Logout?.InvokeSafely(this, null);
-                gameGui.ResetUiHideState();
-            }
-
-            this.IsPvP = GameMain.IsInPvPArea();
-            this.IsPvPExcludingDen = this.IsPvP && this.TerritoryType != 250;
-
-            if (this.IsPvP != this.lastFramePvP)
-            {
-                this.lastFramePvP = this.IsPvP;
-
-                if (this.IsPvP)
-                {
-                    this.EnterPvP?.InvokeSafely();
-                }
-                else
-                {
-                    this.LeavePvP?.InvokeSafely();
-                }
+                this.LeavePvP?.InvokeSafely();
             }
         }
     }
diff --git a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs
index 4fa7feb79..98d3bc6dd 100644
--- a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs
+++ b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs
@@ -1,128 +1,127 @@
 using System;
 
-namespace Dalamud.Game.ClientState
+namespace Dalamud.Game.ClientState;
+
+/// <summary>
+/// Client state memory address resolver.
+/// </summary>
+public sealed class ClientStateAddressResolver : BaseAddressResolver
 {
+    // Static offsets
+
     /// <summary>
-    /// Client state memory address resolver.
+    /// Gets the address of the actor table.
     /// </summary>
-    public sealed class ClientStateAddressResolver : BaseAddressResolver
+    public IntPtr ObjectTable { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the buddy list.
+    /// </summary>
+    public IntPtr BuddyList { get; private set; }
+
+    /// <summary>
+    /// Gets the address of a pointer to the fate table.
+    /// </summary>
+    /// <remarks>
+    /// This is a static address to a pointer, not the address of the table itself.
+    /// </remarks>
+    public IntPtr FateTablePtr { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the Group Manager.
+    /// </summary>
+    public IntPtr GroupManager { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the local content id.
+    /// </summary>
+    public IntPtr LocalContentId { get; private set; }
+
+    /// <summary>
+    /// Gets the address of job gauge data.
+    /// </summary>
+    public IntPtr JobGaugeData { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the keyboard state.
+    /// </summary>
+    public IntPtr KeyboardState { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the keyboard state index array which translates the VK enumeration to the key state.
+    /// </summary>
+    public IntPtr KeyboardStateIndexArray { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the target manager.
+    /// </summary>
+    public IntPtr TargetManager { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the condition flag array.
+    /// </summary>
+    public IntPtr ConditionFlags { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the Telepo instance.
+    /// </summary>
+    public IntPtr Telepo { get; private set; }
+
+    // Functions
+
+    /// <summary>
+    /// Gets the address of the method which sets the territory type.
+    /// </summary>
+    public IntPtr SetupTerritoryType { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the method which polls the gamepads for data.
+    /// Called every frame, even when `Enable Gamepad` is off in the settings.
+    /// </summary>
+    public IntPtr GamepadPoll { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the method which updates the list of available teleport locations.
+    /// </summary>
+    public IntPtr UpdateAetheryteList { get; private set; }
+
+    /// <summary>
+    /// Scan for and setup any configured address pointers.
+    /// </summary>
+    /// <param name="sig">The signature scanner to facilitate setup.</param>
+    protected override void Setup64Bit(SigScanner sig)
     {
-        // Static offsets
+        // We don't need those anymore, but maybe someone else will - let's leave them here for good measure
+        // ViewportActorTable = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? 85 ED", 0) + 0x148;
+        // SomeActorTableAccess = sig.ScanText("E8 ?? ?? ?? ?? 48 8D 55 A0 48 8D 8E ?? ?? ?? ??");
 
-        /// <summary>
-        /// Gets the address of the actor table.
-        /// </summary>
-        public IntPtr ObjectTable { get; private set; }
+        this.ObjectTable = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 44 0F B6 83");
 
-        /// <summary>
-        /// Gets the address of the buddy list.
-        /// </summary>
-        public IntPtr BuddyList { get; private set; }
+        this.BuddyList = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 45 84 E4 75 1A F6 45 12 04");
 
-        /// <summary>
-        /// Gets the address of a pointer to the fate table.
-        /// </summary>
-        /// <remarks>
-        /// This is a static address to a pointer, not the address of the table itself.
-        /// </remarks>
-        public IntPtr FateTablePtr { get; private set; }
+        this.FateTablePtr = sig.GetStaticAddressFromSig("48 8B 15 ?? ?? ?? ?? 48 8B F9 44 0F B7 41 ??");
 
-        /// <summary>
-        /// Gets the address of the Group Manager.
-        /// </summary>
-        public IntPtr GroupManager { get; private set; }
+        this.GroupManager = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 80 B8 ?? ?? ?? ?? ?? 76 50");
 
-        /// <summary>
-        /// Gets the address of the local content id.
-        /// </summary>
-        public IntPtr LocalContentId { get; private set; }
+        this.LocalContentId = sig.GetStaticAddressFromSig("48 0F 44 05 ?? ?? ?? ?? 48 39 07");
+        this.JobGaugeData = sig.GetStaticAddressFromSig("48 8B 3D ?? ?? ?? ?? 33 ED") + 0x8;
 
-        /// <summary>
-        /// Gets the address of job gauge data.
-        /// </summary>
-        public IntPtr JobGaugeData { get; private set; }
+        this.SetupTerritoryType = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B F9 66 89 91 ?? ?? ?? ??");
 
-        /// <summary>
-        /// Gets the address of the keyboard state.
-        /// </summary>
-        public IntPtr KeyboardState { get; private set; }
+        // These resolve to fixed offsets only, without the base address added in, so GetStaticAddressFromSig() can't be used.
+        // lea   rcx, ds:1DB9F74h[rax*4]          KeyboardState
+        // movzx edx, byte ptr [rbx+rsi+1D5E0E0h] KeyboardStateIndexArray
+        this.KeyboardState = sig.ScanText("48 8D 0C 85 ?? ?? ?? ?? 8B 04 31 85 C2 0F 85") + 0x4;
+        this.KeyboardStateIndexArray = sig.ScanText("0F B6 94 33 ?? ?? ?? ?? 84 D2") + 0x4;
 
-        /// <summary>
-        /// Gets the address of the keyboard state index array which translates the VK enumeration to the key state.
-        /// </summary>
-        public IntPtr KeyboardStateIndexArray { get; private set; }
+        this.ConditionFlags = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? BA ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 01 48 83 C4 30");
 
-        /// <summary>
-        /// Gets the address of the target manager.
-        /// </summary>
-        public IntPtr TargetManager { get; private set; }
+        this.TargetManager = sig.GetStaticAddressFromSig("48 8B 05 ?? ?? ?? ?? 48 8D 0D ?? ?? ?? ?? FF 50 ?? 48 85 DB");
 
-        /// <summary>
-        /// Gets the address of the condition flag array.
-        /// </summary>
-        public IntPtr ConditionFlags { get; private set; }
+        this.GamepadPoll = sig.ScanText("40 ?? 57 41 ?? 48 81 EC ?? ?? ?? ?? 44 0F ?? ?? ?? ?? ?? ?? ?? 48 8B");
 
-        /// <summary>
-        /// Gets the address of the Telepo instance.
-        /// </summary>
-        public IntPtr Telepo { get; private set; }
+        this.Telepo = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? 48 8B 12");
 
-        // Functions
-
-        /// <summary>
-        /// Gets the address of the method which sets the territory type.
-        /// </summary>
-        public IntPtr SetupTerritoryType { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the method which polls the gamepads for data.
-        /// Called every frame, even when `Enable Gamepad` is off in the settings.
-        /// </summary>
-        public IntPtr GamepadPoll { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the method which updates the list of available teleport locations.
-        /// </summary>
-        public IntPtr UpdateAetheryteList { get; private set; }
-
-        /// <summary>
-        /// Scan for and setup any configured address pointers.
-        /// </summary>
-        /// <param name="sig">The signature scanner to facilitate setup.</param>
-        protected override void Setup64Bit(SigScanner sig)
-        {
-            // We don't need those anymore, but maybe someone else will - let's leave them here for good measure
-            // ViewportActorTable = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? 85 ED", 0) + 0x148;
-            // SomeActorTableAccess = sig.ScanText("E8 ?? ?? ?? ?? 48 8D 55 A0 48 8D 8E ?? ?? ?? ??");
-
-            this.ObjectTable = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 44 0F B6 83");
-
-            this.BuddyList = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 45 84 E4 75 1A F6 45 12 04");
-
-            this.FateTablePtr = sig.GetStaticAddressFromSig("48 8B 15 ?? ?? ?? ?? 48 8B F9 44 0F B7 41 ??");
-
-            this.GroupManager = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 80 B8 ?? ?? ?? ?? ?? 76 50");
-
-            this.LocalContentId = sig.GetStaticAddressFromSig("48 0F 44 05 ?? ?? ?? ?? 48 39 07");
-            this.JobGaugeData = sig.GetStaticAddressFromSig("48 8B 3D ?? ?? ?? ?? 33 ED") + 0x8;
-
-            this.SetupTerritoryType = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B F9 66 89 91 ?? ?? ?? ??");
-
-            // These resolve to fixed offsets only, without the base address added in, so GetStaticAddressFromSig() can't be used.
-            // lea   rcx, ds:1DB9F74h[rax*4]          KeyboardState
-            // movzx edx, byte ptr [rbx+rsi+1D5E0E0h] KeyboardStateIndexArray
-            this.KeyboardState = sig.ScanText("48 8D 0C 85 ?? ?? ?? ?? 8B 04 31 85 C2 0F 85") + 0x4;
-            this.KeyboardStateIndexArray = sig.ScanText("0F B6 94 33 ?? ?? ?? ?? 84 D2") + 0x4;
-
-            this.ConditionFlags = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? BA ?? ?? ?? ?? E8 ?? ?? ?? ?? B0 01 48 83 C4 30");
-
-            this.TargetManager = sig.GetStaticAddressFromSig("48 8B 05 ?? ?? ?? ?? 48 8D 0D ?? ?? ?? ?? FF 50 ?? 48 85 DB");
-
-            this.GamepadPoll = sig.ScanText("40 ?? 57 41 ?? 48 81 EC ?? ?? ?? ?? 44 0F ?? ?? ?? ?? ?? ?? ?? 48 8B");
-
-            this.Telepo = sig.GetStaticAddressFromSig("48 8D 0D ?? ?? ?? ?? 48 8B 12");
-
-            this.UpdateAetheryteList = sig.ScanText("E8 ?? ?? ?? ?? 48 89 46 68 4C 8D 45 50");
-        }
+        this.UpdateAetheryteList = sig.ScanText("E8 ?? ?? ?? ?? 48 89 46 68 4C 8D 45 50");
     }
 }
diff --git a/Dalamud/Game/ClientState/Conditions/Condition.cs b/Dalamud/Game/ClientState/Conditions/Condition.cs
index 6cf0bbdd5..8fcf59b00 100644
--- a/Dalamud/Game/ClientState/Conditions/Condition.cs
+++ b/Dalamud/Game/ClientState/Conditions/Condition.cs
@@ -4,152 +4,151 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.ClientState.Conditions
+namespace Dalamud.Game.ClientState.Conditions;
+
+/// <summary>
+/// Provides access to conditions (generally player state). You can check whether a player is in combat, mounted, etc.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed partial class Condition : IServiceType
 {
     /// <summary>
-    /// Provides access to conditions (generally player state). You can check whether a player is in combat, mounted, etc.
+    /// The current max number of conditions. You can get this just by looking at the condition sheet and how many rows it has.
     /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed partial class Condition : IServiceType
+    public const int MaxConditionEntries = 100;
+
+    private readonly bool[] cache = new bool[MaxConditionEntries];
+
+    [ServiceManager.ServiceConstructor]
+    private Condition(ClientState clientState)
     {
-        /// <summary>
-        /// The current max number of conditions. You can get this just by looking at the condition sheet and how many rows it has.
-        /// </summary>
-        public const int MaxConditionEntries = 100;
+        var resolver = clientState.AddressResolver;
+        this.Address = resolver.ConditionFlags;
+    }
 
-        private readonly bool[] cache = new bool[MaxConditionEntries];
+    /// <summary>
+    /// A delegate type used with the <see cref="ConditionChange"/> event.
+    /// </summary>
+    /// <param name="flag">The changed condition.</param>
+    /// <param name="value">The value the condition is set to.</param>
+    public delegate void ConditionChangeDelegate(ConditionFlag flag, bool value);
 
-        [ServiceManager.ServiceConstructor]
-        private Condition(ClientState clientState)
+    /// <summary>
+    /// Event that gets fired when a condition is set.
+    /// Should only get fired for actual changes, so the previous value will always be !value.
+    /// </summary>
+    public event ConditionChangeDelegate? ConditionChange;
+
+    /// <summary>
+    /// Gets the condition array base pointer.
+    /// </summary>
+    public IntPtr Address { get; private set; }
+
+    /// <summary>
+    /// Check the value of a specific condition/state flag.
+    /// </summary>
+    /// <param name="flag">The condition flag to check.</param>
+    public unsafe bool this[int flag]
+    {
+        get
         {
-            var resolver = clientState.AddressResolver;
-            this.Address = resolver.ConditionFlags;
+            if (flag < 0 || flag >= MaxConditionEntries)
+                return false;
+
+            return *(bool*)(this.Address + flag);
+        }
+    }
+
+    /// <inheritdoc cref="this[int]"/>
+    public unsafe bool this[ConditionFlag flag]
+        => this[(int)flag];
+
+    /// <summary>
+    /// Check if any condition flags are set.
+    /// </summary>
+    /// <returns>Whether any single flag is set.</returns>
+    public bool Any()
+    {
+        for (var i = 0; i < MaxConditionEntries; i++)
+        {
+            var cond = this[i];
+
+            if (cond)
+                return true;
         }
 
-        /// <summary>
-        /// A delegate type used with the <see cref="ConditionChange"/> event.
-        /// </summary>
-        /// <param name="flag">The changed condition.</param>
-        /// <param name="value">The value the condition is set to.</param>
-        public delegate void ConditionChangeDelegate(ConditionFlag flag, bool value);
+        return false;
+    }
 
-        /// <summary>
-        /// Event that gets fired when a condition is set.
-        /// Should only get fired for actual changes, so the previous value will always be !value.
-        /// </summary>
-        public event ConditionChangeDelegate? ConditionChange;
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction(Framework framework)
+    {
+        // Initialization
+        for (var i = 0; i < MaxConditionEntries; i++)
+            this.cache[i] = this[i];
 
-        /// <summary>
-        /// Gets the condition array base pointer.
-        /// </summary>
-        public IntPtr Address { get; private set; }
+        framework.Update += this.FrameworkUpdate;
+    }
 
-        /// <summary>
-        /// Check the value of a specific condition/state flag.
-        /// </summary>
-        /// <param name="flag">The condition flag to check.</param>
-        public unsafe bool this[int flag]
+    private void FrameworkUpdate(Framework framework)
+    {
+        for (var i = 0; i < MaxConditionEntries; i++)
         {
-            get
+            var value = this[i];
+
+            if (value != this.cache[i])
             {
-                if (flag < 0 || flag >= MaxConditionEntries)
-                    return false;
+                this.cache[i] = value;
 
-                return *(bool*)(this.Address + flag);
-            }
-        }
-
-        /// <inheritdoc cref="this[int]"/>
-        public unsafe bool this[ConditionFlag flag]
-            => this[(int)flag];
-
-        /// <summary>
-        /// Check if any condition flags are set.
-        /// </summary>
-        /// <returns>Whether any single flag is set.</returns>
-        public bool Any()
-        {
-            for (var i = 0; i < MaxConditionEntries; i++)
-            {
-                var cond = this[i];
-
-                if (cond)
-                    return true;
-            }
-
-            return false;
-        }
-
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction(Framework framework)
-        {
-            // Initialization
-            for (var i = 0; i < MaxConditionEntries; i++)
-                this.cache[i] = this[i];
-
-            framework.Update += this.FrameworkUpdate;
-        }
-
-        private void FrameworkUpdate(Framework framework)
-        {
-            for (var i = 0; i < MaxConditionEntries; i++)
-            {
-                var value = this[i];
-
-                if (value != this.cache[i])
+                try
                 {
-                    this.cache[i] = value;
-
-                    try
-                    {
-                        this.ConditionChange?.Invoke((ConditionFlag)i, value);
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error(ex, $"While invoking {nameof(this.ConditionChange)}, an exception was thrown.");
-                    }
+                    this.ConditionChange?.Invoke((ConditionFlag)i, value);
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex, $"While invoking {nameof(this.ConditionChange)}, an exception was thrown.");
                 }
             }
         }
     }
+}
+
+/// <summary>
+/// Provides access to conditions (generally player state). You can check whether a player is in combat, mounted, etc.
+/// </summary>
+public sealed partial class Condition : IDisposable
+{
+    private bool isDisposed;
 
     /// <summary>
-    /// Provides access to conditions (generally player state). You can check whether a player is in combat, mounted, etc.
+    /// Finalizes an instance of the <see cref="Condition" /> class.
     /// </summary>
-    public sealed partial class Condition : IDisposable
+    ~Condition()
     {
-        private bool isDisposed;
+        this.Dispose(false);
+    }
 
-        /// <summary>
-        /// Finalizes an instance of the <see cref="Condition" /> class.
-        /// </summary>
-        ~Condition()
+    /// <summary>
+    /// Disposes this instance, alongside its hooks.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        GC.SuppressFinalize(this);
+        this.Dispose(true);
+    }
+
+    private void Dispose(bool disposing)
+    {
+        if (this.isDisposed)
+            return;
+
+        if (disposing)
         {
-            this.Dispose(false);
+            Service<Framework>.Get().Update -= this.FrameworkUpdate;
         }
 
-        /// <summary>
-        /// Disposes this instance, alongside its hooks.
-        /// </summary>
-        void IDisposable.Dispose()
-        {
-            GC.SuppressFinalize(this);
-            this.Dispose(true);
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (this.isDisposed)
-                return;
-
-            if (disposing)
-            {
-                Service<Framework>.Get().Update -= this.FrameworkUpdate;
-            }
-
-            this.isDisposed = true;
-        }
+        this.isDisposed = true;
     }
 }
diff --git a/Dalamud/Game/ClientState/Conditions/ConditionFlag.cs b/Dalamud/Game/ClientState/Conditions/ConditionFlag.cs
index 7d941304c..3c68d2e43 100644
--- a/Dalamud/Game/ClientState/Conditions/ConditionFlag.cs
+++ b/Dalamud/Game/ClientState/Conditions/ConditionFlag.cs
@@ -1,468 +1,467 @@
-namespace Dalamud.Game.ClientState.Conditions
+namespace Dalamud.Game.ClientState.Conditions;
+
+/// <summary>
+/// Possible state flags (or conditions as they're called internally) that can be set on the local client.
+///
+/// These come from LogMessage (somewhere) and directly map to each state field managed by the client. As of 5.25, it maps to
+/// LogMessage row 7700 and onwards, which can be checked by looking at the Condition sheet and looking at what column 2 maps to.
+/// </summary>
+public enum ConditionFlag
 {
     /// <summary>
-    /// Possible state flags (or conditions as they're called internally) that can be set on the local client.
-    ///
-    /// These come from LogMessage (somewhere) and directly map to each state field managed by the client. As of 5.25, it maps to
-    /// LogMessage row 7700 and onwards, which can be checked by looking at the Condition sheet and looking at what column 2 maps to.
+    /// Unused.
     /// </summary>
-    public enum ConditionFlag
-    {
-        /// <summary>
-        /// Unused.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Unable to execute command under normal conditions.
-        /// </summary>
-        NormalConditions = 1,
-
-        /// <summary>
-        /// Unable to execute command while unconscious.
-        /// </summary>
-        Unconscious = 2,
-
-        /// <summary>
-        /// Unable to execute command during an emote.
-        /// </summary>
-        Emoting = 3,
-
-        /// <summary>
-        /// Unable to execute command while mounted.
-        /// </summary>
-        Mounted = 4,
-
-        /// <summary>
-        /// Unable to execute command while crafting.
-        /// </summary>
-        Crafting = 5,
-
-        /// <summary>
-        /// Unable to execute command while gathering.
-        /// </summary>
-        Gathering = 6,
-
-        /// <summary>
-        /// Unable to execute command while melding materia.
-        /// </summary>
-        MeldingMateria = 7,
-
-        /// <summary>
-        /// Unable to execute command while operating a siege machine.
-        /// </summary>
-        OperatingSiegeMachine = 8,
-
-        /// <summary>
-        /// Unable to execute command while carrying an object.
-        /// </summary>
-        CarryingObject = 9,
-
-        /// <summary>
-        /// Unable to execute command while mounted.
-        /// </summary>
-        Mounted2 = 10,
-
-        /// <summary>
-        /// Unable to execute command while in that position.
-        /// </summary>
-        InThatPosition = 11,
-
-        /// <summary>
-        /// Unable to execute command while chocobo racing.
-        /// </summary>
-        ChocoboRacing = 12,
-
-        /// <summary>
-        /// Unable to execute command while playing a mini-game.
-        /// </summary>
-        PlayingMiniGame = 13,
-
-        /// <summary>
-        /// Unable to execute command while playing Lord of Verminion.
-        /// </summary>
-        PlayingLordOfVerminion = 14,
-
-        /// <summary>
-        /// Unable to execute command while participating in a custom match.
-        /// </summary>
-        ParticipatingInCustomMatch = 15,
-
-        /// <summary>
-        /// Unable to execute command while performing.
-        /// </summary>
-        Performing = 16,
-
-        // Unknown17 = 17,
-        // Unknown18 = 18,
-        // Unknown19 = 19,
-        // Unknown20 = 20,
-        // Unknown21 = 21,
-        // Unknown22 = 22,
-        // Unknown23 = 23,
-        // Unknown24 = 24,
-
-        /// <summary>
-        /// Unable to execute command while occupied.
-        /// </summary>
-        Occupied = 25,
-
-        /// <summary>
-        /// Unable to execute command during combat.
-        /// </summary>
-        InCombat = 26,
-
-        /// <summary>
-        /// Unable to execute command while casting.
-        /// </summary>
-        Casting = 27,
-
-        /// <summary>
-        /// Unable to execute command while suffering status affliction.
-        /// </summary>
-        SufferingStatusAffliction = 28,
-
-        /// <summary>
-        /// Unable to execute command while suffering status affliction.
-        /// </summary>
-        SufferingStatusAffliction2 = 29,
-
-        /// <summary>
-        /// Unable to execute command while occupied.
-        /// </summary>
-        Occupied30 = 30,
-
-        /// <summary>
-        /// Unable to execute command while occupied.
-        /// </summary>
-        // todo: not sure if this is used for other event states/???
-        OccupiedInEvent = 31,
-
-        /// <summary>
-        /// Unable to execute command while occupied.
-        /// </summary>
-        OccupiedInQuestEvent = 32,
-
-        /// <summary>
-        /// Unable to execute command while occupied.
-        /// </summary>
-        Occupied33 = 33,
-
-        /// <summary>
-        /// Unable to execute command while bound by duty.
-        /// </summary>
-        BoundByDuty = 34,
-
-        /// <summary>
-        /// Unable to execute command while occupied.
-        /// </summary>
-        OccupiedInCutSceneEvent = 35,
-
-        /// <summary>
-        /// Unable to execute command while in a dueling area.
-        /// </summary>
-        InDuelingArea = 36,
-
-        /// <summary>
-        /// Unable to execute command while a trade is open.
-        /// </summary>
-        TradeOpen = 37,
-
-        /// <summary>
-        /// Unable to execute command while occupied.
-        /// </summary>
-        Occupied38 = 38,
-
-        /// <summary>
-        /// Unable to execute command while occupied.
-        /// </summary>
-        Occupied39 = 39,
-
-        /// <summary>
-        /// Unable to execute command while crafting.
-        /// </summary>
-        Crafting40 = 40,
-
-        /// <summary>
-        /// Unable to execute command while preparing to craft.
-        /// </summary>
-        PreparingToCraft = 41,
-
-        /// <summary>
-        /// Unable to execute command while gathering.
-        /// </summary>
-        Gathering42 = 42,
-
-        /// <summary>
-        /// Unable to execute command while fishing.
-        /// </summary>
-        Fishing = 43,
-
-        // Unknown44 = 44,
-
-        /// <summary>
-        /// Unable to execute command while between areas.
-        /// </summary>
-        BetweenAreas = 45,
-
-        /// <summary>
-        /// Unable to execute command while stealthed.
-        /// </summary>
-        Stealthed = 46,
-
-        // Unknown47 = 47,
-
-        /// <summary>
-        /// Unable to execute command while jumping.
-        /// </summary>
-        Jumping = 48,
-
-        /// <summary>
-        /// Unable to execute command while auto-run is active.
-        /// </summary>
-        AutorunActive = 49,
-
-        /// <summary>
-        /// Unable to execute command while occupied.
-        /// </summary>
-        // todo: used for other shits?
-        OccupiedSummoningBell = 50,
-
-        /// <summary>
-        /// Unable to execute command while between areas.
-        /// </summary>
-        BetweenAreas51 = 51,
-
-        /// <summary>
-        /// Unable to execute command due to system error.
-        /// </summary>
-        SystemError = 52,
-
-        /// <summary>
-        /// Unable to execute command while logging out.
-        /// </summary>
-        LoggingOut = 53,
-
-        /// <summary>
-        /// Unable to execute command at this location.
-        /// </summary>
-        ConditionLocation = 54,
-
-        /// <summary>
-        /// Unable to execute command while waiting for duty.
-        /// </summary>
-        WaitingForDuty = 55,
-
-        /// <summary>
-        /// Unable to execute command while bound by duty.
-        /// </summary>
-        BoundByDuty56 = 56,
-
-        /// <summary>
-        /// Unable to execute command at this time.
-        /// </summary>
-        Unknown57 = 57,
-
-        /// <summary>
-        /// Unable to execute command while watching a cutscene.
-        /// </summary>
-        WatchingCutscene = 58,
-
-        /// <summary>
-        /// Unable to execute command while waiting for Duty Finder.
-        /// </summary>
-        WaitingForDutyFinder = 59,
-
-        /// <summary>
-        /// Unable to execute command while creating a character.
-        /// </summary>
-        CreatingCharacter = 60,
-
-        /// <summary>
-        /// Unable to execute command while jumping.
-        /// </summary>
-        Jumping61 = 61,
-
-        /// <summary>
-        /// Unable to execute command while the PvP display is active.
-        /// </summary>
-        PvPDisplayActive = 62,
-
-        /// <summary>
-        /// Unable to execute command while suffering status affliction.
-        /// </summary>
-        SufferingStatusAffliction63 = 63,
-
-        /// <summary>
-        /// Unable to execute command while mounting.
-        /// </summary>
-        Mounting = 64,
-
-        /// <summary>
-        /// Unable to execute command while carrying an item.
-        /// </summary>
-        CarryingItem = 65,
-
-        /// <summary>
-        /// Unable to execute command while using the Party Finder.
-        /// </summary>
-        UsingPartyFinder = 66,
-
-        /// <summary>
-        /// Unable to execute command while using housing functions.
-        /// </summary>
-        UsingHousingFunctions = 67,
-
-        /// <summary>
-        /// Unable to execute command while transformed.
-        /// </summary>
-        Transformed = 68,
-
-        /// <summary>
-        /// Unable to execute command while on the free trial.
-        /// </summary>
-        OnFreeTrial = 69,
-
-        /// <summary>
-        /// Unable to execute command while being moved.
-        /// </summary>
-        BeingMoved = 70,
-
-        /// <summary>
-        /// Unable to execute command while mounting.
-        /// </summary>
-        Mounting71 = 71,
-
-        /// <summary>
-        /// Unable to execute command while suffering status affliction.
-        /// </summary>
-        SufferingStatusAffliction72 = 72,
-
-        /// <summary>
-        /// Unable to execute command while suffering status affliction.
-        /// </summary>
-        SufferingStatusAffliction73 = 73,
-
-        /// <summary>
-        /// Unable to execute command while registering for a race or match.
-        /// </summary>
-        RegisteringForRaceOrMatch = 74,
-
-        /// <summary>
-        /// Unable to execute command while waiting for a race or match.
-        /// </summary>
-        WaitingForRaceOrMatch = 75,
-
-        /// <summary>
-        /// Unable to execute command while waiting for a Triple Triad match.
-        /// </summary>
-        WaitingForTripleTriadMatch = 76,
-
-        /// <summary>
-        /// Unable to execute command while in flight.
-        /// </summary>
-        InFlight = 77,
-
-        /// <summary>
-        /// Unable to execute command while watching a cutscene.
-        /// </summary>
-        WatchingCutscene78 = 78,
-
-        /// <summary>
-        /// Unable to execute command while delving into a deep dungeon.
-        /// </summary>
-        InDeepDungeon = 79,
-
-        /// <summary>
-        /// Unable to execute command while swimming.
-        /// </summary>
-        Swimming = 80,
-
-        /// <summary>
-        /// Unable to execute command while diving.
-        /// </summary>
-        Diving = 81,
-
-        /// <summary>
-        /// Unable to execute command while registering for a Triple Triad match.
-        /// </summary>
-        RegisteringForTripleTriadMatch = 82,
-
-        /// <summary>
-        /// Unable to execute command while waiting for a Triple Triad match.
-        /// </summary>
-        WaitingForTripleTriadMatch83 = 83,
-
-        /// <summary>
-        /// Unable to execute command while participating in a cross-world party or alliance.
-        /// </summary>
-        ParticipatingInCrossWorldPartyOrAlliance = 84,
-
-        // Unknown85 = 85,
-
-        /// <summary>
-        /// Unable to execute command while playing duty record.
-        /// </summary>
-        DutyRecorderPlayback = 86,
-
-        /// <summary>
-        /// Unable to execute command while casting.
-        /// </summary>
-        Casting87 = 87,
-
-        /// <summary>
-        /// Unable to execute command in this state.
-        /// </summary>
-        InThisState88 = 88,
-
-        /// <summary>
-        /// Unable to execute command in this state.
-        /// </summary>
-        InThisState89 = 89,
-
-        /// <summary>
-        /// Unable to execute command while role-playing.
-        /// </summary>
-        RolePlaying = 90,
-
-        /// <summary>
-        /// Unable to execute command while bound by duty.
-        /// </summary>
-        BoundToDuty97 = 91,
-
-        /// <summary>
-        /// Unable to execute command while readying to visit another World.
-        /// </summary>
-        ReadyingVisitOtherWorld = 92,
-
-        /// <summary>
-        /// Unable to execute command while waiting to visit another World.
-        /// </summary>
-        WaitingToVisitOtherWorld = 93,
-
-        /// <summary>
-        /// Unable to execute command while using a parasol.
-        /// </summary>
-        UsingParasol = 94,
-
-        /// <summary>
-        /// Unable to execute command while bound by duty.
-        /// </summary>
-        BoundByDuty95 = 95,
-
-        /// <summary>
-        /// Cannot execute at this time.
-        /// </summary>
-        Unknown96 = 96,
-
-        /// <summary>
-        /// Unable to execute command while wearing a guise.
-        /// </summary>
-        Disguised = 97,
-
-        /// <summary>
-        /// Unable to execute command while recruiting for a non-cross-world party.
-        /// </summary>
-        RecruitingWorldOnly = 98,
-    }
+    None = 0,
+
+    /// <summary>
+    /// Unable to execute command under normal conditions.
+    /// </summary>
+    NormalConditions = 1,
+
+    /// <summary>
+    /// Unable to execute command while unconscious.
+    /// </summary>
+    Unconscious = 2,
+
+    /// <summary>
+    /// Unable to execute command during an emote.
+    /// </summary>
+    Emoting = 3,
+
+    /// <summary>
+    /// Unable to execute command while mounted.
+    /// </summary>
+    Mounted = 4,
+
+    /// <summary>
+    /// Unable to execute command while crafting.
+    /// </summary>
+    Crafting = 5,
+
+    /// <summary>
+    /// Unable to execute command while gathering.
+    /// </summary>
+    Gathering = 6,
+
+    /// <summary>
+    /// Unable to execute command while melding materia.
+    /// </summary>
+    MeldingMateria = 7,
+
+    /// <summary>
+    /// Unable to execute command while operating a siege machine.
+    /// </summary>
+    OperatingSiegeMachine = 8,
+
+    /// <summary>
+    /// Unable to execute command while carrying an object.
+    /// </summary>
+    CarryingObject = 9,
+
+    /// <summary>
+    /// Unable to execute command while mounted.
+    /// </summary>
+    Mounted2 = 10,
+
+    /// <summary>
+    /// Unable to execute command while in that position.
+    /// </summary>
+    InThatPosition = 11,
+
+    /// <summary>
+    /// Unable to execute command while chocobo racing.
+    /// </summary>
+    ChocoboRacing = 12,
+
+    /// <summary>
+    /// Unable to execute command while playing a mini-game.
+    /// </summary>
+    PlayingMiniGame = 13,
+
+    /// <summary>
+    /// Unable to execute command while playing Lord of Verminion.
+    /// </summary>
+    PlayingLordOfVerminion = 14,
+
+    /// <summary>
+    /// Unable to execute command while participating in a custom match.
+    /// </summary>
+    ParticipatingInCustomMatch = 15,
+
+    /// <summary>
+    /// Unable to execute command while performing.
+    /// </summary>
+    Performing = 16,
+
+    // Unknown17 = 17,
+    // Unknown18 = 18,
+    // Unknown19 = 19,
+    // Unknown20 = 20,
+    // Unknown21 = 21,
+    // Unknown22 = 22,
+    // Unknown23 = 23,
+    // Unknown24 = 24,
+
+    /// <summary>
+    /// Unable to execute command while occupied.
+    /// </summary>
+    Occupied = 25,
+
+    /// <summary>
+    /// Unable to execute command during combat.
+    /// </summary>
+    InCombat = 26,
+
+    /// <summary>
+    /// Unable to execute command while casting.
+    /// </summary>
+    Casting = 27,
+
+    /// <summary>
+    /// Unable to execute command while suffering status affliction.
+    /// </summary>
+    SufferingStatusAffliction = 28,
+
+    /// <summary>
+    /// Unable to execute command while suffering status affliction.
+    /// </summary>
+    SufferingStatusAffliction2 = 29,
+
+    /// <summary>
+    /// Unable to execute command while occupied.
+    /// </summary>
+    Occupied30 = 30,
+
+    /// <summary>
+    /// Unable to execute command while occupied.
+    /// </summary>
+    // todo: not sure if this is used for other event states/???
+    OccupiedInEvent = 31,
+
+    /// <summary>
+    /// Unable to execute command while occupied.
+    /// </summary>
+    OccupiedInQuestEvent = 32,
+
+    /// <summary>
+    /// Unable to execute command while occupied.
+    /// </summary>
+    Occupied33 = 33,
+
+    /// <summary>
+    /// Unable to execute command while bound by duty.
+    /// </summary>
+    BoundByDuty = 34,
+
+    /// <summary>
+    /// Unable to execute command while occupied.
+    /// </summary>
+    OccupiedInCutSceneEvent = 35,
+
+    /// <summary>
+    /// Unable to execute command while in a dueling area.
+    /// </summary>
+    InDuelingArea = 36,
+
+    /// <summary>
+    /// Unable to execute command while a trade is open.
+    /// </summary>
+    TradeOpen = 37,
+
+    /// <summary>
+    /// Unable to execute command while occupied.
+    /// </summary>
+    Occupied38 = 38,
+
+    /// <summary>
+    /// Unable to execute command while occupied.
+    /// </summary>
+    Occupied39 = 39,
+
+    /// <summary>
+    /// Unable to execute command while crafting.
+    /// </summary>
+    Crafting40 = 40,
+
+    /// <summary>
+    /// Unable to execute command while preparing to craft.
+    /// </summary>
+    PreparingToCraft = 41,
+
+    /// <summary>
+    /// Unable to execute command while gathering.
+    /// </summary>
+    Gathering42 = 42,
+
+    /// <summary>
+    /// Unable to execute command while fishing.
+    /// </summary>
+    Fishing = 43,
+
+    // Unknown44 = 44,
+
+    /// <summary>
+    /// Unable to execute command while between areas.
+    /// </summary>
+    BetweenAreas = 45,
+
+    /// <summary>
+    /// Unable to execute command while stealthed.
+    /// </summary>
+    Stealthed = 46,
+
+    // Unknown47 = 47,
+
+    /// <summary>
+    /// Unable to execute command while jumping.
+    /// </summary>
+    Jumping = 48,
+
+    /// <summary>
+    /// Unable to execute command while auto-run is active.
+    /// </summary>
+    AutorunActive = 49,
+
+    /// <summary>
+    /// Unable to execute command while occupied.
+    /// </summary>
+    // todo: used for other shits?
+    OccupiedSummoningBell = 50,
+
+    /// <summary>
+    /// Unable to execute command while between areas.
+    /// </summary>
+    BetweenAreas51 = 51,
+
+    /// <summary>
+    /// Unable to execute command due to system error.
+    /// </summary>
+    SystemError = 52,
+
+    /// <summary>
+    /// Unable to execute command while logging out.
+    /// </summary>
+    LoggingOut = 53,
+
+    /// <summary>
+    /// Unable to execute command at this location.
+    /// </summary>
+    ConditionLocation = 54,
+
+    /// <summary>
+    /// Unable to execute command while waiting for duty.
+    /// </summary>
+    WaitingForDuty = 55,
+
+    /// <summary>
+    /// Unable to execute command while bound by duty.
+    /// </summary>
+    BoundByDuty56 = 56,
+
+    /// <summary>
+    /// Unable to execute command at this time.
+    /// </summary>
+    Unknown57 = 57,
+
+    /// <summary>
+    /// Unable to execute command while watching a cutscene.
+    /// </summary>
+    WatchingCutscene = 58,
+
+    /// <summary>
+    /// Unable to execute command while waiting for Duty Finder.
+    /// </summary>
+    WaitingForDutyFinder = 59,
+
+    /// <summary>
+    /// Unable to execute command while creating a character.
+    /// </summary>
+    CreatingCharacter = 60,
+
+    /// <summary>
+    /// Unable to execute command while jumping.
+    /// </summary>
+    Jumping61 = 61,
+
+    /// <summary>
+    /// Unable to execute command while the PvP display is active.
+    /// </summary>
+    PvPDisplayActive = 62,
+
+    /// <summary>
+    /// Unable to execute command while suffering status affliction.
+    /// </summary>
+    SufferingStatusAffliction63 = 63,
+
+    /// <summary>
+    /// Unable to execute command while mounting.
+    /// </summary>
+    Mounting = 64,
+
+    /// <summary>
+    /// Unable to execute command while carrying an item.
+    /// </summary>
+    CarryingItem = 65,
+
+    /// <summary>
+    /// Unable to execute command while using the Party Finder.
+    /// </summary>
+    UsingPartyFinder = 66,
+
+    /// <summary>
+    /// Unable to execute command while using housing functions.
+    /// </summary>
+    UsingHousingFunctions = 67,
+
+    /// <summary>
+    /// Unable to execute command while transformed.
+    /// </summary>
+    Transformed = 68,
+
+    /// <summary>
+    /// Unable to execute command while on the free trial.
+    /// </summary>
+    OnFreeTrial = 69,
+
+    /// <summary>
+    /// Unable to execute command while being moved.
+    /// </summary>
+    BeingMoved = 70,
+
+    /// <summary>
+    /// Unable to execute command while mounting.
+    /// </summary>
+    Mounting71 = 71,
+
+    /// <summary>
+    /// Unable to execute command while suffering status affliction.
+    /// </summary>
+    SufferingStatusAffliction72 = 72,
+
+    /// <summary>
+    /// Unable to execute command while suffering status affliction.
+    /// </summary>
+    SufferingStatusAffliction73 = 73,
+
+    /// <summary>
+    /// Unable to execute command while registering for a race or match.
+    /// </summary>
+    RegisteringForRaceOrMatch = 74,
+
+    /// <summary>
+    /// Unable to execute command while waiting for a race or match.
+    /// </summary>
+    WaitingForRaceOrMatch = 75,
+
+    /// <summary>
+    /// Unable to execute command while waiting for a Triple Triad match.
+    /// </summary>
+    WaitingForTripleTriadMatch = 76,
+
+    /// <summary>
+    /// Unable to execute command while in flight.
+    /// </summary>
+    InFlight = 77,
+
+    /// <summary>
+    /// Unable to execute command while watching a cutscene.
+    /// </summary>
+    WatchingCutscene78 = 78,
+
+    /// <summary>
+    /// Unable to execute command while delving into a deep dungeon.
+    /// </summary>
+    InDeepDungeon = 79,
+
+    /// <summary>
+    /// Unable to execute command while swimming.
+    /// </summary>
+    Swimming = 80,
+
+    /// <summary>
+    /// Unable to execute command while diving.
+    /// </summary>
+    Diving = 81,
+
+    /// <summary>
+    /// Unable to execute command while registering for a Triple Triad match.
+    /// </summary>
+    RegisteringForTripleTriadMatch = 82,
+
+    /// <summary>
+    /// Unable to execute command while waiting for a Triple Triad match.
+    /// </summary>
+    WaitingForTripleTriadMatch83 = 83,
+
+    /// <summary>
+    /// Unable to execute command while participating in a cross-world party or alliance.
+    /// </summary>
+    ParticipatingInCrossWorldPartyOrAlliance = 84,
+
+    // Unknown85 = 85,
+
+    /// <summary>
+    /// Unable to execute command while playing duty record.
+    /// </summary>
+    DutyRecorderPlayback = 86,
+
+    /// <summary>
+    /// Unable to execute command while casting.
+    /// </summary>
+    Casting87 = 87,
+
+    /// <summary>
+    /// Unable to execute command in this state.
+    /// </summary>
+    InThisState88 = 88,
+
+    /// <summary>
+    /// Unable to execute command in this state.
+    /// </summary>
+    InThisState89 = 89,
+
+    /// <summary>
+    /// Unable to execute command while role-playing.
+    /// </summary>
+    RolePlaying = 90,
+
+    /// <summary>
+    /// Unable to execute command while bound by duty.
+    /// </summary>
+    BoundToDuty97 = 91,
+
+    /// <summary>
+    /// Unable to execute command while readying to visit another World.
+    /// </summary>
+    ReadyingVisitOtherWorld = 92,
+
+    /// <summary>
+    /// Unable to execute command while waiting to visit another World.
+    /// </summary>
+    WaitingToVisitOtherWorld = 93,
+
+    /// <summary>
+    /// Unable to execute command while using a parasol.
+    /// </summary>
+    UsingParasol = 94,
+
+    /// <summary>
+    /// Unable to execute command while bound by duty.
+    /// </summary>
+    BoundByDuty95 = 95,
+
+    /// <summary>
+    /// Cannot execute at this time.
+    /// </summary>
+    Unknown96 = 96,
+
+    /// <summary>
+    /// Unable to execute command while wearing a guise.
+    /// </summary>
+    Disguised = 97,
+
+    /// <summary>
+    /// Unable to execute command while recruiting for a non-cross-world party.
+    /// </summary>
+    RecruitingWorldOnly = 98,
 }
diff --git a/Dalamud/Game/ClientState/Fates/Fate.cs b/Dalamud/Game/ClientState/Fates/Fate.cs
index 1e5176a9a..440767846 100644
--- a/Dalamud/Game/ClientState/Fates/Fate.cs
+++ b/Dalamud/Game/ClientState/Fates/Fate.cs
@@ -6,131 +6,130 @@ using Dalamud.Game.ClientState.Resolvers;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Memory;
 
-namespace Dalamud.Game.ClientState.Fates
+namespace Dalamud.Game.ClientState.Fates;
+
+/// <summary>
+/// This class represents an FFXIV Fate.
+/// </summary>
+public unsafe partial class Fate : IEquatable<Fate>
 {
     /// <summary>
-    /// This class represents an FFXIV Fate.
+    /// Initializes a new instance of the <see cref="Fate"/> class.
     /// </summary>
-    public unsafe partial class Fate : IEquatable<Fate>
+    /// <param name="address">The address of this fate in memory.</param>
+    internal Fate(IntPtr address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Fate"/> class.
-        /// </summary>
-        /// <param name="address">The address of this fate in memory.</param>
-        internal Fate(IntPtr address)
-        {
-            this.Address = address;
-        }
-
-        /// <summary>
-        /// Gets the address of this Fate in memory.
-        /// </summary>
-        public IntPtr Address { get; }
-
-        private FFXIVClientStructs.FFXIV.Client.Game.Fate.FateContext* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Fate.FateContext*)this.Address;
-
-        public static bool operator ==(Fate fate1, Fate fate2)
-        {
-            if (fate1 is null || fate2 is null)
-                return Equals(fate1, fate2);
-
-            return fate1.Equals(fate2);
-        }
-
-        public static bool operator !=(Fate fate1, Fate fate2) => !(fate1 == fate2);
-
-        /// <summary>
-        /// Gets a value indicating whether this Fate is still valid in memory.
-        /// </summary>
-        /// <param name="fate">The fate to check.</param>
-        /// <returns>True or false.</returns>
-        public static bool IsValid(Fate fate)
-        {
-            var clientState = Service<ClientState>.GetNullable();
-
-            if (fate == null || clientState == null)
-                return false;
-
-            if (clientState.LocalContentId == 0)
-                return false;
-
-            return true;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this actor is still valid in memory.
-        /// </summary>
-        /// <returns>True or false.</returns>
-        public bool IsValid() => IsValid(this);
-
-        /// <inheritdoc/>
-        bool IEquatable<Fate>.Equals(Fate other) => this.FateId == other?.FateId;
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj) => ((IEquatable<Fate>)this).Equals(obj as Fate);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => this.FateId.GetHashCode();
+        this.Address = address;
     }
 
     /// <summary>
-    /// This class represents an FFXIV Fate.
+    /// Gets the address of this Fate in memory.
     /// </summary>
-    public unsafe partial class Fate
+    public IntPtr Address { get; }
+
+    private FFXIVClientStructs.FFXIV.Client.Game.Fate.FateContext* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Fate.FateContext*)this.Address;
+
+    public static bool operator ==(Fate fate1, Fate fate2)
     {
-        /// <summary>
-        /// Gets the Fate ID of this <see cref="Fate" />.
-        /// </summary>
-        public ushort FateId => this.Struct->FateId;
+        if (fate1 is null || fate2 is null)
+            return Equals(fate1, fate2);
 
-        /// <summary>
-        /// Gets game data linked to this Fate.
-        /// </summary>
-        public Lumina.Excel.GeneratedSheets.Fate GameData => Service<DataManager>.Get().GetExcelSheet<Lumina.Excel.GeneratedSheets.Fate>().GetRow(this.FateId);
-
-        /// <summary>
-        /// Gets the time this <see cref="Fate"/> started.
-        /// </summary>
-        public int StartTimeEpoch => this.Struct->StartTimeEpoch;
-
-        /// <summary>
-        /// Gets how long this <see cref="Fate"/> will run.
-        /// </summary>
-        public short Duration => this.Struct->Duration;
-
-        /// <summary>
-        /// Gets the remaining time in seconds for this <see cref="Fate"/>.
-        /// </summary>
-        public long TimeRemaining => this.StartTimeEpoch + this.Duration - DateTimeOffset.Now.ToUnixTimeSeconds();
-
-        /// <summary>
-        /// Gets the displayname of this <see cref="Fate" />.
-        /// </summary>
-        public SeString Name => MemoryHelper.ReadSeString(&this.Struct->Name);
-
-        /// <summary>
-        /// Gets the state of this <see cref="Fate"/> (Running, Ended, Failed, Preparation, WaitingForEnd).
-        /// </summary>
-        public FateState State => (FateState)this.Struct->State;
-
-        /// <summary>
-        /// Gets the progress amount of this <see cref="Fate"/>.
-        /// </summary>
-        public byte Progress => this.Struct->Progress;
-
-        /// <summary>
-        /// Gets the level of this <see cref="Fate"/>.
-        /// </summary>
-        public byte Level => this.Struct->Level;
-
-        /// <summary>
-        /// Gets the position of this <see cref="Fate"/>.
-        /// </summary>
-        public Vector3 Position => this.Struct->Location;
-
-        /// <summary>
-        /// Gets the territory this <see cref="Fate"/> is located in.
-        /// </summary>
-        public ExcelResolver<Lumina.Excel.GeneratedSheets.TerritoryType> TerritoryType => new(this.Struct->TerritoryId);
+        return fate1.Equals(fate2);
     }
+
+    public static bool operator !=(Fate fate1, Fate fate2) => !(fate1 == fate2);
+
+    /// <summary>
+    /// Gets a value indicating whether this Fate is still valid in memory.
+    /// </summary>
+    /// <param name="fate">The fate to check.</param>
+    /// <returns>True or false.</returns>
+    public static bool IsValid(Fate fate)
+    {
+        var clientState = Service<ClientState>.GetNullable();
+
+        if (fate == null || clientState == null)
+            return false;
+
+        if (clientState.LocalContentId == 0)
+            return false;
+
+        return true;
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether this actor is still valid in memory.
+    /// </summary>
+    /// <returns>True or false.</returns>
+    public bool IsValid() => IsValid(this);
+
+    /// <inheritdoc/>
+    bool IEquatable<Fate>.Equals(Fate other) => this.FateId == other?.FateId;
+
+    /// <inheritdoc/>
+    public override bool Equals(object obj) => ((IEquatable<Fate>)this).Equals(obj as Fate);
+
+    /// <inheritdoc/>
+    public override int GetHashCode() => this.FateId.GetHashCode();
+}
+
+/// <summary>
+/// This class represents an FFXIV Fate.
+/// </summary>
+public unsafe partial class Fate
+{
+    /// <summary>
+    /// Gets the Fate ID of this <see cref="Fate" />.
+    /// </summary>
+    public ushort FateId => this.Struct->FateId;
+
+    /// <summary>
+    /// Gets game data linked to this Fate.
+    /// </summary>
+    public Lumina.Excel.GeneratedSheets.Fate GameData => Service<DataManager>.Get().GetExcelSheet<Lumina.Excel.GeneratedSheets.Fate>().GetRow(this.FateId);
+
+    /// <summary>
+    /// Gets the time this <see cref="Fate"/> started.
+    /// </summary>
+    public int StartTimeEpoch => this.Struct->StartTimeEpoch;
+
+    /// <summary>
+    /// Gets how long this <see cref="Fate"/> will run.
+    /// </summary>
+    public short Duration => this.Struct->Duration;
+
+    /// <summary>
+    /// Gets the remaining time in seconds for this <see cref="Fate"/>.
+    /// </summary>
+    public long TimeRemaining => this.StartTimeEpoch + this.Duration - DateTimeOffset.Now.ToUnixTimeSeconds();
+
+    /// <summary>
+    /// Gets the displayname of this <see cref="Fate" />.
+    /// </summary>
+    public SeString Name => MemoryHelper.ReadSeString(&this.Struct->Name);
+
+    /// <summary>
+    /// Gets the state of this <see cref="Fate"/> (Running, Ended, Failed, Preparation, WaitingForEnd).
+    /// </summary>
+    public FateState State => (FateState)this.Struct->State;
+
+    /// <summary>
+    /// Gets the progress amount of this <see cref="Fate"/>.
+    /// </summary>
+    public byte Progress => this.Struct->Progress;
+
+    /// <summary>
+    /// Gets the level of this <see cref="Fate"/>.
+    /// </summary>
+    public byte Level => this.Struct->Level;
+
+    /// <summary>
+    /// Gets the position of this <see cref="Fate"/>.
+    /// </summary>
+    public Vector3 Position => this.Struct->Location;
+
+    /// <summary>
+    /// Gets the territory this <see cref="Fate"/> is located in.
+    /// </summary>
+    public ExcelResolver<Lumina.Excel.GeneratedSheets.TerritoryType> TerritoryType => new(this.Struct->TerritoryId);
 }
diff --git a/Dalamud/Game/ClientState/Fates/FateState.cs b/Dalamud/Game/ClientState/Fates/FateState.cs
index c7a789231..8f2ef85cc 100644
--- a/Dalamud/Game/ClientState/Fates/FateState.cs
+++ b/Dalamud/Game/ClientState/Fates/FateState.cs
@@ -1,33 +1,32 @@
-namespace Dalamud.Game.ClientState.Fates
+namespace Dalamud.Game.ClientState.Fates;
+
+/// <summary>
+/// This represents the state of a single Fate.
+/// </summary>
+public enum FateState : byte
 {
     /// <summary>
-    /// This represents the state of a single Fate.
+    /// The Fate is active.
     /// </summary>
-    public enum FateState : byte
-    {
-        /// <summary>
-        /// The Fate is active.
-        /// </summary>
-        Running = 0x02,
+    Running = 0x02,
 
-        /// <summary>
-        /// The Fate has ended.
-        /// </summary>
-        Ended = 0x04,
+    /// <summary>
+    /// The Fate has ended.
+    /// </summary>
+    Ended = 0x04,
 
-        /// <summary>
-        /// The player failed the Fate.
-        /// </summary>
-        Failed = 0x05,
+    /// <summary>
+    /// The player failed the Fate.
+    /// </summary>
+    Failed = 0x05,
 
-        /// <summary>
-        /// The Fate is preparing to run.
-        /// </summary>
-        Preparation = 0x07,
+    /// <summary>
+    /// The Fate is preparing to run.
+    /// </summary>
+    Preparation = 0x07,
 
-        /// <summary>
-        /// The Fate is preparing to end.
-        /// </summary>
-        WaitingForEnd = 0x08,
-    }
+    /// <summary>
+    /// The Fate is preparing to end.
+    /// </summary>
+    WaitingForEnd = 0x08,
 }
diff --git a/Dalamud/Game/ClientState/Fates/FateTable.cs b/Dalamud/Game/ClientState/Fates/FateTable.cs
index 93a0e60b9..dfd4bcaee 100644
--- a/Dalamud/Game/ClientState/Fates/FateTable.cs
+++ b/Dalamud/Game/ClientState/Fates/FateTable.cs
@@ -6,137 +6,136 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.ClientState.Fates
+namespace Dalamud.Game.ClientState.Fates;
+
+/// <summary>
+/// This collection represents the currently available Fate events.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed partial class FateTable : IServiceType
 {
-    /// <summary>
-    /// This collection represents the currently available Fate events.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed partial class FateTable : IServiceType
+    private readonly ClientStateAddressResolver address;
+
+    [ServiceManager.ServiceConstructor]
+    private FateTable(ClientState clientState)
     {
-        private readonly ClientStateAddressResolver address;
+        this.address = clientState.AddressResolver;
 
-        [ServiceManager.ServiceConstructor]
-        private FateTable(ClientState clientState)
+        Log.Verbose($"Fate table address 0x{this.address.FateTablePtr.ToInt64():X}");
+    }
+
+    /// <summary>
+    /// Gets the address of the Fate table.
+    /// </summary>
+    public IntPtr Address => this.address.FateTablePtr;
+
+    /// <summary>
+    /// Gets the amount of currently active Fates.
+    /// </summary>
+    public unsafe int Length
+    {
+        get
         {
-            this.address = clientState.AddressResolver;
-
-            Log.Verbose($"Fate table address 0x{this.address.FateTablePtr.ToInt64():X}");
-        }
-
-        /// <summary>
-        /// Gets the address of the Fate table.
-        /// </summary>
-        public IntPtr Address => this.address.FateTablePtr;
-
-        /// <summary>
-        /// Gets the amount of currently active Fates.
-        /// </summary>
-        public unsafe int Length
-        {
-            get
-            {
-                var fateTable = this.FateTableAddress;
-                if (fateTable == IntPtr.Zero)
-                    return 0;
-
-                // Sonar used this to check if the table was safe to read
-                if (Struct->FateDirector == null)
-                    return 0;
-
-                if (Struct->Fates.First == null || Struct->Fates.Last == null)
-                    return 0;
-
-                return (int)Struct->Fates.Size();
-            }
-        }
-
-        /// <summary>
-        /// Gets the address of the Fate table.
-        /// </summary>
-        internal unsafe IntPtr FateTableAddress
-        {
-            get
-            {
-                if (this.address.FateTablePtr == IntPtr.Zero)
-                    return IntPtr.Zero;
-
-                return *(IntPtr*)this.address.FateTablePtr;
-            }
-        }
-
-        private unsafe FFXIVClientStructs.FFXIV.Client.Game.Fate.FateManager* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Fate.FateManager*)this.FateTableAddress;
-
-        /// <summary>
-        /// Get an actor at the specified spawn index.
-        /// </summary>
-        /// <param name="index">Spawn index.</param>
-        /// <returns>A <see cref="Fate"/> at the specified spawn index.</returns>
-        public Fate? this[int index]
-        {
-            get
-            {
-                var address = this.GetFateAddress(index);
-                return this.CreateFateReference(address);
-            }
-        }
-
-        /// <summary>
-        /// Gets the address of the Fate at the specified index of the fate table.
-        /// </summary>
-        /// <param name="index">The index of the Fate.</param>
-        /// <returns>The memory address of the Fate.</returns>
-        public unsafe IntPtr GetFateAddress(int index)
-        {
-            if (index >= this.Length)
-                return IntPtr.Zero;
-
             var fateTable = this.FateTableAddress;
             if (fateTable == IntPtr.Zero)
-                return IntPtr.Zero;
+                return 0;
 
-            return (IntPtr)this.Struct->Fates.Get((ulong)index).Value;
-        }
+            // Sonar used this to check if the table was safe to read
+            if (Struct->FateDirector == null)
+                return 0;
 
-        /// <summary>
-        /// Create a reference to a FFXIV actor.
-        /// </summary>
-        /// <param name="offset">The offset of the actor in memory.</param>
-        /// <returns><see cref="Fate"/> object containing requested data.</returns>
-        public Fate? CreateFateReference(IntPtr offset)
-        {
-            var clientState = Service<ClientState>.Get();
+            if (Struct->Fates.First == null || Struct->Fates.Last == null)
+                return 0;
 
-            if (clientState.LocalContentId == 0)
-                return null;
-
-            if (offset == IntPtr.Zero)
-                return null;
-
-            return new Fate(offset);
+            return (int)Struct->Fates.Size();
         }
     }
 
     /// <summary>
-    /// This collection represents the currently available Fate events.
+    /// Gets the address of the Fate table.
     /// </summary>
-    public sealed partial class FateTable : IReadOnlyCollection<Fate>
+    internal unsafe IntPtr FateTableAddress
     {
-        /// <inheritdoc/>
-        int IReadOnlyCollection<Fate>.Count => this.Length;
-
-        /// <inheritdoc/>
-        public IEnumerator<Fate> GetEnumerator()
+        get
         {
-            for (var i = 0; i < this.Length; i++)
-            {
-                yield return this[i];
-            }
-        }
+            if (this.address.FateTablePtr == IntPtr.Zero)
+                return IntPtr.Zero;
 
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+            return *(IntPtr*)this.address.FateTablePtr;
+        }
+    }
+
+    private unsafe FFXIVClientStructs.FFXIV.Client.Game.Fate.FateManager* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Fate.FateManager*)this.FateTableAddress;
+
+    /// <summary>
+    /// Get an actor at the specified spawn index.
+    /// </summary>
+    /// <param name="index">Spawn index.</param>
+    /// <returns>A <see cref="Fate"/> at the specified spawn index.</returns>
+    public Fate? this[int index]
+    {
+        get
+        {
+            var address = this.GetFateAddress(index);
+            return this.CreateFateReference(address);
+        }
+    }
+
+    /// <summary>
+    /// Gets the address of the Fate at the specified index of the fate table.
+    /// </summary>
+    /// <param name="index">The index of the Fate.</param>
+    /// <returns>The memory address of the Fate.</returns>
+    public unsafe IntPtr GetFateAddress(int index)
+    {
+        if (index >= this.Length)
+            return IntPtr.Zero;
+
+        var fateTable = this.FateTableAddress;
+        if (fateTable == IntPtr.Zero)
+            return IntPtr.Zero;
+
+        return (IntPtr)this.Struct->Fates.Get((ulong)index).Value;
+    }
+
+    /// <summary>
+    /// Create a reference to a FFXIV actor.
+    /// </summary>
+    /// <param name="offset">The offset of the actor in memory.</param>
+    /// <returns><see cref="Fate"/> object containing requested data.</returns>
+    public Fate? CreateFateReference(IntPtr offset)
+    {
+        var clientState = Service<ClientState>.Get();
+
+        if (clientState.LocalContentId == 0)
+            return null;
+
+        if (offset == IntPtr.Zero)
+            return null;
+
+        return new Fate(offset);
     }
 }
+
+/// <summary>
+/// This collection represents the currently available Fate events.
+/// </summary>
+public sealed partial class FateTable : IReadOnlyCollection<Fate>
+{
+    /// <inheritdoc/>
+    int IReadOnlyCollection<Fate>.Count => this.Length;
+
+    /// <inheritdoc/>
+    public IEnumerator<Fate> GetEnumerator()
+    {
+        for (var i = 0; i < this.Length; i++)
+        {
+            yield return this[i];
+        }
+    }
+
+    /// <inheritdoc/>
+    IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+}
diff --git a/Dalamud/Game/ClientState/GamePad/GamepadButtons.cs b/Dalamud/Game/ClientState/GamePad/GamepadButtons.cs
index 7813803c8..a73f72857 100644
--- a/Dalamud/Game/ClientState/GamePad/GamepadButtons.cs
+++ b/Dalamud/Game/ClientState/GamePad/GamepadButtons.cs
@@ -1,96 +1,95 @@
 using System;
 
-namespace Dalamud.Game.ClientState.GamePad
+namespace Dalamud.Game.ClientState.GamePad;
+
+/// <summary>
+/// Bitmask of the Button ushort used by the game.
+/// </summary>
+[Flags]
+public enum GamepadButtons : ushort
 {
     /// <summary>
-    /// Bitmask of the Button ushort used by the game.
+    /// No buttons pressed.
     /// </summary>
-    [Flags]
-    public enum GamepadButtons : ushort
-    {
-        /// <summary>
-        /// No buttons pressed.
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// Digipad up.
-        /// </summary>
-        DpadUp = 0x0001,
+    /// <summary>
+    /// Digipad up.
+    /// </summary>
+    DpadUp = 0x0001,
 
-        /// <summary>
-        /// Digipad down.
-        /// </summary>
-        DpadDown = 0x0002,
+    /// <summary>
+    /// Digipad down.
+    /// </summary>
+    DpadDown = 0x0002,
 
-        /// <summary>
-        /// Digipad left.
-        /// </summary>
-        DpadLeft = 0x0004,
+    /// <summary>
+    /// Digipad left.
+    /// </summary>
+    DpadLeft = 0x0004,
 
-        /// <summary>
-        /// Digipad right.
-        /// </summary>
-        DpadRight = 0x0008,
+    /// <summary>
+    /// Digipad right.
+    /// </summary>
+    DpadRight = 0x0008,
 
-        /// <summary>
-        /// North action button. Triangle on PS, Y on Xbox.
-        /// </summary>
-        North = 0x0010,
+    /// <summary>
+    /// North action button. Triangle on PS, Y on Xbox.
+    /// </summary>
+    North = 0x0010,
 
-        /// <summary>
-        /// South action button. Cross on PS, A on Xbox.
-        /// </summary>
-        South = 0x0020,
+    /// <summary>
+    /// South action button. Cross on PS, A on Xbox.
+    /// </summary>
+    South = 0x0020,
 
-        /// <summary>
-        /// West action button. Square on PS, X on Xbos.
-        /// </summary>
-        West = 0x0040,
+    /// <summary>
+    /// West action button. Square on PS, X on Xbos.
+    /// </summary>
+    West = 0x0040,
 
-        /// <summary>
-        /// East action button. Circle on PS, B on Xbox.
-        /// </summary>
-        East = 0x0080,
+    /// <summary>
+    /// East action button. Circle on PS, B on Xbox.
+    /// </summary>
+    East = 0x0080,
 
-        /// <summary>
-        /// First button on left shoulder side.
-        /// </summary>
-        L1 = 0x0100,
+    /// <summary>
+    /// First button on left shoulder side.
+    /// </summary>
+    L1 = 0x0100,
 
-        /// <summary>
-        /// Second button on left shoulder side. Analog input lost in this bitmask.
-        /// </summary>
-        L2 = 0x0200,
+    /// <summary>
+    /// Second button on left shoulder side. Analog input lost in this bitmask.
+    /// </summary>
+    L2 = 0x0200,
 
-        /// <summary>
-        /// Press on left analogue stick.
-        /// </summary>
-        L3 = 0x0400,
+    /// <summary>
+    /// Press on left analogue stick.
+    /// </summary>
+    L3 = 0x0400,
 
-        /// <summary>
-        /// First button on right shoulder.
-        /// </summary>
-        R1 = 0x0800,
+    /// <summary>
+    /// First button on right shoulder.
+    /// </summary>
+    R1 = 0x0800,
 
-        /// <summary>
-        /// Second button on right shoulder. Analog input lost in this bitmask.
-        /// </summary>
-        R2 = 0x1000,
+    /// <summary>
+    /// Second button on right shoulder. Analog input lost in this bitmask.
+    /// </summary>
+    R2 = 0x1000,
 
-        /// <summary>
-        /// Press on right analogue stick.
-        /// </summary>
-        R3 = 0x2000,
+    /// <summary>
+    /// Press on right analogue stick.
+    /// </summary>
+    R3 = 0x2000,
 
-        /// <summary>
-        /// Button on the right inner side of the controller. Options on PS, Start on Xbox.
-        /// </summary>
-        Start = 0x8000,
+    /// <summary>
+    /// Button on the right inner side of the controller. Options on PS, Start on Xbox.
+    /// </summary>
+    Start = 0x8000,
 
-        /// <summary>
-        /// Button on the left inner side of the controller. ??? on PS, Back on Xbox.
-        /// </summary>
-        Select = 0x4000,
-    }
+    /// <summary>
+    /// Button on the left inner side of the controller. ??? on PS, Back on Xbox.
+    /// </summary>
+    Select = 0x4000,
 }
diff --git a/Dalamud/Game/ClientState/GamePad/GamepadInput.cs b/Dalamud/Game/ClientState/GamePad/GamepadInput.cs
index d6d46a0cc..32439cd08 100644
--- a/Dalamud/Game/ClientState/GamePad/GamepadInput.cs
+++ b/Dalamud/Game/ClientState/GamePad/GamepadInput.cs
@@ -1,76 +1,75 @@
 using System.Runtime.InteropServices;
 
-namespace Dalamud.Game.ClientState.GamePad
+namespace Dalamud.Game.ClientState.GamePad;
+
+/// <summary>
+/// Struct which gets populated by polling the gamepads.
+///
+/// Has an array of gamepads, among many other things (here not mapped).
+/// All we really care about is the final data which the game uses to determine input.
+///
+/// The size is definitely bigger than only the following fields but I do not know how big.
+/// </summary>
+[StructLayout(LayoutKind.Explicit)]
+public struct GamepadInput
 {
     /// <summary>
-    /// Struct which gets populated by polling the gamepads.
-    ///
-    /// Has an array of gamepads, among many other things (here not mapped).
-    /// All we really care about is the final data which the game uses to determine input.
-    ///
-    /// The size is definitely bigger than only the following fields but I do not know how big.
+    /// Left analogue stick's horizontal value, -99 for left, 99 for right.
     /// </summary>
-    [StructLayout(LayoutKind.Explicit)]
-    public struct GamepadInput
-    {
-        /// <summary>
-        /// Left analogue stick's horizontal value, -99 for left, 99 for right.
-        /// </summary>
-        [FieldOffset(0x88)]
-        public int LeftStickX;
+    [FieldOffset(0x88)]
+    public int LeftStickX;
 
-        /// <summary>
-        /// Left analogue stick's vertical value, -99 for down, 99 for up.
-        /// </summary>
-        [FieldOffset(0x8C)]
-        public int LeftStickY;
+    /// <summary>
+    /// Left analogue stick's vertical value, -99 for down, 99 for up.
+    /// </summary>
+    [FieldOffset(0x8C)]
+    public int LeftStickY;
 
-        /// <summary>
-        /// Right analogue stick's horizontal value, -99 for left, 99 for right.
-        /// </summary>
-        [FieldOffset(0x90)]
-        public int RightStickX;
+    /// <summary>
+    /// Right analogue stick's horizontal value, -99 for left, 99 for right.
+    /// </summary>
+    [FieldOffset(0x90)]
+    public int RightStickX;
 
-        /// <summary>
-        /// Right analogue stick's vertical value, -99 for down, 99 for up.
-        /// </summary>
-        [FieldOffset(0x94)]
-        public int RightStickY;
+    /// <summary>
+    /// Right analogue stick's vertical value, -99 for down, 99 for up.
+    /// </summary>
+    [FieldOffset(0x94)]
+    public int RightStickY;
 
-        /// <summary>
-        /// Raw input, set the whole time while a button is held. See <see cref="GamepadButtons"/> for the mapping.
-        /// </summary>
-        /// <remarks>
-        /// This is a bitfield.
-        /// </remarks>
-        [FieldOffset(0x98)]
-        public ushort ButtonsRaw;
+    /// <summary>
+    /// Raw input, set the whole time while a button is held. See <see cref="GamepadButtons"/> for the mapping.
+    /// </summary>
+    /// <remarks>
+    /// This is a bitfield.
+    /// </remarks>
+    [FieldOffset(0x98)]
+    public ushort ButtonsRaw;
 
-        /// <summary>
-        /// Button pressed, set once when the button is pressed. See <see cref="GamepadButtons"/> for the mapping.
-        /// </summary>
-        /// <remarks>
-        /// This is a bitfield.
-        /// </remarks>
-        [FieldOffset(0x9C)]
-        public ushort ButtonsPressed;
+    /// <summary>
+    /// Button pressed, set once when the button is pressed. See <see cref="GamepadButtons"/> for the mapping.
+    /// </summary>
+    /// <remarks>
+    /// This is a bitfield.
+    /// </remarks>
+    [FieldOffset(0x9C)]
+    public ushort ButtonsPressed;
 
-        /// <summary>
-        /// Button released input, set once right after the button is not hold anymore. See <see cref="GamepadButtons"/> for the mapping.
-        /// </summary>
-        /// <remarks>
-        /// This is a bitfield.
-        /// </remarks>
-        [FieldOffset(0xA0)]
-        public ushort ButtonsReleased;
+    /// <summary>
+    /// Button released input, set once right after the button is not hold anymore. See <see cref="GamepadButtons"/> for the mapping.
+    /// </summary>
+    /// <remarks>
+    /// This is a bitfield.
+    /// </remarks>
+    [FieldOffset(0xA0)]
+    public ushort ButtonsReleased;
 
-        /// <summary>
-        /// Repeatedly emits the held button input in fixed intervals. See <see cref="GamepadButtons"/> for the mapping.
-        /// </summary>
-        /// <remarks>
-        /// This is a bitfield.
-        /// </remarks>
-        [FieldOffset(0xA4)]
-        public ushort ButtonsRepeat;
-    }
+    /// <summary>
+    /// Repeatedly emits the held button input in fixed intervals. See <see cref="GamepadButtons"/> for the mapping.
+    /// </summary>
+    /// <remarks>
+    /// This is a bitfield.
+    /// </remarks>
+    [FieldOffset(0xA4)]
+    public ushort ButtonsRepeat;
 }
diff --git a/Dalamud/Game/ClientState/GamePad/GamepadState.cs b/Dalamud/Game/ClientState/GamePad/GamepadState.cs
index bd4cadbc8..c72e9c1de 100644
--- a/Dalamud/Game/ClientState/GamePad/GamepadState.cs
+++ b/Dalamud/Game/ClientState/GamePad/GamepadState.cs
@@ -6,249 +6,248 @@ using Dalamud.IoC.Internal;
 using ImGuiNET;
 using Serilog;
 
-namespace Dalamud.Game.ClientState.GamePad
+namespace Dalamud.Game.ClientState.GamePad;
+
+/// <summary>
+/// Exposes the game gamepad state to dalamud.
+///
+/// Will block game's gamepad input if <see cref="ImGuiConfigFlags.NavEnableGamepad"/> is set.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public unsafe class GamepadState : IDisposable, IServiceType
 {
-    /// <summary>
-    /// Exposes the game gamepad state to dalamud.
-    ///
-    /// Will block game's gamepad input if <see cref="ImGuiConfigFlags.NavEnableGamepad"/> is set.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public unsafe class GamepadState : IDisposable, IServiceType
+    private readonly Hook<ControllerPoll> gamepadPoll;
+
+    private bool isDisposed;
+
+    private int leftStickX;
+    private int leftStickY;
+    private int rightStickX;
+    private int rightStickY;
+
+    [ServiceManager.ServiceConstructor]
+    private GamepadState(ClientState clientState)
     {
-        private readonly Hook<ControllerPoll> gamepadPoll;
+        var resolver = clientState.AddressResolver;
+        Log.Verbose($"GamepadPoll address 0x{resolver.GamepadPoll.ToInt64():X}");
+        this.gamepadPoll = Hook<ControllerPoll>.FromAddress(resolver.GamepadPoll, this.GamepadPollDetour);
+    }
 
-        private bool isDisposed;
+    private delegate int ControllerPoll(IntPtr controllerInput);
 
-        private int leftStickX;
-        private int leftStickY;
-        private int rightStickX;
-        private int rightStickY;
+    /// <summary>
+    /// Gets the pointer to the current instance of the GamepadInput struct.
+    /// </summary>
+    public IntPtr GamepadInputAddress { get; private set; }
 
-        [ServiceManager.ServiceConstructor]
-        private GamepadState(ClientState clientState)
+    /// <summary>
+    ///     Gets the state of the left analogue stick in the left direction between 0 (not tilted) and 1 (max tilt).
+    /// </summary>
+    public float LeftStickLeft => this.leftStickX < 0 ? -this.leftStickX / 100f : 0;
+
+    /// <summary>
+    ///     Gets the state of the left analogue stick in the right direction between 0 (not tilted) and 1 (max tilt).
+    /// </summary>
+    public float LeftStickRight => this.leftStickX > 0 ? this.leftStickX / 100f : 0;
+
+    /// <summary>
+    ///     Gets the state of the left analogue stick in the up direction between 0 (not tilted) and 1 (max tilt).
+    /// </summary>
+    public float LeftStickUp => this.leftStickY > 0 ? this.leftStickY / 100f : 0;
+
+    /// <summary>
+    ///     Gets the state of the left analogue stick in the down direction between 0 (not tilted) and 1 (max tilt).
+    /// </summary>
+    public float LeftStickDown => this.leftStickY < 0 ? -this.leftStickY / 100f : 0;
+
+    /// <summary>
+    ///     Gets the state of the right analogue stick in the left direction between 0 (not tilted) and 1 (max tilt).
+    /// </summary>
+    public float RightStickLeft => this.rightStickX < 0 ? -this.rightStickX / 100f : 0;
+
+    /// <summary>
+    ///     Gets the state of the right analogue stick in the right direction between 0 (not tilted) and 1 (max tilt).
+    /// </summary>
+    public float RightStickRight => this.rightStickX > 0 ? this.rightStickX / 100f : 0;
+
+    /// <summary>
+    ///     Gets the state of the right analogue stick in the up direction between 0 (not tilted) and 1 (max tilt).
+    /// </summary>
+    public float RightStickUp => this.rightStickY > 0 ? this.rightStickY / 100f : 0;
+
+    /// <summary>
+    ///     Gets the state of the right analogue stick in the down direction between 0 (not tilted) and 1 (max tilt).
+    /// </summary>
+    public float RightStickDown => this.rightStickY < 0 ? -this.rightStickY / 100f : 0;
+
+    /// <summary>
+    /// Gets buttons pressed bitmask, set once when the button is pressed. See <see cref="GamepadButtons"/> for the mapping.
+    ///
+    /// Exposed internally for Debug Data window.
+    /// </summary>
+    internal ushort ButtonsPressed { get; private set; }
+
+    /// <summary>
+    /// Gets raw button bitmask, set the whole time while a button is held. See <see cref="GamepadButtons"/> for the mapping.
+    ///
+    /// Exposed internally for Debug Data window.
+    /// </summary>
+    internal ushort ButtonsRaw { get; private set; }
+
+    /// <summary>
+    /// Gets button released bitmask, set once right after the button is not hold anymore. See <see cref="GamepadButtons"/> for the mapping.
+    ///
+    /// Exposed internally for Debug Data window.
+    /// </summary>
+    internal ushort ButtonsReleased { get; private set; }
+
+    /// <summary>
+    /// Gets button repeat bitmask, emits the held button input in fixed intervals. See <see cref="GamepadButtons"/> for the mapping.
+    ///
+    /// Exposed internally for Debug Data window.
+    /// </summary>
+    internal ushort ButtonsRepeat { get; private set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether detour should block gamepad input for game.
+    ///
+    /// Ideally, we would use
+    /// (ImGui.GetIO().ConfigFlags &amp; ImGuiConfigFlags.NavEnableGamepad) > 0
+    /// but this has a race condition during load with the detour which sets up ImGui
+    /// and throws if our detour gets called before the other.
+    /// </summary>
+    internal bool NavEnableGamepad { get; set; }
+
+    /// <summary>
+    /// Gets whether <paramref name="button"/> has been pressed.
+    ///
+    /// Only true on first frame of the press.
+    /// If ImGuiConfigFlags.NavEnableGamepad is set, this is unreliable.
+    /// </summary>
+    /// <param name="button">The button to check for.</param>
+    /// <returns>1 if pressed, 0 otherwise.</returns>
+    public float Pressed(GamepadButtons button) => (this.ButtonsPressed & (ushort)button) > 0 ? 1 : 0;
+
+    /// <summary>
+    /// Gets whether <paramref name="button"/> is being pressed.
+    ///
+    /// True in intervals if button is held down.
+    /// If ImGuiConfigFlags.NavEnableGamepad is set, this is unreliable.
+    /// </summary>
+    /// <param name="button">The button to check for.</param>
+    /// <returns>1 if still pressed during interval, 0 otherwise or in between intervals.</returns>
+    public float Repeat(GamepadButtons button) => (this.ButtonsRepeat & (ushort)button) > 0 ? 1 : 0;
+
+    /// <summary>
+    /// Gets whether <paramref name="button"/> has been released.
+    ///
+    /// Only true the frame after release.
+    /// If ImGuiConfigFlags.NavEnableGamepad is set, this is unreliable.
+    /// </summary>
+    /// <param name="button">The button to check for.</param>
+    /// <returns>1 if released, 0 otherwise.</returns>
+    public float Released(GamepadButtons button) => (this.ButtonsReleased & (ushort)button) > 0 ? 1 : 0;
+
+    /// <summary>
+    /// Gets the raw state of <paramref name="button"/>.
+    ///
+    /// Is set the entire time a button is pressed down.
+    /// </summary>
+    /// <param name="button">The button to check for.</param>
+    /// <returns>1 the whole time button is pressed, 0 otherwise.</returns>
+    public float Raw(GamepadButtons button) => (this.ButtonsRaw & (ushort)button) > 0 ? 1 : 0;
+
+    /// <summary>
+    /// Disposes this instance, alongside its hooks.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction()
+    {
+        this.gamepadPoll.Enable();
+    }
+
+    private int GamepadPollDetour(IntPtr gamepadInput)
+    {
+        var original = this.gamepadPoll.Original(gamepadInput);
+        try
         {
-            var resolver = clientState.AddressResolver;
-            Log.Verbose($"GamepadPoll address 0x{resolver.GamepadPoll.ToInt64():X}");
-            this.gamepadPoll = Hook<ControllerPoll>.FromAddress(resolver.GamepadPoll, this.GamepadPollDetour);
-        }
+            this.GamepadInputAddress = gamepadInput;
+            var input = (GamepadInput*)gamepadInput;
+            this.leftStickX = input->LeftStickX;
+            this.leftStickY = input->LeftStickY;
+            this.rightStickX = input->RightStickX;
+            this.rightStickY = input->RightStickY;
+            this.ButtonsRaw = input->ButtonsRaw;
+            this.ButtonsPressed = input->ButtonsPressed;
+            this.ButtonsReleased = input->ButtonsReleased;
+            this.ButtonsRepeat = input->ButtonsRepeat;
 
-        private delegate int ControllerPoll(IntPtr controllerInput);
-
-        /// <summary>
-        /// Gets the pointer to the current instance of the GamepadInput struct.
-        /// </summary>
-        public IntPtr GamepadInputAddress { get; private set; }
-
-        /// <summary>
-        ///     Gets the state of the left analogue stick in the left direction between 0 (not tilted) and 1 (max tilt).
-        /// </summary>
-        public float LeftStickLeft => this.leftStickX < 0 ? -this.leftStickX / 100f : 0;
-
-        /// <summary>
-        ///     Gets the state of the left analogue stick in the right direction between 0 (not tilted) and 1 (max tilt).
-        /// </summary>
-        public float LeftStickRight => this.leftStickX > 0 ? this.leftStickX / 100f : 0;
-
-        /// <summary>
-        ///     Gets the state of the left analogue stick in the up direction between 0 (not tilted) and 1 (max tilt).
-        /// </summary>
-        public float LeftStickUp => this.leftStickY > 0 ? this.leftStickY / 100f : 0;
-
-        /// <summary>
-        ///     Gets the state of the left analogue stick in the down direction between 0 (not tilted) and 1 (max tilt).
-        /// </summary>
-        public float LeftStickDown => this.leftStickY < 0 ? -this.leftStickY / 100f : 0;
-
-        /// <summary>
-        ///     Gets the state of the right analogue stick in the left direction between 0 (not tilted) and 1 (max tilt).
-        /// </summary>
-        public float RightStickLeft => this.rightStickX < 0 ? -this.rightStickX / 100f : 0;
-
-        /// <summary>
-        ///     Gets the state of the right analogue stick in the right direction between 0 (not tilted) and 1 (max tilt).
-        /// </summary>
-        public float RightStickRight => this.rightStickX > 0 ? this.rightStickX / 100f : 0;
-
-        /// <summary>
-        ///     Gets the state of the right analogue stick in the up direction between 0 (not tilted) and 1 (max tilt).
-        /// </summary>
-        public float RightStickUp => this.rightStickY > 0 ? this.rightStickY / 100f : 0;
-
-        /// <summary>
-        ///     Gets the state of the right analogue stick in the down direction between 0 (not tilted) and 1 (max tilt).
-        /// </summary>
-        public float RightStickDown => this.rightStickY < 0 ? -this.rightStickY / 100f : 0;
-
-        /// <summary>
-        /// Gets buttons pressed bitmask, set once when the button is pressed. See <see cref="GamepadButtons"/> for the mapping.
-        ///
-        /// Exposed internally for Debug Data window.
-        /// </summary>
-        internal ushort ButtonsPressed { get; private set; }
-
-        /// <summary>
-        /// Gets raw button bitmask, set the whole time while a button is held. See <see cref="GamepadButtons"/> for the mapping.
-        ///
-        /// Exposed internally for Debug Data window.
-        /// </summary>
-        internal ushort ButtonsRaw { get; private set; }
-
-        /// <summary>
-        /// Gets button released bitmask, set once right after the button is not hold anymore. See <see cref="GamepadButtons"/> for the mapping.
-        ///
-        /// Exposed internally for Debug Data window.
-        /// </summary>
-        internal ushort ButtonsReleased { get; private set; }
-
-        /// <summary>
-        /// Gets button repeat bitmask, emits the held button input in fixed intervals. See <see cref="GamepadButtons"/> for the mapping.
-        ///
-        /// Exposed internally for Debug Data window.
-        /// </summary>
-        internal ushort ButtonsRepeat { get; private set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether detour should block gamepad input for game.
-        ///
-        /// Ideally, we would use
-        /// (ImGui.GetIO().ConfigFlags &amp; ImGuiConfigFlags.NavEnableGamepad) > 0
-        /// but this has a race condition during load with the detour which sets up ImGui
-        /// and throws if our detour gets called before the other.
-        /// </summary>
-        internal bool NavEnableGamepad { get; set; }
-
-        /// <summary>
-        /// Gets whether <paramref name="button"/> has been pressed.
-        ///
-        /// Only true on first frame of the press.
-        /// If ImGuiConfigFlags.NavEnableGamepad is set, this is unreliable.
-        /// </summary>
-        /// <param name="button">The button to check for.</param>
-        /// <returns>1 if pressed, 0 otherwise.</returns>
-        public float Pressed(GamepadButtons button) => (this.ButtonsPressed & (ushort)button) > 0 ? 1 : 0;
-
-        /// <summary>
-        /// Gets whether <paramref name="button"/> is being pressed.
-        ///
-        /// True in intervals if button is held down.
-        /// If ImGuiConfigFlags.NavEnableGamepad is set, this is unreliable.
-        /// </summary>
-        /// <param name="button">The button to check for.</param>
-        /// <returns>1 if still pressed during interval, 0 otherwise or in between intervals.</returns>
-        public float Repeat(GamepadButtons button) => (this.ButtonsRepeat & (ushort)button) > 0 ? 1 : 0;
-
-        /// <summary>
-        /// Gets whether <paramref name="button"/> has been released.
-        ///
-        /// Only true the frame after release.
-        /// If ImGuiConfigFlags.NavEnableGamepad is set, this is unreliable.
-        /// </summary>
-        /// <param name="button">The button to check for.</param>
-        /// <returns>1 if released, 0 otherwise.</returns>
-        public float Released(GamepadButtons button) => (this.ButtonsReleased & (ushort)button) > 0 ? 1 : 0;
-
-        /// <summary>
-        /// Gets the raw state of <paramref name="button"/>.
-        ///
-        /// Is set the entire time a button is pressed down.
-        /// </summary>
-        /// <param name="button">The button to check for.</param>
-        /// <returns>1 the whole time button is pressed, 0 otherwise.</returns>
-        public float Raw(GamepadButtons button) => (this.ButtonsRaw & (ushort)button) > 0 ? 1 : 0;
-
-        /// <summary>
-        /// Disposes this instance, alongside its hooks.
-        /// </summary>
-        void IDisposable.Dispose()
-        {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction()
-        {
-            this.gamepadPoll.Enable();
-        }
-
-        private int GamepadPollDetour(IntPtr gamepadInput)
-        {
-            var original = this.gamepadPoll.Original(gamepadInput);
-            try
+            if (this.NavEnableGamepad)
             {
-                this.GamepadInputAddress = gamepadInput;
-                var input = (GamepadInput*)gamepadInput;
-                this.leftStickX = input->LeftStickX;
-                this.leftStickY = input->LeftStickY;
-                this.rightStickX = input->RightStickX;
-                this.rightStickY = input->RightStickY;
-                this.ButtonsRaw = input->ButtonsRaw;
-                this.ButtonsPressed = input->ButtonsPressed;
-                this.ButtonsReleased = input->ButtonsReleased;
-                this.ButtonsRepeat = input->ButtonsRepeat;
+                input->LeftStickX = 0;
+                input->LeftStickY = 0;
+                input->RightStickX = 0;
+                input->RightStickY = 0;
 
-                if (this.NavEnableGamepad)
-                {
-                    input->LeftStickX = 0;
-                    input->LeftStickY = 0;
-                    input->RightStickX = 0;
-                    input->RightStickY = 0;
-
-                    // NOTE (Chiv) Zeroing `ButtonsRaw` destroys `ButtonPressed`, `ButtonReleased`
-                    // and `ButtonRepeat` as the game uses the RAW input to determine those (apparently).
-                    // It does block, however, all input to the game.
-                    // Leaving `ButtonsRaw` as it is and only zeroing the other leaves e.g. long-hold L2/R2
-                    // and the digipad (in some situations, but thankfully not in menus) functional.
-                    // We can either:
-                    // (a) Explicitly only set L2/R2/Digipad to 0 (and destroy their `ButtonPressed` field) => Needs to be documented, or
-                    // (b) ignore it as so far it seems only a 'visual' error
-                    //      (L2/R2 being held down activates CrossHotBar but activating an ability is impossible because of the others blocked input,
-                    //      Digipad is ignored in menus but without any menu's  one still switches target or party members, but cannot interact with them
-                    //      because of the other blocked input)
-                    // `ButtonPressed` is pretty useful but its hella confusing to the user, so we do (a) and advise plugins do not rely on
-                    // `ButtonPressed` while ImGuiConfigFlags.NavEnableGamepad is set.
-                    // This is debatable.
-                    // ImGui itself does not care either way as it uses the Raw values and does its own state handling.
-                    const ushort deletionMask = (ushort)(~GamepadButtons.L2
-                                                         & ~GamepadButtons.R2
-                                                         & ~GamepadButtons.DpadDown
-                                                         & ~GamepadButtons.DpadLeft
-                                                         & ~GamepadButtons.DpadUp
-                                                         & ~GamepadButtons.DpadRight);
-                    input->ButtonsRaw &= deletionMask;
-                    input->ButtonsPressed = 0;
-                    input->ButtonsReleased = 0;
-                    input->ButtonsRepeat = 0;
-                    return 0;
-                }
-
-                // NOTE (Chiv) Not so sure about the return value, does not seem to matter if we return the
-                // original, zero or do the work adjusting the bits.
-                return original;
-            }
-            catch (Exception e)
-            {
-                Log.Error(e, $"Gamepad Poll detour critical error! Gamepad navigation will not work!");
-
-                // NOTE (Chiv) Explicitly deactivate on error
-                ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableGamepad;
-                return original;
-            }
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (this.isDisposed) return;
-            if (disposing)
-            {
-                this.gamepadPoll?.Disable();
-                this.gamepadPoll?.Dispose();
+                // NOTE (Chiv) Zeroing `ButtonsRaw` destroys `ButtonPressed`, `ButtonReleased`
+                // and `ButtonRepeat` as the game uses the RAW input to determine those (apparently).
+                // It does block, however, all input to the game.
+                // Leaving `ButtonsRaw` as it is and only zeroing the other leaves e.g. long-hold L2/R2
+                // and the digipad (in some situations, but thankfully not in menus) functional.
+                // We can either:
+                // (a) Explicitly only set L2/R2/Digipad to 0 (and destroy their `ButtonPressed` field) => Needs to be documented, or
+                // (b) ignore it as so far it seems only a 'visual' error
+                //      (L2/R2 being held down activates CrossHotBar but activating an ability is impossible because of the others blocked input,
+                //      Digipad is ignored in menus but without any menu's  one still switches target or party members, but cannot interact with them
+                //      because of the other blocked input)
+                // `ButtonPressed` is pretty useful but its hella confusing to the user, so we do (a) and advise plugins do not rely on
+                // `ButtonPressed` while ImGuiConfigFlags.NavEnableGamepad is set.
+                // This is debatable.
+                // ImGui itself does not care either way as it uses the Raw values and does its own state handling.
+                const ushort deletionMask = (ushort)(~GamepadButtons.L2
+                                                     & ~GamepadButtons.R2
+                                                     & ~GamepadButtons.DpadDown
+                                                     & ~GamepadButtons.DpadLeft
+                                                     & ~GamepadButtons.DpadUp
+                                                     & ~GamepadButtons.DpadRight);
+                input->ButtonsRaw &= deletionMask;
+                input->ButtonsPressed = 0;
+                input->ButtonsReleased = 0;
+                input->ButtonsRepeat = 0;
+                return 0;
             }
 
-            this.isDisposed = true;
+            // NOTE (Chiv) Not so sure about the return value, does not seem to matter if we return the
+            // original, zero or do the work adjusting the bits.
+            return original;
+        }
+        catch (Exception e)
+        {
+            Log.Error(e, $"Gamepad Poll detour critical error! Gamepad navigation will not work!");
+
+            // NOTE (Chiv) Explicitly deactivate on error
+            ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableGamepad;
+            return original;
         }
     }
+
+    private void Dispose(bool disposing)
+    {
+        if (this.isDisposed) return;
+        if (disposing)
+        {
+            this.gamepadPoll?.Disable();
+            this.gamepadPoll?.Dispose();
+        }
+
+        this.isDisposed = true;
+    }
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs b/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
index 28d34d55e..9c4d40700 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
@@ -1,28 +1,27 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// MNK Beast Chakra types.
+/// </summary>
+public enum BeastChakra : byte
 {
     /// <summary>
-    /// MNK Beast Chakra types.
+    /// No card.
     /// </summary>
-    public enum BeastChakra : byte
-    {
-        /// <summary>
-        /// No card.
-        /// </summary>
-        NONE = 0,
+    NONE = 0,
 
-        /// <summary>
-        /// The Coeurl chakra.
-        /// </summary>
-        COEURL = 1,
+    /// <summary>
+    /// The Coeurl chakra.
+    /// </summary>
+    COEURL = 1,
 
-        /// <summary>
-        /// The Opo-Opo chakra.
-        /// </summary>
-        OPOOPO = 2,
+    /// <summary>
+    /// The Opo-Opo chakra.
+    /// </summary>
+    OPOOPO = 2,
 
-        /// <summary>
-        /// The Raptor chakra.
-        /// </summary>
-        RAPTOR = 3,
-    }
+    /// <summary>
+    /// The Raptor chakra.
+    /// </summary>
+    RAPTOR = 3,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs b/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs
index 02e064b12..1b367a93e 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs
@@ -1,53 +1,52 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// AST Arcanum (card) types.
+/// </summary>
+public enum CardType : byte
 {
     /// <summary>
-    /// AST Arcanum (card) types.
+    /// No card.
     /// </summary>
-    public enum CardType : byte
-    {
-        /// <summary>
-        /// No card.
-        /// </summary>
-        NONE = 0,
+    NONE = 0,
 
-        /// <summary>
-        /// The Balance card.
-        /// </summary>
-        BALANCE = 1,
+    /// <summary>
+    /// The Balance card.
+    /// </summary>
+    BALANCE = 1,
 
-        /// <summary>
-        /// The Bole card.
-        /// </summary>
-        BOLE = 2,
+    /// <summary>
+    /// The Bole card.
+    /// </summary>
+    BOLE = 2,
 
-        /// <summary>
-        /// The Arrow card.
-        /// </summary>
-        ARROW = 3,
+    /// <summary>
+    /// The Arrow card.
+    /// </summary>
+    ARROW = 3,
 
-        /// <summary>
-        /// The Spear card.
-        /// </summary>
-        SPEAR = 4,
+    /// <summary>
+    /// The Spear card.
+    /// </summary>
+    SPEAR = 4,
 
-        /// <summary>
-        /// The Ewer card.
-        /// </summary>
-        EWER = 5,
+    /// <summary>
+    /// The Ewer card.
+    /// </summary>
+    EWER = 5,
 
-        /// <summary>
-        /// The Spire card.
-        /// </summary>
-        SPIRE = 6,
+    /// <summary>
+    /// The Spire card.
+    /// </summary>
+    SPIRE = 6,
 
-        /// <summary>
-        /// The Lord of Crowns card.
-        /// </summary>
-        LORD = 0x70,
+    /// <summary>
+    /// The Lord of Crowns card.
+    /// </summary>
+    LORD = 0x70,
 
-        /// <summary>
-        /// The Lady of Crowns card.
-        /// </summary>
-        LADY = 0x80,
-    }
+    /// <summary>
+    /// The Lady of Crowns card.
+    /// </summary>
+    LADY = 0x80,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/DismissedFairy.cs b/Dalamud/Game/ClientState/JobGauge/Enums/DismissedFairy.cs
index 9083aad8a..b674d11b8 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/DismissedFairy.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/DismissedFairy.cs
@@ -1,18 +1,17 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// SCH Dismissed fairy types.
+/// </summary>
+public enum DismissedFairy : byte
 {
     /// <summary>
-    /// SCH Dismissed fairy types.
+    /// Dismissed fairy is Eos.
     /// </summary>
-    public enum DismissedFairy : byte
-    {
-        /// <summary>
-        /// Dismissed fairy is Eos.
-        /// </summary>
-        EOS = 6,
+    EOS = 6,
 
-        /// <summary>
-        /// Dismissed fairy is Selene.
-        /// </summary>
-        SELENE = 7,
-    }
+    /// <summary>
+    /// Dismissed fairy is Selene.
+    /// </summary>
+    SELENE = 7,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs
index 5f41dde48..e35dcc7f9 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs
@@ -1,33 +1,32 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// SAM Kaeshi types.
+/// </summary>
+public enum Kaeshi : byte
 {
     /// <summary>
-    /// SAM Kaeshi types.
+    /// No Kaeshi is active.
     /// </summary>
-    public enum Kaeshi : byte
-    {
-        /// <summary>
-        /// No Kaeshi is active.
-        /// </summary>
-        NONE = 0,
+    NONE = 0,
 
-        /// <summary>
-        /// Kaeshi: Higanbana type.
-        /// </summary>
-        HIGANBANA = 1,
+    /// <summary>
+    /// Kaeshi: Higanbana type.
+    /// </summary>
+    HIGANBANA = 1,
 
-        /// <summary>
-        /// Kaeshi: Goken type.
-        /// </summary>
-        GOKEN = 2,
+    /// <summary>
+    /// Kaeshi: Goken type.
+    /// </summary>
+    GOKEN = 2,
 
-        /// <summary>
-        /// Kaeshi: Setsugekka type.
-        /// </summary>
-        SETSUGEKKA = 3,
+    /// <summary>
+    /// Kaeshi: Setsugekka type.
+    /// </summary>
+    SETSUGEKKA = 3,
 
-        /// <summary>
-        /// Kaeshi: Namikiri type.
-        /// </summary>
-        NAMIKIRI = 4,
-    }
+    /// <summary>
+    /// Kaeshi: Namikiri type.
+    /// </summary>
+    NAMIKIRI = 4,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Mudras.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Mudras.cs
index 71449645f..31ee6dac1 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Mudras.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Mudras.cs
@@ -1,23 +1,22 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// NIN Mudra types.
+/// </summary>
+public enum Mudras : byte
 {
     /// <summary>
-    /// NIN Mudra types.
+    /// Ten mudra.
     /// </summary>
-    public enum Mudras : byte
-    {
-        /// <summary>
-        /// Ten mudra.
-        /// </summary>
-        TEN = 1,
+    TEN = 1,
 
-        /// <summary>
-        /// Chi mudra.
-        /// </summary>
-        CHI = 2,
+    /// <summary>
+    /// Chi mudra.
+    /// </summary>
+    CHI = 2,
 
-        /// <summary>
-        /// Jin mudra.
-        /// </summary>
-        JIN = 3,
-    }
+    /// <summary>
+    /// Jin mudra.
+    /// </summary>
+    JIN = 3,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
index f84a7e55e..159ecbb26 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
@@ -1,26 +1,25 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// MNK Nadi types.
+/// </summary>
+[Flags]
+public enum Nadi : byte
 {
     /// <summary>
-    /// MNK Nadi types.
+    /// No card.
     /// </summary>
-    [Flags]
-    public enum Nadi : byte
-    {
-        /// <summary>
-        /// No card.
-        /// </summary>
-        NONE = 0,
+    NONE = 0,
 
-        /// <summary>
-        /// The Lunar nadi.
-        /// </summary>
-        LUNAR = 2,
+    /// <summary>
+    /// The Lunar nadi.
+    /// </summary>
+    LUNAR = 2,
 
-        /// <summary>
-        /// The Solar nadi.
-        /// </summary>
-        SOLAR = 4,
-    }
+    /// <summary>
+    /// The Solar nadi.
+    /// </summary>
+    SOLAR = 4,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/PetGlam.cs b/Dalamud/Game/ClientState/JobGauge/Enums/PetGlam.cs
index 7aaaca908..248caa396 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/PetGlam.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/PetGlam.cs
@@ -1,48 +1,47 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// SMN summoned pet glam types.
+/// </summary>
+public enum PetGlam : byte
 {
     /// <summary>
-    /// SMN summoned pet glam types.
+    /// No pet glam.
     /// </summary>
-    public enum PetGlam : byte
-    {
-        /// <summary>
-        /// No pet glam.
-        /// </summary>
-        NONE = 0,
+    NONE = 0,
 
-        /// <summary>
-        /// Emerald carbuncle pet glam.
-        /// </summary>
-        EMERALD = 1,
+    /// <summary>
+    /// Emerald carbuncle pet glam.
+    /// </summary>
+    EMERALD = 1,
 
-        /// <summary>
-        /// Topaz carbuncle pet glam.
-        /// </summary>
-        TOPAZ = 2,
+    /// <summary>
+    /// Topaz carbuncle pet glam.
+    /// </summary>
+    TOPAZ = 2,
 
-        /// <summary>
-        /// Ruby carbuncle pet glam.
-        /// </summary>
-        RUBY = 3,
+    /// <summary>
+    /// Ruby carbuncle pet glam.
+    /// </summary>
+    RUBY = 3,
 
-        /// <summary>
-        /// Normal carbuncle pet glam.
-        /// </summary>
-        CARBUNCLE = 4,
+    /// <summary>
+    /// Normal carbuncle pet glam.
+    /// </summary>
+    CARBUNCLE = 4,
 
-        /// <summary>
-        /// Ifrit Egi pet glam.
-        /// </summary>
-        IFRIT = 5,
+    /// <summary>
+    /// Ifrit Egi pet glam.
+    /// </summary>
+    IFRIT = 5,
 
-        /// <summary>
-        /// Titan Egi pet glam.
-        /// </summary>
-        TITAN = 6,
+    /// <summary>
+    /// Titan Egi pet glam.
+    /// </summary>
+    TITAN = 6,
 
-        /// <summary>
-        /// Garuda Egi pet glam.
-        /// </summary>
-        GARUDA = 7,
-    }
+    /// <summary>
+    /// Garuda Egi pet glam.
+    /// </summary>
+    GARUDA = 7,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/SealType.cs b/Dalamud/Game/ClientState/JobGauge/Enums/SealType.cs
index 04440dcdc..eacef91fc 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/SealType.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/SealType.cs
@@ -1,28 +1,27 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// AST Divination seal types.
+/// </summary>
+public enum SealType : byte
 {
     /// <summary>
-    /// AST Divination seal types.
+    /// No seal.
     /// </summary>
-    public enum SealType : byte
-    {
-        /// <summary>
-        /// No seal.
-        /// </summary>
-        NONE = 0,
+    NONE = 0,
 
-        /// <summary>
-        /// Sun seal.
-        /// </summary>
-        SUN = 1,
+    /// <summary>
+    /// Sun seal.
+    /// </summary>
+    SUN = 1,
 
-        /// <summary>
-        /// Moon seal.
-        /// </summary>
-        MOON = 2,
+    /// <summary>
+    /// Moon seal.
+    /// </summary>
+    MOON = 2,
 
-        /// <summary>
-        /// Celestial seal.
-        /// </summary>
-        CELESTIAL = 3,
-    }
+    /// <summary>
+    /// Celestial seal.
+    /// </summary>
+    CELESTIAL = 3,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Sen.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Sen.cs
index de9e01fc4..bdd98b750 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Sen.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Sen.cs
@@ -1,31 +1,30 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// Samurai Sen types.
+/// </summary>
+[Flags]
+public enum Sen : byte
 {
     /// <summary>
-    /// Samurai Sen types.
+    /// No Sen.
     /// </summary>
-    [Flags]
-    public enum Sen : byte
-    {
-        /// <summary>
-        /// No Sen.
-        /// </summary>
-        NONE = 0,
+    NONE = 0,
 
-        /// <summary>
-        /// Setsu Sen type.
-        /// </summary>
-        SETSU = 1 << 0,
+    /// <summary>
+    /// Setsu Sen type.
+    /// </summary>
+    SETSU = 1 << 0,
 
-        /// <summary>
-        /// Getsu Sen type.
-        /// </summary>
-        GETSU = 1 << 1,
+    /// <summary>
+    /// Getsu Sen type.
+    /// </summary>
+    GETSU = 1 << 1,
 
-        /// <summary>
-        /// Ka Sen type.
-        /// </summary>
-        KA = 1 << 2,
-    }
+    /// <summary>
+    /// Ka Sen type.
+    /// </summary>
+    KA = 1 << 2,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Song.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Song.cs
index b2440640e..c23fbbbff 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Song.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Song.cs
@@ -1,28 +1,27 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// BRD Song types.
+/// </summary>
+public enum Song : byte
 {
     /// <summary>
-    /// BRD Song types.
+    /// No song is active type.
     /// </summary>
-    public enum Song : byte
-    {
-        /// <summary>
-        /// No song is active type.
-        /// </summary>
-        NONE = 0,
+    NONE = 0,
 
-        /// <summary>
-        /// Mage's Ballad type.
-        /// </summary>
-        MAGE = 1,
+    /// <summary>
+    /// Mage's Ballad type.
+    /// </summary>
+    MAGE = 1,
 
-        /// <summary>
-        /// Army's Paeon type.
-        /// </summary>
-        ARMY = 2,
+    /// <summary>
+    /// Army's Paeon type.
+    /// </summary>
+    ARMY = 2,
 
-        /// <summary>
-        /// The Wanderer's Minuet type.
-        /// </summary>
-        WANDERER = 3,
-    }
+    /// <summary>
+    /// The Wanderer's Minuet type.
+    /// </summary>
+    WANDERER = 3,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/SummonPet.cs b/Dalamud/Game/ClientState/JobGauge/Enums/SummonPet.cs
index aa7e7c8a2..30cc0fff0 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/SummonPet.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/SummonPet.cs
@@ -1,18 +1,17 @@
-namespace Dalamud.Game.ClientState.JobGauge.Enums
+namespace Dalamud.Game.ClientState.JobGauge.Enums;
+
+/// <summary>
+/// SMN summoned pet types.
+/// </summary>
+public enum SummonPet : byte
 {
     /// <summary>
-    /// SMN summoned pet types.
+    /// No pet.
     /// </summary>
-    public enum SummonPet : byte
-    {
-        /// <summary>
-        /// No pet.
-        /// </summary>
-        NONE = 0,
+    NONE = 0,
 
-        /// <summary>
-        /// The summoned pet Carbuncle.
-        /// </summary>
-        CARBUNCLE = 23,
-    }
+    /// <summary>
+    /// The summoned pet Carbuncle.
+    /// </summary>
+    CARBUNCLE = 23,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/JobGauges.cs b/Dalamud/Game/ClientState/JobGauge/JobGauges.cs
index aab5d4991..bf5c4b525 100644
--- a/Dalamud/Game/ClientState/JobGauge/JobGauges.cs
+++ b/Dalamud/Game/ClientState/JobGauge/JobGauges.cs
@@ -7,46 +7,45 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.ClientState.JobGauge
+namespace Dalamud.Game.ClientState.JobGauge;
+
+/// <summary>
+/// This class converts in-memory Job gauge data to structs.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public class JobGauges : IServiceType
 {
-    /// <summary>
-    /// This class converts in-memory Job gauge data to structs.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public class JobGauges : IServiceType
+    private Dictionary<Type, JobGaugeBase> cache = new();
+
+    [ServiceManager.ServiceConstructor]
+    private JobGauges(ClientState clientState)
     {
-        private Dictionary<Type, JobGaugeBase> cache = new();
+        this.Address = clientState.AddressResolver.JobGaugeData;
 
-        [ServiceManager.ServiceConstructor]
-        private JobGauges(ClientState clientState)
+        Log.Verbose($"JobGaugeData address 0x{this.Address.ToInt64():X}");
+    }
+
+    /// <summary>
+    /// Gets the address of the JobGauge data.
+    /// </summary>
+    public IntPtr Address { get; }
+
+    /// <summary>
+    /// Get the JobGauge for a given job.
+    /// </summary>
+    /// <typeparam name="T">A JobGauge struct from ClientState.Structs.JobGauge.</typeparam>
+    /// <returns>A JobGauge.</returns>
+    public T Get<T>() where T : JobGaugeBase
+    {
+        // This is cached to mitigate the effects of using activator for instantiation.
+        // Since the gauge itself reads from live memory, there isn't much downside to doing this.
+        if (!this.cache.TryGetValue(typeof(T), out var gauge))
         {
-            this.Address = clientState.AddressResolver.JobGaugeData;
-
-            Log.Verbose($"JobGaugeData address 0x{this.Address.ToInt64():X}");
+            gauge = this.cache[typeof(T)] = (T)Activator.CreateInstance(typeof(T), BindingFlags.NonPublic | BindingFlags.Instance, null, new object[] { this.Address }, null);
         }
 
-        /// <summary>
-        /// Gets the address of the JobGauge data.
-        /// </summary>
-        public IntPtr Address { get; }
-
-        /// <summary>
-        /// Get the JobGauge for a given job.
-        /// </summary>
-        /// <typeparam name="T">A JobGauge struct from ClientState.Structs.JobGauge.</typeparam>
-        /// <returns>A JobGauge.</returns>
-        public T Get<T>() where T : JobGaugeBase
-        {
-            // This is cached to mitigate the effects of using activator for instantiation.
-            // Since the gauge itself reads from live memory, there isn't much downside to doing this.
-            if (!this.cache.TryGetValue(typeof(T), out var gauge))
-            {
-                gauge = this.cache[typeof(T)] = (T)Activator.CreateInstance(typeof(T), BindingFlags.NonPublic | BindingFlags.Instance, null, new object[] { this.Address }, null);
-            }
-
-            return (T)gauge;
-        }
+        return (T)gauge;
     }
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs
index cb8ed1eb0..4549ff9c9 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/ASTGauge.cs
@@ -3,44 +3,43 @@ using System.Linq;
 
 using Dalamud.Game.ClientState.JobGauge.Enums;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory AST job gauge.
+/// </summary>
+public unsafe class ASTGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.AstrologianGauge>
 {
     /// <summary>
-    /// In-memory AST job gauge.
+    /// Initializes a new instance of the <see cref="ASTGauge"/> class.
     /// </summary>
-    public unsafe class ASTGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.AstrologianGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal ASTGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ASTGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal ASTGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the currently drawn <see cref="CardType"/>.
-        /// </summary>
-        /// <returns>Currently drawn <see cref="CardType"/>.</returns>
-        public CardType DrawnCard => (CardType)(this.Struct->Card & 0xF);
-
-        /// <summary>
-        /// Gets the currently drawn crown <see cref="CardType"/>.
-        /// </summary>
-        /// <returns>Currently drawn crown <see cref="CardType"/>.</returns>
-        public CardType DrawnCrownCard => this.Struct->Card - this.DrawnCard;
-
-        /// <summary>
-        /// Gets the <see cref="SealType"/>s currently active.
-        /// </summary>
-        public SealType[] Seals => this.Struct->CurrentSeals.Select(seal => (SealType)seal).ToArray();
-
-        /// <summary>
-        /// Check if a <see cref="SealType"/> is currently active on the divination gauge.
-        /// </summary>
-        /// <param name="seal">The <see cref="SealType"/> to check for.</param>
-        /// <returns>If the given Seal is currently divined.</returns>
-        public unsafe bool ContainsSeal(SealType seal) => this.Seals.Contains(seal);
     }
+
+    /// <summary>
+    /// Gets the currently drawn <see cref="CardType"/>.
+    /// </summary>
+    /// <returns>Currently drawn <see cref="CardType"/>.</returns>
+    public CardType DrawnCard => (CardType)(this.Struct->Card & 0xF);
+
+    /// <summary>
+    /// Gets the currently drawn crown <see cref="CardType"/>.
+    /// </summary>
+    /// <returns>Currently drawn crown <see cref="CardType"/>.</returns>
+    public CardType DrawnCrownCard => this.Struct->Card - this.DrawnCard;
+
+    /// <summary>
+    /// Gets the <see cref="SealType"/>s currently active.
+    /// </summary>
+    public SealType[] Seals => this.Struct->CurrentSeals.Select(seal => (SealType)seal).ToArray();
+
+    /// <summary>
+    /// Check if a <see cref="SealType"/> is currently active on the divination gauge.
+    /// </summary>
+    /// <param name="seal">The <see cref="SealType"/> to check for.</param>
+    /// <returns>If the given Seal is currently divined.</returns>
+    public unsafe bool ContainsSeal(SealType seal) => this.Seals.Contains(seal);
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
index e195225d8..4ed8eabe4 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/BLMGauge.cs
@@ -1,73 +1,72 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory BLM job gauge.
+/// </summary>
+public unsafe class BLMGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.BlackMageGauge>
 {
     /// <summary>
-    /// In-memory BLM job gauge.
+    /// Initializes a new instance of the <see cref="BLMGauge"/> class.
     /// </summary>
-    public unsafe class BLMGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.BlackMageGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal BLMGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BLMGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal BLMGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the time remaining for the Enochian time in milliseconds.
-        /// </summary>
-        public short EnochianTimer => this.Struct->EnochianTimer;
-
-        /// <summary>
-        /// Gets the time remaining for Astral Fire or Umbral Ice in milliseconds.
-        /// </summary>
-        public short ElementTimeRemaining => this.Struct->ElementTimeRemaining;
-
-        /// <summary>
-        /// Gets the number of Polyglot stacks remaining.
-        /// </summary>
-        public byte PolyglotStacks => this.Struct->PolyglotStacks;
-
-        /// <summary>
-        /// Gets the number of Umbral Hearts remaining.
-        /// </summary>
-        public byte UmbralHearts => this.Struct->UmbralHearts;
-
-        /// <summary>
-        /// Gets the amount of Umbral Ice stacks.
-        /// </summary>
-        public byte UmbralIceStacks => (byte)(this.InUmbralIce ? -this.Struct->ElementStance : 0);
-
-        /// <summary>
-        /// Gets the amount of Astral Fire stacks.
-        /// </summary>
-        public byte AstralFireStacks => (byte)(this.InAstralFire ? this.Struct->ElementStance : 0);
-
-        /// <summary>
-        /// Gets a value indicating whether or not the player is in Umbral Ice.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool InUmbralIce => this.Struct->ElementStance < 0;
-
-        /// <summary>
-        /// Gets a value indicating whether or not the player is in Astral fire.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool InAstralFire => this.Struct->ElementStance > 0;
-
-        /// <summary>
-        /// Gets a value indicating whether or not Enochian is active.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsEnochianActive => this.Struct->EnochianActive;
-
-        /// <summary>
-        /// Gets a value indicating whether Paradox is active.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsParadoxActive => this.Struct->ParadoxActive;
     }
+
+    /// <summary>
+    /// Gets the time remaining for the Enochian time in milliseconds.
+    /// </summary>
+    public short EnochianTimer => this.Struct->EnochianTimer;
+
+    /// <summary>
+    /// Gets the time remaining for Astral Fire or Umbral Ice in milliseconds.
+    /// </summary>
+    public short ElementTimeRemaining => this.Struct->ElementTimeRemaining;
+
+    /// <summary>
+    /// Gets the number of Polyglot stacks remaining.
+    /// </summary>
+    public byte PolyglotStacks => this.Struct->PolyglotStacks;
+
+    /// <summary>
+    /// Gets the number of Umbral Hearts remaining.
+    /// </summary>
+    public byte UmbralHearts => this.Struct->UmbralHearts;
+
+    /// <summary>
+    /// Gets the amount of Umbral Ice stacks.
+    /// </summary>
+    public byte UmbralIceStacks => (byte)(this.InUmbralIce ? -this.Struct->ElementStance : 0);
+
+    /// <summary>
+    /// Gets the amount of Astral Fire stacks.
+    /// </summary>
+    public byte AstralFireStacks => (byte)(this.InAstralFire ? this.Struct->ElementStance : 0);
+
+    /// <summary>
+    /// Gets a value indicating whether or not the player is in Umbral Ice.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool InUmbralIce => this.Struct->ElementStance < 0;
+
+    /// <summary>
+    /// Gets a value indicating whether or not the player is in Astral fire.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool InAstralFire => this.Struct->ElementStance > 0;
+
+    /// <summary>
+    /// Gets a value indicating whether or not Enochian is active.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsEnochianActive => this.Struct->EnochianActive;
+
+    /// <summary>
+    /// Gets a value indicating whether Paradox is active.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsParadoxActive => this.Struct->ParadoxActive;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/BRDGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/BRDGauge.cs
index 006ee907b..1a7f7bd47 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/BRDGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/BRDGauge.cs
@@ -3,94 +3,93 @@ using System;
 using Dalamud.Game.ClientState.JobGauge.Enums;
 using FFXIVClientStructs.FFXIV.Client.Game.Gauge;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory BRD job gauge.
+/// </summary>
+public unsafe class BRDGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.BardGauge>
 {
     /// <summary>
-    /// In-memory BRD job gauge.
+    /// Initializes a new instance of the <see cref="BRDGauge"/> class.
     /// </summary>
-    public unsafe class BRDGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.BardGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal BRDGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BRDGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal BRDGauge(IntPtr address)
-            : base(address)
+    }
+
+    /// <summary>
+    /// Gets the current song timer in milliseconds.
+    /// </summary>
+    public ushort SongTimer => this.Struct->SongTimer;
+
+    /// <summary>
+    /// Gets the amount of Repertoire accumulated.
+    /// </summary>
+    public byte Repertoire => this.Struct->Repertoire;
+
+    /// <summary>
+    /// Gets the amount of Soul Voice accumulated.
+    /// </summary>
+    public byte SoulVoice => this.Struct->SoulVoice;
+
+    /// <summary>
+    /// Gets the type of song that is active.
+    /// </summary>
+    public Song Song
+    {
+        get
         {
+            if (this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuet))
+                return Song.WANDERER;
+
+            if (this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeon))
+                return Song.ARMY;
+
+            if (this.Struct->SongFlags.HasFlag(SongFlags.MagesBallad))
+                return Song.MAGE;
+
+            return Song.NONE;
         }
+    }
 
-        /// <summary>
-        /// Gets the current song timer in milliseconds.
-        /// </summary>
-        public ushort SongTimer => this.Struct->SongTimer;
-
-        /// <summary>
-        /// Gets the amount of Repertoire accumulated.
-        /// </summary>
-        public byte Repertoire => this.Struct->Repertoire;
-
-        /// <summary>
-        /// Gets the amount of Soul Voice accumulated.
-        /// </summary>
-        public byte SoulVoice => this.Struct->SoulVoice;
-
-        /// <summary>
-        /// Gets the type of song that is active.
-        /// </summary>
-        public Song Song
+    /// <summary>
+    /// Gets the type of song that was last played.
+    /// </summary>
+    public Song LastSong
+    {
+        get
         {
-            get
-            {
-                if (this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuet))
-                    return Song.WANDERER;
+            if (this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuetLastPlayed))
+                return Song.WANDERER;
 
-                if (this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeon))
-                    return Song.ARMY;
+            if (this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeonLastPlayed))
+                return Song.ARMY;
 
-                if (this.Struct->SongFlags.HasFlag(SongFlags.MagesBallad))
-                    return Song.MAGE;
+            if (this.Struct->SongFlags.HasFlag(SongFlags.MagesBalladLastPlayed))
+                return Song.MAGE;
 
-                return Song.NONE;
-            }
+            return Song.NONE;
         }
+    }
 
-        /// <summary>
-        /// Gets the type of song that was last played.
-        /// </summary>
-        public Song LastSong
+    /// <summary>
+    /// Gets the song Coda that are currently active.
+    /// </summary>
+    /// <remarks>
+    /// This will always return an array of size 3, inactive Coda are represented by <see cref="Song.NONE"/>.
+    /// </remarks>
+    public Song[] Coda
+    {
+        get
         {
-            get
+            return new[]
             {
-                if (this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuetLastPlayed))
-                    return Song.WANDERER;
-
-                if (this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeonLastPlayed))
-                    return Song.ARMY;
-
-                if (this.Struct->SongFlags.HasFlag(SongFlags.MagesBalladLastPlayed))
-                    return Song.MAGE;
-
-                return Song.NONE;
-            }
-        }
-
-        /// <summary>
-        /// Gets the song Coda that are currently active.
-        /// </summary>
-        /// <remarks>
-        /// This will always return an array of size 3, inactive Coda are represented by <see cref="Song.NONE"/>.
-        /// </remarks>
-        public Song[] Coda
-        {
-            get
-            {
-                return new[]
-                {
-                    this.Struct->SongFlags.HasFlag(SongFlags.MagesBalladCoda) ? Song.MAGE : Song.NONE,
-                    this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeonCoda) ? Song.ARMY : Song.NONE,
-                    this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuetCoda) ? Song.WANDERER : Song.NONE,
-                };
-            }
+                this.Struct->SongFlags.HasFlag(SongFlags.MagesBalladCoda) ? Song.MAGE : Song.NONE,
+                this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeonCoda) ? Song.ARMY : Song.NONE,
+                this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuetCoda) ? Song.WANDERER : Song.NONE,
+            };
         }
     }
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/DNCGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/DNCGauge.cs
index 7ae2b7bca..455c5bca0 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/DNCGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/DNCGauge.cs
@@ -1,60 +1,59 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory DNC job gauge.
+/// </summary>
+public unsafe class DNCGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.DancerGauge>
 {
     /// <summary>
-    /// In-memory DNC job gauge.
+    /// Initializes a new instance of the <see cref="DNCGauge"/> class.
     /// </summary>
-    public unsafe class DNCGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.DancerGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal DNCGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DNCGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal DNCGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the number of feathers available.
-        /// </summary>
-        public byte Feathers => this.Struct->Feathers;
-
-        /// <summary>
-        /// Gets the amount of Espirit available.
-        /// </summary>
-        public byte Esprit => this.Struct->Esprit;
-
-        /// <summary>
-        /// Gets the number of steps completed for the current dance.
-        /// </summary>
-        public byte CompletedSteps => this.Struct->StepIndex;
-
-        /// <summary>
-        /// Gets all the steps in the current dance.
-        /// </summary>
-        public unsafe uint[] Steps
-        {
-            get
-            {
-                var arr = new uint[4];
-                for (var i = 0; i < 4; i++)
-                    arr[i] = this.Struct->DanceSteps[i] + 15999u - 1;
-                return arr;
-            }
-        }
-
-        /// <summary>
-        /// Gets the next step in the current dance.
-        /// </summary>
-        /// <returns>The next dance step action ID.</returns>
-        public uint NextStep => 15999u + this.Struct->DanceSteps[this.Struct->StepIndex] - 1;
-
-        /// <summary>
-        /// Gets a value indicating whether the player is dancing or not.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsDancing => this.Struct->DanceSteps[0] != 0;
     }
+
+    /// <summary>
+    /// Gets the number of feathers available.
+    /// </summary>
+    public byte Feathers => this.Struct->Feathers;
+
+    /// <summary>
+    /// Gets the amount of Espirit available.
+    /// </summary>
+    public byte Esprit => this.Struct->Esprit;
+
+    /// <summary>
+    /// Gets the number of steps completed for the current dance.
+    /// </summary>
+    public byte CompletedSteps => this.Struct->StepIndex;
+
+    /// <summary>
+    /// Gets all the steps in the current dance.
+    /// </summary>
+    public unsafe uint[] Steps
+    {
+        get
+        {
+            var arr = new uint[4];
+            for (var i = 0; i < 4; i++)
+                arr[i] = this.Struct->DanceSteps[i] + 15999u - 1;
+            return arr;
+        }
+    }
+
+    /// <summary>
+    /// Gets the next step in the current dance.
+    /// </summary>
+    /// <returns>The next dance step action ID.</returns>
+    public uint NextStep => 15999u + this.Struct->DanceSteps[this.Struct->StepIndex] - 1;
+
+    /// <summary>
+    /// Gets a value indicating whether the player is dancing or not.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsDancing => this.Struct->DanceSteps[0] != 0;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/DRGGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/DRGGauge.cs
index 1003d2cd5..39e39b41b 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/DRGGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/DRGGauge.cs
@@ -1,39 +1,38 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory DRG job gauge.
+/// </summary>
+public unsafe class DRGGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.DragoonGauge>
 {
     /// <summary>
-    /// In-memory DRG job gauge.
+    /// Initializes a new instance of the <see cref="DRGGauge"/> class.
     /// </summary>
-    public unsafe class DRGGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.DragoonGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal DRGGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DRGGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal DRGGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the time remaining for Life of the Dragon in milliseconds.
-        /// </summary>
-        public short LOTDTimer => this.Struct->LotdTimer;
-
-        /// <summary>
-        /// Gets a value indicating whether Life of the Dragon is active.
-        /// </summary>
-        public bool IsLOTDActive => this.Struct->LotdState == 2;
-
-        /// <summary>
-        /// Gets the count of eyes opened during Blood of the Dragon.
-        /// </summary>
-        public byte EyeCount => this.Struct->EyeCount;
-
-        /// <summary>
-        /// Gets the amount of Firstminds' Focus available.
-        /// </summary>
-        public byte FirstmindsFocusCount => this.Struct->FirstmindsFocusCount;
     }
+
+    /// <summary>
+    /// Gets the time remaining for Life of the Dragon in milliseconds.
+    /// </summary>
+    public short LOTDTimer => this.Struct->LotdTimer;
+
+    /// <summary>
+    /// Gets a value indicating whether Life of the Dragon is active.
+    /// </summary>
+    public bool IsLOTDActive => this.Struct->LotdState == 2;
+
+    /// <summary>
+    /// Gets the count of eyes opened during Blood of the Dragon.
+    /// </summary>
+    public byte EyeCount => this.Struct->EyeCount;
+
+    /// <summary>
+    /// Gets the amount of Firstminds' Focus available.
+    /// </summary>
+    public byte FirstmindsFocusCount => this.Struct->FirstmindsFocusCount;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/DRKGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/DRKGauge.cs
index d903c0f68..25a245ac6 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/DRKGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/DRKGauge.cs
@@ -1,40 +1,39 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory DRK job gauge.
+/// </summary>
+public unsafe class DRKGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.DarkKnightGauge>
 {
     /// <summary>
-    /// In-memory DRK job gauge.
+    /// Initializes a new instance of the <see cref="DRKGauge"/> class.
     /// </summary>
-    public unsafe class DRKGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.DarkKnightGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal DRKGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DRKGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal DRKGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the amount of blood accumulated.
-        /// </summary>
-        public byte Blood => this.Struct->Blood;
-
-        /// <summary>
-        /// Gets the Darkside time remaining in milliseconds.
-        /// </summary>
-        public ushort DarksideTimeRemaining => this.Struct->DarksideTimer;
-
-        /// <summary>
-        /// Gets the Shadow time remaining in milliseconds.
-        /// </summary>
-        public ushort ShadowTimeRemaining => this.Struct->ShadowTimer;
-
-        /// <summary>
-        /// Gets a value indicating whether the player has Dark Arts or not.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool HasDarkArts => this.Struct->DarkArtsState > 0;
     }
+
+    /// <summary>
+    /// Gets the amount of blood accumulated.
+    /// </summary>
+    public byte Blood => this.Struct->Blood;
+
+    /// <summary>
+    /// Gets the Darkside time remaining in milliseconds.
+    /// </summary>
+    public ushort DarksideTimeRemaining => this.Struct->DarksideTimer;
+
+    /// <summary>
+    /// Gets the Shadow time remaining in milliseconds.
+    /// </summary>
+    public ushort ShadowTimeRemaining => this.Struct->ShadowTimer;
+
+    /// <summary>
+    /// Gets a value indicating whether the player has Dark Arts or not.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool HasDarkArts => this.Struct->DarkArtsState > 0;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/GNBGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/GNBGauge.cs
index dc934d8f4..4acc9a712 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/GNBGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/GNBGauge.cs
@@ -1,34 +1,33 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory GNB job gauge.
+/// </summary>
+public unsafe class GNBGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.GunbreakerGauge>
 {
     /// <summary>
-    /// In-memory GNB job gauge.
+    /// Initializes a new instance of the <see cref="GNBGauge"/> class.
     /// </summary>
-    public unsafe class GNBGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.GunbreakerGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal GNBGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GNBGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal GNBGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the amount of ammo available.
-        /// </summary>
-        public byte Ammo => this.Struct->Ammo;
-
-        /// <summary>
-        /// Gets the max combo time of the Gnashing Fang combo.
-        /// </summary>
-        public short MaxTimerDuration => this.Struct->MaxTimerDuration;
-
-        /// <summary>
-        /// Gets the current step of the Gnashing Fang combo.
-        /// </summary>
-        public byte AmmoComboStep => this.Struct->AmmoComboStep;
     }
+
+    /// <summary>
+    /// Gets the amount of ammo available.
+    /// </summary>
+    public byte Ammo => this.Struct->Ammo;
+
+    /// <summary>
+    /// Gets the max combo time of the Gnashing Fang combo.
+    /// </summary>
+    public short MaxTimerDuration => this.Struct->MaxTimerDuration;
+
+    /// <summary>
+    /// Gets the current step of the Gnashing Fang combo.
+    /// </summary>
+    public byte AmmoComboStep => this.Struct->AmmoComboStep;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/JobGaugeBase.cs b/Dalamud/Game/ClientState/JobGauge/Types/JobGaugeBase.cs
index 0160a9a87..09280cf7c 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/JobGaugeBase.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/JobGaugeBase.cs
@@ -1,24 +1,23 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// Base job gauge class.
+/// </summary>
+public abstract unsafe class JobGaugeBase
 {
     /// <summary>
-    /// Base job gauge class.
+    /// Initializes a new instance of the <see cref="JobGaugeBase"/> class.
     /// </summary>
-    public abstract unsafe class JobGaugeBase
+    /// <param name="address">Address of the job gauge.</param>
+    internal JobGaugeBase(IntPtr address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JobGaugeBase"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal JobGaugeBase(IntPtr address)
-        {
-            this.Address = address;
-        }
-
-        /// <summary>
-        /// Gets the address of this job gauge in memory.
-        /// </summary>
-        public IntPtr Address { get; }
+        this.Address = address;
     }
+
+    /// <summary>
+    /// Gets the address of this job gauge in memory.
+    /// </summary>
+    public IntPtr Address { get; }
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/JobGaugeBase{T}.cs b/Dalamud/Game/ClientState/JobGauge/Types/JobGaugeBase{T}.cs
index 0dc494d8b..dbe107d2c 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/JobGaugeBase{T}.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/JobGaugeBase{T}.cs
@@ -1,25 +1,24 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// Base job gauge class.
+/// </summary>
+/// <typeparam name="T">The underlying FFXIVClientStructs type.</typeparam>
+public unsafe class JobGaugeBase<T> : JobGaugeBase where T : unmanaged
 {
     /// <summary>
-    /// Base job gauge class.
+    /// Initializes a new instance of the <see cref="JobGaugeBase{T}"/> class.
     /// </summary>
-    /// <typeparam name="T">The underlying FFXIVClientStructs type.</typeparam>
-    public unsafe class JobGaugeBase<T> : JobGaugeBase where T : unmanaged
+    /// <param name="address">Address of the job gauge.</param>
+    internal JobGaugeBase(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JobGaugeBase{T}"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal JobGaugeBase(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets an unsafe struct pointer of this job gauge.
-        /// </summary>
-        private protected T* Struct => (T*)this.Address;
     }
+
+    /// <summary>
+    /// Gets an unsafe struct pointer of this job gauge.
+    /// </summary>
+    private protected T* Struct => (T*)this.Address;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/MCHGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/MCHGauge.cs
index 1971137a5..76e3b00c4 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/MCHGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/MCHGauge.cs
@@ -1,56 +1,55 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory MCH job gauge.
+/// </summary>
+public unsafe class MCHGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.MachinistGauge>
 {
     /// <summary>
-    /// In-memory MCH job gauge.
+    /// Initializes a new instance of the <see cref="MCHGauge"/> class.
     /// </summary>
-    public unsafe class MCHGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.MachinistGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal MCHGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MCHGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal MCHGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the time time remaining for Overheat in milliseconds.
-        /// </summary>
-        public short OverheatTimeRemaining => this.Struct->OverheatTimeRemaining;
-
-        /// <summary>
-        /// Gets the time remaining for the Rook or Queen in milliseconds.
-        /// </summary>
-        public short SummonTimeRemaining => this.Struct->SummonTimeRemaining;
-
-        /// <summary>
-        /// Gets the current Heat level.
-        /// </summary>
-        public byte Heat => this.Struct->Heat;
-
-        /// <summary>
-        /// Gets the current Battery level.
-        /// </summary>
-        public byte Battery => this.Struct->Battery;
-
-        /// <summary>
-        /// Gets the battery level of the last summon (robot).
-        /// </summary>
-        public byte LastSummonBatteryPower => this.Struct->LastSummonBatteryPower;
-
-        /// <summary>
-        /// Gets a value indicating whether the player is currently Overheated.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsOverheated => (this.Struct->TimerActive & 1) != 0;
-
-        /// <summary>
-        /// Gets a value indicating whether the player has an active Robot.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsRobotActive => (this.Struct->TimerActive & 2) != 0;
     }
+
+    /// <summary>
+    /// Gets the time time remaining for Overheat in milliseconds.
+    /// </summary>
+    public short OverheatTimeRemaining => this.Struct->OverheatTimeRemaining;
+
+    /// <summary>
+    /// Gets the time remaining for the Rook or Queen in milliseconds.
+    /// </summary>
+    public short SummonTimeRemaining => this.Struct->SummonTimeRemaining;
+
+    /// <summary>
+    /// Gets the current Heat level.
+    /// </summary>
+    public byte Heat => this.Struct->Heat;
+
+    /// <summary>
+    /// Gets the current Battery level.
+    /// </summary>
+    public byte Battery => this.Struct->Battery;
+
+    /// <summary>
+    /// Gets the battery level of the last summon (robot).
+    /// </summary>
+    public byte LastSummonBatteryPower => this.Struct->LastSummonBatteryPower;
+
+    /// <summary>
+    /// Gets a value indicating whether the player is currently Overheated.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsOverheated => (this.Struct->TimerActive & 1) != 0;
+
+    /// <summary>
+    /// Gets a value indicating whether the player has an active Robot.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsRobotActive => (this.Struct->TimerActive & 2) != 0;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
index 752e0dc42..4f572a7c4 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
@@ -3,43 +3,42 @@ using System.Linq;
 
 using Dalamud.Game.ClientState.JobGauge.Enums;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory MNK job gauge.
+/// </summary>
+public unsafe class MNKGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.MonkGauge>
 {
     /// <summary>
-    /// In-memory MNK job gauge.
+    /// Initializes a new instance of the <see cref="MNKGauge"/> class.
     /// </summary>
-    public unsafe class MNKGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.MonkGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal MNKGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MNKGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal MNKGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the amount of Chakra available.
-        /// </summary>
-        public byte Chakra => this.Struct->Chakra;
-
-        /// <summary>
-        /// Gets the types of Beast Chakra available.
-        /// </summary>
-        /// <remarks>
-        /// This will always return an array of size 3, inactive Beast Chakra are represented by <see cref="BeastChakra.NONE"/>.
-        /// </remarks>
-        public BeastChakra[] BeastChakra => this.Struct->BeastChakra.Select(c => (BeastChakra)c).ToArray();
-
-        /// <summary>
-        /// Gets the types of Nadi available.
-        /// </summary>
-        public Nadi Nadi => (Nadi)this.Struct->Nadi;
-
-        /// <summary>
-        /// Gets the time remaining that Blitz is active.
-        /// </summary>
-        public ushort BlitzTimeRemaining => this.Struct->BlitzTimeRemaining;
     }
+
+    /// <summary>
+    /// Gets the amount of Chakra available.
+    /// </summary>
+    public byte Chakra => this.Struct->Chakra;
+
+    /// <summary>
+    /// Gets the types of Beast Chakra available.
+    /// </summary>
+    /// <remarks>
+    /// This will always return an array of size 3, inactive Beast Chakra are represented by <see cref="BeastChakra.NONE"/>.
+    /// </remarks>
+    public BeastChakra[] BeastChakra => this.Struct->BeastChakra.Select(c => (BeastChakra)c).ToArray();
+
+    /// <summary>
+    /// Gets the types of Nadi available.
+    /// </summary>
+    public Nadi Nadi => (Nadi)this.Struct->Nadi;
+
+    /// <summary>
+    /// Gets the time remaining that Blitz is active.
+    /// </summary>
+    public ushort BlitzTimeRemaining => this.Struct->BlitzTimeRemaining;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/NINGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/NINGauge.cs
index 40bf64d4a..998ee10a4 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/NINGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/NINGauge.cs
@@ -1,34 +1,33 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory NIN job gauge.
+/// </summary>
+public unsafe class NINGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.NinjaGauge>
 {
     /// <summary>
-    /// In-memory NIN job gauge.
+    /// Initializes a new instance of the <see cref="NINGauge"/> class.
     /// </summary>
-    public unsafe class NINGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.NinjaGauge>
+    /// <param name="address">The address of the gauge.</param>
+    internal NINGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NINGauge"/> class.
-        /// </summary>
-        /// <param name="address">The address of the gauge.</param>
-        internal NINGauge(IntPtr address)
-                : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the time left on Huton in milliseconds.
-        /// </summary>
-        public int HutonTimer => this.Struct->HutonTimer;
-
-        /// <summary>
-        /// Gets the amount of Ninki available.
-        /// </summary>
-        public byte Ninki => this.Struct->Ninki;
-
-        /// <summary>
-        /// Gets the number of times Huton has been cast manually.
-        /// </summary>
-        public byte HutonManualCasts => this.Struct->HutonManualCasts;
     }
+
+    /// <summary>
+    /// Gets the time left on Huton in milliseconds.
+    /// </summary>
+    public int HutonTimer => this.Struct->HutonTimer;
+
+    /// <summary>
+    /// Gets the amount of Ninki available.
+    /// </summary>
+    public byte Ninki => this.Struct->Ninki;
+
+    /// <summary>
+    /// Gets the number of times Huton has been cast manually.
+    /// </summary>
+    public byte HutonManualCasts => this.Struct->HutonManualCasts;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/PLDGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/PLDGauge.cs
index d610515e1..8998200c2 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/PLDGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/PLDGauge.cs
@@ -1,24 +1,23 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory PLD job gauge.
+/// </summary>
+public unsafe class PLDGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.PaladinGauge>
 {
     /// <summary>
-    /// In-memory PLD job gauge.
+    /// Initializes a new instance of the <see cref="PLDGauge"/> class.
     /// </summary>
-    public unsafe class PLDGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.PaladinGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal PLDGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PLDGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal PLDGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the current level of the Oath gauge.
-        /// </summary>
-        public byte OathGauge => this.Struct->OathGauge;
     }
+
+    /// <summary>
+    /// Gets the current level of the Oath gauge.
+    /// </summary>
+    public byte OathGauge => this.Struct->OathGauge;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/RDMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/RDMGauge.cs
index af16ee031..0b10a2b4d 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/RDMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/RDMGauge.cs
@@ -1,34 +1,33 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory RDM job gauge.
+/// </summary>
+public unsafe class RDMGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.RedMageGauge>
 {
     /// <summary>
-    /// In-memory RDM job gauge.
+    /// Initializes a new instance of the <see cref="RDMGauge"/> class.
     /// </summary>
-    public unsafe class RDMGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.RedMageGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal RDMGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RDMGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal RDMGauge(IntPtr address)
-                : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the level of the White gauge.
-        /// </summary>
-        public byte WhiteMana => this.Struct->WhiteMana;
-
-        /// <summary>
-        /// Gets the level of the Black gauge.
-        /// </summary>
-        public byte BlackMana => this.Struct->BlackMana;
-
-        /// <summary>
-        /// Gets the amount of mana stacks.
-        /// </summary>
-        public byte ManaStacks => this.Struct->ManaStacks;
     }
+
+    /// <summary>
+    /// Gets the level of the White gauge.
+    /// </summary>
+    public byte WhiteMana => this.Struct->WhiteMana;
+
+    /// <summary>
+    /// Gets the level of the Black gauge.
+    /// </summary>
+    public byte BlackMana => this.Struct->BlackMana;
+
+    /// <summary>
+    /// Gets the amount of mana stacks.
+    /// </summary>
+    public byte ManaStacks => this.Struct->ManaStacks;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs
index f08d0bbe0..7ddafcc4c 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/RPRGauge.cs
@@ -1,44 +1,43 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory RPR job gauge.
+/// </summary>
+public unsafe class RPRGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.ReaperGauge>
 {
     /// <summary>
-    /// In-memory RPR job gauge.
+    /// Initializes a new instance of the <see cref="RPRGauge"/> class.
     /// </summary>
-    public unsafe class RPRGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.ReaperGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal RPRGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RPRGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal RPRGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the amount of Soul available.
-        /// </summary>
-        public byte Soul => this.Struct->Soul;
-
-        /// <summary>
-        /// Gets the amount of Shroud available.
-        /// </summary>
-        public byte Shroud => this.Struct->Shroud;
-
-        /// <summary>
-        /// Gets the time remaining that Enshrouded is active.
-        /// </summary>
-        public ushort EnshroudedTimeRemaining => this.Struct->EnshroudedTimeRemaining;
-
-        /// <summary>
-        /// Gets the amount of Lemure Shroud available.
-        /// </summary>
-        public byte LemureShroud => this.Struct->LemureShroud;
-
-        /// <summary>
-        /// Gets the amount of Void Shroud available.
-        /// </summary>
-        public byte VoidShroud => this.Struct->VoidShroud;
     }
+
+    /// <summary>
+    /// Gets the amount of Soul available.
+    /// </summary>
+    public byte Soul => this.Struct->Soul;
+
+    /// <summary>
+    /// Gets the amount of Shroud available.
+    /// </summary>
+    public byte Shroud => this.Struct->Shroud;
+
+    /// <summary>
+    /// Gets the time remaining that Enshrouded is active.
+    /// </summary>
+    public ushort EnshroudedTimeRemaining => this.Struct->EnshroudedTimeRemaining;
+
+    /// <summary>
+    /// Gets the amount of Lemure Shroud available.
+    /// </summary>
+    public byte LemureShroud => this.Struct->LemureShroud;
+
+    /// <summary>
+    /// Gets the amount of Void Shroud available.
+    /// </summary>
+    public byte VoidShroud => this.Struct->VoidShroud;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs
index 242e3f9f0..4d4c2d397 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs
@@ -2,58 +2,57 @@ using System;
 
 using Dalamud.Game.ClientState.JobGauge.Enums;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory SAM job gauge.
+/// </summary>
+public unsafe class SAMGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.SamuraiGauge>
 {
     /// <summary>
-    /// In-memory SAM job gauge.
+    /// Initializes a new instance of the <see cref="SAMGauge"/> class.
     /// </summary>
-    public unsafe class SAMGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.SamuraiGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal SAMGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SAMGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal SAMGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the currently active Kaeshi ability.
-        /// </summary>
-        public Kaeshi Kaeshi => (Kaeshi)this.Struct->Kaeshi;
-
-        /// <summary>
-        /// Gets the current amount of Kenki available.
-        /// </summary>
-        public byte Kenki => this.Struct->Kenki;
-
-        /// <summary>
-        /// Gets the amount of Meditation stacks.
-        /// </summary>
-        public byte MeditationStacks => this.Struct->MeditationStacks;
-
-        /// <summary>
-        /// Gets the active Sen.
-        /// </summary>
-        public Sen Sen => (Sen)this.Struct->SenFlags;
-
-        /// <summary>
-        /// Gets a value indicating whether the Setsu Sen is active.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool HasSetsu => (this.Sen & Sen.SETSU) != 0;
-
-        /// <summary>
-        /// Gets a value indicating whether the Getsu Sen is active.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool HasGetsu => (this.Sen & Sen.GETSU) != 0;
-
-        /// <summary>
-        /// Gets a value indicating whether the Ka Sen is active.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool HasKa => (this.Sen & Sen.KA) != 0;
     }
+
+    /// <summary>
+    /// Gets the currently active Kaeshi ability.
+    /// </summary>
+    public Kaeshi Kaeshi => (Kaeshi)this.Struct->Kaeshi;
+
+    /// <summary>
+    /// Gets the current amount of Kenki available.
+    /// </summary>
+    public byte Kenki => this.Struct->Kenki;
+
+    /// <summary>
+    /// Gets the amount of Meditation stacks.
+    /// </summary>
+    public byte MeditationStacks => this.Struct->MeditationStacks;
+
+    /// <summary>
+    /// Gets the active Sen.
+    /// </summary>
+    public Sen Sen => (Sen)this.Struct->SenFlags;
+
+    /// <summary>
+    /// Gets a value indicating whether the Setsu Sen is active.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool HasSetsu => (this.Sen & Sen.SETSU) != 0;
+
+    /// <summary>
+    /// Gets a value indicating whether the Getsu Sen is active.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool HasGetsu => (this.Sen & Sen.GETSU) != 0;
+
+    /// <summary>
+    /// Gets a value indicating whether the Ka Sen is active.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool HasKa => (this.Sen & Sen.KA) != 0;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/SCHGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/SCHGauge.cs
index cadeeb0ba..ae8c87f3a 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/SCHGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/SCHGauge.cs
@@ -2,40 +2,39 @@ using System;
 
 using Dalamud.Game.ClientState.JobGauge.Enums;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory SCH job gauge.
+/// </summary>
+public unsafe class SCHGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.ScholarGauge>
 {
     /// <summary>
-    /// In-memory SCH job gauge.
+    /// Initializes a new instance of the <see cref="SCHGauge"/> class.
     /// </summary>
-    public unsafe class SCHGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.ScholarGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal SCHGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SCHGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal SCHGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the amount of Aetherflow stacks available.
-        /// </summary>
-        public byte Aetherflow => this.Struct->Aetherflow;
-
-        /// <summary>
-        /// Gets the current level of the Fairy Gauge.
-        /// </summary>
-        public byte FairyGauge => this.Struct->FairyGauge;
-
-        /// <summary>
-        /// Gets the remaining time Seraph is active in milliseconds.
-        /// </summary>
-        public short SeraphTimer => this.Struct->SeraphTimer;
-
-        /// <summary>
-        /// Gets the last dismissed fairy.
-        /// </summary>
-        public DismissedFairy DismissedFairy => (DismissedFairy)this.Struct->DismissedFairy;
     }
+
+    /// <summary>
+    /// Gets the amount of Aetherflow stacks available.
+    /// </summary>
+    public byte Aetherflow => this.Struct->Aetherflow;
+
+    /// <summary>
+    /// Gets the current level of the Fairy Gauge.
+    /// </summary>
+    public byte FairyGauge => this.Struct->FairyGauge;
+
+    /// <summary>
+    /// Gets the remaining time Seraph is active in milliseconds.
+    /// </summary>
+    public short SeraphTimer => this.Struct->SeraphTimer;
+
+    /// <summary>
+    /// Gets the last dismissed fairy.
+    /// </summary>
+    public DismissedFairy DismissedFairy => (DismissedFairy)this.Struct->DismissedFairy;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/SGEGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/SGEGauge.cs
index e1a09bf7b..4775809c1 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/SGEGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/SGEGauge.cs
@@ -1,40 +1,39 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory SGE job gauge.
+/// </summary>
+public unsafe class SGEGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.SageGauge>
 {
     /// <summary>
-    /// In-memory SGE job gauge.
+    /// Initializes a new instance of the <see cref="SGEGauge"/> class.
     /// </summary>
-    public unsafe class SGEGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.SageGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal SGEGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SGEGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal SGEGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the amount of milliseconds elapsed until the next Addersgall is available.
-        /// This counts from 0 to 20_000.
-        /// </summary>
-        public short AddersgallTimer => this.Struct->AddersgallTimer;
-
-        /// <summary>
-        /// Gets the amount of Addersgall available.
-        /// </summary>
-        public byte Addersgall => this.Struct->Addersgall;
-
-        /// <summary>
-        /// Gets the amount of Addersting available.
-        /// </summary>
-        public byte Addersting => this.Struct->Addersting;
-
-        /// <summary>
-        /// Gets a value indicating whether Eukrasia is activated.
-        /// </summary>
-        public bool Eukrasia => this.Struct->Eukrasia == 1;
     }
+
+    /// <summary>
+    /// Gets the amount of milliseconds elapsed until the next Addersgall is available.
+    /// This counts from 0 to 20_000.
+    /// </summary>
+    public short AddersgallTimer => this.Struct->AddersgallTimer;
+
+    /// <summary>
+    /// Gets the amount of Addersgall available.
+    /// </summary>
+    public byte Addersgall => this.Struct->Addersgall;
+
+    /// <summary>
+    /// Gets the amount of Addersting available.
+    /// </summary>
+    public byte Addersting => this.Struct->Addersting;
+
+    /// <summary>
+    /// Gets a value indicating whether Eukrasia is activated.
+    /// </summary>
+    public bool Eukrasia => this.Struct->Eukrasia == 1;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/SMNGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/SMNGauge.cs
index c567c590b..6b03a4c6e 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/SMNGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/SMNGauge.cs
@@ -3,112 +3,111 @@ using System;
 using Dalamud.Game.ClientState.JobGauge.Enums;
 using FFXIVClientStructs.FFXIV.Client.Game.Gauge;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory SMN job gauge.
+/// </summary>
+public unsafe class SMNGauge : JobGaugeBase<SummonerGauge>
 {
     /// <summary>
-    /// In-memory SMN job gauge.
+    /// Initializes a new instance of the <see cref="SMNGauge"/> class.
     /// </summary>
-    public unsafe class SMNGauge : JobGaugeBase<SummonerGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal SMNGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SMNGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal SMNGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the time remaining for the current summon.
-        /// </summary>
-        public ushort SummonTimerRemaining => this.Struct->SummonTimer;
-
-        /// <summary>
-        /// Gets the time remaining for the current attunement.
-        /// </summary>
-        public ushort AttunmentTimerRemaining => this.Struct->AttunementTimer;
-
-        /// <summary>
-        /// Gets the summon that will return after the current summon expires.
-        /// This maps to the <see cref="Lumina.Excel.GeneratedSheets.Pet"/> sheet.
-        /// </summary>
-        public SummonPet ReturnSummon => (SummonPet)this.Struct->ReturnSummon;
-
-        /// <summary>
-        /// Gets the summon glam for the <see cref="ReturnSummon"/>.
-        /// This maps to the <see cref="Lumina.Excel.GeneratedSheets.PetMirage"/> sheet.
-        /// </summary>
-        public PetGlam ReturnSummonGlam => (PetGlam)this.Struct->ReturnSummonGlam;
-
-        /// <summary>
-        /// Gets the amount of aspected Attunment remaining.
-        /// </summary>
-        public byte Attunement => this.Struct->Attunement;
-
-        /// <summary>
-        /// Gets the current aether flags.
-        /// Use the summon accessors instead.
-        /// </summary>
-        public AetherFlags AetherFlags => this.Struct->AetherFlags;
-
-        /// <summary>
-        /// Gets a value indicating whether Bahamut is ready to be summoned.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsBahamutReady => !this.AetherFlags.HasFlag(AetherFlags.PhoenixReady);
-
-        /// <summary>
-        /// Gets a value indicating whether if Phoenix is ready to be summoned.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsPhoenixReady => this.AetherFlags.HasFlag(AetherFlags.PhoenixReady);
-
-        /// <summary>
-        /// Gets a value indicating whether if Ifrit is ready to be summoned.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsIfritReady => this.AetherFlags.HasFlag(AetherFlags.IfritReady);
-
-        /// <summary>
-        /// Gets a value indicating whether if Titan is ready to be summoned.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsTitanReady => this.AetherFlags.HasFlag(AetherFlags.TitanReady);
-
-        /// <summary>
-        /// Gets a value indicating whether if Garuda is ready to be summoned.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsGarudaReady => this.AetherFlags.HasFlag(AetherFlags.GarudaReady);
-
-        /// <summary>
-        /// Gets a value indicating whether if Ifrit is currently attuned.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsIfritAttuned => this.AetherFlags.HasFlag(AetherFlags.IfritAttuned) && !this.AetherFlags.HasFlag(AetherFlags.GarudaAttuned);
-
-        /// <summary>
-        /// Gets a value indicating whether if Titan is currently attuned.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsTitanAttuned => this.AetherFlags.HasFlag(AetherFlags.TitanAttuned) && !this.AetherFlags.HasFlag(AetherFlags.GarudaAttuned);
-
-        /// <summary>
-        /// Gets a value indicating whether if Garuda is currently attuned.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool IsGarudaAttuned => this.AetherFlags.HasFlag(AetherFlags.GarudaAttuned);
-
-        /// <summary>
-        /// Gets a value indicating whether there are any Aetherflow stacks available.
-        /// </summary>
-        /// <returns><c>true</c> or <c>false</c>.</returns>
-        public bool HasAetherflowStacks => this.AetherflowStacks > 0;
-
-        /// <summary>
-        /// Gets the amount of Aetherflow available.
-        /// </summary>
-        public byte AetherflowStacks => (byte)(this.AetherFlags & AetherFlags.Aetherflow);
     }
+
+    /// <summary>
+    /// Gets the time remaining for the current summon.
+    /// </summary>
+    public ushort SummonTimerRemaining => this.Struct->SummonTimer;
+
+    /// <summary>
+    /// Gets the time remaining for the current attunement.
+    /// </summary>
+    public ushort AttunmentTimerRemaining => this.Struct->AttunementTimer;
+
+    /// <summary>
+    /// Gets the summon that will return after the current summon expires.
+    /// This maps to the <see cref="Lumina.Excel.GeneratedSheets.Pet"/> sheet.
+    /// </summary>
+    public SummonPet ReturnSummon => (SummonPet)this.Struct->ReturnSummon;
+
+    /// <summary>
+    /// Gets the summon glam for the <see cref="ReturnSummon"/>.
+    /// This maps to the <see cref="Lumina.Excel.GeneratedSheets.PetMirage"/> sheet.
+    /// </summary>
+    public PetGlam ReturnSummonGlam => (PetGlam)this.Struct->ReturnSummonGlam;
+
+    /// <summary>
+    /// Gets the amount of aspected Attunment remaining.
+    /// </summary>
+    public byte Attunement => this.Struct->Attunement;
+
+    /// <summary>
+    /// Gets the current aether flags.
+    /// Use the summon accessors instead.
+    /// </summary>
+    public AetherFlags AetherFlags => this.Struct->AetherFlags;
+
+    /// <summary>
+    /// Gets a value indicating whether Bahamut is ready to be summoned.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsBahamutReady => !this.AetherFlags.HasFlag(AetherFlags.PhoenixReady);
+
+    /// <summary>
+    /// Gets a value indicating whether if Phoenix is ready to be summoned.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsPhoenixReady => this.AetherFlags.HasFlag(AetherFlags.PhoenixReady);
+
+    /// <summary>
+    /// Gets a value indicating whether if Ifrit is ready to be summoned.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsIfritReady => this.AetherFlags.HasFlag(AetherFlags.IfritReady);
+
+    /// <summary>
+    /// Gets a value indicating whether if Titan is ready to be summoned.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsTitanReady => this.AetherFlags.HasFlag(AetherFlags.TitanReady);
+
+    /// <summary>
+    /// Gets a value indicating whether if Garuda is ready to be summoned.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsGarudaReady => this.AetherFlags.HasFlag(AetherFlags.GarudaReady);
+
+    /// <summary>
+    /// Gets a value indicating whether if Ifrit is currently attuned.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsIfritAttuned => this.AetherFlags.HasFlag(AetherFlags.IfritAttuned) && !this.AetherFlags.HasFlag(AetherFlags.GarudaAttuned);
+
+    /// <summary>
+    /// Gets a value indicating whether if Titan is currently attuned.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsTitanAttuned => this.AetherFlags.HasFlag(AetherFlags.TitanAttuned) && !this.AetherFlags.HasFlag(AetherFlags.GarudaAttuned);
+
+    /// <summary>
+    /// Gets a value indicating whether if Garuda is currently attuned.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool IsGarudaAttuned => this.AetherFlags.HasFlag(AetherFlags.GarudaAttuned);
+
+    /// <summary>
+    /// Gets a value indicating whether there are any Aetherflow stacks available.
+    /// </summary>
+    /// <returns><c>true</c> or <c>false</c>.</returns>
+    public bool HasAetherflowStacks => this.AetherflowStacks > 0;
+
+    /// <summary>
+    /// Gets the amount of Aetherflow available.
+    /// </summary>
+    public byte AetherflowStacks => (byte)(this.AetherFlags & AetherFlags.Aetherflow);
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/WARGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/WARGauge.cs
index 484ac83a8..2a50e9d24 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/WARGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/WARGauge.cs
@@ -1,24 +1,23 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory WAR job gauge.
+/// </summary>
+public unsafe class WARGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.WarriorGauge>
 {
     /// <summary>
-    /// In-memory WAR job gauge.
+    /// Initializes a new instance of the <see cref="WARGauge"/> class.
     /// </summary>
-    public unsafe class WARGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.WarriorGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal WARGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WARGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal WARGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the amount of wrath in the Beast gauge.
-        /// </summary>
-        public byte BeastGauge => this.Struct->BeastGauge;
     }
+
+    /// <summary>
+    /// Gets the amount of wrath in the Beast gauge.
+    /// </summary>
+    public byte BeastGauge => this.Struct->BeastGauge;
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/WHMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/WHMGauge.cs
index f3933a5aa..afe19f59d 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/WHMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/WHMGauge.cs
@@ -1,34 +1,33 @@
 using System;
 
-namespace Dalamud.Game.ClientState.JobGauge.Types
+namespace Dalamud.Game.ClientState.JobGauge.Types;
+
+/// <summary>
+/// In-memory WHM job gauge.
+/// </summary>
+public unsafe class WHMGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.WhiteMageGauge>
 {
     /// <summary>
-    /// In-memory WHM job gauge.
+    /// Initializes a new instance of the <see cref="WHMGauge"/> class.
     /// </summary>
-    public unsafe class WHMGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game.Gauge.WhiteMageGauge>
+    /// <param name="address">Address of the job gauge.</param>
+    internal WHMGauge(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WHMGauge"/> class.
-        /// </summary>
-        /// <param name="address">Address of the job gauge.</param>
-        internal WHMGauge(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the time to next lily in milliseconds.
-        /// </summary>
-        public short LilyTimer => this.Struct->LilyTimer;
-
-        /// <summary>
-        /// Gets the number of Lilies.
-        /// </summary>
-        public byte Lily => this.Struct->Lily;
-
-        /// <summary>
-        /// Gets the number of times the blood lily has been nourished.
-        /// </summary>
-        public byte BloodLily => this.Struct->BloodLily;
     }
+
+    /// <summary>
+    /// Gets the time to next lily in milliseconds.
+    /// </summary>
+    public short LilyTimer => this.Struct->LilyTimer;
+
+    /// <summary>
+    /// Gets the number of Lilies.
+    /// </summary>
+    public byte Lily => this.Struct->Lily;
+
+    /// <summary>
+    /// Gets the number of times the blood lily has been nourished.
+    /// </summary>
+    public byte BloodLily => this.Struct->BloodLily;
 }
diff --git a/Dalamud/Game/ClientState/Keys/KeyState.cs b/Dalamud/Game/ClientState/Keys/KeyState.cs
index 953f01f75..685973e17 100644
--- a/Dalamud/Game/ClientState/Keys/KeyState.cs
+++ b/Dalamud/Game/ClientState/Keys/KeyState.cs
@@ -6,153 +6,152 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.ClientState.Keys
+namespace Dalamud.Game.ClientState.Keys;
+
+/// <summary>
+/// Wrapper around the game keystate buffer, which contains the pressed state for all keyboard keys, indexed by virtual vkCode.
+/// </summary>
+/// <remarks>
+/// The stored key state is actually a combination field, however the below ephemeral states are consumed each frame. Setting
+/// the value may be mildly useful, however retrieving the value is largely pointless. In testing, it wasn't possible without
+/// setting the statue manually.
+/// index &amp; 0 = key pressed.
+/// index &amp; 1 = key down (ephemeral).
+/// index &amp; 2 = key up (ephemeral).
+/// index &amp; 3 = short key press (ephemeral).
+/// </remarks>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public class KeyState : IServiceType
 {
-    /// <summary>
-    /// Wrapper around the game keystate buffer, which contains the pressed state for all keyboard keys, indexed by virtual vkCode.
-    /// </summary>
-    /// <remarks>
-    /// The stored key state is actually a combination field, however the below ephemeral states are consumed each frame. Setting
-    /// the value may be mildly useful, however retrieving the value is largely pointless. In testing, it wasn't possible without
-    /// setting the statue manually.
-    /// index &amp; 0 = key pressed.
-    /// index &amp; 1 = key down (ephemeral).
-    /// index &amp; 2 = key up (ephemeral).
-    /// index &amp; 3 = short key press (ephemeral).
-    /// </remarks>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public class KeyState : IServiceType
+    // The array is accessed in a way that this limit doesn't appear to exist
+    // but there is other state data past this point, and keys beyond here aren't
+    // generally valid for most things anyway
+    private const int MaxKeyCode = 0xF0;
+    private readonly IntPtr bufferBase;
+    private readonly IntPtr indexBase;
+    private VirtualKey[] validVirtualKeyCache = null;
+
+    [ServiceManager.ServiceConstructor]
+    private KeyState(SigScanner sigScanner, ClientState clientState)
     {
-        // The array is accessed in a way that this limit doesn't appear to exist
-        // but there is other state data past this point, and keys beyond here aren't
-        // generally valid for most things anyway
-        private const int MaxKeyCode = 0xF0;
-        private readonly IntPtr bufferBase;
-        private readonly IntPtr indexBase;
-        private VirtualKey[] validVirtualKeyCache = null;
+        var moduleBaseAddress = sigScanner.Module.BaseAddress;
+        var addressResolver = clientState.AddressResolver;
+        this.bufferBase = moduleBaseAddress + Marshal.ReadInt32(addressResolver.KeyboardState);
+        this.indexBase = moduleBaseAddress + Marshal.ReadInt32(addressResolver.KeyboardStateIndexArray);
 
-        [ServiceManager.ServiceConstructor]
-        private KeyState(SigScanner sigScanner, ClientState clientState)
+        Log.Verbose($"Keyboard state buffer address 0x{this.bufferBase.ToInt64():X}");
+    }
+
+    /// <summary>
+    /// Get or set the key-pressed state for a given vkCode.
+    /// </summary>
+    /// <param name="vkCode">The virtual key to change.</param>
+    /// <returns>Whether the specified key is currently pressed.</returns>
+    /// <exception cref="ArgumentException">If the vkCode is not valid. Refer to <see cref="IsVirtualKeyValid(int)"/> or <see cref="GetValidVirtualKeys"/>.</exception>
+    /// <exception cref="ArgumentOutOfRangeException">If the set value is non-zero.</exception>
+    public unsafe bool this[int vkCode]
+    {
+        get => this.GetRawValue(vkCode) != 0;
+        set => this.SetRawValue(vkCode, value ? 1 : 0);
+    }
+
+    /// <inheritdoc cref="this[int]"/>
+    public bool this[VirtualKey vkCode]
+    {
+        get => this[(int)vkCode];
+        set => this[(int)vkCode] = value;
+    }
+
+    /// <summary>
+    /// Gets the value in the index array.
+    /// </summary>
+    /// <param name="vkCode">The virtual key to change.</param>
+    /// <returns>The raw value stored in the index array.</returns>
+    /// <exception cref="ArgumentException">If the vkCode is not valid. Refer to <see cref="IsVirtualKeyValid(int)"/> or <see cref="GetValidVirtualKeys"/>.</exception>
+    public int GetRawValue(int vkCode)
+        => this.GetRefValue(vkCode);
+
+    /// <inheritdoc cref="GetRawValue(int)"/>
+    public int GetRawValue(VirtualKey vkCode)
+        => this.GetRawValue((int)vkCode);
+
+    /// <summary>
+    /// Sets the value in the index array.
+    /// </summary>
+    /// <param name="vkCode">The virtual key to change.</param>
+    /// <param name="value">The raw value to set in the index array.</param>
+    /// <exception cref="ArgumentException">If the vkCode is not valid. Refer to <see cref="IsVirtualKeyValid(int)"/> or <see cref="GetValidVirtualKeys"/>.</exception>
+    /// <exception cref="ArgumentOutOfRangeException">If the set value is non-zero.</exception>
+    public void SetRawValue(int vkCode, int value)
+    {
+        if (value != 0)
+            throw new ArgumentOutOfRangeException(nameof(value), "Dalamud does not support pressing keys, only preventing them via zero or False. If you have a valid use-case for this, please contact the dev team.");
+
+        this.GetRefValue(vkCode) = value;
+    }
+
+    /// <inheritdoc cref="SetRawValue(int, int)"/>
+    public void SetRawValue(VirtualKey vkCode, int value)
+        => this.SetRawValue((int)vkCode, value);
+
+    /// <summary>
+    /// Gets a value indicating whether the given VirtualKey code is regarded as valid input by the game.
+    /// </summary>
+    /// <param name="vkCode">Virtual key code.</param>
+    /// <returns>If the code is valid.</returns>
+    public bool IsVirtualKeyValid(int vkCode)
+        => this.ConvertVirtualKey(vkCode) != 0;
+
+    /// <inheritdoc cref="IsVirtualKeyValid(int)"/>
+    public bool IsVirtualKeyValid(VirtualKey vkCode)
+        => this.IsVirtualKeyValid((int)vkCode);
+
+    /// <summary>
+    /// Gets an array of virtual keys the game considers valid input.
+    /// </summary>
+    /// <returns>An array of valid virtual keys.</returns>
+    public VirtualKey[] GetValidVirtualKeys()
+        => this.validVirtualKeyCache ??= Enum.GetValues<VirtualKey>().Where(vk => this.IsVirtualKeyValid(vk)).ToArray();
+
+    /// <summary>
+    /// Clears the pressed state for all keys.
+    /// </summary>
+    public void ClearAll()
+    {
+        foreach (var vk in this.GetValidVirtualKeys())
         {
-            var moduleBaseAddress = sigScanner.Module.BaseAddress;
-            var addressResolver = clientState.AddressResolver;
-            this.bufferBase = moduleBaseAddress + Marshal.ReadInt32(addressResolver.KeyboardState);
-            this.indexBase = moduleBaseAddress + Marshal.ReadInt32(addressResolver.KeyboardStateIndexArray);
-
-            Log.Verbose($"Keyboard state buffer address 0x{this.bufferBase.ToInt64():X}");
-        }
-
-        /// <summary>
-        /// Get or set the key-pressed state for a given vkCode.
-        /// </summary>
-        /// <param name="vkCode">The virtual key to change.</param>
-        /// <returns>Whether the specified key is currently pressed.</returns>
-        /// <exception cref="ArgumentException">If the vkCode is not valid. Refer to <see cref="IsVirtualKeyValid(int)"/> or <see cref="GetValidVirtualKeys"/>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException">If the set value is non-zero.</exception>
-        public unsafe bool this[int vkCode]
-        {
-            get => this.GetRawValue(vkCode) != 0;
-            set => this.SetRawValue(vkCode, value ? 1 : 0);
-        }
-
-        /// <inheritdoc cref="this[int]"/>
-        public bool this[VirtualKey vkCode]
-        {
-            get => this[(int)vkCode];
-            set => this[(int)vkCode] = value;
-        }
-
-        /// <summary>
-        /// Gets the value in the index array.
-        /// </summary>
-        /// <param name="vkCode">The virtual key to change.</param>
-        /// <returns>The raw value stored in the index array.</returns>
-        /// <exception cref="ArgumentException">If the vkCode is not valid. Refer to <see cref="IsVirtualKeyValid(int)"/> or <see cref="GetValidVirtualKeys"/>.</exception>
-        public int GetRawValue(int vkCode)
-            => this.GetRefValue(vkCode);
-
-        /// <inheritdoc cref="GetRawValue(int)"/>
-        public int GetRawValue(VirtualKey vkCode)
-            => this.GetRawValue((int)vkCode);
-
-        /// <summary>
-        /// Sets the value in the index array.
-        /// </summary>
-        /// <param name="vkCode">The virtual key to change.</param>
-        /// <param name="value">The raw value to set in the index array.</param>
-        /// <exception cref="ArgumentException">If the vkCode is not valid. Refer to <see cref="IsVirtualKeyValid(int)"/> or <see cref="GetValidVirtualKeys"/>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException">If the set value is non-zero.</exception>
-        public void SetRawValue(int vkCode, int value)
-        {
-            if (value != 0)
-                throw new ArgumentOutOfRangeException(nameof(value), "Dalamud does not support pressing keys, only preventing them via zero or False. If you have a valid use-case for this, please contact the dev team.");
-
-            this.GetRefValue(vkCode) = value;
-        }
-
-        /// <inheritdoc cref="SetRawValue(int, int)"/>
-        public void SetRawValue(VirtualKey vkCode, int value)
-            => this.SetRawValue((int)vkCode, value);
-
-        /// <summary>
-        /// Gets a value indicating whether the given VirtualKey code is regarded as valid input by the game.
-        /// </summary>
-        /// <param name="vkCode">Virtual key code.</param>
-        /// <returns>If the code is valid.</returns>
-        public bool IsVirtualKeyValid(int vkCode)
-            => this.ConvertVirtualKey(vkCode) != 0;
-
-        /// <inheritdoc cref="IsVirtualKeyValid(int)"/>
-        public bool IsVirtualKeyValid(VirtualKey vkCode)
-            => this.IsVirtualKeyValid((int)vkCode);
-
-        /// <summary>
-        /// Gets an array of virtual keys the game considers valid input.
-        /// </summary>
-        /// <returns>An array of valid virtual keys.</returns>
-        public VirtualKey[] GetValidVirtualKeys()
-            => this.validVirtualKeyCache ??= Enum.GetValues<VirtualKey>().Where(vk => this.IsVirtualKeyValid(vk)).ToArray();
-
-        /// <summary>
-        /// Clears the pressed state for all keys.
-        /// </summary>
-        public void ClearAll()
-        {
-            foreach (var vk in this.GetValidVirtualKeys())
-            {
-                this[vk] = false;
-            }
-        }
-
-        /// <summary>
-        /// Converts a virtual key into the equivalent value that the game uses.
-        /// Valid values are non-zero.
-        /// </summary>
-        /// <param name="vkCode">Virtual key.</param>
-        /// <returns>Converted value.</returns>
-        private unsafe byte ConvertVirtualKey(int vkCode)
-        {
-            if (vkCode <= 0 || vkCode >= MaxKeyCode)
-                return 0;
-
-            return *(byte*)(this.indexBase + vkCode);
-        }
-
-        /// <summary>
-        /// Gets the raw value from the key state array.
-        /// </summary>
-        /// <param name="vkCode">Virtual key code.</param>
-        /// <returns>A reference to the indexed array.</returns>
-        private unsafe ref int GetRefValue(int vkCode)
-        {
-            vkCode = this.ConvertVirtualKey(vkCode);
-
-            if (vkCode == 0)
-                throw new ArgumentException($"Keycode state is only valid for certain values. Reference GetValidVirtualKeys for help.");
-
-            return ref *(int*)(this.bufferBase + (4 * vkCode));
+            this[vk] = false;
         }
     }
+
+    /// <summary>
+    /// Converts a virtual key into the equivalent value that the game uses.
+    /// Valid values are non-zero.
+    /// </summary>
+    /// <param name="vkCode">Virtual key.</param>
+    /// <returns>Converted value.</returns>
+    private unsafe byte ConvertVirtualKey(int vkCode)
+    {
+        if (vkCode <= 0 || vkCode >= MaxKeyCode)
+            return 0;
+
+        return *(byte*)(this.indexBase + vkCode);
+    }
+
+    /// <summary>
+    /// Gets the raw value from the key state array.
+    /// </summary>
+    /// <param name="vkCode">Virtual key code.</param>
+    /// <returns>A reference to the indexed array.</returns>
+    private unsafe ref int GetRefValue(int vkCode)
+    {
+        vkCode = this.ConvertVirtualKey(vkCode);
+
+        if (vkCode == 0)
+            throw new ArgumentException($"Keycode state is only valid for certain values. Reference GetValidVirtualKeys for help.");
+
+        return ref *(int*)(this.bufferBase + (4 * vkCode));
+    }
 }
diff --git a/Dalamud/Game/ClientState/Keys/VirtualKey.cs b/Dalamud/Game/ClientState/Keys/VirtualKey.cs
index dd9009601..bcd410f17 100644
--- a/Dalamud/Game/ClientState/Keys/VirtualKey.cs
+++ b/Dalamud/Game/ClientState/Keys/VirtualKey.cs
@@ -1,1247 +1,1246 @@
-namespace Dalamud.Game.ClientState.Keys
+namespace Dalamud.Game.ClientState.Keys;
+
+/// <summary>
+/// Virtual-key codes.
+/// </summary>
+/// <remarks>
+/// Defined in winuser.h from Windows SDK v6.1.
+/// </remarks>
+public enum VirtualKey : ushort
 {
     /// <summary>
-    /// Virtual-key codes.
+    /// This is an addendum to use on functions in which you have to pass a zero value to represent no key code.
+    /// </summary>
+    [VirtualKey("No key")]
+    NO_KEY = 0,
+
+    /// <summary>
+    /// Left mouse button.
+    /// </summary>
+    [VirtualKey("Left mouse button")]
+    LBUTTON = 1,
+
+    /// <summary>
+    /// Right mouse button.
+    /// </summary>
+    [VirtualKey("Right mouse button")]
+    RBUTTON = 2,
+
+    /// <summary>
+    /// Control-break processing.
+    /// </summary>
+    [VirtualKey("CANCEL")]
+    CANCEL = 3,
+
+    /// <summary>
+    /// Middle mouse button (three-button mouse).
     /// </summary>
     /// <remarks>
-    /// Defined in winuser.h from Windows SDK v6.1.
+    /// NOT contiguous with L and R buttons.
     /// </remarks>
-    public enum VirtualKey : ushort
-    {
-        /// <summary>
-        /// This is an addendum to use on functions in which you have to pass a zero value to represent no key code.
-        /// </summary>
-        [VirtualKey("No key")]
-        NO_KEY = 0,
-
-        /// <summary>
-        /// Left mouse button.
-        /// </summary>
-        [VirtualKey("Left mouse button")]
-        LBUTTON = 1,
-
-        /// <summary>
-        /// Right mouse button.
-        /// </summary>
-        [VirtualKey("Right mouse button")]
-        RBUTTON = 2,
-
-        /// <summary>
-        /// Control-break processing.
-        /// </summary>
-        [VirtualKey("CANCEL")]
-        CANCEL = 3,
-
-        /// <summary>
-        /// Middle mouse button (three-button mouse).
-        /// </summary>
-        /// <remarks>
-        /// NOT contiguous with L and R buttons.
-        /// </remarks>
-        [VirtualKey("Mouse 3")]
-        MBUTTON = 4,
-
-        /// <summary>
-        /// X1 mouse button.
-        /// </summary>
-
-        /// <remarks>
-        /// NOT contiguous with L and R buttons.
-        /// </remarks>
-        [VirtualKey("Mouse 4")]
-        XBUTTON1 = 5,
-
-        /// <summary>
-        /// X2 mouse button.
-        /// </summary>
-
-        /// <remarks>
-        /// NOT contiguous with L and R buttons.
-        /// </remarks>
-        [VirtualKey("Mouse 5")]
-        XBUTTON2 = 6,
-
-        /// <summary>
-        /// BACKSPACE key.
-        /// </summary>
-        [VirtualKey("Backspace")]
-        BACK = 8,
-
-        /// <summary>
-        /// TAB key.
-        /// </summary>
-        [VirtualKey("Tab")]
-        TAB = 9,
-
-        /// <summary>
-        /// CLEAR key.
-        /// </summary>
-        [VirtualKey("Clear")]
-        CLEAR = 12,
-
-        /// <summary>
-        /// RETURN key.
-        /// </summary>
-        [VirtualKey("Return/Enter")]
-        RETURN = 13,
-
-        /// <summary>
-        /// SHIFT key.
-        /// </summary>
-        [VirtualKey("Shift")]
-        SHIFT = 16,
-
-        /// <summary>
-        /// CONTROL key.
-        /// </summary>
-        [VirtualKey("Control")]
-        CONTROL = 17,
-
-        /// <summary>
-        /// ALT key.
-        /// </summary>
-        [VirtualKey("Alt")]
-        MENU = 18,
-
-        /// <summary>
-        /// PAUSE key.
-        /// </summary>
-        [VirtualKey("Pause")]
-        PAUSE = 19,
-
-        /// <summary>
-        /// CAPS LOCK key.
-        /// </summary>
-        [VirtualKey("Caps Lock")]
-        CAPITAL = 20,
-
-        /// <summary>
-        /// IME Kana mode.
-        /// </summary>
-        [VirtualKey("Kana Key")]
-        KANA = 21,
-
-        /// <summary>
-        /// IME Hangeul mode (maintained for compatibility; use User32.VirtualKey.HANGUL).
-        /// </summary>
-        [VirtualKey("Hangul Key")]
-        HANGEUL = KANA,
-
-        /// <summary>
-        /// IME Hangul mode.
-        /// </summary>
-        [VirtualKey("Hangul Key 2")]
-        HANGUL = KANA,
-
-        /// <summary>
-        /// IME Junja mode.
-        /// </summary>
-        [VirtualKey("Junja Key")]
-        JUNJA = 23,
-
-        /// <summary>
-        /// IME final mode.
-        /// </summary>
-        [VirtualKey("Final Key")]
-        FINAL = 24,
-
-        /// <summary>
-        /// IME Hanja mode.
-        /// </summary>
-        [VirtualKey("Hanja Key")]
-        HANJA = 25,
-
-        /// <summary>
-        /// IME Kanji mode.
-        /// </summary>
-        [VirtualKey("Kanji Key")]
-        KANJI = HANJA,
-
-        /// <summary>
-        /// ESC key.
-        /// </summary>
-        [VirtualKey("Escape")]
-        ESCAPE = 27,
-
-        /// <summary>
-        /// IME convert.
-        /// </summary>
-        [VirtualKey("Convert Key")]
-        CONVERT = 28,
-
-        /// <summary>
-        /// IME nonconvert.
-        /// </summary>
-        [VirtualKey("Non-Convert Key")]
-        NONCONVERT = 29,
-
-        /// <summary>
-        /// IME accept.
-        /// </summary>
-        [VirtualKey("IME Accept Key")]
-        ACCEPT = 30,
-
-        /// <summary>
-        /// IME mode change request.
-        /// </summary>
-        [VirtualKey("IME Mode-Change Key")]
-        MODECHANGE = 31,
-
-        /// <summary>
-        /// SPACEBAR.
-        /// </summary>
-        [VirtualKey("Spacebar")]
-        SPACE = 32,
-
-        /// <summary>
-        /// PAGE UP key.
-        /// </summary>
-        [VirtualKey("Page Up")]
-        PRIOR = 33,
-
-        /// <summary>
-        /// PAGE DOWN key.
-        /// </summary>
-        [VirtualKey("Page Down")]
-        NEXT = 34,
-
-        /// <summary>
-        /// END key.
-        /// </summary>
-        [VirtualKey("End")]
-        END = 35,
-
-        /// <summary>
-        /// HOME key.
-        /// </summary>
-        [VirtualKey("Home")]
-        HOME = 36,
-
-        /// <summary>
-        /// LEFT ARROW key.
-        /// </summary>
-        [VirtualKey("Left Arrow")]
-        LEFT = 37,
-
-        /// <summary>
-        /// UP ARROW key.
-        /// </summary>
-        [VirtualKey("Up Arrow")]
-        UP = 38,
-
-        /// <summary>
-        /// RIGHT ARROW key.
-        /// </summary>
-        [VirtualKey("Right Arrow")]
-        RIGHT = 39,
-
-        /// <summary>
-        /// DOWN ARROW key.
-        /// </summary>
-        [VirtualKey("Down Arrow")]
-        DOWN = 40,
-
-        /// <summary>
-        /// SELECT key.
-        /// </summary>
-        [VirtualKey("Select")]
-        SELECT = 41,
-
-        /// <summary>
-        /// PRINT key.
-        /// </summary>
-        [VirtualKey("Print")]
-        PRINT = 42,
-
-        /// <summary>
-        /// EXECUTE key.
-        /// </summary>
-        [VirtualKey("Execute")]
-        EXECUTE = 43,
-
-        /// <summary>
-        /// PRINT SCREEN key.
-        /// </summary>
-        [VirtualKey("Print Screen")]
-        SNAPSHOT = 44,
-
-        /// <summary>
-        /// INS key.
-        /// </summary>
-        [VirtualKey("Insert")]
-        INSERT = 45,
-
-        /// <summary>
-        /// DEL key.
-        /// </summary>
-        [VirtualKey("Delete")]
-        DELETE = 46,
-
-        /// <summary>
-        /// HELP key.
-        /// </summary>
-        [VirtualKey("Help")]
-        HELP = 47,
-
-        /// <summary>
-        /// 0 key.
-        /// </summary>
-        [VirtualKey("Number-Row 0")]
-        KEY_0 = 48,
-
-        /// <summary>
-        /// 1 key.
-        /// </summary>
-        [VirtualKey("Number-Row 1")]
-        KEY_1 = 49,
-
-        /// <summary>
-        /// 2 key.
-        /// </summary>
-        [VirtualKey("Number-Row 2")]
-        KEY_2 = 50,
-
-        /// <summary>
-        /// 3 key.
-        /// </summary>
-        [VirtualKey("Number-Row 3")]
-        KEY_3 = 51,
-
-        /// <summary>
-        /// 4 key.
-        /// </summary>
-        [VirtualKey("Number-Row 4")]
-        KEY_4 = 52,
-
-        /// <summary>
-        /// 5 key.
-        /// </summary>
-        [VirtualKey("Number-Row 5")]
-        KEY_5 = 53,
-
-        /// <summary>
-        /// 6 key.
-        /// </summary>
-        [VirtualKey("Number-Row 6")]
-        KEY_6 = 54,
-
-        /// <summary>
-        /// 7 key.
-        /// </summary>
-        [VirtualKey("Number-Row 7")]
-        KEY_7 = 55,
-
-        /// <summary>
-        /// 8 key.
-        /// </summary>
-        [VirtualKey("Number-Row 8")]
-        KEY_8 = 56,
-
-        /// <summary>
-        /// 9 key.
-        /// </summary>
-        [VirtualKey("Number-Row 9")]
-        KEY_9 = 57,
-
-        /// <summary>
-        /// A key.
-        /// </summary>
-        [VirtualKey("A")]
-        A = 65,
-
-        /// <summary>
-        /// B key.
-        /// </summary>
-        [VirtualKey("B")]
-        B = 66,
-
-        /// <summary>
-        /// C key.
-        /// </summary>
-        [VirtualKey("C")]
-        C = 67,
-
-        /// <summary>
-        /// D key.
-        /// </summary>
-        [VirtualKey("D")]
-        D = 68,
-
-        /// <summary>
-        /// E key.
-        /// </summary>
-        [VirtualKey("E")]
-        E = 69,
-
-        /// <summary>
-        /// F key.
-        /// </summary>
-        [VirtualKey("F")]
-        F = 70,
-
-        /// <summary>
-        /// G key.
-        /// </summary>
-        [VirtualKey("G")]
-        G = 71,
-
-        /// <summary>
-        /// H key.
-        /// </summary>
-        [VirtualKey("H")]
-        H = 72,
-
-        /// <summary>
-        /// I key.
-        /// </summary>
-        [VirtualKey("I")]
-        I = 73,
-
-        /// <summary>
-        /// J key.
-        /// </summary>
-        [VirtualKey("J")]
-        J = 74,
-
-        /// <summary>
-        /// K key.
-        /// </summary>
-        [VirtualKey("K")]
-        K = 75,
-
-        /// <summary>
-        /// L key.
-        /// </summary>
-        [VirtualKey("L")]
-        L = 76,
-
-        /// <summary>
-        /// M key.
-        /// </summary>
-        [VirtualKey("M")]
-        M = 77,
-
-        /// <summary>
-        /// N key.
-        /// </summary>
-        [VirtualKey("N")]
-        N = 78,
-
-        /// <summary>
-        /// O key.
-        /// </summary>
-        [VirtualKey("O")]
-        O = 79,
-
-        /// <summary>
-        /// P key.
-        /// </summary>
-        [VirtualKey("P")]
-        P = 80,
-
-        /// <summary>
-        /// Q key.
-        /// </summary>
-        [VirtualKey("Q")]
-        Q = 81,
-
-        /// <summary>
-        /// R key.
-        /// </summary>
-        [VirtualKey("R")]
-        R = 82,
-
-        /// <summary>
-        /// S key.
-        /// </summary>
-        [VirtualKey("S")]
-        S = 83,
-
-        /// <summary>
-        /// T key.
-        /// </summary>
-        [VirtualKey("T")]
-        T = 84,
-
-        /// <summary>
-        /// U key.
-        /// </summary>
-        [VirtualKey("U")]
-        U = 85,
-
-        /// <summary>
-        /// V key.
-        /// </summary>
-        [VirtualKey("V")]
-        V = 86,
-
-        /// <summary>
-        /// W key.
-        /// </summary>
-        [VirtualKey("W")]
-        W = 87,
-
-        /// <summary>
-        /// X key.
-        /// </summary>
-        [VirtualKey("X")]
-        X = 88,
-
-        /// <summary>
-        /// Y key.
-        /// </summary>
-        [VirtualKey("Y")]
-        Y = 89,
-
-        /// <summary>
-        /// Z key.
-        /// </summary>
-        [VirtualKey("Z")]
-        Z = 90,
-
-        /// <summary>
-        /// Left Windows key (Natural keyboard).
-        /// </summary>
-        [VirtualKey("Left Windows")]
-        LWIN = 91,
-
-        /// <summary>
-        /// Right Windows key (Natural keyboard).
-        /// </summary>
-        [VirtualKey("Right Windows")]
-        RWIN = 92,
-
-        /// <summary>
-        /// Applications key (Natural keyboard).
-        /// </summary>
-        [VirtualKey("Applications")]
-        APPS = 93,
-
-        /// <summary>
-        /// Computer Sleep key.
-        /// </summary>
-        [VirtualKey("Sleep")]
-        SLEEP = 95,
-
-        /// <summary>
-        /// Numeric keypad 0 key.
-        /// </summary>
-        [VirtualKey("Numpad 0")]
-        NUMPAD0 = 96,
-
-        /// <summary>
-        /// Numeric keypad 1 key.
-        /// </summary>
-        [VirtualKey("Numpad 1")]
-        NUMPAD1 = 97,
-
-        /// <summary>
-        /// Numeric keypad 2 key.
-        /// </summary>
-        [VirtualKey("Numpad 2")]
-        NUMPAD2 = 98,
-
-        /// <summary>
-        /// Numeric keypad 3 key.
-        /// </summary>
-        [VirtualKey("Numpad 3")]
-        NUMPAD3 = 99,
-
-        /// <summary>
-        /// Numeric keypad 4 key.
-        /// </summary>
-        [VirtualKey("Numpad 4")]
-        NUMPAD4 = 100,
-
-        /// <summary>
-        /// Numeric keypad 5 key.
-        /// </summary>
-        [VirtualKey("Numpad 5")]
-        NUMPAD5 = 101,
-
-        /// <summary>
-        /// Numeric keypad 6 key.
-        /// </summary>
-        [VirtualKey("Numpad 6")]
-        NUMPAD6 = 102,
-
-        /// <summary>
-        /// Numeric keypad 7 key.
-        /// </summary>
-        [VirtualKey("Numpad 7")]
-        NUMPAD7 = 103,
-
-        /// <summary>
-        /// Numeric keypad 8 key.
-        /// </summary>
-        [VirtualKey("Numpad 8")]
-        NUMPAD8 = 104,
-
-        /// <summary>
-        /// Numeric keypad 9 key.
-        /// </summary>
-        [VirtualKey("Numpad 9")]
-        NUMPAD9 = 105,
-
-        /// <summary>
-        /// Multiply key.
-        /// </summary>
-        [VirtualKey("Numpad Multiply")]
-        MULTIPLY = 106,
-
-        /// <summary>
-        /// Add key.
-        /// </summary>
-        [VirtualKey("Numpad Add")]
-        ADD = 107,
-
-        /// <summary>
-        /// Separator key.
-        /// </summary>
-        [VirtualKey("Numpad Separator")]
-        SEPARATOR = 108,
-
-        /// <summary>
-        /// Subtract key.
-        /// </summary>
-        [VirtualKey("Numpad Subtract")]
-        SUBTRACT = 109,
-
-        /// <summary>
-        /// Decimal key.
-        /// </summary>
-        [VirtualKey("Numpad Decimal")]
-        DECIMAL = 110,
-
-        /// <summary>
-        /// Divide key.
-        /// </summary>
-        [VirtualKey("Numpad Divide")]
-        DIVIDE = 111,
-
-        /// <summary>
-        /// F1 Key.
-        /// </summary>
-        [VirtualKey("F1")]
-        F1 = 112,
-
-        /// <summary>
-        /// F2 Key.
-        /// </summary>
-        [VirtualKey("F2")]
-        F2 = 113,
-
-        /// <summary>
-        /// F3 Key.
-        /// </summary>
-        [VirtualKey("F3")]
-        F3 = 114,
-
-        /// <summary>
-        /// F4 Key.
-        /// </summary>
-        [VirtualKey("F4")]
-        F4 = 115,
-
-        /// <summary>
-        /// F5 Key.
-        /// </summary>
-        [VirtualKey("F5")]
-        F5 = 116,
-
-        /// <summary>
-        /// F6 Key.
-        /// </summary>
-        [VirtualKey("F6")]
-        F6 = 117,
-
-        /// <summary>
-        /// F7 Key.
-        /// </summary>
-        [VirtualKey("F7")]
-        F7 = 118,
-
-        /// <summary>
-        /// F8 Key.
-        /// </summary>
-        [VirtualKey("F8")]
-        F8 = 119,
-
-        /// <summary>
-        /// F9 Key.
-        /// </summary>
-        [VirtualKey("F9")]
-        F9 = 120,
-
-        /// <summary>
-        /// F10 Key.
-        /// </summary>
-        [VirtualKey("F10")]
-        F10 = 121,
-
-        /// <summary>
-        /// F11 Key.
-        /// </summary>
-        [VirtualKey("F11")]
-        F11 = 122,
-
-        /// <summary>
-        /// F12 Key.
-        /// </summary>
-        [VirtualKey("F12")]
-        F12 = 123,
-
-        /// <summary>
-        /// F13 Key.
-        /// </summary>
-        [VirtualKey("F13")]
-        F13 = 124,
-
-        /// <summary>
-        /// F14 Key.
-        /// </summary>
-        [VirtualKey("F14")]
-        F14 = 125,
-
-        /// <summary>
-        /// F15 Key.
-        /// </summary>
-        [VirtualKey("F15")]
-        F15 = 126,
-
-        /// <summary>
-        /// F16 Key.
-        /// </summary>
-        [VirtualKey("F16")]
-        F16 = 127,
-
-        /// <summary>
-        /// F17 Key.
-        /// </summary>
-        [VirtualKey("F17")]
-        F17 = 128,
-
-        /// <summary>
-        /// F18 Key.
-        /// </summary>
-        [VirtualKey("F18")]
-        F18 = 129,
-
-        /// <summary>
-        /// F19 Key.
-        /// </summary>
-        [VirtualKey("F19")]
-        F19 = 130,
-
-        /// <summary>
-        /// F20 Key.
-        /// </summary>
-        [VirtualKey("F20")]
-        F20 = 131,
-
-        /// <summary>
-        /// F21 Key.
-        /// </summary>
-        [VirtualKey("F21")]
-        F21 = 132,
-
-        /// <summary>
-        /// F22 Key.
-        /// </summary>
-        [VirtualKey("F22")]
-        F22 = 133,
-
-        /// <summary>
-        /// F23 Key.
-        /// </summary>
-        [VirtualKey("F23")]
-        F23 = 134,
-
-        /// <summary>
-        /// F24 Key.
-        /// </summary>
-        [VirtualKey("F24")]
-        F24 = 135,
-
-        /// <summary>
-        /// NUM LOCK key.
-        /// </summary>
-        [VirtualKey("Num-Lock")]
-        NUMLOCK = 144,
-
-        /// <summary>
-        /// SCROLL LOCK key.
-        /// </summary>
-        [VirtualKey("Scroll-Lock")]
-        SCROLL = 145,
-
-        /// <summary>
-        /// '=' key on numpad (NEC PC-9800 kbd definitions).
-        /// </summary>
-        [VirtualKey("Numpad Equals")]
-        OEM_NEC_EQUAL = 146,
-
-        /// <summary>
-        /// 'Dictionary' key (Fujitsu/OASYS kbd definitions).
-        /// </summary>
-        [VirtualKey("Dictionary (Fujitsu)")]
-        OEM_FJ_JISHO = OEM_NEC_EQUAL,
-
-        /// <summary>
-        /// 'Unregister word' key (Fujitsu/OASYS kbd definitions).
-        /// </summary>
-        [VirtualKey("Unregister word (Fujitsu)")]
-        OEM_FJ_MASSHOU = 147,
-
-        /// <summary>
-        /// 'Register word' key (Fujitsu/OASYS kbd definitions).
-        /// </summary>
-        [VirtualKey("Register word (Fujitsu)")]
-        OEM_FJ_TOUROKU = 148,
-
-        /// <summary>
-        /// 'Left OYAYUBI' key (Fujitsu/OASYS kbd definitions).
-        /// </summary>
-        [VirtualKey("Left Oyayubi (Fujitsu)")]
-        OEM_FJ_LOYA = 149,
-
-        /// <summary>
-        /// 'Right OYAYUBI' key (Fujitsu/OASYS kbd definitions).
-        /// </summary>
-        [VirtualKey("Right Oyayubi (Fujitsu)")]
-        OEM_FJ_ROYA = 150,
-
-        /// <summary>
-        /// Left SHIFT key.
-        /// </summary>
-        /// <remarks>
-        /// Used only as parameters to User32.GetAsyncKeyState and User32.GetKeyState. No other API or message will distinguish
-        /// left and right keys in this way.
-        /// </remarks>
-        [VirtualKey("Left Shift")]
-        LSHIFT = 160,
-
-        /// <summary>
-        /// Right SHIFT key.
-        /// </summary>
-        [VirtualKey("Right Shift")]
-        RSHIFT = 161,
-
-        /// <summary>
-        /// Left CONTROL key.
-        /// </summary>
-        [VirtualKey("Left Control")]
-        LCONTROL = 162,
-
-        /// <summary>
-        /// Right CONTROL key.
-        /// </summary>
-        [VirtualKey("Right Control")]
-        RCONTROL = 163,
-
-        /// <summary>
-        /// Left MENU key.
-        /// </summary>
-        [VirtualKey("Left Menu")]
-        LMENU = 164,
-
-        /// <summary>
-        /// Right MENU key.
-        /// </summary>
-        [VirtualKey("Right Menu")]
-        RMENU = 165,
-
-        /// <summary>
-        /// Browser Back key.
-        /// </summary>
-        [VirtualKey("Browser Back")]
-        BROWSER_BACK = 166,
-
-        /// <summary>
-        /// Browser Forward key.
-        /// </summary>
-        [VirtualKey("Browser Forward")]
-        BROWSER_FORWARD = 167,
-
-        /// <summary>
-        /// Browser Refresh key.
-        /// </summary>
-        [VirtualKey("Browser Refresh")]
-        BROWSER_REFRESH = 168,
-
-        /// <summary>
-        /// Browser Stop key.
-        /// </summary>
-        [VirtualKey("Browser Stop")]
-        BROWSER_STOP = 169,
-
-        /// <summary>
-        /// Browser Search key.
-        /// </summary>
-        [VirtualKey("Browser Search")]
-        BROWSER_SEARCH = 170,
-
-        /// <summary>
-        /// Browser Favorites key.
-        /// </summary>
-        [VirtualKey("Browser Favorites")]
-        BROWSER_FAVORITES = 171,
-
-        /// <summary>
-        /// Browser Start and Home key.
-        /// </summary>
-        [VirtualKey("Browser Home")]
-        BROWSER_HOME = 172,
-
-        /// <summary>
-        /// Volume Mute key.
-        /// </summary>
-        [VirtualKey("Mute Volume")]
-        VOLUME_MUTE = 173,
-
-        /// <summary>
-        /// Volume Down key.
-        /// </summary>
-        [VirtualKey("Volume Down")]
-        VOLUME_DOWN = 174,
-
-        /// <summary>
-        /// Volume Up key.
-        /// </summary>
-        [VirtualKey("Volume Up")]
-        VOLUME_UP = 175,
-
-        /// <summary>
-        /// Next Track key.
-        /// </summary>
-        [VirtualKey("Next Track")]
-        MEDIA_NEXT_TRACK = 176,
-
-        /// <summary>
-        /// Previous Track key.
-        /// </summary>
-        [VirtualKey("Previous Track")]
-        MEDIA_PREV_TRACK = 177,
-
-        /// <summary>
-        /// Stop Media key.
-        /// </summary>
-        [VirtualKey("Stop Media")]
-        MEDIA_STOP = 178,
-
-        /// <summary>
-        /// Play/Pause Media key.
-        /// </summary>
-        [VirtualKey("Play/Pause Media")]
-        MEDIA_PLAY_PAUSE = 179,
-
-        /// <summary>
-        /// Start Mail key.
-        /// </summary>
-        [VirtualKey("Launch Mail")]
-        LAUNCH_MAIL = 180,
-
-        /// <summary>
-        /// Select Media key.
-        /// </summary>
-        [VirtualKey("Launch Media Player")]
-        LAUNCH_MEDIA_SELECT = 181,
-
-        /// <summary>
-        /// Start Application 1 key.
-        /// </summary>
-        [VirtualKey("Launch Application 1")]
-        LAUNCH_APP1 = 182,
-
-        /// <summary>
-        /// Start Application 2 key.
-        /// </summary>
-        [VirtualKey("Launch Application 2")]
-        LAUNCH_APP2 = 183,
-
-        /// <summary>
-        /// Used for miscellaneous characters; it can vary by keyboard..
-        /// </summary>
-        /// <remarks>
-        /// For the US standard keyboard, the ';:' key.
-        /// </remarks>
-        [VirtualKey("Semicolon")]
-        OEM_1 = 186,
-
-        /// <summary>
-        /// For any country/region, the '+' key.
-        /// </summary>
-        [VirtualKey("Plus")]
-        OEM_PLUS = 187,
-
-        /// <summary>
-        /// For any country/region, the ',' key.
-        /// </summary>
-        [VirtualKey("Comma")]
-        OEM_COMMA = 188,
-
-        /// <summary>
-        /// For any country/region, the '-' key.
-        /// </summary>
-        [VirtualKey("Minus")]
-        OEM_MINUS = 189,
-
-        /// <summary>
-        /// For any country/region, the '.' key.
-        /// </summary>
-        [VirtualKey("Period")]
-        OEM_PERIOD = 190,
-
-        /// <summary>
-        /// Used for miscellaneous characters; it can vary by keyboard..
-        /// </summary>
-        /// <remarks>
-        /// For the US standard keyboard, the '/?' key.
-        /// </remarks>
-        [VirtualKey("Forward Slash/Question Mark")]
-        OEM_2 = 191,
-
-        /// <summary>
-        /// Used for miscellaneous characters; it can vary by keyboard..
-        /// </summary>
-        /// <remarks>
-        /// For the US standard keyboard, the '`~' key.
-        /// </remarks>
-        [VirtualKey("Tilde")]
-        OEM_3 = 192,
-
-        /// <summary>
-        /// Used for miscellaneous characters; it can vary by keyboard..
-        /// </summary>
-        /// <remarks>
-        /// For the US standard keyboard, the '[{' key.
-        /// </remarks>
-        [VirtualKey("Opening Bracket")]
-        OEM_4 = 219,
-
-        /// <summary>
-        /// Used for miscellaneous characters; it can vary by keyboard..
-        /// </summary>
-        /// <remarks>
-        /// For the US standard keyboard, the '\|' key.
-        /// </remarks>
-        [VirtualKey("Back Slash/Pipe")]
-        OEM_5 = 220,
-
-        /// <summary>
-        /// Used for miscellaneous characters; it can vary by keyboard..
-        /// </summary>
-        /// <remarks>
-        /// For the US standard keyboard, the ']}' key.
-        /// </remarks>
-        [VirtualKey("Closing Bracket")]
-        OEM_6 = 221,
-
-        /// <summary>
-        /// Used for miscellaneous characters; it can vary by keyboard..
-        /// </summary>
-        /// <remarks>
-        /// For the US standard keyboard, the 'single-quote/double-quote' (''"') key.
-        /// </remarks>
-        [VirtualKey("Single Quote/Double Quote")]
-        OEM_7 = 222,
-
-        /// <summary>
-        /// Used for miscellaneous characters; it can vary by keyboard..
-        /// </summary>
-        [VirtualKey("OEM 8")]
-        OEM_8 = 223,
-
-        /// <summary>
-        /// OEM specific.
-        /// </summary>
-
-        /// <remarks>
-        /// 'AX' key on Japanese AX kbd.
-        /// </remarks>
-        [VirtualKey("OEM AX")]
-        OEM_AX = 225,
-
-        /// <summary>
-        /// Either the angle bracket ("&lt;&gt;") key or the backslash ("\|") key on the RT 102-key keyboard.
-        /// </summary>
-        [VirtualKey("OEM 102")]
-        OEM_102 = 226,
-
-        /// <summary>
-        /// OEM specific.
-        /// </summary>
-        /// <remarks>
-        /// Help key on ICO.
-        /// </remarks>
-        [VirtualKey("Help (ICO)")]
-        ICO_HELP = 227,
-
-        /// <summary>
-        /// OEM specific.
-        /// </summary>
-        /// <remarks>
-        /// 00 key on ICO.
-        /// </remarks>
-        [VirtualKey("00 (ICO)")]
-        ICO_00 = 228,
-
-        /// <summary>
-        /// IME PROCESS key.
-        /// </summary>
-        [VirtualKey("IME Process")]
-        PROCESSKEY = 229,
-
-        /// <summary>
-        /// OEM specific.
-        /// </summary>
-        /// <remarks>
-        /// Clear key on ICO.
-        /// </remarks>
-        [VirtualKey("Clear (ICO)")]
-        ICO_CLEAR = 230,
-
-        /// <summary>
-        /// Used to pass Unicode characters as if they were keystrokes. The PACKET key is the low word of a 32-bit Virtual Key
-        /// value used for non-keyboard input methods..
-        /// </summary>
-        /// <remarks>
-        /// For more information, see Remark in User32.KEYBDINPUT, User32.SendInput, User32.WindowMessage.WM_KEYDOWN, and
-        /// User32.WindowMessage.WM_KEYUP.
-        /// </remarks>
-        [VirtualKey("Packet")]
-        PACKET = 231,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM Reset")]
-        OEM_RESET = 233,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM Jump")]
-        OEM_JUMP = 234,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM PA1")]
-        OEM_PA1 = 235,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM PA2")]
-        OEM_PA2 = 236,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM PA3")]
-        OEM_PA3 = 237,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM WSCTRL")]
-        OEM_WSCTRL = 238,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM CUSEL")]
-        OEM_CUSEL = 239,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM ATTN")]
-        OEM_ATTN = 240,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM Finish")]
-        OEM_FINISH = 241,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM Copy")]
-        OEM_COPY = 242,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM Auto")]
-        OEM_AUTO = 243,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM ENLW")]
-        OEM_ENLW = 244,
-
-        /// <summary>
-        /// Nokia/Ericsson definition.
-        /// </summary>
-        [VirtualKey("OEM Backtab")]
-        OEM_BACKTAB = 245,
-
-        /// <summary>
-        /// Attn key.
-        /// </summary>
-        [VirtualKey("ATTN")]
-        ATTN = 246,
-
-        /// <summary>
-        /// CrSel key.
-        /// </summary>
-        [VirtualKey("CRSEL")]
-        CRSEL = 247,
-
-        /// <summary>
-        /// ExSel key.
-        /// </summary>
-        [VirtualKey("EXSEL")]
-        EXSEL = 248,
-
-        /// <summary>
-        /// Erase EOF key.
-        /// </summary>
-        [VirtualKey("Erase EOF")]
-        EREOF = 249,
-
-        /// <summary>
-        /// Play key.
-        /// </summary>
-        [VirtualKey("Play")]
-        PLAY = 250,
-
-        /// <summary>
-        /// Zoom key.
-        /// </summary>
-        [VirtualKey("Zoom")]
-        ZOOM = 251,
-
-        /// <summary>
-        /// Reserved constant by Windows headers definition.
-        /// </summary>
-        [VirtualKey("Reserved")]
-        NONAME = 252,
-
-        /// <summary>
-        /// PA1 key.
-        /// </summary>
-        [VirtualKey("PA1")]
-        PA1 = 253,
-
-        /// <summary>
-        /// Clear key.
-        /// </summary>
-        [VirtualKey("Clear")]
-        OEM_CLEAR = 254,
-    }
+    [VirtualKey("Mouse 3")]
+    MBUTTON = 4,
+
+    /// <summary>
+    /// X1 mouse button.
+    /// </summary>
+
+    /// <remarks>
+    /// NOT contiguous with L and R buttons.
+    /// </remarks>
+    [VirtualKey("Mouse 4")]
+    XBUTTON1 = 5,
+
+    /// <summary>
+    /// X2 mouse button.
+    /// </summary>
+
+    /// <remarks>
+    /// NOT contiguous with L and R buttons.
+    /// </remarks>
+    [VirtualKey("Mouse 5")]
+    XBUTTON2 = 6,
+
+    /// <summary>
+    /// BACKSPACE key.
+    /// </summary>
+    [VirtualKey("Backspace")]
+    BACK = 8,
+
+    /// <summary>
+    /// TAB key.
+    /// </summary>
+    [VirtualKey("Tab")]
+    TAB = 9,
+
+    /// <summary>
+    /// CLEAR key.
+    /// </summary>
+    [VirtualKey("Clear")]
+    CLEAR = 12,
+
+    /// <summary>
+    /// RETURN key.
+    /// </summary>
+    [VirtualKey("Return/Enter")]
+    RETURN = 13,
+
+    /// <summary>
+    /// SHIFT key.
+    /// </summary>
+    [VirtualKey("Shift")]
+    SHIFT = 16,
+
+    /// <summary>
+    /// CONTROL key.
+    /// </summary>
+    [VirtualKey("Control")]
+    CONTROL = 17,
+
+    /// <summary>
+    /// ALT key.
+    /// </summary>
+    [VirtualKey("Alt")]
+    MENU = 18,
+
+    /// <summary>
+    /// PAUSE key.
+    /// </summary>
+    [VirtualKey("Pause")]
+    PAUSE = 19,
+
+    /// <summary>
+    /// CAPS LOCK key.
+    /// </summary>
+    [VirtualKey("Caps Lock")]
+    CAPITAL = 20,
+
+    /// <summary>
+    /// IME Kana mode.
+    /// </summary>
+    [VirtualKey("Kana Key")]
+    KANA = 21,
+
+    /// <summary>
+    /// IME Hangeul mode (maintained for compatibility; use User32.VirtualKey.HANGUL).
+    /// </summary>
+    [VirtualKey("Hangul Key")]
+    HANGEUL = KANA,
+
+    /// <summary>
+    /// IME Hangul mode.
+    /// </summary>
+    [VirtualKey("Hangul Key 2")]
+    HANGUL = KANA,
+
+    /// <summary>
+    /// IME Junja mode.
+    /// </summary>
+    [VirtualKey("Junja Key")]
+    JUNJA = 23,
+
+    /// <summary>
+    /// IME final mode.
+    /// </summary>
+    [VirtualKey("Final Key")]
+    FINAL = 24,
+
+    /// <summary>
+    /// IME Hanja mode.
+    /// </summary>
+    [VirtualKey("Hanja Key")]
+    HANJA = 25,
+
+    /// <summary>
+    /// IME Kanji mode.
+    /// </summary>
+    [VirtualKey("Kanji Key")]
+    KANJI = HANJA,
+
+    /// <summary>
+    /// ESC key.
+    /// </summary>
+    [VirtualKey("Escape")]
+    ESCAPE = 27,
+
+    /// <summary>
+    /// IME convert.
+    /// </summary>
+    [VirtualKey("Convert Key")]
+    CONVERT = 28,
+
+    /// <summary>
+    /// IME nonconvert.
+    /// </summary>
+    [VirtualKey("Non-Convert Key")]
+    NONCONVERT = 29,
+
+    /// <summary>
+    /// IME accept.
+    /// </summary>
+    [VirtualKey("IME Accept Key")]
+    ACCEPT = 30,
+
+    /// <summary>
+    /// IME mode change request.
+    /// </summary>
+    [VirtualKey("IME Mode-Change Key")]
+    MODECHANGE = 31,
+
+    /// <summary>
+    /// SPACEBAR.
+    /// </summary>
+    [VirtualKey("Spacebar")]
+    SPACE = 32,
+
+    /// <summary>
+    /// PAGE UP key.
+    /// </summary>
+    [VirtualKey("Page Up")]
+    PRIOR = 33,
+
+    /// <summary>
+    /// PAGE DOWN key.
+    /// </summary>
+    [VirtualKey("Page Down")]
+    NEXT = 34,
+
+    /// <summary>
+    /// END key.
+    /// </summary>
+    [VirtualKey("End")]
+    END = 35,
+
+    /// <summary>
+    /// HOME key.
+    /// </summary>
+    [VirtualKey("Home")]
+    HOME = 36,
+
+    /// <summary>
+    /// LEFT ARROW key.
+    /// </summary>
+    [VirtualKey("Left Arrow")]
+    LEFT = 37,
+
+    /// <summary>
+    /// UP ARROW key.
+    /// </summary>
+    [VirtualKey("Up Arrow")]
+    UP = 38,
+
+    /// <summary>
+    /// RIGHT ARROW key.
+    /// </summary>
+    [VirtualKey("Right Arrow")]
+    RIGHT = 39,
+
+    /// <summary>
+    /// DOWN ARROW key.
+    /// </summary>
+    [VirtualKey("Down Arrow")]
+    DOWN = 40,
+
+    /// <summary>
+    /// SELECT key.
+    /// </summary>
+    [VirtualKey("Select")]
+    SELECT = 41,
+
+    /// <summary>
+    /// PRINT key.
+    /// </summary>
+    [VirtualKey("Print")]
+    PRINT = 42,
+
+    /// <summary>
+    /// EXECUTE key.
+    /// </summary>
+    [VirtualKey("Execute")]
+    EXECUTE = 43,
+
+    /// <summary>
+    /// PRINT SCREEN key.
+    /// </summary>
+    [VirtualKey("Print Screen")]
+    SNAPSHOT = 44,
+
+    /// <summary>
+    /// INS key.
+    /// </summary>
+    [VirtualKey("Insert")]
+    INSERT = 45,
+
+    /// <summary>
+    /// DEL key.
+    /// </summary>
+    [VirtualKey("Delete")]
+    DELETE = 46,
+
+    /// <summary>
+    /// HELP key.
+    /// </summary>
+    [VirtualKey("Help")]
+    HELP = 47,
+
+    /// <summary>
+    /// 0 key.
+    /// </summary>
+    [VirtualKey("Number-Row 0")]
+    KEY_0 = 48,
+
+    /// <summary>
+    /// 1 key.
+    /// </summary>
+    [VirtualKey("Number-Row 1")]
+    KEY_1 = 49,
+
+    /// <summary>
+    /// 2 key.
+    /// </summary>
+    [VirtualKey("Number-Row 2")]
+    KEY_2 = 50,
+
+    /// <summary>
+    /// 3 key.
+    /// </summary>
+    [VirtualKey("Number-Row 3")]
+    KEY_3 = 51,
+
+    /// <summary>
+    /// 4 key.
+    /// </summary>
+    [VirtualKey("Number-Row 4")]
+    KEY_4 = 52,
+
+    /// <summary>
+    /// 5 key.
+    /// </summary>
+    [VirtualKey("Number-Row 5")]
+    KEY_5 = 53,
+
+    /// <summary>
+    /// 6 key.
+    /// </summary>
+    [VirtualKey("Number-Row 6")]
+    KEY_6 = 54,
+
+    /// <summary>
+    /// 7 key.
+    /// </summary>
+    [VirtualKey("Number-Row 7")]
+    KEY_7 = 55,
+
+    /// <summary>
+    /// 8 key.
+    /// </summary>
+    [VirtualKey("Number-Row 8")]
+    KEY_8 = 56,
+
+    /// <summary>
+    /// 9 key.
+    /// </summary>
+    [VirtualKey("Number-Row 9")]
+    KEY_9 = 57,
+
+    /// <summary>
+    /// A key.
+    /// </summary>
+    [VirtualKey("A")]
+    A = 65,
+
+    /// <summary>
+    /// B key.
+    /// </summary>
+    [VirtualKey("B")]
+    B = 66,
+
+    /// <summary>
+    /// C key.
+    /// </summary>
+    [VirtualKey("C")]
+    C = 67,
+
+    /// <summary>
+    /// D key.
+    /// </summary>
+    [VirtualKey("D")]
+    D = 68,
+
+    /// <summary>
+    /// E key.
+    /// </summary>
+    [VirtualKey("E")]
+    E = 69,
+
+    /// <summary>
+    /// F key.
+    /// </summary>
+    [VirtualKey("F")]
+    F = 70,
+
+    /// <summary>
+    /// G key.
+    /// </summary>
+    [VirtualKey("G")]
+    G = 71,
+
+    /// <summary>
+    /// H key.
+    /// </summary>
+    [VirtualKey("H")]
+    H = 72,
+
+    /// <summary>
+    /// I key.
+    /// </summary>
+    [VirtualKey("I")]
+    I = 73,
+
+    /// <summary>
+    /// J key.
+    /// </summary>
+    [VirtualKey("J")]
+    J = 74,
+
+    /// <summary>
+    /// K key.
+    /// </summary>
+    [VirtualKey("K")]
+    K = 75,
+
+    /// <summary>
+    /// L key.
+    /// </summary>
+    [VirtualKey("L")]
+    L = 76,
+
+    /// <summary>
+    /// M key.
+    /// </summary>
+    [VirtualKey("M")]
+    M = 77,
+
+    /// <summary>
+    /// N key.
+    /// </summary>
+    [VirtualKey("N")]
+    N = 78,
+
+    /// <summary>
+    /// O key.
+    /// </summary>
+    [VirtualKey("O")]
+    O = 79,
+
+    /// <summary>
+    /// P key.
+    /// </summary>
+    [VirtualKey("P")]
+    P = 80,
+
+    /// <summary>
+    /// Q key.
+    /// </summary>
+    [VirtualKey("Q")]
+    Q = 81,
+
+    /// <summary>
+    /// R key.
+    /// </summary>
+    [VirtualKey("R")]
+    R = 82,
+
+    /// <summary>
+    /// S key.
+    /// </summary>
+    [VirtualKey("S")]
+    S = 83,
+
+    /// <summary>
+    /// T key.
+    /// </summary>
+    [VirtualKey("T")]
+    T = 84,
+
+    /// <summary>
+    /// U key.
+    /// </summary>
+    [VirtualKey("U")]
+    U = 85,
+
+    /// <summary>
+    /// V key.
+    /// </summary>
+    [VirtualKey("V")]
+    V = 86,
+
+    /// <summary>
+    /// W key.
+    /// </summary>
+    [VirtualKey("W")]
+    W = 87,
+
+    /// <summary>
+    /// X key.
+    /// </summary>
+    [VirtualKey("X")]
+    X = 88,
+
+    /// <summary>
+    /// Y key.
+    /// </summary>
+    [VirtualKey("Y")]
+    Y = 89,
+
+    /// <summary>
+    /// Z key.
+    /// </summary>
+    [VirtualKey("Z")]
+    Z = 90,
+
+    /// <summary>
+    /// Left Windows key (Natural keyboard).
+    /// </summary>
+    [VirtualKey("Left Windows")]
+    LWIN = 91,
+
+    /// <summary>
+    /// Right Windows key (Natural keyboard).
+    /// </summary>
+    [VirtualKey("Right Windows")]
+    RWIN = 92,
+
+    /// <summary>
+    /// Applications key (Natural keyboard).
+    /// </summary>
+    [VirtualKey("Applications")]
+    APPS = 93,
+
+    /// <summary>
+    /// Computer Sleep key.
+    /// </summary>
+    [VirtualKey("Sleep")]
+    SLEEP = 95,
+
+    /// <summary>
+    /// Numeric keypad 0 key.
+    /// </summary>
+    [VirtualKey("Numpad 0")]
+    NUMPAD0 = 96,
+
+    /// <summary>
+    /// Numeric keypad 1 key.
+    /// </summary>
+    [VirtualKey("Numpad 1")]
+    NUMPAD1 = 97,
+
+    /// <summary>
+    /// Numeric keypad 2 key.
+    /// </summary>
+    [VirtualKey("Numpad 2")]
+    NUMPAD2 = 98,
+
+    /// <summary>
+    /// Numeric keypad 3 key.
+    /// </summary>
+    [VirtualKey("Numpad 3")]
+    NUMPAD3 = 99,
+
+    /// <summary>
+    /// Numeric keypad 4 key.
+    /// </summary>
+    [VirtualKey("Numpad 4")]
+    NUMPAD4 = 100,
+
+    /// <summary>
+    /// Numeric keypad 5 key.
+    /// </summary>
+    [VirtualKey("Numpad 5")]
+    NUMPAD5 = 101,
+
+    /// <summary>
+    /// Numeric keypad 6 key.
+    /// </summary>
+    [VirtualKey("Numpad 6")]
+    NUMPAD6 = 102,
+
+    /// <summary>
+    /// Numeric keypad 7 key.
+    /// </summary>
+    [VirtualKey("Numpad 7")]
+    NUMPAD7 = 103,
+
+    /// <summary>
+    /// Numeric keypad 8 key.
+    /// </summary>
+    [VirtualKey("Numpad 8")]
+    NUMPAD8 = 104,
+
+    /// <summary>
+    /// Numeric keypad 9 key.
+    /// </summary>
+    [VirtualKey("Numpad 9")]
+    NUMPAD9 = 105,
+
+    /// <summary>
+    /// Multiply key.
+    /// </summary>
+    [VirtualKey("Numpad Multiply")]
+    MULTIPLY = 106,
+
+    /// <summary>
+    /// Add key.
+    /// </summary>
+    [VirtualKey("Numpad Add")]
+    ADD = 107,
+
+    /// <summary>
+    /// Separator key.
+    /// </summary>
+    [VirtualKey("Numpad Separator")]
+    SEPARATOR = 108,
+
+    /// <summary>
+    /// Subtract key.
+    /// </summary>
+    [VirtualKey("Numpad Subtract")]
+    SUBTRACT = 109,
+
+    /// <summary>
+    /// Decimal key.
+    /// </summary>
+    [VirtualKey("Numpad Decimal")]
+    DECIMAL = 110,
+
+    /// <summary>
+    /// Divide key.
+    /// </summary>
+    [VirtualKey("Numpad Divide")]
+    DIVIDE = 111,
+
+    /// <summary>
+    /// F1 Key.
+    /// </summary>
+    [VirtualKey("F1")]
+    F1 = 112,
+
+    /// <summary>
+    /// F2 Key.
+    /// </summary>
+    [VirtualKey("F2")]
+    F2 = 113,
+
+    /// <summary>
+    /// F3 Key.
+    /// </summary>
+    [VirtualKey("F3")]
+    F3 = 114,
+
+    /// <summary>
+    /// F4 Key.
+    /// </summary>
+    [VirtualKey("F4")]
+    F4 = 115,
+
+    /// <summary>
+    /// F5 Key.
+    /// </summary>
+    [VirtualKey("F5")]
+    F5 = 116,
+
+    /// <summary>
+    /// F6 Key.
+    /// </summary>
+    [VirtualKey("F6")]
+    F6 = 117,
+
+    /// <summary>
+    /// F7 Key.
+    /// </summary>
+    [VirtualKey("F7")]
+    F7 = 118,
+
+    /// <summary>
+    /// F8 Key.
+    /// </summary>
+    [VirtualKey("F8")]
+    F8 = 119,
+
+    /// <summary>
+    /// F9 Key.
+    /// </summary>
+    [VirtualKey("F9")]
+    F9 = 120,
+
+    /// <summary>
+    /// F10 Key.
+    /// </summary>
+    [VirtualKey("F10")]
+    F10 = 121,
+
+    /// <summary>
+    /// F11 Key.
+    /// </summary>
+    [VirtualKey("F11")]
+    F11 = 122,
+
+    /// <summary>
+    /// F12 Key.
+    /// </summary>
+    [VirtualKey("F12")]
+    F12 = 123,
+
+    /// <summary>
+    /// F13 Key.
+    /// </summary>
+    [VirtualKey("F13")]
+    F13 = 124,
+
+    /// <summary>
+    /// F14 Key.
+    /// </summary>
+    [VirtualKey("F14")]
+    F14 = 125,
+
+    /// <summary>
+    /// F15 Key.
+    /// </summary>
+    [VirtualKey("F15")]
+    F15 = 126,
+
+    /// <summary>
+    /// F16 Key.
+    /// </summary>
+    [VirtualKey("F16")]
+    F16 = 127,
+
+    /// <summary>
+    /// F17 Key.
+    /// </summary>
+    [VirtualKey("F17")]
+    F17 = 128,
+
+    /// <summary>
+    /// F18 Key.
+    /// </summary>
+    [VirtualKey("F18")]
+    F18 = 129,
+
+    /// <summary>
+    /// F19 Key.
+    /// </summary>
+    [VirtualKey("F19")]
+    F19 = 130,
+
+    /// <summary>
+    /// F20 Key.
+    /// </summary>
+    [VirtualKey("F20")]
+    F20 = 131,
+
+    /// <summary>
+    /// F21 Key.
+    /// </summary>
+    [VirtualKey("F21")]
+    F21 = 132,
+
+    /// <summary>
+    /// F22 Key.
+    /// </summary>
+    [VirtualKey("F22")]
+    F22 = 133,
+
+    /// <summary>
+    /// F23 Key.
+    /// </summary>
+    [VirtualKey("F23")]
+    F23 = 134,
+
+    /// <summary>
+    /// F24 Key.
+    /// </summary>
+    [VirtualKey("F24")]
+    F24 = 135,
+
+    /// <summary>
+    /// NUM LOCK key.
+    /// </summary>
+    [VirtualKey("Num-Lock")]
+    NUMLOCK = 144,
+
+    /// <summary>
+    /// SCROLL LOCK key.
+    /// </summary>
+    [VirtualKey("Scroll-Lock")]
+    SCROLL = 145,
+
+    /// <summary>
+    /// '=' key on numpad (NEC PC-9800 kbd definitions).
+    /// </summary>
+    [VirtualKey("Numpad Equals")]
+    OEM_NEC_EQUAL = 146,
+
+    /// <summary>
+    /// 'Dictionary' key (Fujitsu/OASYS kbd definitions).
+    /// </summary>
+    [VirtualKey("Dictionary (Fujitsu)")]
+    OEM_FJ_JISHO = OEM_NEC_EQUAL,
+
+    /// <summary>
+    /// 'Unregister word' key (Fujitsu/OASYS kbd definitions).
+    /// </summary>
+    [VirtualKey("Unregister word (Fujitsu)")]
+    OEM_FJ_MASSHOU = 147,
+
+    /// <summary>
+    /// 'Register word' key (Fujitsu/OASYS kbd definitions).
+    /// </summary>
+    [VirtualKey("Register word (Fujitsu)")]
+    OEM_FJ_TOUROKU = 148,
+
+    /// <summary>
+    /// 'Left OYAYUBI' key (Fujitsu/OASYS kbd definitions).
+    /// </summary>
+    [VirtualKey("Left Oyayubi (Fujitsu)")]
+    OEM_FJ_LOYA = 149,
+
+    /// <summary>
+    /// 'Right OYAYUBI' key (Fujitsu/OASYS kbd definitions).
+    /// </summary>
+    [VirtualKey("Right Oyayubi (Fujitsu)")]
+    OEM_FJ_ROYA = 150,
+
+    /// <summary>
+    /// Left SHIFT key.
+    /// </summary>
+    /// <remarks>
+    /// Used only as parameters to User32.GetAsyncKeyState and User32.GetKeyState. No other API or message will distinguish
+    /// left and right keys in this way.
+    /// </remarks>
+    [VirtualKey("Left Shift")]
+    LSHIFT = 160,
+
+    /// <summary>
+    /// Right SHIFT key.
+    /// </summary>
+    [VirtualKey("Right Shift")]
+    RSHIFT = 161,
+
+    /// <summary>
+    /// Left CONTROL key.
+    /// </summary>
+    [VirtualKey("Left Control")]
+    LCONTROL = 162,
+
+    /// <summary>
+    /// Right CONTROL key.
+    /// </summary>
+    [VirtualKey("Right Control")]
+    RCONTROL = 163,
+
+    /// <summary>
+    /// Left MENU key.
+    /// </summary>
+    [VirtualKey("Left Menu")]
+    LMENU = 164,
+
+    /// <summary>
+    /// Right MENU key.
+    /// </summary>
+    [VirtualKey("Right Menu")]
+    RMENU = 165,
+
+    /// <summary>
+    /// Browser Back key.
+    /// </summary>
+    [VirtualKey("Browser Back")]
+    BROWSER_BACK = 166,
+
+    /// <summary>
+    /// Browser Forward key.
+    /// </summary>
+    [VirtualKey("Browser Forward")]
+    BROWSER_FORWARD = 167,
+
+    /// <summary>
+    /// Browser Refresh key.
+    /// </summary>
+    [VirtualKey("Browser Refresh")]
+    BROWSER_REFRESH = 168,
+
+    /// <summary>
+    /// Browser Stop key.
+    /// </summary>
+    [VirtualKey("Browser Stop")]
+    BROWSER_STOP = 169,
+
+    /// <summary>
+    /// Browser Search key.
+    /// </summary>
+    [VirtualKey("Browser Search")]
+    BROWSER_SEARCH = 170,
+
+    /// <summary>
+    /// Browser Favorites key.
+    /// </summary>
+    [VirtualKey("Browser Favorites")]
+    BROWSER_FAVORITES = 171,
+
+    /// <summary>
+    /// Browser Start and Home key.
+    /// </summary>
+    [VirtualKey("Browser Home")]
+    BROWSER_HOME = 172,
+
+    /// <summary>
+    /// Volume Mute key.
+    /// </summary>
+    [VirtualKey("Mute Volume")]
+    VOLUME_MUTE = 173,
+
+    /// <summary>
+    /// Volume Down key.
+    /// </summary>
+    [VirtualKey("Volume Down")]
+    VOLUME_DOWN = 174,
+
+    /// <summary>
+    /// Volume Up key.
+    /// </summary>
+    [VirtualKey("Volume Up")]
+    VOLUME_UP = 175,
+
+    /// <summary>
+    /// Next Track key.
+    /// </summary>
+    [VirtualKey("Next Track")]
+    MEDIA_NEXT_TRACK = 176,
+
+    /// <summary>
+    /// Previous Track key.
+    /// </summary>
+    [VirtualKey("Previous Track")]
+    MEDIA_PREV_TRACK = 177,
+
+    /// <summary>
+    /// Stop Media key.
+    /// </summary>
+    [VirtualKey("Stop Media")]
+    MEDIA_STOP = 178,
+
+    /// <summary>
+    /// Play/Pause Media key.
+    /// </summary>
+    [VirtualKey("Play/Pause Media")]
+    MEDIA_PLAY_PAUSE = 179,
+
+    /// <summary>
+    /// Start Mail key.
+    /// </summary>
+    [VirtualKey("Launch Mail")]
+    LAUNCH_MAIL = 180,
+
+    /// <summary>
+    /// Select Media key.
+    /// </summary>
+    [VirtualKey("Launch Media Player")]
+    LAUNCH_MEDIA_SELECT = 181,
+
+    /// <summary>
+    /// Start Application 1 key.
+    /// </summary>
+    [VirtualKey("Launch Application 1")]
+    LAUNCH_APP1 = 182,
+
+    /// <summary>
+    /// Start Application 2 key.
+    /// </summary>
+    [VirtualKey("Launch Application 2")]
+    LAUNCH_APP2 = 183,
+
+    /// <summary>
+    /// Used for miscellaneous characters; it can vary by keyboard..
+    /// </summary>
+    /// <remarks>
+    /// For the US standard keyboard, the ';:' key.
+    /// </remarks>
+    [VirtualKey("Semicolon")]
+    OEM_1 = 186,
+
+    /// <summary>
+    /// For any country/region, the '+' key.
+    /// </summary>
+    [VirtualKey("Plus")]
+    OEM_PLUS = 187,
+
+    /// <summary>
+    /// For any country/region, the ',' key.
+    /// </summary>
+    [VirtualKey("Comma")]
+    OEM_COMMA = 188,
+
+    /// <summary>
+    /// For any country/region, the '-' key.
+    /// </summary>
+    [VirtualKey("Minus")]
+    OEM_MINUS = 189,
+
+    /// <summary>
+    /// For any country/region, the '.' key.
+    /// </summary>
+    [VirtualKey("Period")]
+    OEM_PERIOD = 190,
+
+    /// <summary>
+    /// Used for miscellaneous characters; it can vary by keyboard..
+    /// </summary>
+    /// <remarks>
+    /// For the US standard keyboard, the '/?' key.
+    /// </remarks>
+    [VirtualKey("Forward Slash/Question Mark")]
+    OEM_2 = 191,
+
+    /// <summary>
+    /// Used for miscellaneous characters; it can vary by keyboard..
+    /// </summary>
+    /// <remarks>
+    /// For the US standard keyboard, the '`~' key.
+    /// </remarks>
+    [VirtualKey("Tilde")]
+    OEM_3 = 192,
+
+    /// <summary>
+    /// Used for miscellaneous characters; it can vary by keyboard..
+    /// </summary>
+    /// <remarks>
+    /// For the US standard keyboard, the '[{' key.
+    /// </remarks>
+    [VirtualKey("Opening Bracket")]
+    OEM_4 = 219,
+
+    /// <summary>
+    /// Used for miscellaneous characters; it can vary by keyboard..
+    /// </summary>
+    /// <remarks>
+    /// For the US standard keyboard, the '\|' key.
+    /// </remarks>
+    [VirtualKey("Back Slash/Pipe")]
+    OEM_5 = 220,
+
+    /// <summary>
+    /// Used for miscellaneous characters; it can vary by keyboard..
+    /// </summary>
+    /// <remarks>
+    /// For the US standard keyboard, the ']}' key.
+    /// </remarks>
+    [VirtualKey("Closing Bracket")]
+    OEM_6 = 221,
+
+    /// <summary>
+    /// Used for miscellaneous characters; it can vary by keyboard..
+    /// </summary>
+    /// <remarks>
+    /// For the US standard keyboard, the 'single-quote/double-quote' (''"') key.
+    /// </remarks>
+    [VirtualKey("Single Quote/Double Quote")]
+    OEM_7 = 222,
+
+    /// <summary>
+    /// Used for miscellaneous characters; it can vary by keyboard..
+    /// </summary>
+    [VirtualKey("OEM 8")]
+    OEM_8 = 223,
+
+    /// <summary>
+    /// OEM specific.
+    /// </summary>
+
+    /// <remarks>
+    /// 'AX' key on Japanese AX kbd.
+    /// </remarks>
+    [VirtualKey("OEM AX")]
+    OEM_AX = 225,
+
+    /// <summary>
+    /// Either the angle bracket ("&lt;&gt;") key or the backslash ("\|") key on the RT 102-key keyboard.
+    /// </summary>
+    [VirtualKey("OEM 102")]
+    OEM_102 = 226,
+
+    /// <summary>
+    /// OEM specific.
+    /// </summary>
+    /// <remarks>
+    /// Help key on ICO.
+    /// </remarks>
+    [VirtualKey("Help (ICO)")]
+    ICO_HELP = 227,
+
+    /// <summary>
+    /// OEM specific.
+    /// </summary>
+    /// <remarks>
+    /// 00 key on ICO.
+    /// </remarks>
+    [VirtualKey("00 (ICO)")]
+    ICO_00 = 228,
+
+    /// <summary>
+    /// IME PROCESS key.
+    /// </summary>
+    [VirtualKey("IME Process")]
+    PROCESSKEY = 229,
+
+    /// <summary>
+    /// OEM specific.
+    /// </summary>
+    /// <remarks>
+    /// Clear key on ICO.
+    /// </remarks>
+    [VirtualKey("Clear (ICO)")]
+    ICO_CLEAR = 230,
+
+    /// <summary>
+    /// Used to pass Unicode characters as if they were keystrokes. The PACKET key is the low word of a 32-bit Virtual Key
+    /// value used for non-keyboard input methods..
+    /// </summary>
+    /// <remarks>
+    /// For more information, see Remark in User32.KEYBDINPUT, User32.SendInput, User32.WindowMessage.WM_KEYDOWN, and
+    /// User32.WindowMessage.WM_KEYUP.
+    /// </remarks>
+    [VirtualKey("Packet")]
+    PACKET = 231,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM Reset")]
+    OEM_RESET = 233,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM Jump")]
+    OEM_JUMP = 234,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM PA1")]
+    OEM_PA1 = 235,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM PA2")]
+    OEM_PA2 = 236,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM PA3")]
+    OEM_PA3 = 237,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM WSCTRL")]
+    OEM_WSCTRL = 238,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM CUSEL")]
+    OEM_CUSEL = 239,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM ATTN")]
+    OEM_ATTN = 240,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM Finish")]
+    OEM_FINISH = 241,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM Copy")]
+    OEM_COPY = 242,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM Auto")]
+    OEM_AUTO = 243,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM ENLW")]
+    OEM_ENLW = 244,
+
+    /// <summary>
+    /// Nokia/Ericsson definition.
+    /// </summary>
+    [VirtualKey("OEM Backtab")]
+    OEM_BACKTAB = 245,
+
+    /// <summary>
+    /// Attn key.
+    /// </summary>
+    [VirtualKey("ATTN")]
+    ATTN = 246,
+
+    /// <summary>
+    /// CrSel key.
+    /// </summary>
+    [VirtualKey("CRSEL")]
+    CRSEL = 247,
+
+    /// <summary>
+    /// ExSel key.
+    /// </summary>
+    [VirtualKey("EXSEL")]
+    EXSEL = 248,
+
+    /// <summary>
+    /// Erase EOF key.
+    /// </summary>
+    [VirtualKey("Erase EOF")]
+    EREOF = 249,
+
+    /// <summary>
+    /// Play key.
+    /// </summary>
+    [VirtualKey("Play")]
+    PLAY = 250,
+
+    /// <summary>
+    /// Zoom key.
+    /// </summary>
+    [VirtualKey("Zoom")]
+    ZOOM = 251,
+
+    /// <summary>
+    /// Reserved constant by Windows headers definition.
+    /// </summary>
+    [VirtualKey("Reserved")]
+    NONAME = 252,
+
+    /// <summary>
+    /// PA1 key.
+    /// </summary>
+    [VirtualKey("PA1")]
+    PA1 = 253,
+
+    /// <summary>
+    /// Clear key.
+    /// </summary>
+    [VirtualKey("Clear")]
+    OEM_CLEAR = 254,
 }
diff --git a/Dalamud/Game/ClientState/Keys/VirtualKeyAttribute.cs b/Dalamud/Game/ClientState/Keys/VirtualKeyAttribute.cs
index 249491be7..6d0750f0d 100644
--- a/Dalamud/Game/ClientState/Keys/VirtualKeyAttribute.cs
+++ b/Dalamud/Game/ClientState/Keys/VirtualKeyAttribute.cs
@@ -1,25 +1,24 @@
 using System;
 
-namespace Dalamud.Game.ClientState.Keys
+namespace Dalamud.Game.ClientState.Keys;
+
+/// <summary>
+/// Attribute describing a VirtualKey.
+/// </summary>
+[AttributeUsage(AttributeTargets.Field)]
+internal sealed class VirtualKeyAttribute : Attribute
 {
     /// <summary>
-    /// Attribute describing a VirtualKey.
+    /// Initializes a new instance of the <see cref="VirtualKeyAttribute"/> class.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Field)]
-    internal sealed class VirtualKeyAttribute : Attribute
+    /// <param name="fancyName">Fancy name of this key.</param>
+    public VirtualKeyAttribute(string fancyName)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VirtualKeyAttribute"/> class.
-        /// </summary>
-        /// <param name="fancyName">Fancy name of this key.</param>
-        public VirtualKeyAttribute(string fancyName)
-        {
-            this.FancyName = fancyName;
-        }
-
-        /// <summary>
-        /// Gets the fancy name of this virtual key.
-        /// </summary>
-        public string FancyName { get; init; }
+        this.FancyName = fancyName;
     }
+
+    /// <summary>
+    /// Gets the fancy name of this virtual key.
+    /// </summary>
+    public string FancyName { get; init; }
 }
diff --git a/Dalamud/Game/ClientState/Keys/VirtualKeyExtensions.cs b/Dalamud/Game/ClientState/Keys/VirtualKeyExtensions.cs
index 2a94dd5df..22470fe99 100644
--- a/Dalamud/Game/ClientState/Keys/VirtualKeyExtensions.cs
+++ b/Dalamud/Game/ClientState/Keys/VirtualKeyExtensions.cs
@@ -1,20 +1,19 @@
 using Dalamud.Utility;
 
-namespace Dalamud.Game.ClientState.Keys
+namespace Dalamud.Game.ClientState.Keys;
+
+/// <summary>
+/// Extension methods for <see cref="VirtualKey"/>.
+/// </summary>
+public static class VirtualKeyExtensions
 {
     /// <summary>
-    /// Extension methods for <see cref="VirtualKey"/>.
+    /// Get the fancy name associated with this key.
     /// </summary>
-    public static class VirtualKeyExtensions
+    /// <param name="key">The they key to act on.</param>
+    /// <returns>The key's fancy name.</returns>
+    public static string GetFancyName(this VirtualKey key)
     {
-        /// <summary>
-        /// Get the fancy name associated with this key.
-        /// </summary>
-        /// <param name="key">The they key to act on.</param>
-        /// <returns>The key's fancy name.</returns>
-        public static string GetFancyName(this VirtualKey key)
-        {
-            return key.GetAttribute<VirtualKeyAttribute>().FancyName;
-        }
+        return key.GetAttribute<VirtualKeyAttribute>().FancyName;
     }
 }
diff --git a/Dalamud/Game/ClientState/Objects/Enums/BattleNpcSubKind.cs b/Dalamud/Game/ClientState/Objects/Enums/BattleNpcSubKind.cs
index 489891c45..dd6057d36 100644
--- a/Dalamud/Game/ClientState/Objects/Enums/BattleNpcSubKind.cs
+++ b/Dalamud/Game/ClientState/Objects/Enums/BattleNpcSubKind.cs
@@ -1,28 +1,27 @@
-namespace Dalamud.Game.ClientState.Objects.Enums
+namespace Dalamud.Game.ClientState.Objects.Enums;
+
+/// <summary>
+/// An Enum describing possible BattleNpc kinds.
+/// </summary>
+public enum BattleNpcSubKind : byte
 {
     /// <summary>
-    /// An Enum describing possible BattleNpc kinds.
+    /// Invalid BattleNpc.
     /// </summary>
-    public enum BattleNpcSubKind : byte
-    {
-        /// <summary>
-        /// Invalid BattleNpc.
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// BattleNpc representing a Pet.
-        /// </summary>
-        Pet = 2,
+    /// <summary>
+    /// BattleNpc representing a Pet.
+    /// </summary>
+    Pet = 2,
 
-        /// <summary>
-        /// BattleNpc representing a Chocobo.
-        /// </summary>
-        Chocobo = 3,
+    /// <summary>
+    /// BattleNpc representing a Chocobo.
+    /// </summary>
+    Chocobo = 3,
 
-        /// <summary>
-        /// BattleNpc representing a standard enemy.
-        /// </summary>
-        Enemy = 5,
-    }
+    /// <summary>
+    /// BattleNpc representing a standard enemy.
+    /// </summary>
+    Enemy = 5,
 }
diff --git a/Dalamud/Game/ClientState/Objects/Enums/CustomizeIndex.cs b/Dalamud/Game/ClientState/Objects/Enums/CustomizeIndex.cs
index b1827c0c5..299583fd3 100644
--- a/Dalamud/Game/ClientState/Objects/Enums/CustomizeIndex.cs
+++ b/Dalamud/Game/ClientState/Objects/Enums/CustomizeIndex.cs
@@ -1,139 +1,138 @@
-namespace Dalamud.Game.ClientState.Objects.Enums
+namespace Dalamud.Game.ClientState.Objects.Enums;
+
+/// <summary>
+/// This enum describes the indices of the Customize array.
+/// </summary>
+// TODO: This may need some rework since it may not be entirely accurate (stolen from Sapphire)
+public enum CustomizeIndex
 {
     /// <summary>
-    /// This enum describes the indices of the Customize array.
+    /// The race of the character.
     /// </summary>
-    // TODO: This may need some rework since it may not be entirely accurate (stolen from Sapphire)
-    public enum CustomizeIndex
-    {
-        /// <summary>
-        /// The race of the character.
-        /// </summary>
-        Race = 0x00,
+    Race = 0x00,
 
-        /// <summary>
-        /// The gender of the character.
-        /// </summary>
-        Gender = 0x01,
+    /// <summary>
+    /// The gender of the character.
+    /// </summary>
+    Gender = 0x01,
 
-        /// <summary>
-        /// The tribe of the character.
-        /// </summary>
-        Tribe = 0x04,
+    /// <summary>
+    /// The tribe of the character.
+    /// </summary>
+    Tribe = 0x04,
 
-        /// <summary>
-        /// The height of the character.
-        /// </summary>
-        Height = 0x03,
+    /// <summary>
+    /// The height of the character.
+    /// </summary>
+    Height = 0x03,
 
-        /// <summary>
-        /// The model type of the character.
-        /// </summary>
-        ModelType = 0x02, // Au Ra: changes horns/tails, everything else: seems to drastically change appearance (flip between two sets, odd/even numbers). sometimes retains hairstyle and other features
+    /// <summary>
+    /// The model type of the character.
+    /// </summary>
+    ModelType = 0x02, // Au Ra: changes horns/tails, everything else: seems to drastically change appearance (flip between two sets, odd/even numbers). sometimes retains hairstyle and other features
 
-        /// <summary>
-        /// The face type of the character.
-        /// </summary>
-        FaceType = 0x05,
+    /// <summary>
+    /// The face type of the character.
+    /// </summary>
+    FaceType = 0x05,
 
-        /// <summary>
-        /// The hair of the character.
-        /// </summary>
-        HairStyle = 0x06,
+    /// <summary>
+    /// The hair of the character.
+    /// </summary>
+    HairStyle = 0x06,
 
-        /// <summary>
-        /// Whether or not the character has hair highlights.
-        /// </summary>
-        HasHighlights = 0x07, // negative to enable, positive to disable
+    /// <summary>
+    /// Whether or not the character has hair highlights.
+    /// </summary>
+    HasHighlights = 0x07, // negative to enable, positive to disable
 
-        /// <summary>
-        /// The skin color of the character.
-        /// </summary>
-        SkinColor = 0x08,
+    /// <summary>
+    /// The skin color of the character.
+    /// </summary>
+    SkinColor = 0x08,
 
-        /// <summary>
-        /// The eye color of the character.
-        /// </summary>
-        EyeColor = 0x09, // color of character's right eye
+    /// <summary>
+    /// The eye color of the character.
+    /// </summary>
+    EyeColor = 0x09, // color of character's right eye
 
-        /// <summary>
-        /// The hair color of the character.
-        /// </summary>
-        HairColor = 0x0A, // main color
+    /// <summary>
+    /// The hair color of the character.
+    /// </summary>
+    HairColor = 0x0A, // main color
 
-        /// <summary>
-        /// The highlights hair color of the character.
-        /// </summary>
-        HairColor2 = 0x0B, // highlights color
+    /// <summary>
+    /// The highlights hair color of the character.
+    /// </summary>
+    HairColor2 = 0x0B, // highlights color
 
-        /// <summary>
-        /// The face features of the character.
-        /// </summary>
-        FaceFeatures = 0x0C, // seems to be a toggle, (-odd and +even for large face covering), opposite for small
+    /// <summary>
+    /// The face features of the character.
+    /// </summary>
+    FaceFeatures = 0x0C, // seems to be a toggle, (-odd and +even for large face covering), opposite for small
 
-        /// <summary>
-        /// The color of the face features of the character.
-        /// </summary>
-        FaceFeaturesColor = 0x0D,
+    /// <summary>
+    /// The color of the face features of the character.
+    /// </summary>
+    FaceFeaturesColor = 0x0D,
 
-        /// <summary>
-        /// The eyebrows of the character.
-        /// </summary>
-        Eyebrows = 0x0E,
+    /// <summary>
+    /// The eyebrows of the character.
+    /// </summary>
+    Eyebrows = 0x0E,
 
-        /// <summary>
-        /// The 2nd eye color of the character.
-        /// </summary>
-        EyeColor2 = 0x0F, // color of character's left eye
+    /// <summary>
+    /// The 2nd eye color of the character.
+    /// </summary>
+    EyeColor2 = 0x0F, // color of character's left eye
 
-        /// <summary>
-        /// The eye shape of the character.
-        /// </summary>
-        EyeShape = 0x10,
+    /// <summary>
+    /// The eye shape of the character.
+    /// </summary>
+    EyeShape = 0x10,
 
-        /// <summary>
-        /// The nose shape of the character.
-        /// </summary>
-        NoseShape = 0x11,
+    /// <summary>
+    /// The nose shape of the character.
+    /// </summary>
+    NoseShape = 0x11,
 
-        /// <summary>
-        /// The jaw shape of the character.
-        /// </summary>
-        JawShape = 0x12,
+    /// <summary>
+    /// The jaw shape of the character.
+    /// </summary>
+    JawShape = 0x12,
 
-        /// <summary>
-        /// The lip style of the character.
-        /// </summary>
-        LipStyle = 0x13, // lip colour depth and shape (negative values around -120 darker/more noticeable, positive no colour)
+    /// <summary>
+    /// The lip style of the character.
+    /// </summary>
+    LipStyle = 0x13, // lip colour depth and shape (negative values around -120 darker/more noticeable, positive no colour)
 
-        /// <summary>
-        /// The lip color of the character.
-        /// </summary>
-        LipColor = 0x14,
+    /// <summary>
+    /// The lip color of the character.
+    /// </summary>
+    LipColor = 0x14,
 
-        /// <summary>
-        /// The race feature size of the character.
-        /// </summary>
-        RaceFeatureSize = 0x15,
+    /// <summary>
+    /// The race feature size of the character.
+    /// </summary>
+    RaceFeatureSize = 0x15,
 
-        /// <summary>
-        /// The race feature type of the character.
-        /// </summary>
-        RaceFeatureType = 0x16, // negative or out of range tail shapes for race result in no tail (e.g. Au Ra has max of 4 tail shapes), incorrect value can crash client
+    /// <summary>
+    /// The race feature type of the character.
+    /// </summary>
+    RaceFeatureType = 0x16, // negative or out of range tail shapes for race result in no tail (e.g. Au Ra has max of 4 tail shapes), incorrect value can crash client
 
-        /// <summary>
-        /// The bust size of the character.
-        /// </summary>
-        BustSize = 0x17, // char creator allows up to max of 100, i set to 127 cause who wouldnt but no visible difference
+    /// <summary>
+    /// The bust size of the character.
+    /// </summary>
+    BustSize = 0x17, // char creator allows up to max of 100, i set to 127 cause who wouldnt but no visible difference
 
-        /// <summary>
-        /// The face paint of the character.
-        /// </summary>
-        Facepaint = 0x18,
+    /// <summary>
+    /// The face paint of the character.
+    /// </summary>
+    Facepaint = 0x18,
 
-        /// <summary>
-        /// The face paint color of the character.
-        /// </summary>
-        FacepaintColor = 0x19,
-    }
+    /// <summary>
+    /// The face paint color of the character.
+    /// </summary>
+    FacepaintColor = 0x19,
 }
diff --git a/Dalamud/Game/ClientState/Objects/Enums/ObjectKind.cs b/Dalamud/Game/ClientState/Objects/Enums/ObjectKind.cs
index 038bce143..6bfb80863 100644
--- a/Dalamud/Game/ClientState/Objects/Enums/ObjectKind.cs
+++ b/Dalamud/Game/ClientState/Objects/Enums/ObjectKind.cs
@@ -1,83 +1,82 @@
-namespace Dalamud.Game.ClientState.Objects.Enums
+namespace Dalamud.Game.ClientState.Objects.Enums;
+
+/// <summary>
+/// Enum describing possible entity kinds.
+/// </summary>
+public enum ObjectKind : byte
 {
     /// <summary>
-    /// Enum describing possible entity kinds.
+    /// Invalid character.
     /// </summary>
-    public enum ObjectKind : byte
-    {
-        /// <summary>
-        /// Invalid character.
-        /// </summary>
-        None = 0x00,
+    None = 0x00,
 
-        /// <summary>
-        /// Objects representing player characters.
-        /// </summary>
-        Player = 0x01,
+    /// <summary>
+    /// Objects representing player characters.
+    /// </summary>
+    Player = 0x01,
 
-        /// <summary>
-        /// Objects representing battle NPCs.
-        /// </summary>
-        BattleNpc = 0x02,
+    /// <summary>
+    /// Objects representing battle NPCs.
+    /// </summary>
+    BattleNpc = 0x02,
 
-        /// <summary>
-        /// Objects representing event NPCs.
-        /// </summary>
-        EventNpc = 0x03,
+    /// <summary>
+    /// Objects representing event NPCs.
+    /// </summary>
+    EventNpc = 0x03,
 
-        /// <summary>
-        /// Objects representing treasures.
-        /// </summary>
-        Treasure = 0x04,
+    /// <summary>
+    /// Objects representing treasures.
+    /// </summary>
+    Treasure = 0x04,
 
-        /// <summary>
-        /// Objects representing aetherytes.
-        /// </summary>
-        Aetheryte = 0x05,
+    /// <summary>
+    /// Objects representing aetherytes.
+    /// </summary>
+    Aetheryte = 0x05,
 
-        /// <summary>
-        /// Objects representing gathering points.
-        /// </summary>
-        GatheringPoint = 0x06,
+    /// <summary>
+    /// Objects representing gathering points.
+    /// </summary>
+    GatheringPoint = 0x06,
 
-        /// <summary>
-        /// Objects representing event objects.
-        /// </summary>
-        EventObj = 0x07,
+    /// <summary>
+    /// Objects representing event objects.
+    /// </summary>
+    EventObj = 0x07,
 
-        /// <summary>
-        /// Objects representing mounts.
-        /// </summary>
-        MountType = 0x08,
+    /// <summary>
+    /// Objects representing mounts.
+    /// </summary>
+    MountType = 0x08,
 
-        /// <summary>
-        /// Objects representing minions.
-        /// </summary>
-        Companion = 0x09, // Minion
+    /// <summary>
+    /// Objects representing minions.
+    /// </summary>
+    Companion = 0x09, // Minion
 
-        /// <summary>
-        /// Objects representing retainers.
-        /// </summary>
-        Retainer = 0x0A,
+    /// <summary>
+    /// Objects representing retainers.
+    /// </summary>
+    Retainer = 0x0A,
 
-        /// <summary>
-        /// Objects representing area objects.
-        /// </summary>
-        Area = 0x0B,
+    /// <summary>
+    /// Objects representing area objects.
+    /// </summary>
+    Area = 0x0B,
 
-        /// <summary>
-        /// Objects representing housing objects.
-        /// </summary>
-        Housing = 0x0C,
+    /// <summary>
+    /// Objects representing housing objects.
+    /// </summary>
+    Housing = 0x0C,
 
-        /// <summary>
-        /// Objects representing cutscene objects.
-        /// </summary>
-        Cutscene = 0x0D,
+    /// <summary>
+    /// Objects representing cutscene objects.
+    /// </summary>
+    Cutscene = 0x0D,
 
-        /// <summary>
-        /// Objects representing card stand objects.
-        /// </summary>
-        CardStand = 0x0E,
-    }
+    /// <summary>
+    /// Objects representing card stand objects.
+    /// </summary>
+    CardStand = 0x0E,
 }
diff --git a/Dalamud/Game/ClientState/Objects/Enums/StatusFlags.cs b/Dalamud/Game/ClientState/Objects/Enums/StatusFlags.cs
index 43587c66b..2fed2a655 100644
--- a/Dalamud/Game/ClientState/Objects/Enums/StatusFlags.cs
+++ b/Dalamud/Game/ClientState/Objects/Enums/StatusFlags.cs
@@ -1,56 +1,55 @@
 using System;
 
-namespace Dalamud.Game.ClientState.Objects.Enums
+namespace Dalamud.Game.ClientState.Objects.Enums;
+
+/// <summary>
+/// Enum describing possible status flags.
+/// </summary>
+[Flags]
+public enum StatusFlags : byte
 {
     /// <summary>
-    /// Enum describing possible status flags.
+    /// No status flags set.
     /// </summary>
-    [Flags]
-    public enum StatusFlags : byte
-    {
-        /// <summary>
-        /// No status flags set.
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// Hostile character.
-        /// </summary>
-        Hostile = 1,
+    /// <summary>
+    /// Hostile character.
+    /// </summary>
+    Hostile = 1,
 
-        /// <summary>
-        /// Character in combat.
-        /// </summary>
-        InCombat = 2,
+    /// <summary>
+    /// Character in combat.
+    /// </summary>
+    InCombat = 2,
 
-        /// <summary>
-        /// Character weapon is out.
-        /// </summary>
-        WeaponOut = 4,
+    /// <summary>
+    /// Character weapon is out.
+    /// </summary>
+    WeaponOut = 4,
 
-        /// <summary>
-        /// Character offhand is out.
-        /// </summary>
-        OffhandOut = 8,
+    /// <summary>
+    /// Character offhand is out.
+    /// </summary>
+    OffhandOut = 8,
 
-        /// <summary>
-        /// Character is a party member.
-        /// </summary>
-        PartyMember = 16,
+    /// <summary>
+    /// Character is a party member.
+    /// </summary>
+    PartyMember = 16,
 
-        /// <summary>
-        /// Character is a alliance member.
-        /// </summary>
-        AllianceMember = 32,
+    /// <summary>
+    /// Character is a alliance member.
+    /// </summary>
+    AllianceMember = 32,
 
-        /// <summary>
-        /// Character is in friend list.
-        /// </summary>
-        Friend = 64,
+    /// <summary>
+    /// Character is in friend list.
+    /// </summary>
+    Friend = 64,
 
-        /// <summary>
-        /// Character is casting.
-        /// </summary>
-        IsCasting = 128,
-    }
+    /// <summary>
+    /// Character is casting.
+    /// </summary>
+    IsCasting = 128,
 }
diff --git a/Dalamud/Game/ClientState/Objects/ObjectTable.cs b/Dalamud/Game/ClientState/Objects/ObjectTable.cs
index 71c439f64..babb9f5d6 100644
--- a/Dalamud/Game/ClientState/Objects/ObjectTable.cs
+++ b/Dalamud/Game/ClientState/Objects/ObjectTable.cs
@@ -9,138 +9,137 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.ClientState.Objects
+namespace Dalamud.Game.ClientState.Objects;
+
+/// <summary>
+/// This collection represents the currently spawned FFXIV game objects.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed partial class ObjectTable : IServiceType
 {
-    /// <summary>
-    /// This collection represents the currently spawned FFXIV game objects.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed partial class ObjectTable : IServiceType
+    private const int ObjectTableLength = 596;
+
+    private readonly ClientStateAddressResolver address;
+
+    [ServiceManager.ServiceConstructor]
+    private ObjectTable(ClientState clientState)
     {
-        private const int ObjectTableLength = 596;
+        this.address = clientState.AddressResolver;
 
-        private readonly ClientStateAddressResolver address;
+        Log.Verbose($"Object table address 0x{this.address.ObjectTable.ToInt64():X}");
+    }
 
-        [ServiceManager.ServiceConstructor]
-        private ObjectTable(ClientState clientState)
+    /// <summary>
+    /// Gets the address of the object table.
+    /// </summary>
+    public IntPtr Address => this.address.ObjectTable;
+
+    /// <summary>
+    /// Gets the length of the object table.
+    /// </summary>
+    public int Length => ObjectTableLength;
+
+    /// <summary>
+    /// Get an object at the specified spawn index.
+    /// </summary>
+    /// <param name="index">Spawn index.</param>
+    /// <returns>An <see cref="GameObject"/> at the specified spawn index.</returns>
+    public GameObject? this[int index]
+    {
+        get
         {
-            this.address = clientState.AddressResolver;
-
-            Log.Verbose($"Object table address 0x{this.address.ObjectTable.ToInt64():X}");
-        }
-
-        /// <summary>
-        /// Gets the address of the object table.
-        /// </summary>
-        public IntPtr Address => this.address.ObjectTable;
-
-        /// <summary>
-        /// Gets the length of the object table.
-        /// </summary>
-        public int Length => ObjectTableLength;
-
-        /// <summary>
-        /// Get an object at the specified spawn index.
-        /// </summary>
-        /// <param name="index">Spawn index.</param>
-        /// <returns>An <see cref="GameObject"/> at the specified spawn index.</returns>
-        public GameObject? this[int index]
-        {
-            get
-            {
-                var address = this.GetObjectAddress(index);
-                return this.CreateObjectReference(address);
-            }
-        }
-
-        /// <summary>
-        /// Search for a game object by their Object ID.
-        /// </summary>
-        /// <param name="objectId">Object ID to find.</param>
-        /// <returns>A game object or null.</returns>
-        public GameObject? SearchById(uint objectId)
-        {
-            if (objectId is GameObject.InvalidGameObjectId or 0)
-                return null;
-
-            foreach (var obj in this)
-            {
-                if (obj == null)
-                    continue;
-
-                if (obj.ObjectId == objectId)
-                    return obj;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets the address of the game object at the specified index of the object table.
-        /// </summary>
-        /// <param name="index">The index of the object.</param>
-        /// <returns>The memory address of the object.</returns>
-        public unsafe IntPtr GetObjectAddress(int index)
-        {
-            if (index < 0 || index >= ObjectTableLength)
-                return IntPtr.Zero;
-
-            return *(IntPtr*)(this.address.ObjectTable + (8 * index));
-        }
-
-        /// <summary>
-        /// Create a reference to an FFXIV game object.
-        /// </summary>
-        /// <param name="address">The address of the object in memory.</param>
-        /// <returns><see cref="GameObject"/> object or inheritor containing the requested data.</returns>
-        public unsafe GameObject? CreateObjectReference(IntPtr address)
-        {
-            var clientState = Service<ClientState>.GetNullable();
-
-            if (clientState == null || clientState.LocalContentId == 0)
-                return null;
-
-            if (address == IntPtr.Zero)
-                return null;
-
-            var obj = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)address;
-            var objKind = (ObjectKind)obj->ObjectKind;
-            return objKind switch
-            {
-                ObjectKind.Player => new PlayerCharacter(address),
-                ObjectKind.BattleNpc => new BattleNpc(address),
-                ObjectKind.EventObj => new EventObj(address),
-                ObjectKind.Companion => new Npc(address),
-                _ => new GameObject(address),
-            };
+            var address = this.GetObjectAddress(index);
+            return this.CreateObjectReference(address);
         }
     }
 
     /// <summary>
-    /// This collection represents the currently spawned FFXIV game objects.
+    /// Search for a game object by their Object ID.
     /// </summary>
-    public sealed partial class ObjectTable : IReadOnlyCollection<GameObject>
+    /// <param name="objectId">Object ID to find.</param>
+    /// <returns>A game object or null.</returns>
+    public GameObject? SearchById(uint objectId)
     {
-        /// <inheritdoc/>
-        int IReadOnlyCollection<GameObject>.Count => this.Length;
+        if (objectId is GameObject.InvalidGameObjectId or 0)
+            return null;
 
-        /// <inheritdoc/>
-        public IEnumerator<GameObject> GetEnumerator()
+        foreach (var obj in this)
         {
-            for (var i = 0; i < ObjectTableLength; i++)
-            {
-                var obj = this[i];
+            if (obj == null)
+                continue;
 
-                if (obj == null)
-                    continue;
-
-                yield return obj;
-            }
+            if (obj.ObjectId == objectId)
+                return obj;
         }
 
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the address of the game object at the specified index of the object table.
+    /// </summary>
+    /// <param name="index">The index of the object.</param>
+    /// <returns>The memory address of the object.</returns>
+    public unsafe IntPtr GetObjectAddress(int index)
+    {
+        if (index < 0 || index >= ObjectTableLength)
+            return IntPtr.Zero;
+
+        return *(IntPtr*)(this.address.ObjectTable + (8 * index));
+    }
+
+    /// <summary>
+    /// Create a reference to an FFXIV game object.
+    /// </summary>
+    /// <param name="address">The address of the object in memory.</param>
+    /// <returns><see cref="GameObject"/> object or inheritor containing the requested data.</returns>
+    public unsafe GameObject? CreateObjectReference(IntPtr address)
+    {
+        var clientState = Service<ClientState>.GetNullable();
+
+        if (clientState == null || clientState.LocalContentId == 0)
+            return null;
+
+        if (address == IntPtr.Zero)
+            return null;
+
+        var obj = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)address;
+        var objKind = (ObjectKind)obj->ObjectKind;
+        return objKind switch
+        {
+            ObjectKind.Player => new PlayerCharacter(address),
+            ObjectKind.BattleNpc => new BattleNpc(address),
+            ObjectKind.EventObj => new EventObj(address),
+            ObjectKind.Companion => new Npc(address),
+            _ => new GameObject(address),
+        };
     }
 }
+
+/// <summary>
+/// This collection represents the currently spawned FFXIV game objects.
+/// </summary>
+public sealed partial class ObjectTable : IReadOnlyCollection<GameObject>
+{
+    /// <inheritdoc/>
+    int IReadOnlyCollection<GameObject>.Count => this.Length;
+
+    /// <inheritdoc/>
+    public IEnumerator<GameObject> GetEnumerator()
+    {
+        for (var i = 0; i < ObjectTableLength; i++)
+        {
+            var obj = this[i];
+
+            if (obj == null)
+                continue;
+
+            yield return obj;
+        }
+    }
+
+    /// <inheritdoc/>
+    IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+}
diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs b/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
index 42bf16f15..cbdc44a4f 100644
--- a/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
+++ b/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
@@ -2,29 +2,28 @@ using System;
 
 using Dalamud.Game.ClientState.Objects.Enums;
 
-namespace Dalamud.Game.ClientState.Objects.Types
+namespace Dalamud.Game.ClientState.Objects.Types;
+
+/// <summary>
+/// This class represents a battle NPC.
+/// </summary>
+public unsafe class BattleNpc : BattleChara
 {
     /// <summary>
-    /// This class represents a battle NPC.
+    /// Initializes a new instance of the <see cref="BattleNpc"/> class.
+    /// Set up a new BattleNpc with the provided memory representation.
     /// </summary>
-    public unsafe class BattleNpc : BattleChara
+    /// <param name="address">The address of this actor in memory.</param>
+    internal BattleNpc(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BattleNpc"/> class.
-        /// Set up a new BattleNpc with the provided memory representation.
-        /// </summary>
-        /// <param name="address">The address of this actor in memory.</param>
-        internal BattleNpc(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the BattleNpc <see cref="BattleNpcSubKind" /> of this BattleNpc.
-        /// </summary>
-        public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind;
-
-        /// <inheritdoc/>
-        public override uint TargetObjectId => this.Struct->Character.TargetObjectID;
     }
+
+    /// <summary>
+    /// Gets the BattleNpc <see cref="BattleNpcSubKind" /> of this BattleNpc.
+    /// </summary>
+    public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind;
+
+    /// <inheritdoc/>
+    public override uint TargetObjectId => this.Struct->Character.TargetObjectID;
 }
diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/EventObj.cs b/Dalamud/Game/ClientState/Objects/SubKinds/EventObj.cs
index 61710f32b..9d977ec95 100644
--- a/Dalamud/Game/ClientState/Objects/SubKinds/EventObj.cs
+++ b/Dalamud/Game/ClientState/Objects/SubKinds/EventObj.cs
@@ -2,21 +2,20 @@ using System;
 
 using Dalamud.Game.ClientState.Objects.Types;
 
-namespace Dalamud.Game.ClientState.Objects.SubKinds
+namespace Dalamud.Game.ClientState.Objects.SubKinds;
+
+/// <summary>
+/// This class represents an EventObj.
+/// </summary>
+public unsafe class EventObj : GameObject
 {
     /// <summary>
-    /// This class represents an EventObj.
+    /// Initializes a new instance of the <see cref="EventObj"/> class.
+    /// Set up a new EventObj with the provided memory representation.
     /// </summary>
-    public unsafe class EventObj : GameObject
+    /// <param name="address">The address of this event object in memory.</param>
+    internal EventObj(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventObj"/> class.
-        /// Set up a new EventObj with the provided memory representation.
-        /// </summary>
-        /// <param name="address">The address of this event object in memory.</param>
-        internal EventObj(IntPtr address)
-            : base(address)
-        {
-        }
     }
 }
diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/Npc.cs b/Dalamud/Game/ClientState/Objects/SubKinds/Npc.cs
index 3d9ff17b9..802e647ff 100644
--- a/Dalamud/Game/ClientState/Objects/SubKinds/Npc.cs
+++ b/Dalamud/Game/ClientState/Objects/SubKinds/Npc.cs
@@ -2,21 +2,20 @@ using System;
 
 using Dalamud.Game.ClientState.Objects.Types;
 
-namespace Dalamud.Game.ClientState.Objects.SubKinds
+namespace Dalamud.Game.ClientState.Objects.SubKinds;
+
+/// <summary>
+/// This class represents a NPC.
+/// </summary>
+public unsafe class Npc : Character
 {
     /// <summary>
-    /// This class represents a NPC.
+    /// Initializes a new instance of the <see cref="Npc"/> class.
+    /// Set up a new NPC with the provided memory representation.
     /// </summary>
-    public unsafe class Npc : Character
+    /// <param name="address">The address of this actor in memory.</param>
+    internal Npc(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Npc"/> class.
-        /// Set up a new NPC with the provided memory representation.
-        /// </summary>
-        /// <param name="address">The address of this actor in memory.</param>
-        internal Npc(IntPtr address)
-            : base(address)
-        {
-        }
     }
 }
diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs b/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
index 121dae753..e998ae5e4 100644
--- a/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
+++ b/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
@@ -3,36 +3,35 @@ using System;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.ClientState.Resolvers;
 
-namespace Dalamud.Game.ClientState.Objects.SubKinds
+namespace Dalamud.Game.ClientState.Objects.SubKinds;
+
+/// <summary>
+/// This class represents a player character.
+/// </summary>
+public unsafe class PlayerCharacter : BattleChara
 {
     /// <summary>
-    /// This class represents a player character.
+    /// Initializes a new instance of the <see cref="PlayerCharacter"/> class.
+    /// This represents a player character.
     /// </summary>
-    public unsafe class PlayerCharacter : BattleChara
+    /// <param name="address">The address of this actor in memory.</param>
+    internal PlayerCharacter(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PlayerCharacter"/> class.
-        /// This represents a player character.
-        /// </summary>
-        /// <param name="address">The address of this actor in memory.</param>
-        internal PlayerCharacter(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the current <see cref="ExcelResolver{T}">world</see> of the character.
-        /// </summary>
-        public ExcelResolver<Lumina.Excel.GeneratedSheets.World> CurrentWorld => new(this.Struct->Character.CurrentWorld);
-
-        /// <summary>
-        /// Gets the home <see cref="ExcelResolver{T}">world</see> of the character.
-        /// </summary>
-        public ExcelResolver<Lumina.Excel.GeneratedSheets.World> HomeWorld => new(this.Struct->Character.HomeWorld);
-
-        /// <summary>
-        /// Gets the target actor ID of the PlayerCharacter.
-        /// </summary>
-        public override uint TargetObjectId => this.Struct->Character.PlayerTargetObjectID;
     }
+
+    /// <summary>
+    /// Gets the current <see cref="ExcelResolver{T}">world</see> of the character.
+    /// </summary>
+    public ExcelResolver<Lumina.Excel.GeneratedSheets.World> CurrentWorld => new(this.Struct->Character.CurrentWorld);
+
+    /// <summary>
+    /// Gets the home <see cref="ExcelResolver{T}">world</see> of the character.
+    /// </summary>
+    public ExcelResolver<Lumina.Excel.GeneratedSheets.World> HomeWorld => new(this.Struct->Character.HomeWorld);
+
+    /// <summary>
+    /// Gets the target actor ID of the PlayerCharacter.
+    /// </summary>
+    public override uint TargetObjectId => this.Struct->Character.PlayerTargetObjectID;
 }
diff --git a/Dalamud/Game/ClientState/Objects/TargetManager.cs b/Dalamud/Game/ClientState/Objects/TargetManager.cs
index 0c97c8bcf..ccd89e6a3 100644
--- a/Dalamud/Game/ClientState/Objects/TargetManager.cs
+++ b/Dalamud/Game/ClientState/Objects/TargetManager.cs
@@ -4,165 +4,164 @@ using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 
-namespace Dalamud.Game.ClientState.Objects
+namespace Dalamud.Game.ClientState.Objects;
+
+/// <summary>
+/// Get and set various kinds of targets for the player.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed unsafe class TargetManager : IServiceType
 {
-    /// <summary>
-    /// Get and set various kinds of targets for the player.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed unsafe class TargetManager : IServiceType
+    [ServiceManager.ServiceDependency]
+    private readonly ClientState clientState = Service<ClientState>.Get();
+
+    [ServiceManager.ServiceDependency]
+    private readonly ObjectTable objectTable = Service<ObjectTable>.Get();
+
+    private readonly ClientStateAddressResolver address;
+
+    [ServiceManager.ServiceConstructor]
+    private TargetManager()
     {
-        [ServiceManager.ServiceDependency]
-        private readonly ClientState clientState = Service<ClientState>.Get();
-
-        [ServiceManager.ServiceDependency]
-        private readonly ObjectTable objectTable = Service<ObjectTable>.Get();
-
-        private readonly ClientStateAddressResolver address;
-
-        [ServiceManager.ServiceConstructor]
-        private TargetManager()
-        {
-            this.address = this.clientState.AddressResolver;
-        }
-
-        /// <summary>
-        /// Gets the address of the target manager.
-        /// </summary>
-        public IntPtr Address => this.address.TargetManager;
-
-        /// <summary>
-        /// Gets or sets the current target.
-        /// </summary>
-        public GameObject? Target
-        {
-            get => this.objectTable.CreateObjectReference((IntPtr)Struct->Target);
-            set => this.SetTarget(value);
-        }
-
-        /// <summary>
-        /// Gets or sets the mouseover target.
-        /// </summary>
-        public GameObject? MouseOverTarget
-        {
-            get => this.objectTable.CreateObjectReference((IntPtr)Struct->MouseOverTarget);
-            set => this.SetMouseOverTarget(value);
-        }
-
-        /// <summary>
-        /// Gets or sets the focus target.
-        /// </summary>
-        public GameObject? FocusTarget
-        {
-            get => this.objectTable.CreateObjectReference((IntPtr)Struct->FocusTarget);
-            set => this.SetFocusTarget(value);
-        }
-
-        /// <summary>
-        /// Gets or sets the previous target.
-        /// </summary>
-        public GameObject? PreviousTarget
-        {
-            get => this.objectTable.CreateObjectReference((IntPtr)Struct->PreviousTarget);
-            set => this.SetPreviousTarget(value);
-        }
-
-        /// <summary>
-        /// Gets or sets the soft target.
-        /// </summary>
-        public GameObject? SoftTarget
-        {
-            get => this.objectTable.CreateObjectReference((IntPtr)Struct->SoftTarget);
-            set => this.SetSoftTarget(value);
-        }
-
-        private FFXIVClientStructs.FFXIV.Client.Game.Control.TargetSystem* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Control.TargetSystem*)this.Address;
-
-        /// <summary>
-        /// Sets the current target.
-        /// </summary>
-        /// <param name="actor">Actor to target.</param>
-        public void SetTarget(GameObject? actor) => this.SetTarget(actor?.Address ?? IntPtr.Zero);
-
-        /// <summary>
-        /// Sets the mouseover target.
-        /// </summary>
-        /// <param name="actor">Actor to target.</param>
-        public void SetMouseOverTarget(GameObject? actor) => this.SetMouseOverTarget(actor?.Address ?? IntPtr.Zero);
-
-        /// <summary>
-        /// Sets the focus target.
-        /// </summary>
-        /// <param name="actor">Actor to target.</param>
-        public void SetFocusTarget(GameObject? actor) => this.SetFocusTarget(actor?.Address ?? IntPtr.Zero);
-
-        /// <summary>
-        /// Sets the previous target.
-        /// </summary>
-        /// <param name="actor">Actor to target.</param>
-        public void SetPreviousTarget(GameObject? actor) => this.SetTarget(actor?.Address ?? IntPtr.Zero);
-
-        /// <summary>
-        /// Sets the soft target.
-        /// </summary>
-        /// <param name="actor">Actor to target.</param>
-        public void SetSoftTarget(GameObject? actor) => this.SetTarget(actor?.Address ?? IntPtr.Zero);
-
-        /// <summary>
-        /// Sets the current target.
-        /// </summary>
-        /// <param name="actorAddress">Actor (address) to target.</param>
-        public void SetTarget(IntPtr actorAddress) => Struct->Target = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)actorAddress;
-
-        /// <summary>
-        /// Sets the mouseover target.
-        /// </summary>
-        /// <param name="actorAddress">Actor (address) to target.</param>
-        public void SetMouseOverTarget(IntPtr actorAddress) => Struct->MouseOverTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)actorAddress;
-
-        /// <summary>
-        /// Sets the focus target.
-        /// </summary>
-        /// <param name="actorAddress">Actor (address) to target.</param>
-        public void SetFocusTarget(IntPtr actorAddress) => Struct->FocusTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)actorAddress;
-
-        /// <summary>
-        /// Sets the previous target.
-        /// </summary>
-        /// <param name="actorAddress">Actor (address) to target.</param>
-        public void SetPreviousTarget(IntPtr actorAddress) => Struct->PreviousTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)actorAddress;
-
-        /// <summary>
-        /// Sets the soft target.
-        /// </summary>
-        /// <param name="actorAddress">Actor (address) to target.</param>
-        public void SetSoftTarget(IntPtr actorAddress) => Struct->SoftTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)actorAddress;
-
-        /// <summary>
-        /// Clears the current target.
-        /// </summary>
-        public void ClearTarget() => this.SetTarget(IntPtr.Zero);
-
-        /// <summary>
-        /// Clears the mouseover target.
-        /// </summary>
-        public void ClearMouseOverTarget() => this.SetMouseOverTarget(IntPtr.Zero);
-
-        /// <summary>
-        /// Clears the focus target.
-        /// </summary>
-        public void ClearFocusTarget() => this.SetFocusTarget(IntPtr.Zero);
-
-        /// <summary>
-        /// Clears the previous target.
-        /// </summary>
-        public void ClearPreviousTarget() => this.SetPreviousTarget(IntPtr.Zero);
-
-        /// <summary>
-        /// Clears the soft target.
-        /// </summary>
-        public void ClearSoftTarget() => this.SetSoftTarget(IntPtr.Zero);
+        this.address = this.clientState.AddressResolver;
     }
+
+    /// <summary>
+    /// Gets the address of the target manager.
+    /// </summary>
+    public IntPtr Address => this.address.TargetManager;
+
+    /// <summary>
+    /// Gets or sets the current target.
+    /// </summary>
+    public GameObject? Target
+    {
+        get => this.objectTable.CreateObjectReference((IntPtr)Struct->Target);
+        set => this.SetTarget(value);
+    }
+
+    /// <summary>
+    /// Gets or sets the mouseover target.
+    /// </summary>
+    public GameObject? MouseOverTarget
+    {
+        get => this.objectTable.CreateObjectReference((IntPtr)Struct->MouseOverTarget);
+        set => this.SetMouseOverTarget(value);
+    }
+
+    /// <summary>
+    /// Gets or sets the focus target.
+    /// </summary>
+    public GameObject? FocusTarget
+    {
+        get => this.objectTable.CreateObjectReference((IntPtr)Struct->FocusTarget);
+        set => this.SetFocusTarget(value);
+    }
+
+    /// <summary>
+    /// Gets or sets the previous target.
+    /// </summary>
+    public GameObject? PreviousTarget
+    {
+        get => this.objectTable.CreateObjectReference((IntPtr)Struct->PreviousTarget);
+        set => this.SetPreviousTarget(value);
+    }
+
+    /// <summary>
+    /// Gets or sets the soft target.
+    /// </summary>
+    public GameObject? SoftTarget
+    {
+        get => this.objectTable.CreateObjectReference((IntPtr)Struct->SoftTarget);
+        set => this.SetSoftTarget(value);
+    }
+
+    private FFXIVClientStructs.FFXIV.Client.Game.Control.TargetSystem* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Control.TargetSystem*)this.Address;
+
+    /// <summary>
+    /// Sets the current target.
+    /// </summary>
+    /// <param name="actor">Actor to target.</param>
+    public void SetTarget(GameObject? actor) => this.SetTarget(actor?.Address ?? IntPtr.Zero);
+
+    /// <summary>
+    /// Sets the mouseover target.
+    /// </summary>
+    /// <param name="actor">Actor to target.</param>
+    public void SetMouseOverTarget(GameObject? actor) => this.SetMouseOverTarget(actor?.Address ?? IntPtr.Zero);
+
+    /// <summary>
+    /// Sets the focus target.
+    /// </summary>
+    /// <param name="actor">Actor to target.</param>
+    public void SetFocusTarget(GameObject? actor) => this.SetFocusTarget(actor?.Address ?? IntPtr.Zero);
+
+    /// <summary>
+    /// Sets the previous target.
+    /// </summary>
+    /// <param name="actor">Actor to target.</param>
+    public void SetPreviousTarget(GameObject? actor) => this.SetTarget(actor?.Address ?? IntPtr.Zero);
+
+    /// <summary>
+    /// Sets the soft target.
+    /// </summary>
+    /// <param name="actor">Actor to target.</param>
+    public void SetSoftTarget(GameObject? actor) => this.SetTarget(actor?.Address ?? IntPtr.Zero);
+
+    /// <summary>
+    /// Sets the current target.
+    /// </summary>
+    /// <param name="actorAddress">Actor (address) to target.</param>
+    public void SetTarget(IntPtr actorAddress) => Struct->Target = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)actorAddress;
+
+    /// <summary>
+    /// Sets the mouseover target.
+    /// </summary>
+    /// <param name="actorAddress">Actor (address) to target.</param>
+    public void SetMouseOverTarget(IntPtr actorAddress) => Struct->MouseOverTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)actorAddress;
+
+    /// <summary>
+    /// Sets the focus target.
+    /// </summary>
+    /// <param name="actorAddress">Actor (address) to target.</param>
+    public void SetFocusTarget(IntPtr actorAddress) => Struct->FocusTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)actorAddress;
+
+    /// <summary>
+    /// Sets the previous target.
+    /// </summary>
+    /// <param name="actorAddress">Actor (address) to target.</param>
+    public void SetPreviousTarget(IntPtr actorAddress) => Struct->PreviousTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)actorAddress;
+
+    /// <summary>
+    /// Sets the soft target.
+    /// </summary>
+    /// <param name="actorAddress">Actor (address) to target.</param>
+    public void SetSoftTarget(IntPtr actorAddress) => Struct->SoftTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)actorAddress;
+
+    /// <summary>
+    /// Clears the current target.
+    /// </summary>
+    public void ClearTarget() => this.SetTarget(IntPtr.Zero);
+
+    /// <summary>
+    /// Clears the mouseover target.
+    /// </summary>
+    public void ClearMouseOverTarget() => this.SetMouseOverTarget(IntPtr.Zero);
+
+    /// <summary>
+    /// Clears the focus target.
+    /// </summary>
+    public void ClearFocusTarget() => this.SetFocusTarget(IntPtr.Zero);
+
+    /// <summary>
+    /// Clears the previous target.
+    /// </summary>
+    public void ClearPreviousTarget() => this.SetPreviousTarget(IntPtr.Zero);
+
+    /// <summary>
+    /// Clears the soft target.
+    /// </summary>
+    public void ClearSoftTarget() => this.SetSoftTarget(IntPtr.Zero);
 }
diff --git a/Dalamud/Game/ClientState/Objects/Types/BattleChara.cs b/Dalamud/Game/ClientState/Objects/Types/BattleChara.cs
index a3f9b9f89..651f97834 100644
--- a/Dalamud/Game/ClientState/Objects/Types/BattleChara.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/BattleChara.cs
@@ -2,66 +2,65 @@ using System;
 
 using Dalamud.Game.ClientState.Statuses;
 
-namespace Dalamud.Game.ClientState.Objects.Types
+namespace Dalamud.Game.ClientState.Objects.Types;
+
+/// <summary>
+/// This class represents the battle characters.
+/// </summary>
+public unsafe class BattleChara : Character
 {
     /// <summary>
-    /// This class represents the battle characters.
+    /// Initializes a new instance of the <see cref="BattleChara"/> class.
+    /// This represents a battle character.
     /// </summary>
-    public unsafe class BattleChara : Character
+    /// <param name="address">The address of this character in memory.</param>
+    internal BattleChara(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BattleChara"/> class.
-        /// This represents a battle character.
-        /// </summary>
-        /// <param name="address">The address of this character in memory.</param>
-        internal BattleChara(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the current status effects.
-        /// </summary>
-        public StatusList StatusList => new(&this.Struct->StatusManager);
-
-        /// <summary>
-        /// Gets a value indicating whether the chara is currently casting.
-        /// </summary>
-        public bool IsCasting => this.Struct->SpellCastInfo.IsCasting > 0;
-
-        /// <summary>
-        /// Gets a value indicating whether the cast is interruptible.
-        /// </summary>
-        public bool IsCastInterruptible => this.Struct->SpellCastInfo.Interruptible > 0;
-
-        /// <summary>
-        /// Gets the spell action type of the spell being cast by the actor.
-        /// </summary>
-        public byte CastActionType => (byte)this.Struct->SpellCastInfo.ActionType;
-
-        /// <summary>
-        /// Gets the spell action ID of the spell being cast by the actor.
-        /// </summary>
-        public uint CastActionId => this.Struct->SpellCastInfo.ActionID;
-
-        /// <summary>
-        /// Gets the object ID of the target currently being cast at by the chara.
-        /// </summary>
-        public uint CastTargetObjectId => this.Struct->SpellCastInfo.CastTargetID;
-
-        /// <summary>
-        /// Gets the current casting time of the spell being cast by the chara.
-        /// </summary>
-        public float CurrentCastTime => this.Struct->SpellCastInfo.CurrentCastTime;
-
-        /// <summary>
-        /// Gets the total casting time of the spell being cast by the chara.
-        /// </summary>
-        public float TotalCastTime => this.Struct->SpellCastInfo.TotalCastTime;
-
-        /// <summary>
-        /// Gets the underlying structure.
-        /// </summary>
-        protected internal new FFXIVClientStructs.FFXIV.Client.Game.Character.BattleChara* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Character.BattleChara*)this.Address;
     }
+
+    /// <summary>
+    /// Gets the current status effects.
+    /// </summary>
+    public StatusList StatusList => new(&this.Struct->StatusManager);
+
+    /// <summary>
+    /// Gets a value indicating whether the chara is currently casting.
+    /// </summary>
+    public bool IsCasting => this.Struct->SpellCastInfo.IsCasting > 0;
+
+    /// <summary>
+    /// Gets a value indicating whether the cast is interruptible.
+    /// </summary>
+    public bool IsCastInterruptible => this.Struct->SpellCastInfo.Interruptible > 0;
+
+    /// <summary>
+    /// Gets the spell action type of the spell being cast by the actor.
+    /// </summary>
+    public byte CastActionType => (byte)this.Struct->SpellCastInfo.ActionType;
+
+    /// <summary>
+    /// Gets the spell action ID of the spell being cast by the actor.
+    /// </summary>
+    public uint CastActionId => this.Struct->SpellCastInfo.ActionID;
+
+    /// <summary>
+    /// Gets the object ID of the target currently being cast at by the chara.
+    /// </summary>
+    public uint CastTargetObjectId => this.Struct->SpellCastInfo.CastTargetID;
+
+    /// <summary>
+    /// Gets the current casting time of the spell being cast by the chara.
+    /// </summary>
+    public float CurrentCastTime => this.Struct->SpellCastInfo.CurrentCastTime;
+
+    /// <summary>
+    /// Gets the total casting time of the spell being cast by the chara.
+    /// </summary>
+    public float TotalCastTime => this.Struct->SpellCastInfo.TotalCastTime;
+
+    /// <summary>
+    /// Gets the underlying structure.
+    /// </summary>
+    protected internal new FFXIVClientStructs.FFXIV.Client.Game.Character.BattleChara* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Character.BattleChara*)this.Address;
 }
diff --git a/Dalamud/Game/ClientState/Objects/Types/Character.cs b/Dalamud/Game/ClientState/Objects/Types/Character.cs
index 666223429..093da7ebd 100644
--- a/Dalamud/Game/ClientState/Objects/Types/Character.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/Character.cs
@@ -6,107 +6,106 @@ using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Memory;
 using Lumina.Excel.GeneratedSheets;
 
-namespace Dalamud.Game.ClientState.Objects.Types
+namespace Dalamud.Game.ClientState.Objects.Types;
+
+/// <summary>
+/// This class represents the base for non-static entities.
+/// </summary>
+public unsafe class Character : GameObject
 {
     /// <summary>
-    /// This class represents the base for non-static entities.
+    /// Initializes a new instance of the <see cref="Character"/> class.
+    /// This represents a non-static entity.
     /// </summary>
-    public unsafe class Character : GameObject
+    /// <param name="address">The address of this character in memory.</param>
+    internal Character(IntPtr address)
+        : base(address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Character"/> class.
-        /// This represents a non-static entity.
-        /// </summary>
-        /// <param name="address">The address of this character in memory.</param>
-        internal Character(IntPtr address)
-            : base(address)
-        {
-        }
-
-        /// <summary>
-        /// Gets the current HP of this Chara.
-        /// </summary>
-        public uint CurrentHp => this.Struct->Health;
-
-        /// <summary>
-        /// Gets the maximum HP of this Chara.
-        /// </summary>
-        public uint MaxHp => this.Struct->MaxHealth;
-
-        /// <summary>
-        /// Gets the current MP of this Chara.
-        /// </summary>
-        public uint CurrentMp => this.Struct->Mana;
-
-        /// <summary>
-        /// Gets the maximum MP of this Chara.
-        /// </summary>
-        public uint MaxMp => this.Struct->MaxMana;
-
-        /// <summary>
-        /// Gets the current GP of this Chara.
-        /// </summary>
-        public uint CurrentGp => this.Struct->GatheringPoints;
-
-        /// <summary>
-        /// Gets the maximum GP of this Chara.
-        /// </summary>
-        public uint MaxGp => this.Struct->MaxGatheringPoints;
-
-        /// <summary>
-        /// Gets the current CP of this Chara.
-        /// </summary>
-        public uint CurrentCp => this.Struct->CraftingPoints;
-
-        /// <summary>
-        /// Gets the maximum CP of this Chara.
-        /// </summary>
-        public uint MaxCp => this.Struct->MaxCraftingPoints;
-
-        /// <summary>
-        /// Gets the ClassJob of this Chara.
-        /// </summary>
-        public ExcelResolver<ClassJob> ClassJob => new(this.Struct->ClassJob);
-
-        /// <summary>
-        /// Gets the level of this Chara.
-        /// </summary>
-        public byte Level => this.Struct->Level;
-
-        /// <summary>
-        /// Gets a byte array describing the visual appearance of this Chara.
-        /// Indexed by <see cref="CustomizeIndex"/>.
-        /// </summary>
-        public byte[] Customize => MemoryHelper.Read<byte>((IntPtr)this.Struct->CustomizeData, 28);
-
-        /// <summary>
-        /// Gets the Free Company tag of this chara.
-        /// </summary>
-        public SeString CompanyTag => MemoryHelper.ReadSeString((IntPtr)this.Struct->FreeCompanyTag, 6);
-
-        /// <summary>
-        /// Gets the target object ID of the character.
-        /// </summary>
-        public override uint TargetObjectId => this.Struct->TargetObjectID;
-
-        /// <summary>
-        /// Gets the name ID of the character.
-        /// </summary>
-        public uint NameId => this.Struct->NameID;
-
-        /// <summary>
-        /// Gets the current online status of the character.
-        /// </summary>
-        public ExcelResolver<OnlineStatus> OnlineStatus => new(this.Struct->OnlineStatus);
-
-        /// <summary>
-        /// Gets the status flags.
-        /// </summary>
-        public StatusFlags StatusFlags => (StatusFlags)this.Struct->StatusFlags;
-
-        /// <summary>
-        /// Gets the underlying structure.
-        /// </summary>
-        protected internal new FFXIVClientStructs.FFXIV.Client.Game.Character.Character* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)this.Address;
     }
+
+    /// <summary>
+    /// Gets the current HP of this Chara.
+    /// </summary>
+    public uint CurrentHp => this.Struct->Health;
+
+    /// <summary>
+    /// Gets the maximum HP of this Chara.
+    /// </summary>
+    public uint MaxHp => this.Struct->MaxHealth;
+
+    /// <summary>
+    /// Gets the current MP of this Chara.
+    /// </summary>
+    public uint CurrentMp => this.Struct->Mana;
+
+    /// <summary>
+    /// Gets the maximum MP of this Chara.
+    /// </summary>
+    public uint MaxMp => this.Struct->MaxMana;
+
+    /// <summary>
+    /// Gets the current GP of this Chara.
+    /// </summary>
+    public uint CurrentGp => this.Struct->GatheringPoints;
+
+    /// <summary>
+    /// Gets the maximum GP of this Chara.
+    /// </summary>
+    public uint MaxGp => this.Struct->MaxGatheringPoints;
+
+    /// <summary>
+    /// Gets the current CP of this Chara.
+    /// </summary>
+    public uint CurrentCp => this.Struct->CraftingPoints;
+
+    /// <summary>
+    /// Gets the maximum CP of this Chara.
+    /// </summary>
+    public uint MaxCp => this.Struct->MaxCraftingPoints;
+
+    /// <summary>
+    /// Gets the ClassJob of this Chara.
+    /// </summary>
+    public ExcelResolver<ClassJob> ClassJob => new(this.Struct->ClassJob);
+
+    /// <summary>
+    /// Gets the level of this Chara.
+    /// </summary>
+    public byte Level => this.Struct->Level;
+
+    /// <summary>
+    /// Gets a byte array describing the visual appearance of this Chara.
+    /// Indexed by <see cref="CustomizeIndex"/>.
+    /// </summary>
+    public byte[] Customize => MemoryHelper.Read<byte>((IntPtr)this.Struct->CustomizeData, 28);
+
+    /// <summary>
+    /// Gets the Free Company tag of this chara.
+    /// </summary>
+    public SeString CompanyTag => MemoryHelper.ReadSeString((IntPtr)this.Struct->FreeCompanyTag, 6);
+
+    /// <summary>
+    /// Gets the target object ID of the character.
+    /// </summary>
+    public override uint TargetObjectId => this.Struct->TargetObjectID;
+
+    /// <summary>
+    /// Gets the name ID of the character.
+    /// </summary>
+    public uint NameId => this.Struct->NameID;
+
+    /// <summary>
+    /// Gets the current online status of the character.
+    /// </summary>
+    public ExcelResolver<OnlineStatus> OnlineStatus => new(this.Struct->OnlineStatus);
+
+    /// <summary>
+    /// Gets the status flags.
+    /// </summary>
+    public StatusFlags StatusFlags => (StatusFlags)this.Struct->StatusFlags;
+
+    /// <summary>
+    /// Gets the underlying structure.
+    /// </summary>
+    protected internal new FFXIVClientStructs.FFXIV.Client.Game.Character.Character* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)this.Address;
 }
diff --git a/Dalamud/Game/ClientState/Objects/Types/GameObject.cs b/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
index 55627e0c3..9cd0cccdb 100644
--- a/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
@@ -5,171 +5,170 @@ using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Memory;
 
-namespace Dalamud.Game.ClientState.Objects.Types
+namespace Dalamud.Game.ClientState.Objects.Types;
+
+/// <summary>
+/// This class represents a GameObject in FFXIV.
+/// </summary>
+public unsafe partial class GameObject : IEquatable<GameObject>
 {
     /// <summary>
-    /// This class represents a GameObject in FFXIV.
+    /// IDs of non-networked GameObjects.
     /// </summary>
-    public unsafe partial class GameObject : IEquatable<GameObject>
+    public const uint InvalidGameObjectId = 0xE0000000;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GameObject"/> class.
+    /// </summary>
+    /// <param name="address">The address of this game object in memory.</param>
+    internal GameObject(IntPtr address)
     {
-        /// <summary>
-        /// IDs of non-networked GameObjects.
-        /// </summary>
-        public const uint InvalidGameObjectId = 0xE0000000;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameObject"/> class.
-        /// </summary>
-        /// <param name="address">The address of this game object in memory.</param>
-        internal GameObject(IntPtr address)
-        {
-            this.Address = address;
-        }
-
-        /// <summary>
-        /// Gets the address of the game object in memory.
-        /// </summary>
-        public IntPtr Address { get; }
-
-        /// <summary>
-        /// Gets the Dalamud instance.
-        /// </summary>
-        private protected Dalamud Dalamud { get; }
-
-        /// <summary>
-        /// This allows you to <c>if (obj) {...}</c> to check for validity.
-        /// </summary>
-        /// <param name="gameObject">The actor to check.</param>
-        /// <returns>True or false.</returns>
-        public static implicit operator bool(GameObject? gameObject) => IsValid(gameObject);
-
-        public static bool operator ==(GameObject? gameObject1, GameObject? gameObject2)
-        {
-            // Using == results in a stack overflow.
-            if (gameObject1 is null || gameObject2 is null)
-                return Equals(gameObject1, gameObject2);
-
-            return gameObject1.Equals(gameObject2);
-        }
-
-        public static bool operator !=(GameObject? actor1, GameObject? actor2) => !(actor1 == actor2);
-
-        /// <summary>
-        /// Gets a value indicating whether this actor is still valid in memory.
-        /// </summary>
-        /// <param name="actor">The actor to check.</param>
-        /// <returns>True or false.</returns>
-        public static bool IsValid(GameObject? actor)
-        {
-            var clientState = Service<ClientState>.GetNullable();
-
-            if (actor is null || clientState == null)
-                return false;
-
-            if (clientState.LocalContentId == 0)
-                return false;
-
-            return true;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this actor is still valid in memory.
-        /// </summary>
-        /// <returns>True or false.</returns>
-        public bool IsValid() => IsValid(this);
-
-        /// <inheritdoc/>
-        bool IEquatable<GameObject>.Equals(GameObject other) => this.ObjectId == other?.ObjectId;
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj) => ((IEquatable<GameObject>)this).Equals(obj as GameObject);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => this.ObjectId.GetHashCode();
+        this.Address = address;
     }
 
     /// <summary>
-    /// This class represents a basic actor (GameObject) in FFXIV.
+    /// Gets the address of the game object in memory.
     /// </summary>
-    public unsafe partial class GameObject
+    public IntPtr Address { get; }
+
+    /// <summary>
+    /// Gets the Dalamud instance.
+    /// </summary>
+    private protected Dalamud Dalamud { get; }
+
+    /// <summary>
+    /// This allows you to <c>if (obj) {...}</c> to check for validity.
+    /// </summary>
+    /// <param name="gameObject">The actor to check.</param>
+    /// <returns>True or false.</returns>
+    public static implicit operator bool(GameObject? gameObject) => IsValid(gameObject);
+
+    public static bool operator ==(GameObject? gameObject1, GameObject? gameObject2)
     {
-        /// <summary>
-        /// Gets the name of this <see cref="GameObject" />.
-        /// </summary>
-        public SeString Name => MemoryHelper.ReadSeString((IntPtr)this.Struct->Name, 64);
+        // Using == results in a stack overflow.
+        if (gameObject1 is null || gameObject2 is null)
+            return Equals(gameObject1, gameObject2);
 
-        /// <summary>
-        /// Gets the object ID of this <see cref="GameObject" />.
-        /// </summary>
-        public uint ObjectId => this.Struct->ObjectID;
-
-        /// <summary>
-        /// Gets the data ID for linking to other respective game data.
-        /// </summary>
-        public uint DataId => this.Struct->DataID;
-
-        /// <summary>
-        /// Gets the ID of this GameObject's owner.
-        /// </summary>
-        public uint OwnerId => this.Struct->OwnerID;
-
-        /// <summary>
-        /// Gets the entity kind of this <see cref="GameObject" />.
-        /// See <see cref="ObjectKind">the ObjectKind enum</see> for possible values.
-        /// </summary>
-        public ObjectKind ObjectKind => (ObjectKind)this.Struct->ObjectKind;
-
-        /// <summary>
-        /// Gets the sub kind of this Actor.
-        /// </summary>
-        public byte SubKind => this.Struct->SubKind;
-
-        /// <summary>
-        /// Gets the X distance from the local player in yalms.
-        /// </summary>
-        public byte YalmDistanceX => this.Struct->YalmDistanceFromPlayerX;
-
-        /// <summary>
-        /// Gets the Y distance from the local player in yalms.
-        /// </summary>
-        public byte YalmDistanceZ => this.Struct->YalmDistanceFromPlayerZ;
-
-        /// <summary>
-        /// Gets the position of this <see cref="GameObject" />.
-        /// </summary>
-        public Vector3 Position => new(this.Struct->Position.X, this.Struct->Position.Y, this.Struct->Position.Z);
-
-        /// <summary>
-        /// Gets the rotation of this <see cref="GameObject" />.
-        /// This ranges from -pi to pi radians.
-        /// </summary>
-        public float Rotation => this.Struct->Rotation;
-
-        /// <summary>
-        /// Gets the hitbox radius of this <see cref="GameObject" />.
-        /// </summary>
-        public float HitboxRadius => this.Struct->HitboxRadius;
-
-        /// <summary>
-        /// Gets the current target of the game object.
-        /// </summary>
-        public virtual uint TargetObjectId => 0;
-
-        /// <summary>
-        /// Gets the target object of the game object.
-        /// </summary>
-        /// <remarks>
-        /// This iterates the actor table, it should be used with care.
-        /// </remarks>
-        // TODO: Fix for non-networked GameObjects
-        public virtual GameObject? TargetObject => Service<ObjectTable>.Get().SearchById(this.TargetObjectId);
-
-        /// <summary>
-        /// Gets the underlying structure.
-        /// </summary>
-        protected internal FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)this.Address;
-
-        /// <inheritdoc/>
-        public override string ToString() => $"{this.ObjectId:X}({this.Name.TextValue} - {this.ObjectKind}) at {this.Address:X}";
+        return gameObject1.Equals(gameObject2);
     }
+
+    public static bool operator !=(GameObject? actor1, GameObject? actor2) => !(actor1 == actor2);
+
+    /// <summary>
+    /// Gets a value indicating whether this actor is still valid in memory.
+    /// </summary>
+    /// <param name="actor">The actor to check.</param>
+    /// <returns>True or false.</returns>
+    public static bool IsValid(GameObject? actor)
+    {
+        var clientState = Service<ClientState>.GetNullable();
+
+        if (actor is null || clientState == null)
+            return false;
+
+        if (clientState.LocalContentId == 0)
+            return false;
+
+        return true;
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether this actor is still valid in memory.
+    /// </summary>
+    /// <returns>True or false.</returns>
+    public bool IsValid() => IsValid(this);
+
+    /// <inheritdoc/>
+    bool IEquatable<GameObject>.Equals(GameObject other) => this.ObjectId == other?.ObjectId;
+
+    /// <inheritdoc/>
+    public override bool Equals(object obj) => ((IEquatable<GameObject>)this).Equals(obj as GameObject);
+
+    /// <inheritdoc/>
+    public override int GetHashCode() => this.ObjectId.GetHashCode();
+}
+
+/// <summary>
+/// This class represents a basic actor (GameObject) in FFXIV.
+/// </summary>
+public unsafe partial class GameObject
+{
+    /// <summary>
+    /// Gets the name of this <see cref="GameObject" />.
+    /// </summary>
+    public SeString Name => MemoryHelper.ReadSeString((IntPtr)this.Struct->Name, 64);
+
+    /// <summary>
+    /// Gets the object ID of this <see cref="GameObject" />.
+    /// </summary>
+    public uint ObjectId => this.Struct->ObjectID;
+
+    /// <summary>
+    /// Gets the data ID for linking to other respective game data.
+    /// </summary>
+    public uint DataId => this.Struct->DataID;
+
+    /// <summary>
+    /// Gets the ID of this GameObject's owner.
+    /// </summary>
+    public uint OwnerId => this.Struct->OwnerID;
+
+    /// <summary>
+    /// Gets the entity kind of this <see cref="GameObject" />.
+    /// See <see cref="ObjectKind">the ObjectKind enum</see> for possible values.
+    /// </summary>
+    public ObjectKind ObjectKind => (ObjectKind)this.Struct->ObjectKind;
+
+    /// <summary>
+    /// Gets the sub kind of this Actor.
+    /// </summary>
+    public byte SubKind => this.Struct->SubKind;
+
+    /// <summary>
+    /// Gets the X distance from the local player in yalms.
+    /// </summary>
+    public byte YalmDistanceX => this.Struct->YalmDistanceFromPlayerX;
+
+    /// <summary>
+    /// Gets the Y distance from the local player in yalms.
+    /// </summary>
+    public byte YalmDistanceZ => this.Struct->YalmDistanceFromPlayerZ;
+
+    /// <summary>
+    /// Gets the position of this <see cref="GameObject" />.
+    /// </summary>
+    public Vector3 Position => new(this.Struct->Position.X, this.Struct->Position.Y, this.Struct->Position.Z);
+
+    /// <summary>
+    /// Gets the rotation of this <see cref="GameObject" />.
+    /// This ranges from -pi to pi radians.
+    /// </summary>
+    public float Rotation => this.Struct->Rotation;
+
+    /// <summary>
+    /// Gets the hitbox radius of this <see cref="GameObject" />.
+    /// </summary>
+    public float HitboxRadius => this.Struct->HitboxRadius;
+
+    /// <summary>
+    /// Gets the current target of the game object.
+    /// </summary>
+    public virtual uint TargetObjectId => 0;
+
+    /// <summary>
+    /// Gets the target object of the game object.
+    /// </summary>
+    /// <remarks>
+    /// This iterates the actor table, it should be used with care.
+    /// </remarks>
+    // TODO: Fix for non-networked GameObjects
+    public virtual GameObject? TargetObject => Service<ObjectTable>.Get().SearchById(this.TargetObjectId);
+
+    /// <summary>
+    /// Gets the underlying structure.
+    /// </summary>
+    protected internal FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)this.Address;
+
+    /// <inheritdoc/>
+    public override string ToString() => $"{this.ObjectId:X}({this.Name.TextValue} - {this.ObjectKind}) at {this.Address:X}";
 }
diff --git a/Dalamud/Game/ClientState/Party/PartyList.cs b/Dalamud/Game/ClientState/Party/PartyList.cs
index 40bba06d4..5312be67c 100644
--- a/Dalamud/Game/ClientState/Party/PartyList.cs
+++ b/Dalamud/Game/ClientState/Party/PartyList.cs
@@ -7,180 +7,179 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.ClientState.Party
+namespace Dalamud.Game.ClientState.Party;
+
+/// <summary>
+/// This collection represents the actors present in your party or alliance.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed unsafe partial class PartyList : IServiceType
 {
-    /// <summary>
-    /// This collection represents the actors present in your party or alliance.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed unsafe partial class PartyList : IServiceType
+    private const int GroupLength = 8;
+    private const int AllianceLength = 20;
+
+    [ServiceManager.ServiceDependency]
+    private readonly ClientState clientState = Service<ClientState>.Get();
+
+    private readonly ClientStateAddressResolver address;
+
+    [ServiceManager.ServiceConstructor]
+    private PartyList()
     {
-        private const int GroupLength = 8;
-        private const int AllianceLength = 20;
+        this.address = this.clientState.AddressResolver;
 
-        [ServiceManager.ServiceDependency]
-        private readonly ClientState clientState = Service<ClientState>.Get();
-
-        private readonly ClientStateAddressResolver address;
-
-        [ServiceManager.ServiceConstructor]
-        private PartyList()
-        {
-            this.address = this.clientState.AddressResolver;
-
-            Log.Verbose($"Group manager address 0x{this.address.GroupManager.ToInt64():X}");
-        }
-
-        /// <summary>
-        /// Gets the amount of party members the local player has.
-        /// </summary>
-        public int Length => this.GroupManagerStruct->MemberCount;
-
-        /// <summary>
-        /// Gets the index of the party leader.
-        /// </summary>
-        public uint PartyLeaderIndex => this.GroupManagerStruct->PartyLeaderIndex;
-
-        /// <summary>
-        /// Gets a value indicating whether this group is an alliance.
-        /// </summary>
-        public bool IsAlliance => this.GroupManagerStruct->IsAlliance;
-
-        /// <summary>
-        /// Gets the address of the Group Manager.
-        /// </summary>
-        public IntPtr GroupManagerAddress => this.address.GroupManager;
-
-        /// <summary>
-        /// Gets the address of the party list within the group manager.
-        /// </summary>
-        public IntPtr GroupListAddress => (IntPtr)GroupManagerStruct->PartyMembers;
-
-        /// <summary>
-        /// Gets the address of the alliance member list within the group manager.
-        /// </summary>
-        public IntPtr AllianceListAddress => (IntPtr)this.GroupManagerStruct->AllianceMembers;
-
-        /// <summary>
-        /// Gets the ID of the party.
-        /// </summary>
-        public long PartyId => this.GroupManagerStruct->PartyId;
-
-        private static int PartyMemberSize { get; } = Marshal.SizeOf<FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember>();
-
-        private FFXIVClientStructs.FFXIV.Client.Game.Group.GroupManager* GroupManagerStruct => (FFXIVClientStructs.FFXIV.Client.Game.Group.GroupManager*)this.GroupManagerAddress;
-
-        /// <summary>
-        /// Get a party member at the specified spawn index.
-        /// </summary>
-        /// <param name="index">Spawn index.</param>
-        /// <returns>A <see cref="PartyMember"/> at the specified spawn index.</returns>
-        public PartyMember? this[int index]
-        {
-            get
-            {
-                // Normally using Length results in a recursion crash, however we know the party size via ptr.
-                if (index < 0 || index >= this.Length)
-                    return null;
-
-                if (this.Length > GroupLength)
-                {
-                    var addr = this.GetAllianceMemberAddress(index);
-                    return this.CreateAllianceMemberReference(addr);
-                }
-                else
-                {
-                    var addr = this.GetPartyMemberAddress(index);
-                    return this.CreatePartyMemberReference(addr);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the address of the party member at the specified index of the party list.
-        /// </summary>
-        /// <param name="index">The index of the party member.</param>
-        /// <returns>The memory address of the party member.</returns>
-        public IntPtr GetPartyMemberAddress(int index)
-        {
-            if (index < 0 || index >= GroupLength)
-                return IntPtr.Zero;
-
-            return this.GroupListAddress + (index * PartyMemberSize);
-        }
-
-        /// <summary>
-        /// Create a reference to an FFXIV party member.
-        /// </summary>
-        /// <param name="address">The address of the party member in memory.</param>
-        /// <returns>The party member object containing the requested data.</returns>
-        public PartyMember? CreatePartyMemberReference(IntPtr address)
-        {
-            if (this.clientState.LocalContentId == 0)
-                return null;
-
-            if (address == IntPtr.Zero)
-                return null;
-
-            return new PartyMember(address);
-        }
-
-        /// <summary>
-        /// Gets the address of the alliance member at the specified index of the alliance list.
-        /// </summary>
-        /// <param name="index">The index of the alliance member.</param>
-        /// <returns>The memory address of the alliance member.</returns>
-        public IntPtr GetAllianceMemberAddress(int index)
-        {
-            if (index < 0 || index >= AllianceLength)
-                return IntPtr.Zero;
-
-            return this.AllianceListAddress + (index * PartyMemberSize);
-        }
-
-        /// <summary>
-        /// Create a reference to an FFXIV alliance member.
-        /// </summary>
-        /// <param name="address">The address of the alliance member in memory.</param>
-        /// <returns>The party member object containing the requested data.</returns>
-        public PartyMember? CreateAllianceMemberReference(IntPtr address)
-        {
-            if (this.clientState.LocalContentId == 0)
-                return null;
-
-            if (address == IntPtr.Zero)
-                return null;
-
-            return new PartyMember(address);
-        }
+        Log.Verbose($"Group manager address 0x{this.address.GroupManager.ToInt64():X}");
     }
 
     /// <summary>
-    /// This collection represents the party members present in your party or alliance.
+    /// Gets the amount of party members the local player has.
     /// </summary>
-    public sealed partial class PartyList : IReadOnlyCollection<PartyMember>
-    {
-        /// <inheritdoc/>
-        int IReadOnlyCollection<PartyMember>.Count => this.Length;
+    public int Length => this.GroupManagerStruct->MemberCount;
 
-        /// <inheritdoc/>
-        public IEnumerator<PartyMember> GetEnumerator()
+    /// <summary>
+    /// Gets the index of the party leader.
+    /// </summary>
+    public uint PartyLeaderIndex => this.GroupManagerStruct->PartyLeaderIndex;
+
+    /// <summary>
+    /// Gets a value indicating whether this group is an alliance.
+    /// </summary>
+    public bool IsAlliance => this.GroupManagerStruct->IsAlliance;
+
+    /// <summary>
+    /// Gets the address of the Group Manager.
+    /// </summary>
+    public IntPtr GroupManagerAddress => this.address.GroupManager;
+
+    /// <summary>
+    /// Gets the address of the party list within the group manager.
+    /// </summary>
+    public IntPtr GroupListAddress => (IntPtr)GroupManagerStruct->PartyMembers;
+
+    /// <summary>
+    /// Gets the address of the alliance member list within the group manager.
+    /// </summary>
+    public IntPtr AllianceListAddress => (IntPtr)this.GroupManagerStruct->AllianceMembers;
+
+    /// <summary>
+    /// Gets the ID of the party.
+    /// </summary>
+    public long PartyId => this.GroupManagerStruct->PartyId;
+
+    private static int PartyMemberSize { get; } = Marshal.SizeOf<FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember>();
+
+    private FFXIVClientStructs.FFXIV.Client.Game.Group.GroupManager* GroupManagerStruct => (FFXIVClientStructs.FFXIV.Client.Game.Group.GroupManager*)this.GroupManagerAddress;
+
+    /// <summary>
+    /// Get a party member at the specified spawn index.
+    /// </summary>
+    /// <param name="index">Spawn index.</param>
+    /// <returns>A <see cref="PartyMember"/> at the specified spawn index.</returns>
+    public PartyMember? this[int index]
+    {
+        get
         {
             // Normally using Length results in a recursion crash, however we know the party size via ptr.
-            for (var i = 0; i < this.Length; i++)
+            if (index < 0 || index >= this.Length)
+                return null;
+
+            if (this.Length > GroupLength)
             {
-                var member = this[i];
-
-                if (member == null)
-                    break;
-
-                yield return member;
+                var addr = this.GetAllianceMemberAddress(index);
+                return this.CreateAllianceMemberReference(addr);
+            }
+            else
+            {
+                var addr = this.GetPartyMemberAddress(index);
+                return this.CreatePartyMemberReference(addr);
             }
         }
+    }
 
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+    /// <summary>
+    /// Gets the address of the party member at the specified index of the party list.
+    /// </summary>
+    /// <param name="index">The index of the party member.</param>
+    /// <returns>The memory address of the party member.</returns>
+    public IntPtr GetPartyMemberAddress(int index)
+    {
+        if (index < 0 || index >= GroupLength)
+            return IntPtr.Zero;
+
+        return this.GroupListAddress + (index * PartyMemberSize);
+    }
+
+    /// <summary>
+    /// Create a reference to an FFXIV party member.
+    /// </summary>
+    /// <param name="address">The address of the party member in memory.</param>
+    /// <returns>The party member object containing the requested data.</returns>
+    public PartyMember? CreatePartyMemberReference(IntPtr address)
+    {
+        if (this.clientState.LocalContentId == 0)
+            return null;
+
+        if (address == IntPtr.Zero)
+            return null;
+
+        return new PartyMember(address);
+    }
+
+    /// <summary>
+    /// Gets the address of the alliance member at the specified index of the alliance list.
+    /// </summary>
+    /// <param name="index">The index of the alliance member.</param>
+    /// <returns>The memory address of the alliance member.</returns>
+    public IntPtr GetAllianceMemberAddress(int index)
+    {
+        if (index < 0 || index >= AllianceLength)
+            return IntPtr.Zero;
+
+        return this.AllianceListAddress + (index * PartyMemberSize);
+    }
+
+    /// <summary>
+    /// Create a reference to an FFXIV alliance member.
+    /// </summary>
+    /// <param name="address">The address of the alliance member in memory.</param>
+    /// <returns>The party member object containing the requested data.</returns>
+    public PartyMember? CreateAllianceMemberReference(IntPtr address)
+    {
+        if (this.clientState.LocalContentId == 0)
+            return null;
+
+        if (address == IntPtr.Zero)
+            return null;
+
+        return new PartyMember(address);
     }
 }
+
+/// <summary>
+/// This collection represents the party members present in your party or alliance.
+/// </summary>
+public sealed partial class PartyList : IReadOnlyCollection<PartyMember>
+{
+    /// <inheritdoc/>
+    int IReadOnlyCollection<PartyMember>.Count => this.Length;
+
+    /// <inheritdoc/>
+    public IEnumerator<PartyMember> GetEnumerator()
+    {
+        // Normally using Length results in a recursion crash, however we know the party size via ptr.
+        for (var i = 0; i < this.Length; i++)
+        {
+            var member = this[i];
+
+            if (member == null)
+                break;
+
+            yield return member;
+        }
+    }
+
+    /// <inheritdoc/>
+    IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+}
diff --git a/Dalamud/Game/ClientState/Party/PartyMember.cs b/Dalamud/Game/ClientState/Party/PartyMember.cs
index 64e6fda64..ef65e3b19 100644
--- a/Dalamud/Game/ClientState/Party/PartyMember.cs
+++ b/Dalamud/Game/ClientState/Party/PartyMember.cs
@@ -8,105 +8,104 @@ using Dalamud.Game.ClientState.Statuses;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Memory;
 
-namespace Dalamud.Game.ClientState.Party
+namespace Dalamud.Game.ClientState.Party;
+
+/// <summary>
+/// This class represents a party member in the group manager.
+/// </summary>
+public unsafe class PartyMember
 {
     /// <summary>
-    /// This class represents a party member in the group manager.
+    /// Initializes a new instance of the <see cref="PartyMember"/> class.
     /// </summary>
-    public unsafe class PartyMember
+    /// <param name="address">Address of the party member.</param>
+    internal PartyMember(IntPtr address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PartyMember"/> class.
-        /// </summary>
-        /// <param name="address">Address of the party member.</param>
-        internal PartyMember(IntPtr address)
-        {
-            this.Address = address;
-        }
-
-        /// <summary>
-        /// Gets the address of this party member in memory.
-        /// </summary>
-        public IntPtr Address { get; }
-
-        /// <summary>
-        /// Gets a list of buffs or debuffs applied to this party member.
-        /// </summary>
-        public StatusList Statuses => new(&this.Struct->StatusManager);
-
-        /// <summary>
-        /// Gets the position of the party member.
-        /// </summary>
-        public Vector3 Position => new(this.Struct->X, this.Struct->Y, this.Struct->Z);
-
-        /// <summary>
-        /// Gets the content ID of the party member.
-        /// </summary>
-        public long ContentId => this.Struct->ContentID;
-
-        /// <summary>
-        /// Gets the actor ID of this party member.
-        /// </summary>
-        public uint ObjectId => this.Struct->ObjectID;
-
-        /// <summary>
-        /// Gets the actor associated with this buddy.
-        /// </summary>
-        /// <remarks>
-        /// This iterates the actor table, it should be used with care.
-        /// </remarks>
-        public GameObject? GameObject => Service<ObjectTable>.Get().SearchById(this.ObjectId);
-
-        /// <summary>
-        /// Gets the current HP of this party member.
-        /// </summary>
-        public uint CurrentHP => this.Struct->CurrentHP;
-
-        /// <summary>
-        /// Gets the maximum HP of this party member.
-        /// </summary>
-        public uint MaxHP => this.Struct->MaxHP;
-
-        /// <summary>
-        /// Gets the current MP of this party member.
-        /// </summary>
-        public ushort CurrentMP => this.Struct->CurrentMP;
-
-        /// <summary>
-        /// Gets the maximum MP of this party member.
-        /// </summary>
-        public ushort MaxMP => this.Struct->MaxMP;
-
-        /// <summary>
-        /// Gets the territory this party member is located in.
-        /// </summary>
-        public ExcelResolver<Lumina.Excel.GeneratedSheets.TerritoryType> Territory => new(this.Struct->TerritoryType);
-
-        /// <summary>
-        /// Gets the World this party member resides in.
-        /// </summary>
-        public ExcelResolver<Lumina.Excel.GeneratedSheets.World> World => new(this.Struct->HomeWorld);
-
-        /// <summary>
-        /// Gets the displayname of this party member.
-        /// </summary>
-        public SeString Name => MemoryHelper.ReadSeString((IntPtr)Struct->Name, 0x40);
-
-        /// <summary>
-        /// Gets the sex of this party member.
-        /// </summary>
-        public byte Sex => this.Struct->Sex;
-
-        /// <summary>
-        /// Gets the classjob of this party member.
-        /// </summary>
-        public ExcelResolver<Lumina.Excel.GeneratedSheets.ClassJob> ClassJob => new(this.Struct->ClassJob);
-
-        /// <summary>
-        /// Gets the level of this party member.
-        /// </summary>
-        public byte Level => this.Struct->Level;
-
-        private FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember*)this.Address;
+        this.Address = address;
     }
+
+    /// <summary>
+    /// Gets the address of this party member in memory.
+    /// </summary>
+    public IntPtr Address { get; }
+
+    /// <summary>
+    /// Gets a list of buffs or debuffs applied to this party member.
+    /// </summary>
+    public StatusList Statuses => new(&this.Struct->StatusManager);
+
+    /// <summary>
+    /// Gets the position of the party member.
+    /// </summary>
+    public Vector3 Position => new(this.Struct->X, this.Struct->Y, this.Struct->Z);
+
+    /// <summary>
+    /// Gets the content ID of the party member.
+    /// </summary>
+    public long ContentId => this.Struct->ContentID;
+
+    /// <summary>
+    /// Gets the actor ID of this party member.
+    /// </summary>
+    public uint ObjectId => this.Struct->ObjectID;
+
+    /// <summary>
+    /// Gets the actor associated with this buddy.
+    /// </summary>
+    /// <remarks>
+    /// This iterates the actor table, it should be used with care.
+    /// </remarks>
+    public GameObject? GameObject => Service<ObjectTable>.Get().SearchById(this.ObjectId);
+
+    /// <summary>
+    /// Gets the current HP of this party member.
+    /// </summary>
+    public uint CurrentHP => this.Struct->CurrentHP;
+
+    /// <summary>
+    /// Gets the maximum HP of this party member.
+    /// </summary>
+    public uint MaxHP => this.Struct->MaxHP;
+
+    /// <summary>
+    /// Gets the current MP of this party member.
+    /// </summary>
+    public ushort CurrentMP => this.Struct->CurrentMP;
+
+    /// <summary>
+    /// Gets the maximum MP of this party member.
+    /// </summary>
+    public ushort MaxMP => this.Struct->MaxMP;
+
+    /// <summary>
+    /// Gets the territory this party member is located in.
+    /// </summary>
+    public ExcelResolver<Lumina.Excel.GeneratedSheets.TerritoryType> Territory => new(this.Struct->TerritoryType);
+
+    /// <summary>
+    /// Gets the World this party member resides in.
+    /// </summary>
+    public ExcelResolver<Lumina.Excel.GeneratedSheets.World> World => new(this.Struct->HomeWorld);
+
+    /// <summary>
+    /// Gets the displayname of this party member.
+    /// </summary>
+    public SeString Name => MemoryHelper.ReadSeString((IntPtr)Struct->Name, 0x40);
+
+    /// <summary>
+    /// Gets the sex of this party member.
+    /// </summary>
+    public byte Sex => this.Struct->Sex;
+
+    /// <summary>
+    /// Gets the classjob of this party member.
+    /// </summary>
+    public ExcelResolver<Lumina.Excel.GeneratedSheets.ClassJob> ClassJob => new(this.Struct->ClassJob);
+
+    /// <summary>
+    /// Gets the level of this party member.
+    /// </summary>
+    public byte Level => this.Struct->Level;
+
+    private FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember*)this.Address;
 }
diff --git a/Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs b/Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs
index fa9ce0ec2..722c5a6bc 100644
--- a/Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs
+++ b/Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs
@@ -1,38 +1,37 @@
 using Dalamud.Data;
 using Lumina.Excel;
 
-namespace Dalamud.Game.ClientState.Resolvers
+namespace Dalamud.Game.ClientState.Resolvers;
+
+/// <summary>
+/// This object resolves a rowID within an Excel sheet.
+/// </summary>
+/// <typeparam name="T">The type of Lumina sheet to resolve.</typeparam>
+public class ExcelResolver<T> where T : ExcelRow
 {
     /// <summary>
-    /// This object resolves a rowID within an Excel sheet.
+    /// Initializes a new instance of the <see cref="ExcelResolver{T}"/> class.
     /// </summary>
-    /// <typeparam name="T">The type of Lumina sheet to resolve.</typeparam>
-    public class ExcelResolver<T> where T : ExcelRow
+    /// <param name="id">The ID of the classJob.</param>
+    internal ExcelResolver(uint id)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExcelResolver{T}"/> class.
-        /// </summary>
-        /// <param name="id">The ID of the classJob.</param>
-        internal ExcelResolver(uint id)
-        {
-            this.Id = id;
-        }
-
-        /// <summary>
-        /// Gets the ID to be resolved.
-        /// </summary>
-        public uint Id { get; }
-
-        /// <summary>
-        /// Gets GameData linked to this excel row.
-        /// </summary>
-        public T? GameData => Service<DataManager>.Get().GetExcelSheet<T>()?.GetRow(this.Id);
-
-        /// <summary>
-        /// Gets GameData linked to this excel row with the specified language.
-        /// </summary>
-        /// <param name="language">The language.</param>
-        /// <returns>The ExcelRow in the specified language.</returns>
-        public T? GetWithLanguage(ClientLanguage language) => Service<DataManager>.Get().GetExcelSheet<T>(language)?.GetRow(this.Id);
+        this.Id = id;
     }
+
+    /// <summary>
+    /// Gets the ID to be resolved.
+    /// </summary>
+    public uint Id { get; }
+
+    /// <summary>
+    /// Gets GameData linked to this excel row.
+    /// </summary>
+    public T? GameData => Service<DataManager>.Get().GetExcelSheet<T>()?.GetRow(this.Id);
+
+    /// <summary>
+    /// Gets GameData linked to this excel row with the specified language.
+    /// </summary>
+    /// <param name="language">The language.</param>
+    /// <returns>The ExcelRow in the specified language.</returns>
+    public T? GetWithLanguage(ClientLanguage language) => Service<DataManager>.Get().GetExcelSheet<T>(language)?.GetRow(this.Id);
 }
diff --git a/Dalamud/Game/ClientState/Statuses/Status.cs b/Dalamud/Game/ClientState/Statuses/Status.cs
index 883fba43b..aa5759a03 100644
--- a/Dalamud/Game/ClientState/Statuses/Status.cs
+++ b/Dalamud/Game/ClientState/Statuses/Status.cs
@@ -4,65 +4,64 @@ using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.ClientState.Resolvers;
 
-namespace Dalamud.Game.ClientState.Statuses
+namespace Dalamud.Game.ClientState.Statuses;
+
+/// <summary>
+/// This class represents a status effect an actor is afflicted by.
+/// </summary>
+public unsafe class Status
 {
     /// <summary>
-    /// This class represents a status effect an actor is afflicted by.
+    /// Initializes a new instance of the <see cref="Status"/> class.
     /// </summary>
-    public unsafe class Status
+    /// <param name="address">Status address.</param>
+    internal Status(IntPtr address)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Status"/> class.
-        /// </summary>
-        /// <param name="address">Status address.</param>
-        internal Status(IntPtr address)
-        {
-            this.Address = address;
-        }
-
-        /// <summary>
-        /// Gets the address of the status in memory.
-        /// </summary>
-        public IntPtr Address { get; }
-
-        /// <summary>
-        /// Gets the status ID of this status.
-        /// </summary>
-        public uint StatusId => this.Struct->StatusID;
-
-        /// <summary>
-        /// Gets the GameData associated with this status.
-        /// </summary>
-        public Lumina.Excel.GeneratedSheets.Status GameData => new ExcelResolver<Lumina.Excel.GeneratedSheets.Status>(this.Struct->StatusID).GameData;
-
-        /// <summary>
-        /// Gets the parameter value of the status.
-        /// </summary>
-        public ushort Param => this.Struct->Param;
-
-        /// <summary>
-        /// Gets the stack count of this status.
-        /// </summary>
-        public byte StackCount => this.Struct->StackCount;
-
-        /// <summary>
-        /// Gets the time remaining of this status.
-        /// </summary>
-        public float RemainingTime => this.Struct->RemainingTime;
-
-        /// <summary>
-        /// Gets the source ID of this status.
-        /// </summary>
-        public uint SourceId => this.Struct->SourceID;
-
-        /// <summary>
-        /// Gets the source actor associated with this status.
-        /// </summary>
-        /// <remarks>
-        /// This iterates the actor table, it should be used with care.
-        /// </remarks>
-        public GameObject? SourceObject => Service<ObjectTable>.Get().SearchById(this.SourceId);
-
-        private FFXIVClientStructs.FFXIV.Client.Game.Status* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Status*)this.Address;
+        this.Address = address;
     }
+
+    /// <summary>
+    /// Gets the address of the status in memory.
+    /// </summary>
+    public IntPtr Address { get; }
+
+    /// <summary>
+    /// Gets the status ID of this status.
+    /// </summary>
+    public uint StatusId => this.Struct->StatusID;
+
+    /// <summary>
+    /// Gets the GameData associated with this status.
+    /// </summary>
+    public Lumina.Excel.GeneratedSheets.Status GameData => new ExcelResolver<Lumina.Excel.GeneratedSheets.Status>(this.Struct->StatusID).GameData;
+
+    /// <summary>
+    /// Gets the parameter value of the status.
+    /// </summary>
+    public ushort Param => this.Struct->Param;
+
+    /// <summary>
+    /// Gets the stack count of this status.
+    /// </summary>
+    public byte StackCount => this.Struct->StackCount;
+
+    /// <summary>
+    /// Gets the time remaining of this status.
+    /// </summary>
+    public float RemainingTime => this.Struct->RemainingTime;
+
+    /// <summary>
+    /// Gets the source ID of this status.
+    /// </summary>
+    public uint SourceId => this.Struct->SourceID;
+
+    /// <summary>
+    /// Gets the source actor associated with this status.
+    /// </summary>
+    /// <remarks>
+    /// This iterates the actor table, it should be used with care.
+    /// </remarks>
+    public GameObject? SourceObject => Service<ObjectTable>.Get().SearchById(this.SourceId);
+
+    private FFXIVClientStructs.FFXIV.Client.Game.Status* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Status*)this.Address;
 }
diff --git a/Dalamud/Game/ClientState/Statuses/StatusList.cs b/Dalamud/Game/ClientState/Statuses/StatusList.cs
index 591988e35..bcff50360 100644
--- a/Dalamud/Game/ClientState/Statuses/StatusList.cs
+++ b/Dalamud/Game/ClientState/Statuses/StatusList.cs
@@ -3,159 +3,158 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace Dalamud.Game.ClientState.Statuses
+namespace Dalamud.Game.ClientState.Statuses;
+
+/// <summary>
+/// This collection represents the status effects an actor is afflicted by.
+/// </summary>
+public sealed unsafe partial class StatusList
 {
+    private const int StatusListLength = 30;
+
     /// <summary>
-    /// This collection represents the status effects an actor is afflicted by.
+    /// Initializes a new instance of the <see cref="StatusList"/> class.
     /// </summary>
-    public sealed unsafe partial class StatusList
+    /// <param name="address">Address of the status list.</param>
+    internal StatusList(IntPtr address)
     {
-        private const int StatusListLength = 30;
+        this.Address = address;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StatusList"/> class.
-        /// </summary>
-        /// <param name="address">Address of the status list.</param>
-        internal StatusList(IntPtr address)
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StatusList"/> class.
+    /// </summary>
+    /// <param name="pointer">Pointer to the status list.</param>
+    internal unsafe StatusList(void* pointer)
+        : this((IntPtr)pointer)
+    {
+    }
+
+    /// <summary>
+    /// Gets the address of the status list in memory.
+    /// </summary>
+    public IntPtr Address { get; }
+
+    /// <summary>
+    /// Gets the amount of status effect slots the actor has.
+    /// </summary>
+    public int Length => StatusListLength;
+
+    private static int StatusSize { get; } = Marshal.SizeOf<FFXIVClientStructs.FFXIV.Client.Game.Status>();
+
+    private FFXIVClientStructs.FFXIV.Client.Game.StatusManager* Struct => (FFXIVClientStructs.FFXIV.Client.Game.StatusManager*)this.Address;
+
+    /// <summary>
+    /// Get a status effect at the specified index.
+    /// </summary>
+    /// <param name="index">Status Index.</param>
+    /// <returns>The status at the specified index.</returns>
+    public Status? this[int index]
+    {
+        get
         {
-            this.Address = address;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StatusList"/> class.
-        /// </summary>
-        /// <param name="pointer">Pointer to the status list.</param>
-        internal unsafe StatusList(void* pointer)
-            : this((IntPtr)pointer)
-        {
-        }
-
-        /// <summary>
-        /// Gets the address of the status list in memory.
-        /// </summary>
-        public IntPtr Address { get; }
-
-        /// <summary>
-        /// Gets the amount of status effect slots the actor has.
-        /// </summary>
-        public int Length => StatusListLength;
-
-        private static int StatusSize { get; } = Marshal.SizeOf<FFXIVClientStructs.FFXIV.Client.Game.Status>();
-
-        private FFXIVClientStructs.FFXIV.Client.Game.StatusManager* Struct => (FFXIVClientStructs.FFXIV.Client.Game.StatusManager*)this.Address;
-
-        /// <summary>
-        /// Get a status effect at the specified index.
-        /// </summary>
-        /// <param name="index">Status Index.</param>
-        /// <returns>The status at the specified index.</returns>
-        public Status? this[int index]
-        {
-            get
-            {
-                if (index < 0 || index > StatusListLength)
-                    return null;
-
-                var addr = this.GetStatusAddress(index);
-                return CreateStatusReference(addr);
-            }
-        }
-
-        /// <summary>
-        /// Create a reference to an FFXIV actor status list.
-        /// </summary>
-        /// <param name="address">The address of the status list in memory.</param>
-        /// <returns>The status object containing the requested data.</returns>
-        public static StatusList? CreateStatusListReference(IntPtr address)
-        {
-            // The use case for CreateStatusListReference and CreateStatusReference to be static is so
-            // fake status lists can be generated. Since they aren't exposed as services, it's either
-            // here or somewhere else.
-            var clientState = Service<ClientState>.Get();
-
-            if (clientState.LocalContentId == 0)
+            if (index < 0 || index > StatusListLength)
                 return null;
 
-            if (address == IntPtr.Zero)
-                return null;
-
-            return new StatusList(address);
-        }
-
-        /// <summary>
-        /// Create a reference to an FFXIV actor status.
-        /// </summary>
-        /// <param name="address">The address of the status effect in memory.</param>
-        /// <returns>The status object containing the requested data.</returns>
-        public static Status? CreateStatusReference(IntPtr address)
-        {
-            var clientState = Service<ClientState>.Get();
-
-            if (clientState.LocalContentId == 0)
-                return null;
-
-            if (address == IntPtr.Zero)
-                return null;
-
-            return new Status(address);
-        }
-
-        /// <summary>
-        /// Gets the address of the party member at the specified index of the party list.
-        /// </summary>
-        /// <param name="index">The index of the party member.</param>
-        /// <returns>The memory address of the party member.</returns>
-        public IntPtr GetStatusAddress(int index)
-        {
-            if (index < 0 || index >= StatusListLength)
-                return IntPtr.Zero;
-
-            return (IntPtr)(this.Struct->Status + (index * StatusSize));
+            var addr = this.GetStatusAddress(index);
+            return CreateStatusReference(addr);
         }
     }
 
     /// <summary>
-    /// This collection represents the status effects an actor is afflicted by.
+    /// Create a reference to an FFXIV actor status list.
     /// </summary>
-    public sealed partial class StatusList : IReadOnlyCollection<Status>, ICollection
+    /// <param name="address">The address of the status list in memory.</param>
+    /// <returns>The status object containing the requested data.</returns>
+    public static StatusList? CreateStatusListReference(IntPtr address)
     {
-        /// <inheritdoc/>
-        int IReadOnlyCollection<Status>.Count => this.Length;
+        // The use case for CreateStatusListReference and CreateStatusReference to be static is so
+        // fake status lists can be generated. Since they aren't exposed as services, it's either
+        // here or somewhere else.
+        var clientState = Service<ClientState>.Get();
 
-        /// <inheritdoc/>
-        int ICollection.Count => this.Length;
+        if (clientState.LocalContentId == 0)
+            return null;
 
-        /// <inheritdoc/>
-        bool ICollection.IsSynchronized => false;
+        if (address == IntPtr.Zero)
+            return null;
 
-        /// <inheritdoc/>
-        object ICollection.SyncRoot => this;
+        return new StatusList(address);
+    }
 
-        /// <inheritdoc/>
-        public IEnumerator<Status> GetEnumerator()
+    /// <summary>
+    /// Create a reference to an FFXIV actor status.
+    /// </summary>
+    /// <param name="address">The address of the status effect in memory.</param>
+    /// <returns>The status object containing the requested data.</returns>
+    public static Status? CreateStatusReference(IntPtr address)
+    {
+        var clientState = Service<ClientState>.Get();
+
+        if (clientState.LocalContentId == 0)
+            return null;
+
+        if (address == IntPtr.Zero)
+            return null;
+
+        return new Status(address);
+    }
+
+    /// <summary>
+    /// Gets the address of the party member at the specified index of the party list.
+    /// </summary>
+    /// <param name="index">The index of the party member.</param>
+    /// <returns>The memory address of the party member.</returns>
+    public IntPtr GetStatusAddress(int index)
+    {
+        if (index < 0 || index >= StatusListLength)
+            return IntPtr.Zero;
+
+        return (IntPtr)(this.Struct->Status + (index * StatusSize));
+    }
+}
+
+/// <summary>
+/// This collection represents the status effects an actor is afflicted by.
+/// </summary>
+public sealed partial class StatusList : IReadOnlyCollection<Status>, ICollection
+{
+    /// <inheritdoc/>
+    int IReadOnlyCollection<Status>.Count => this.Length;
+
+    /// <inheritdoc/>
+    int ICollection.Count => this.Length;
+
+    /// <inheritdoc/>
+    bool ICollection.IsSynchronized => false;
+
+    /// <inheritdoc/>
+    object ICollection.SyncRoot => this;
+
+    /// <inheritdoc/>
+    public IEnumerator<Status> GetEnumerator()
+    {
+        for (var i = 0; i < StatusListLength; i++)
         {
-            for (var i = 0; i < StatusListLength; i++)
-            {
-                var status = this[i];
+            var status = this[i];
 
-                if (status == null || status.StatusId == 0)
-                    continue;
+            if (status == null || status.StatusId == 0)
+                continue;
 
-                yield return status;
-            }
+            yield return status;
         }
+    }
 
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+    /// <inheritdoc/>
+    IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
 
-        /// <inheritdoc/>
-        void ICollection.CopyTo(Array array, int index)
+    /// <inheritdoc/>
+    void ICollection.CopyTo(Array array, int index)
+    {
+        for (var i = 0; i < this.Length; i++)
         {
-            for (var i = 0; i < this.Length; i++)
-            {
-                array.SetValue(this[i], index);
-                index++;
-            }
+            array.SetValue(this[i], index);
+            index++;
         }
     }
 }
diff --git a/Dalamud/Game/ClientState/Structs/StatusEffect.cs b/Dalamud/Game/ClientState/Structs/StatusEffect.cs
index 6d4c2fd77..2a60a7d3b 100644
--- a/Dalamud/Game/ClientState/Structs/StatusEffect.cs
+++ b/Dalamud/Game/ClientState/Structs/StatusEffect.cs
@@ -1,36 +1,35 @@
 using System.Runtime.InteropServices;
 
-namespace Dalamud.Game.ClientState.Structs
+namespace Dalamud.Game.ClientState.Structs;
+
+/// <summary>
+/// Native memory representation of a FFXIV status effect.
+/// </summary>
+[StructLayout(LayoutKind.Sequential)]
+public struct StatusEffect
 {
     /// <summary>
-    /// Native memory representation of a FFXIV status effect.
+    /// The effect ID.
     /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    public struct StatusEffect
-    {
-        /// <summary>
-        /// The effect ID.
-        /// </summary>
-        public short EffectId;
+    public short EffectId;
 
-        /// <summary>
-        /// How many stacks are present.
-        /// </summary>
-        public byte StackCount;
+    /// <summary>
+    /// How many stacks are present.
+    /// </summary>
+    public byte StackCount;
 
-        /// <summary>
-        /// Additional parameters.
-        /// </summary>
-        public byte Param;
+    /// <summary>
+    /// Additional parameters.
+    /// </summary>
+    public byte Param;
 
-        /// <summary>
-        /// The duration remaining.
-        /// </summary>
-        public float Duration;
+    /// <summary>
+    /// The duration remaining.
+    /// </summary>
+    public float Duration;
 
-        /// <summary>
-        /// The ID of the actor that caused this effect.
-        /// </summary>
-        public int OwnerId;
-    }
+    /// <summary>
+    /// The ID of the actor that caused this effect.
+    /// </summary>
+    public int OwnerId;
 }
diff --git a/Dalamud/Game/Command/CommandInfo.cs b/Dalamud/Game/Command/CommandInfo.cs
index 0eb97177c..9b559599a 100644
--- a/Dalamud/Game/Command/CommandInfo.cs
+++ b/Dalamud/Game/Command/CommandInfo.cs
@@ -1,48 +1,47 @@
 using System.Reflection;
 
-namespace Dalamud.Game.Command
+namespace Dalamud.Game.Command;
+
+/// <summary>
+/// This class describes a registered command.
+/// </summary>
+public sealed class CommandInfo
 {
     /// <summary>
-    /// This class describes a registered command.
+    /// Initializes a new instance of the <see cref="CommandInfo"/> class.
+    /// Create a new CommandInfo with the provided handler.
     /// </summary>
-    public sealed class CommandInfo
+    /// <param name="handler">The method to call when the command is run.</param>
+    public CommandInfo(HandlerDelegate handler)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommandInfo"/> class.
-        /// Create a new CommandInfo with the provided handler.
-        /// </summary>
-        /// <param name="handler">The method to call when the command is run.</param>
-        public CommandInfo(HandlerDelegate handler)
-        {
-            this.Handler = handler;
-            this.LoaderAssemblyName = Assembly.GetCallingAssembly()?.GetName()?.Name;
-        }
-
-        /// <summary>
-        /// The function to be executed when the command is dispatched.
-        /// </summary>
-        /// <param name="command">The command itself.</param>
-        /// <param name="arguments">The arguments supplied to the command, ready for parsing.</param>
-        public delegate void HandlerDelegate(string command, string arguments);
-
-        /// <summary>
-        /// Gets a <see cref="HandlerDelegate"/> which will be called when the command is dispatched.
-        /// </summary>
-        public HandlerDelegate Handler { get; }
-
-        /// <summary>
-        /// Gets or sets the help message for this command.
-        /// </summary>
-        public string HelpMessage { get; set; } = string.Empty;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether if this command should be shown in the help output.
-        /// </summary>
-        public bool ShowInHelp { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the name of the assembly responsible for this command.
-        /// </summary>
-        internal string LoaderAssemblyName { get; set; } = string.Empty;
+        this.Handler = handler;
+        this.LoaderAssemblyName = Assembly.GetCallingAssembly()?.GetName()?.Name;
     }
+
+    /// <summary>
+    /// The function to be executed when the command is dispatched.
+    /// </summary>
+    /// <param name="command">The command itself.</param>
+    /// <param name="arguments">The arguments supplied to the command, ready for parsing.</param>
+    public delegate void HandlerDelegate(string command, string arguments);
+
+    /// <summary>
+    /// Gets a <see cref="HandlerDelegate"/> which will be called when the command is dispatched.
+    /// </summary>
+    public HandlerDelegate Handler { get; }
+
+    /// <summary>
+    /// Gets or sets the help message for this command.
+    /// </summary>
+    public string HelpMessage { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether if this command should be shown in the help output.
+    /// </summary>
+    public bool ShowInHelp { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the name of the assembly responsible for this command.
+    /// </summary>
+    internal string LoaderAssemblyName { get; set; } = string.Empty;
 }
diff --git a/Dalamud/Game/Command/CommandManager.cs b/Dalamud/Game/Command/CommandManager.cs
index 7d46b0842..7bb429063 100644
--- a/Dalamud/Game/Command/CommandManager.cs
+++ b/Dalamud/Game/Command/CommandManager.cs
@@ -10,173 +10,172 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.Command
+namespace Dalamud.Game.Command;
+
+/// <summary>
+/// This class manages registered in-game slash commands.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed class CommandManager : IServiceType, IDisposable
 {
-    /// <summary>
-    /// This class manages registered in-game slash commands.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed class CommandManager : IServiceType, IDisposable
+    private readonly Dictionary<string, CommandInfo> commandMap = new();
+    private readonly Regex commandRegexEn = new(@"^The command (?<command>.+) does not exist\.$", RegexOptions.Compiled);
+    private readonly Regex commandRegexJp = new(@"^そのコマンドはありません。： (?<command>.+)$", RegexOptions.Compiled);
+    private readonly Regex commandRegexDe = new(@"^„(?<command>.+)“ existiert nicht als Textkommando\.$", RegexOptions.Compiled);
+    private readonly Regex commandRegexFr = new(@"^La commande texte “(?<command>.+)” n'existe pas\.$", RegexOptions.Compiled);
+    private readonly Regex commandRegexCn = new(@"^^(“|「)(?<command>.+)(”|」)(出现问题：该命令不存在|出現問題：該命令不存在)。$", RegexOptions.Compiled);
+    private readonly Regex currentLangCommandRegex;
+
+    [ServiceManager.ServiceDependency]
+    private readonly ChatGui chatGui = Service<ChatGui>.Get();
+
+    [ServiceManager.ServiceConstructor]
+    private CommandManager(DalamudStartInfo startInfo)
     {
-        private readonly Dictionary<string, CommandInfo> commandMap = new();
-        private readonly Regex commandRegexEn = new(@"^The command (?<command>.+) does not exist\.$", RegexOptions.Compiled);
-        private readonly Regex commandRegexJp = new(@"^そのコマンドはありません。： (?<command>.+)$", RegexOptions.Compiled);
-        private readonly Regex commandRegexDe = new(@"^„(?<command>.+)“ existiert nicht als Textkommando\.$", RegexOptions.Compiled);
-        private readonly Regex commandRegexFr = new(@"^La commande texte “(?<command>.+)” n'existe pas\.$", RegexOptions.Compiled);
-        private readonly Regex commandRegexCn = new(@"^^(“|「)(?<command>.+)(”|」)(出现问题：该命令不存在|出現問題：該命令不存在)。$", RegexOptions.Compiled);
-        private readonly Regex currentLangCommandRegex;
-
-        [ServiceManager.ServiceDependency]
-        private readonly ChatGui chatGui = Service<ChatGui>.Get();
-
-        [ServiceManager.ServiceConstructor]
-        private CommandManager(DalamudStartInfo startInfo)
+        this.currentLangCommandRegex = startInfo.Language switch
         {
-            this.currentLangCommandRegex = startInfo.Language switch
-            {
-                ClientLanguage.Japanese => this.commandRegexJp,
-                ClientLanguage.English => this.commandRegexEn,
-                ClientLanguage.German => this.commandRegexDe,
-                ClientLanguage.French => this.commandRegexFr,
-                _ => this.currentLangCommandRegex,
-            };
+            ClientLanguage.Japanese => this.commandRegexJp,
+            ClientLanguage.English => this.commandRegexEn,
+            ClientLanguage.German => this.commandRegexDe,
+            ClientLanguage.French => this.commandRegexFr,
+            _ => this.currentLangCommandRegex,
+        };
 
-            this.chatGui.CheckMessageHandled += this.OnCheckMessageHandled;
-        }
+        this.chatGui.CheckMessageHandled += this.OnCheckMessageHandled;
+    }
 
-        /// <summary>
-        /// Gets a read-only list of all registered commands.
-        /// </summary>
-        public ReadOnlyDictionary<string, CommandInfo> Commands => new(this.commandMap);
+    /// <summary>
+    /// Gets a read-only list of all registered commands.
+    /// </summary>
+    public ReadOnlyDictionary<string, CommandInfo> Commands => new(this.commandMap);
 
-        /// <summary>
-        /// Process a command in full.
-        /// </summary>
-        /// <param name="content">The full command string.</param>
-        /// <returns>True if the command was found and dispatched.</returns>
-        public bool ProcessCommand(string content)
+    /// <summary>
+    /// Process a command in full.
+    /// </summary>
+    /// <param name="content">The full command string.</param>
+    /// <returns>True if the command was found and dispatched.</returns>
+    public bool ProcessCommand(string content)
+    {
+        string command;
+        string argument;
+
+        var separatorPosition = content.IndexOf(' ');
+        if (separatorPosition == -1 || separatorPosition + 1 >= content.Length)
         {
-            string command;
-            string argument;
-
-            var separatorPosition = content.IndexOf(' ');
-            if (separatorPosition == -1 || separatorPosition + 1 >= content.Length)
+            // If no space was found or ends with the space. Process them as a no argument
+            if (separatorPosition + 1 >= content.Length)
             {
-                // If no space was found or ends with the space. Process them as a no argument
-                if (separatorPosition + 1 >= content.Length)
-                {
-                    // Remove the trailing space
-                    command = content.Substring(0, separatorPosition);
-                }
-                else
-                {
-                    command = content;
-                }
-
-                argument = string.Empty;
+                // Remove the trailing space
+                command = content.Substring(0, separatorPosition);
             }
             else
             {
-                // e.g.)
-                // /testcommand arg1
-                // => Total of 17 chars
-                // => command: 0-12 (12 chars)
-                // => argument: 13-17 (4 chars)
-                // => content.IndexOf(' ') == 12
-                command = content.Substring(0, separatorPosition);
-
-                var argStart = separatorPosition + 1;
-                argument = content[argStart..];
+                command = content;
             }
 
-            if (!this.commandMap.TryGetValue(command, out var handler)) // Commad was not found.
-                return false;
+            argument = string.Empty;
+        }
+        else
+        {
+            // e.g.)
+            // /testcommand arg1
+            // => Total of 17 chars
+            // => command: 0-12 (12 chars)
+            // => argument: 13-17 (4 chars)
+            // => content.IndexOf(' ') == 12
+            command = content.Substring(0, separatorPosition);
 
-            this.DispatchCommand(command, argument, handler);
+            var argStart = separatorPosition + 1;
+            argument = content[argStart..];
+        }
+
+        if (!this.commandMap.TryGetValue(command, out var handler)) // Commad was not found.
+            return false;
+
+        this.DispatchCommand(command, argument, handler);
+        return true;
+    }
+
+    /// <summary>
+    /// Dispatch the handling of a command.
+    /// </summary>
+    /// <param name="command">The command to dispatch.</param>
+    /// <param name="argument">The provided arguments.</param>
+    /// <param name="info">A <see cref="CommandInfo"/> object describing this command.</param>
+    public void DispatchCommand(string command, string argument, CommandInfo info)
+    {
+        try
+        {
+            info.Handler(command, argument);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Error while dispatching command {CommandName} (Argument: {Argument})", command, argument);
+        }
+    }
+
+    /// <summary>
+    /// Add a command handler, which you can use to add your own custom commands to the in-game chat.
+    /// </summary>
+    /// <param name="command">The command to register.</param>
+    /// <param name="info">A <see cref="CommandInfo"/> object describing the command.</param>
+    /// <returns>If adding was successful.</returns>
+    public bool AddHandler(string command, CommandInfo info)
+    {
+        if (info == null)
+            throw new ArgumentNullException(nameof(info), "Command handler is null.");
+
+        try
+        {
+            this.commandMap.Add(command, info);
             return true;
         }
-
-        /// <summary>
-        /// Dispatch the handling of a command.
-        /// </summary>
-        /// <param name="command">The command to dispatch.</param>
-        /// <param name="argument">The provided arguments.</param>
-        /// <param name="info">A <see cref="CommandInfo"/> object describing this command.</param>
-        public void DispatchCommand(string command, string argument, CommandInfo info)
+        catch (ArgumentException)
         {
-            try
-            {
-                info.Handler(command, argument);
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Error while dispatching command {CommandName} (Argument: {Argument})", command, argument);
-            }
+            Log.Error("Command {CommandName} is already registered.", command);
+            return false;
         }
+    }
 
-        /// <summary>
-        /// Add a command handler, which you can use to add your own custom commands to the in-game chat.
-        /// </summary>
-        /// <param name="command">The command to register.</param>
-        /// <param name="info">A <see cref="CommandInfo"/> object describing the command.</param>
-        /// <returns>If adding was successful.</returns>
-        public bool AddHandler(string command, CommandInfo info)
+    /// <summary>
+    /// Remove a command from the command handlers.
+    /// </summary>
+    /// <param name="command">The command to remove.</param>
+    /// <returns>If the removal was successful.</returns>
+    public bool RemoveHandler(string command)
+    {
+        return this.commandMap.Remove(command);
+    }
+
+    /// <inheritdoc/>
+    void IDisposable.Dispose()
+    {
+        this.chatGui.CheckMessageHandled -= this.OnCheckMessageHandled;
+    }
+
+    private void OnCheckMessageHandled(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled)
+    {
+        if (type == XivChatType.ErrorMessage && senderId == 0)
         {
-            if (info == null)
-                throw new ArgumentNullException(nameof(info), "Command handler is null.");
-
-            try
+            var cmdMatch = this.currentLangCommandRegex.Match(message.TextValue).Groups["command"];
+            if (cmdMatch.Success)
             {
-                this.commandMap.Add(command, info);
-                return true;
+                // Yes, it's a chat command.
+                var command = cmdMatch.Value;
+                if (this.ProcessCommand(command)) isHandled = true;
             }
-            catch (ArgumentException)
+            else
             {
-                Log.Error("Command {CommandName} is already registered.", command);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Remove a command from the command handlers.
-        /// </summary>
-        /// <param name="command">The command to remove.</param>
-        /// <returns>If the removal was successful.</returns>
-        public bool RemoveHandler(string command)
-        {
-            return this.commandMap.Remove(command);
-        }
-
-        /// <inheritdoc/>
-        void IDisposable.Dispose()
-        {
-            this.chatGui.CheckMessageHandled -= this.OnCheckMessageHandled;
-        }
-
-        private void OnCheckMessageHandled(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled)
-        {
-            if (type == XivChatType.ErrorMessage && senderId == 0)
-            {
-                var cmdMatch = this.currentLangCommandRegex.Match(message.TextValue).Groups["command"];
+                // Always match for china, since they patch in language files without changing the ClientLanguage.
+                cmdMatch = this.commandRegexCn.Match(message.TextValue).Groups["command"];
                 if (cmdMatch.Success)
                 {
-                    // Yes, it's a chat command.
+                    // Yes, it's a Chinese fallback chat command.
                     var command = cmdMatch.Value;
                     if (this.ProcessCommand(command)) isHandled = true;
                 }
-                else
-                {
-                    // Always match for china, since they patch in language files without changing the ClientLanguage.
-                    cmdMatch = this.commandRegexCn.Match(message.TextValue).Groups["command"];
-                    if (cmdMatch.Success)
-                    {
-                        // Yes, it's a Chinese fallback chat command.
-                        var command = cmdMatch.Value;
-                        if (this.ProcessCommand(command)) isHandled = true;
-                    }
-                }
             }
         }
     }
diff --git a/Dalamud/Game/Framework.cs b/Dalamud/Game/Framework.cs
index cb1f4e2a9..2de448aae 100644
--- a/Dalamud/Game/Framework.cs
+++ b/Dalamud/Game/Framework.cs
@@ -15,540 +15,539 @@ using Dalamud.IoC.Internal;
 using Dalamud.Utility;
 using Serilog;
 
-namespace Dalamud.Game
+namespace Dalamud.Game;
+
+/// <summary>
+/// This class represents the Framework of the native game client and grants access to various subsystems.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed class Framework : IDisposable, IServiceType
 {
-    /// <summary>
-    /// This class represents the Framework of the native game client and grants access to various subsystems.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed class Framework : IDisposable, IServiceType
+    private static Stopwatch statsStopwatch = new();
+
+    private readonly Stopwatch updateStopwatch = new();
+
+    private readonly Hook<OnUpdateDetour> updateHook;
+    private readonly Hook<OnRealDestroyDelegate> destroyHook;
+
+    private readonly object runOnNextTickTaskListSync = new();
+    private List<RunOnNextTickTaskBase> runOnNextTickTaskList = new();
+    private List<RunOnNextTickTaskBase> runOnNextTickTaskList2 = new();
+
+    private Thread? frameworkUpdateThread;
+
+    [ServiceManager.ServiceConstructor]
+    private Framework(SigScanner sigScanner)
     {
-        private static Stopwatch statsStopwatch = new();
+        this.Address = new FrameworkAddressResolver();
+        this.Address.Setup(sigScanner);
 
-        private readonly Stopwatch updateStopwatch = new();
+        this.updateHook = Hook<OnUpdateDetour>.FromAddress(this.Address.TickAddress, this.HandleFrameworkUpdate);
+        this.destroyHook = Hook<OnRealDestroyDelegate>.FromAddress(this.Address.DestroyAddress, this.HandleFrameworkDestroy);
+    }
 
-        private readonly Hook<OnUpdateDetour> updateHook;
-        private readonly Hook<OnRealDestroyDelegate> destroyHook;
+    /// <summary>
+    /// A delegate type used with the <see cref="Update"/> event.
+    /// </summary>
+    /// <param name="framework">The Framework instance.</param>
+    public delegate void OnUpdateDelegate(Framework framework);
 
-        private readonly object runOnNextTickTaskListSync = new();
-        private List<RunOnNextTickTaskBase> runOnNextTickTaskList = new();
-        private List<RunOnNextTickTaskBase> runOnNextTickTaskList2 = new();
+    /// <summary>
+    /// A delegate type used during the native Framework::destroy.
+    /// </summary>
+    /// <param name="framework">The native Framework address.</param>
+    /// <returns>A value indicating if the call was successful.</returns>
+    public delegate bool OnRealDestroyDelegate(IntPtr framework);
 
-        private Thread? frameworkUpdateThread;
+    /// <summary>
+    /// A delegate type used during the native Framework::free.
+    /// </summary>
+    /// <returns>The native Framework address.</returns>
+    public delegate IntPtr OnDestroyDelegate();
 
-        [ServiceManager.ServiceConstructor]
-        private Framework(SigScanner sigScanner)
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate bool OnUpdateDetour(IntPtr framework);
+
+    private delegate IntPtr OnDestroyDetour(); // OnDestroyDelegate
+
+    /// <summary>
+    /// Event that gets fired every time the game framework updates.
+    /// </summary>
+    public event OnUpdateDelegate Update;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the collection of stats is enabled.
+    /// </summary>
+    public static bool StatsEnabled { get; set; }
+
+    /// <summary>
+    /// Gets the stats history mapping.
+    /// </summary>
+    public static Dictionary<string, List<double>> StatsHistory { get; } = new();
+
+    /// <summary>
+    /// Gets a raw pointer to the instance of Client::Framework.
+    /// </summary>
+    public FrameworkAddressResolver Address { get; }
+
+    /// <summary>
+    /// Gets the last time that the Framework Update event was triggered.
+    /// </summary>
+    public DateTime LastUpdate { get; private set; } = DateTime.MinValue;
+
+    /// <summary>
+    /// Gets the last time in UTC that the Framework Update event was triggered.
+    /// </summary>
+    public DateTime LastUpdateUTC { get; private set; } = DateTime.MinValue;
+
+    /// <summary>
+    /// Gets the delta between the last Framework Update and the currently executing one.
+    /// </summary>
+    public TimeSpan UpdateDelta { get; private set; } = TimeSpan.Zero;
+
+    /// <summary>
+    /// Gets a value indicating whether currently executing code is running in the game's framework update thread.
+    /// </summary>
+    public bool IsInFrameworkUpdateThread => Thread.CurrentThread == this.frameworkUpdateThread;
+
+    /// <summary>
+    /// Gets a value indicating whether game Framework is unloading.
+    /// </summary>
+    public bool IsFrameworkUnloading { get; internal set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to dispatch update events.
+    /// </summary>
+    internal bool DispatchUpdateEvents { get; set; } = true;
+
+    /// <summary>
+    /// Run given function right away if this function has been called from game's Framework.Update thread, or otherwise run on next Framework.Update call.
+    /// </summary>
+    /// <typeparam name="T">Return type.</typeparam>
+    /// <param name="func">Function to call.</param>
+    /// <returns>Task representing the pending or already completed function.</returns>
+    public Task<T> RunOnFrameworkThread<T>(Func<T> func) =>
+        this.IsInFrameworkUpdateThread || this.IsFrameworkUnloading ? Task.FromResult(func()) : this.RunOnTick(func);
+
+    /// <summary>
+    /// Run given function right away if this function has been called from game's Framework.Update thread, or otherwise run on next Framework.Update call.
+    /// </summary>
+    /// <param name="action">Function to call.</param>
+    /// <returns>Task representing the pending or already completed function.</returns>
+    public Task RunOnFrameworkThread(Action action)
+    {
+        if (this.IsInFrameworkUpdateThread || this.IsFrameworkUnloading)
         {
-            this.Address = new FrameworkAddressResolver();
-            this.Address.Setup(sigScanner);
+            try
+            {
+                action();
+                return Task.CompletedTask;
+            }
+            catch (Exception ex)
+            {
+                return Task.FromException(ex);
+            }
+        }
+        else
+        {
+            return this.RunOnTick(action);
+        }
+    }
 
-            this.updateHook = Hook<OnUpdateDetour>.FromAddress(this.Address.TickAddress, this.HandleFrameworkUpdate);
-            this.destroyHook = Hook<OnRealDestroyDelegate>.FromAddress(this.Address.DestroyAddress, this.HandleFrameworkDestroy);
+    /// <summary>
+    /// Run given function right away if this function has been called from game's Framework.Update thread, or otherwise run on next Framework.Update call.
+    /// </summary>
+    /// <typeparam name="T">Return type.</typeparam>
+    /// <param name="func">Function to call.</param>
+    /// <returns>Task representing the pending or already completed function.</returns>
+    public Task<T> RunOnFrameworkThread<T>(Func<Task<T>> func) =>
+        this.IsInFrameworkUpdateThread || this.IsFrameworkUnloading ? func() : this.RunOnTick(func);
+
+    /// <summary>
+    /// Run given function right away if this function has been called from game's Framework.Update thread, or otherwise run on next Framework.Update call.
+    /// </summary>
+    /// <param name="func">Function to call.</param>
+    /// <returns>Task representing the pending or already completed function.</returns>
+    public Task RunOnFrameworkThread(Func<Task> func) =>
+        this.IsInFrameworkUpdateThread || this.IsFrameworkUnloading ? func() : this.RunOnTick(func);
+
+    /// <summary>
+    /// Run given function in upcoming Framework.Tick call.
+    /// </summary>
+    /// <typeparam name="T">Return type.</typeparam>
+    /// <param name="func">Function to call.</param>
+    /// <param name="delay">Wait for given timespan before calling this function.</param>
+    /// <param name="delayTicks">Count given number of Framework.Tick calls before calling this function. This takes precedence over delay parameter.</param>
+    /// <param name="cancellationToken">Cancellation token which will prevent the execution of this function if wait conditions are not met.</param>
+    /// <returns>Task representing the pending function.</returns>
+    public Task<T> RunOnTick<T>(Func<T> func, TimeSpan delay = default, int delayTicks = default, CancellationToken cancellationToken = default)
+    {
+        if (this.IsFrameworkUnloading)
+        {
+            if (delay == default && delayTicks == default)
+                return this.RunOnFrameworkThread(func);
+
+            var cts = new CancellationTokenSource();
+            cts.Cancel();
+            return Task.FromCanceled<T>(cts.Token);
         }
 
-        /// <summary>
-        /// A delegate type used with the <see cref="Update"/> event.
-        /// </summary>
-        /// <param name="framework">The Framework instance.</param>
-        public delegate void OnUpdateDelegate(Framework framework);
-
-        /// <summary>
-        /// A delegate type used during the native Framework::destroy.
-        /// </summary>
-        /// <param name="framework">The native Framework address.</param>
-        /// <returns>A value indicating if the call was successful.</returns>
-        public delegate bool OnRealDestroyDelegate(IntPtr framework);
-
-        /// <summary>
-        /// A delegate type used during the native Framework::free.
-        /// </summary>
-        /// <returns>The native Framework address.</returns>
-        public delegate IntPtr OnDestroyDelegate();
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate bool OnUpdateDetour(IntPtr framework);
-
-        private delegate IntPtr OnDestroyDetour(); // OnDestroyDelegate
-
-        /// <summary>
-        /// Event that gets fired every time the game framework updates.
-        /// </summary>
-        public event OnUpdateDelegate Update;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the collection of stats is enabled.
-        /// </summary>
-        public static bool StatsEnabled { get; set; }
-
-        /// <summary>
-        /// Gets the stats history mapping.
-        /// </summary>
-        public static Dictionary<string, List<double>> StatsHistory { get; } = new();
-
-        /// <summary>
-        /// Gets a raw pointer to the instance of Client::Framework.
-        /// </summary>
-        public FrameworkAddressResolver Address { get; }
-
-        /// <summary>
-        /// Gets the last time that the Framework Update event was triggered.
-        /// </summary>
-        public DateTime LastUpdate { get; private set; } = DateTime.MinValue;
-
-        /// <summary>
-        /// Gets the last time in UTC that the Framework Update event was triggered.
-        /// </summary>
-        public DateTime LastUpdateUTC { get; private set; } = DateTime.MinValue;
-
-        /// <summary>
-        /// Gets the delta between the last Framework Update and the currently executing one.
-        /// </summary>
-        public TimeSpan UpdateDelta { get; private set; } = TimeSpan.Zero;
-
-        /// <summary>
-        /// Gets a value indicating whether currently executing code is running in the game's framework update thread.
-        /// </summary>
-        public bool IsInFrameworkUpdateThread => Thread.CurrentThread == this.frameworkUpdateThread;
-
-        /// <summary>
-        /// Gets a value indicating whether game Framework is unloading.
-        /// </summary>
-        public bool IsFrameworkUnloading { get; internal set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to dispatch update events.
-        /// </summary>
-        internal bool DispatchUpdateEvents { get; set; } = true;
-
-        /// <summary>
-        /// Run given function right away if this function has been called from game's Framework.Update thread, or otherwise run on next Framework.Update call.
-        /// </summary>
-        /// <typeparam name="T">Return type.</typeparam>
-        /// <param name="func">Function to call.</param>
-        /// <returns>Task representing the pending or already completed function.</returns>
-        public Task<T> RunOnFrameworkThread<T>(Func<T> func) =>
-            this.IsInFrameworkUpdateThread || this.IsFrameworkUnloading ? Task.FromResult(func()) : this.RunOnTick(func);
-
-        /// <summary>
-        /// Run given function right away if this function has been called from game's Framework.Update thread, or otherwise run on next Framework.Update call.
-        /// </summary>
-        /// <param name="action">Function to call.</param>
-        /// <returns>Task representing the pending or already completed function.</returns>
-        public Task RunOnFrameworkThread(Action action)
+        var tcs = new TaskCompletionSource<T>();
+        lock (this.runOnNextTickTaskListSync)
         {
-            if (this.IsInFrameworkUpdateThread || this.IsFrameworkUnloading)
+            this.runOnNextTickTaskList.Add(new RunOnNextTickTaskFunc<T>()
             {
-                try
+                RemainingTicks = delayTicks,
+                RunAfterTickCount = Environment.TickCount64 + (long)Math.Ceiling(delay.TotalMilliseconds),
+                CancellationToken = cancellationToken,
+                TaskCompletionSource = tcs,
+                Func = func,
+            });
+        }
+
+        return tcs.Task;
+    }
+
+    /// <summary>
+    /// Run given function in upcoming Framework.Tick call.
+    /// </summary>
+    /// <param name="action">Function to call.</param>
+    /// <param name="delay">Wait for given timespan before calling this function.</param>
+    /// <param name="delayTicks">Count given number of Framework.Tick calls before calling this function. This takes precedence over delay parameter.</param>
+    /// <param name="cancellationToken">Cancellation token which will prevent the execution of this function if wait conditions are not met.</param>
+    /// <returns>Task representing the pending function.</returns>
+    public Task RunOnTick(Action action, TimeSpan delay = default, int delayTicks = default, CancellationToken cancellationToken = default)
+    {
+        if (this.IsFrameworkUnloading)
+        {
+            if (delay == default && delayTicks == default)
+                return this.RunOnFrameworkThread(action);
+
+            var cts = new CancellationTokenSource();
+            cts.Cancel();
+            return Task.FromCanceled(cts.Token);
+        }
+
+        var tcs = new TaskCompletionSource();
+        lock (this.runOnNextTickTaskListSync)
+        {
+            this.runOnNextTickTaskList.Add(new RunOnNextTickTaskAction()
+            {
+                RemainingTicks = delayTicks,
+                RunAfterTickCount = Environment.TickCount64 + (long)Math.Ceiling(delay.TotalMilliseconds),
+                CancellationToken = cancellationToken,
+                TaskCompletionSource = tcs,
+                Action = action,
+            });
+        }
+
+        return tcs.Task;
+    }
+
+    /// <summary>
+    /// Run given function in upcoming Framework.Tick call.
+    /// </summary>
+    /// <typeparam name="T">Return type.</typeparam>
+    /// <param name="func">Function to call.</param>
+    /// <param name="delay">Wait for given timespan before calling this function.</param>
+    /// <param name="delayTicks">Count given number of Framework.Tick calls before calling this function. This takes precedence over delay parameter.</param>
+    /// <param name="cancellationToken">Cancellation token which will prevent the execution of this function if wait conditions are not met.</param>
+    /// <returns>Task representing the pending function.</returns>
+    public Task<T> RunOnTick<T>(Func<Task<T>> func, TimeSpan delay = default, int delayTicks = default, CancellationToken cancellationToken = default)
+    {
+        if (this.IsFrameworkUnloading)
+        {
+            if (delay == default && delayTicks == default)
+                return this.RunOnFrameworkThread(func);
+
+            var cts = new CancellationTokenSource();
+            cts.Cancel();
+            return Task.FromCanceled<T>(cts.Token);
+        }
+
+        var tcs = new TaskCompletionSource<Task<T>>();
+        lock (this.runOnNextTickTaskListSync)
+        {
+            this.runOnNextTickTaskList.Add(new RunOnNextTickTaskFunc<Task<T>>()
+            {
+                RemainingTicks = delayTicks,
+                RunAfterTickCount = Environment.TickCount64 + (long)Math.Ceiling(delay.TotalMilliseconds),
+                CancellationToken = cancellationToken,
+                TaskCompletionSource = tcs,
+                Func = func,
+            });
+        }
+
+        return tcs.Task.ContinueWith(x => x.Result, cancellationToken).Unwrap();
+    }
+
+    /// <summary>
+    /// Run given function in upcoming Framework.Tick call.
+    /// </summary>
+    /// <param name="func">Function to call.</param>
+    /// <param name="delay">Wait for given timespan before calling this function.</param>
+    /// <param name="delayTicks">Count given number of Framework.Tick calls before calling this function. This takes precedence over delay parameter.</param>
+    /// <param name="cancellationToken">Cancellation token which will prevent the execution of this function if wait conditions are not met.</param>
+    /// <returns>Task representing the pending function.</returns>
+    public Task RunOnTick(Func<Task> func, TimeSpan delay = default, int delayTicks = default, CancellationToken cancellationToken = default)
+    {
+        if (this.IsFrameworkUnloading)
+        {
+            if (delay == default && delayTicks == default)
+                return this.RunOnFrameworkThread(func);
+
+            var cts = new CancellationTokenSource();
+            cts.Cancel();
+            return Task.FromCanceled(cts.Token);
+        }
+
+        var tcs = new TaskCompletionSource<Task>();
+        lock (this.runOnNextTickTaskListSync)
+        {
+            this.runOnNextTickTaskList.Add(new RunOnNextTickTaskFunc<Task>()
+            {
+                RemainingTicks = delayTicks,
+                RunAfterTickCount = Environment.TickCount64 + (long)Math.Ceiling(delay.TotalMilliseconds),
+                CancellationToken = cancellationToken,
+                TaskCompletionSource = tcs,
+                Func = func,
+            });
+        }
+
+        return tcs.Task.ContinueWith(x => x.Result, cancellationToken).Unwrap();
+    }
+
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.RunOnFrameworkThread(() =>
+        {
+            // ReSharper disable once AccessToDisposedClosure
+            this.updateHook.Disable();
+
+            // ReSharper disable once AccessToDisposedClosure
+            this.destroyHook.Disable();
+        }).Wait();
+
+        this.updateHook.Dispose();
+        this.destroyHook.Dispose();
+
+        this.updateStopwatch.Reset();
+        statsStopwatch.Reset();
+    }
+
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction()
+    {
+        this.updateHook.Enable();
+        this.destroyHook.Enable();
+    }
+
+    private void RunPendingTickTasks()
+    {
+        if (this.runOnNextTickTaskList.Count == 0 && this.runOnNextTickTaskList2.Count == 0)
+            return;
+
+        for (var i = 0; i < 2; i++)
+        {
+            lock (this.runOnNextTickTaskListSync)
+                (this.runOnNextTickTaskList, this.runOnNextTickTaskList2) = (this.runOnNextTickTaskList2, this.runOnNextTickTaskList);
+
+            this.runOnNextTickTaskList2.RemoveAll(x => x.Run());
+        }
+    }
+
+    private bool HandleFrameworkUpdate(IntPtr framework)
+    {
+        this.frameworkUpdateThread ??= Thread.CurrentThread;
+
+        ThreadSafety.MarkMainThread();
+
+        try
+        {
+            var chatGui = Service<ChatGui>.GetNullable();
+            var toastGui = Service<ToastGui>.GetNullable();
+            var gameNetwork = Service<GameNetwork>.GetNullable();
+            if (chatGui == null || toastGui == null || gameNetwork == null)
+                goto original;
+
+            chatGui.UpdateQueue();
+            toastGui.UpdateQueue();
+            gameNetwork.UpdateQueue();
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Exception while handling Framework::Update hook.");
+        }
+
+        if (this.DispatchUpdateEvents)
+        {
+            this.updateStopwatch.Stop();
+            this.UpdateDelta = TimeSpan.FromMilliseconds(this.updateStopwatch.ElapsedMilliseconds);
+            this.updateStopwatch.Restart();
+
+            this.LastUpdate = DateTime.Now;
+            this.LastUpdateUTC = DateTime.UtcNow;
+
+            this.RunPendingTickTasks();
+
+            if (StatsEnabled && this.Update != null)
+            {
+                // Stat Tracking for Framework Updates
+                var invokeList = this.Update.GetInvocationList();
+                var notUpdated = StatsHistory.Keys.ToList();
+
+                // Individually invoke OnUpdate handlers and time them.
+                foreach (var d in invokeList)
                 {
-                    action();
-                    return Task.CompletedTask;
+                    statsStopwatch.Restart();
+                    try
+                    {
+                        d.Method.Invoke(d.Target, new object[] { this });
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.Error(ex, "Exception while dispatching Framework::Update event.");
+                    }
+
+                    statsStopwatch.Stop();
+
+                    var key = $"{d.Target}::{d.Method.Name}";
+                    if (notUpdated.Contains(key))
+                        notUpdated.Remove(key);
+
+                    if (!StatsHistory.ContainsKey(key))
+                        StatsHistory.Add(key, new List<double>());
+
+                    StatsHistory[key].Add(statsStopwatch.Elapsed.TotalMilliseconds);
+
+                    if (StatsHistory[key].Count > 1000)
+                    {
+                        StatsHistory[key].RemoveRange(0, StatsHistory[key].Count - 1000);
+                    }
                 }
-                catch (Exception ex)
+
+                // Cleanup handlers that are no longer being called
+                foreach (var key in notUpdated)
                 {
-                    return Task.FromException(ex);
+                    if (StatsHistory[key].Count > 0)
+                    {
+                        StatsHistory[key].RemoveAt(0);
+                    }
+                    else
+                    {
+                        StatsHistory.Remove(key);
+                    }
                 }
             }
             else
             {
-                return this.RunOnTick(action);
+                this.Update?.InvokeSafely(this);
             }
         }
 
-        /// <summary>
-        /// Run given function right away if this function has been called from game's Framework.Update thread, or otherwise run on next Framework.Update call.
-        /// </summary>
-        /// <typeparam name="T">Return type.</typeparam>
-        /// <param name="func">Function to call.</param>
-        /// <returns>Task representing the pending or already completed function.</returns>
-        public Task<T> RunOnFrameworkThread<T>(Func<Task<T>> func) =>
-            this.IsInFrameworkUpdateThread || this.IsFrameworkUnloading ? func() : this.RunOnTick(func);
-
-        /// <summary>
-        /// Run given function right away if this function has been called from game's Framework.Update thread, or otherwise run on next Framework.Update call.
-        /// </summary>
-        /// <param name="func">Function to call.</param>
-        /// <returns>Task representing the pending or already completed function.</returns>
-        public Task RunOnFrameworkThread(Func<Task> func) =>
-            this.IsInFrameworkUpdateThread || this.IsFrameworkUnloading ? func() : this.RunOnTick(func);
-
-        /// <summary>
-        /// Run given function in upcoming Framework.Tick call.
-        /// </summary>
-        /// <typeparam name="T">Return type.</typeparam>
-        /// <param name="func">Function to call.</param>
-        /// <param name="delay">Wait for given timespan before calling this function.</param>
-        /// <param name="delayTicks">Count given number of Framework.Tick calls before calling this function. This takes precedence over delay parameter.</param>
-        /// <param name="cancellationToken">Cancellation token which will prevent the execution of this function if wait conditions are not met.</param>
-        /// <returns>Task representing the pending function.</returns>
-        public Task<T> RunOnTick<T>(Func<T> func, TimeSpan delay = default, int delayTicks = default, CancellationToken cancellationToken = default)
-        {
-            if (this.IsFrameworkUnloading)
-            {
-                if (delay == default && delayTicks == default)
-                    return this.RunOnFrameworkThread(func);
-
-                var cts = new CancellationTokenSource();
-                cts.Cancel();
-                return Task.FromCanceled<T>(cts.Token);
-            }
-
-            var tcs = new TaskCompletionSource<T>();
-            lock (this.runOnNextTickTaskListSync)
-            {
-                this.runOnNextTickTaskList.Add(new RunOnNextTickTaskFunc<T>()
-                {
-                    RemainingTicks = delayTicks,
-                    RunAfterTickCount = Environment.TickCount64 + (long)Math.Ceiling(delay.TotalMilliseconds),
-                    CancellationToken = cancellationToken,
-                    TaskCompletionSource = tcs,
-                    Func = func,
-                });
-            }
-
-            return tcs.Task;
-        }
-
-        /// <summary>
-        /// Run given function in upcoming Framework.Tick call.
-        /// </summary>
-        /// <param name="action">Function to call.</param>
-        /// <param name="delay">Wait for given timespan before calling this function.</param>
-        /// <param name="delayTicks">Count given number of Framework.Tick calls before calling this function. This takes precedence over delay parameter.</param>
-        /// <param name="cancellationToken">Cancellation token which will prevent the execution of this function if wait conditions are not met.</param>
-        /// <returns>Task representing the pending function.</returns>
-        public Task RunOnTick(Action action, TimeSpan delay = default, int delayTicks = default, CancellationToken cancellationToken = default)
-        {
-            if (this.IsFrameworkUnloading)
-            {
-                if (delay == default && delayTicks == default)
-                    return this.RunOnFrameworkThread(action);
-
-                var cts = new CancellationTokenSource();
-                cts.Cancel();
-                return Task.FromCanceled(cts.Token);
-            }
-
-            var tcs = new TaskCompletionSource();
-            lock (this.runOnNextTickTaskListSync)
-            {
-                this.runOnNextTickTaskList.Add(new RunOnNextTickTaskAction()
-                {
-                    RemainingTicks = delayTicks,
-                    RunAfterTickCount = Environment.TickCount64 + (long)Math.Ceiling(delay.TotalMilliseconds),
-                    CancellationToken = cancellationToken,
-                    TaskCompletionSource = tcs,
-                    Action = action,
-                });
-            }
-
-            return tcs.Task;
-        }
-
-        /// <summary>
-        /// Run given function in upcoming Framework.Tick call.
-        /// </summary>
-        /// <typeparam name="T">Return type.</typeparam>
-        /// <param name="func">Function to call.</param>
-        /// <param name="delay">Wait for given timespan before calling this function.</param>
-        /// <param name="delayTicks">Count given number of Framework.Tick calls before calling this function. This takes precedence over delay parameter.</param>
-        /// <param name="cancellationToken">Cancellation token which will prevent the execution of this function if wait conditions are not met.</param>
-        /// <returns>Task representing the pending function.</returns>
-        public Task<T> RunOnTick<T>(Func<Task<T>> func, TimeSpan delay = default, int delayTicks = default, CancellationToken cancellationToken = default)
-        {
-            if (this.IsFrameworkUnloading)
-            {
-                if (delay == default && delayTicks == default)
-                    return this.RunOnFrameworkThread(func);
-
-                var cts = new CancellationTokenSource();
-                cts.Cancel();
-                return Task.FromCanceled<T>(cts.Token);
-            }
-
-            var tcs = new TaskCompletionSource<Task<T>>();
-            lock (this.runOnNextTickTaskListSync)
-            {
-                this.runOnNextTickTaskList.Add(new RunOnNextTickTaskFunc<Task<T>>()
-                {
-                    RemainingTicks = delayTicks,
-                    RunAfterTickCount = Environment.TickCount64 + (long)Math.Ceiling(delay.TotalMilliseconds),
-                    CancellationToken = cancellationToken,
-                    TaskCompletionSource = tcs,
-                    Func = func,
-                });
-            }
-
-            return tcs.Task.ContinueWith(x => x.Result, cancellationToken).Unwrap();
-        }
-
-        /// <summary>
-        /// Run given function in upcoming Framework.Tick call.
-        /// </summary>
-        /// <param name="func">Function to call.</param>
-        /// <param name="delay">Wait for given timespan before calling this function.</param>
-        /// <param name="delayTicks">Count given number of Framework.Tick calls before calling this function. This takes precedence over delay parameter.</param>
-        /// <param name="cancellationToken">Cancellation token which will prevent the execution of this function if wait conditions are not met.</param>
-        /// <returns>Task representing the pending function.</returns>
-        public Task RunOnTick(Func<Task> func, TimeSpan delay = default, int delayTicks = default, CancellationToken cancellationToken = default)
-        {
-            if (this.IsFrameworkUnloading)
-            {
-                if (delay == default && delayTicks == default)
-                    return this.RunOnFrameworkThread(func);
-
-                var cts = new CancellationTokenSource();
-                cts.Cancel();
-                return Task.FromCanceled(cts.Token);
-            }
-
-            var tcs = new TaskCompletionSource<Task>();
-            lock (this.runOnNextTickTaskListSync)
-            {
-                this.runOnNextTickTaskList.Add(new RunOnNextTickTaskFunc<Task>()
-                {
-                    RemainingTicks = delayTicks,
-                    RunAfterTickCount = Environment.TickCount64 + (long)Math.Ceiling(delay.TotalMilliseconds),
-                    CancellationToken = cancellationToken,
-                    TaskCompletionSource = tcs,
-                    Func = func,
-                });
-            }
-
-            return tcs.Task.ContinueWith(x => x.Result, cancellationToken).Unwrap();
-        }
-
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        void IDisposable.Dispose()
-        {
-            this.RunOnFrameworkThread(() =>
-            {
-                // ReSharper disable once AccessToDisposedClosure
-                this.updateHook.Disable();
-
-                // ReSharper disable once AccessToDisposedClosure
-                this.destroyHook.Disable();
-            }).Wait();
-
-            this.updateHook.Dispose();
-            this.destroyHook.Dispose();
-
-            this.updateStopwatch.Reset();
-            statsStopwatch.Reset();
-        }
-
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction()
-        {
-            this.updateHook.Enable();
-            this.destroyHook.Enable();
-        }
-
-        private void RunPendingTickTasks()
-        {
-            if (this.runOnNextTickTaskList.Count == 0 && this.runOnNextTickTaskList2.Count == 0)
-                return;
-
-            for (var i = 0; i < 2; i++)
-            {
-                lock (this.runOnNextTickTaskListSync)
-                    (this.runOnNextTickTaskList, this.runOnNextTickTaskList2) = (this.runOnNextTickTaskList2, this.runOnNextTickTaskList);
-
-                this.runOnNextTickTaskList2.RemoveAll(x => x.Run());
-            }
-        }
-
-        private bool HandleFrameworkUpdate(IntPtr framework)
-        {
-            this.frameworkUpdateThread ??= Thread.CurrentThread;
-
-            ThreadSafety.MarkMainThread();
-
-            try
-            {
-                var chatGui = Service<ChatGui>.GetNullable();
-                var toastGui = Service<ToastGui>.GetNullable();
-                var gameNetwork = Service<GameNetwork>.GetNullable();
-                if (chatGui == null || toastGui == null || gameNetwork == null)
-                    goto original;
-
-                chatGui.UpdateQueue();
-                toastGui.UpdateQueue();
-                gameNetwork.UpdateQueue();
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Exception while handling Framework::Update hook.");
-            }
-
-            if (this.DispatchUpdateEvents)
-            {
-                this.updateStopwatch.Stop();
-                this.UpdateDelta = TimeSpan.FromMilliseconds(this.updateStopwatch.ElapsedMilliseconds);
-                this.updateStopwatch.Restart();
-
-                this.LastUpdate = DateTime.Now;
-                this.LastUpdateUTC = DateTime.UtcNow;
-
-                this.RunPendingTickTasks();
-
-                if (StatsEnabled && this.Update != null)
-                {
-                    // Stat Tracking for Framework Updates
-                    var invokeList = this.Update.GetInvocationList();
-                    var notUpdated = StatsHistory.Keys.ToList();
-
-                    // Individually invoke OnUpdate handlers and time them.
-                    foreach (var d in invokeList)
-                    {
-                        statsStopwatch.Restart();
-                        try
-                        {
-                            d.Method.Invoke(d.Target, new object[] { this });
-                        }
-                        catch (Exception ex)
-                        {
-                            Log.Error(ex, "Exception while dispatching Framework::Update event.");
-                        }
-
-                        statsStopwatch.Stop();
-
-                        var key = $"{d.Target}::{d.Method.Name}";
-                        if (notUpdated.Contains(key))
-                            notUpdated.Remove(key);
-
-                        if (!StatsHistory.ContainsKey(key))
-                            StatsHistory.Add(key, new List<double>());
-
-                        StatsHistory[key].Add(statsStopwatch.Elapsed.TotalMilliseconds);
-
-                        if (StatsHistory[key].Count > 1000)
-                        {
-                            StatsHistory[key].RemoveRange(0, StatsHistory[key].Count - 1000);
-                        }
-                    }
-
-                    // Cleanup handlers that are no longer being called
-                    foreach (var key in notUpdated)
-                    {
-                        if (StatsHistory[key].Count > 0)
-                        {
-                            StatsHistory[key].RemoveAt(0);
-                        }
-                        else
-                        {
-                            StatsHistory.Remove(key);
-                        }
-                    }
-                }
-                else
-                {
-                    this.Update?.InvokeSafely(this);
-                }
-            }
-
         original:
-            return this.updateHook.OriginalDisposeSafe(framework);
-        }
+        return this.updateHook.OriginalDisposeSafe(framework);
+    }
 
-        private bool HandleFrameworkDestroy(IntPtr framework)
+    private bool HandleFrameworkDestroy(IntPtr framework)
+    {
+        this.IsFrameworkUnloading = true;
+        this.DispatchUpdateEvents = false;
+
+        Log.Information("Framework::Destroy!");
+        Service<Dalamud>.Get().Unload();
+        this.RunPendingTickTasks();
+        ServiceManager.UnloadAllServices();
+        Log.Information("Framework::Destroy OK!");
+
+        return this.destroyHook.OriginalDisposeSafe(framework);
+    }
+
+    private abstract class RunOnNextTickTaskBase
+    {
+        internal int RemainingTicks { get; set; }
+
+        internal long RunAfterTickCount { get; init; }
+
+        internal CancellationToken CancellationToken { get; init; }
+
+        internal bool Run()
         {
-            this.IsFrameworkUnloading = true;
-            this.DispatchUpdateEvents = false;
-
-            Log.Information("Framework::Destroy!");
-            Service<Dalamud>.Get().Unload();
-            this.RunPendingTickTasks();
-            ServiceManager.UnloadAllServices();
-            Log.Information("Framework::Destroy OK!");
-
-            return this.destroyHook.OriginalDisposeSafe(framework);
-        }
-
-        private abstract class RunOnNextTickTaskBase
-        {
-            internal int RemainingTicks { get; set; }
-
-            internal long RunAfterTickCount { get; init; }
-
-            internal CancellationToken CancellationToken { get; init; }
-
-            internal bool Run()
+            if (this.CancellationToken.IsCancellationRequested)
             {
-                if (this.CancellationToken.IsCancellationRequested)
-                {
-                    this.CancelImpl();
-                    return true;
-                }
-
-                if (this.RemainingTicks > 0)
-                    this.RemainingTicks -= 1;
-                if (this.RemainingTicks > 0)
-                    return false;
-
-                if (this.RunAfterTickCount > Environment.TickCount64)
-                    return false;
-
-                this.RunImpl();
-
+                this.CancelImpl();
                 return true;
             }
 
-            protected abstract void RunImpl();
+            if (this.RemainingTicks > 0)
+                this.RemainingTicks -= 1;
+            if (this.RemainingTicks > 0)
+                return false;
 
-            protected abstract void CancelImpl();
+            if (this.RunAfterTickCount > Environment.TickCount64)
+                return false;
+
+            this.RunImpl();
+
+            return true;
         }
 
-        private class RunOnNextTickTaskFunc<T> : RunOnNextTickTaskBase
+        protected abstract void RunImpl();
+
+        protected abstract void CancelImpl();
+    }
+
+    private class RunOnNextTickTaskFunc<T> : RunOnNextTickTaskBase
+    {
+        internal TaskCompletionSource<T> TaskCompletionSource { get; init; }
+
+        internal Func<T> Func { get; init; }
+
+        protected override void RunImpl()
         {
-            internal TaskCompletionSource<T> TaskCompletionSource { get; init; }
-
-            internal Func<T> Func { get; init; }
-
-            protected override void RunImpl()
+            try
             {
-                try
-                {
-                    this.TaskCompletionSource.SetResult(this.Func());
-                }
-                catch (Exception ex)
-                {
-                    this.TaskCompletionSource.SetException(ex);
-                }
+                this.TaskCompletionSource.SetResult(this.Func());
             }
-
-            protected override void CancelImpl()
+            catch (Exception ex)
             {
-                this.TaskCompletionSource.SetCanceled();
+                this.TaskCompletionSource.SetException(ex);
             }
         }
 
-        private class RunOnNextTickTaskAction : RunOnNextTickTaskBase
+        protected override void CancelImpl()
         {
-            internal TaskCompletionSource TaskCompletionSource { get; init; }
+            this.TaskCompletionSource.SetCanceled();
+        }
+    }
 
-            internal Action Action { get; init; }
+    private class RunOnNextTickTaskAction : RunOnNextTickTaskBase
+    {
+        internal TaskCompletionSource TaskCompletionSource { get; init; }
 
-            protected override void RunImpl()
+        internal Action Action { get; init; }
+
+        protected override void RunImpl()
+        {
+            try
             {
-                try
-                {
-                    this.Action();
-                    this.TaskCompletionSource.SetResult();
-                }
-                catch (Exception ex)
-                {
-                    this.TaskCompletionSource.SetException(ex);
-                }
+                this.Action();
+                this.TaskCompletionSource.SetResult();
             }
-
-            protected override void CancelImpl()
+            catch (Exception ex)
             {
-                this.TaskCompletionSource.SetCanceled();
+                this.TaskCompletionSource.SetException(ex);
             }
         }
+
+        protected override void CancelImpl()
+        {
+            this.TaskCompletionSource.SetCanceled();
+        }
     }
 }
diff --git a/Dalamud/Game/FrameworkAddressResolver.cs b/Dalamud/Game/FrameworkAddressResolver.cs
index 2c6a860e0..e3d128f0f 100644
--- a/Dalamud/Game/FrameworkAddressResolver.cs
+++ b/Dalamud/Game/FrameworkAddressResolver.cs
@@ -1,49 +1,48 @@
 using System;
 
-namespace Dalamud.Game
+namespace Dalamud.Game;
+
+/// <summary>
+/// The address resolver for the <see cref="Framework"/> class.
+/// </summary>
+public sealed unsafe class FrameworkAddressResolver : BaseAddressResolver
 {
     /// <summary>
-    /// The address resolver for the <see cref="Framework"/> class.
+    /// Gets the base address of the Framework object.
     /// </summary>
-    public sealed unsafe class FrameworkAddressResolver : BaseAddressResolver
+    [Obsolete("Please use FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance() instead.")]
+    public IntPtr BaseAddress => new(FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance());
+
+    /// <summary>
+    /// Gets the address for the function that is called once the Framework is destroyed.
+    /// </summary>
+    public IntPtr DestroyAddress { get; private set; }
+
+    /// <summary>
+    /// Gets the address for the function that is called once the Framework is free'd.
+    /// </summary>
+    public IntPtr FreeAddress { get; private set; }
+
+    /// <summary>
+    /// Gets the function that is called every tick.
+    /// </summary>
+    public IntPtr TickAddress { get; private set; }
+
+    /// <inheritdoc/>
+    protected override void Setup64Bit(SigScanner sig)
     {
-        /// <summary>
-        /// Gets the base address of the Framework object.
-        /// </summary>
-        [Obsolete("Please use FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance() instead.")]
-        public IntPtr BaseAddress => new(FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance());
+        this.SetupFramework(sig);
+    }
 
-        /// <summary>
-        /// Gets the address for the function that is called once the Framework is destroyed.
-        /// </summary>
-        public IntPtr DestroyAddress { get; private set; }
+    private void SetupFramework(SigScanner scanner)
+    {
+        this.DestroyAddress =
+            scanner.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B 3D ?? ?? ?? ?? 48 8B D9 48 85 FF");
 
-        /// <summary>
-        /// Gets the address for the function that is called once the Framework is free'd.
-        /// </summary>
-        public IntPtr FreeAddress { get; private set; }
+        this.FreeAddress =
+            scanner.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B D9 48 8B 0D ?? ?? ?? ??");
 
-        /// <summary>
-        /// Gets the function that is called every tick.
-        /// </summary>
-        public IntPtr TickAddress { get; private set; }
-
-        /// <inheritdoc/>
-        protected override void Setup64Bit(SigScanner sig)
-        {
-            this.SetupFramework(sig);
-        }
-
-        private void SetupFramework(SigScanner scanner)
-        {
-            this.DestroyAddress =
-                scanner.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B 3D ?? ?? ?? ?? 48 8B D9 48 85 FF");
-
-            this.FreeAddress =
-                scanner.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B D9 48 8B 0D ?? ?? ?? ??");
-
-            this.TickAddress =
-                scanner.ScanText("40 53 48 83 EC 20 FF 81 ?? ?? ?? ?? 48 8B D9 48 8D 4C 24 ??");
-        }
+        this.TickAddress =
+            scanner.ScanText("40 53 48 83 EC 20 FF 81 ?? ?? ?? ?? 48 8B D9 48 8D 4C 24 ??");
     }
 }
diff --git a/Dalamud/Game/GameVersion.cs b/Dalamud/Game/GameVersion.cs
index a93e0bff2..2b2021e60 100644
--- a/Dalamud/Game/GameVersion.cs
+++ b/Dalamud/Game/GameVersion.cs
@@ -5,405 +5,404 @@ using System.Text;
 
 using Newtonsoft.Json;
 
-namespace Dalamud.Game
+namespace Dalamud.Game;
+
+/// <summary>
+/// A GameVersion object contains give hierarchical numeric components: year, month,
+/// day, major and minor. All components may be unspecified, which is represented
+/// internally as a -1. By definition, an unspecified component matches anything
+/// (both unspecified and specified), and an unspecified component is "less than" any
+/// specified component. It will also equal the string "any" if all components are
+/// unspecified. The value can be retrieved from the ffxivgame.ver file in your game
+/// installation directory.
+/// </summary>
+[Serializable]
+public sealed class GameVersion : ICloneable, IComparable, IComparable<GameVersion>, IEquatable<GameVersion>
 {
+    private static readonly GameVersion AnyVersion = new();
+
     /// <summary>
-    /// A GameVersion object contains give hierarchical numeric components: year, month,
-    /// day, major and minor. All components may be unspecified, which is represented
-    /// internally as a -1. By definition, an unspecified component matches anything
-    /// (both unspecified and specified), and an unspecified component is "less than" any
-    /// specified component. It will also equal the string "any" if all components are
-    /// unspecified. The value can be retrieved from the ffxivgame.ver file in your game
-    /// installation directory.
+    /// Initializes a new instance of the <see cref="GameVersion"/> class.
     /// </summary>
-    [Serializable]
-    public sealed class GameVersion : ICloneable, IComparable, IComparable<GameVersion>, IEquatable<GameVersion>
+    /// <param name="version">Version string to parse.</param>
+    [JsonConstructor]
+    public GameVersion(string version)
     {
-        private static readonly GameVersion AnyVersion = new();
+        var ver = Parse(version);
+        this.Year = ver.Year;
+        this.Month = ver.Month;
+        this.Day = ver.Day;
+        this.Major = ver.Major;
+        this.Minor = ver.Minor;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameVersion"/> class.
-        /// </summary>
-        /// <param name="version">Version string to parse.</param>
-        [JsonConstructor]
-        public GameVersion(string version)
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GameVersion"/> class.
+    /// </summary>
+    /// <param name="year">The year.</param>
+    /// <param name="month">The month.</param>
+    /// <param name="day">The day.</param>
+    /// <param name="major">The major version.</param>
+    /// <param name="minor">The minor version.</param>
+    public GameVersion(int year, int month, int day, int major, int minor)
+    {
+        if ((this.Year = year) < 0)
+            throw new ArgumentOutOfRangeException(nameof(year));
+
+        if ((this.Month = month) < 0)
+            throw new ArgumentOutOfRangeException(nameof(month));
+
+        if ((this.Day = day) < 0)
+            throw new ArgumentOutOfRangeException(nameof(day));
+
+        if ((this.Major = major) < 0)
+            throw new ArgumentOutOfRangeException(nameof(major));
+
+        if ((this.Minor = minor) < 0)
+            throw new ArgumentOutOfRangeException(nameof(minor));
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GameVersion"/> class.
+    /// </summary>
+    /// <param name="year">The year.</param>
+    /// <param name="month">The month.</param>
+    /// <param name="day">The day.</param>
+    /// <param name="major">The major version.</param>
+    public GameVersion(int year, int month, int day, int major)
+    {
+        if ((this.Year = year) < 0)
+            throw new ArgumentOutOfRangeException(nameof(year));
+
+        if ((this.Month = month) < 0)
+            throw new ArgumentOutOfRangeException(nameof(month));
+
+        if ((this.Day = day) < 0)
+            throw new ArgumentOutOfRangeException(nameof(day));
+
+        if ((this.Major = major) < 0)
+            throw new ArgumentOutOfRangeException(nameof(major));
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GameVersion"/> class.
+    /// </summary>
+    /// <param name="year">The year.</param>
+    /// <param name="month">The month.</param>
+    /// <param name="day">The day.</param>
+    public GameVersion(int year, int month, int day)
+    {
+        if ((this.Year = year) < 0)
+            throw new ArgumentOutOfRangeException(nameof(year));
+
+        if ((this.Month = month) < 0)
+            throw new ArgumentOutOfRangeException(nameof(month));
+
+        if ((this.Day = day) < 0)
+            throw new ArgumentOutOfRangeException(nameof(day));
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GameVersion"/> class.
+    /// </summary>
+    /// <param name="year">The year.</param>
+    /// <param name="month">The month.</param>
+    public GameVersion(int year, int month)
+    {
+        if ((this.Year = year) < 0)
+            throw new ArgumentOutOfRangeException(nameof(year));
+
+        if ((this.Month = month) < 0)
+            throw new ArgumentOutOfRangeException(nameof(month));
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GameVersion"/> class.
+    /// </summary>
+    /// <param name="year">The year.</param>
+    public GameVersion(int year)
+    {
+        if ((this.Year = year) < 0)
+            throw new ArgumentOutOfRangeException(nameof(year));
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GameVersion"/> class.
+    /// </summary>
+    public GameVersion()
+    {
+    }
+
+    /// <summary>
+    /// Gets the default "any" game version.
+    /// </summary>
+    public static GameVersion Any => AnyVersion;
+
+    /// <summary>
+    /// Gets the year component.
+    /// </summary>
+    public int Year { get; } = -1;
+
+    /// <summary>
+    /// Gets the month component.
+    /// </summary>
+    public int Month { get; } = -1;
+
+    /// <summary>
+    /// Gets the day component.
+    /// </summary>
+    public int Day { get; } = -1;
+
+    /// <summary>
+    /// Gets the major version component.
+    /// </summary>
+    public int Major { get; } = -1;
+
+    /// <summary>
+    /// Gets the minor version component.
+    /// </summary>
+    public int Minor { get; } = -1;
+
+    public static implicit operator GameVersion(string ver)
+    {
+        return Parse(ver);
+    }
+
+    public static bool operator ==(GameVersion v1, GameVersion v2)
+    {
+        if (v1 is null)
         {
-            var ver = Parse(version);
-            this.Year = ver.Year;
-            this.Month = ver.Month;
-            this.Day = ver.Day;
-            this.Major = ver.Major;
-            this.Minor = ver.Minor;
+            return v2 is null;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameVersion"/> class.
-        /// </summary>
-        /// <param name="year">The year.</param>
-        /// <param name="month">The month.</param>
-        /// <param name="day">The day.</param>
-        /// <param name="major">The major version.</param>
-        /// <param name="minor">The minor version.</param>
-        public GameVersion(int year, int month, int day, int major, int minor)
+        return v1.Equals(v2);
+    }
+
+    public static bool operator !=(GameVersion v1, GameVersion v2)
+    {
+        return !(v1 == v2);
+    }
+
+    public static bool operator <(GameVersion v1, GameVersion v2)
+    {
+        if (v1 is null)
+            throw new ArgumentNullException(nameof(v1));
+
+        return v1.CompareTo(v2) < 0;
+    }
+
+    public static bool operator <=(GameVersion v1, GameVersion v2)
+    {
+        if (v1 is null)
+            throw new ArgumentNullException(nameof(v1));
+
+        return v1.CompareTo(v2) <= 0;
+    }
+
+    public static bool operator >(GameVersion v1, GameVersion v2)
+    {
+        return v2 < v1;
+    }
+
+    public static bool operator >=(GameVersion v1, GameVersion v2)
+    {
+        return v2 <= v1;
+    }
+
+    public static GameVersion operator +(GameVersion v1, TimeSpan v2)
+    {
+        if (v1 == null)
+            throw new ArgumentNullException(nameof(v1));
+
+        if (v1.Year == -1 || v1.Month == -1 || v1.Day == -1)
+            return v1;
+
+        var date = new DateTime(v1.Year, v1.Month, v1.Day) + v2;
+
+        return new GameVersion(date.Year, date.Month, date.Day, v1.Major, v1.Minor);
+    }
+
+    public static GameVersion operator -(GameVersion v1, TimeSpan v2)
+    {
+        if (v1 == null)
+            throw new ArgumentNullException(nameof(v1));
+
+        if (v1.Year == -1 || v1.Month == -1 || v1.Day == -1)
+            return v1;
+
+        var date = new DateTime(v1.Year, v1.Month, v1.Day) - v2;
+
+        return new GameVersion(date.Year, date.Month, date.Day, v1.Major, v1.Minor);
+    }
+
+    /// <summary>
+    /// Parse a version string. YYYY.MM.DD.majr.minr or "any".
+    /// </summary>
+    /// <param name="input">Input to parse.</param>
+    /// <returns>GameVersion object.</returns>
+    public static GameVersion Parse(string input)
+    {
+        if (input == null)
+            throw new ArgumentNullException(nameof(input));
+
+        if (input.ToLower(CultureInfo.InvariantCulture) == "any")
+            return new GameVersion();
+
+        var parts = input.Split('.');
+        var tplParts = parts.Select(p =>
         {
-            if ((this.Year = year) < 0)
-                throw new ArgumentOutOfRangeException(nameof(year));
+            var result = int.TryParse(p, out var value);
+            return (result, value);
+        }).ToArray();
 
-            if ((this.Month = month) < 0)
-                throw new ArgumentOutOfRangeException(nameof(month));
+        if (tplParts.Any(t => !t.result))
+            throw new FormatException("Bad formatting");
 
-            if ((this.Day = day) < 0)
-                throw new ArgumentOutOfRangeException(nameof(day));
+        var intParts = tplParts.Select(t => t.value).ToArray();
+        var len = intParts.Length;
 
-            if ((this.Major = major) < 0)
-                throw new ArgumentOutOfRangeException(nameof(major));
+        if (len == 1)
+            return new GameVersion(intParts[0]);
+        else if (len == 2)
+            return new GameVersion(intParts[0], intParts[1]);
+        else if (len == 3)
+            return new GameVersion(intParts[0], intParts[1], intParts[2]);
+        else if (len == 4)
+            return new GameVersion(intParts[0], intParts[1], intParts[2], intParts[3]);
+        else if (len == 5)
+            return new GameVersion(intParts[0], intParts[1], intParts[2], intParts[3], intParts[4]);
+        else
+            throw new ArgumentException("Too many parts");
+    }
 
-            if ((this.Minor = minor) < 0)
-                throw new ArgumentOutOfRangeException(nameof(minor));
+    /// <summary>
+    /// Try to parse a version string. YYYY.MM.DD.majr.minr or "any".
+    /// </summary>
+    /// <param name="input">Input to parse.</param>
+    /// <param name="result">GameVersion object.</param>
+    /// <returns>Success or failure.</returns>
+    public static bool TryParse(string input, out GameVersion result)
+    {
+        try
+        {
+            result = Parse(input);
+            return true;
         }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameVersion"/> class.
-        /// </summary>
-        /// <param name="year">The year.</param>
-        /// <param name="month">The month.</param>
-        /// <param name="day">The day.</param>
-        /// <param name="major">The major version.</param>
-        public GameVersion(int year, int month, int day, int major)
+        catch
         {
-            if ((this.Year = year) < 0)
-                throw new ArgumentOutOfRangeException(nameof(year));
-
-            if ((this.Month = month) < 0)
-                throw new ArgumentOutOfRangeException(nameof(month));
-
-            if ((this.Day = day) < 0)
-                throw new ArgumentOutOfRangeException(nameof(day));
-
-            if ((this.Major = major) < 0)
-                throw new ArgumentOutOfRangeException(nameof(major));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameVersion"/> class.
-        /// </summary>
-        /// <param name="year">The year.</param>
-        /// <param name="month">The month.</param>
-        /// <param name="day">The day.</param>
-        public GameVersion(int year, int month, int day)
-        {
-            if ((this.Year = year) < 0)
-                throw new ArgumentOutOfRangeException(nameof(year));
-
-            if ((this.Month = month) < 0)
-                throw new ArgumentOutOfRangeException(nameof(month));
-
-            if ((this.Day = day) < 0)
-                throw new ArgumentOutOfRangeException(nameof(day));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameVersion"/> class.
-        /// </summary>
-        /// <param name="year">The year.</param>
-        /// <param name="month">The month.</param>
-        public GameVersion(int year, int month)
-        {
-            if ((this.Year = year) < 0)
-                throw new ArgumentOutOfRangeException(nameof(year));
-
-            if ((this.Month = month) < 0)
-                throw new ArgumentOutOfRangeException(nameof(month));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameVersion"/> class.
-        /// </summary>
-        /// <param name="year">The year.</param>
-        public GameVersion(int year)
-        {
-            if ((this.Year = year) < 0)
-                throw new ArgumentOutOfRangeException(nameof(year));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameVersion"/> class.
-        /// </summary>
-        public GameVersion()
-        {
-        }
-
-        /// <summary>
-        /// Gets the default "any" game version.
-        /// </summary>
-        public static GameVersion Any => AnyVersion;
-
-        /// <summary>
-        /// Gets the year component.
-        /// </summary>
-        public int Year { get; } = -1;
-
-        /// <summary>
-        /// Gets the month component.
-        /// </summary>
-        public int Month { get; } = -1;
-
-        /// <summary>
-        /// Gets the day component.
-        /// </summary>
-        public int Day { get; } = -1;
-
-        /// <summary>
-        /// Gets the major version component.
-        /// </summary>
-        public int Major { get; } = -1;
-
-        /// <summary>
-        /// Gets the minor version component.
-        /// </summary>
-        public int Minor { get; } = -1;
-
-        public static implicit operator GameVersion(string ver)
-        {
-            return Parse(ver);
-        }
-
-        public static bool operator ==(GameVersion v1, GameVersion v2)
-        {
-            if (v1 is null)
-            {
-                return v2 is null;
-            }
-
-            return v1.Equals(v2);
-        }
-
-        public static bool operator !=(GameVersion v1, GameVersion v2)
-        {
-            return !(v1 == v2);
-        }
-
-        public static bool operator <(GameVersion v1, GameVersion v2)
-        {
-            if (v1 is null)
-                throw new ArgumentNullException(nameof(v1));
-
-            return v1.CompareTo(v2) < 0;
-        }
-
-        public static bool operator <=(GameVersion v1, GameVersion v2)
-        {
-            if (v1 is null)
-                throw new ArgumentNullException(nameof(v1));
-
-            return v1.CompareTo(v2) <= 0;
-        }
-
-        public static bool operator >(GameVersion v1, GameVersion v2)
-        {
-            return v2 < v1;
-        }
-
-        public static bool operator >=(GameVersion v1, GameVersion v2)
-        {
-            return v2 <= v1;
-        }
-
-        public static GameVersion operator +(GameVersion v1, TimeSpan v2)
-        {
-            if (v1 == null)
-                throw new ArgumentNullException(nameof(v1));
-
-            if (v1.Year == -1 || v1.Month == -1 || v1.Day == -1)
-                return v1;
-
-            var date = new DateTime(v1.Year, v1.Month, v1.Day) + v2;
-
-            return new GameVersion(date.Year, date.Month, date.Day, v1.Major, v1.Minor);
-        }
-
-        public static GameVersion operator -(GameVersion v1, TimeSpan v2)
-        {
-            if (v1 == null)
-                throw new ArgumentNullException(nameof(v1));
-
-            if (v1.Year == -1 || v1.Month == -1 || v1.Day == -1)
-                return v1;
-
-            var date = new DateTime(v1.Year, v1.Month, v1.Day) - v2;
-
-            return new GameVersion(date.Year, date.Month, date.Day, v1.Major, v1.Minor);
-        }
-
-        /// <summary>
-        /// Parse a version string. YYYY.MM.DD.majr.minr or "any".
-        /// </summary>
-        /// <param name="input">Input to parse.</param>
-        /// <returns>GameVersion object.</returns>
-        public static GameVersion Parse(string input)
-        {
-            if (input == null)
-                throw new ArgumentNullException(nameof(input));
-
-            if (input.ToLower(CultureInfo.InvariantCulture) == "any")
-                return new GameVersion();
-
-            var parts = input.Split('.');
-            var tplParts = parts.Select(p =>
-            {
-                var result = int.TryParse(p, out var value);
-                return (result, value);
-            }).ToArray();
-
-            if (tplParts.Any(t => !t.result))
-                throw new FormatException("Bad formatting");
-
-            var intParts = tplParts.Select(t => t.value).ToArray();
-            var len = intParts.Length;
-
-            if (len == 1)
-                return new GameVersion(intParts[0]);
-            else if (len == 2)
-                return new GameVersion(intParts[0], intParts[1]);
-            else if (len == 3)
-                return new GameVersion(intParts[0], intParts[1], intParts[2]);
-            else if (len == 4)
-                return new GameVersion(intParts[0], intParts[1], intParts[2], intParts[3]);
-            else if (len == 5)
-                return new GameVersion(intParts[0], intParts[1], intParts[2], intParts[3], intParts[4]);
-            else
-                throw new ArgumentException("Too many parts");
-        }
-
-        /// <summary>
-        /// Try to parse a version string. YYYY.MM.DD.majr.minr or "any".
-        /// </summary>
-        /// <param name="input">Input to parse.</param>
-        /// <param name="result">GameVersion object.</param>
-        /// <returns>Success or failure.</returns>
-        public static bool TryParse(string input, out GameVersion result)
-        {
-            try
-            {
-                result = Parse(input);
-                return true;
-            }
-            catch
-            {
-                result = null;
-                return false;
-            }
-        }
-
-        /// <inheritdoc/>
-        public object Clone() => new GameVersion(this.Year, this.Month, this.Day, this.Major, this.Minor);
-
-        /// <inheritdoc/>
-        public int CompareTo(object obj)
-        {
-            if (obj == null)
-                return 1;
-
-            if (obj is GameVersion value)
-            {
-                return this.CompareTo(value);
-            }
-            else
-            {
-                throw new ArgumentException("Argument must be a GameVersion");
-            }
-        }
-
-        /// <inheritdoc/>
-        public int CompareTo(GameVersion value)
-        {
-            if (value == null)
-                return 1;
-
-            if (this == value)
-                return 0;
-
-            if (this == AnyVersion)
-                return 1;
-
-            if (value == AnyVersion)
-                return -1;
-
-            if (this.Year != value.Year)
-                return this.Year > value.Year ? 1 : -1;
-
-            if (this.Month != value.Month)
-                return this.Month > value.Month ? 1 : -1;
-
-            if (this.Day != value.Day)
-                return this.Day > value.Day ? 1 : -1;
-
-            if (this.Major != value.Major)
-                return this.Major > value.Major ? 1 : -1;
-
-            if (this.Minor != value.Minor)
-                return this.Minor > value.Minor ? 1 : -1;
-
-            return 0;
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is not GameVersion value)
-                return false;
-
-            return this.Equals(value);
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(GameVersion value)
-        {
-            if (value == null)
-            {
-                return false;
-            }
-
-            return
-                (this.Year == value.Year) &&
-                (this.Month == value.Month) &&
-                (this.Day == value.Day) &&
-                (this.Major == value.Major) &&
-                (this.Minor == value.Minor);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            var accumulator = 0;
-
-            // This might be horribly wrong, but it isn't used heavily.
-            accumulator |= this.Year.GetHashCode();
-            accumulator |= this.Month.GetHashCode();
-            accumulator |= this.Day.GetHashCode();
-            accumulator |= this.Major.GetHashCode();
-            accumulator |= this.Minor.GetHashCode();
-
-            return accumulator;
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this.Year == -1 &&
-                this.Month == -1 &&
-                this.Day == -1 &&
-                this.Major == -1 &&
-                this.Minor == -1)
-                return "any";
-
-            return new StringBuilder()
-                .Append(string.Format("{0:D4}.", this.Year == -1 ? 0 : this.Year))
-                .Append(string.Format("{0:D2}.", this.Month == -1 ? 0 : this.Month))
-                .Append(string.Format("{0:D2}.", this.Day == -1 ? 0 : this.Day))
-                .Append(string.Format("{0:D4}.", this.Major == -1 ? 0 : this.Major))
-                .Append(string.Format("{0:D4}", this.Minor == -1 ? 0 : this.Minor))
-                .ToString();
+            result = null;
+            return false;
         }
     }
+
+    /// <inheritdoc/>
+    public object Clone() => new GameVersion(this.Year, this.Month, this.Day, this.Major, this.Minor);
+
+    /// <inheritdoc/>
+    public int CompareTo(object obj)
+    {
+        if (obj == null)
+            return 1;
+
+        if (obj is GameVersion value)
+        {
+            return this.CompareTo(value);
+        }
+        else
+        {
+            throw new ArgumentException("Argument must be a GameVersion");
+        }
+    }
+
+    /// <inheritdoc/>
+    public int CompareTo(GameVersion value)
+    {
+        if (value == null)
+            return 1;
+
+        if (this == value)
+            return 0;
+
+        if (this == AnyVersion)
+            return 1;
+
+        if (value == AnyVersion)
+            return -1;
+
+        if (this.Year != value.Year)
+            return this.Year > value.Year ? 1 : -1;
+
+        if (this.Month != value.Month)
+            return this.Month > value.Month ? 1 : -1;
+
+        if (this.Day != value.Day)
+            return this.Day > value.Day ? 1 : -1;
+
+        if (this.Major != value.Major)
+            return this.Major > value.Major ? 1 : -1;
+
+        if (this.Minor != value.Minor)
+            return this.Minor > value.Minor ? 1 : -1;
+
+        return 0;
+    }
+
+    /// <inheritdoc/>
+    public override bool Equals(object obj)
+    {
+        if (obj is not GameVersion value)
+            return false;
+
+        return this.Equals(value);
+    }
+
+    /// <inheritdoc/>
+    public bool Equals(GameVersion value)
+    {
+        if (value == null)
+        {
+            return false;
+        }
+
+        return
+            (this.Year == value.Year) &&
+            (this.Month == value.Month) &&
+            (this.Day == value.Day) &&
+            (this.Major == value.Major) &&
+            (this.Minor == value.Minor);
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        var accumulator = 0;
+
+        // This might be horribly wrong, but it isn't used heavily.
+        accumulator |= this.Year.GetHashCode();
+        accumulator |= this.Month.GetHashCode();
+        accumulator |= this.Day.GetHashCode();
+        accumulator |= this.Major.GetHashCode();
+        accumulator |= this.Minor.GetHashCode();
+
+        return accumulator;
+    }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        if (this.Year == -1 &&
+            this.Month == -1 &&
+            this.Day == -1 &&
+            this.Major == -1 &&
+            this.Minor == -1)
+            return "any";
+
+        return new StringBuilder()
+               .Append(string.Format("{0:D4}.", this.Year == -1 ? 0 : this.Year))
+               .Append(string.Format("{0:D2}.", this.Month == -1 ? 0 : this.Month))
+               .Append(string.Format("{0:D2}.", this.Day == -1 ? 0 : this.Day))
+               .Append(string.Format("{0:D4}.", this.Major == -1 ? 0 : this.Major))
+               .Append(string.Format("{0:D4}", this.Minor == -1 ? 0 : this.Minor))
+               .ToString();
+    }
 }
diff --git a/Dalamud/Game/GameVersionConverter.cs b/Dalamud/Game/GameVersionConverter.cs
index 9058e8be9..f307b6fb9 100644
--- a/Dalamud/Game/GameVersionConverter.cs
+++ b/Dalamud/Game/GameVersionConverter.cs
@@ -2,79 +2,78 @@ using System;
 
 using Newtonsoft.Json;
 
-namespace Dalamud.Game
+namespace Dalamud.Game;
+
+/// <summary>
+/// Converts a <see cref="GameVersion"/> to and from a string (e.g. <c>"2010.01.01.1234.5678"</c>).
+/// </summary>
+public sealed class GameVersionConverter : JsonConverter
 {
     /// <summary>
-    /// Converts a <see cref="GameVersion"/> to and from a string (e.g. <c>"2010.01.01.1234.5678"</c>).
+    /// Writes the JSON representation of the object.
     /// </summary>
-    public sealed class GameVersionConverter : JsonConverter
+    /// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="serializer">The calling serializer.</param>
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
     {
-        /// <summary>
-        /// Writes the JSON representation of the object.
-        /// </summary>
-        /// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="serializer">The calling serializer.</param>
-        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+        if (value == null)
         {
-            if (value == null)
-            {
-                writer.WriteNull();
-            }
-            else if (value is GameVersion)
-            {
-                writer.WriteValue(value.ToString());
-            }
-            else
-            {
-                throw new JsonSerializationException("Expected GameVersion object value");
-            }
+            writer.WriteNull();
         }
-
-        /// <summary>
-        /// Reads the JSON representation of the object.
-        /// </summary>
-        /// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
-        /// <param name="objectType">Type of the object.</param>
-        /// <param name="existingValue">The existing property value of the JSON that is being converted.</param>
-        /// <param name="serializer">The calling serializer.</param>
-        /// <returns>The object value.</returns>
-        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        else if (value is GameVersion)
         {
-            if (reader.TokenType == JsonToken.Null)
-            {
-                return null;
-            }
-            else
-            {
-                if (reader.TokenType == JsonToken.String)
-                {
-                    try
-                    {
-                        return new GameVersion((string)reader.Value!);
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new JsonSerializationException($"Error parsing GameVersion string: {reader.Value}", ex);
-                    }
-                }
-                else
-                {
-                    throw new JsonSerializationException($"Unexpected token or value when parsing GameVersion. Token: {reader.TokenType}, Value: {reader.Value}");
-                }
-            }
+            writer.WriteValue(value.ToString());
         }
-
-        /// <summary>
-        /// Determines whether this instance can convert the specified object type.
-        /// </summary>
-        /// <param name="objectType">Type of the object.</param>
-        /// <returns>
-        /// <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool CanConvert(Type objectType)
+        else
         {
-            return objectType == typeof(GameVersion);
+            throw new JsonSerializationException("Expected GameVersion object value");
         }
     }
+
+    /// <summary>
+    /// Reads the JSON representation of the object.
+    /// </summary>
+    /// <param name="reader">The <see cref="JsonReader"/> to read from.</param>
+    /// <param name="objectType">Type of the object.</param>
+    /// <param name="existingValue">The existing property value of the JSON that is being converted.</param>
+    /// <param name="serializer">The calling serializer.</param>
+    /// <returns>The object value.</returns>
+    public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+    {
+        if (reader.TokenType == JsonToken.Null)
+        {
+            return null;
+        }
+        else
+        {
+            if (reader.TokenType == JsonToken.String)
+            {
+                try
+                {
+                    return new GameVersion((string)reader.Value!);
+                }
+                catch (Exception ex)
+                {
+                    throw new JsonSerializationException($"Error parsing GameVersion string: {reader.Value}", ex);
+                }
+            }
+            else
+            {
+                throw new JsonSerializationException($"Unexpected token or value when parsing GameVersion. Token: {reader.TokenType}, Value: {reader.Value}");
+            }
+        }
+    }
+
+    /// <summary>
+    /// Determines whether this instance can convert the specified object type.
+    /// </summary>
+    /// <param name="objectType">Type of the object.</param>
+    /// <returns>
+    /// <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
+    /// </returns>
+    public override bool CanConvert(Type objectType)
+    {
+        return objectType == typeof(GameVersion);
+    }
 }
diff --git a/Dalamud/Game/Gui/ChatGui.cs b/Dalamud/Game/Gui/ChatGui.cs
index 48ff123c6..93185caf9 100644
--- a/Dalamud/Game/Gui/ChatGui.cs
+++ b/Dalamud/Game/Gui/ChatGui.cs
@@ -14,446 +14,445 @@ using Dalamud.IoC.Internal;
 using Dalamud.Utility;
 using Serilog;
 
-namespace Dalamud.Game.Gui
+namespace Dalamud.Game.Gui;
+
+/// <summary>
+/// This class handles interacting with the native chat UI.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed class ChatGui : IDisposable, IServiceType
 {
-    /// <summary>
-    /// This class handles interacting with the native chat UI.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed class ChatGui : IDisposable, IServiceType
+    private readonly ChatGuiAddressResolver address;
+
+    private readonly Queue<XivChatEntry> chatQueue = new();
+    private readonly Dictionary<(string PluginName, uint CommandId), Action<uint, SeString>> dalamudLinkHandlers = new();
+
+    private readonly Hook<PrintMessageDelegate> printMessageHook;
+    private readonly Hook<PopulateItemLinkDelegate> populateItemLinkHook;
+    private readonly Hook<InteractableLinkClickedDelegate> interactableLinkClickedHook;
+
+    [ServiceManager.ServiceDependency]
+    private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
+
+    [ServiceManager.ServiceDependency]
+    private readonly LibcFunction libcFunction = Service<LibcFunction>.Get();
+
+    private IntPtr baseAddress = IntPtr.Zero;
+
+    [ServiceManager.ServiceConstructor]
+    private ChatGui(SigScanner sigScanner)
     {
-        private readonly ChatGuiAddressResolver address;
+        this.address = new ChatGuiAddressResolver();
+        this.address.Setup(sigScanner);
 
-        private readonly Queue<XivChatEntry> chatQueue = new();
-        private readonly Dictionary<(string PluginName, uint CommandId), Action<uint, SeString>> dalamudLinkHandlers = new();
+        this.printMessageHook = Hook<PrintMessageDelegate>.FromAddress(this.address.PrintMessage, this.HandlePrintMessageDetour);
+        this.populateItemLinkHook = Hook<PopulateItemLinkDelegate>.FromAddress(this.address.PopulateItemLinkObject, this.HandlePopulateItemLinkDetour);
+        this.interactableLinkClickedHook = Hook<InteractableLinkClickedDelegate>.FromAddress(this.address.InteractableLinkClicked, this.InteractableLinkClickedDetour);
+    }
 
-        private readonly Hook<PrintMessageDelegate> printMessageHook;
-        private readonly Hook<PopulateItemLinkDelegate> populateItemLinkHook;
-        private readonly Hook<InteractableLinkClickedDelegate> interactableLinkClickedHook;
+    /// <summary>
+    /// A delegate type used with the <see cref="ChatGui.ChatMessage"/> event.
+    /// </summary>
+    /// <param name="type">The type of chat.</param>
+    /// <param name="senderId">The sender ID.</param>
+    /// <param name="sender">The sender name.</param>
+    /// <param name="message">The message sent.</param>
+    /// <param name="isHandled">A value indicating whether the message was handled or should be propagated.</param>
+    public delegate void OnMessageDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled);
 
-        [ServiceManager.ServiceDependency]
-        private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
+    /// <summary>
+    /// A delegate type used with the <see cref="ChatGui.CheckMessageHandled"/> event.
+    /// </summary>
+    /// <param name="type">The type of chat.</param>
+    /// <param name="senderId">The sender ID.</param>
+    /// <param name="sender">The sender name.</param>
+    /// <param name="message">The message sent.</param>
+    /// <param name="isHandled">A value indicating whether the message was handled or should be propagated.</param>
+    public delegate void OnCheckMessageHandledDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled);
 
-        [ServiceManager.ServiceDependency]
-        private readonly LibcFunction libcFunction = Service<LibcFunction>.Get();
+    /// <summary>
+    /// A delegate type used with the <see cref="ChatGui.ChatMessageHandled"/> event.
+    /// </summary>
+    /// <param name="type">The type of chat.</param>
+    /// <param name="senderId">The sender ID.</param>
+    /// <param name="sender">The sender name.</param>
+    /// <param name="message">The message sent.</param>
+    public delegate void OnMessageHandledDelegate(XivChatType type, uint senderId, SeString sender, SeString message);
 
-        private IntPtr baseAddress = IntPtr.Zero;
+    /// <summary>
+    /// A delegate type used with the <see cref="ChatGui.ChatMessageUnhandled"/> event.
+    /// </summary>
+    /// <param name="type">The type of chat.</param>
+    /// <param name="senderId">The sender ID.</param>
+    /// <param name="sender">The sender name.</param>
+    /// <param name="message">The message sent.</param>
+    public delegate void OnMessageUnhandledDelegate(XivChatType type, uint senderId, SeString sender, SeString message);
 
-        [ServiceManager.ServiceConstructor]
-        private ChatGui(SigScanner sigScanner)
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr PrintMessageDelegate(IntPtr manager, XivChatType chatType, IntPtr senderName, IntPtr message, uint senderId, IntPtr parameter);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate void PopulateItemLinkDelegate(IntPtr linkObjectPtr, IntPtr itemInfoPtr);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate void InteractableLinkClickedDelegate(IntPtr managerPtr, IntPtr messagePtr);
+
+    /// <summary>
+    /// Event that will be fired when a chat message is sent to chat by the game.
+    /// </summary>
+    public event OnMessageDelegate ChatMessage;
+
+    /// <summary>
+    /// Event that allows you to stop messages from appearing in chat by setting the isHandled parameter to true.
+    /// </summary>
+    public event OnCheckMessageHandledDelegate CheckMessageHandled;
+
+    /// <summary>
+    /// Event that will be fired when a chat message is handled by Dalamud or a Plugin.
+    /// </summary>
+    public event OnMessageHandledDelegate ChatMessageHandled;
+
+    /// <summary>
+    /// Event that will be fired when a chat message is not handled by Dalamud or a Plugin.
+    /// </summary>
+    public event OnMessageUnhandledDelegate ChatMessageUnhandled;
+
+    /// <summary>
+    /// Gets the ID of the last linked item.
+    /// </summary>
+    public int LastLinkedItemId { get; private set; }
+
+    /// <summary>
+    /// Gets the flags of the last linked item.
+    /// </summary>
+    public byte LastLinkedItemFlags { get; private set; }
+
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.printMessageHook.Dispose();
+        this.populateItemLinkHook.Dispose();
+        this.interactableLinkClickedHook.Dispose();
+    }
+
+    /// <summary>
+    /// Queue a chat message. While method is named as PrintChat, it only add a entry to the queue,
+    /// later to be processed when UpdateQueue() is called.
+    /// </summary>
+    /// <param name="chat">A message to send.</param>
+    public void PrintChat(XivChatEntry chat)
+    {
+        this.chatQueue.Enqueue(chat);
+    }
+
+    /// <summary>
+    /// Queue a chat message. While method is named as PrintChat (it calls it internally), it only add a entry to the queue,
+    /// later to be processed when UpdateQueue() is called.
+    /// </summary>
+    /// <param name="message">A message to send.</param>
+    public void Print(string message)
+    {
+        // Log.Verbose("[CHATGUI PRINT REGULAR]{0}", message);
+        this.PrintChat(new XivChatEntry
         {
-            this.address = new ChatGuiAddressResolver();
-            this.address.Setup(sigScanner);
+            Message = message,
+            Type = this.configuration.GeneralChatType,
+        });
+    }
 
-            this.printMessageHook = Hook<PrintMessageDelegate>.FromAddress(this.address.PrintMessage, this.HandlePrintMessageDetour);
-            this.populateItemLinkHook = Hook<PopulateItemLinkDelegate>.FromAddress(this.address.PopulateItemLinkObject, this.HandlePopulateItemLinkDetour);
-            this.interactableLinkClickedHook = Hook<InteractableLinkClickedDelegate>.FromAddress(this.address.InteractableLinkClicked, this.InteractableLinkClickedDetour);
-        }
-
-        /// <summary>
-        /// A delegate type used with the <see cref="ChatGui.ChatMessage"/> event.
-        /// </summary>
-        /// <param name="type">The type of chat.</param>
-        /// <param name="senderId">The sender ID.</param>
-        /// <param name="sender">The sender name.</param>
-        /// <param name="message">The message sent.</param>
-        /// <param name="isHandled">A value indicating whether the message was handled or should be propagated.</param>
-        public delegate void OnMessageDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled);
-
-        /// <summary>
-        /// A delegate type used with the <see cref="ChatGui.CheckMessageHandled"/> event.
-        /// </summary>
-        /// <param name="type">The type of chat.</param>
-        /// <param name="senderId">The sender ID.</param>
-        /// <param name="sender">The sender name.</param>
-        /// <param name="message">The message sent.</param>
-        /// <param name="isHandled">A value indicating whether the message was handled or should be propagated.</param>
-        public delegate void OnCheckMessageHandledDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled);
-
-        /// <summary>
-        /// A delegate type used with the <see cref="ChatGui.ChatMessageHandled"/> event.
-        /// </summary>
-        /// <param name="type">The type of chat.</param>
-        /// <param name="senderId">The sender ID.</param>
-        /// <param name="sender">The sender name.</param>
-        /// <param name="message">The message sent.</param>
-        public delegate void OnMessageHandledDelegate(XivChatType type, uint senderId, SeString sender, SeString message);
-
-        /// <summary>
-        /// A delegate type used with the <see cref="ChatGui.ChatMessageUnhandled"/> event.
-        /// </summary>
-        /// <param name="type">The type of chat.</param>
-        /// <param name="senderId">The sender ID.</param>
-        /// <param name="sender">The sender name.</param>
-        /// <param name="message">The message sent.</param>
-        public delegate void OnMessageUnhandledDelegate(XivChatType type, uint senderId, SeString sender, SeString message);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr PrintMessageDelegate(IntPtr manager, XivChatType chatType, IntPtr senderName, IntPtr message, uint senderId, IntPtr parameter);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate void PopulateItemLinkDelegate(IntPtr linkObjectPtr, IntPtr itemInfoPtr);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate void InteractableLinkClickedDelegate(IntPtr managerPtr, IntPtr messagePtr);
-
-        /// <summary>
-        /// Event that will be fired when a chat message is sent to chat by the game.
-        /// </summary>
-        public event OnMessageDelegate ChatMessage;
-
-        /// <summary>
-        /// Event that allows you to stop messages from appearing in chat by setting the isHandled parameter to true.
-        /// </summary>
-        public event OnCheckMessageHandledDelegate CheckMessageHandled;
-
-        /// <summary>
-        /// Event that will be fired when a chat message is handled by Dalamud or a Plugin.
-        /// </summary>
-        public event OnMessageHandledDelegate ChatMessageHandled;
-
-        /// <summary>
-        /// Event that will be fired when a chat message is not handled by Dalamud or a Plugin.
-        /// </summary>
-        public event OnMessageUnhandledDelegate ChatMessageUnhandled;
-
-        /// <summary>
-        /// Gets the ID of the last linked item.
-        /// </summary>
-        public int LastLinkedItemId { get; private set; }
-
-        /// <summary>
-        /// Gets the flags of the last linked item.
-        /// </summary>
-        public byte LastLinkedItemFlags { get; private set; }
-
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        void IDisposable.Dispose()
+    /// <summary>
+    /// Queue a chat message. While method is named as PrintChat (it calls it internally), it only add a entry to the queue,
+    /// later to be processed when UpdateQueue() is called.
+    /// </summary>
+    /// <param name="message">A message to send.</param>
+    public void Print(SeString message)
+    {
+        // Log.Verbose("[CHATGUI PRINT SESTRING]{0}", message.TextValue);
+        this.PrintChat(new XivChatEntry
         {
-            this.printMessageHook.Dispose();
-            this.populateItemLinkHook.Dispose();
-            this.interactableLinkClickedHook.Dispose();
-        }
+            Message = message,
+            Type = this.configuration.GeneralChatType,
+        });
+    }
 
-        /// <summary>
-        /// Queue a chat message. While method is named as PrintChat, it only add a entry to the queue,
-        /// later to be processed when UpdateQueue() is called.
-        /// </summary>
-        /// <param name="chat">A message to send.</param>
-        public void PrintChat(XivChatEntry chat)
+    /// <summary>
+    /// Queue an error chat message. While method is named as PrintChat (it calls it internally), it only add a entry to
+    /// the queue, later to be processed when UpdateQueue() is called.
+    /// </summary>
+    /// <param name="message">A message to send.</param>
+    public void PrintError(string message)
+    {
+        // Log.Verbose("[CHATGUI PRINT REGULAR ERROR]{0}", message);
+        this.PrintChat(new XivChatEntry
         {
-            this.chatQueue.Enqueue(chat);
-        }
+            Message = message,
+            Type = XivChatType.Urgent,
+        });
+    }
 
-        /// <summary>
-        /// Queue a chat message. While method is named as PrintChat (it calls it internally), it only add a entry to the queue,
-        /// later to be processed when UpdateQueue() is called.
-        /// </summary>
-        /// <param name="message">A message to send.</param>
-        public void Print(string message)
+    /// <summary>
+    /// Queue an error chat message. While method is named as PrintChat (it calls it internally), it only add a entry to
+    /// the queue, later to be processed when UpdateQueue() is called.
+    /// </summary>
+    /// <param name="message">A message to send.</param>
+    public void PrintError(SeString message)
+    {
+        // Log.Verbose("[CHATGUI PRINT SESTRING ERROR]{0}", message.TextValue);
+        this.PrintChat(new XivChatEntry
         {
-            // Log.Verbose("[CHATGUI PRINT REGULAR]{0}", message);
-            this.PrintChat(new XivChatEntry
+            Message = message,
+            Type = XivChatType.Urgent,
+        });
+    }
+
+    /// <summary>
+    /// Process a chat queue.
+    /// </summary>
+    public void UpdateQueue()
+    {
+        while (this.chatQueue.Count > 0)
+        {
+            var chat = this.chatQueue.Dequeue();
+
+            if (this.baseAddress == IntPtr.Zero)
             {
-                Message = message,
-                Type = this.configuration.GeneralChatType,
-            });
+                continue;
+            }
+
+            var senderRaw = (chat.Name ?? string.Empty).Encode();
+            using var senderOwned = this.libcFunction.NewString(senderRaw);
+
+            var messageRaw = (chat.Message ?? string.Empty).Encode();
+            using var messageOwned = this.libcFunction.NewString(messageRaw);
+
+            this.HandlePrintMessageDetour(this.baseAddress, chat.Type, senderOwned.Address, messageOwned.Address, chat.SenderId, chat.Parameters);
         }
+    }
 
-        /// <summary>
-        /// Queue a chat message. While method is named as PrintChat (it calls it internally), it only add a entry to the queue,
-        /// later to be processed when UpdateQueue() is called.
-        /// </summary>
-        /// <param name="message">A message to send.</param>
-        public void Print(SeString message)
+    /// <summary>
+    /// Create a link handler.
+    /// </summary>
+    /// <param name="pluginName">The name of the plugin handling the link.</param>
+    /// <param name="commandId">The ID of the command to run.</param>
+    /// <param name="commandAction">The command action itself.</param>
+    /// <returns>A payload for handling.</returns>
+    internal DalamudLinkPayload AddChatLinkHandler(string pluginName, uint commandId, Action<uint, SeString> commandAction)
+    {
+        var payload = new DalamudLinkPayload() { Plugin = pluginName, CommandId = commandId };
+        this.dalamudLinkHandlers.Add((pluginName, commandId), commandAction);
+        return payload;
+    }
+
+    /// <summary>
+    /// Remove all handlers owned by a plugin.
+    /// </summary>
+    /// <param name="pluginName">The name of the plugin handling the links.</param>
+    internal void RemoveChatLinkHandler(string pluginName)
+    {
+        foreach (var handler in this.dalamudLinkHandlers.Keys.ToList().Where(k => k.PluginName == pluginName))
         {
-            // Log.Verbose("[CHATGUI PRINT SESTRING]{0}", message.TextValue);
-            this.PrintChat(new XivChatEntry
-            {
-                Message = message,
-                Type = this.configuration.GeneralChatType,
-            });
+            this.dalamudLinkHandlers.Remove(handler);
         }
+    }
 
-        /// <summary>
-        /// Queue an error chat message. While method is named as PrintChat (it calls it internally), it only add a entry to
-        /// the queue, later to be processed when UpdateQueue() is called.
-        /// </summary>
-        /// <param name="message">A message to send.</param>
-        public void PrintError(string message)
+    /// <summary>
+    /// Remove a registered link handler.
+    /// </summary>
+    /// <param name="pluginName">The name of the plugin handling the link.</param>
+    /// <param name="commandId">The ID of the command to be removed.</param>
+    internal void RemoveChatLinkHandler(string pluginName, uint commandId)
+    {
+        if (this.dalamudLinkHandlers.ContainsKey((pluginName, commandId)))
         {
-            // Log.Verbose("[CHATGUI PRINT REGULAR ERROR]{0}", message);
-            this.PrintChat(new XivChatEntry
-            {
-                Message = message,
-                Type = XivChatType.Urgent,
-            });
+            this.dalamudLinkHandlers.Remove((pluginName, commandId));
         }
+    }
 
-        /// <summary>
-        /// Queue an error chat message. While method is named as PrintChat (it calls it internally), it only add a entry to
-        /// the queue, later to be processed when UpdateQueue() is called.
-        /// </summary>
-        /// <param name="message">A message to send.</param>
-        public void PrintError(SeString message)
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction(GameGui gameGui, LibcFunction libcFunction)
+    {
+        this.printMessageHook.Enable();
+        this.populateItemLinkHook.Enable();
+        this.interactableLinkClickedHook.Enable();
+    }
+
+    private void HandlePopulateItemLinkDetour(IntPtr linkObjectPtr, IntPtr itemInfoPtr)
+    {
+        try
         {
-            // Log.Verbose("[CHATGUI PRINT SESTRING ERROR]{0}", message.TextValue);
-            this.PrintChat(new XivChatEntry
-            {
-                Message = message,
-                Type = XivChatType.Urgent,
-            });
+            this.populateItemLinkHook.Original(linkObjectPtr, itemInfoPtr);
+
+            this.LastLinkedItemId = Marshal.ReadInt32(itemInfoPtr, 8);
+            this.LastLinkedItemFlags = Marshal.ReadByte(itemInfoPtr, 0x14);
+
+            // Log.Verbose($"HandlePopulateItemLinkDetour {linkObjectPtr} {itemInfoPtr} - linked:{this.LastLinkedItemId}");
         }
-
-        /// <summary>
-        /// Process a chat queue.
-        /// </summary>
-        public void UpdateQueue()
+        catch (Exception ex)
         {
-            while (this.chatQueue.Count > 0)
-            {
-                var chat = this.chatQueue.Dequeue();
+            Log.Error(ex, "Exception onPopulateItemLink hook.");
+            this.populateItemLinkHook.Original(linkObjectPtr, itemInfoPtr);
+        }
+    }
 
-                if (this.baseAddress == IntPtr.Zero)
+    private IntPtr HandlePrintMessageDetour(IntPtr manager, XivChatType chattype, IntPtr pSenderName, IntPtr pMessage, uint senderid, IntPtr parameter)
+    {
+        var retVal = IntPtr.Zero;
+
+        try
+        {
+            var sender = StdString.ReadFromPointer(pSenderName);
+            var parsedSender = SeString.Parse(sender.RawData);
+            var originalSenderData = (byte[])sender.RawData.Clone();
+            var oldEditedSender = parsedSender.Encode();
+            var senderPtr = pSenderName;
+            OwnedStdString allocatedString = null;
+
+            var message = StdString.ReadFromPointer(pMessage);
+            var parsedMessage = SeString.Parse(message.RawData);
+            var originalMessageData = (byte[])message.RawData.Clone();
+            var oldEdited = parsedMessage.Encode();
+            var messagePtr = pMessage;
+            OwnedStdString allocatedStringSender = null;
+
+            // Log.Verbose("[CHATGUI][{0}][{1}]", parsedSender.TextValue, parsedMessage.TextValue);
+
+            // Log.Debug($"HandlePrintMessageDetour {manager} - [{chattype}] [{BitConverter.ToString(message.RawData).Replace("-", " ")}] {message.Value} from {senderName.Value}");
+
+            // Call events
+            var isHandled = false;
+
+            var invocationList = this.CheckMessageHandled.GetInvocationList();
+            foreach (var @delegate in invocationList)
+            {
+                try
                 {
-                    continue;
+                    var messageHandledDelegate = @delegate as OnCheckMessageHandledDelegate;
+                    messageHandledDelegate!.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
+                }
+                catch (Exception e)
+                {
+                    Log.Error(e, "Could not invoke registered OnCheckMessageHandledDelegate for {Name}", @delegate.Method.Name);
                 }
-
-                var senderRaw = (chat.Name ?? string.Empty).Encode();
-                using var senderOwned = this.libcFunction.NewString(senderRaw);
-
-                var messageRaw = (chat.Message ?? string.Empty).Encode();
-                using var messageOwned = this.libcFunction.NewString(messageRaw);
-
-                this.HandlePrintMessageDetour(this.baseAddress, chat.Type, senderOwned.Address, messageOwned.Address, chat.SenderId, chat.Parameters);
             }
-        }
 
-        /// <summary>
-        /// Create a link handler.
-        /// </summary>
-        /// <param name="pluginName">The name of the plugin handling the link.</param>
-        /// <param name="commandId">The ID of the command to run.</param>
-        /// <param name="commandAction">The command action itself.</param>
-        /// <returns>A payload for handling.</returns>
-        internal DalamudLinkPayload AddChatLinkHandler(string pluginName, uint commandId, Action<uint, SeString> commandAction)
-        {
-            var payload = new DalamudLinkPayload() { Plugin = pluginName, CommandId = commandId };
-            this.dalamudLinkHandlers.Add((pluginName, commandId), commandAction);
-            return payload;
-        }
-
-        /// <summary>
-        /// Remove all handlers owned by a plugin.
-        /// </summary>
-        /// <param name="pluginName">The name of the plugin handling the links.</param>
-        internal void RemoveChatLinkHandler(string pluginName)
-        {
-            foreach (var handler in this.dalamudLinkHandlers.Keys.ToList().Where(k => k.PluginName == pluginName))
+            if (!isHandled)
             {
-                this.dalamudLinkHandlers.Remove(handler);
-            }
-        }
-
-        /// <summary>
-        /// Remove a registered link handler.
-        /// </summary>
-        /// <param name="pluginName">The name of the plugin handling the link.</param>
-        /// <param name="commandId">The ID of the command to be removed.</param>
-        internal void RemoveChatLinkHandler(string pluginName, uint commandId)
-        {
-            if (this.dalamudLinkHandlers.ContainsKey((pluginName, commandId)))
-            {
-                this.dalamudLinkHandlers.Remove((pluginName, commandId));
-            }
-        }
-
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction(GameGui gameGui, LibcFunction libcFunction)
-        {
-            this.printMessageHook.Enable();
-            this.populateItemLinkHook.Enable();
-            this.interactableLinkClickedHook.Enable();
-        }
-
-        private void HandlePopulateItemLinkDetour(IntPtr linkObjectPtr, IntPtr itemInfoPtr)
-        {
-            try
-            {
-                this.populateItemLinkHook.Original(linkObjectPtr, itemInfoPtr);
-
-                this.LastLinkedItemId = Marshal.ReadInt32(itemInfoPtr, 8);
-                this.LastLinkedItemFlags = Marshal.ReadByte(itemInfoPtr, 0x14);
-
-                // Log.Verbose($"HandlePopulateItemLinkDetour {linkObjectPtr} {itemInfoPtr} - linked:{this.LastLinkedItemId}");
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Exception onPopulateItemLink hook.");
-                this.populateItemLinkHook.Original(linkObjectPtr, itemInfoPtr);
-            }
-        }
-
-        private IntPtr HandlePrintMessageDetour(IntPtr manager, XivChatType chattype, IntPtr pSenderName, IntPtr pMessage, uint senderid, IntPtr parameter)
-        {
-            var retVal = IntPtr.Zero;
-
-            try
-            {
-                var sender = StdString.ReadFromPointer(pSenderName);
-                var parsedSender = SeString.Parse(sender.RawData);
-                var originalSenderData = (byte[])sender.RawData.Clone();
-                var oldEditedSender = parsedSender.Encode();
-                var senderPtr = pSenderName;
-                OwnedStdString allocatedString = null;
-
-                var message = StdString.ReadFromPointer(pMessage);
-                var parsedMessage = SeString.Parse(message.RawData);
-                var originalMessageData = (byte[])message.RawData.Clone();
-                var oldEdited = parsedMessage.Encode();
-                var messagePtr = pMessage;
-                OwnedStdString allocatedStringSender = null;
-
-                // Log.Verbose("[CHATGUI][{0}][{1}]", parsedSender.TextValue, parsedMessage.TextValue);
-
-                // Log.Debug($"HandlePrintMessageDetour {manager} - [{chattype}] [{BitConverter.ToString(message.RawData).Replace("-", " ")}] {message.Value} from {senderName.Value}");
-
-                // Call events
-                var isHandled = false;
-
-                var invocationList = this.CheckMessageHandled.GetInvocationList();
+                invocationList = this.ChatMessage.GetInvocationList();
                 foreach (var @delegate in invocationList)
                 {
                     try
                     {
-                        var messageHandledDelegate = @delegate as OnCheckMessageHandledDelegate;
+                        var messageHandledDelegate = @delegate as OnMessageDelegate;
                         messageHandledDelegate!.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
                     }
                     catch (Exception e)
                     {
-                        Log.Error(e, "Could not invoke registered OnCheckMessageHandledDelegate for {Name}", @delegate.Method.Name);
+                        Log.Error(e, "Could not invoke registered OnMessageDelegate for {Name}", @delegate.Method.Name);
                     }
                 }
+            }
 
-                if (!isHandled)
-                {
-                    invocationList = this.ChatMessage.GetInvocationList();
-                    foreach (var @delegate in invocationList)
-                    {
-                        try
-                        {
-                            var messageHandledDelegate = @delegate as OnMessageDelegate;
-                            messageHandledDelegate!.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
-                        }
-                        catch (Exception e)
-                        {
-                            Log.Error(e, "Could not invoke registered OnMessageDelegate for {Name}", @delegate.Method.Name);
-                        }
-                    }
-                }
+            var newEdited = parsedMessage.Encode();
+            if (!Util.FastByteArrayCompare(oldEdited, newEdited))
+            {
+                Log.Verbose("SeString was edited, taking precedence over StdString edit.");
+                message.RawData = newEdited;
+                // Log.Debug($"\nOLD: {BitConverter.ToString(originalMessageData)}\nNEW: {BitConverter.ToString(newEdited)}");
+            }
 
-                var newEdited = parsedMessage.Encode();
-                if (!Util.FastByteArrayCompare(oldEdited, newEdited))
-                {
-                    Log.Verbose("SeString was edited, taking precedence over StdString edit.");
-                    message.RawData = newEdited;
-                    // Log.Debug($"\nOLD: {BitConverter.ToString(originalMessageData)}\nNEW: {BitConverter.ToString(newEdited)}");
-                }
+            if (!Util.FastByteArrayCompare(originalMessageData, message.RawData))
+            {
+                allocatedString = this.libcFunction.NewString(message.RawData);
+                Log.Debug($"HandlePrintMessageDetour String modified: {originalMessageData}({messagePtr}) -> {message}({allocatedString.Address})");
+                messagePtr = allocatedString.Address;
+            }
 
-                if (!Util.FastByteArrayCompare(originalMessageData, message.RawData))
-                {
-                    allocatedString = this.libcFunction.NewString(message.RawData);
-                    Log.Debug($"HandlePrintMessageDetour String modified: {originalMessageData}({messagePtr}) -> {message}({allocatedString.Address})");
-                    messagePtr = allocatedString.Address;
-                }
+            var newEditedSender = parsedSender.Encode();
+            if (!Util.FastByteArrayCompare(oldEditedSender, newEditedSender))
+            {
+                Log.Verbose("SeString was edited, taking precedence over StdString edit.");
+                sender.RawData = newEditedSender;
+                // Log.Debug($"\nOLD: {BitConverter.ToString(originalMessageData)}\nNEW: {BitConverter.ToString(newEdited)}");
+            }
 
-                var newEditedSender = parsedSender.Encode();
-                if (!Util.FastByteArrayCompare(oldEditedSender, newEditedSender))
-                {
-                    Log.Verbose("SeString was edited, taking precedence over StdString edit.");
-                    sender.RawData = newEditedSender;
-                    // Log.Debug($"\nOLD: {BitConverter.ToString(originalMessageData)}\nNEW: {BitConverter.ToString(newEdited)}");
-                }
+            if (!Util.FastByteArrayCompare(originalSenderData, sender.RawData))
+            {
+                allocatedStringSender = this.libcFunction.NewString(sender.RawData);
+                Log.Debug(
+                    $"HandlePrintMessageDetour Sender modified: {originalSenderData}({senderPtr}) -> {sender}({allocatedStringSender.Address})");
+                senderPtr = allocatedStringSender.Address;
+            }
 
-                if (!Util.FastByteArrayCompare(originalSenderData, sender.RawData))
-                {
-                    allocatedStringSender = this.libcFunction.NewString(sender.RawData);
-                    Log.Debug(
-                        $"HandlePrintMessageDetour Sender modified: {originalSenderData}({senderPtr}) -> {sender}({allocatedStringSender.Address})");
-                    senderPtr = allocatedStringSender.Address;
-                }
+            // Print the original chat if it's handled.
+            if (isHandled)
+            {
+                this.ChatMessageHandled?.Invoke(chattype, senderid, parsedSender, parsedMessage);
+            }
+            else
+            {
+                retVal = this.printMessageHook.Original(manager, chattype, senderPtr, messagePtr, senderid, parameter);
+                this.ChatMessageUnhandled?.Invoke(chattype, senderid, parsedSender, parsedMessage);
+            }
 
-                // Print the original chat if it's handled.
-                if (isHandled)
+            if (this.baseAddress == IntPtr.Zero)
+                this.baseAddress = manager;
+
+            allocatedString?.Dispose();
+            allocatedStringSender?.Dispose();
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Exception on OnChatMessage hook.");
+            retVal = this.printMessageHook.Original(manager, chattype, pSenderName, pMessage, senderid, parameter);
+        }
+
+        return retVal;
+    }
+
+    private void InteractableLinkClickedDetour(IntPtr managerPtr, IntPtr messagePtr)
+    {
+        try
+        {
+            var interactableType = (Payload.EmbeddedInfoType)(Marshal.ReadByte(messagePtr, 0x1B) + 1);
+
+            if (interactableType != Payload.EmbeddedInfoType.DalamudLink)
+            {
+                this.interactableLinkClickedHook.Original(managerPtr, messagePtr);
+                return;
+            }
+
+            Log.Verbose($"InteractableLinkClicked: {Payload.EmbeddedInfoType.DalamudLink}");
+
+            var payloadPtr = Marshal.ReadIntPtr(messagePtr, 0x10);
+            var messageSize = 0;
+            while (Marshal.ReadByte(payloadPtr, messageSize) != 0) messageSize++;
+            var payloadBytes = new byte[messageSize];
+            Marshal.Copy(payloadPtr, payloadBytes, 0, messageSize);
+            var seStr = SeString.Parse(payloadBytes);
+            var terminatorIndex = seStr.Payloads.IndexOf(RawPayload.LinkTerminator);
+            var payloads = terminatorIndex >= 0 ? seStr.Payloads.Take(terminatorIndex + 1).ToList() : seStr.Payloads;
+            if (payloads.Count == 0) return;
+            var linkPayload = payloads[0];
+            if (linkPayload is DalamudLinkPayload link)
+            {
+                if (this.dalamudLinkHandlers.ContainsKey((link.Plugin, link.CommandId)))
                 {
-                    this.ChatMessageHandled?.Invoke(chattype, senderid, parsedSender, parsedMessage);
+                    Log.Verbose($"Sending DalamudLink to {link.Plugin}: {link.CommandId}");
+                    this.dalamudLinkHandlers[(link.Plugin, link.CommandId)].Invoke(link.CommandId, new SeString(payloads));
                 }
                 else
                 {
-                    retVal = this.printMessageHook.Original(manager, chattype, senderPtr, messagePtr, senderid, parameter);
-                    this.ChatMessageUnhandled?.Invoke(chattype, senderid, parsedSender, parsedMessage);
+                    Log.Debug($"No DalamudLink registered for {link.Plugin} with ID of {link.CommandId}");
                 }
-
-                if (this.baseAddress == IntPtr.Zero)
-                    this.baseAddress = manager;
-
-                allocatedString?.Dispose();
-                allocatedStringSender?.Dispose();
             }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Exception on OnChatMessage hook.");
-                retVal = this.printMessageHook.Original(manager, chattype, pSenderName, pMessage, senderid, parameter);
-            }
-
-            return retVal;
         }
-
-        private void InteractableLinkClickedDetour(IntPtr managerPtr, IntPtr messagePtr)
+        catch (Exception ex)
         {
-            try
-            {
-                var interactableType = (Payload.EmbeddedInfoType)(Marshal.ReadByte(messagePtr, 0x1B) + 1);
-
-                if (interactableType != Payload.EmbeddedInfoType.DalamudLink)
-                {
-                    this.interactableLinkClickedHook.Original(managerPtr, messagePtr);
-                    return;
-                }
-
-                Log.Verbose($"InteractableLinkClicked: {Payload.EmbeddedInfoType.DalamudLink}");
-
-                var payloadPtr = Marshal.ReadIntPtr(messagePtr, 0x10);
-                var messageSize = 0;
-                while (Marshal.ReadByte(payloadPtr, messageSize) != 0) messageSize++;
-                var payloadBytes = new byte[messageSize];
-                Marshal.Copy(payloadPtr, payloadBytes, 0, messageSize);
-                var seStr = SeString.Parse(payloadBytes);
-                var terminatorIndex = seStr.Payloads.IndexOf(RawPayload.LinkTerminator);
-                var payloads = terminatorIndex >= 0 ? seStr.Payloads.Take(terminatorIndex + 1).ToList() : seStr.Payloads;
-                if (payloads.Count == 0) return;
-                var linkPayload = payloads[0];
-                if (linkPayload is DalamudLinkPayload link)
-                {
-                    if (this.dalamudLinkHandlers.ContainsKey((link.Plugin, link.CommandId)))
-                    {
-                        Log.Verbose($"Sending DalamudLink to {link.Plugin}: {link.CommandId}");
-                        this.dalamudLinkHandlers[(link.Plugin, link.CommandId)].Invoke(link.CommandId, new SeString(payloads));
-                    }
-                    else
-                    {
-                        Log.Debug($"No DalamudLink registered for {link.Plugin} with ID of {link.CommandId}");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Exception on InteractableLinkClicked hook");
-            }
+            Log.Error(ex, "Exception on InteractableLinkClicked hook");
         }
     }
 }
diff --git a/Dalamud/Game/Gui/ChatGuiAddressResolver.cs b/Dalamud/Game/Gui/ChatGuiAddressResolver.cs
index 9a30037fa..a94dec1a7 100644
--- a/Dalamud/Game/Gui/ChatGuiAddressResolver.cs
+++ b/Dalamud/Game/Gui/ChatGuiAddressResolver.cs
@@ -1,104 +1,103 @@
 using System;
 
-namespace Dalamud.Game.Gui
+namespace Dalamud.Game.Gui;
+
+/// <summary>
+/// The address resolver for the <see cref="ChatGui"/> class.
+/// </summary>
+public sealed class ChatGuiAddressResolver : BaseAddressResolver
 {
     /// <summary>
-    /// The address resolver for the <see cref="ChatGui"/> class.
+    /// Gets the address of the native PrintMessage method.
     /// </summary>
-    public sealed class ChatGuiAddressResolver : BaseAddressResolver
+    public IntPtr PrintMessage { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native PopulateItemLinkObject method.
+    /// </summary>
+    public IntPtr PopulateItemLinkObject { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native InteractableLinkClicked method.
+    /// </summary>
+    public IntPtr InteractableLinkClicked { get; private set; }
+
+    /*
+     --- for reference: 4.57 ---
+    .text:00000001405CD210 ; __int64 __fastcall Xiv::Gui::ChatGui::PrintMessage(__int64 handler, unsigned __int16 chatType, __int64 senderName, __int64 message, int senderActorId, char isLocal)
+    .text:00000001405CD210 Xiv__Gui__ChatGui__PrintMessage proc near
+    .text:00000001405CD210                                         ; CODE XREF: sub_1401419F0+201↑p
+    .text:00000001405CD210                                         ; sub_140141D10+220↑p ...
+    .text:00000001405CD210
+    .text:00000001405CD210 var_220         = qword ptr -220h
+    .text:00000001405CD210 var_218         = byte ptr -218h
+    .text:00000001405CD210 var_210         = word ptr -210h
+    .text:00000001405CD210 var_208         = byte ptr -208h
+    .text:00000001405CD210 var_200         = word ptr -200h
+    .text:00000001405CD210 var_1FC         = dword ptr -1FCh
+    .text:00000001405CD210 var_1F8         = qword ptr -1F8h
+    .text:00000001405CD210 var_1F0         = qword ptr -1F0h
+    .text:00000001405CD210 var_1E8         = qword ptr -1E8h
+    .text:00000001405CD210 var_1E0         = dword ptr -1E0h
+    .text:00000001405CD210 var_1DC         = word ptr -1DCh
+    .text:00000001405CD210 var_1DA         = word ptr -1DAh
+    .text:00000001405CD210 var_1D8         = qword ptr -1D8h
+    .text:00000001405CD210 var_1D0         = byte ptr -1D0h
+    .text:00000001405CD210 var_1C8         = qword ptr -1C8h
+    .text:00000001405CD210 var_1B0         = dword ptr -1B0h
+    .text:00000001405CD210 var_1AC         = dword ptr -1ACh
+    .text:00000001405CD210 var_1A8         = dword ptr -1A8h
+    .text:00000001405CD210 var_1A4         = dword ptr -1A4h
+    .text:00000001405CD210 var_1A0         = dword ptr -1A0h
+    .text:00000001405CD210 var_160         = dword ptr -160h
+    .text:00000001405CD210 var_15C         = dword ptr -15Ch
+    .text:00000001405CD210 var_140         = dword ptr -140h
+    .text:00000001405CD210 var_138         = dword ptr -138h
+    .text:00000001405CD210 var_130         = byte ptr -130h
+    .text:00000001405CD210 var_C0          = byte ptr -0C0h
+    .text:00000001405CD210 var_50          = qword ptr -50h
+    .text:00000001405CD210 var_38          = qword ptr -38h
+    .text:00000001405CD210 var_30          = qword ptr -30h
+    .text:00000001405CD210 var_28          = qword ptr -28h
+    .text:00000001405CD210 var_20          = qword ptr -20h
+    .text:00000001405CD210 senderActorId   = dword ptr  30h
+    .text:00000001405CD210 isLocal         = byte ptr  38h
+    .text:00000001405CD210
+    .text:00000001405CD210 ; __unwind { // __GSHandlerCheck
+    .text:00000001405CD210                 push    rbp
+    .text:00000001405CD212                 push    rdi
+    .text:00000001405CD213                 push    r14
+    .text:00000001405CD215                 push    r15
+    .text:00000001405CD217                 lea     rbp, [rsp-128h]
+    .text:00000001405CD21F                 sub     rsp, 228h
+    .text:00000001405CD226                 mov     rax, cs:__security_cookie
+    .text:00000001405CD22D                 xor     rax, rsp
+    .text:00000001405CD230                 mov     [rbp+140h+var_50], rax
+    .text:00000001405CD237                 xor     r10b, r10b
+    .text:00000001405CD23A                 mov     [rsp+240h+var_1F8], rcx
+    .text:00000001405CD23F                 xor     eax, eax
+    .text:00000001405CD241                 mov     r11, r9
+    .text:00000001405CD244                 mov     r14, r8
+    .text:00000001405CD247                 mov     r9d, eax
+    .text:00000001405CD24A                 movzx   r15d, dx
+    .text:00000001405CD24E                 lea     r8, [rcx+0C10h]
+    .text:00000001405CD255                 mov     rdi, rcx
+     */
+
+    /// <inheritdoc/>
+    protected override void Setup64Bit(SigScanner sig)
     {
-        /// <summary>
-        /// Gets the address of the native PrintMessage method.
-        /// </summary>
-        public IntPtr PrintMessage { get; private set; }
+        // PrintMessage = sig.ScanText("4055 57 41 ?? 41 ?? 488DAC24D8FEFFFF 4881EC28020000 488B05???????? 4833C4 488985F0000000 4532D2 48894C2448"); LAST PART FOR 5.1???
+        this.PrintMessage = sig.ScanText("40 55 53 56 41 54 41 57 48 8D AC 24 ?? ?? ?? ?? 48 81 EC 20 02 00 00 48 8B 05");
+        // PrintMessage = sig.ScanText("4055 57 41 ?? 41 ?? 488DAC24E8FEFFFF 4881EC18020000 488B05???????? 4833C4 488985E0000000 4532D2 48894C2438"); old
 
-        /// <summary>
-        /// Gets the address of the native PopulateItemLinkObject method.
-        /// </summary>
-        public IntPtr PopulateItemLinkObject { get; private set; }
+        // PrintMessage = sig.ScanText("40 55 57 41 56 41 57 48  8D AC 24 D8 FE FF FF 48 81 EC 28 02 00 00 48 8B  05 63 47 4A 01 48 33 C4 48 89 85 F0 00 00 00 45  32 D2 48 89 4C 24 48 33");
 
-        /// <summary>
-        /// Gets the address of the native InteractableLinkClicked method.
-        /// </summary>
-        public IntPtr InteractableLinkClicked { get; private set; }
+        // PopulateItemLinkObject = sig.ScanText("48 89 5C 24 08 57 48 83  EC 20 80 7A 06 00 48 8B DA 48 8B F9 74 14 48 8B  CA E8 32 03 00 00 48 8B C8 E8 FA F2 B0 FF 8B C8  EB 1D 0F B6 42 14 8B 4A");
 
-        /*
-         --- for reference: 4.57 ---
-        .text:00000001405CD210 ; __int64 __fastcall Xiv::Gui::ChatGui::PrintMessage(__int64 handler, unsigned __int16 chatType, __int64 senderName, __int64 message, int senderActorId, char isLocal)
-        .text:00000001405CD210 Xiv__Gui__ChatGui__PrintMessage proc near
-        .text:00000001405CD210                                         ; CODE XREF: sub_1401419F0+201↑p
-        .text:00000001405CD210                                         ; sub_140141D10+220↑p ...
-        .text:00000001405CD210
-        .text:00000001405CD210 var_220         = qword ptr -220h
-        .text:00000001405CD210 var_218         = byte ptr -218h
-        .text:00000001405CD210 var_210         = word ptr -210h
-        .text:00000001405CD210 var_208         = byte ptr -208h
-        .text:00000001405CD210 var_200         = word ptr -200h
-        .text:00000001405CD210 var_1FC         = dword ptr -1FCh
-        .text:00000001405CD210 var_1F8         = qword ptr -1F8h
-        .text:00000001405CD210 var_1F0         = qword ptr -1F0h
-        .text:00000001405CD210 var_1E8         = qword ptr -1E8h
-        .text:00000001405CD210 var_1E0         = dword ptr -1E0h
-        .text:00000001405CD210 var_1DC         = word ptr -1DCh
-        .text:00000001405CD210 var_1DA         = word ptr -1DAh
-        .text:00000001405CD210 var_1D8         = qword ptr -1D8h
-        .text:00000001405CD210 var_1D0         = byte ptr -1D0h
-        .text:00000001405CD210 var_1C8         = qword ptr -1C8h
-        .text:00000001405CD210 var_1B0         = dword ptr -1B0h
-        .text:00000001405CD210 var_1AC         = dword ptr -1ACh
-        .text:00000001405CD210 var_1A8         = dword ptr -1A8h
-        .text:00000001405CD210 var_1A4         = dword ptr -1A4h
-        .text:00000001405CD210 var_1A0         = dword ptr -1A0h
-        .text:00000001405CD210 var_160         = dword ptr -160h
-        .text:00000001405CD210 var_15C         = dword ptr -15Ch
-        .text:00000001405CD210 var_140         = dword ptr -140h
-        .text:00000001405CD210 var_138         = dword ptr -138h
-        .text:00000001405CD210 var_130         = byte ptr -130h
-        .text:00000001405CD210 var_C0          = byte ptr -0C0h
-        .text:00000001405CD210 var_50          = qword ptr -50h
-        .text:00000001405CD210 var_38          = qword ptr -38h
-        .text:00000001405CD210 var_30          = qword ptr -30h
-        .text:00000001405CD210 var_28          = qword ptr -28h
-        .text:00000001405CD210 var_20          = qword ptr -20h
-        .text:00000001405CD210 senderActorId   = dword ptr  30h
-        .text:00000001405CD210 isLocal         = byte ptr  38h
-        .text:00000001405CD210
-        .text:00000001405CD210 ; __unwind { // __GSHandlerCheck
-        .text:00000001405CD210                 push    rbp
-        .text:00000001405CD212                 push    rdi
-        .text:00000001405CD213                 push    r14
-        .text:00000001405CD215                 push    r15
-        .text:00000001405CD217                 lea     rbp, [rsp-128h]
-        .text:00000001405CD21F                 sub     rsp, 228h
-        .text:00000001405CD226                 mov     rax, cs:__security_cookie
-        .text:00000001405CD22D                 xor     rax, rsp
-        .text:00000001405CD230                 mov     [rbp+140h+var_50], rax
-        .text:00000001405CD237                 xor     r10b, r10b
-        .text:00000001405CD23A                 mov     [rsp+240h+var_1F8], rcx
-        .text:00000001405CD23F                 xor     eax, eax
-        .text:00000001405CD241                 mov     r11, r9
-        .text:00000001405CD244                 mov     r14, r8
-        .text:00000001405CD247                 mov     r9d, eax
-        .text:00000001405CD24A                 movzx   r15d, dx
-        .text:00000001405CD24E                 lea     r8, [rcx+0C10h]
-        .text:00000001405CD255                 mov     rdi, rcx
-         */
+        // PopulateItemLinkObject = sig.ScanText(      "48 89 5C 24 08 57 48 83  EC 20 80 7A 06 00 48 8B DA 48 8B F9 74 14 48 8B  CA E8 32 03 00 00 48 8B C8 E8 ?? ?? B0 FF 8B C8  EB 1D 0F B6 42 14 8B 4A"); 5.0
+        this.PopulateItemLinkObject = sig.ScanText("48 89 5C 24 08 57 48 83  EC 20 80 7A 06 00 48 8B DA 48 8B F9 74 14 48 8B  CA E8 32 03 00 00 48 8B C8 E8 ?? ?? ?? FF 8B C8  EB 1D 0F B6 42 14 8B 4A");
 
-        /// <inheritdoc/>
-        protected override void Setup64Bit(SigScanner sig)
-        {
-            // PrintMessage = sig.ScanText("4055 57 41 ?? 41 ?? 488DAC24D8FEFFFF 4881EC28020000 488B05???????? 4833C4 488985F0000000 4532D2 48894C2448"); LAST PART FOR 5.1???
-            this.PrintMessage = sig.ScanText("40 55 53 56 41 54 41 57 48 8D AC 24 ?? ?? ?? ?? 48 81 EC 20 02 00 00 48 8B 05");
-            // PrintMessage = sig.ScanText("4055 57 41 ?? 41 ?? 488DAC24E8FEFFFF 4881EC18020000 488B05???????? 4833C4 488985E0000000 4532D2 48894C2438"); old
-
-            // PrintMessage = sig.ScanText("40 55 57 41 56 41 57 48  8D AC 24 D8 FE FF FF 48 81 EC 28 02 00 00 48 8B  05 63 47 4A 01 48 33 C4 48 89 85 F0 00 00 00 45  32 D2 48 89 4C 24 48 33");
-
-            // PopulateItemLinkObject = sig.ScanText("48 89 5C 24 08 57 48 83  EC 20 80 7A 06 00 48 8B DA 48 8B F9 74 14 48 8B  CA E8 32 03 00 00 48 8B C8 E8 FA F2 B0 FF 8B C8  EB 1D 0F B6 42 14 8B 4A");
-
-            // PopulateItemLinkObject = sig.ScanText(      "48 89 5C 24 08 57 48 83  EC 20 80 7A 06 00 48 8B DA 48 8B F9 74 14 48 8B  CA E8 32 03 00 00 48 8B C8 E8 ?? ?? B0 FF 8B C8  EB 1D 0F B6 42 14 8B 4A"); 5.0
-            this.PopulateItemLinkObject = sig.ScanText("48 89 5C 24 08 57 48 83  EC 20 80 7A 06 00 48 8B DA 48 8B F9 74 14 48 8B  CA E8 32 03 00 00 48 8B C8 E8 ?? ?? ?? FF 8B C8  EB 1D 0F B6 42 14 8B 4A");
-
-            this.InteractableLinkClicked = sig.ScanText("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 80 BB ?? ?? ?? ?? ?? 0F 85 ?? ?? ?? ?? 80 BB") + 9;
-        }
+        this.InteractableLinkClicked = sig.ScanText("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 80 BB ?? ?? ?? ?? ?? 0F 85 ?? ?? ?? ?? 80 BB") + 9;
     }
 }
diff --git a/Dalamud/Game/Gui/Dtr/DtrBar.cs b/Dalamud/Game/Gui/Dtr/DtrBar.cs
index e70bad070..e351320b9 100644
--- a/Dalamud/Game/Gui/Dtr/DtrBar.cs
+++ b/Dalamud/Game/Gui/Dtr/DtrBar.cs
@@ -10,314 +10,313 @@ using FFXIVClientStructs.FFXIV.Client.System.Memory;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using Serilog;
 
-namespace Dalamud.Game.Gui.Dtr
+namespace Dalamud.Game.Gui.Dtr;
+
+/// <summary>
+/// Class used to interface with the server info bar.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed unsafe class DtrBar : IDisposable, IServiceType
 {
-    /// <summary>
-    /// Class used to interface with the server info bar.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed unsafe class DtrBar : IDisposable, IServiceType
+    private const uint BaseNodeId = 1000;
+
+    [ServiceManager.ServiceDependency]
+    private readonly Framework framework = Service<Framework>.Get();
+
+    [ServiceManager.ServiceDependency]
+    private readonly GameGui gameGui = Service<GameGui>.Get();
+
+    [ServiceManager.ServiceDependency]
+    private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
+
+    private List<DtrBarEntry> entries = new();
+    private uint runningNodeIds = BaseNodeId;
+
+    [ServiceManager.ServiceConstructor]
+    private DtrBar()
     {
-        private const uint BaseNodeId = 1000;
+        this.framework.Update += this.Update;
 
-        [ServiceManager.ServiceDependency]
-        private readonly Framework framework = Service<Framework>.Get();
+        this.configuration.DtrOrder ??= new List<string>();
+        this.configuration.DtrIgnore ??= new List<string>();
+        this.configuration.Save();
+    }
 
-        [ServiceManager.ServiceDependency]
-        private readonly GameGui gameGui = Service<GameGui>.Get();
+    /// <summary>
+    /// Get a DTR bar entry.
+    /// This allows you to add your own text, and users to sort it.
+    /// </summary>
+    /// <param name="title">A user-friendly name for sorting.</param>
+    /// <param name="text">The text the entry shows.</param>
+    /// <returns>The entry object used to update, hide and remove the entry.</returns>
+    /// <exception cref="ArgumentException">Thrown when an entry with the specified title exists.</exception>
+    public DtrBarEntry Get(string title, SeString? text = null)
+    {
+        if (this.entries.Any(x => x.Title == title))
+            throw new ArgumentException("An entry with the same title already exists.");
 
-        [ServiceManager.ServiceDependency]
-        private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
+        var node = this.MakeNode(++this.runningNodeIds);
+        var entry = new DtrBarEntry(title, node);
+        entry.Text = text;
 
-        private List<DtrBarEntry> entries = new();
-        private uint runningNodeIds = BaseNodeId;
+        // Add the entry to the end of the order list, if it's not there already.
+        if (!this.configuration.DtrOrder!.Contains(title))
+            this.configuration.DtrOrder!.Add(title);
+        this.entries.Add(entry);
+        this.ApplySort();
 
-        [ServiceManager.ServiceConstructor]
-        private DtrBar()
+        return entry;
+    }
+
+    /// <inheritdoc/>
+    void IDisposable.Dispose()
+    {
+        foreach (var entry in this.entries)
+            this.RemoveNode(entry.TextNode);
+
+        this.entries.Clear();
+        this.framework.Update -= this.Update;
+    }
+
+    /// <summary>
+    /// Remove nodes marked as "should be removed" from the bar.
+    /// </summary>
+    internal void HandleRemovedNodes()
+    {
+        foreach (var data in this.entries.Where(d => d.ShouldBeRemoved))
         {
-            this.framework.Update += this.Update;
-
-            this.configuration.DtrOrder ??= new List<string>();
-            this.configuration.DtrIgnore ??= new List<string>();
-            this.configuration.Save();
+            this.RemoveNode(data.TextNode);
         }
 
-        /// <summary>
-        /// Get a DTR bar entry.
-        /// This allows you to add your own text, and users to sort it.
-        /// </summary>
-        /// <param name="title">A user-friendly name for sorting.</param>
-        /// <param name="text">The text the entry shows.</param>
-        /// <returns>The entry object used to update, hide and remove the entry.</returns>
-        /// <exception cref="ArgumentException">Thrown when an entry with the specified title exists.</exception>
-        public DtrBarEntry Get(string title, SeString? text = null)
-        {
-            if (this.entries.Any(x => x.Title == title))
-                throw new ArgumentException("An entry with the same title already exists.");
+        this.entries.RemoveAll(d => d.ShouldBeRemoved);
+    }
 
-            var node = this.MakeNode(++this.runningNodeIds);
-            var entry = new DtrBarEntry(title, node);
-            entry.Text = text;
-
-            // Add the entry to the end of the order list, if it's not there already.
-            if (!this.configuration.DtrOrder!.Contains(title))
-                this.configuration.DtrOrder!.Add(title);
-            this.entries.Add(entry);
-            this.ApplySort();
-
-            return entry;
-        }
-
-        /// <inheritdoc/>
-        void IDisposable.Dispose()
-        {
-            foreach (var entry in this.entries)
-                this.RemoveNode(entry.TextNode);
-
-            this.entries.Clear();
-            this.framework.Update -= this.Update;
-        }
-
-        /// <summary>
-        /// Remove nodes marked as "should be removed" from the bar.
-        /// </summary>
-        internal void HandleRemovedNodes()
-        {
-            foreach (var data in this.entries.Where(d => d.ShouldBeRemoved))
-            {
-                this.RemoveNode(data.TextNode);
-            }
-
-            this.entries.RemoveAll(d => d.ShouldBeRemoved);
-        }
-
-        /// <summary>
-        /// Check whether an entry with the specified title exists.
-        /// </summary>
-        /// <param name="title">The title to check for.</param>
-        /// <returns>Whether or not an entry with that title is registered.</returns>
-        internal bool HasEntry(string title) => this.entries.Any(x => x.Title == title);
-
-        /// <summary>
-        /// Dirty the DTR bar entry with the specified title.
-        /// </summary>
-        /// <param name="title">Title of the entry to dirty.</param>
-        /// <returns>Whether the entry was found.</returns>
-        internal bool MakeDirty(string title)
-        {
-            var entry = this.entries.FirstOrDefault(x => x.Title == title);
-            if (entry == null)
-                return false;
-
-            entry.Dirty = true;
-            return true;
-        }
-
-        /// <summary>
-        /// Reapply the DTR entry ordering from <see cref="DalamudConfiguration"/>.
-        /// </summary>
-        internal void ApplySort()
-        {
-            // Sort the current entry list, based on the order in the configuration.
-            var positions = this.configuration
-                                .DtrOrder!
-                                .Select(entry => (entry, index: this.configuration.DtrOrder!.IndexOf(entry)))
-                                .ToDictionary(x => x.entry, x => x.index);
-
-            this.entries.Sort((x, y) =>
-            {
-                var xPos = positions.TryGetValue(x.Title, out var xIndex) ? xIndex : int.MaxValue;
-                var yPos = positions.TryGetValue(y.Title, out var yIndex) ? yIndex : int.MaxValue;
-                return xPos.CompareTo(yPos);
-            });
-        }
-
-        private AtkUnitBase* GetDtr() => (AtkUnitBase*)this.gameGui.GetAddonByName("_DTR", 1).ToPointer();
-
-        private void Update(Framework unused)
-        {
-            this.HandleRemovedNodes();
-
-            var dtr = this.GetDtr();
-            if (dtr == null) return;
-
-            // The collision node on the DTR element is always the width of its content
-            if (dtr->UldManager.NodeList == null) return;
-
-            // If we have an unmodified DTR but still have entries, we need to
-            // work to reset our state.
-            if (!this.CheckForDalamudNodes())
-                this.RecreateNodes();
-
-            var collisionNode = dtr->UldManager.NodeList[1];
-            if (collisionNode == null) return;
-
-            // If we are drawing backwards, we should start from the right side of the collision node. That is,
-            // collisionNode->X + collisionNode->Width.
-            var runningXPos = this.configuration.DtrSwapDirection
-                                  ? collisionNode->X + collisionNode->Width
-                                  : collisionNode->X;
-
-            for (var i = 0; i < this.entries.Count; i++)
-            {
-                var data = this.entries[i];
-                var isHide = this.configuration.DtrIgnore!.Any(x => x == data.Title) || !data.Shown;
-
-                if (data.Dirty && data.Added && data.Text != null && data.TextNode != null)
-                {
-                    var node = data.TextNode;
-                    node->SetText(data.Text?.Encode());
-                    ushort w = 0, h = 0;
-
-                    if (isHide)
-                    {
-                        node->AtkResNode.ToggleVisibility(false);
-                    }
-                    else
-                    {
-                        node->AtkResNode.ToggleVisibility(true);
-                        node->GetTextDrawSize(&w, &h, node->NodeText.StringPtr);
-                        node->AtkResNode.SetWidth(w);
-                    }
-
-                    data.Dirty = false;
-                }
-
-                if (!data.Added)
-                {
-                    data.Added = this.AddNode(data.TextNode);
-                }
-
-                if (!isHide)
-                {
-                    var elementWidth = data.TextNode->AtkResNode.Width + this.configuration.DtrSpacing;
-
-                    if (this.configuration.DtrSwapDirection)
-                    {
-                        data.TextNode->AtkResNode.SetPositionFloat(runningXPos, 2);
-                        runningXPos += elementWidth;
-                    }
-                    else
-                    {
-                        runningXPos -= elementWidth;
-                        data.TextNode->AtkResNode.SetPositionFloat(runningXPos, 2);
-                    }
-                }
-
-                this.entries[i] = data;
-            }
-        }
-
-        /// <summary>
-        /// Checks if there are any Dalamud nodes in the DTR.
-        /// </summary>
-        /// <returns>True if there are nodes with an ID > 1000.</returns>
-        private bool CheckForDalamudNodes()
-        {
-            var dtr = this.GetDtr();
-            if (dtr == null || dtr->RootNode == null) return false;
-
-            for (var i = 0; i < dtr->UldManager.NodeListCount; i++)
-            {
-                if (dtr->UldManager.NodeList[i]->NodeID > 1000)
-                    return true;
-            }
+    /// <summary>
+    /// Check whether an entry with the specified title exists.
+    /// </summary>
+    /// <param name="title">The title to check for.</param>
+    /// <returns>Whether or not an entry with that title is registered.</returns>
+    internal bool HasEntry(string title) => this.entries.Any(x => x.Title == title);
 
+    /// <summary>
+    /// Dirty the DTR bar entry with the specified title.
+    /// </summary>
+    /// <param name="title">Title of the entry to dirty.</param>
+    /// <returns>Whether the entry was found.</returns>
+    internal bool MakeDirty(string title)
+    {
+        var entry = this.entries.FirstOrDefault(x => x.Title == title);
+        if (entry == null)
             return false;
-        }
 
-        private void RecreateNodes()
+        entry.Dirty = true;
+        return true;
+    }
+
+    /// <summary>
+    /// Reapply the DTR entry ordering from <see cref="DalamudConfiguration"/>.
+    /// </summary>
+    internal void ApplySort()
+    {
+        // Sort the current entry list, based on the order in the configuration.
+        var positions = this.configuration
+                            .DtrOrder!
+                            .Select(entry => (entry, index: this.configuration.DtrOrder!.IndexOf(entry)))
+                            .ToDictionary(x => x.entry, x => x.index);
+
+        this.entries.Sort((x, y) =>
         {
-            this.runningNodeIds = BaseNodeId;
-            foreach (var entry in this.entries)
+            var xPos = positions.TryGetValue(x.Title, out var xIndex) ? xIndex : int.MaxValue;
+            var yPos = positions.TryGetValue(y.Title, out var yIndex) ? yIndex : int.MaxValue;
+            return xPos.CompareTo(yPos);
+        });
+    }
+
+    private AtkUnitBase* GetDtr() => (AtkUnitBase*)this.gameGui.GetAddonByName("_DTR", 1).ToPointer();
+
+    private void Update(Framework unused)
+    {
+        this.HandleRemovedNodes();
+
+        var dtr = this.GetDtr();
+        if (dtr == null) return;
+
+        // The collision node on the DTR element is always the width of its content
+        if (dtr->UldManager.NodeList == null) return;
+
+        // If we have an unmodified DTR but still have entries, we need to
+        // work to reset our state.
+        if (!this.CheckForDalamudNodes())
+            this.RecreateNodes();
+
+        var collisionNode = dtr->UldManager.NodeList[1];
+        if (collisionNode == null) return;
+
+        // If we are drawing backwards, we should start from the right side of the collision node. That is,
+        // collisionNode->X + collisionNode->Width.
+        var runningXPos = this.configuration.DtrSwapDirection
+                              ? collisionNode->X + collisionNode->Width
+                              : collisionNode->X;
+
+        for (var i = 0; i < this.entries.Count; i++)
+        {
+            var data = this.entries[i];
+            var isHide = this.configuration.DtrIgnore!.Any(x => x == data.Title) || !data.Shown;
+
+            if (data.Dirty && data.Added && data.Text != null && data.TextNode != null)
             {
-                entry.TextNode = this.MakeNode(++this.runningNodeIds);
-                entry.Added = false;
-            }
-        }
+                var node = data.TextNode;
+                node->SetText(data.Text?.Encode());
+                ushort w = 0, h = 0;
 
-        private bool AddNode(AtkTextNode* node)
-        {
-            var dtr = this.GetDtr();
-            if (dtr == null || dtr->RootNode == null || dtr->UldManager.NodeList == null || node == null) return false;
+                if (isHide)
+                {
+                    node->AtkResNode.ToggleVisibility(false);
+                }
+                else
+                {
+                    node->AtkResNode.ToggleVisibility(true);
+                    node->GetTextDrawSize(&w, &h, node->NodeText.StringPtr);
+                    node->AtkResNode.SetWidth(w);
+                }
 
-            var lastChild = dtr->RootNode->ChildNode;
-            while (lastChild->PrevSiblingNode != null) lastChild = lastChild->PrevSiblingNode;
-            Log.Debug($"Found last sibling: {(ulong)lastChild:X}");
-            lastChild->PrevSiblingNode = (AtkResNode*)node;
-            node->AtkResNode.ParentNode = lastChild->ParentNode;
-            node->AtkResNode.NextSiblingNode = lastChild;
-
-            dtr->RootNode->ChildCount = (ushort)(dtr->RootNode->ChildCount + 1);
-            Log.Debug("Set last sibling of DTR and updated child count");
-
-            dtr->UldManager.UpdateDrawNodeList();
-            Log.Debug("Updated node draw list");
-            return true;
-        }
-
-        private bool RemoveNode(AtkTextNode* node)
-        {
-            var dtr = this.GetDtr();
-            if (dtr == null || dtr->RootNode == null || dtr->UldManager.NodeList == null || node == null) return false;
-
-            var tmpPrevNode = node->AtkResNode.PrevSiblingNode;
-            var tmpNextNode = node->AtkResNode.NextSiblingNode;
-
-            // if (tmpNextNode != null)
-            tmpNextNode->PrevSiblingNode = tmpPrevNode;
-            if (tmpPrevNode != null)
-                tmpPrevNode->NextSiblingNode = tmpNextNode;
-            node->AtkResNode.Destroy(true);
-
-            dtr->RootNode->ChildCount = (ushort)(dtr->RootNode->ChildCount - 1);
-            Log.Debug("Set last sibling of DTR and updated child count");
-            dtr->UldManager.UpdateDrawNodeList();
-            Log.Debug("Updated node draw list");
-            return true;
-        }
-
-        private AtkTextNode* MakeNode(uint nodeId)
-        {
-            var newTextNode = (AtkTextNode*)IMemorySpace.GetUISpace()->Malloc((ulong)sizeof(AtkTextNode), 8);
-            if (newTextNode == null)
-            {
-                Log.Debug("Failed to allocate memory for text node");
-                return null;
+                data.Dirty = false;
             }
 
-            IMemorySpace.Memset(newTextNode, 0, (ulong)sizeof(AtkTextNode));
-            newTextNode->Ctor();
+            if (!data.Added)
+            {
+                data.Added = this.AddNode(data.TextNode);
+            }
 
-            newTextNode->AtkResNode.NodeID = nodeId;
-            newTextNode->AtkResNode.Type = NodeType.Text;
-            newTextNode->AtkResNode.Flags = (short)(NodeFlags.AnchorLeft | NodeFlags.AnchorTop);
-            newTextNode->AtkResNode.DrawFlags = 12;
-            newTextNode->AtkResNode.SetWidth(22);
-            newTextNode->AtkResNode.SetHeight(22);
-            newTextNode->AtkResNode.SetPositionFloat(-200, 2);
+            if (!isHide)
+            {
+                var elementWidth = data.TextNode->AtkResNode.Width + this.configuration.DtrSpacing;
 
-            newTextNode->LineSpacing = 12;
-            newTextNode->AlignmentFontType = 5;
-            newTextNode->FontSize = 14;
-            newTextNode->TextFlags = (byte)TextFlags.Edge;
-            newTextNode->TextFlags2 = 0;
+                if (this.configuration.DtrSwapDirection)
+                {
+                    data.TextNode->AtkResNode.SetPositionFloat(runningXPos, 2);
+                    runningXPos += elementWidth;
+                }
+                else
+                {
+                    runningXPos -= elementWidth;
+                    data.TextNode->AtkResNode.SetPositionFloat(runningXPos, 2);
+                }
+            }
 
-            newTextNode->SetText(" ");
-
-            newTextNode->TextColor.R = 255;
-            newTextNode->TextColor.G = 255;
-            newTextNode->TextColor.B = 255;
-            newTextNode->TextColor.A = 255;
-
-            newTextNode->EdgeColor.R = 142;
-            newTextNode->EdgeColor.G = 106;
-            newTextNode->EdgeColor.B = 12;
-            newTextNode->EdgeColor.A = 255;
-
-            return newTextNode;
+            this.entries[i] = data;
         }
     }
+
+    /// <summary>
+    /// Checks if there are any Dalamud nodes in the DTR.
+    /// </summary>
+    /// <returns>True if there are nodes with an ID > 1000.</returns>
+    private bool CheckForDalamudNodes()
+    {
+        var dtr = this.GetDtr();
+        if (dtr == null || dtr->RootNode == null) return false;
+
+        for (var i = 0; i < dtr->UldManager.NodeListCount; i++)
+        {
+            if (dtr->UldManager.NodeList[i]->NodeID > 1000)
+                return true;
+        }
+
+        return false;
+    }
+
+    private void RecreateNodes()
+    {
+        this.runningNodeIds = BaseNodeId;
+        foreach (var entry in this.entries)
+        {
+            entry.TextNode = this.MakeNode(++this.runningNodeIds);
+            entry.Added = false;
+        }
+    }
+
+    private bool AddNode(AtkTextNode* node)
+    {
+        var dtr = this.GetDtr();
+        if (dtr == null || dtr->RootNode == null || dtr->UldManager.NodeList == null || node == null) return false;
+
+        var lastChild = dtr->RootNode->ChildNode;
+        while (lastChild->PrevSiblingNode != null) lastChild = lastChild->PrevSiblingNode;
+        Log.Debug($"Found last sibling: {(ulong)lastChild:X}");
+        lastChild->PrevSiblingNode = (AtkResNode*)node;
+        node->AtkResNode.ParentNode = lastChild->ParentNode;
+        node->AtkResNode.NextSiblingNode = lastChild;
+
+        dtr->RootNode->ChildCount = (ushort)(dtr->RootNode->ChildCount + 1);
+        Log.Debug("Set last sibling of DTR and updated child count");
+
+        dtr->UldManager.UpdateDrawNodeList();
+        Log.Debug("Updated node draw list");
+        return true;
+    }
+
+    private bool RemoveNode(AtkTextNode* node)
+    {
+        var dtr = this.GetDtr();
+        if (dtr == null || dtr->RootNode == null || dtr->UldManager.NodeList == null || node == null) return false;
+
+        var tmpPrevNode = node->AtkResNode.PrevSiblingNode;
+        var tmpNextNode = node->AtkResNode.NextSiblingNode;
+
+        // if (tmpNextNode != null)
+        tmpNextNode->PrevSiblingNode = tmpPrevNode;
+        if (tmpPrevNode != null)
+            tmpPrevNode->NextSiblingNode = tmpNextNode;
+        node->AtkResNode.Destroy(true);
+
+        dtr->RootNode->ChildCount = (ushort)(dtr->RootNode->ChildCount - 1);
+        Log.Debug("Set last sibling of DTR and updated child count");
+        dtr->UldManager.UpdateDrawNodeList();
+        Log.Debug("Updated node draw list");
+        return true;
+    }
+
+    private AtkTextNode* MakeNode(uint nodeId)
+    {
+        var newTextNode = (AtkTextNode*)IMemorySpace.GetUISpace()->Malloc((ulong)sizeof(AtkTextNode), 8);
+        if (newTextNode == null)
+        {
+            Log.Debug("Failed to allocate memory for text node");
+            return null;
+        }
+
+        IMemorySpace.Memset(newTextNode, 0, (ulong)sizeof(AtkTextNode));
+        newTextNode->Ctor();
+
+        newTextNode->AtkResNode.NodeID = nodeId;
+        newTextNode->AtkResNode.Type = NodeType.Text;
+        newTextNode->AtkResNode.Flags = (short)(NodeFlags.AnchorLeft | NodeFlags.AnchorTop);
+        newTextNode->AtkResNode.DrawFlags = 12;
+        newTextNode->AtkResNode.SetWidth(22);
+        newTextNode->AtkResNode.SetHeight(22);
+        newTextNode->AtkResNode.SetPositionFloat(-200, 2);
+
+        newTextNode->LineSpacing = 12;
+        newTextNode->AlignmentFontType = 5;
+        newTextNode->FontSize = 14;
+        newTextNode->TextFlags = (byte)TextFlags.Edge;
+        newTextNode->TextFlags2 = 0;
+
+        newTextNode->SetText(" ");
+
+        newTextNode->TextColor.R = 255;
+        newTextNode->TextColor.G = 255;
+        newTextNode->TextColor.B = 255;
+        newTextNode->TextColor.A = 255;
+
+        newTextNode->EdgeColor.R = 142;
+        newTextNode->EdgeColor.G = 106;
+        newTextNode->EdgeColor.B = 12;
+        newTextNode->EdgeColor.A = 255;
+
+        return newTextNode;
+    }
 }
diff --git a/Dalamud/Game/Gui/Dtr/DtrBarEntry.cs b/Dalamud/Game/Gui/Dtr/DtrBarEntry.cs
index 0c94ea352..c5bdb7e85 100644
--- a/Dalamud/Game/Gui/Dtr/DtrBarEntry.cs
+++ b/Dalamud/Game/Gui/Dtr/DtrBarEntry.cs
@@ -3,91 +3,90 @@
 using Dalamud.Game.Text.SeStringHandling;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 
-namespace Dalamud.Game.Gui.Dtr
+namespace Dalamud.Game.Gui.Dtr;
+
+/// <summary>
+/// Class representing an entry in the server info bar.
+/// </summary>
+public sealed unsafe class DtrBarEntry : IDisposable
 {
+    private bool shownBacking = true;
+    private SeString? textBacking = null;
+
     /// <summary>
-    /// Class representing an entry in the server info bar.
+    /// Initializes a new instance of the <see cref="DtrBarEntry"/> class.
     /// </summary>
-    public sealed unsafe class DtrBarEntry : IDisposable
+    /// <param name="title">The title of the bar entry.</param>
+    /// <param name="textNode">The corresponding text node.</param>
+    internal DtrBarEntry(string title, AtkTextNode* textNode)
     {
-        private bool shownBacking = true;
-        private SeString? textBacking = null;
+        this.Title = title;
+        this.TextNode = textNode;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DtrBarEntry"/> class.
-        /// </summary>
-        /// <param name="title">The title of the bar entry.</param>
-        /// <param name="textNode">The corresponding text node.</param>
-        internal DtrBarEntry(string title, AtkTextNode* textNode)
+    /// <summary>
+    /// Gets the title of this entry.
+    /// </summary>
+    public string Title { get; init; }
+
+    /// <summary>
+    /// Gets or sets the text of this entry.
+    /// </summary>
+    public SeString? Text
+    {
+        get => this.textBacking;
+        set
         {
-            this.Title = title;
-            this.TextNode = textNode;
-        }
-
-        /// <summary>
-        /// Gets the title of this entry.
-        /// </summary>
-        public string Title { get; init; }
-
-        /// <summary>
-        /// Gets or sets the text of this entry.
-        /// </summary>
-        public SeString? Text
-        {
-            get => this.textBacking;
-            set
-            {
-                this.textBacking = value;
-                this.Dirty = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this entry is visible.
-        /// </summary>
-        public bool Shown
-        {
-            get => this.shownBacking;
-            set
-            {
-                this.shownBacking = value;
-                this.Dirty = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the internal text node of this entry.
-        /// </summary>
-        internal AtkTextNode* TextNode { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether this entry should be removed.
-        /// </summary>
-        internal bool ShouldBeRemoved { get; private set; } = false;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this entry is dirty.
-        /// </summary>
-        internal bool Dirty { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this entry has just been added.
-        /// </summary>
-        internal bool Added { get; set; } = false;
-
-        /// <summary>
-        /// Remove this entry from the bar.
-        /// You will need to re-acquire it from DtrBar to reuse it.
-        /// </summary>
-        public void Remove()
-        {
-            this.ShouldBeRemoved = true;
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            this.Remove();
+            this.textBacking = value;
+            this.Dirty = true;
         }
     }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this entry is visible.
+    /// </summary>
+    public bool Shown
+    {
+        get => this.shownBacking;
+        set
+        {
+            this.shownBacking = value;
+            this.Dirty = true;
+        }
+    }
+
+    /// <summary>
+    /// Gets or sets the internal text node of this entry.
+    /// </summary>
+    internal AtkTextNode* TextNode { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether this entry should be removed.
+    /// </summary>
+    internal bool ShouldBeRemoved { get; private set; } = false;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this entry is dirty.
+    /// </summary>
+    internal bool Dirty { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this entry has just been added.
+    /// </summary>
+    internal bool Added { get; set; } = false;
+
+    /// <summary>
+    /// Remove this entry from the bar.
+    /// You will need to re-acquire it from DtrBar to reuse it.
+    /// </summary>
+    public void Remove()
+    {
+        this.ShouldBeRemoved = true;
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        this.Remove();
+    }
 }
diff --git a/Dalamud/Game/Gui/FlyText/FlyTextGui.cs b/Dalamud/Game/Gui/FlyText/FlyTextGui.cs
index cdb65fa78..cf5ca68ad 100644
--- a/Dalamud/Game/Gui/FlyText/FlyTextGui.cs
+++ b/Dalamud/Game/Gui/FlyText/FlyTextGui.cs
@@ -9,303 +9,302 @@ using Dalamud.IoC.Internal;
 using Dalamud.Memory;
 using Serilog;
 
-namespace Dalamud.Game.Gui.FlyText
+namespace Dalamud.Game.Gui.FlyText;
+
+/// <summary>
+/// This class facilitates interacting with and creating native in-game "fly text".
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed class FlyTextGui : IDisposable, IServiceType
 {
     /// <summary>
-    /// This class facilitates interacting with and creating native in-game "fly text".
+    /// The native function responsible for adding fly text to the UI. See <see cref="FlyTextGuiAddressResolver.AddFlyText"/>.
     /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed class FlyTextGui : IDisposable, IServiceType
+    private readonly AddFlyTextDelegate addFlyTextNative;
+
+    /// <summary>
+    /// The hook that fires when the game creates a fly text element. See <see cref="FlyTextGuiAddressResolver.CreateFlyText"/>.
+    /// </summary>
+    private readonly Hook<CreateFlyTextDelegate> createFlyTextHook;
+
+    [ServiceManager.ServiceConstructor]
+    private FlyTextGui(SigScanner sigScanner)
     {
-        /// <summary>
-        /// The native function responsible for adding fly text to the UI. See <see cref="FlyTextGuiAddressResolver.AddFlyText"/>.
-        /// </summary>
-        private readonly AddFlyTextDelegate addFlyTextNative;
+        this.Address = new FlyTextGuiAddressResolver();
+        this.Address.Setup(sigScanner);
 
-        /// <summary>
-        /// The hook that fires when the game creates a fly text element. See <see cref="FlyTextGuiAddressResolver.CreateFlyText"/>.
-        /// </summary>
-        private readonly Hook<CreateFlyTextDelegate> createFlyTextHook;
+        this.addFlyTextNative = Marshal.GetDelegateForFunctionPointer<AddFlyTextDelegate>(this.Address.AddFlyText);
+        this.createFlyTextHook = Hook<CreateFlyTextDelegate>.FromAddress(this.Address.CreateFlyText, this.CreateFlyTextDetour);
+    }
 
-        [ServiceManager.ServiceConstructor]
-        private FlyTextGui(SigScanner sigScanner)
+    /// <summary>
+    /// The delegate defining the type for the FlyText event.
+    /// </summary>
+    /// <param name="kind">The FlyTextKind. See <see cref="FlyTextKind"/>.</param>
+    /// <param name="val1">Value1 passed to the native flytext function.</param>
+    /// <param name="val2">Value2 passed to the native flytext function. Seems unused.</param>
+    /// <param name="text1">Text1 passed to the native flytext function.</param>
+    /// <param name="text2">Text2 passed to the native flytext function.</param>
+    /// <param name="color">Color passed to the native flytext function. Changes flytext color.</param>
+    /// <param name="icon">Icon ID passed to the native flytext function. Only displays with select FlyTextKind.</param>
+    /// <param name="yOffset">The vertical offset to place the flytext at. 0 is default. Negative values result
+    /// in text appearing higher on the screen. This does not change where the element begins to fade.</param>
+    /// <param name="handled">Whether this flytext has been handled. If a subscriber sets this to true, the FlyText will not appear.</param>
+    public delegate void OnFlyTextCreatedDelegate(
+        ref FlyTextKind kind,
+        ref int val1,
+        ref int val2,
+        ref SeString text1,
+        ref SeString text2,
+        ref uint color,
+        ref uint icon,
+        ref float yOffset,
+        ref bool handled);
+
+    /// <summary>
+    /// Private delegate for the native CreateFlyText function's hook.
+    /// </summary>
+    private delegate IntPtr CreateFlyTextDelegate(
+        IntPtr addonFlyText,
+        FlyTextKind kind,
+        int val1,
+        int val2,
+        IntPtr text2,
+        uint color,
+        uint icon,
+        IntPtr text1,
+        float yOffset);
+
+    /// <summary>
+    /// Private delegate for the native AddFlyText function pointer.
+    /// </summary>
+    private delegate void AddFlyTextDelegate(
+        IntPtr addonFlyText,
+        uint actorIndex,
+        uint messageMax,
+        IntPtr numbers,
+        uint offsetNum,
+        uint offsetNumMax,
+        IntPtr strings,
+        uint offsetStr,
+        uint offsetStrMax,
+        int unknown);
+
+    /// <summary>
+    /// The FlyText event that can be subscribed to.
+    /// </summary>
+    public event OnFlyTextCreatedDelegate? FlyTextCreated;
+
+    private Dalamud Dalamud { get; }
+
+    private FlyTextGuiAddressResolver Address { get; }
+
+    /// <summary>
+    /// Disposes of managed and unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+        this.createFlyTextHook.Dispose();
+    }
+
+    /// <summary>
+    /// Displays a fly text in-game on the local player.
+    /// </summary>
+    /// <param name="kind">The FlyTextKind. See <see cref="FlyTextKind"/>.</param>
+    /// <param name="actorIndex">The index of the actor to place flytext on. Indexing unknown. 1 places flytext on local player.</param>
+    /// <param name="val1">Value1 passed to the native flytext function.</param>
+    /// <param name="val2">Value2 passed to the native flytext function. Seems unused.</param>
+    /// <param name="text1">Text1 passed to the native flytext function.</param>
+    /// <param name="text2">Text2 passed to the native flytext function.</param>
+    /// <param name="color">Color passed to the native flytext function. Changes flytext color.</param>
+    /// <param name="icon">Icon ID passed to the native flytext function. Only displays with select FlyTextKind.</param>
+    public unsafe void AddFlyText(FlyTextKind kind, uint actorIndex, uint val1, uint val2, SeString text1, SeString text2, uint color, uint icon)
+    {
+        // Known valid flytext region within the atk arrays
+        var numIndex = 28;
+        var strIndex = 25;
+        var numOffset = 147u;
+        var strOffset = 28u;
+
+        // Get the UI module and flytext addon pointers
+        var gameGui = Service<GameGui>.GetNullable();
+        if (gameGui == null)
+            return;
+
+        var ui = (FFXIVClientStructs.FFXIV.Client.UI.UIModule*)gameGui.GetUIModule();
+        var flytext = gameGui.GetAddonByName("_FlyText", 1);
+
+        if (ui == null || flytext == IntPtr.Zero)
+            return;
+
+        // Get the number and string arrays we need
+        var atkArrayDataHolder = ui->GetRaptureAtkModule()->AtkModule.AtkArrayDataHolder;
+        var numArray = atkArrayDataHolder._NumberArrays[numIndex];
+        var strArray = atkArrayDataHolder._StringArrays[strIndex];
+
+        // Write the values to the arrays using a known valid flytext region
+        numArray->IntArray[numOffset + 0] = 1; // Some kind of "Enabled" flag for this section
+        numArray->IntArray[numOffset + 1] = (int)kind;
+        numArray->IntArray[numOffset + 2] = unchecked((int)val1);
+        numArray->IntArray[numOffset + 3] = unchecked((int)val2);
+        numArray->IntArray[numOffset + 4] = 5; // Unknown
+        numArray->IntArray[numOffset + 5] = unchecked((int)color);
+        numArray->IntArray[numOffset + 6] = unchecked((int)icon);
+        numArray->IntArray[numOffset + 7] = 0; // Unknown
+        numArray->IntArray[numOffset + 8] = 0; // Unknown, has something to do with yOffset
+
+        fixed (byte* pText1 = text1.Encode())
         {
-            this.Address = new FlyTextGuiAddressResolver();
-            this.Address.Setup(sigScanner);
-
-            this.addFlyTextNative = Marshal.GetDelegateForFunctionPointer<AddFlyTextDelegate>(this.Address.AddFlyText);
-            this.createFlyTextHook = Hook<CreateFlyTextDelegate>.FromAddress(this.Address.CreateFlyText, this.CreateFlyTextDetour);
-        }
-
-        /// <summary>
-        /// The delegate defining the type for the FlyText event.
-        /// </summary>
-        /// <param name="kind">The FlyTextKind. See <see cref="FlyTextKind"/>.</param>
-        /// <param name="val1">Value1 passed to the native flytext function.</param>
-        /// <param name="val2">Value2 passed to the native flytext function. Seems unused.</param>
-        /// <param name="text1">Text1 passed to the native flytext function.</param>
-        /// <param name="text2">Text2 passed to the native flytext function.</param>
-        /// <param name="color">Color passed to the native flytext function. Changes flytext color.</param>
-        /// <param name="icon">Icon ID passed to the native flytext function. Only displays with select FlyTextKind.</param>
-        /// <param name="yOffset">The vertical offset to place the flytext at. 0 is default. Negative values result
-        /// in text appearing higher on the screen. This does not change where the element begins to fade.</param>
-        /// <param name="handled">Whether this flytext has been handled. If a subscriber sets this to true, the FlyText will not appear.</param>
-        public delegate void OnFlyTextCreatedDelegate(
-            ref FlyTextKind kind,
-            ref int val1,
-            ref int val2,
-            ref SeString text1,
-            ref SeString text2,
-            ref uint color,
-            ref uint icon,
-            ref float yOffset,
-            ref bool handled);
-
-        /// <summary>
-        /// Private delegate for the native CreateFlyText function's hook.
-        /// </summary>
-        private delegate IntPtr CreateFlyTextDelegate(
-            IntPtr addonFlyText,
-            FlyTextKind kind,
-            int val1,
-            int val2,
-            IntPtr text2,
-            uint color,
-            uint icon,
-            IntPtr text1,
-            float yOffset);
-
-        /// <summary>
-        /// Private delegate for the native AddFlyText function pointer.
-        /// </summary>
-        private delegate void AddFlyTextDelegate(
-            IntPtr addonFlyText,
-            uint actorIndex,
-            uint messageMax,
-            IntPtr numbers,
-            uint offsetNum,
-            uint offsetNumMax,
-            IntPtr strings,
-            uint offsetStr,
-            uint offsetStrMax,
-            int unknown);
-
-        /// <summary>
-        /// The FlyText event that can be subscribed to.
-        /// </summary>
-        public event OnFlyTextCreatedDelegate? FlyTextCreated;
-
-        private Dalamud Dalamud { get; }
-
-        private FlyTextGuiAddressResolver Address { get; }
-
-        /// <summary>
-        /// Disposes of managed and unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            this.createFlyTextHook.Dispose();
-        }
-
-        /// <summary>
-        /// Displays a fly text in-game on the local player.
-        /// </summary>
-        /// <param name="kind">The FlyTextKind. See <see cref="FlyTextKind"/>.</param>
-        /// <param name="actorIndex">The index of the actor to place flytext on. Indexing unknown. 1 places flytext on local player.</param>
-        /// <param name="val1">Value1 passed to the native flytext function.</param>
-        /// <param name="val2">Value2 passed to the native flytext function. Seems unused.</param>
-        /// <param name="text1">Text1 passed to the native flytext function.</param>
-        /// <param name="text2">Text2 passed to the native flytext function.</param>
-        /// <param name="color">Color passed to the native flytext function. Changes flytext color.</param>
-        /// <param name="icon">Icon ID passed to the native flytext function. Only displays with select FlyTextKind.</param>
-        public unsafe void AddFlyText(FlyTextKind kind, uint actorIndex, uint val1, uint val2, SeString text1, SeString text2, uint color, uint icon)
-        {
-            // Known valid flytext region within the atk arrays
-            var numIndex = 28;
-            var strIndex = 25;
-            var numOffset = 147u;
-            var strOffset = 28u;
-
-            // Get the UI module and flytext addon pointers
-            var gameGui = Service<GameGui>.GetNullable();
-            if (gameGui == null)
-                return;
-
-            var ui = (FFXIVClientStructs.FFXIV.Client.UI.UIModule*)gameGui.GetUIModule();
-            var flytext = gameGui.GetAddonByName("_FlyText", 1);
-
-            if (ui == null || flytext == IntPtr.Zero)
-                return;
-
-            // Get the number and string arrays we need
-            var atkArrayDataHolder = ui->GetRaptureAtkModule()->AtkModule.AtkArrayDataHolder;
-            var numArray = atkArrayDataHolder._NumberArrays[numIndex];
-            var strArray = atkArrayDataHolder._StringArrays[strIndex];
-
-            // Write the values to the arrays using a known valid flytext region
-            numArray->IntArray[numOffset + 0] = 1;                      // Some kind of "Enabled" flag for this section
-            numArray->IntArray[numOffset + 1] = (int)kind;
-            numArray->IntArray[numOffset + 2] = unchecked((int)val1);
-            numArray->IntArray[numOffset + 3] = unchecked((int)val2);
-            numArray->IntArray[numOffset + 4] = 5;                      // Unknown
-            numArray->IntArray[numOffset + 5] = unchecked((int)color);
-            numArray->IntArray[numOffset + 6] = unchecked((int)icon);
-            numArray->IntArray[numOffset + 7] = 0;                      // Unknown
-            numArray->IntArray[numOffset + 8] = 0;                      // Unknown, has something to do with yOffset
-
-            fixed (byte* pText1 = text1.Encode())
+            fixed (byte* pText2 = text2.Encode())
             {
-                fixed (byte* pText2 = text2.Encode())
-                {
-                    strArray->StringArray[strOffset + 0] = pText1;
-                    strArray->StringArray[strOffset + 1] = pText2;
+                strArray->StringArray[strOffset + 0] = pText1;
+                strArray->StringArray[strOffset + 1] = pText2;
 
-                    this.addFlyTextNative(
-                        flytext,
-                        actorIndex,
-                        1,
-                        (IntPtr)numArray,
-                        numOffset,
-                        9,
-                        (IntPtr)strArray,
-                        strOffset,
-                        2,
-                        0);
-                }
+                this.addFlyTextNative(
+                    flytext,
+                    actorIndex,
+                    1,
+                    (IntPtr)numArray,
+                    numOffset,
+                    9,
+                    (IntPtr)strArray,
+                    strOffset,
+                    2,
+                    0);
             }
         }
-
-        private static byte[] Terminate(byte[] source)
-        {
-            var terminated = new byte[source.Length + 1];
-            Array.Copy(source, 0, terminated, 0, source.Length);
-            terminated[^1] = 0;
-
-            return terminated;
-        }
-
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction(GameGui gameGui)
-        {
-            this.createFlyTextHook.Enable();
-        }
-
-        private IntPtr CreateFlyTextDetour(
-            IntPtr addonFlyText,
-            FlyTextKind kind,
-            int val1,
-            int val2,
-            IntPtr text2,
-            uint color,
-            uint icon,
-            IntPtr text1,
-            float yOffset)
-        {
-            var retVal = IntPtr.Zero;
-            try
-            {
-                Log.Verbose("[FlyText] Enter CreateFlyText detour!");
-
-                var handled = false;
-
-                var tmpKind = kind;
-                var tmpVal1 = val1;
-                var tmpVal2 = val2;
-                var tmpText1 = text1 == IntPtr.Zero ? string.Empty : MemoryHelper.ReadSeStringNullTerminated(text1);
-                var tmpText2 = text2 == IntPtr.Zero ? string.Empty : MemoryHelper.ReadSeStringNullTerminated(text2);
-                var tmpColor = color;
-                var tmpIcon = icon;
-                var tmpYOffset = yOffset;
-
-                var cmpText1 = tmpText1.ToString();
-                var cmpText2 = tmpText2.ToString();
-
-                Log.Verbose($"[FlyText] Called with addonFlyText({addonFlyText.ToInt64():X}) " +
-                                         $"kind({kind}) val1({val1}) val2({val2}) " +
-                                         $"text1({text1.ToInt64():X}, \"{tmpText1}\") text2({text2.ToInt64():X}, \"{tmpText2}\") " +
-                                         $"color({color:X}) icon({icon}) yOffset({yOffset})");
-                Log.Verbose("[FlyText] Calling flytext events!");
-                this.FlyTextCreated?.Invoke(
-                    ref tmpKind,
-                    ref tmpVal1,
-                    ref tmpVal2,
-                    ref tmpText1,
-                    ref tmpText2,
-                    ref tmpColor,
-                    ref tmpIcon,
-                    ref tmpYOffset,
-                    ref handled);
-
-                // If handled, ignore the original call
-                if (handled)
-                {
-                    Log.Verbose("[FlyText] FlyText was handled.");
-
-                    // Returning null to AddFlyText from CreateFlyText will result
-                    // in the operation being dropped entirely.
-                    return IntPtr.Zero;
-                }
-
-                // Check if any values have changed
-                var dirty = tmpKind != kind ||
-                            tmpVal1 != val1 ||
-                            tmpVal2 != val2 ||
-                            tmpText1.ToString() != cmpText1 ||
-                            tmpText2.ToString() != cmpText2 ||
-                            tmpColor != color ||
-                            tmpIcon != icon ||
-                            Math.Abs(tmpYOffset - yOffset) > float.Epsilon;
-
-                // If not dirty, make the original call
-                if (!dirty)
-                {
-                    Log.Verbose("[FlyText] Calling flytext with original args.");
-                    return this.createFlyTextHook.Original(addonFlyText, kind, val1, val2, text2, color, icon, text1, yOffset);
-                }
-
-                var terminated1 = Terminate(tmpText1.Encode());
-                var terminated2 = Terminate(tmpText2.Encode());
-                var pText1 = Marshal.AllocHGlobal(terminated1.Length);
-                var pText2 = Marshal.AllocHGlobal(terminated2.Length);
-                Marshal.Copy(terminated1, 0, pText1, terminated1.Length);
-                Marshal.Copy(terminated2, 0, pText2, terminated2.Length);
-                Log.Verbose("[FlyText] Allocated and set strings.");
-
-                retVal = this.createFlyTextHook.Original(
-                    addonFlyText,
-                    tmpKind,
-                    tmpVal1,
-                    tmpVal2,
-                    pText2,
-                    tmpColor,
-                    tmpIcon,
-                    pText1,
-                    tmpYOffset);
-
-                Log.Verbose("[FlyText] Returned from original. Delaying free task.");
-
-                Task.Delay(2000).ContinueWith(_ =>
-                {
-                    try
-                    {
-                        Marshal.FreeHGlobal(pText1);
-                        Marshal.FreeHGlobal(pText2);
-                        Log.Verbose("[FlyText] Freed strings.");
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Verbose(e, "[FlyText] Exception occurred freeing strings in task.");
-                    }
-                });
-            }
-            catch (Exception e)
-            {
-                Log.Error(e, "Exception occurred in CreateFlyTextDetour!");
-            }
-
-            return retVal;
-        }
+    }
+
+    private static byte[] Terminate(byte[] source)
+    {
+        var terminated = new byte[source.Length + 1];
+        Array.Copy(source, 0, terminated, 0, source.Length);
+        terminated[^1] = 0;
+
+        return terminated;
+    }
+
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction(GameGui gameGui)
+    {
+        this.createFlyTextHook.Enable();
+    }
+
+    private IntPtr CreateFlyTextDetour(
+        IntPtr addonFlyText,
+        FlyTextKind kind,
+        int val1,
+        int val2,
+        IntPtr text2,
+        uint color,
+        uint icon,
+        IntPtr text1,
+        float yOffset)
+    {
+        var retVal = IntPtr.Zero;
+        try
+        {
+            Log.Verbose("[FlyText] Enter CreateFlyText detour!");
+
+            var handled = false;
+
+            var tmpKind = kind;
+            var tmpVal1 = val1;
+            var tmpVal2 = val2;
+            var tmpText1 = text1 == IntPtr.Zero ? string.Empty : MemoryHelper.ReadSeStringNullTerminated(text1);
+            var tmpText2 = text2 == IntPtr.Zero ? string.Empty : MemoryHelper.ReadSeStringNullTerminated(text2);
+            var tmpColor = color;
+            var tmpIcon = icon;
+            var tmpYOffset = yOffset;
+
+            var cmpText1 = tmpText1.ToString();
+            var cmpText2 = tmpText2.ToString();
+
+            Log.Verbose($"[FlyText] Called with addonFlyText({addonFlyText.ToInt64():X}) " +
+                        $"kind({kind}) val1({val1}) val2({val2}) " +
+                        $"text1({text1.ToInt64():X}, \"{tmpText1}\") text2({text2.ToInt64():X}, \"{tmpText2}\") " +
+                        $"color({color:X}) icon({icon}) yOffset({yOffset})");
+            Log.Verbose("[FlyText] Calling flytext events!");
+            this.FlyTextCreated?.Invoke(
+                ref tmpKind,
+                ref tmpVal1,
+                ref tmpVal2,
+                ref tmpText1,
+                ref tmpText2,
+                ref tmpColor,
+                ref tmpIcon,
+                ref tmpYOffset,
+                ref handled);
+
+            // If handled, ignore the original call
+            if (handled)
+            {
+                Log.Verbose("[FlyText] FlyText was handled.");
+
+                // Returning null to AddFlyText from CreateFlyText will result
+                // in the operation being dropped entirely.
+                return IntPtr.Zero;
+            }
+
+            // Check if any values have changed
+            var dirty = tmpKind != kind ||
+                        tmpVal1 != val1 ||
+                        tmpVal2 != val2 ||
+                        tmpText1.ToString() != cmpText1 ||
+                        tmpText2.ToString() != cmpText2 ||
+                        tmpColor != color ||
+                        tmpIcon != icon ||
+                        Math.Abs(tmpYOffset - yOffset) > float.Epsilon;
+
+            // If not dirty, make the original call
+            if (!dirty)
+            {
+                Log.Verbose("[FlyText] Calling flytext with original args.");
+                return this.createFlyTextHook.Original(addonFlyText, kind, val1, val2, text2, color, icon, text1, yOffset);
+            }
+
+            var terminated1 = Terminate(tmpText1.Encode());
+            var terminated2 = Terminate(tmpText2.Encode());
+            var pText1 = Marshal.AllocHGlobal(terminated1.Length);
+            var pText2 = Marshal.AllocHGlobal(terminated2.Length);
+            Marshal.Copy(terminated1, 0, pText1, terminated1.Length);
+            Marshal.Copy(terminated2, 0, pText2, terminated2.Length);
+            Log.Verbose("[FlyText] Allocated and set strings.");
+
+            retVal = this.createFlyTextHook.Original(
+                addonFlyText,
+                tmpKind,
+                tmpVal1,
+                tmpVal2,
+                pText2,
+                tmpColor,
+                tmpIcon,
+                pText1,
+                tmpYOffset);
+
+            Log.Verbose("[FlyText] Returned from original. Delaying free task.");
+
+            Task.Delay(2000).ContinueWith(_ =>
+            {
+                try
+                {
+                    Marshal.FreeHGlobal(pText1);
+                    Marshal.FreeHGlobal(pText2);
+                    Log.Verbose("[FlyText] Freed strings.");
+                }
+                catch (Exception e)
+                {
+                    Log.Verbose(e, "[FlyText] Exception occurred freeing strings in task.");
+                }
+            });
+        }
+        catch (Exception e)
+        {
+            Log.Error(e, "Exception occurred in CreateFlyTextDetour!");
+        }
+
+        return retVal;
     }
 }
diff --git a/Dalamud/Game/Gui/FlyText/FlyTextGuiAddressResolver.cs b/Dalamud/Game/Gui/FlyText/FlyTextGuiAddressResolver.cs
index ae0eb0035..f608c7d77 100644
--- a/Dalamud/Game/Gui/FlyText/FlyTextGuiAddressResolver.cs
+++ b/Dalamud/Game/Gui/FlyText/FlyTextGuiAddressResolver.cs
@@ -1,32 +1,31 @@
 using System;
 
-namespace Dalamud.Game.Gui.FlyText
+namespace Dalamud.Game.Gui.FlyText;
+
+/// <summary>
+/// An address resolver for the <see cref="FlyTextGui"/> class.
+/// </summary>
+public class FlyTextGuiAddressResolver : BaseAddressResolver
 {
     /// <summary>
-    /// An address resolver for the <see cref="FlyTextGui"/> class.
+    /// Gets the address of the native AddFlyText method, which occurs
+    /// when the game adds fly text elements to the UI. Multiple fly text
+    /// elements can be added in a single AddFlyText call.
     /// </summary>
-    public class FlyTextGuiAddressResolver : BaseAddressResolver
+    public IntPtr AddFlyText { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native CreateFlyText method, which occurs
+    /// when the game creates a new fly text element. This method is called
+    /// once per fly text element, and can be called multiple times per
+    /// AddFlyText call.
+    /// </summary>
+    public IntPtr CreateFlyText { get; private set; }
+
+    /// <inheritdoc/>
+    protected override void Setup64Bit(SigScanner sig)
     {
-        /// <summary>
-        /// Gets the address of the native AddFlyText method, which occurs
-        /// when the game adds fly text elements to the UI. Multiple fly text
-        /// elements can be added in a single AddFlyText call.
-        /// </summary>
-        public IntPtr AddFlyText { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native CreateFlyText method, which occurs
-        /// when the game creates a new fly text element. This method is called
-        /// once per fly text element, and can be called multiple times per
-        /// AddFlyText call.
-        /// </summary>
-        public IntPtr CreateFlyText { get; private set; }
-
-        /// <inheritdoc/>
-        protected override void Setup64Bit(SigScanner sig)
-        {
-            this.AddFlyText = sig.ScanText("E8 ?? ?? ?? ?? FF C7 41 D1 C7");
-            this.CreateFlyText = sig.ScanText("48 89 74 24 ?? 48 89 7C 24 ?? 41 56 48 83 EC 40 48 63 FA");
-        }
+        this.AddFlyText = sig.ScanText("E8 ?? ?? ?? ?? FF C7 41 D1 C7");
+        this.CreateFlyText = sig.ScanText("48 89 74 24 ?? 48 89 7C 24 ?? 41 56 48 83 EC 40 48 63 FA");
     }
 }
diff --git a/Dalamud/Game/Gui/FlyText/FlyTextKind.cs b/Dalamud/Game/Gui/FlyText/FlyTextKind.cs
index ae5e8a3fb..68650fb5c 100644
--- a/Dalamud/Game/Gui/FlyText/FlyTextKind.cs
+++ b/Dalamud/Game/Gui/FlyText/FlyTextKind.cs
@@ -1,298 +1,297 @@
-namespace Dalamud.Game.Gui.FlyText
+namespace Dalamud.Game.Gui.FlyText;
+
+/// <summary>
+/// Enum of FlyTextKind values. Members suffixed with
+/// a number seem to be a duplicate, or perform duplicate behavior.
+/// </summary>
+public enum FlyTextKind : int
 {
     /// <summary>
-    /// Enum of FlyTextKind values. Members suffixed with
-    /// a number seem to be a duplicate, or perform duplicate behavior.
+    /// Val1 in serif font, Text2 in sans-serif as subtitle.
+    /// Used for autos and incoming DoTs.
     /// </summary>
-    public enum FlyTextKind : int
-    {
-        /// <summary>
-        /// Val1 in serif font, Text2 in sans-serif as subtitle.
-        /// Used for autos and incoming DoTs.
-        /// </summary>
-        AutoAttack = 0,
+    AutoAttack = 0,
 
-        /// <summary>
-        /// Val1 in serif font, Text2 in sans-serif as subtitle.
-        /// Does a bounce effect on appearance.
-        /// </summary>
-        DirectHit = 1,
+    /// <summary>
+    /// Val1 in serif font, Text2 in sans-serif as subtitle.
+    /// Does a bounce effect on appearance.
+    /// </summary>
+    DirectHit = 1,
 
-        /// <summary>
-        /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle.
-        /// Does a bigger bounce effect on appearance.
-        /// </summary>
-        CriticalHit = 2,
+    /// <summary>
+    /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle.
+    /// Does a bigger bounce effect on appearance.
+    /// </summary>
+    CriticalHit = 2,
 
-        /// <summary>
-        /// Val1 in even larger serif font with 2 exclamations, Text2 in
-        /// sans-serif as subtitle. Does a large bounce effect on appearance.
-        /// Does not scroll up or down the screen.
-        /// </summary>
-        CriticalDirectHit = 3,
+    /// <summary>
+    /// Val1 in even larger serif font with 2 exclamations, Text2 in
+    /// sans-serif as subtitle. Does a large bounce effect on appearance.
+    /// Does not scroll up or down the screen.
+    /// </summary>
+    CriticalDirectHit = 3,
 
-        /// <summary>
-        /// AutoAttack with sans-serif Text1 to the left of the Val1.
-        /// </summary>
-        NamedAttack = 4,
+    /// <summary>
+    /// AutoAttack with sans-serif Text1 to the left of the Val1.
+    /// </summary>
+    NamedAttack = 4,
 
-        /// <summary>
-        /// DirectHit with sans-serif Text1 to the left of the Val1.
-        /// </summary>
-        NamedDirectHit = 5,
+    /// <summary>
+    /// DirectHit with sans-serif Text1 to the left of the Val1.
+    /// </summary>
+    NamedDirectHit = 5,
 
-        /// <summary>
-        /// CriticalHit with sans-serif Text1 to the left of the Val1.
-        /// </summary>
-        NamedCriticalHit = 6,
+    /// <summary>
+    /// CriticalHit with sans-serif Text1 to the left of the Val1.
+    /// </summary>
+    NamedCriticalHit = 6,
 
-        /// <summary>
-        /// CriticalDirectHit with sans-serif Text1 to the left of the Val1.
-        /// </summary>
-        NamedCriticalDirectHit = 7,
+    /// <summary>
+    /// CriticalDirectHit with sans-serif Text1 to the left of the Val1.
+    /// </summary>
+    NamedCriticalDirectHit = 7,
 
-        /// <summary>
-        /// All caps, serif MISS.
-        /// </summary>
-        Miss = 8,
+    /// <summary>
+    /// All caps, serif MISS.
+    /// </summary>
+    Miss = 8,
 
-        /// <summary>
-        /// Sans-serif Text1 next to all caps serif MISS.
-        /// </summary>
-        NamedMiss = 9,
+    /// <summary>
+    /// Sans-serif Text1 next to all caps serif MISS.
+    /// </summary>
+    NamedMiss = 9,
 
-        /// <summary>
-        /// All caps serif DODGE.
-        /// </summary>
-        Dodge = 10,
+    /// <summary>
+    /// All caps serif DODGE.
+    /// </summary>
+    Dodge = 10,
 
-        /// <summary>
-        /// Sans-serif Text1 next to all caps serif DODGE.
-        /// </summary>
-        NamedDodge = 11,
+    /// <summary>
+    /// Sans-serif Text1 next to all caps serif DODGE.
+    /// </summary>
+    NamedDodge = 11,
 
-        /// <summary>
-        /// Icon next to sans-serif Text1.
-        /// </summary>
-        NamedIcon = 12,
+    /// <summary>
+    /// Icon next to sans-serif Text1.
+    /// </summary>
+    NamedIcon = 12,
 
-        /// <summary>
-        /// Icon next to sans-serif Text1 (2).
-        /// </summary>
-        NamedIcon2 = 13,
+    /// <summary>
+    /// Icon next to sans-serif Text1 (2).
+    /// </summary>
+    NamedIcon2 = 13,
 
-        /// <summary>
-        /// Serif Val1 with all caps condensed font EXP with Text2 in sans-serif as subtitle.
-        /// </summary>
-        Exp = 14,
+    /// <summary>
+    /// Serif Val1 with all caps condensed font EXP with Text2 in sans-serif as subtitle.
+    /// </summary>
+    Exp = 14,
 
-        /// <summary>
-        /// Serif Val1 with all caps condensed font ISLAND EXP with Text2 in sans-serif as subtitle.
-        /// </summary>
-        IslandExp = 15,
+    /// <summary>
+    /// Serif Val1 with all caps condensed font ISLAND EXP with Text2 in sans-serif as subtitle.
+    /// </summary>
+    IslandExp = 15,
 
-        /// <summary>
-        /// Sans-serif Text1 next to serif Val1 with all caps condensed font MP with Text2 in sans-serif as subtitle.
-        /// </summary>
-        NamedMp = 16,
+    /// <summary>
+    /// Sans-serif Text1 next to serif Val1 with all caps condensed font MP with Text2 in sans-serif as subtitle.
+    /// </summary>
+    NamedMp = 16,
 
-        /// <summary>
-        /// Sans-serif Text1 next to serif Val1 with all caps condensed font TP with Text2 in sans-serif as subtitle.
-        /// </summary>
-        NamedTp = 17,
+    /// <summary>
+    /// Sans-serif Text1 next to serif Val1 with all caps condensed font TP with Text2 in sans-serif as subtitle.
+    /// </summary>
+    NamedTp = 17,
 
-        /// <summary>
-        /// AutoAttack with sans-serif Text1 to the left of the Val1 (2).
-        /// </summary>
-        NamedAttack2 = 18,
+    /// <summary>
+    /// AutoAttack with sans-serif Text1 to the left of the Val1 (2).
+    /// </summary>
+    NamedAttack2 = 18,
 
-        /// <summary>
-        /// Sans-serif Text1 next to serif Val1 with all caps condensed font MP with Text2 in sans-serif as subtitle (2).
-        /// </summary>
-        NamedMp2 = 19,
+    /// <summary>
+    /// Sans-serif Text1 next to serif Val1 with all caps condensed font MP with Text2 in sans-serif as subtitle (2).
+    /// </summary>
+    NamedMp2 = 19,
 
-        /// <summary>
-        /// Sans-serif Text1 next to serif Val1 with all caps condensed font TP with Text2 in sans-serif as subtitle (2).
-        /// </summary>
-        NamedTp2 = 20,
+    /// <summary>
+    /// Sans-serif Text1 next to serif Val1 with all caps condensed font TP with Text2 in sans-serif as subtitle (2).
+    /// </summary>
+    NamedTp2 = 20,
 
-        /// <summary>
-        /// Sans-serif Text1 next to serif Val1 with all caps condensed font EP with Text2 in sans-serif as subtitle.
-        /// </summary>
-        NamedEp = 21,
+    /// <summary>
+    /// Sans-serif Text1 next to serif Val1 with all caps condensed font EP with Text2 in sans-serif as subtitle.
+    /// </summary>
+    NamedEp = 21,
 
-        /// <summary>
-        /// Sans-serif Text1 next to serif Val1 with all caps condensed font CP with Text2 in sans-serif as subtitle.
-        /// </summary>
-        NamedCp = 22,
+    /// <summary>
+    /// Sans-serif Text1 next to serif Val1 with all caps condensed font CP with Text2 in sans-serif as subtitle.
+    /// </summary>
+    NamedCp = 22,
 
-        /// <summary>
-        /// Sans-serif Text1 next to serif Val1 with all caps condensed font GP with Text2 in sans-serif as subtitle.
-        /// </summary>
-        NamedGp = 23,
+    /// <summary>
+    /// Sans-serif Text1 next to serif Val1 with all caps condensed font GP with Text2 in sans-serif as subtitle.
+    /// </summary>
+    NamedGp = 23,
 
-        /// <summary>
-        /// Displays nothing.
-        /// </summary>
-        None = 24,
+    /// <summary>
+    /// Displays nothing.
+    /// </summary>
+    None = 24,
 
-        /// <summary>
-        /// All caps serif INVULNERABLE.
-        /// </summary>
-        Invulnerable = 25,
+    /// <summary>
+    /// All caps serif INVULNERABLE.
+    /// </summary>
+    Invulnerable = 25,
 
-        /// <summary>
-        /// All caps sans-serif condensed font INTERRUPTED!
-        /// Does a large bounce effect on appearance.
-        /// Does not scroll up or down the screen.
-        /// </summary>
-        Interrupted = 26,
+    /// <summary>
+    /// All caps sans-serif condensed font INTERRUPTED!
+    /// Does a large bounce effect on appearance.
+    /// Does not scroll up or down the screen.
+    /// </summary>
+    Interrupted = 26,
 
-        /// <summary>
-        /// AutoAttack with no Text2.
-        /// </summary>
-        AutoAttackNoText = 27,
+    /// <summary>
+    /// AutoAttack with no Text2.
+    /// </summary>
+    AutoAttackNoText = 27,
 
-        /// <summary>
-        /// AutoAttack with no Text2 (2).
-        /// </summary>
-        AutoAttackNoText2 = 28,
+    /// <summary>
+    /// AutoAttack with no Text2 (2).
+    /// </summary>
+    AutoAttackNoText2 = 28,
 
-        /// <summary>
-        /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle. Does a bigger bounce effect on appearance (2).
-        /// </summary>
-        CriticalHit2 = 29,
+    /// <summary>
+    /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle. Does a bigger bounce effect on appearance (2).
+    /// </summary>
+    CriticalHit2 = 29,
 
-        /// <summary>
-        /// AutoAttack with no Text2 (3).
-        /// </summary>
-        AutoAttackNoText3 = 30,
+    /// <summary>
+    /// AutoAttack with no Text2 (3).
+    /// </summary>
+    AutoAttackNoText3 = 30,
 
-        /// <summary>
-        /// CriticalHit with sans-serif Text1 to the left of the Val1 (2).
-        /// </summary>
-        NamedCriticalHit2 = 31,
+    /// <summary>
+    /// CriticalHit with sans-serif Text1 to the left of the Val1 (2).
+    /// </summary>
+    NamedCriticalHit2 = 31,
 
-        /// <summary>
-        /// Same as NamedCriticalHit with a green (cannot change) MP in condensed font to the right of Val1.
-        /// Does a jiggle effect to the right on appearance.
-        /// </summary>
-        NamedCriticalHitWithMp = 32,
+    /// <summary>
+    /// Same as NamedCriticalHit with a green (cannot change) MP in condensed font to the right of Val1.
+    /// Does a jiggle effect to the right on appearance.
+    /// </summary>
+    NamedCriticalHitWithMp = 32,
 
-        /// <summary>
-        /// Same as NamedCriticalHit with a yellow (cannot change) TP in condensed font to the right of Val1.
-        /// Does a jiggle effect to the right on appearance.
-        /// </summary>
-        NamedCriticalHitWithTp = 33,
+    /// <summary>
+    /// Same as NamedCriticalHit with a yellow (cannot change) TP in condensed font to the right of Val1.
+    /// Does a jiggle effect to the right on appearance.
+    /// </summary>
+    NamedCriticalHitWithTp = 33,
 
-        /// <summary>
-        /// Same as NamedIcon with sans-serif "has no effect!" to the right.
-        /// </summary>
-        NamedIconHasNoEffect = 34,
+    /// <summary>
+    /// Same as NamedIcon with sans-serif "has no effect!" to the right.
+    /// </summary>
+    NamedIconHasNoEffect = 34,
 
-        /// <summary>
-        /// Same as NamedIcon but Text1 is slightly faded. Used for buff expiration.
-        /// </summary>
-        NamedIconFaded = 35,
+    /// <summary>
+    /// Same as NamedIcon but Text1 is slightly faded. Used for buff expiration.
+    /// </summary>
+    NamedIconFaded = 35,
 
-        /// <summary>
-        /// Same as NamedIcon but Text1 is slightly faded (2).
-        /// Used for buff expiration.
-        /// </summary>
-        NamedIconFaded2 = 36,
+    /// <summary>
+    /// Same as NamedIcon but Text1 is slightly faded (2).
+    /// Used for buff expiration.
+    /// </summary>
+    NamedIconFaded2 = 36,
 
-        /// <summary>
-        /// Text1 in sans-serif font.
-        /// </summary>
-        Named = 37,
+    /// <summary>
+    /// Text1 in sans-serif font.
+    /// </summary>
+    Named = 37,
 
-        /// <summary>
-        /// Same as NamedIcon with sans-serif "(fully resisted)" to the right.
-        /// </summary>
-        NamedIconFullyResisted = 38,
+    /// <summary>
+    /// Same as NamedIcon with sans-serif "(fully resisted)" to the right.
+    /// </summary>
+    NamedIconFullyResisted = 38,
 
-        /// <summary>
-        /// All caps serif 'INCAPACITATED!'.
-        /// </summary>
-        Incapacitated = 39,
+    /// <summary>
+    /// All caps serif 'INCAPACITATED!'.
+    /// </summary>
+    Incapacitated = 39,
 
-        /// <summary>
-        /// Text1 with sans-serif "(fully resisted)" to the right.
-        /// </summary>
-        NamedFullyResisted = 40,
+    /// <summary>
+    /// Text1 with sans-serif "(fully resisted)" to the right.
+    /// </summary>
+    NamedFullyResisted = 40,
 
-        /// <summary>
-        /// Text1 with sans-serif "has no effect!" to the right.
-        /// </summary>
-        NamedHasNoEffect = 41,
+    /// <summary>
+    /// Text1 with sans-serif "has no effect!" to the right.
+    /// </summary>
+    NamedHasNoEffect = 41,
 
-        /// <summary>
-        /// AutoAttack with sans-serif Text1 to the left of the Val1 (3).
-        /// </summary>
-        NamedAttack3 = 42,
+    /// <summary>
+    /// AutoAttack with sans-serif Text1 to the left of the Val1 (3).
+    /// </summary>
+    NamedAttack3 = 42,
 
-        /// <summary>
-        /// Sans-serif Text1 next to serif Val1 with all caps condensed font MP with Text2 in sans-serif as subtitle (3).
-        /// </summary>
-        NamedMp3 = 43,
+    /// <summary>
+    /// Sans-serif Text1 next to serif Val1 with all caps condensed font MP with Text2 in sans-serif as subtitle (3).
+    /// </summary>
+    NamedMp3 = 43,
 
-        /// <summary>
-        /// Sans-serif Text1 next to serif Val1 with all caps condensed font TP with Text2 in sans-serif as subtitle (3).
-        /// </summary>
-        NamedTp3 = 44,
+    /// <summary>
+    /// Sans-serif Text1 next to serif Val1 with all caps condensed font TP with Text2 in sans-serif as subtitle (3).
+    /// </summary>
+    NamedTp3 = 44,
 
-        /// <summary>
-        /// Same as NamedIcon with serif "INVULNERABLE!" beneath the Text1.
-        /// </summary>
-        NamedIconInvulnerable = 45,
+    /// <summary>
+    /// Same as NamedIcon with serif "INVULNERABLE!" beneath the Text1.
+    /// </summary>
+    NamedIconInvulnerable = 45,
 
-        /// <summary>
-        /// All caps serif RESIST.
-        /// </summary>
-        Resist = 46,
+    /// <summary>
+    /// All caps serif RESIST.
+    /// </summary>
+    Resist = 46,
 
-        /// <summary>
-        /// Same as NamedIcon but places the given icon in the item icon outline.
-        /// </summary>
-        NamedIconWithItemOutline = 47,
+    /// <summary>
+    /// Same as NamedIcon but places the given icon in the item icon outline.
+    /// </summary>
+    NamedIconWithItemOutline = 47,
 
-        /// <summary>
-        /// AutoAttack with no Text2 (4).
-        /// </summary>
-        AutoAttackNoText4 = 48,
+    /// <summary>
+    /// AutoAttack with no Text2 (4).
+    /// </summary>
+    AutoAttackNoText4 = 48,
 
-        /// <summary>
-        /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle (3).
-        /// Does a bigger bounce effect on appearance.
-        /// </summary>
-        CriticalHit3 = 49,
+    /// <summary>
+    /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle (3).
+    /// Does a bigger bounce effect on appearance.
+    /// </summary>
+    CriticalHit3 = 49,
 
-        /// <summary>
-        /// All caps serif REFLECT.
-        /// </summary>
-        Reflect = 50,
+    /// <summary>
+    /// All caps serif REFLECT.
+    /// </summary>
+    Reflect = 50,
 
-        /// <summary>
-        /// All caps serif REFLECTED.
-        /// </summary>
-        Reflected = 51,
+    /// <summary>
+    /// All caps serif REFLECTED.
+    /// </summary>
+    Reflected = 51,
 
-        /// <summary>
-        /// Val1 in serif font, Text2 in sans-serif as subtitle (2).
-        /// Does a bounce effect on appearance.
-        /// </summary>
-        DirectHit2 = 52,
+    /// <summary>
+    /// Val1 in serif font, Text2 in sans-serif as subtitle (2).
+    /// Does a bounce effect on appearance.
+    /// </summary>
+    DirectHit2 = 52,
 
-        /// <summary>
-        /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle (4).
-        /// Does a bigger bounce effect on appearance.
-        /// </summary>
-        CriticalHit4 = 53,
+    /// <summary>
+    /// Val1 in larger serif font with exclamation, with Text2 in sans-serif as subtitle (4).
+    /// Does a bigger bounce effect on appearance.
+    /// </summary>
+    CriticalHit4 = 53,
 
-        /// <summary>
-        /// Val1 in even larger serif font with 2 exclamations, Text2 in sans-serif as subtitle (2).
-        /// Does a large bounce effect on appearance. Does not scroll up or down the screen.
-        /// </summary>
-        CriticalDirectHit2 = 54,
-    }
+    /// <summary>
+    /// Val1 in even larger serif font with 2 exclamations, Text2 in sans-serif as subtitle (2).
+    /// Does a large bounce effect on appearance. Does not scroll up or down the screen.
+    /// </summary>
+    CriticalDirectHit2 = 54,
 }
diff --git a/Dalamud/Game/Gui/GameGui.cs b/Dalamud/Game/Gui/GameGui.cs
index 3576c66a0..177c01fb9 100644
--- a/Dalamud/Game/Gui/GameGui.cs
+++ b/Dalamud/Game/Gui/GameGui.cs
@@ -14,563 +14,562 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 using ImGuiNET;
 using Serilog;
 
-namespace Dalamud.Game.Gui
+namespace Dalamud.Game.Gui;
+
+/// <summary>
+/// A class handling many aspects of the in-game UI.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed unsafe class GameGui : IDisposable, IServiceType
 {
-    /// <summary>
-    /// A class handling many aspects of the in-game UI.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed unsafe class GameGui : IDisposable, IServiceType
+    private readonly GameGuiAddressResolver address;
+
+    private readonly GetMatrixSingletonDelegate getMatrixSingleton;
+    private readonly ScreenToWorldNativeDelegate screenToWorldNative;
+
+    private readonly Hook<SetGlobalBgmDelegate> setGlobalBgmHook;
+    private readonly Hook<HandleItemHoverDelegate> handleItemHoverHook;
+    private readonly Hook<HandleItemOutDelegate> handleItemOutHook;
+    private readonly Hook<HandleActionHoverDelegate> handleActionHoverHook;
+    private readonly Hook<HandleActionOutDelegate> handleActionOutHook;
+    private readonly Hook<HandleImmDelegate> handleImmHook;
+    private readonly Hook<ToggleUiHideDelegate> toggleUiHideHook;
+    private readonly Hook<Utf8StringFromSequenceDelegate> utf8StringFromSequenceHook;
+
+    private GetUIMapObjectDelegate getUIMapObject;
+    private OpenMapWithFlagDelegate openMapWithFlag;
+
+    [ServiceManager.ServiceConstructor]
+    private GameGui(SigScanner sigScanner)
     {
-        private readonly GameGuiAddressResolver address;
+        this.address = new GameGuiAddressResolver();
+        this.address.Setup(sigScanner);
 
-        private readonly GetMatrixSingletonDelegate getMatrixSingleton;
-        private readonly ScreenToWorldNativeDelegate screenToWorldNative;
+        Log.Verbose("===== G A M E G U I =====");
+        Log.Verbose($"GameGuiManager address 0x{this.address.BaseAddress.ToInt64():X}");
+        Log.Verbose($"SetGlobalBgm address 0x{this.address.SetGlobalBgm.ToInt64():X}");
+        Log.Verbose($"HandleItemHover address 0x{this.address.HandleItemHover.ToInt64():X}");
+        Log.Verbose($"HandleItemOut address 0x{this.address.HandleItemOut.ToInt64():X}");
+        Log.Verbose($"HandleImm address 0x{this.address.HandleImm.ToInt64():X}");
 
-        private readonly Hook<SetGlobalBgmDelegate> setGlobalBgmHook;
-        private readonly Hook<HandleItemHoverDelegate> handleItemHoverHook;
-        private readonly Hook<HandleItemOutDelegate> handleItemOutHook;
-        private readonly Hook<HandleActionHoverDelegate> handleActionHoverHook;
-        private readonly Hook<HandleActionOutDelegate> handleActionOutHook;
-        private readonly Hook<HandleImmDelegate> handleImmHook;
-        private readonly Hook<ToggleUiHideDelegate> toggleUiHideHook;
-        private readonly Hook<Utf8StringFromSequenceDelegate> utf8StringFromSequenceHook;
+        this.setGlobalBgmHook = Hook<SetGlobalBgmDelegate>.FromAddress(this.address.SetGlobalBgm, this.HandleSetGlobalBgmDetour);
 
-        private GetUIMapObjectDelegate getUIMapObject;
-        private OpenMapWithFlagDelegate openMapWithFlag;
+        this.handleItemHoverHook = Hook<HandleItemHoverDelegate>.FromAddress(this.address.HandleItemHover, this.HandleItemHoverDetour);
+        this.handleItemOutHook = Hook<HandleItemOutDelegate>.FromAddress(this.address.HandleItemOut, this.HandleItemOutDetour);
 
-        [ServiceManager.ServiceConstructor]
-        private GameGui(SigScanner sigScanner)
+        this.handleActionHoverHook = Hook<HandleActionHoverDelegate>.FromAddress(this.address.HandleActionHover, this.HandleActionHoverDetour);
+        this.handleActionOutHook = Hook<HandleActionOutDelegate>.FromAddress(this.address.HandleActionOut, this.HandleActionOutDetour);
+
+        this.handleImmHook = Hook<HandleImmDelegate>.FromAddress(this.address.HandleImm, this.HandleImmDetour);
+
+        this.getMatrixSingleton = Marshal.GetDelegateForFunctionPointer<GetMatrixSingletonDelegate>(this.address.GetMatrixSingleton);
+
+        this.screenToWorldNative = Marshal.GetDelegateForFunctionPointer<ScreenToWorldNativeDelegate>(this.address.ScreenToWorld);
+
+        this.toggleUiHideHook = Hook<ToggleUiHideDelegate>.FromAddress(this.address.ToggleUiHide, this.ToggleUiHideDetour);
+
+        this.utf8StringFromSequenceHook = Hook<Utf8StringFromSequenceDelegate>.FromAddress(this.address.Utf8StringFromSequence, this.Utf8StringFromSequenceDetour);
+    }
+
+    // Marshaled delegates
+
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    private delegate IntPtr GetMatrixSingletonDelegate();
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private unsafe delegate bool ScreenToWorldNativeDelegate(float* camPos, float* clipPos, float rayDistance, float* worldPos, int* unknown);
+
+    // Hooked delegates
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate Utf8String* Utf8StringFromSequenceDelegate(Utf8String* thisPtr, byte* sourcePtr, nuint sourceLen);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr GetUIMapObjectDelegate(IntPtr uiObject);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall, CharSet = CharSet.Ansi)]
+    private delegate bool OpenMapWithFlagDelegate(IntPtr uiMapObject, string flag);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr SetGlobalBgmDelegate(ushort bgmKey, byte a2, uint a3, uint a4, uint a5, byte a6);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr HandleItemHoverDelegate(IntPtr hoverState, IntPtr a2, IntPtr a3, ulong a4);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr HandleItemOutDelegate(IntPtr hoverState, IntPtr a2, IntPtr a3, ulong a4);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate void HandleActionHoverDelegate(IntPtr hoverState, HoverActionKind a2, uint a3, int a4, byte a5);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr HandleActionOutDelegate(IntPtr agentActionDetail, IntPtr a2, IntPtr a3, int a4);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate char HandleImmDelegate(IntPtr framework, char a2, byte a3);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr ToggleUiHideDelegate(IntPtr thisPtr, byte unknownByte);
+
+    /// <summary>
+    /// Event which is fired when the game UI hiding is toggled.
+    /// </summary>
+    public event EventHandler<bool> UiHideToggled;
+
+    /// <summary>
+    /// Event that is fired when the currently hovered item changes.
+    /// </summary>
+    public event EventHandler<ulong> HoveredItemChanged;
+
+    /// <summary>
+    /// Event that is fired when the currently hovered action changes.
+    /// </summary>
+    public event EventHandler<HoveredAction> HoveredActionChanged;
+
+    /// <summary>
+    /// Gets a value indicating whether the game UI is hidden.
+    /// </summary>
+    public bool GameUiHidden { get; private set; }
+
+    /// <summary>
+    /// Gets or sets the item ID that is currently hovered by the player. 0 when no item is hovered.
+    /// If > 1.000.000, subtract 1.000.000 and treat it as HQ.
+    /// </summary>
+    public ulong HoveredItem { get; set; }
+
+    /// <summary>
+    /// Gets the action ID that is current hovered by the player. 0 when no action is hovered.
+    /// </summary>
+    public HoveredAction HoveredAction { get; } = new HoveredAction();
+
+    /// <summary>
+    /// Opens the in-game map with a flag on the location of the parameter.
+    /// </summary>
+    /// <param name="mapLink">Link to the map to be opened.</param>
+    /// <returns>True if there were no errors and it could open the map.</returns>
+    public bool OpenMapWithMapLink(MapLinkPayload mapLink)
+    {
+        var uiModule = this.GetUIModule();
+
+        if (uiModule == IntPtr.Zero)
         {
-            this.address = new GameGuiAddressResolver();
-            this.address.Setup(sigScanner);
-
-            Log.Verbose("===== G A M E G U I =====");
-            Log.Verbose($"GameGuiManager address 0x{this.address.BaseAddress.ToInt64():X}");
-            Log.Verbose($"SetGlobalBgm address 0x{this.address.SetGlobalBgm.ToInt64():X}");
-            Log.Verbose($"HandleItemHover address 0x{this.address.HandleItemHover.ToInt64():X}");
-            Log.Verbose($"HandleItemOut address 0x{this.address.HandleItemOut.ToInt64():X}");
-            Log.Verbose($"HandleImm address 0x{this.address.HandleImm.ToInt64():X}");
-
-            this.setGlobalBgmHook = Hook<SetGlobalBgmDelegate>.FromAddress(this.address.SetGlobalBgm, this.HandleSetGlobalBgmDetour);
-
-            this.handleItemHoverHook = Hook<HandleItemHoverDelegate>.FromAddress(this.address.HandleItemHover, this.HandleItemHoverDetour);
-            this.handleItemOutHook = Hook<HandleItemOutDelegate>.FromAddress(this.address.HandleItemOut, this.HandleItemOutDetour);
-
-            this.handleActionHoverHook = Hook<HandleActionHoverDelegate>.FromAddress(this.address.HandleActionHover, this.HandleActionHoverDetour);
-            this.handleActionOutHook = Hook<HandleActionOutDelegate>.FromAddress(this.address.HandleActionOut, this.HandleActionOutDetour);
-
-            this.handleImmHook = Hook<HandleImmDelegate>.FromAddress(this.address.HandleImm, this.HandleImmDetour);
-
-            this.getMatrixSingleton = Marshal.GetDelegateForFunctionPointer<GetMatrixSingletonDelegate>(this.address.GetMatrixSingleton);
-
-            this.screenToWorldNative = Marshal.GetDelegateForFunctionPointer<ScreenToWorldNativeDelegate>(this.address.ScreenToWorld);
-
-            this.toggleUiHideHook = Hook<ToggleUiHideDelegate>.FromAddress(this.address.ToggleUiHide, this.ToggleUiHideDetour);
-
-            this.utf8StringFromSequenceHook = Hook<Utf8StringFromSequenceDelegate>.FromAddress(this.address.Utf8StringFromSequence, this.Utf8StringFromSequenceDetour);
+            Log.Error("OpenMapWithMapLink: Null pointer returned from getUIObject()");
+            return false;
         }
 
-        // Marshaled delegates
+        this.getUIMapObject = this.address.GetVirtualFunction<GetUIMapObjectDelegate>(uiModule, 0, 8);
 
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        private delegate IntPtr GetMatrixSingletonDelegate();
+        var uiMapObjectPtr = this.getUIMapObject(uiModule);
 
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private unsafe delegate bool ScreenToWorldNativeDelegate(float* camPos, float* clipPos, float rayDistance, float* worldPos, int* unknown);
-
-        // Hooked delegates
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate Utf8String* Utf8StringFromSequenceDelegate(Utf8String* thisPtr, byte* sourcePtr, nuint sourceLen);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr GetUIMapObjectDelegate(IntPtr uiObject);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall, CharSet = CharSet.Ansi)]
-        private delegate bool OpenMapWithFlagDelegate(IntPtr uiMapObject, string flag);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr SetGlobalBgmDelegate(ushort bgmKey, byte a2, uint a3, uint a4, uint a5, byte a6);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr HandleItemHoverDelegate(IntPtr hoverState, IntPtr a2, IntPtr a3, ulong a4);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr HandleItemOutDelegate(IntPtr hoverState, IntPtr a2, IntPtr a3, ulong a4);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate void HandleActionHoverDelegate(IntPtr hoverState, HoverActionKind a2, uint a3, int a4, byte a5);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr HandleActionOutDelegate(IntPtr agentActionDetail, IntPtr a2, IntPtr a3, int a4);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate char HandleImmDelegate(IntPtr framework, char a2, byte a3);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr ToggleUiHideDelegate(IntPtr thisPtr, byte unknownByte);
-
-        /// <summary>
-        /// Event which is fired when the game UI hiding is toggled.
-        /// </summary>
-        public event EventHandler<bool> UiHideToggled;
-
-        /// <summary>
-        /// Event that is fired when the currently hovered item changes.
-        /// </summary>
-        public event EventHandler<ulong> HoveredItemChanged;
-
-        /// <summary>
-        /// Event that is fired when the currently hovered action changes.
-        /// </summary>
-        public event EventHandler<HoveredAction> HoveredActionChanged;
-
-        /// <summary>
-        /// Gets a value indicating whether the game UI is hidden.
-        /// </summary>
-        public bool GameUiHidden { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the item ID that is currently hovered by the player. 0 when no item is hovered.
-        /// If > 1.000.000, subtract 1.000.000 and treat it as HQ.
-        /// </summary>
-        public ulong HoveredItem { get; set; }
-
-        /// <summary>
-        /// Gets the action ID that is current hovered by the player. 0 when no action is hovered.
-        /// </summary>
-        public HoveredAction HoveredAction { get; } = new HoveredAction();
-
-        /// <summary>
-        /// Opens the in-game map with a flag on the location of the parameter.
-        /// </summary>
-        /// <param name="mapLink">Link to the map to be opened.</param>
-        /// <returns>True if there were no errors and it could open the map.</returns>
-        public bool OpenMapWithMapLink(MapLinkPayload mapLink)
+        if (uiMapObjectPtr == IntPtr.Zero)
         {
-            var uiModule = this.GetUIModule();
-
-            if (uiModule == IntPtr.Zero)
-            {
-                Log.Error("OpenMapWithMapLink: Null pointer returned from getUIObject()");
-                return false;
-            }
-
-            this.getUIMapObject = this.address.GetVirtualFunction<GetUIMapObjectDelegate>(uiModule, 0, 8);
-
-            var uiMapObjectPtr = this.getUIMapObject(uiModule);
-
-            if (uiMapObjectPtr == IntPtr.Zero)
-            {
-                Log.Error("OpenMapWithMapLink: Null pointer returned from GetUIMapObject()");
-                return false;
-            }
-
-            this.openMapWithFlag = this.address.GetVirtualFunction<OpenMapWithFlagDelegate>(uiMapObjectPtr, 0, 63);
-
-            var mapLinkString = mapLink.DataString;
-
-            Log.Debug($"OpenMapWithMapLink: Opening Map Link: {mapLinkString}");
-
-            return this.openMapWithFlag(uiMapObjectPtr, mapLinkString);
+            Log.Error("OpenMapWithMapLink: Null pointer returned from GetUIMapObject()");
+            return false;
         }
 
-        /// <summary>
-        /// Converts in-world coordinates to screen coordinates (upper left corner origin).
-        /// </summary>
-        /// <param name="worldPos">Coordinates in the world.</param>
-        /// <param name="screenPos">Converted coordinates.</param>
-        /// <returns>True if worldPos corresponds to a position in front of the camera.</returns>
-        public bool WorldToScreen(Vector3 worldPos, out Vector2 screenPos)
+        this.openMapWithFlag = this.address.GetVirtualFunction<OpenMapWithFlagDelegate>(uiMapObjectPtr, 0, 63);
+
+        var mapLinkString = mapLink.DataString;
+
+        Log.Debug($"OpenMapWithMapLink: Opening Map Link: {mapLinkString}");
+
+        return this.openMapWithFlag(uiMapObjectPtr, mapLinkString);
+    }
+
+    /// <summary>
+    /// Converts in-world coordinates to screen coordinates (upper left corner origin).
+    /// </summary>
+    /// <param name="worldPos">Coordinates in the world.</param>
+    /// <param name="screenPos">Converted coordinates.</param>
+    /// <returns>True if worldPos corresponds to a position in front of the camera.</returns>
+    public bool WorldToScreen(Vector3 worldPos, out Vector2 screenPos)
+    {
+        // Get base object with matrices
+        var matrixSingleton = this.getMatrixSingleton();
+
+        // Read current ViewProjectionMatrix plus game window size
+        var viewProjectionMatrix = default(SharpDX.Matrix);
+        float width, height;
+        var windowPos = ImGuiHelpers.MainViewport.Pos;
+
+        unsafe
         {
-            // Get base object with matrices
-            var matrixSingleton = this.getMatrixSingleton();
+            var rawMatrix = (float*)(matrixSingleton + 0x1b4).ToPointer();
 
-            // Read current ViewProjectionMatrix plus game window size
-            var viewProjectionMatrix = default(SharpDX.Matrix);
-            float width, height;
-            var windowPos = ImGuiHelpers.MainViewport.Pos;
+            for (var i = 0; i < 16; i++, rawMatrix++)
+                viewProjectionMatrix[i] = *rawMatrix;
 
-            unsafe
-            {
-                var rawMatrix = (float*)(matrixSingleton + 0x1b4).ToPointer();
-
-                for (var i = 0; i < 16; i++, rawMatrix++)
-                    viewProjectionMatrix[i] = *rawMatrix;
-
-                width = *rawMatrix;
-                height = *(rawMatrix + 1);
-            }
-
-            var worldPosDx = worldPos.ToSharpDX();
-            SharpDX.Vector3.Transform(ref worldPosDx, ref viewProjectionMatrix, out SharpDX.Vector3 pCoords);
-
-            screenPos = new Vector2(pCoords.X / pCoords.Z, pCoords.Y / pCoords.Z);
-
-            screenPos.X = (0.5f * width * (screenPos.X + 1f)) + windowPos.X;
-            screenPos.Y = (0.5f * height * (1f - screenPos.Y)) + windowPos.Y;
-
-            return pCoords.Z > 0 &&
-                   screenPos.X > windowPos.X && screenPos.X < windowPos.X + width &&
-                   screenPos.Y > windowPos.Y && screenPos.Y < windowPos.Y + height;
+            width = *rawMatrix;
+            height = *(rawMatrix + 1);
         }
 
-        /// <summary>
-        /// Converts screen coordinates to in-world coordinates via raycasting.
-        /// </summary>
-        /// <param name="screenPos">Screen coordinates.</param>
-        /// <param name="worldPos">Converted coordinates.</param>
-        /// <param name="rayDistance">How far to search for a collision.</param>
-        /// <returns>True if successful. On false, worldPos's contents are undefined.</returns>
-        public bool ScreenToWorld(Vector2 screenPos, out Vector3 worldPos, float rayDistance = 100000.0f)
+        var worldPosDx = worldPos.ToSharpDX();
+        SharpDX.Vector3.Transform(ref worldPosDx, ref viewProjectionMatrix, out SharpDX.Vector3 pCoords);
+
+        screenPos = new Vector2(pCoords.X / pCoords.Z, pCoords.Y / pCoords.Z);
+
+        screenPos.X = (0.5f * width * (screenPos.X + 1f)) + windowPos.X;
+        screenPos.Y = (0.5f * height * (1f - screenPos.Y)) + windowPos.Y;
+
+        return pCoords.Z > 0 &&
+               screenPos.X > windowPos.X && screenPos.X < windowPos.X + width &&
+               screenPos.Y > windowPos.Y && screenPos.Y < windowPos.Y + height;
+    }
+
+    /// <summary>
+    /// Converts screen coordinates to in-world coordinates via raycasting.
+    /// </summary>
+    /// <param name="screenPos">Screen coordinates.</param>
+    /// <param name="worldPos">Converted coordinates.</param>
+    /// <param name="rayDistance">How far to search for a collision.</param>
+    /// <returns>True if successful. On false, worldPos's contents are undefined.</returns>
+    public bool ScreenToWorld(Vector2 screenPos, out Vector3 worldPos, float rayDistance = 100000.0f)
+    {
+        // The game is only visible in the main viewport, so if the cursor is outside
+        // of the game window, do not bother calculating anything
+        var windowPos = ImGuiHelpers.MainViewport.Pos;
+        var windowSize = ImGuiHelpers.MainViewport.Size;
+
+        if (screenPos.X < windowPos.X || screenPos.X > windowPos.X + windowSize.X ||
+            screenPos.Y < windowPos.Y || screenPos.Y > windowPos.Y + windowSize.Y)
         {
-            // The game is only visible in the main viewport, so if the cursor is outside
-            // of the game window, do not bother calculating anything
-            var windowPos = ImGuiHelpers.MainViewport.Pos;
-            var windowSize = ImGuiHelpers.MainViewport.Size;
+            worldPos = default;
+            return false;
+        }
 
-            if (screenPos.X < windowPos.X || screenPos.X > windowPos.X + windowSize.X ||
-                screenPos.Y < windowPos.Y || screenPos.Y > windowPos.Y + windowSize.Y)
+        // Get base object with matrices
+        var matrixSingleton = this.getMatrixSingleton();
+
+        // Read current ViewProjectionMatrix plus game window size
+        var viewProjectionMatrix = default(SharpDX.Matrix);
+        float width, height;
+        unsafe
+        {
+            var rawMatrix = (float*)(matrixSingleton + 0x1b4).ToPointer();
+
+            for (var i = 0; i < 16; i++, rawMatrix++)
+                viewProjectionMatrix[i] = *rawMatrix;
+
+            width = *rawMatrix;
+            height = *(rawMatrix + 1);
+        }
+
+        viewProjectionMatrix.Invert();
+
+        var localScreenPos = new SharpDX.Vector2(screenPos.X - windowPos.X, screenPos.Y - windowPos.Y);
+        var screenPos3D = new SharpDX.Vector3
+        {
+            X = (localScreenPos.X / width * 2.0f) - 1.0f,
+            Y = -((localScreenPos.Y / height * 2.0f) - 1.0f),
+            Z = 0,
+        };
+
+        SharpDX.Vector3.TransformCoordinate(ref screenPos3D, ref viewProjectionMatrix, out var camPos);
+
+        screenPos3D.Z = 1;
+        SharpDX.Vector3.TransformCoordinate(ref screenPos3D, ref viewProjectionMatrix, out var camPosOne);
+
+        var clipPos = camPosOne - camPos;
+        clipPos.Normalize();
+
+        bool isSuccess;
+        unsafe
+        {
+            var camPosArray = camPos.ToArray();
+            var clipPosArray = clipPos.ToArray();
+
+            // This array is larger than necessary because it contains more info than we currently use
+            var worldPosArray = stackalloc float[32];
+
+            // Theory: this is some kind of flag on what type of things the ray collides with
+            var unknown = stackalloc int[3]
             {
-                worldPos = default;
-                return false;
-            }
-
-            // Get base object with matrices
-            var matrixSingleton = this.getMatrixSingleton();
-
-            // Read current ViewProjectionMatrix plus game window size
-            var viewProjectionMatrix = default(SharpDX.Matrix);
-            float width, height;
-            unsafe
-            {
-                var rawMatrix = (float*)(matrixSingleton + 0x1b4).ToPointer();
-
-                for (var i = 0; i < 16; i++, rawMatrix++)
-                    viewProjectionMatrix[i] = *rawMatrix;
-
-                width = *rawMatrix;
-                height = *(rawMatrix + 1);
-            }
-
-            viewProjectionMatrix.Invert();
-
-            var localScreenPos = new SharpDX.Vector2(screenPos.X - windowPos.X, screenPos.Y - windowPos.Y);
-            var screenPos3D = new SharpDX.Vector3
-            {
-                X = (localScreenPos.X / width * 2.0f) - 1.0f,
-                Y = -((localScreenPos.Y / height * 2.0f) - 1.0f),
-                Z = 0,
+                0x4000,
+                0x4000,
+                0x0,
             };
 
-            SharpDX.Vector3.TransformCoordinate(ref screenPos3D, ref viewProjectionMatrix, out var camPos);
-
-            screenPos3D.Z = 1;
-            SharpDX.Vector3.TransformCoordinate(ref screenPos3D, ref viewProjectionMatrix, out var camPosOne);
-
-            var clipPos = camPosOne - camPos;
-            clipPos.Normalize();
-
-            bool isSuccess;
-            unsafe
+            fixed (float* pCamPos = camPosArray)
             {
-                var camPosArray = camPos.ToArray();
-                var clipPosArray = clipPos.ToArray();
-
-                // This array is larger than necessary because it contains more info than we currently use
-                var worldPosArray = stackalloc float[32];
-
-                // Theory: this is some kind of flag on what type of things the ray collides with
-                var unknown = stackalloc int[3]
+                fixed (float* pClipPos = clipPosArray)
                 {
-                    0x4000,
-                    0x4000,
-                    0x0,
-                };
-
-                fixed (float* pCamPos = camPosArray)
-                {
-                    fixed (float* pClipPos = clipPosArray)
-                    {
-                        isSuccess = this.screenToWorldNative(pCamPos, pClipPos, rayDistance, worldPosArray, unknown);
-                    }
+                    isSuccess = this.screenToWorldNative(pCamPos, pClipPos, rayDistance, worldPosArray, unknown);
                 }
-
-                worldPos = new Vector3
-                {
-                    X = worldPosArray[0],
-                    Y = worldPosArray[1],
-                    Z = worldPosArray[2],
-                };
             }
 
-            return isSuccess;
-        }
-
-        /// <summary>
-        /// Gets a pointer to the game's UI module.
-        /// </summary>
-        /// <returns>IntPtr pointing to UI module.</returns>
-        public unsafe IntPtr GetUIModule()
-        {
-            var framework = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance();
-            if (framework == null)
-                return IntPtr.Zero;
-
-            var uiModule = framework->GetUiModule();
-            if (uiModule == null)
-                return IntPtr.Zero;
-
-            return (IntPtr)uiModule;
-        }
-
-        /// <summary>
-        /// Gets the pointer to the Addon with the given name and index.
-        /// </summary>
-        /// <param name="name">Name of addon to find.</param>
-        /// <param name="index">Index of addon to find (1-indexed).</param>
-        /// <returns>IntPtr.Zero if unable to find UI, otherwise IntPtr pointing to the start of the addon.</returns>
-        public unsafe IntPtr GetAddonByName(string name, int index)
-        {
-            var atkStage = FFXIVClientStructs.FFXIV.Component.GUI.AtkStage.GetSingleton();
-            if (atkStage == null)
-                return IntPtr.Zero;
-
-            var unitMgr = atkStage->RaptureAtkUnitManager;
-            if (unitMgr == null)
-                return IntPtr.Zero;
-
-            var addon = unitMgr->GetAddonByName(name, index);
-            if (addon == null)
-                return IntPtr.Zero;
-
-            return (IntPtr)addon;
-        }
-
-        /// <summary>
-        /// Find the agent associated with an addon, if possible.
-        /// </summary>
-        /// <param name="addonName">The addon name.</param>
-        /// <returns>A pointer to the agent interface.</returns>
-        public IntPtr FindAgentInterface(string addonName)
-        {
-            var addon = this.GetAddonByName(addonName, 1);
-            return this.FindAgentInterface(addon);
-        }
-
-        /// <summary>
-        /// Find the agent associated with an addon, if possible.
-        /// </summary>
-        /// <param name="addon">The addon address.</param>
-        /// <returns>A pointer to the agent interface.</returns>
-        public unsafe IntPtr FindAgentInterface(void* addon) => this.FindAgentInterface((IntPtr)addon);
-
-        /// <summary>
-        /// Find the agent associated with an addon, if possible.
-        /// </summary>
-        /// <param name="addonPtr">The addon address.</param>
-        /// <returns>A pointer to the agent interface.</returns>
-        public unsafe IntPtr FindAgentInterface(IntPtr addonPtr)
-        {
-            if (addonPtr == IntPtr.Zero)
-                return IntPtr.Zero;
-
-            var uiModule = (UIModule*)this.GetUIModule();
-            if (uiModule == null)
-                return IntPtr.Zero;
-
-            var agentModule = uiModule->GetAgentModule();
-            if (agentModule == null)
-                return IntPtr.Zero;
-
-            var addon = (AtkUnitBase*)addonPtr;
-            var addonId = addon->ParentID == 0 ? addon->ID : addon->ParentID;
-
-            if (addonId == 0)
-                return IntPtr.Zero;
-
-            var index = 0;
-            while (true)
+            worldPos = new Vector3
             {
-                var agent = agentModule->GetAgentByInternalID((uint)index++);
-                if (agent == uiModule || agent == null)
-                    break;
+                X = worldPosArray[0],
+                Y = worldPosArray[1],
+                Z = worldPosArray[2],
+            };
+        }
 
-                if (agent->AddonId == addonId)
-                    return new IntPtr(agent);
-            }
+        return isSuccess;
+    }
 
+    /// <summary>
+    /// Gets a pointer to the game's UI module.
+    /// </summary>
+    /// <returns>IntPtr pointing to UI module.</returns>
+    public unsafe IntPtr GetUIModule()
+    {
+        var framework = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance();
+        if (framework == null)
             return IntPtr.Zero;
+
+        var uiModule = framework->GetUiModule();
+        if (uiModule == null)
+            return IntPtr.Zero;
+
+        return (IntPtr)uiModule;
+    }
+
+    /// <summary>
+    /// Gets the pointer to the Addon with the given name and index.
+    /// </summary>
+    /// <param name="name">Name of addon to find.</param>
+    /// <param name="index">Index of addon to find (1-indexed).</param>
+    /// <returns>IntPtr.Zero if unable to find UI, otherwise IntPtr pointing to the start of the addon.</returns>
+    public unsafe IntPtr GetAddonByName(string name, int index)
+    {
+        var atkStage = FFXIVClientStructs.FFXIV.Component.GUI.AtkStage.GetSingleton();
+        if (atkStage == null)
+            return IntPtr.Zero;
+
+        var unitMgr = atkStage->RaptureAtkUnitManager;
+        if (unitMgr == null)
+            return IntPtr.Zero;
+
+        var addon = unitMgr->GetAddonByName(name, index);
+        if (addon == null)
+            return IntPtr.Zero;
+
+        return (IntPtr)addon;
+    }
+
+    /// <summary>
+    /// Find the agent associated with an addon, if possible.
+    /// </summary>
+    /// <param name="addonName">The addon name.</param>
+    /// <returns>A pointer to the agent interface.</returns>
+    public IntPtr FindAgentInterface(string addonName)
+    {
+        var addon = this.GetAddonByName(addonName, 1);
+        return this.FindAgentInterface(addon);
+    }
+
+    /// <summary>
+    /// Find the agent associated with an addon, if possible.
+    /// </summary>
+    /// <param name="addon">The addon address.</param>
+    /// <returns>A pointer to the agent interface.</returns>
+    public unsafe IntPtr FindAgentInterface(void* addon) => this.FindAgentInterface((IntPtr)addon);
+
+    /// <summary>
+    /// Find the agent associated with an addon, if possible.
+    /// </summary>
+    /// <param name="addonPtr">The addon address.</param>
+    /// <returns>A pointer to the agent interface.</returns>
+    public unsafe IntPtr FindAgentInterface(IntPtr addonPtr)
+    {
+        if (addonPtr == IntPtr.Zero)
+            return IntPtr.Zero;
+
+        var uiModule = (UIModule*)this.GetUIModule();
+        if (uiModule == null)
+            return IntPtr.Zero;
+
+        var agentModule = uiModule->GetAgentModule();
+        if (agentModule == null)
+            return IntPtr.Zero;
+
+        var addon = (AtkUnitBase*)addonPtr;
+        var addonId = addon->ParentID == 0 ? addon->ID : addon->ParentID;
+
+        if (addonId == 0)
+            return IntPtr.Zero;
+
+        var index = 0;
+        while (true)
+        {
+            var agent = agentModule->GetAgentByInternalID((uint)index++);
+            if (agent == uiModule || agent == null)
+                break;
+
+            if (agent->AddonId == addonId)
+                return new IntPtr(agent);
         }
 
-        /// <summary>
-        /// Disables the hooks and submodules of this module.
-        /// </summary>
-        void IDisposable.Dispose()
+        return IntPtr.Zero;
+    }
+
+    /// <summary>
+    /// Disables the hooks and submodules of this module.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.setGlobalBgmHook.Dispose();
+        this.handleItemHoverHook.Dispose();
+        this.handleItemOutHook.Dispose();
+        this.handleImmHook.Dispose();
+        this.toggleUiHideHook.Dispose();
+        this.handleActionHoverHook.Dispose();
+        this.handleActionOutHook.Dispose();
+        this.utf8StringFromSequenceHook.Dispose();
+    }
+
+    /// <summary>
+    /// Set the current background music.
+    /// </summary>
+    /// <param name="bgmKey">The background music key.</param>
+    public void SetBgm(ushort bgmKey) => this.setGlobalBgmHook.Original(bgmKey, 0, 0, 0, 0, 0);
+
+    /// <summary>
+    /// Reset the stored "UI hide" state.
+    /// </summary>
+    internal void ResetUiHideState()
+    {
+        this.GameUiHidden = false;
+    }
+
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction()
+    {
+        this.setGlobalBgmHook.Enable();
+        this.handleItemHoverHook.Enable();
+        this.handleItemOutHook.Enable();
+        this.handleImmHook.Enable();
+        this.toggleUiHideHook.Enable();
+        this.handleActionHoverHook.Enable();
+        this.handleActionOutHook.Enable();
+        this.utf8StringFromSequenceHook.Enable();
+    }
+
+    private IntPtr HandleSetGlobalBgmDetour(ushort bgmKey, byte a2, uint a3, uint a4, uint a5, byte a6)
+    {
+        var retVal = this.setGlobalBgmHook.Original(bgmKey, a2, a3, a4, a5, a6);
+
+        Log.Verbose("SetGlobalBgm: {0} {1} {2} {3} {4} {5} -> {6}", bgmKey, a2, a3, a4, a5, a6, retVal);
+
+        return retVal;
+    }
+
+    private IntPtr HandleItemHoverDetour(IntPtr hoverState, IntPtr a2, IntPtr a3, ulong a4)
+    {
+        var retVal = this.handleItemHoverHook.Original(hoverState, a2, a3, a4);
+
+        if (retVal.ToInt64() == 22)
         {
-            this.setGlobalBgmHook.Dispose();
-            this.handleItemHoverHook.Dispose();
-            this.handleItemOutHook.Dispose();
-            this.handleImmHook.Dispose();
-            this.toggleUiHideHook.Dispose();
-            this.handleActionHoverHook.Dispose();
-            this.handleActionOutHook.Dispose();
-            this.utf8StringFromSequenceHook.Dispose();
+            var itemId = (ulong)Marshal.ReadInt32(hoverState, 0x138);
+            this.HoveredItem = itemId;
+
+            this.HoveredItemChanged?.InvokeSafely(this, itemId);
+
+            Log.Verbose("HoverItemId:{0} this:{1}", itemId, hoverState.ToInt64().ToString("X"));
         }
 
-        /// <summary>
-        /// Set the current background music.
-        /// </summary>
-        /// <param name="bgmKey">The background music key.</param>
-        public void SetBgm(ushort bgmKey) => this.setGlobalBgmHook.Original(bgmKey, 0, 0, 0, 0, 0);
+        return retVal;
+    }
 
-        /// <summary>
-        /// Reset the stored "UI hide" state.
-        /// </summary>
-        internal void ResetUiHideState()
+    private IntPtr HandleItemOutDetour(IntPtr hoverState, IntPtr a2, IntPtr a3, ulong a4)
+    {
+        var retVal = this.handleItemOutHook.Original(hoverState, a2, a3, a4);
+
+        if (a3 != IntPtr.Zero && a4 == 1)
         {
-            this.GameUiHidden = false;
-        }
+            var a3Val = Marshal.ReadByte(a3, 0x8);
 
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction()
-        {
-            this.setGlobalBgmHook.Enable();
-            this.handleItemHoverHook.Enable();
-            this.handleItemOutHook.Enable();
-            this.handleImmHook.Enable();
-            this.toggleUiHideHook.Enable();
-            this.handleActionHoverHook.Enable();
-            this.handleActionOutHook.Enable();
-            this.utf8StringFromSequenceHook.Enable();
-        }
-
-        private IntPtr HandleSetGlobalBgmDetour(ushort bgmKey, byte a2, uint a3, uint a4, uint a5, byte a6)
-        {
-            var retVal = this.setGlobalBgmHook.Original(bgmKey, a2, a3, a4, a5, a6);
-
-            Log.Verbose("SetGlobalBgm: {0} {1} {2} {3} {4} {5} -> {6}", bgmKey, a2, a3, a4, a5, a6, retVal);
-
-            return retVal;
-        }
-
-        private IntPtr HandleItemHoverDetour(IntPtr hoverState, IntPtr a2, IntPtr a3, ulong a4)
-        {
-            var retVal = this.handleItemHoverHook.Original(hoverState, a2, a3, a4);
-
-            if (retVal.ToInt64() == 22)
+            if (a3Val == 255)
             {
-                var itemId = (ulong)Marshal.ReadInt32(hoverState, 0x138);
-                this.HoveredItem = itemId;
+                this.HoveredItem = 0ul;
 
-                this.HoveredItemChanged?.InvokeSafely(this, itemId);
-
-                Log.Verbose("HoverItemId:{0} this:{1}", itemId, hoverState.ToInt64().ToString("X"));
-            }
-
-            return retVal;
-        }
-
-        private IntPtr HandleItemOutDetour(IntPtr hoverState, IntPtr a2, IntPtr a3, ulong a4)
-        {
-            var retVal = this.handleItemOutHook.Original(hoverState, a2, a3, a4);
-
-            if (a3 != IntPtr.Zero && a4 == 1)
-            {
-                var a3Val = Marshal.ReadByte(a3, 0x8);
-
-                if (a3Val == 255)
+                try
                 {
-                    this.HoveredItem = 0ul;
-
-                    try
-                    {
-                        this.HoveredItemChanged?.Invoke(this, 0ul);
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Error(e, "Could not dispatch HoveredItemChanged event.");
-                    }
-
-                    Log.Verbose("HoverItemId: 0");
+                    this.HoveredItemChanged?.Invoke(this, 0ul);
                 }
-            }
-
-            return retVal;
-        }
-
-        private void HandleActionHoverDetour(IntPtr hoverState, HoverActionKind actionKind, uint actionId, int a4, byte a5)
-        {
-            this.handleActionHoverHook.Original(hoverState, actionKind, actionId, a4, a5);
-            this.HoveredAction.ActionKind = actionKind;
-            this.HoveredAction.BaseActionID = actionId;
-            this.HoveredAction.ActionID = (uint)Marshal.ReadInt32(hoverState, 0x3C);
-            this.HoveredActionChanged?.InvokeSafely(this, this.HoveredAction);
-
-            Log.Verbose("HoverActionId: {0}/{1} this:{2}", actionKind, actionId, hoverState.ToInt64().ToString("X"));
-        }
-
-        private IntPtr HandleActionOutDetour(IntPtr agentActionDetail, IntPtr a2, IntPtr a3, int a4)
-        {
-            var retVal = this.handleActionOutHook.Original(agentActionDetail, a2, a3, a4);
-
-            if (a3 != IntPtr.Zero && a4 == 1)
-            {
-                var a3Val = Marshal.ReadByte(a3, 0x8);
-
-                if (a3Val == 255)
+                catch (Exception e)
                 {
-                    this.HoveredAction.ActionKind = HoverActionKind.None;
-                    this.HoveredAction.BaseActionID = 0;
-                    this.HoveredAction.ActionID = 0;
-
-                    try
-                    {
-                        this.HoveredActionChanged?.Invoke(this, this.HoveredAction);
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Error(e, "Could not dispatch HoveredActionChanged event.");
-                    }
-
-                    Log.Verbose("HoverActionId: 0");
+                    Log.Error(e, "Could not dispatch HoveredItemChanged event.");
                 }
+
+                Log.Verbose("HoverItemId: 0");
             }
-
-            return retVal;
         }
 
-        private IntPtr ToggleUiHideDetour(IntPtr thisPtr, byte unknownByte)
+        return retVal;
+    }
+
+    private void HandleActionHoverDetour(IntPtr hoverState, HoverActionKind actionKind, uint actionId, int a4, byte a5)
+    {
+        this.handleActionHoverHook.Original(hoverState, actionKind, actionId, a4, a5);
+        this.HoveredAction.ActionKind = actionKind;
+        this.HoveredAction.BaseActionID = actionId;
+        this.HoveredAction.ActionID = (uint)Marshal.ReadInt32(hoverState, 0x3C);
+        this.HoveredActionChanged?.InvokeSafely(this, this.HoveredAction);
+
+        Log.Verbose("HoverActionId: {0}/{1} this:{2}", actionKind, actionId, hoverState.ToInt64().ToString("X"));
+    }
+
+    private IntPtr HandleActionOutDetour(IntPtr agentActionDetail, IntPtr a2, IntPtr a3, int a4)
+    {
+        var retVal = this.handleActionOutHook.Original(agentActionDetail, a2, a3, a4);
+
+        if (a3 != IntPtr.Zero && a4 == 1)
         {
-            // TODO(goat): We should read this from memory directly, instead of relying on catching every toggle.
-            this.GameUiHidden = !this.GameUiHidden;
+            var a3Val = Marshal.ReadByte(a3, 0x8);
 
-            this.UiHideToggled?.InvokeSafely(this, this.GameUiHidden);
+            if (a3Val == 255)
+            {
+                this.HoveredAction.ActionKind = HoverActionKind.None;
+                this.HoveredAction.BaseActionID = 0;
+                this.HoveredAction.ActionID = 0;
 
-            Log.Debug("UiHide toggled: {0}", this.GameUiHidden);
+                try
+                {
+                    this.HoveredActionChanged?.Invoke(this, this.HoveredAction);
+                }
+                catch (Exception e)
+                {
+                    Log.Error(e, "Could not dispatch HoveredActionChanged event.");
+                }
 
-            return this.toggleUiHideHook.Original(thisPtr, unknownByte);
+                Log.Verbose("HoverActionId: 0");
+            }
         }
 
-        private char HandleImmDetour(IntPtr framework, char a2, byte a3)
-        {
-            var result = this.handleImmHook.Original(framework, a2, a3);
-            return ImGui.GetIO().WantTextInput
-                ? (char)0
-                : result;
-        }
+        return retVal;
+    }
 
-        private Utf8String* Utf8StringFromSequenceDetour(Utf8String* thisPtr, byte* sourcePtr, nuint sourceLen)
-        {
-            if (sourcePtr != null)
-                this.utf8StringFromSequenceHook.Original(thisPtr, sourcePtr, sourceLen);
-            else
-                thisPtr->Ctor(); // this is in clientstructs but you could do it manually too
+    private IntPtr ToggleUiHideDetour(IntPtr thisPtr, byte unknownByte)
+    {
+        // TODO(goat): We should read this from memory directly, instead of relying on catching every toggle.
+        this.GameUiHidden = !this.GameUiHidden;
 
-            return thisPtr; // this function shouldn't need to return but the original asm moves this into rax before returning so be safe?
-        }
+        this.UiHideToggled?.InvokeSafely(this, this.GameUiHidden);
+
+        Log.Debug("UiHide toggled: {0}", this.GameUiHidden);
+
+        return this.toggleUiHideHook.Original(thisPtr, unknownByte);
+    }
+
+    private char HandleImmDetour(IntPtr framework, char a2, byte a3)
+    {
+        var result = this.handleImmHook.Original(framework, a2, a3);
+        return ImGui.GetIO().WantTextInput
+                   ? (char)0
+                   : result;
+    }
+
+    private Utf8String* Utf8StringFromSequenceDetour(Utf8String* thisPtr, byte* sourcePtr, nuint sourceLen)
+    {
+        if (sourcePtr != null)
+            this.utf8StringFromSequenceHook.Original(thisPtr, sourcePtr, sourceLen);
+        else
+            thisPtr->Ctor(); // this is in clientstructs but you could do it manually too
+
+        return thisPtr; // this function shouldn't need to return but the original asm moves this into rax before returning so be safe?
     }
 }
diff --git a/Dalamud/Game/Gui/GameGuiAddressResolver.cs b/Dalamud/Game/Gui/GameGuiAddressResolver.cs
index ae36fe31b..fda4acb99 100644
--- a/Dalamud/Game/Gui/GameGuiAddressResolver.cs
+++ b/Dalamud/Game/Gui/GameGuiAddressResolver.cs
@@ -1,80 +1,79 @@
 using System;
 
-namespace Dalamud.Game.Gui
+namespace Dalamud.Game.Gui;
+
+/// <summary>
+/// The address resolver for the <see cref="GameGui"/> class.
+/// </summary>
+internal sealed class GameGuiAddressResolver : BaseAddressResolver
 {
     /// <summary>
-    /// The address resolver for the <see cref="GameGui"/> class.
+    /// Gets the base address of the native GuiManager class.
     /// </summary>
-    internal sealed class GameGuiAddressResolver : BaseAddressResolver
+    public IntPtr BaseAddress { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native SetGlobalBgm method.
+    /// </summary>
+    public IntPtr SetGlobalBgm { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native HandleItemHover method.
+    /// </summary>
+    public IntPtr HandleItemHover { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native HandleItemOut method.
+    /// </summary>
+    public IntPtr HandleItemOut { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native HandleActionHover method.
+    /// </summary>
+    public IntPtr HandleActionHover { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native HandleActionOut method.
+    /// </summary>
+    public IntPtr HandleActionOut { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native HandleImm method.
+    /// </summary>
+    public IntPtr HandleImm { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native GetMatrixSingleton method.
+    /// </summary>
+    public IntPtr GetMatrixSingleton { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native ScreenToWorld method.
+    /// </summary>
+    public IntPtr ScreenToWorld { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native ToggleUiHide method.
+    /// </summary>
+    public IntPtr ToggleUiHide { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native Utf8StringFromSequence method.
+    /// </summary>
+    public IntPtr Utf8StringFromSequence { get; private set; }
+
+    /// <inheritdoc/>
+    protected override void Setup64Bit(SigScanner sig)
     {
-        /// <summary>
-        /// Gets the base address of the native GuiManager class.
-        /// </summary>
-        public IntPtr BaseAddress { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native SetGlobalBgm method.
-        /// </summary>
-        public IntPtr SetGlobalBgm { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native HandleItemHover method.
-        /// </summary>
-        public IntPtr HandleItemHover { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native HandleItemOut method.
-        /// </summary>
-        public IntPtr HandleItemOut { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native HandleActionHover method.
-        /// </summary>
-        public IntPtr HandleActionHover { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native HandleActionOut method.
-        /// </summary>
-        public IntPtr HandleActionOut { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native HandleImm method.
-        /// </summary>
-        public IntPtr HandleImm { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native GetMatrixSingleton method.
-        /// </summary>
-        public IntPtr GetMatrixSingleton { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native ScreenToWorld method.
-        /// </summary>
-        public IntPtr ScreenToWorld { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native ToggleUiHide method.
-        /// </summary>
-        public IntPtr ToggleUiHide { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native Utf8StringFromSequence method.
-        /// </summary>
-        public IntPtr Utf8StringFromSequence { get; private set; }
-
-        /// <inheritdoc/>
-        protected override void Setup64Bit(SigScanner sig)
-        {
-            this.SetGlobalBgm = sig.ScanText("4C 8B 15 ?? ?? ?? ?? 4D 85 D2 74 58");
-            this.HandleItemHover = sig.ScanText("E8 ?? ?? ?? ?? 48 8B 5C 24 ?? 48 89 AE ?? ?? ?? ??");
-            this.HandleItemOut = sig.ScanText("48 89 5C 24 ?? 57 48 83 EC 20 48 8B FA 48 8B D9 4D");
-            this.HandleActionHover = sig.ScanText("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 83 F8 0F");
-            this.HandleActionOut = sig.ScanText("48 89 5C 24 ?? 57 48 83 EC 20 48 8B DA 48 8B F9 4D 85 C0 74 1F");
-            this.HandleImm = sig.ScanText("E8 ?? ?? ?? ?? 84 C0 75 10 48 83 FF 09");
-            this.GetMatrixSingleton = sig.ScanText("E8 ?? ?? ?? ?? 48 8D 4C 24 ?? 48 89 4c 24 ?? 4C 8D 4D ?? 4C 8D 44 24 ??");
-            this.ScreenToWorld = sig.ScanText("48 83 EC 48 48 8B 05 ?? ?? ?? ?? 4D 8B D1");
-            this.ToggleUiHide = sig.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 0F B6 B9 ?? ?? ?? ?? B8 ?? ?? ?? ??");
-            this.Utf8StringFromSequence = sig.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8D 41 22 66 C7 41 ?? ?? ?? 48 89 01 49 8B D8");
-        }
+        this.SetGlobalBgm = sig.ScanText("4C 8B 15 ?? ?? ?? ?? 4D 85 D2 74 58");
+        this.HandleItemHover = sig.ScanText("E8 ?? ?? ?? ?? 48 8B 5C 24 ?? 48 89 AE ?? ?? ?? ??");
+        this.HandleItemOut = sig.ScanText("48 89 5C 24 ?? 57 48 83 EC 20 48 8B FA 48 8B D9 4D");
+        this.HandleActionHover = sig.ScanText("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 83 F8 0F");
+        this.HandleActionOut = sig.ScanText("48 89 5C 24 ?? 57 48 83 EC 20 48 8B DA 48 8B F9 4D 85 C0 74 1F");
+        this.HandleImm = sig.ScanText("E8 ?? ?? ?? ?? 84 C0 75 10 48 83 FF 09");
+        this.GetMatrixSingleton = sig.ScanText("E8 ?? ?? ?? ?? 48 8D 4C 24 ?? 48 89 4c 24 ?? 4C 8D 4D ?? 4C 8D 44 24 ??");
+        this.ScreenToWorld = sig.ScanText("48 83 EC 48 48 8B 05 ?? ?? ?? ?? 4D 8B D1");
+        this.ToggleUiHide = sig.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 0F B6 B9 ?? ?? ?? ?? B8 ?? ?? ?? ??");
+        this.Utf8StringFromSequence = sig.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8D 41 22 66 C7 41 ?? ?? ?? 48 89 01 49 8B D8");
     }
 }
diff --git a/Dalamud/Game/Gui/HoverActionKind.cs b/Dalamud/Game/Gui/HoverActionKind.cs
index 217ea18fb..90ff9d46c 100644
--- a/Dalamud/Game/Gui/HoverActionKind.cs
+++ b/Dalamud/Game/Gui/HoverActionKind.cs
@@ -1,49 +1,48 @@
-namespace Dalamud.Game.Gui
+namespace Dalamud.Game.Gui;
+
+/// <summary>
+/// ActionKinds used in AgentActionDetail.
+/// These describe the possible kinds of actions being hovered.
+/// </summary>
+public enum HoverActionKind
 {
     /// <summary>
-    /// ActionKinds used in AgentActionDetail.
-    /// These describe the possible kinds of actions being hovered.
+    /// No action is hovered.
     /// </summary>
-    public enum HoverActionKind
-    {
-        /// <summary>
-        /// No action is hovered.
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// A regular action is hovered.
-        /// </summary>
-        Action = 21,
+    /// <summary>
+    /// A regular action is hovered.
+    /// </summary>
+    Action = 21,
 
-        /// <summary>
-        /// A general action is hovered.
-        /// </summary>
-        GeneralAction = 23,
+    /// <summary>
+    /// A general action is hovered.
+    /// </summary>
+    GeneralAction = 23,
 
-        /// <summary>
-        /// A companion order type of action is hovered.
-        /// </summary>
-        CompanionOrder = 24,
+    /// <summary>
+    /// A companion order type of action is hovered.
+    /// </summary>
+    CompanionOrder = 24,
 
-        /// <summary>
-        /// A main command type of action is hovered.
-        /// </summary>
-        MainCommand = 25,
+    /// <summary>
+    /// A main command type of action is hovered.
+    /// </summary>
+    MainCommand = 25,
 
-        /// <summary>
-        /// An extras command type of action is hovered.
-        /// </summary>
-        ExtraCommand = 26,
+    /// <summary>
+    /// An extras command type of action is hovered.
+    /// </summary>
+    ExtraCommand = 26,
 
-        /// <summary>
-        /// A pet order type of action is hovered.
-        /// </summary>
-        PetOrder = 28,
+    /// <summary>
+    /// A pet order type of action is hovered.
+    /// </summary>
+    PetOrder = 28,
 
-        /// <summary>
-        /// A trait is hovered.
-        /// </summary>
-        Trait = 29,
-    }
+    /// <summary>
+    /// A trait is hovered.
+    /// </summary>
+    Trait = 29,
 }
diff --git a/Dalamud/Game/Gui/HoveredAction.cs b/Dalamud/Game/Gui/HoveredAction.cs
index 1a7336610..dcfab5b00 100644
--- a/Dalamud/Game/Gui/HoveredAction.cs
+++ b/Dalamud/Game/Gui/HoveredAction.cs
@@ -1,23 +1,22 @@
-namespace Dalamud.Game.Gui
+namespace Dalamud.Game.Gui;
+
+/// <summary>
+/// This class represents the hotbar action currently hovered over by the cursor.
+/// </summary>
+public class HoveredAction
 {
     /// <summary>
-    /// This class represents the hotbar action currently hovered over by the cursor.
+    /// Gets or sets the base action ID.
     /// </summary>
-    public class HoveredAction
-    {
-        /// <summary>
-        /// Gets or sets the base action ID.
-        /// </summary>
-        public uint BaseActionID { get; set; } = 0;
+    public uint BaseActionID { get; set; } = 0;
 
-        /// <summary>
-        /// Gets or sets the action ID accounting for automatic upgrades.
-        /// </summary>
-        public uint ActionID { get; set; } = 0;
+    /// <summary>
+    /// Gets or sets the action ID accounting for automatic upgrades.
+    /// </summary>
+    public uint ActionID { get; set; } = 0;
 
-        /// <summary>
-        /// Gets or sets the type of action.
-        /// </summary>
-        public HoverActionKind ActionKind { get; set; } = HoverActionKind.None;
-    }
+    /// <summary>
+    /// Gets or sets the type of action.
+    /// </summary>
+    public HoverActionKind ActionKind { get; set; } = HoverActionKind.None;
 }
diff --git a/Dalamud/Game/Gui/Internal/DalamudIME.cs b/Dalamud/Game/Gui/Internal/DalamudIME.cs
index 4304bb791..37c072806 100644
--- a/Dalamud/Game/Gui/Internal/DalamudIME.cs
+++ b/Dalamud/Game/Gui/Internal/DalamudIME.cs
@@ -14,261 +14,261 @@ using PInvoke;
 
 using static Dalamud.NativeFunctions;
 
-namespace Dalamud.Game.Gui.Internal
+namespace Dalamud.Game.Gui.Internal;
+
+/// <summary>
+/// This class handles IME for non-English users.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal unsafe class DalamudIME : IDisposable, IServiceType
 {
-    /// <summary>
-    /// This class handles IME for non-English users.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal unsafe class DalamudIME : IDisposable, IServiceType
+    private static readonly ModuleLog Log = new("IME");
+
+    private AsmHook imguiTextInputCursorHook;
+    private Vector2* cursorPos;
+
+    [ServiceManager.ServiceConstructor]
+    private DalamudIME()
     {
-        private static readonly ModuleLog Log = new("IME");
+    }
 
-        private AsmHook imguiTextInputCursorHook;
-        private Vector2* cursorPos;
+    /// <summary>
+    /// Gets a value indicating whether the module is enabled.
+    /// </summary>
+    internal bool IsEnabled { get; private set; }
 
-        [ServiceManager.ServiceConstructor]
-        private DalamudIME()
+    /// <summary>
+    /// Gets the index of the first imm candidate in relation to the full list.
+    /// </summary>
+    internal CandidateList ImmCandNative { get; private set; } = default;
+
+    /// <summary>
+    /// Gets the imm candidates.
+    /// </summary>
+    internal List<string> ImmCand { get; private set; } = new();
+
+    /// <summary>
+    /// Gets the selected imm component.
+    /// </summary>
+    internal string ImmComp { get; private set; } = string.Empty;
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        this.imguiTextInputCursorHook?.Dispose();
+        Marshal.FreeHGlobal((IntPtr)this.cursorPos);
+    }
+
+    /// <summary>
+    /// Processes window messages.
+    /// </summary>
+    /// <param name="hWnd">Handle of the window.</param>
+    /// <param name="msg">Type of window message.</param>
+    /// <param name="wParamPtr">wParam or the pointer to it.</param>
+    /// <param name="lParamPtr">lParam or the pointer to it.</param>
+    /// <returns>Return value, if not doing further processing.</returns>
+    public unsafe IntPtr? ProcessWndProcW(IntPtr hWnd, User32.WindowMessage msg, void* wParamPtr, void* lParamPtr)
+    {
+        try
         {
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the module is enabled.
-        /// </summary>
-        internal bool IsEnabled { get; private set; }
-
-        /// <summary>
-        /// Gets the index of the first imm candidate in relation to the full list.
-        /// </summary>
-        internal CandidateList ImmCandNative { get; private set; } = default;
-
-        /// <summary>
-        /// Gets the imm candidates.
-        /// </summary>
-        internal List<string> ImmCand { get; private set; } = new();
-
-        /// <summary>
-        /// Gets the selected imm component.
-        /// </summary>
-        internal string ImmComp { get; private set; } = string.Empty;
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            this.imguiTextInputCursorHook?.Dispose();
-            Marshal.FreeHGlobal((IntPtr)this.cursorPos);
-        }
-
-        /// <summary>
-        /// Processes window messages.
-        /// </summary>
-        /// <param name="hWnd">Handle of the window.</param>
-        /// <param name="msg">Type of window message.</param>
-        /// <param name="wParamPtr">wParam or the pointer to it.</param>
-        /// <param name="lParamPtr">lParam or the pointer to it.</param>
-        /// <returns>Return value, if not doing further processing.</returns>
-        public unsafe IntPtr? ProcessWndProcW(IntPtr hWnd, User32.WindowMessage msg, void* wParamPtr, void* lParamPtr)
-        {
-            try
+            if (ImGui.GetCurrentContext() != IntPtr.Zero && ImGui.GetIO().WantTextInput)
             {
-                if (ImGui.GetCurrentContext() != IntPtr.Zero && ImGui.GetIO().WantTextInput)
+                var io = ImGui.GetIO();
+                var wmsg = (WindowsMessage)msg;
+                long wParam = (long)wParamPtr, lParam = (long)lParamPtr;
+                try
                 {
-                    var io = ImGui.GetIO();
-                    var wmsg = (WindowsMessage)msg;
-                    long wParam = (long)wParamPtr, lParam = (long)lParamPtr;
-                    try
-                    {
-                        wParam = Marshal.ReadInt32((IntPtr)wParamPtr);
-                    }
-                    catch
-                    {
-                        // ignored
-                    }
+                    wParam = Marshal.ReadInt32((IntPtr)wParamPtr);
+                }
+                catch
+                {
+                    // ignored
+                }
 
-                    try
-                    {
-                        lParam = Marshal.ReadInt32((IntPtr)lParamPtr);
-                    }
-                    catch
-                    {
-                        // ignored
-                    }
+                try
+                {
+                    lParam = Marshal.ReadInt32((IntPtr)lParamPtr);
+                }
+                catch
+                {
+                    // ignored
+                }
 
-                    switch (wmsg)
-                    {
-                        case WindowsMessage.WM_IME_NOTIFY:
-                            switch ((IMECommand)(IntPtr)wParam)
-                            {
-                                case IMECommand.ChangeCandidate:
-                                    this.ToggleWindow(true);
-                                    this.LoadCand(hWnd);
-                                    break;
-                                case IMECommand.OpenCandidate:
-                                    this.ToggleWindow(true);
-                                    this.ImmCandNative = default;
-                                    // this.ImmCand.Clear();
-                                    break;
-
-                                case IMECommand.CloseCandidate:
-                                    this.ToggleWindow(false);
-                                    this.ImmCandNative = default;
-                                    // this.ImmCand.Clear();
-                                    break;
-
-                                default:
-                                    break;
-                            }
-
-                            break;
-                        case WindowsMessage.WM_IME_COMPOSITION:
-                            if (((long)(IMEComposition.CompStr | IMEComposition.CompAttr | IMEComposition.CompClause |
-                                IMEComposition.CompReadAttr | IMEComposition.CompReadClause | IMEComposition.CompReadStr) & (long)(IntPtr)lParam) > 0)
-                            {
-                                var hIMC = ImmGetContext(hWnd);
-                                if (hIMC == IntPtr.Zero)
-                                    return IntPtr.Zero;
-
-                                var dwSize = ImmGetCompositionStringW(hIMC, IMEComposition.CompStr, IntPtr.Zero, 0);
-                                var unmanagedPointer = Marshal.AllocHGlobal((int)dwSize);
-                                ImmGetCompositionStringW(hIMC, IMEComposition.CompStr, unmanagedPointer, (uint)dwSize);
-
-                                var bytes = new byte[dwSize];
-                                Marshal.Copy(unmanagedPointer, bytes, 0, (int)dwSize);
-                                Marshal.FreeHGlobal(unmanagedPointer);
-
-                                var lpstr = Encoding.Unicode.GetString(bytes);
-                                this.ImmComp = lpstr;
-                                if (lpstr == string.Empty)
-                                {
-                                    this.ToggleWindow(false);
-                                }
-                                else
-                                {
-                                    this.LoadCand(hWnd);
-                                }
-                            }
-
-                            if (((long)(IntPtr)lParam & (long)IMEComposition.ResultStr) > 0)
-                            {
-                                var hIMC = ImmGetContext(hWnd);
-                                if (hIMC == IntPtr.Zero)
-                                    return IntPtr.Zero;
-
-                                var dwSize = ImmGetCompositionStringW(hIMC, IMEComposition.ResultStr, IntPtr.Zero, 0);
-                                var unmanagedPointer = Marshal.AllocHGlobal((int)dwSize);
-                                ImmGetCompositionStringW(hIMC, IMEComposition.ResultStr, unmanagedPointer, (uint)dwSize);
-
-                                var bytes = new byte[dwSize];
-                                Marshal.Copy(unmanagedPointer, bytes, 0, (int)dwSize);
-                                Marshal.FreeHGlobal(unmanagedPointer);
-
-                                var lpstr = Encoding.Unicode.GetString(bytes);
-                                io.AddInputCharactersUTF8(lpstr);
-
-                                this.ImmComp = string.Empty;
+                switch (wmsg)
+                {
+                    case WindowsMessage.WM_IME_NOTIFY:
+                        switch ((IMECommand)(IntPtr)wParam)
+                        {
+                            case IMECommand.ChangeCandidate:
+                                this.ToggleWindow(true);
+                                this.LoadCand(hWnd);
+                                break;
+                            case IMECommand.OpenCandidate:
+                                this.ToggleWindow(true);
                                 this.ImmCandNative = default;
-                                this.ImmCand.Clear();
+                                // this.ImmCand.Clear();
+                                break;
+
+                            case IMECommand.CloseCandidate:
+                                this.ToggleWindow(false);
+                                this.ImmCandNative = default;
+                                // this.ImmCand.Clear();
+                                break;
+
+                            default:
+                                break;
+                        }
+
+                        break;
+                    case WindowsMessage.WM_IME_COMPOSITION:
+                        if (((long)(IMEComposition.CompStr | IMEComposition.CompAttr | IMEComposition.CompClause |
+                                    IMEComposition.CompReadAttr | IMEComposition.CompReadClause | IMEComposition.CompReadStr) & (long)(IntPtr)lParam) > 0)
+                        {
+                            var hIMC = ImmGetContext(hWnd);
+                            if (hIMC == IntPtr.Zero)
+                                return IntPtr.Zero;
+
+                            var dwSize = ImmGetCompositionStringW(hIMC, IMEComposition.CompStr, IntPtr.Zero, 0);
+                            var unmanagedPointer = Marshal.AllocHGlobal((int)dwSize);
+                            ImmGetCompositionStringW(hIMC, IMEComposition.CompStr, unmanagedPointer, (uint)dwSize);
+
+                            var bytes = new byte[dwSize];
+                            Marshal.Copy(unmanagedPointer, bytes, 0, (int)dwSize);
+                            Marshal.FreeHGlobal(unmanagedPointer);
+
+                            var lpstr = Encoding.Unicode.GetString(bytes);
+                            this.ImmComp = lpstr;
+                            if (lpstr == string.Empty)
+                            {
                                 this.ToggleWindow(false);
                             }
+                            else
+                            {
+                                this.LoadCand(hWnd);
+                            }
+                        }
 
-                            break;
+                        if (((long)(IntPtr)lParam & (long)IMEComposition.ResultStr) > 0)
+                        {
+                            var hIMC = ImmGetContext(hWnd);
+                            if (hIMC == IntPtr.Zero)
+                                return IntPtr.Zero;
 
-                        default:
-                            break;
-                    }
+                            var dwSize = ImmGetCompositionStringW(hIMC, IMEComposition.ResultStr, IntPtr.Zero, 0);
+                            var unmanagedPointer = Marshal.AllocHGlobal((int)dwSize);
+                            ImmGetCompositionStringW(hIMC, IMEComposition.ResultStr, unmanagedPointer, (uint)dwSize);
+
+                            var bytes = new byte[dwSize];
+                            Marshal.Copy(unmanagedPointer, bytes, 0, (int)dwSize);
+                            Marshal.FreeHGlobal(unmanagedPointer);
+
+                            var lpstr = Encoding.Unicode.GetString(bytes);
+                            io.AddInputCharactersUTF8(lpstr);
+
+                            this.ImmComp = string.Empty;
+                            this.ImmCandNative = default;
+                            this.ImmCand.Clear();
+                            this.ToggleWindow(false);
+                        }
+
+                        break;
+
+                    default:
+                        break;
                 }
             }
-            catch (Exception ex)
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Prevented a crash in an IME hook");
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Get the position of the cursor.
+    /// </summary>
+    /// <returns>The position of the cursor.</returns>
+    internal Vector2 GetCursorPos()
+    {
+        return new Vector2(this.cursorPos->X, this.cursorPos->Y);
+    }
+
+    private unsafe void LoadCand(IntPtr hWnd)
+    {
+        if (hWnd == IntPtr.Zero)
+            return;
+
+        var hImc = ImmGetContext(hWnd);
+        if (hImc == IntPtr.Zero)
+            return;
+
+        var size = ImmGetCandidateListW(hImc, 0, IntPtr.Zero, 0);
+        if (size == 0)
+            return;
+
+        var candlistPtr = Marshal.AllocHGlobal((int)size);
+        size = ImmGetCandidateListW(hImc, 0, candlistPtr, (uint)size);
+
+        var candlist = this.ImmCandNative = Marshal.PtrToStructure<CandidateList>(candlistPtr);
+        var pageSize = candlist.PageSize;
+        var candCount = candlist.Count;
+
+        if (pageSize > 0 && candCount > 1)
+        {
+            var dwOffsets = new int[candCount];
+            for (var i = 0; i < candCount; i++)
             {
-                Log.Error(ex, "Prevented a crash in an IME hook");
+                dwOffsets[i] = Marshal.ReadInt32(candlistPtr + ((i + 6) * sizeof(int)));
             }
 
-            return null;
-        }
+            var pageStart = candlist.PageStart;
 
-        /// <summary>
-        /// Get the position of the cursor.
-        /// </summary>
-        /// <returns>The position of the cursor.</returns>
-        internal Vector2 GetCursorPos()
-        {
-            return new Vector2(this.cursorPos->X, this.cursorPos->Y);
-        }
+            var cand = new string[pageSize];
+            this.ImmCand.Clear();
 
-        private unsafe void LoadCand(IntPtr hWnd)
-        {
-            if (hWnd == IntPtr.Zero)
-                return;
-
-            var hImc = ImmGetContext(hWnd);
-            if (hImc == IntPtr.Zero)
-                return;
-
-            var size = ImmGetCandidateListW(hImc, 0, IntPtr.Zero, 0);
-            if (size == 0)
-                return;
-
-            var candlistPtr = Marshal.AllocHGlobal((int)size);
-            size = ImmGetCandidateListW(hImc, 0, candlistPtr, (uint)size);
-
-            var candlist = this.ImmCandNative = Marshal.PtrToStructure<CandidateList>(candlistPtr);
-            var pageSize = candlist.PageSize;
-            var candCount = candlist.Count;
-
-            if (pageSize > 0 && candCount > 1)
+            for (var i = 0; i < pageSize; i++)
             {
-                var dwOffsets = new int[candCount];
-                for (var i = 0; i < candCount; i++)
+                var offStart = dwOffsets[i + pageStart];
+                var offEnd = i + pageStart + 1 < candCount ? dwOffsets[i + pageStart + 1] : size;
+
+                var pStrStart = candlistPtr + (int)offStart;
+                var pStrEnd = candlistPtr + (int)offEnd;
+
+                var len = (int)(pStrEnd.ToInt64() - pStrStart.ToInt64());
+                if (len > 0)
                 {
-                    dwOffsets[i] = Marshal.ReadInt32(candlistPtr + ((i + 6) * sizeof(int)));
+                    var candBytes = new byte[len];
+                    Marshal.Copy(pStrStart, candBytes, 0, len);
+
+                    var candStr = Encoding.Unicode.GetString(candBytes);
+                    cand[i] = candStr;
+
+                    this.ImmCand.Add(candStr);
                 }
-
-                var pageStart = candlist.PageStart;
-
-                var cand = new string[pageSize];
-                this.ImmCand.Clear();
-
-                for (var i = 0; i < pageSize; i++)
-                {
-                    var offStart = dwOffsets[i + pageStart];
-                    var offEnd = i + pageStart + 1 < candCount ? dwOffsets[i + pageStart + 1] : size;
-
-                    var pStrStart = candlistPtr + (int)offStart;
-                    var pStrEnd = candlistPtr + (int)offEnd;
-
-                    var len = (int)(pStrEnd.ToInt64() - pStrStart.ToInt64());
-                    if (len > 0)
-                    {
-                        var candBytes = new byte[len];
-                        Marshal.Copy(pStrStart, candBytes, 0, len);
-
-                        var candStr = Encoding.Unicode.GetString(candBytes);
-                        cand[i] = candStr;
-
-                        this.ImmCand.Add(candStr);
-                    }
-                }
-
-                Marshal.FreeHGlobal(candlistPtr);
             }
+
+            Marshal.FreeHGlobal(candlistPtr);
         }
+    }
 
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction(InterfaceManager.InterfaceManagerWithScene interfaceManagerWithScene)
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction(InterfaceManager.InterfaceManagerWithScene interfaceManagerWithScene)
+    {
+        try
         {
-            try
+            var module = Process.GetCurrentProcess().Modules.Cast<ProcessModule>().First(m => m.ModuleName == "cimgui.dll");
+            var scanner = new SigScanner(module);
+            var cursorDrawingPtr = scanner.ScanModule("F3 0F 11 75 ?? 0F 28 CF");
+            Log.Debug($"Found cursorDrawingPtr at {cursorDrawingPtr:X}");
+
+            this.cursorPos = (Vector2*)Marshal.AllocHGlobal(sizeof(Vector2));
+            this.cursorPos->X = 0f;
+            this.cursorPos->Y = 0f;
+
+            var asm = new[]
             {
-                var module = Process.GetCurrentProcess().Modules.Cast<ProcessModule>().First(m => m.ModuleName == "cimgui.dll");
-                var scanner = new SigScanner(module);
-                var cursorDrawingPtr = scanner.ScanModule("F3 0F 11 75 ?? 0F 28 CF");
-                Log.Debug($"Found cursorDrawingPtr at {cursorDrawingPtr:X}");
-
-                this.cursorPos = (Vector2*)Marshal.AllocHGlobal(sizeof(Vector2));
-                this.cursorPos->X = 0f;
-                this.cursorPos->Y = 0f;
-
-                var asm = new[]
-                {
                 "use64",
                 $"push rax",
                 $"mov rax, {(IntPtr)this.cursorPos + sizeof(float)}",
@@ -276,27 +276,26 @@ namespace Dalamud.Game.Gui.Internal
                 $"mov rax, {(IntPtr)this.cursorPos}",
                 $"movss [rax],xmm6",
                 $"pop rax",
-                };
+            };
 
-                Log.Debug($"Asm Code:\n{string.Join("\n", asm)}");
-                this.imguiTextInputCursorHook = new AsmHook(cursorDrawingPtr, asm, "ImguiTextInputCursorHook");
-                this.imguiTextInputCursorHook?.Enable();
+            Log.Debug($"Asm Code:\n{string.Join("\n", asm)}");
+            this.imguiTextInputCursorHook = new AsmHook(cursorDrawingPtr, asm, "ImguiTextInputCursorHook");
+            this.imguiTextInputCursorHook?.Enable();
 
-                this.IsEnabled = true;
-                Log.Information("Enabled!");
-            }
-            catch (Exception ex)
-            {
-                Log.Information(ex, "Enable failed");
-            }
+            this.IsEnabled = true;
+            Log.Information("Enabled!");
         }
-
-        private void ToggleWindow(bool visible)
+        catch (Exception ex)
         {
-            if (visible)
-                Service<DalamudInterface>.GetNullable()?.OpenImeWindow();
-            else
-                Service<DalamudInterface>.GetNullable()?.CloseImeWindow();
+            Log.Information(ex, "Enable failed");
         }
     }
+
+    private void ToggleWindow(bool visible)
+    {
+        if (visible)
+            Service<DalamudInterface>.GetNullable()?.OpenImeWindow();
+        else
+            Service<DalamudInterface>.GetNullable()?.CloseImeWindow();
+    }
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacket.cs b/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacket.cs
index 9f8834ecd..a7ab12e4b 100644
--- a/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacket.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacket.cs
@@ -1,28 +1,27 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Dalamud.Game.Gui.PartyFinder.Internal
+namespace Dalamud.Game.Gui.PartyFinder.Internal;
+
+/// <summary>
+/// The structure of the PartyFinder packet.
+/// </summary>
+[SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "Sequential struct marshaling.")]
+[SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:Elements should be ordered by access", Justification = "Sequential struct marshaling.")]
+[SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Document the field usage.")]
+[StructLayout(LayoutKind.Sequential)]
+internal readonly struct PartyFinderPacket
 {
     /// <summary>
-    /// The structure of the PartyFinder packet.
+    /// Gets the size of this packet.
     /// </summary>
-    [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "Sequential struct marshaling.")]
-    [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:Elements should be ordered by access", Justification = "Sequential struct marshaling.")]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Document the field usage.")]
-    [StructLayout(LayoutKind.Sequential)]
-    internal readonly struct PartyFinderPacket
-    {
-        /// <summary>
-        /// Gets the size of this packet.
-        /// </summary>
-        internal static int PacketSize { get; } = Marshal.SizeOf<PartyFinderPacket>();
+    internal static int PacketSize { get; } = Marshal.SizeOf<PartyFinderPacket>();
 
-        internal readonly int BatchNumber;
+    internal readonly int BatchNumber;
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-        private readonly byte[] padding1;
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+    private readonly byte[] padding1;
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-        internal readonly PartyFinderPacketListing[] Listings;
-    }
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+    internal readonly PartyFinderPacketListing[] Listings;
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacketListing.cs b/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacketListing.cs
index 7e8f1e1ef..53d2831ef 100644
--- a/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacketListing.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacketListing.cs
@@ -2,98 +2,97 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Runtime.InteropServices;
 
-namespace Dalamud.Game.Gui.PartyFinder.Internal
+namespace Dalamud.Game.Gui.PartyFinder.Internal;
+
+/// <summary>
+/// The structure of an individual listing within a packet.
+/// </summary>
+[SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:Elements should be ordered by access", Justification = "Sequential struct marshaling.")]
+[SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Document the field usage.")]
+[StructLayout(LayoutKind.Sequential)]
+internal readonly struct PartyFinderPacketListing
 {
-    /// <summary>
-    /// The structure of an individual listing within a packet.
-    /// </summary>
-    [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1202:Elements should be ordered by access", Justification = "Sequential struct marshaling.")]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Document the field usage.")]
-    [StructLayout(LayoutKind.Sequential)]
-    internal readonly struct PartyFinderPacketListing
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+    private readonly byte[] header1;
+    internal readonly uint Id;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+    private readonly byte[] header2;
+
+    internal readonly uint ContentIdLower;
+    private readonly ushort unknownShort1;
+    private readonly ushort unknownShort2;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+    private readonly byte[] header3;
+
+    internal readonly byte Category;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+    private readonly byte[] header4;
+
+    internal readonly ushort Duty;
+    internal readonly byte DutyType;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+    private readonly byte[] header5;
+
+    internal readonly ushort World;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+    private readonly byte[] header6;
+
+    internal readonly byte Objective;
+    internal readonly byte BeginnersWelcome;
+    internal readonly byte Conditions;
+    internal readonly byte DutyFinderSettings;
+    internal readonly byte LootRules;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+    private readonly byte[] header7; // all zero in every pf I've examined
+
+    internal readonly uint LastPatchHotfixTimestamp; // last time the servers were restarted?
+    internal readonly ushort SecondsRemaining;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+    private readonly byte[] header8; // 00 00 01 00 00 00 in every pf I've examined
+
+    internal readonly ushort MinimumItemLevel;
+    internal readonly ushort HomeWorld;
+    internal readonly ushort CurrentWorld;
+
+    private readonly byte header9;
+
+    internal readonly byte NumSlots;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+    private readonly byte[] header10;
+
+    internal readonly byte SearchArea;
+
+    private readonly byte header11;
+
+    internal readonly byte NumParties;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+    private readonly byte[] header12; // 00 00 00 always. maybe numParties is a u32?
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+    internal readonly uint[] Slots;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+    internal readonly byte[] JobsPresent;
+
+    // Note that ByValTStr will not work here because the strings are UTF-8 and there's only a CharSet for UTF-16 in C#.
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+    internal readonly byte[] Name;
+
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 192)]
+    internal readonly byte[] Description;
+
+    internal bool IsNull()
     {
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-        private readonly byte[] header1;
-        internal readonly uint Id;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-        private readonly byte[] header2;
-
-        internal readonly uint ContentIdLower;
-        private readonly ushort unknownShort1;
-        private readonly ushort unknownShort2;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-        private readonly byte[] header3;
-
-        internal readonly byte Category;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-        private readonly byte[] header4;
-
-        internal readonly ushort Duty;
-        internal readonly byte DutyType;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-        private readonly byte[] header5;
-
-        internal readonly ushort World;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-        private readonly byte[] header6;
-
-        internal readonly byte Objective;
-        internal readonly byte BeginnersWelcome;
-        internal readonly byte Conditions;
-        internal readonly byte DutyFinderSettings;
-        internal readonly byte LootRules;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-        private readonly byte[] header7; // all zero in every pf I've examined
-
-        internal readonly uint LastPatchHotfixTimestamp; // last time the servers were restarted?
-        internal readonly ushort SecondsRemaining;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-        private readonly byte[] header8; // 00 00 01 00 00 00 in every pf I've examined
-
-        internal readonly ushort MinimumItemLevel;
-        internal readonly ushort HomeWorld;
-        internal readonly ushort CurrentWorld;
-
-        private readonly byte header9;
-
-        internal readonly byte NumSlots;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-        private readonly byte[] header10;
-
-        internal readonly byte SearchArea;
-
-        private readonly byte header11;
-
-        internal readonly byte NumParties;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-        private readonly byte[] header12; // 00 00 00 always. maybe numParties is a u32?
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-        internal readonly uint[] Slots;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-        internal readonly byte[] JobsPresent;
-
-        // Note that ByValTStr will not work here because the strings are UTF-8 and there's only a CharSet for UTF-16 in C#.
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-        internal readonly byte[] Name;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 192)]
-        internal readonly byte[] Description;
-
-        internal bool IsNull()
-        {
-            // a valid party finder must have at least one slot set
-            return this.Slots.All(slot => slot == 0);
-        }
+        // a valid party finder must have at least one slot set
+        return this.Slots.All(slot => slot == 0);
     }
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/PartyFinderAddressResolver.cs b/Dalamud/Game/Gui/PartyFinder/PartyFinderAddressResolver.cs
index 75da83180..aa9d28cb1 100644
--- a/Dalamud/Game/Gui/PartyFinder/PartyFinderAddressResolver.cs
+++ b/Dalamud/Game/Gui/PartyFinder/PartyFinderAddressResolver.cs
@@ -1,21 +1,20 @@
 using System;
 
-namespace Dalamud.Game.Gui.PartyFinder
+namespace Dalamud.Game.Gui.PartyFinder;
+
+/// <summary>
+/// The address resolver for the <see cref="PartyFinderGui"/> class.
+/// </summary>
+public class PartyFinderAddressResolver : BaseAddressResolver
 {
     /// <summary>
-    /// The address resolver for the <see cref="PartyFinderGui"/> class.
+    /// Gets the address of the native ReceiveListing method.
     /// </summary>
-    public class PartyFinderAddressResolver : BaseAddressResolver
-    {
-        /// <summary>
-        /// Gets the address of the native ReceiveListing method.
-        /// </summary>
-        public IntPtr ReceiveListing { get; private set; }
+    public IntPtr ReceiveListing { get; private set; }
 
-        /// <inheritdoc/>
-        protected override void Setup64Bit(SigScanner sig)
-        {
-            this.ReceiveListing = sig.ScanText("40 53 41 57 48 83 EC 28 48 8B D9");
-        }
+    /// <inheritdoc/>
+    protected override void Setup64Bit(SigScanner sig)
+    {
+        this.ReceiveListing = sig.ScanText("40 53 41 57 48 83 EC 28 48 8B D9");
     }
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs b/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs
index c6a7dad04..6427f2a54 100644
--- a/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs
+++ b/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs
@@ -8,134 +8,133 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.Gui.PartyFinder
+namespace Dalamud.Game.Gui.PartyFinder;
+
+/// <summary>
+/// This class handles interacting with the native PartyFinder window.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed class PartyFinderGui : IDisposable, IServiceType
 {
+    private readonly PartyFinderAddressResolver address;
+    private readonly IntPtr memory;
+
+    private readonly Hook<ReceiveListingDelegate> receiveListingHook;
+
     /// <summary>
-    /// This class handles interacting with the native PartyFinder window.
+    /// Initializes a new instance of the <see cref="PartyFinderGui"/> class.
     /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed class PartyFinderGui : IDisposable, IServiceType
+    /// <param name="sigScanner">Sig scanner to use.</param>
+    [ServiceManager.ServiceConstructor]
+    private PartyFinderGui(SigScanner sigScanner)
     {
-        private readonly PartyFinderAddressResolver address;
-        private readonly IntPtr memory;
+        this.address = new PartyFinderAddressResolver();
+        this.address.Setup(sigScanner);
 
-        private readonly Hook<ReceiveListingDelegate> receiveListingHook;
+        this.memory = Marshal.AllocHGlobal(PartyFinderPacket.PacketSize);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PartyFinderGui"/> class.
-        /// </summary>
-        /// <param name="sigScanner">Sig scanner to use.</param>
-        [ServiceManager.ServiceConstructor]
-        private PartyFinderGui(SigScanner sigScanner)
+        this.receiveListingHook = Hook<ReceiveListingDelegate>.FromAddress(this.address.ReceiveListing, new ReceiveListingDelegate(this.HandleReceiveListingDetour));
+    }
+
+    /// <summary>
+    /// Event type fired each time the game receives an individual Party Finder listing.
+    /// Cannot modify listings but can hide them.
+    /// </summary>
+    /// <param name="listing">The listings received.</param>
+    /// <param name="args">Additional arguments passed by the game.</param>
+    public delegate void PartyFinderListingEventDelegate(PartyFinderListing listing, PartyFinderListingEventArgs args);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate void ReceiveListingDelegate(IntPtr managerPtr, IntPtr data);
+
+    /// <summary>
+    /// Event fired each time the game receives an individual Party Finder listing.
+    /// Cannot modify listings but can hide them.
+    /// </summary>
+    public event PartyFinderListingEventDelegate ReceiveListing;
+
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.receiveListingHook.Dispose();
+
+        try
         {
-            this.address = new PartyFinderAddressResolver();
-            this.address.Setup(sigScanner);
+            Marshal.FreeHGlobal(this.memory);
+        }
+        catch (BadImageFormatException)
+        {
+            Log.Warning("Could not free PartyFinderGui memory.");
+        }
+    }
 
-            this.memory = Marshal.AllocHGlobal(PartyFinderPacket.PacketSize);
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction(GameGui gameGui)
+    {
+        this.receiveListingHook.Enable();
+    }
 
-            this.receiveListingHook = Hook<ReceiveListingDelegate>.FromAddress(this.address.ReceiveListing, new ReceiveListingDelegate(this.HandleReceiveListingDetour));
+    private void HandleReceiveListingDetour(IntPtr managerPtr, IntPtr data)
+    {
+        try
+        {
+            this.HandleListingEvents(data);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Exception on ReceiveListing hook.");
         }
 
-        /// <summary>
-        /// Event type fired each time the game receives an individual Party Finder listing.
-        /// Cannot modify listings but can hide them.
-        /// </summary>
-        /// <param name="listing">The listings received.</param>
-        /// <param name="args">Additional arguments passed by the game.</param>
-        public delegate void PartyFinderListingEventDelegate(PartyFinderListing listing, PartyFinderListingEventArgs args);
+        this.receiveListingHook.Original(managerPtr, data);
+    }
 
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate void ReceiveListingDelegate(IntPtr managerPtr, IntPtr data);
+    private void HandleListingEvents(IntPtr data)
+    {
+        var dataPtr = data + 0x10;
 
-        /// <summary>
-        /// Event fired each time the game receives an individual Party Finder listing.
-        /// Cannot modify listings but can hide them.
-        /// </summary>
-        public event PartyFinderListingEventDelegate ReceiveListing;
+        var packet = Marshal.PtrToStructure<PartyFinderPacket>(dataPtr);
 
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        void IDisposable.Dispose()
+        // rewriting is an expensive operation, so only do it if necessary
+        var needToRewrite = false;
+
+        for (var i = 0; i < packet.Listings.Length; i++)
         {
-            this.receiveListingHook.Dispose();
+            // these are empty slots that are not shown to the player
+            if (packet.Listings[i].IsNull())
+            {
+                continue;
+            }
 
-            try
+            var listing = new PartyFinderListing(packet.Listings[i]);
+            var args = new PartyFinderListingEventArgs(packet.BatchNumber);
+            this.ReceiveListing?.Invoke(listing, args);
+
+            if (args.Visible)
             {
-                Marshal.FreeHGlobal(this.memory);
-            }
-            catch (BadImageFormatException)
-            {
-                Log.Warning("Could not free PartyFinderGui memory.");
+                continue;
             }
+
+            // hide the listing from the player by setting it to a null listing
+            packet.Listings[i] = default;
+            needToRewrite = true;
         }
 
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction(GameGui gameGui)
+        if (!needToRewrite)
         {
-            this.receiveListingHook.Enable();
+            return;
         }
 
-        private void HandleReceiveListingDetour(IntPtr managerPtr, IntPtr data)
+        // write our struct into the memory (doing this directly crashes the game)
+        Marshal.StructureToPtr(packet, this.memory, false);
+
+        // copy our new memory over the game's
+        unsafe
         {
-            try
-            {
-                this.HandleListingEvents(data);
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Exception on ReceiveListing hook.");
-            }
-
-            this.receiveListingHook.Original(managerPtr, data);
-        }
-
-        private void HandleListingEvents(IntPtr data)
-        {
-            var dataPtr = data + 0x10;
-
-            var packet = Marshal.PtrToStructure<PartyFinderPacket>(dataPtr);
-
-            // rewriting is an expensive operation, so only do it if necessary
-            var needToRewrite = false;
-
-            for (var i = 0; i < packet.Listings.Length; i++)
-            {
-                // these are empty slots that are not shown to the player
-                if (packet.Listings[i].IsNull())
-                {
-                    continue;
-                }
-
-                var listing = new PartyFinderListing(packet.Listings[i]);
-                var args = new PartyFinderListingEventArgs(packet.BatchNumber);
-                this.ReceiveListing?.Invoke(listing, args);
-
-                if (args.Visible)
-                {
-                    continue;
-                }
-
-                // hide the listing from the player by setting it to a null listing
-                packet.Listings[i] = default;
-                needToRewrite = true;
-            }
-
-            if (!needToRewrite)
-            {
-                return;
-            }
-
-            // write our struct into the memory (doing this directly crashes the game)
-            Marshal.StructureToPtr(packet, this.memory, false);
-
-            // copy our new memory over the game's
-            unsafe
-            {
-                Buffer.MemoryCopy((void*)this.memory, (void*)dataPtr, PartyFinderPacket.PacketSize, PartyFinderPacket.PacketSize);
-            }
+            Buffer.MemoryCopy((void*)this.memory, (void*)dataPtr, PartyFinderPacket.PacketSize, PartyFinderPacket.PacketSize);
         }
     }
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs
index 50f59426e..d9be66856 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs
@@ -1,32 +1,31 @@
 using System;
 
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// Condition flags for the <see cref="PartyFinderGui"/> class.
+/// </summary>
+[Flags]
+public enum ConditionFlags : uint
 {
     /// <summary>
-    /// Condition flags for the <see cref="PartyFinderGui"/> class.
+    /// No duty condition.
     /// </summary>
-    [Flags]
-    public enum ConditionFlags : uint
-    {
-        /// <summary>
-        /// No duty condition.
-        /// </summary>
-        None = 1 << 0,
+    None = 1 << 0,
 
-        /// <summary>
-        /// The duty complete condition.
-        /// </summary>
-        DutyComplete = 1 << 1,
+    /// <summary>
+    /// The duty complete condition.
+    /// </summary>
+    DutyComplete = 1 << 1,
 
-        /// <summary>
-        /// The duty complete (weekly reward unclaimed) condition. This condition is
-        /// only available for savage fights prior to echo release.
-        /// </summary>
-        DutyCompleteWeeklyRewardUnclaimed = 1 << 3,
+    /// <summary>
+    /// The duty complete (weekly reward unclaimed) condition. This condition is
+    /// only available for savage fights prior to echo release.
+    /// </summary>
+    DutyCompleteWeeklyRewardUnclaimed = 1 << 3,
 
-        /// <summary>
-        /// The duty incomplete condition.
-        /// </summary>
-        DutyIncomplete = 1 << 2,
-    }
+    /// <summary>
+    /// The duty incomplete condition.
+    /// </summary>
+    DutyIncomplete = 1 << 2,
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs
index 920325d64..c4a05704d 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs
@@ -1,48 +1,47 @@
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// Category flags for the <see cref="PartyFinderGui"/> class.
+/// </summary>
+public enum DutyCategory
 {
     /// <summary>
-    /// Category flags for the <see cref="PartyFinderGui"/> class.
+    /// The duty category.
     /// </summary>
-    public enum DutyCategory
-    {
-        /// <summary>
-        /// The duty category.
-        /// </summary>
-        Duty = 0,
+    Duty = 0,
 
-        /// <summary>
-        /// The quest battle category.
-        /// </summary>
-        QuestBattles = 1 << 0,
+    /// <summary>
+    /// The quest battle category.
+    /// </summary>
+    QuestBattles = 1 << 0,
 
-        /// <summary>
-        /// The fate category.
-        /// </summary>
-        Fates = 1 << 1,
+    /// <summary>
+    /// The fate category.
+    /// </summary>
+    Fates = 1 << 1,
 
-        /// <summary>
-        /// The treasure hunt category.
-        /// </summary>
-        TreasureHunt = 1 << 2,
+    /// <summary>
+    /// The treasure hunt category.
+    /// </summary>
+    TreasureHunt = 1 << 2,
 
-        /// <summary>
-        /// The hunt category.
-        /// </summary>
-        TheHunt = 1 << 3,
+    /// <summary>
+    /// The hunt category.
+    /// </summary>
+    TheHunt = 1 << 3,
 
-        /// <summary>
-        /// The gathering forays category.
-        /// </summary>
-        GatheringForays = 1 << 4,
+    /// <summary>
+    /// The gathering forays category.
+    /// </summary>
+    GatheringForays = 1 << 4,
 
-        /// <summary>
-        /// The deep dungeons category.
-        /// </summary>
-        DeepDungeons = 1 << 5,
+    /// <summary>
+    /// The deep dungeons category.
+    /// </summary>
+    DeepDungeons = 1 << 5,
 
-        /// <summary>
-        /// The adventuring forays category.
-        /// </summary>
-        AdventuringForays = 1 << 6,
-    }
+    /// <summary>
+    /// The adventuring forays category.
+    /// </summary>
+    AdventuringForays = 1 << 6,
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs
index 03335dbaf..e3ab56ed3 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs
@@ -1,31 +1,30 @@
 using System;
 
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// Duty finder settings flags for the <see cref="PartyFinderGui"/> class.
+/// </summary>
+[Flags]
+public enum DutyFinderSettingsFlags : uint
 {
     /// <summary>
-    /// Duty finder settings flags for the <see cref="PartyFinderGui"/> class.
+    /// No duty finder settings.
     /// </summary>
-    [Flags]
-    public enum DutyFinderSettingsFlags : uint
-    {
-        /// <summary>
-        /// No duty finder settings.
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// The undersized party setting.
-        /// </summary>
-        UndersizedParty = 1 << 0,
+    /// <summary>
+    /// The undersized party setting.
+    /// </summary>
+    UndersizedParty = 1 << 0,
 
-        /// <summary>
-        /// The minimum item level setting.
-        /// </summary>
-        MinimumItemLevel = 1 << 1,
+    /// <summary>
+    /// The minimum item level setting.
+    /// </summary>
+    MinimumItemLevel = 1 << 1,
 
-        /// <summary>
-        /// The silence echo setting.
-        /// </summary>
-        SilenceEcho = 1 << 2,
-    }
+    /// <summary>
+    /// The silence echo setting.
+    /// </summary>
+    SilenceEcho = 1 << 2,
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs
index 589d0b91b..41b4c5da3 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs
@@ -1,23 +1,22 @@
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// Duty type flags for the <see cref="PartyFinderGui"/> class.
+/// </summary>
+public enum DutyType
 {
     /// <summary>
-    /// Duty type flags for the <see cref="PartyFinderGui"/> class.
+    /// No duty type.
     /// </summary>
-    public enum DutyType
-    {
-        /// <summary>
-        /// No duty type.
-        /// </summary>
-        Other = 0,
+    Other = 0,
 
-        /// <summary>
-        /// The roulette duty type.
-        /// </summary>
-        Roulette = 1 << 0,
+    /// <summary>
+    /// The roulette duty type.
+    /// </summary>
+    Roulette = 1 << 0,
 
-        /// <summary>
-        /// The normal duty type.
-        /// </summary>
-        Normal = 1 << 1,
-    }
+    /// <summary>
+    /// The normal duty type.
+    /// </summary>
+    Normal = 1 << 1,
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/JobFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/JobFlags.cs
index b79e374d9..9d6c8820c 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/JobFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/JobFlags.cs
@@ -1,156 +1,155 @@
 using System;
 
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// Job flags for the <see cref="PartyFinder"/> class.
+/// </summary>
+[Flags]
+public enum JobFlags
 {
     /// <summary>
-    /// Job flags for the <see cref="PartyFinder"/> class.
+    /// Gladiator (GLD).
     /// </summary>
-    [Flags]
-    public enum JobFlags
-    {
-        /// <summary>
-        /// Gladiator (GLD).
-        /// </summary>
-        Gladiator = 1 << 1,
+    Gladiator = 1 << 1,
 
-        /// <summary>
-        /// Pugilist (PGL).
-        /// </summary>
-        Pugilist = 1 << 2,
+    /// <summary>
+    /// Pugilist (PGL).
+    /// </summary>
+    Pugilist = 1 << 2,
 
-        /// <summary>
-        /// Marauder (MRD).
-        /// </summary>
-        Marauder = 1 << 3,
+    /// <summary>
+    /// Marauder (MRD).
+    /// </summary>
+    Marauder = 1 << 3,
 
-        /// <summary>
-        /// Lancer (LNC).
-        /// </summary>
-        Lancer = 1 << 4,
+    /// <summary>
+    /// Lancer (LNC).
+    /// </summary>
+    Lancer = 1 << 4,
 
-        /// <summary>
-        /// Archer (ARC).
-        /// </summary>
-        Archer = 1 << 5,
+    /// <summary>
+    /// Archer (ARC).
+    /// </summary>
+    Archer = 1 << 5,
 
-        /// <summary>
-        /// Conjurer (CNJ).
-        /// </summary>
-        Conjurer = 1 << 6,
+    /// <summary>
+    /// Conjurer (CNJ).
+    /// </summary>
+    Conjurer = 1 << 6,
 
-        /// <summary>
-        /// Thaumaturge (THM).
-        /// </summary>
-        Thaumaturge = 1 << 7,
+    /// <summary>
+    /// Thaumaturge (THM).
+    /// </summary>
+    Thaumaturge = 1 << 7,
 
-        /// <summary>
-        /// Paladin (PLD).
-        /// </summary>
-        Paladin = 1 << 8,
+    /// <summary>
+    /// Paladin (PLD).
+    /// </summary>
+    Paladin = 1 << 8,
 
-        /// <summary>
-        /// Monk (MNK).
-        /// </summary>
-        Monk = 1 << 9,
+    /// <summary>
+    /// Monk (MNK).
+    /// </summary>
+    Monk = 1 << 9,
 
-        /// <summary>
-        /// Warrior (WAR).
-        /// </summary>
-        Warrior = 1 << 10,
+    /// <summary>
+    /// Warrior (WAR).
+    /// </summary>
+    Warrior = 1 << 10,
 
-        /// <summary>
-        /// Dragoon (DRG).
-        /// </summary>
-        Dragoon = 1 << 11,
+    /// <summary>
+    /// Dragoon (DRG).
+    /// </summary>
+    Dragoon = 1 << 11,
 
-        /// <summary>
-        /// Bard (BRD).
-        /// </summary>
-        Bard = 1 << 12,
+    /// <summary>
+    /// Bard (BRD).
+    /// </summary>
+    Bard = 1 << 12,
 
-        /// <summary>
-        /// White mage (WHM).
-        /// </summary>
-        WhiteMage = 1 << 13,
+    /// <summary>
+    /// White mage (WHM).
+    /// </summary>
+    WhiteMage = 1 << 13,
 
-        /// <summary>
-        /// Black mage (BLM).
-        /// </summary>
-        BlackMage = 1 << 14,
+    /// <summary>
+    /// Black mage (BLM).
+    /// </summary>
+    BlackMage = 1 << 14,
 
-        /// <summary>
-        /// Arcanist (ACN).
-        /// </summary>
-        Arcanist = 1 << 15,
+    /// <summary>
+    /// Arcanist (ACN).
+    /// </summary>
+    Arcanist = 1 << 15,
 
-        /// <summary>
-        /// Summoner (SMN).
-        /// </summary>
-        Summoner = 1 << 16,
+    /// <summary>
+    /// Summoner (SMN).
+    /// </summary>
+    Summoner = 1 << 16,
 
-        /// <summary>
-        /// Scholar (SCH).
-        /// </summary>
-        Scholar = 1 << 17,
+    /// <summary>
+    /// Scholar (SCH).
+    /// </summary>
+    Scholar = 1 << 17,
 
-        /// <summary>
-        /// Rogue (ROG).
-        /// </summary>
-        Rogue = 1 << 18,
+    /// <summary>
+    /// Rogue (ROG).
+    /// </summary>
+    Rogue = 1 << 18,
 
-        /// <summary>
-        /// Ninja (NIN).
-        /// </summary>
-        Ninja = 1 << 19,
+    /// <summary>
+    /// Ninja (NIN).
+    /// </summary>
+    Ninja = 1 << 19,
 
-        /// <summary>
-        /// Machinist (MCH).
-        /// </summary>
-        Machinist = 1 << 20,
+    /// <summary>
+    /// Machinist (MCH).
+    /// </summary>
+    Machinist = 1 << 20,
 
-        /// <summary>
-        /// Dark Knight (DRK).
-        /// </summary>
-        DarkKnight = 1 << 21,
+    /// <summary>
+    /// Dark Knight (DRK).
+    /// </summary>
+    DarkKnight = 1 << 21,
 
-        /// <summary>
-        /// Astrologian (AST).
-        /// </summary>
-        Astrologian = 1 << 22,
+    /// <summary>
+    /// Astrologian (AST).
+    /// </summary>
+    Astrologian = 1 << 22,
 
-        /// <summary>
-        /// Samurai (SAM).
-        /// </summary>
-        Samurai = 1 << 23,
+    /// <summary>
+    /// Samurai (SAM).
+    /// </summary>
+    Samurai = 1 << 23,
 
-        /// <summary>
-        /// Red mage (RDM).
-        /// </summary>
-        RedMage = 1 << 24,
+    /// <summary>
+    /// Red mage (RDM).
+    /// </summary>
+    RedMage = 1 << 24,
 
-        /// <summary>
-        /// Blue mage (BLM).
-        /// </summary>
-        BlueMage = 1 << 25,
+    /// <summary>
+    /// Blue mage (BLM).
+    /// </summary>
+    BlueMage = 1 << 25,
 
-        /// <summary>
-        /// Gunbreaker (GNB).
-        /// </summary>
-        Gunbreaker = 1 << 26,
+    /// <summary>
+    /// Gunbreaker (GNB).
+    /// </summary>
+    Gunbreaker = 1 << 26,
 
-        /// <summary>
-        /// Dancer (DNC).
-        /// </summary>
-        Dancer = 1 << 27,
+    /// <summary>
+    /// Dancer (DNC).
+    /// </summary>
+    Dancer = 1 << 27,
 
-        /// <summary>
-        /// Reaper (RPR).
-        /// </summary>
-        Reaper = 1 << 28,
+    /// <summary>
+    /// Reaper (RPR).
+    /// </summary>
+    Reaper = 1 << 28,
 
-        /// <summary>
-        /// Sage (SGE).
-        /// </summary>
-        Sage = 1 << 29,
-    }
+    /// <summary>
+    /// Sage (SGE).
+    /// </summary>
+    Sage = 1 << 29,
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/JobFlagsExtensions.cs b/Dalamud/Game/Gui/PartyFinder/Types/JobFlagsExtensions.cs
index 67469f6aa..c7630acfa 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/JobFlagsExtensions.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/JobFlagsExtensions.cs
@@ -1,58 +1,57 @@
 using Dalamud.Data;
 using Lumina.Excel.GeneratedSheets;
 
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// Extensions for the <see cref="JobFlags"/> enum.
+/// </summary>
+public static class JobFlagsExtensions
 {
     /// <summary>
-    /// Extensions for the <see cref="JobFlags"/> enum.
+    /// Get the actual ClassJob from the in-game sheets for this JobFlags.
     /// </summary>
-    public static class JobFlagsExtensions
+    /// <param name="job">A JobFlags enum member.</param>
+    /// <param name="data">A DataManager to get the ClassJob from.</param>
+    /// <returns>A ClassJob if found or null if not.</returns>
+    public static ClassJob ClassJob(this JobFlags job, DataManager data)
     {
-        /// <summary>
-        /// Get the actual ClassJob from the in-game sheets for this JobFlags.
-        /// </summary>
-        /// <param name="job">A JobFlags enum member.</param>
-        /// <param name="data">A DataManager to get the ClassJob from.</param>
-        /// <returns>A ClassJob if found or null if not.</returns>
-        public static ClassJob ClassJob(this JobFlags job, DataManager data)
+        var jobs = data.GetExcelSheet<ClassJob>();
+
+        uint? row = job switch
         {
-            var jobs = data.GetExcelSheet<ClassJob>();
+            JobFlags.Gladiator => 1,
+            JobFlags.Pugilist => 2,
+            JobFlags.Marauder => 3,
+            JobFlags.Lancer => 4,
+            JobFlags.Archer => 5,
+            JobFlags.Conjurer => 6,
+            JobFlags.Thaumaturge => 7,
+            JobFlags.Paladin => 19,
+            JobFlags.Monk => 20,
+            JobFlags.Warrior => 21,
+            JobFlags.Dragoon => 22,
+            JobFlags.Bard => 23,
+            JobFlags.WhiteMage => 24,
+            JobFlags.BlackMage => 25,
+            JobFlags.Arcanist => 26,
+            JobFlags.Summoner => 27,
+            JobFlags.Scholar => 28,
+            JobFlags.Rogue => 29,
+            JobFlags.Ninja => 30,
+            JobFlags.Machinist => 31,
+            JobFlags.DarkKnight => 32,
+            JobFlags.Astrologian => 33,
+            JobFlags.Samurai => 34,
+            JobFlags.RedMage => 35,
+            JobFlags.BlueMage => 36,
+            JobFlags.Gunbreaker => 37,
+            JobFlags.Dancer => 38,
+            JobFlags.Reaper => 39,
+            JobFlags.Sage => 40,
+            _ => null,
+        };
 
-            uint? row = job switch
-            {
-                JobFlags.Gladiator => 1,
-                JobFlags.Pugilist => 2,
-                JobFlags.Marauder => 3,
-                JobFlags.Lancer => 4,
-                JobFlags.Archer => 5,
-                JobFlags.Conjurer => 6,
-                JobFlags.Thaumaturge => 7,
-                JobFlags.Paladin => 19,
-                JobFlags.Monk => 20,
-                JobFlags.Warrior => 21,
-                JobFlags.Dragoon => 22,
-                JobFlags.Bard => 23,
-                JobFlags.WhiteMage => 24,
-                JobFlags.BlackMage => 25,
-                JobFlags.Arcanist => 26,
-                JobFlags.Summoner => 27,
-                JobFlags.Scholar => 28,
-                JobFlags.Rogue => 29,
-                JobFlags.Ninja => 30,
-                JobFlags.Machinist => 31,
-                JobFlags.DarkKnight => 32,
-                JobFlags.Astrologian => 33,
-                JobFlags.Samurai => 34,
-                JobFlags.RedMage => 35,
-                JobFlags.BlueMage => 36,
-                JobFlags.Gunbreaker => 37,
-                JobFlags.Dancer => 38,
-                JobFlags.Reaper => 39,
-                JobFlags.Sage => 40,
-                _ => null,
-            };
-
-            return row == null ? null : jobs.GetRow((uint)row);
-        }
+        return row == null ? null : jobs.GetRow((uint)row);
     }
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs
index a1a29ceb8..6e43ecf4c 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs
@@ -1,26 +1,25 @@
 using System;
 
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// Loot rule flags for the <see cref="PartyFinderGui"/> class.
+/// </summary>
+[Flags]
+public enum LootRuleFlags : uint
 {
     /// <summary>
-    /// Loot rule flags for the <see cref="PartyFinderGui"/> class.
+    /// No loot rules.
     /// </summary>
-    [Flags]
-    public enum LootRuleFlags : uint
-    {
-        /// <summary>
-        /// No loot rules.
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// The greed only rule.
-        /// </summary>
-        GreedOnly = 1,
+    /// <summary>
+    /// The greed only rule.
+    /// </summary>
+    GreedOnly = 1,
 
-        /// <summary>
-        /// The lootmaster rule.
-        /// </summary>
-        Lootmaster = 2,
-    }
+    /// <summary>
+    /// The lootmaster rule.
+    /// </summary>
+    Lootmaster = 2,
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs
index de3b8fc6b..19f56f84c 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs
@@ -1,31 +1,30 @@
 using System;
 
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// Objective flags for the <see cref="PartyFinderGui"/> class.
+/// </summary>
+[Flags]
+public enum ObjectiveFlags : uint
 {
     /// <summary>
-    /// Objective flags for the <see cref="PartyFinderGui"/> class.
+    /// No objective.
     /// </summary>
-    [Flags]
-    public enum ObjectiveFlags : uint
-    {
-        /// <summary>
-        /// No objective.
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// The duty completion objective.
-        /// </summary>
-        DutyCompletion = 1,
+    /// <summary>
+    /// The duty completion objective.
+    /// </summary>
+    DutyCompletion = 1,
 
-        /// <summary>
-        /// The practice objective.
-        /// </summary>
-        Practice = 2,
+    /// <summary>
+    /// The practice objective.
+    /// </summary>
+    Practice = 2,
 
-        /// <summary>
-        /// The loot objective.
-        /// </summary>
-        Loot = 4,
-    }
+    /// <summary>
+    /// The loot objective.
+    /// </summary>
+    Loot = 4,
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs
index b0dce07b9..503b7d905 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs
@@ -7,228 +7,227 @@ using Dalamud.Game.Gui.PartyFinder.Internal;
 using Dalamud.Game.Text.SeStringHandling;
 using Lumina.Excel.GeneratedSheets;
 
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// A single listing in party finder.
+/// </summary>
+public class PartyFinderListing
 {
+    private readonly byte objective;
+    private readonly byte conditions;
+    private readonly byte dutyFinderSettings;
+    private readonly byte lootRules;
+    private readonly byte searchArea;
+    private readonly PartyFinderSlot[] slots;
+    private readonly byte[] jobsPresent;
+
     /// <summary>
-    /// A single listing in party finder.
+    /// Initializes a new instance of the <see cref="PartyFinderListing"/> class.
     /// </summary>
-    public class PartyFinderListing
+    /// <param name="listing">The interop listing data.</param>
+    internal PartyFinderListing(PartyFinderPacketListing listing)
     {
-        private readonly byte objective;
-        private readonly byte conditions;
-        private readonly byte dutyFinderSettings;
-        private readonly byte lootRules;
-        private readonly byte searchArea;
-        private readonly PartyFinderSlot[] slots;
-        private readonly byte[] jobsPresent;
+        var dataManager = Service<DataManager>.Get();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PartyFinderListing"/> class.
-        /// </summary>
-        /// <param name="listing">The interop listing data.</param>
-        internal PartyFinderListing(PartyFinderPacketListing listing)
-        {
-            var dataManager = Service<DataManager>.Get();
-
-            this.objective = listing.Objective;
-            this.conditions = listing.Conditions;
-            this.dutyFinderSettings = listing.DutyFinderSettings;
-            this.lootRules = listing.LootRules;
-            this.searchArea = listing.SearchArea;
-            this.slots = listing.Slots.Select(accepting => new PartyFinderSlot(accepting)).ToArray();
-            this.jobsPresent = listing.JobsPresent;
-
-            this.Id = listing.Id;
-            this.ContentIdLower = listing.ContentIdLower;
-            this.Name = SeString.Parse(listing.Name.TakeWhile(b => b != 0).ToArray());
-            this.Description = SeString.Parse(listing.Description.TakeWhile(b => b != 0).ToArray());
-            this.World = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.World));
-            this.HomeWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.HomeWorld));
-            this.CurrentWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.CurrentWorld));
-            this.Category = (DutyCategory)listing.Category;
-            this.RawDuty = listing.Duty;
-            this.Duty = new Lazy<ContentFinderCondition>(() => dataManager.GetExcelSheet<ContentFinderCondition>().GetRow(listing.Duty));
-            this.DutyType = (DutyType)listing.DutyType;
-            this.BeginnersWelcome = listing.BeginnersWelcome == 1;
-            this.SecondsRemaining = listing.SecondsRemaining;
-            this.MinimumItemLevel = listing.MinimumItemLevel;
-            this.Parties = listing.NumParties;
-            this.SlotsAvailable = listing.NumSlots;
-            this.LastPatchHotfixTimestamp = listing.LastPatchHotfixTimestamp;
-            this.JobsPresent = listing.JobsPresent
-                .Select(id => new Lazy<ClassJob>(
-                    () => id == 0
-                        ? null
-                        : dataManager.GetExcelSheet<ClassJob>().GetRow(id)))
-                .ToArray();
-        }
-
-        /// <summary>
-        /// Gets the ID assigned to this listing by the game's server.
-        /// </summary>
-        public uint Id { get; }
-
-        /// <summary>
-        /// Gets the lower bits of the player's content ID.
-        /// </summary>
-        public uint ContentIdLower { get; }
-
-        /// <summary>
-        /// Gets the name of the player hosting this listing.
-        /// </summary>
-        public SeString Name { get; }
-
-        /// <summary>
-        /// Gets the description of this listing as set by the host. May be multiple lines.
-        /// </summary>
-        public SeString Description { get; }
-
-        /// <summary>
-        /// Gets the world that this listing was created on.
-        /// </summary>
-        public Lazy<World> World { get; }
-
-        /// <summary>
-        /// Gets the home world of the listing's host.
-        /// </summary>
-        public Lazy<World> HomeWorld { get; }
-
-        /// <summary>
-        /// Gets the current world of the listing's host.
-        /// </summary>
-        public Lazy<World> CurrentWorld { get; }
-
-        /// <summary>
-        /// Gets the Party Finder category this listing is listed under.
-        /// </summary>
-        public DutyCategory Category { get; }
-
-        /// <summary>
-        /// Gets the row ID of the duty this listing is for. May be 0 for non-duty listings.
-        /// </summary>
-        public ushort RawDuty { get; }
-
-        /// <summary>
-        /// Gets the duty this listing is for. May be null for non-duty listings.
-        /// </summary>
-        public Lazy<ContentFinderCondition> Duty { get; }
-
-        /// <summary>
-        /// Gets the type of duty this listing is for.
-        /// </summary>
-        public DutyType DutyType { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether if this listing is beginner-friendly. Shown with a sprout icon in-game.
-        /// </summary>
-        public bool BeginnersWelcome { get; }
-
-        /// <summary>
-        /// Gets how many seconds this listing will continue to be available for. It may end before this time if the party
-        /// fills or the host ends it early.
-        /// </summary>
-        public ushort SecondsRemaining { get; }
-
-        /// <summary>
-        /// Gets the minimum item level required to join this listing.
-        /// </summary>
-        public ushort MinimumItemLevel { get; }
-
-        /// <summary>
-        /// Gets the number of parties this listing is recruiting for.
-        /// </summary>
-        public byte Parties { get; }
-
-        /// <summary>
-        /// Gets the number of player slots this listing is recruiting for.
-        /// </summary>
-        public byte SlotsAvailable { get; }
-
-        /// <summary>
-        /// Gets the time at which the server this listings is on last restarted for a patch/hotfix.
-        /// Probably.
-        /// </summary>
-        public uint LastPatchHotfixTimestamp { get; }
-
-        /// <summary>
-        /// Gets a list of player slots that the Party Finder is accepting.
-        /// </summary>
-        public IReadOnlyCollection<PartyFinderSlot> Slots => this.slots;
-
-        /// <summary>
-        /// Gets  the objective of this listing.
-        /// </summary>
-        public ObjectiveFlags Objective => (ObjectiveFlags)this.objective;
-
-        /// <summary>
-        /// Gets the conditions of this listing.
-        /// </summary>
-        public ConditionFlags Conditions => (ConditionFlags)this.conditions;
-
-        /// <summary>
-        /// Gets the Duty Finder settings that will be used for this listing.
-        /// </summary>
-        public DutyFinderSettingsFlags DutyFinderSettings => (DutyFinderSettingsFlags)this.dutyFinderSettings;
-
-        /// <summary>
-        /// Gets the loot rules that will be used for this listing.
-        /// </summary>
-        public LootRuleFlags LootRules => (LootRuleFlags)this.lootRules;
-
-        /// <summary>
-        /// Gets where this listing is searching. Note that this is also used for denoting alliance raid listings and one
-        /// player per job.
-        /// </summary>
-        public SearchAreaFlags SearchArea => (SearchAreaFlags)this.searchArea;
-
-        /// <summary>
-        /// Gets a list of the class/job IDs that are currently present in the party.
-        /// </summary>
-        public IReadOnlyCollection<byte> RawJobsPresent => this.jobsPresent;
-
-        /// <summary>
-        /// Gets a list of the classes/jobs that are currently present in the party.
-        /// </summary>
-        public IReadOnlyCollection<Lazy<ClassJob>> JobsPresent { get; }
-
-        #region Indexers
-
-        /// <summary>
-        /// Check if the given flag is present.
-        /// </summary>
-        /// <param name="flag">The flag to check for.</param>
-        /// <returns>A value indicating whether the flag is present.</returns>
-        public bool this[ObjectiveFlags flag] => this.objective == 0 || (this.objective & (uint)flag) > 0;
-
-        /// <summary>
-        /// Check if the given flag is present.
-        /// </summary>
-        /// <param name="flag">The flag to check for.</param>
-        /// <returns>A value indicating whether the flag is present.</returns>
-        public bool this[ConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0;
-
-        /// <summary>
-        /// Check if the given flag is present.
-        /// </summary>
-        /// <param name="flag">The flag to check for.</param>
-        /// <returns>A value indicating whether the flag is present.</returns>
-        public bool this[DutyFinderSettingsFlags flag] => this.dutyFinderSettings == 0 || (this.dutyFinderSettings & (uint)flag) > 0;
-
-        /// <summary>
-        /// Check if the given flag is present.
-        /// </summary>
-        /// <param name="flag">The flag to check for.</param>
-        /// <returns>A value indicating whether the flag is present.</returns>
-        public bool this[LootRuleFlags flag] => this.lootRules == 0 || (this.lootRules & (uint)flag) > 0;
-
-        /// <summary>
-        /// Check if the given flag is present.
-        /// </summary>
-        /// <param name="flag">The flag to check for.</param>
-        /// <returns>A value indicating whether the flag is present.</returns>
-        public bool this[SearchAreaFlags flag] => this.searchArea == 0 || (this.searchArea & (uint)flag) > 0;
-
-        #endregion
+        this.objective = listing.Objective;
+        this.conditions = listing.Conditions;
+        this.dutyFinderSettings = listing.DutyFinderSettings;
+        this.lootRules = listing.LootRules;
+        this.searchArea = listing.SearchArea;
+        this.slots = listing.Slots.Select(accepting => new PartyFinderSlot(accepting)).ToArray();
+        this.jobsPresent = listing.JobsPresent;
 
+        this.Id = listing.Id;
+        this.ContentIdLower = listing.ContentIdLower;
+        this.Name = SeString.Parse(listing.Name.TakeWhile(b => b != 0).ToArray());
+        this.Description = SeString.Parse(listing.Description.TakeWhile(b => b != 0).ToArray());
+        this.World = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.World));
+        this.HomeWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.HomeWorld));
+        this.CurrentWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.CurrentWorld));
+        this.Category = (DutyCategory)listing.Category;
+        this.RawDuty = listing.Duty;
+        this.Duty = new Lazy<ContentFinderCondition>(() => dataManager.GetExcelSheet<ContentFinderCondition>().GetRow(listing.Duty));
+        this.DutyType = (DutyType)listing.DutyType;
+        this.BeginnersWelcome = listing.BeginnersWelcome == 1;
+        this.SecondsRemaining = listing.SecondsRemaining;
+        this.MinimumItemLevel = listing.MinimumItemLevel;
+        this.Parties = listing.NumParties;
+        this.SlotsAvailable = listing.NumSlots;
+        this.LastPatchHotfixTimestamp = listing.LastPatchHotfixTimestamp;
+        this.JobsPresent = listing.JobsPresent
+                                  .Select(id => new Lazy<ClassJob>(
+                                              () => id == 0
+                                                        ? null
+                                                        : dataManager.GetExcelSheet<ClassJob>().GetRow(id)))
+                                  .ToArray();
     }
+
+    /// <summary>
+    /// Gets the ID assigned to this listing by the game's server.
+    /// </summary>
+    public uint Id { get; }
+
+    /// <summary>
+    /// Gets the lower bits of the player's content ID.
+    /// </summary>
+    public uint ContentIdLower { get; }
+
+    /// <summary>
+    /// Gets the name of the player hosting this listing.
+    /// </summary>
+    public SeString Name { get; }
+
+    /// <summary>
+    /// Gets the description of this listing as set by the host. May be multiple lines.
+    /// </summary>
+    public SeString Description { get; }
+
+    /// <summary>
+    /// Gets the world that this listing was created on.
+    /// </summary>
+    public Lazy<World> World { get; }
+
+    /// <summary>
+    /// Gets the home world of the listing's host.
+    /// </summary>
+    public Lazy<World> HomeWorld { get; }
+
+    /// <summary>
+    /// Gets the current world of the listing's host.
+    /// </summary>
+    public Lazy<World> CurrentWorld { get; }
+
+    /// <summary>
+    /// Gets the Party Finder category this listing is listed under.
+    /// </summary>
+    public DutyCategory Category { get; }
+
+    /// <summary>
+    /// Gets the row ID of the duty this listing is for. May be 0 for non-duty listings.
+    /// </summary>
+    public ushort RawDuty { get; }
+
+    /// <summary>
+    /// Gets the duty this listing is for. May be null for non-duty listings.
+    /// </summary>
+    public Lazy<ContentFinderCondition> Duty { get; }
+
+    /// <summary>
+    /// Gets the type of duty this listing is for.
+    /// </summary>
+    public DutyType DutyType { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether if this listing is beginner-friendly. Shown with a sprout icon in-game.
+    /// </summary>
+    public bool BeginnersWelcome { get; }
+
+    /// <summary>
+    /// Gets how many seconds this listing will continue to be available for. It may end before this time if the party
+    /// fills or the host ends it early.
+    /// </summary>
+    public ushort SecondsRemaining { get; }
+
+    /// <summary>
+    /// Gets the minimum item level required to join this listing.
+    /// </summary>
+    public ushort MinimumItemLevel { get; }
+
+    /// <summary>
+    /// Gets the number of parties this listing is recruiting for.
+    /// </summary>
+    public byte Parties { get; }
+
+    /// <summary>
+    /// Gets the number of player slots this listing is recruiting for.
+    /// </summary>
+    public byte SlotsAvailable { get; }
+
+    /// <summary>
+    /// Gets the time at which the server this listings is on last restarted for a patch/hotfix.
+    /// Probably.
+    /// </summary>
+    public uint LastPatchHotfixTimestamp { get; }
+
+    /// <summary>
+    /// Gets a list of player slots that the Party Finder is accepting.
+    /// </summary>
+    public IReadOnlyCollection<PartyFinderSlot> Slots => this.slots;
+
+    /// <summary>
+    /// Gets  the objective of this listing.
+    /// </summary>
+    public ObjectiveFlags Objective => (ObjectiveFlags)this.objective;
+
+    /// <summary>
+    /// Gets the conditions of this listing.
+    /// </summary>
+    public ConditionFlags Conditions => (ConditionFlags)this.conditions;
+
+    /// <summary>
+    /// Gets the Duty Finder settings that will be used for this listing.
+    /// </summary>
+    public DutyFinderSettingsFlags DutyFinderSettings => (DutyFinderSettingsFlags)this.dutyFinderSettings;
+
+    /// <summary>
+    /// Gets the loot rules that will be used for this listing.
+    /// </summary>
+    public LootRuleFlags LootRules => (LootRuleFlags)this.lootRules;
+
+    /// <summary>
+    /// Gets where this listing is searching. Note that this is also used for denoting alliance raid listings and one
+    /// player per job.
+    /// </summary>
+    public SearchAreaFlags SearchArea => (SearchAreaFlags)this.searchArea;
+
+    /// <summary>
+    /// Gets a list of the class/job IDs that are currently present in the party.
+    /// </summary>
+    public IReadOnlyCollection<byte> RawJobsPresent => this.jobsPresent;
+
+    /// <summary>
+    /// Gets a list of the classes/jobs that are currently present in the party.
+    /// </summary>
+    public IReadOnlyCollection<Lazy<ClassJob>> JobsPresent { get; }
+
+    #region Indexers
+
+    /// <summary>
+    /// Check if the given flag is present.
+    /// </summary>
+    /// <param name="flag">The flag to check for.</param>
+    /// <returns>A value indicating whether the flag is present.</returns>
+    public bool this[ObjectiveFlags flag] => this.objective == 0 || (this.objective & (uint)flag) > 0;
+
+    /// <summary>
+    /// Check if the given flag is present.
+    /// </summary>
+    /// <param name="flag">The flag to check for.</param>
+    /// <returns>A value indicating whether the flag is present.</returns>
+    public bool this[ConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0;
+
+    /// <summary>
+    /// Check if the given flag is present.
+    /// </summary>
+    /// <param name="flag">The flag to check for.</param>
+    /// <returns>A value indicating whether the flag is present.</returns>
+    public bool this[DutyFinderSettingsFlags flag] => this.dutyFinderSettings == 0 || (this.dutyFinderSettings & (uint)flag) > 0;
+
+    /// <summary>
+    /// Check if the given flag is present.
+    /// </summary>
+    /// <param name="flag">The flag to check for.</param>
+    /// <returns>A value indicating whether the flag is present.</returns>
+    public bool this[LootRuleFlags flag] => this.lootRules == 0 || (this.lootRules & (uint)flag) > 0;
+
+    /// <summary>
+    /// Check if the given flag is present.
+    /// </summary>
+    /// <param name="flag">The flag to check for.</param>
+    /// <returns>A value indicating whether the flag is present.</returns>
+    public bool this[SearchAreaFlags flag] => this.searchArea == 0 || (this.searchArea & (uint)flag) > 0;
+
+    #endregion
+
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListingEventArgs.cs b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListingEventArgs.cs
index ff6bd607d..4bc603d7a 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListingEventArgs.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListingEventArgs.cs
@@ -1,27 +1,26 @@
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// This class represents additional arguments passed by the game.
+/// </summary>
+public class PartyFinderListingEventArgs
 {
     /// <summary>
-    /// This class represents additional arguments passed by the game.
+    /// Initializes a new instance of the <see cref="PartyFinderListingEventArgs"/> class.
     /// </summary>
-    public class PartyFinderListingEventArgs
+    /// <param name="batchNumber">The batch number.</param>
+    internal PartyFinderListingEventArgs(int batchNumber)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PartyFinderListingEventArgs"/> class.
-        /// </summary>
-        /// <param name="batchNumber">The batch number.</param>
-        internal PartyFinderListingEventArgs(int batchNumber)
-        {
-            this.BatchNumber = batchNumber;
-        }
-
-        /// <summary>
-        /// Gets the batch number.
-        /// </summary>
-        public int BatchNumber { get; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the listing is visible.
-        /// </summary>
-        public bool Visible { get; set; } = true;
+        this.BatchNumber = batchNumber;
     }
+
+    /// <summary>
+    /// Gets the batch number.
+    /// </summary>
+    public int BatchNumber { get; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the listing is visible.
+    /// </summary>
+    public bool Visible { get; set; } = true;
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderSlot.cs b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderSlot.cs
index d740c0c0a..a0853adf1 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderSlot.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderSlot.cs
@@ -2,50 +2,49 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// A player slot in a Party Finder listing.
+/// </summary>
+public class PartyFinderSlot
 {
+    private readonly uint accepting;
+    private JobFlags[] listAccepting;
+
     /// <summary>
-    /// A player slot in a Party Finder listing.
+    /// Initializes a new instance of the <see cref="PartyFinderSlot"/> class.
     /// </summary>
-    public class PartyFinderSlot
+    /// <param name="accepting">The flag value of accepted jobs.</param>
+    internal PartyFinderSlot(uint accepting)
     {
-        private readonly uint accepting;
-        private JobFlags[] listAccepting;
+        this.accepting = accepting;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PartyFinderSlot"/> class.
-        /// </summary>
-        /// <param name="accepting">The flag value of accepted jobs.</param>
-        internal PartyFinderSlot(uint accepting)
+    /// <summary>
+    /// Gets a list of jobs that this slot is accepting.
+    /// </summary>
+    public IReadOnlyCollection<JobFlags> Accepting
+    {
+        get
         {
-            this.accepting = accepting;
-        }
-
-        /// <summary>
-        /// Gets a list of jobs that this slot is accepting.
-        /// </summary>
-        public IReadOnlyCollection<JobFlags> Accepting
-        {
-            get
+            if (this.listAccepting != null)
             {
-                if (this.listAccepting != null)
-                {
-                    return this.listAccepting;
-                }
-
-                this.listAccepting = Enum.GetValues(typeof(JobFlags))
-                                          .Cast<JobFlags>()
-                                          .Where(flag => this[flag])
-                                          .ToArray();
-
                 return this.listAccepting;
             }
-        }
 
-        /// <summary>
-        /// Tests if this slot is accepting a job.
-        /// </summary>
-        /// <param name="flag">Job to test.</param>
-        public bool this[JobFlags flag] => (this.accepting & (uint)flag) > 0;
+            this.listAccepting = Enum.GetValues(typeof(JobFlags))
+                                     .Cast<JobFlags>()
+                                     .Where(flag => this[flag])
+                                     .ToArray();
+
+            return this.listAccepting;
+        }
     }
+
+    /// <summary>
+    /// Tests if this slot is accepting a job.
+    /// </summary>
+    /// <param name="flag">Job to test.</param>
+    public bool this[JobFlags flag] => (this.accepting & (uint)flag) > 0;
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs
index 85308c8d1..27a3f5ee8 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs
@@ -1,36 +1,35 @@
 using System;
 
-namespace Dalamud.Game.Gui.PartyFinder.Types
+namespace Dalamud.Game.Gui.PartyFinder.Types;
+
+/// <summary>
+/// Search area flags for the <see cref="PartyFinderGui"/> class.
+/// </summary>
+[Flags]
+public enum SearchAreaFlags : uint
 {
     /// <summary>
-    /// Search area flags for the <see cref="PartyFinderGui"/> class.
+    /// Datacenter.
     /// </summary>
-    [Flags]
-    public enum SearchAreaFlags : uint
-    {
-        /// <summary>
-        /// Datacenter.
-        /// </summary>
-        DataCentre = 1 << 0,
+    DataCentre = 1 << 0,
 
-        /// <summary>
-        /// Private.
-        /// </summary>
-        Private = 1 << 1,
+    /// <summary>
+    /// Private.
+    /// </summary>
+    Private = 1 << 1,
 
-        /// <summary>
-        /// Alliance raid.
-        /// </summary>
-        AllianceRaid = 1 << 2,
+    /// <summary>
+    /// Alliance raid.
+    /// </summary>
+    AllianceRaid = 1 << 2,
 
-        /// <summary>
-        /// World.
-        /// </summary>
-        World = 1 << 3,
+    /// <summary>
+    /// World.
+    /// </summary>
+    World = 1 << 3,
 
-        /// <summary>
-        /// One player per job.
-        /// </summary>
-        OnePlayerPerJob = 1 << 5,
-    }
+    /// <summary>
+    /// One player per job.
+    /// </summary>
+    OnePlayerPerJob = 1 << 5,
 }
diff --git a/Dalamud/Game/Gui/Toast/QuestToastOptions.cs b/Dalamud/Game/Gui/Toast/QuestToastOptions.cs
index 11f09a523..5c2fd14fe 100644
--- a/Dalamud/Game/Gui/Toast/QuestToastOptions.cs
+++ b/Dalamud/Game/Gui/Toast/QuestToastOptions.cs
@@ -1,32 +1,31 @@
-namespace Dalamud.Game.Gui.Toast
+namespace Dalamud.Game.Gui.Toast;
+
+/// <summary>
+/// This class represents options that can be used with the <see cref="ToastGui"/> class for the quest toast variant.
+/// </summary>
+public sealed class QuestToastOptions
 {
     /// <summary>
-    /// This class represents options that can be used with the <see cref="ToastGui"/> class for the quest toast variant.
+    /// Gets or sets the position of the toast on the screen.
     /// </summary>
-    public sealed class QuestToastOptions
-    {
-        /// <summary>
-        /// Gets or sets the position of the toast on the screen.
-        /// </summary>
-        public QuestToastPosition Position { get; set; } = QuestToastPosition.Centre;
+    public QuestToastPosition Position { get; set; } = QuestToastPosition.Centre;
 
-        /// <summary>
-        /// Gets or sets the ID of the icon that will appear in the toast.
-        ///
-        /// This may be 0 for no icon.
-        /// </summary>
-        public uint IconId { get; set; } = 0;
+    /// <summary>
+    /// Gets or sets the ID of the icon that will appear in the toast.
+    ///
+    /// This may be 0 for no icon.
+    /// </summary>
+    public uint IconId { get; set; } = 0;
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the toast will show a checkmark after appearing.
-        /// </summary>
-        public bool DisplayCheckmark { get; set; } = false;
+    /// <summary>
+    /// Gets or sets a value indicating whether the toast will show a checkmark after appearing.
+    /// </summary>
+    public bool DisplayCheckmark { get; set; } = false;
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the toast will play a completion sound.
-        ///
-        /// This only works if <see cref="IconId"/> is non-zero or <see cref="DisplayCheckmark"/> is true.
-        /// </summary>
-        public bool PlaySound { get; set; } = false;
-    }
+    /// <summary>
+    /// Gets or sets a value indicating whether the toast will play a completion sound.
+    ///
+    /// This only works if <see cref="IconId"/> is non-zero or <see cref="DisplayCheckmark"/> is true.
+    /// </summary>
+    public bool PlaySound { get; set; } = false;
 }
diff --git a/Dalamud/Game/Gui/Toast/QuestToastPosition.cs b/Dalamud/Game/Gui/Toast/QuestToastPosition.cs
index cc107ab6e..4c7d91c36 100644
--- a/Dalamud/Game/Gui/Toast/QuestToastPosition.cs
+++ b/Dalamud/Game/Gui/Toast/QuestToastPosition.cs
@@ -1,23 +1,22 @@
-namespace Dalamud.Game.Gui.Toast
+namespace Dalamud.Game.Gui.Toast;
+
+/// <summary>
+/// The alignment of native quest toast windows.
+/// </summary>
+public enum QuestToastPosition
 {
     /// <summary>
-    /// The alignment of native quest toast windows.
+    /// The toast will be aligned screen centre.
     /// </summary>
-    public enum QuestToastPosition
-    {
-        /// <summary>
-        /// The toast will be aligned screen centre.
-        /// </summary>
-        Centre = 0,
+    Centre = 0,
 
-        /// <summary>
-        /// The toast will be aligned screen right.
-        /// </summary>
-        Right = 1,
+    /// <summary>
+    /// The toast will be aligned screen right.
+    /// </summary>
+    Right = 1,
 
-        /// <summary>
-        /// The toast will be aligned screen left.
-        /// </summary>
-        Left = 2,
-    }
+    /// <summary>
+    /// The toast will be aligned screen left.
+    /// </summary>
+    Left = 2,
 }
diff --git a/Dalamud/Game/Gui/Toast/ToastGui.cs b/Dalamud/Game/Gui/Toast/ToastGui.cs
index 05954553a..e65fa1444 100644
--- a/Dalamud/Game/Gui/Toast/ToastGui.cs
+++ b/Dalamud/Game/Gui/Toast/ToastGui.cs
@@ -7,429 +7,428 @@ using Dalamud.Hooking;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 
-namespace Dalamud.Game.Gui.Toast
+namespace Dalamud.Game.Gui.Toast;
+
+/// <summary>
+/// This class facilitates interacting with and creating native toast windows.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed partial class ToastGui : IDisposable, IServiceType
+{
+    private const uint QuestToastCheckmarkMagic = 60081;
+
+    private readonly ToastGuiAddressResolver address;
+
+    private readonly Queue<(byte[] Message, ToastOptions Options)> normalQueue = new();
+    private readonly Queue<(byte[] Message, QuestToastOptions Options)> questQueue = new();
+    private readonly Queue<byte[]> errorQueue = new();
+
+    private readonly Hook<ShowNormalToastDelegate> showNormalToastHook;
+    private readonly Hook<ShowQuestToastDelegate> showQuestToastHook;
+    private readonly Hook<ShowErrorToastDelegate> showErrorToastHook;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ToastGui"/> class.
+    /// </summary>
+    /// <param name="sigScanner">Sig scanner to use.</param>
+    [ServiceManager.ServiceConstructor]
+    private ToastGui(SigScanner sigScanner)
+    {
+        this.address = new ToastGuiAddressResolver();
+        this.address.Setup(sigScanner);
+
+        this.showNormalToastHook = Hook<ShowNormalToastDelegate>.FromAddress(this.address.ShowNormalToast, new ShowNormalToastDelegate(this.HandleNormalToastDetour));
+        this.showQuestToastHook = Hook<ShowQuestToastDelegate>.FromAddress(this.address.ShowQuestToast, new ShowQuestToastDelegate(this.HandleQuestToastDetour));
+        this.showErrorToastHook = Hook<ShowErrorToastDelegate>.FromAddress(this.address.ShowErrorToast, new ShowErrorToastDelegate(this.HandleErrorToastDetour));
+    }
+
+    #region Event delegates
+
+    /// <summary>
+    /// A delegate type used when a normal toast window appears.
+    /// </summary>
+    /// <param name="message">The message displayed.</param>
+    /// <param name="options">Assorted toast options.</param>
+    /// <param name="isHandled">Whether the toast has been handled or should be propagated.</param>
+    public delegate void OnNormalToastDelegate(ref SeString message, ref ToastOptions options, ref bool isHandled);
+
+    /// <summary>
+    /// A delegate type used when a quest toast window appears.
+    /// </summary>
+    /// <param name="message">The message displayed.</param>
+    /// <param name="options">Assorted toast options.</param>
+    /// <param name="isHandled">Whether the toast has been handled or should be propagated.</param>
+    public delegate void OnQuestToastDelegate(ref SeString message, ref QuestToastOptions options, ref bool isHandled);
+
+    /// <summary>
+    /// A delegate type used when an error toast window appears.
+    /// </summary>
+    /// <param name="message">The message displayed.</param>
+    /// <param name="isHandled">Whether the toast has been handled or should be propagated.</param>
+    public delegate void OnErrorToastDelegate(ref SeString message, ref bool isHandled);
+
+    #endregion
+
+    #region Marshal delegates
+
+    private delegate IntPtr ShowNormalToastDelegate(IntPtr manager, IntPtr text, int layer, byte isTop, byte isFast, int logMessageId);
+
+    private delegate byte ShowQuestToastDelegate(IntPtr manager, int position, IntPtr text, uint iconOrCheck1, byte playSound, uint iconOrCheck2, byte alsoPlaySound);
+
+    private delegate byte ShowErrorToastDelegate(IntPtr manager, IntPtr text, byte respectsHidingMaybe);
+
+    #endregion
+
+    #region Events
+
+    /// <summary>
+    /// Event that will be fired when a toast is sent by the game or a plugin.
+    /// </summary>
+    public event OnNormalToastDelegate Toast;
+
+    /// <summary>
+    /// Event that will be fired when a quest toast is sent by the game or a plugin.
+    /// </summary>
+    public event OnQuestToastDelegate QuestToast;
+
+    /// <summary>
+    /// Event that will be fired when an error toast is sent by the game or a plugin.
+    /// </summary>
+    public event OnErrorToastDelegate ErrorToast;
+
+    #endregion
+
+    /// <summary>
+    /// Disposes of managed and unmanaged resources.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.showNormalToastHook.Dispose();
+        this.showQuestToastHook.Dispose();
+        this.showErrorToastHook.Dispose();
+    }
+
+    /// <summary>
+    /// Process the toast queue.
+    /// </summary>
+    internal void UpdateQueue()
+    {
+        while (this.normalQueue.Count > 0)
+        {
+            var (message, options) = this.normalQueue.Dequeue();
+            this.ShowNormal(message, options);
+        }
+
+        while (this.questQueue.Count > 0)
+        {
+            var (message, options) = this.questQueue.Dequeue();
+            this.ShowQuest(message, options);
+        }
+
+        while (this.errorQueue.Count > 0)
+        {
+            var message = this.errorQueue.Dequeue();
+            this.ShowError(message);
+        }
+    }
+
+    private static byte[] Terminate(byte[] source)
+    {
+        var terminated = new byte[source.Length + 1];
+        Array.Copy(source, 0, terminated, 0, source.Length);
+        terminated[^1] = 0;
+
+        return terminated;
+    }
+
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction(GameGui gameGui)
+    {
+        this.showNormalToastHook.Enable();
+        this.showQuestToastHook.Enable();
+        this.showErrorToastHook.Enable();
+    }
+
+    private SeString ParseString(IntPtr text)
+    {
+        var bytes = new List<byte>();
+        unsafe
+        {
+            var ptr = (byte*)text;
+            while (*ptr != 0)
+            {
+                bytes.Add(*ptr);
+                ptr += 1;
+            }
+        }
+
+        // call events
+        return SeString.Parse(bytes.ToArray());
+    }
+}
+
+/// <summary>
+/// Handles normal toasts.
+/// </summary>
+public sealed partial class ToastGui
 {
     /// <summary>
-    /// This class facilitates interacting with and creating native toast windows.
+    /// Show a toast message with the given content.
     /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed partial class ToastGui : IDisposable, IServiceType
+    /// <param name="message">The message to be shown.</param>
+    /// <param name="options">Options for the toast.</param>
+    public void ShowNormal(string message, ToastOptions options = null)
     {
-        private const uint QuestToastCheckmarkMagic = 60081;
-
-        private readonly ToastGuiAddressResolver address;
-
-        private readonly Queue<(byte[] Message, ToastOptions Options)> normalQueue = new();
-        private readonly Queue<(byte[] Message, QuestToastOptions Options)> questQueue = new();
-        private readonly Queue<byte[]> errorQueue = new();
-
-        private readonly Hook<ShowNormalToastDelegate> showNormalToastHook;
-        private readonly Hook<ShowQuestToastDelegate> showQuestToastHook;
-        private readonly Hook<ShowErrorToastDelegate> showErrorToastHook;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ToastGui"/> class.
-        /// </summary>
-        /// <param name="sigScanner">Sig scanner to use.</param>
-        [ServiceManager.ServiceConstructor]
-        private ToastGui(SigScanner sigScanner)
-        {
-            this.address = new ToastGuiAddressResolver();
-            this.address.Setup(sigScanner);
-
-            this.showNormalToastHook = Hook<ShowNormalToastDelegate>.FromAddress(this.address.ShowNormalToast, new ShowNormalToastDelegate(this.HandleNormalToastDetour));
-            this.showQuestToastHook = Hook<ShowQuestToastDelegate>.FromAddress(this.address.ShowQuestToast, new ShowQuestToastDelegate(this.HandleQuestToastDetour));
-            this.showErrorToastHook = Hook<ShowErrorToastDelegate>.FromAddress(this.address.ShowErrorToast, new ShowErrorToastDelegate(this.HandleErrorToastDetour));
-        }
-
-        #region Event delegates
-
-        /// <summary>
-        /// A delegate type used when a normal toast window appears.
-        /// </summary>
-        /// <param name="message">The message displayed.</param>
-        /// <param name="options">Assorted toast options.</param>
-        /// <param name="isHandled">Whether the toast has been handled or should be propagated.</param>
-        public delegate void OnNormalToastDelegate(ref SeString message, ref ToastOptions options, ref bool isHandled);
-
-        /// <summary>
-        /// A delegate type used when a quest toast window appears.
-        /// </summary>
-        /// <param name="message">The message displayed.</param>
-        /// <param name="options">Assorted toast options.</param>
-        /// <param name="isHandled">Whether the toast has been handled or should be propagated.</param>
-        public delegate void OnQuestToastDelegate(ref SeString message, ref QuestToastOptions options, ref bool isHandled);
-
-        /// <summary>
-        /// A delegate type used when an error toast window appears.
-        /// </summary>
-        /// <param name="message">The message displayed.</param>
-        /// <param name="isHandled">Whether the toast has been handled or should be propagated.</param>
-        public delegate void OnErrorToastDelegate(ref SeString message, ref bool isHandled);
-
-        #endregion
-
-        #region Marshal delegates
-
-        private delegate IntPtr ShowNormalToastDelegate(IntPtr manager, IntPtr text, int layer, byte isTop, byte isFast, int logMessageId);
-
-        private delegate byte ShowQuestToastDelegate(IntPtr manager, int position, IntPtr text, uint iconOrCheck1, byte playSound, uint iconOrCheck2, byte alsoPlaySound);
-
-        private delegate byte ShowErrorToastDelegate(IntPtr manager, IntPtr text, byte respectsHidingMaybe);
-
-        #endregion
-
-        #region Events
-
-        /// <summary>
-        /// Event that will be fired when a toast is sent by the game or a plugin.
-        /// </summary>
-        public event OnNormalToastDelegate Toast;
-
-        /// <summary>
-        /// Event that will be fired when a quest toast is sent by the game or a plugin.
-        /// </summary>
-        public event OnQuestToastDelegate QuestToast;
-
-        /// <summary>
-        /// Event that will be fired when an error toast is sent by the game or a plugin.
-        /// </summary>
-        public event OnErrorToastDelegate ErrorToast;
-
-        #endregion
-
-        /// <summary>
-        /// Disposes of managed and unmanaged resources.
-        /// </summary>
-        void IDisposable.Dispose()
-        {
-            this.showNormalToastHook.Dispose();
-            this.showQuestToastHook.Dispose();
-            this.showErrorToastHook.Dispose();
-        }
-
-        /// <summary>
-        /// Process the toast queue.
-        /// </summary>
-        internal void UpdateQueue()
-        {
-            while (this.normalQueue.Count > 0)
-            {
-                var (message, options) = this.normalQueue.Dequeue();
-                this.ShowNormal(message, options);
-            }
-
-            while (this.questQueue.Count > 0)
-            {
-                var (message, options) = this.questQueue.Dequeue();
-                this.ShowQuest(message, options);
-            }
-
-            while (this.errorQueue.Count > 0)
-            {
-                var message = this.errorQueue.Dequeue();
-                this.ShowError(message);
-            }
-        }
-
-        private static byte[] Terminate(byte[] source)
-        {
-            var terminated = new byte[source.Length + 1];
-            Array.Copy(source, 0, terminated, 0, source.Length);
-            terminated[^1] = 0;
-
-            return terminated;
-        }
-
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction(GameGui gameGui)
-        {
-            this.showNormalToastHook.Enable();
-            this.showQuestToastHook.Enable();
-            this.showErrorToastHook.Enable();
-        }
-
-        private SeString ParseString(IntPtr text)
-        {
-            var bytes = new List<byte>();
-            unsafe
-            {
-                var ptr = (byte*)text;
-                while (*ptr != 0)
-                {
-                    bytes.Add(*ptr);
-                    ptr += 1;
-                }
-            }
-
-            // call events
-            return SeString.Parse(bytes.ToArray());
-        }
+        options ??= new ToastOptions();
+        this.normalQueue.Enqueue((Encoding.UTF8.GetBytes(message), options));
     }
 
     /// <summary>
-    /// Handles normal toasts.
+    /// Show a toast message with the given content.
     /// </summary>
-    public sealed partial class ToastGui
+    /// <param name="message">The message to be shown.</param>
+    /// <param name="options">Options for the toast.</param>
+    public void ShowNormal(SeString message, ToastOptions options = null)
     {
-        /// <summary>
-        /// Show a toast message with the given content.
-        /// </summary>
-        /// <param name="message">The message to be shown.</param>
-        /// <param name="options">Options for the toast.</param>
-        public void ShowNormal(string message, ToastOptions options = null)
+        options ??= new ToastOptions();
+        this.normalQueue.Enqueue((message.Encode(), options));
+    }
+
+    private void ShowNormal(byte[] bytes, ToastOptions options = null)
+    {
+        options ??= new ToastOptions();
+
+        var manager = Service<GameGui>.GetNullable()?.GetUIModule();
+        if (manager == null)
+            return;
+
+        // terminate the string
+        var terminated = Terminate(bytes);
+
+        unsafe
         {
-            options ??= new ToastOptions();
-            this.normalQueue.Enqueue((Encoding.UTF8.GetBytes(message), options));
-        }
-
-        /// <summary>
-        /// Show a toast message with the given content.
-        /// </summary>
-        /// <param name="message">The message to be shown.</param>
-        /// <param name="options">Options for the toast.</param>
-        public void ShowNormal(SeString message, ToastOptions options = null)
-        {
-            options ??= new ToastOptions();
-            this.normalQueue.Enqueue((message.Encode(), options));
-        }
-
-        private void ShowNormal(byte[] bytes, ToastOptions options = null)
-        {
-            options ??= new ToastOptions();
-
-            var manager = Service<GameGui>.GetNullable()?.GetUIModule();
-            if (manager == null)
-                return;
-
-            // terminate the string
-            var terminated = Terminate(bytes);
-
-            unsafe
+            fixed (byte* ptr = terminated)
             {
-                fixed (byte* ptr = terminated)
-                {
-                    this.HandleNormalToastDetour(manager!.Value, (IntPtr)ptr, 5, (byte)options.Position, (byte)options.Speed, 0);
-                }
-            }
-        }
-
-        private IntPtr HandleNormalToastDetour(IntPtr manager, IntPtr text, int layer, byte isTop, byte isFast, int logMessageId)
-        {
-            if (text == IntPtr.Zero)
-            {
-                return IntPtr.Zero;
-            }
-
-            // call events
-            var isHandled = false;
-            var str = this.ParseString(text);
-            var options = new ToastOptions
-            {
-                Position = (ToastPosition)isTop,
-                Speed = (ToastSpeed)isFast,
-            };
-
-            this.Toast?.Invoke(ref str, ref options, ref isHandled);
-
-            // do nothing if handled
-            if (isHandled)
-            {
-                return IntPtr.Zero;
-            }
-
-            var terminated = Terminate(str.Encode());
-
-            unsafe
-            {
-                fixed (byte* message = terminated)
-                {
-                    return this.showNormalToastHook.Original(manager, (IntPtr)message, layer, (byte)options.Position, (byte)options.Speed, logMessageId);
-                }
+                this.HandleNormalToastDetour(manager!.Value, (IntPtr)ptr, 5, (byte)options.Position, (byte)options.Speed, 0);
             }
         }
     }
 
-    /// <summary>
-    /// Handles quest toasts.
-    /// </summary>
-    public sealed partial class ToastGui
+    private IntPtr HandleNormalToastDetour(IntPtr manager, IntPtr text, int layer, byte isTop, byte isFast, int logMessageId)
     {
-        /// <summary>
-        /// Show a quest toast message with the given content.
-        /// </summary>
-        /// <param name="message">The message to be shown.</param>
-        /// <param name="options">Options for the toast.</param>
-        public void ShowQuest(string message, QuestToastOptions options = null)
+        if (text == IntPtr.Zero)
         {
-            options ??= new QuestToastOptions();
-            this.questQueue.Enqueue((Encoding.UTF8.GetBytes(message), options));
+            return IntPtr.Zero;
         }
 
-        /// <summary>
-        /// Show a quest toast message with the given content.
-        /// </summary>
-        /// <param name="message">The message to be shown.</param>
-        /// <param name="options">Options for the toast.</param>
-        public void ShowQuest(SeString message, QuestToastOptions options = null)
+        // call events
+        var isHandled = false;
+        var str = this.ParseString(text);
+        var options = new ToastOptions
         {
-            options ??= new QuestToastOptions();
-            this.questQueue.Enqueue((message.Encode(), options));
+            Position = (ToastPosition)isTop,
+            Speed = (ToastSpeed)isFast,
+        };
+
+        this.Toast?.Invoke(ref str, ref options, ref isHandled);
+
+        // do nothing if handled
+        if (isHandled)
+        {
+            return IntPtr.Zero;
         }
 
-        private void ShowQuest(byte[] bytes, QuestToastOptions options = null)
+        var terminated = Terminate(str.Encode());
+
+        unsafe
         {
-            options ??= new QuestToastOptions();
-
-            var manager = Service<GameGui>.GetNullable()?.GetUIModule();
-            if (manager == null)
-                return;
-
-            // terminate the string
-            var terminated = Terminate(bytes);
-
-            var (ioc1, ioc2) = this.DetermineParameterOrder(options);
-
-            unsafe
+            fixed (byte* message = terminated)
             {
-                fixed (byte* ptr = terminated)
-                {
-                    this.HandleQuestToastDetour(
-                        manager!.Value,
-                        (int)options.Position,
-                        (IntPtr)ptr,
-                        ioc1,
-                        options.PlaySound ? (byte)1 : (byte)0,
-                        ioc2,
-                        0);
-                }
-            }
-        }
-
-        private byte HandleQuestToastDetour(IntPtr manager, int position, IntPtr text, uint iconOrCheck1, byte playSound, uint iconOrCheck2, byte alsoPlaySound)
-        {
-            if (text == IntPtr.Zero)
-            {
-                return 0;
-            }
-
-            // call events
-            var isHandled = false;
-            var str = this.ParseString(text);
-            var options = new QuestToastOptions
-            {
-                Position = (QuestToastPosition)position,
-                DisplayCheckmark = iconOrCheck1 == QuestToastCheckmarkMagic,
-                IconId = iconOrCheck1 == QuestToastCheckmarkMagic ? iconOrCheck2 : iconOrCheck1,
-                PlaySound = playSound == 1,
-            };
-
-            this.QuestToast?.Invoke(ref str, ref options, ref isHandled);
-
-            // do nothing if handled
-            if (isHandled)
-            {
-                return 0;
-            }
-
-            var terminated = Terminate(str.Encode());
-
-            var (ioc1, ioc2) = this.DetermineParameterOrder(options);
-
-            unsafe
-            {
-                fixed (byte* message = terminated)
-                {
-                    return this.showQuestToastHook.Original(
-                        manager,
-                        (int)options.Position,
-                        (IntPtr)message,
-                        ioc1,
-                        options.PlaySound ? (byte)1 : (byte)0,
-                        ioc2,
-                        0);
-                }
-            }
-        }
-
-        private (uint IconOrCheck1, uint IconOrCheck2) DetermineParameterOrder(QuestToastOptions options)
-        {
-            return options.DisplayCheckmark
-                ? (QuestToastCheckmarkMagic, options.IconId)
-                : (options.IconId, 0);
-        }
-    }
-
-    /// <summary>
-    /// Handles error toasts.
-    /// </summary>
-    public sealed partial class ToastGui
-    {
-        /// <summary>
-        /// Show an error toast message with the given content.
-        /// </summary>
-        /// <param name="message">The message to be shown.</param>
-        public void ShowError(string message)
-        {
-            this.errorQueue.Enqueue(Encoding.UTF8.GetBytes(message));
-        }
-
-        /// <summary>
-        /// Show an error toast message with the given content.
-        /// </summary>
-        /// <param name="message">The message to be shown.</param>
-        public void ShowError(SeString message)
-        {
-            this.errorQueue.Enqueue(message.Encode());
-        }
-
-        private void ShowError(byte[] bytes)
-        {
-            var manager = Service<GameGui>.GetNullable()?.GetUIModule();
-            if (manager == null)
-                return;
-
-            // terminate the string
-            var terminated = Terminate(bytes);
-
-            unsafe
-            {
-                fixed (byte* ptr = terminated)
-                {
-                    this.HandleErrorToastDetour(manager!.Value, (IntPtr)ptr, 0);
-                }
-            }
-        }
-
-        private byte HandleErrorToastDetour(IntPtr manager, IntPtr text, byte respectsHidingMaybe)
-        {
-            if (text == IntPtr.Zero)
-            {
-                return 0;
-            }
-
-            // call events
-            var isHandled = false;
-            var str = this.ParseString(text);
-
-            this.ErrorToast?.Invoke(ref str, ref isHandled);
-
-            // do nothing if handled
-            if (isHandled)
-            {
-                return 0;
-            }
-
-            var terminated = Terminate(str.Encode());
-
-            unsafe
-            {
-                fixed (byte* message = terminated)
-                {
-                    return this.showErrorToastHook.Original(manager, (IntPtr)message, respectsHidingMaybe);
-                }
+                return this.showNormalToastHook.Original(manager, (IntPtr)message, layer, (byte)options.Position, (byte)options.Speed, logMessageId);
+            }
+        }
+    }
+}
+
+/// <summary>
+/// Handles quest toasts.
+/// </summary>
+public sealed partial class ToastGui
+{
+    /// <summary>
+    /// Show a quest toast message with the given content.
+    /// </summary>
+    /// <param name="message">The message to be shown.</param>
+    /// <param name="options">Options for the toast.</param>
+    public void ShowQuest(string message, QuestToastOptions options = null)
+    {
+        options ??= new QuestToastOptions();
+        this.questQueue.Enqueue((Encoding.UTF8.GetBytes(message), options));
+    }
+
+    /// <summary>
+    /// Show a quest toast message with the given content.
+    /// </summary>
+    /// <param name="message">The message to be shown.</param>
+    /// <param name="options">Options for the toast.</param>
+    public void ShowQuest(SeString message, QuestToastOptions options = null)
+    {
+        options ??= new QuestToastOptions();
+        this.questQueue.Enqueue((message.Encode(), options));
+    }
+
+    private void ShowQuest(byte[] bytes, QuestToastOptions options = null)
+    {
+        options ??= new QuestToastOptions();
+
+        var manager = Service<GameGui>.GetNullable()?.GetUIModule();
+        if (manager == null)
+            return;
+
+        // terminate the string
+        var terminated = Terminate(bytes);
+
+        var (ioc1, ioc2) = this.DetermineParameterOrder(options);
+
+        unsafe
+        {
+            fixed (byte* ptr = terminated)
+            {
+                this.HandleQuestToastDetour(
+                    manager!.Value,
+                    (int)options.Position,
+                    (IntPtr)ptr,
+                    ioc1,
+                    options.PlaySound ? (byte)1 : (byte)0,
+                    ioc2,
+                    0);
+            }
+        }
+    }
+
+    private byte HandleQuestToastDetour(IntPtr manager, int position, IntPtr text, uint iconOrCheck1, byte playSound, uint iconOrCheck2, byte alsoPlaySound)
+    {
+        if (text == IntPtr.Zero)
+        {
+            return 0;
+        }
+
+        // call events
+        var isHandled = false;
+        var str = this.ParseString(text);
+        var options = new QuestToastOptions
+        {
+            Position = (QuestToastPosition)position,
+            DisplayCheckmark = iconOrCheck1 == QuestToastCheckmarkMagic,
+            IconId = iconOrCheck1 == QuestToastCheckmarkMagic ? iconOrCheck2 : iconOrCheck1,
+            PlaySound = playSound == 1,
+        };
+
+        this.QuestToast?.Invoke(ref str, ref options, ref isHandled);
+
+        // do nothing if handled
+        if (isHandled)
+        {
+            return 0;
+        }
+
+        var terminated = Terminate(str.Encode());
+
+        var (ioc1, ioc2) = this.DetermineParameterOrder(options);
+
+        unsafe
+        {
+            fixed (byte* message = terminated)
+            {
+                return this.showQuestToastHook.Original(
+                    manager,
+                    (int)options.Position,
+                    (IntPtr)message,
+                    ioc1,
+                    options.PlaySound ? (byte)1 : (byte)0,
+                    ioc2,
+                    0);
+            }
+        }
+    }
+
+    private (uint IconOrCheck1, uint IconOrCheck2) DetermineParameterOrder(QuestToastOptions options)
+    {
+        return options.DisplayCheckmark
+                   ? (QuestToastCheckmarkMagic, options.IconId)
+                   : (options.IconId, 0);
+    }
+}
+
+/// <summary>
+/// Handles error toasts.
+/// </summary>
+public sealed partial class ToastGui
+{
+    /// <summary>
+    /// Show an error toast message with the given content.
+    /// </summary>
+    /// <param name="message">The message to be shown.</param>
+    public void ShowError(string message)
+    {
+        this.errorQueue.Enqueue(Encoding.UTF8.GetBytes(message));
+    }
+
+    /// <summary>
+    /// Show an error toast message with the given content.
+    /// </summary>
+    /// <param name="message">The message to be shown.</param>
+    public void ShowError(SeString message)
+    {
+        this.errorQueue.Enqueue(message.Encode());
+    }
+
+    private void ShowError(byte[] bytes)
+    {
+        var manager = Service<GameGui>.GetNullable()?.GetUIModule();
+        if (manager == null)
+            return;
+
+        // terminate the string
+        var terminated = Terminate(bytes);
+
+        unsafe
+        {
+            fixed (byte* ptr = terminated)
+            {
+                this.HandleErrorToastDetour(manager!.Value, (IntPtr)ptr, 0);
+            }
+        }
+    }
+
+    private byte HandleErrorToastDetour(IntPtr manager, IntPtr text, byte respectsHidingMaybe)
+    {
+        if (text == IntPtr.Zero)
+        {
+            return 0;
+        }
+
+        // call events
+        var isHandled = false;
+        var str = this.ParseString(text);
+
+        this.ErrorToast?.Invoke(ref str, ref isHandled);
+
+        // do nothing if handled
+        if (isHandled)
+        {
+            return 0;
+        }
+
+        var terminated = Terminate(str.Encode());
+
+        unsafe
+        {
+            fixed (byte* message = terminated)
+            {
+                return this.showErrorToastHook.Original(manager, (IntPtr)message, respectsHidingMaybe);
             }
         }
     }
diff --git a/Dalamud/Game/Gui/Toast/ToastGuiAddressResolver.cs b/Dalamud/Game/Gui/Toast/ToastGuiAddressResolver.cs
index 75a1e96b6..4f935b465 100644
--- a/Dalamud/Game/Gui/Toast/ToastGuiAddressResolver.cs
+++ b/Dalamud/Game/Gui/Toast/ToastGuiAddressResolver.cs
@@ -1,33 +1,32 @@
 using System;
 
-namespace Dalamud.Game.Gui.Toast
+namespace Dalamud.Game.Gui.Toast;
+
+/// <summary>
+/// An address resolver for the <see cref="ToastGui"/> class.
+/// </summary>
+public class ToastGuiAddressResolver : BaseAddressResolver
 {
     /// <summary>
-    /// An address resolver for the <see cref="ToastGui"/> class.
+    /// Gets the address of the native ShowNormalToast method.
     /// </summary>
-    public class ToastGuiAddressResolver : BaseAddressResolver
+    public IntPtr ShowNormalToast { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native ShowQuestToast method.
+    /// </summary>
+    public IntPtr ShowQuestToast { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the ShowErrorToast method.
+    /// </summary>
+    public IntPtr ShowErrorToast { get; private set; }
+
+    /// <inheritdoc/>
+    protected override void Setup64Bit(SigScanner sig)
     {
-        /// <summary>
-        /// Gets the address of the native ShowNormalToast method.
-        /// </summary>
-        public IntPtr ShowNormalToast { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native ShowQuestToast method.
-        /// </summary>
-        public IntPtr ShowQuestToast { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the ShowErrorToast method.
-        /// </summary>
-        public IntPtr ShowErrorToast { get; private set; }
-
-        /// <inheritdoc/>
-        protected override void Setup64Bit(SigScanner sig)
-        {
-            this.ShowNormalToast = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 30 83 3D ?? ?? ?? ?? ??");
-            this.ShowQuestToast = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 41 56 48 83 EC 40 83 3D ?? ?? ?? ?? ??");
-            this.ShowErrorToast = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 83 3D ?? ?? ?? ?? ?? 41 0F B6 F0");
-        }
+        this.ShowNormalToast = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 30 83 3D ?? ?? ?? ?? ??");
+        this.ShowQuestToast = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 41 56 48 83 EC 40 83 3D ?? ?? ?? ?? ??");
+        this.ShowErrorToast = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 83 3D ?? ?? ?? ?? ?? 41 0F B6 F0");
     }
 }
diff --git a/Dalamud/Game/Gui/Toast/ToastOptions.cs b/Dalamud/Game/Gui/Toast/ToastOptions.cs
index 0939bb5bb..32b5ae646 100644
--- a/Dalamud/Game/Gui/Toast/ToastOptions.cs
+++ b/Dalamud/Game/Gui/Toast/ToastOptions.cs
@@ -1,18 +1,17 @@
-namespace Dalamud.Game.Gui.Toast
+namespace Dalamud.Game.Gui.Toast;
+
+/// <summary>
+/// This class represents options that can be used with the <see cref="ToastGui"/> class.
+/// </summary>
+public sealed class ToastOptions
 {
     /// <summary>
-    /// This class represents options that can be used with the <see cref="ToastGui"/> class.
+    /// Gets or sets the position of the toast on the screen.
     /// </summary>
-    public sealed class ToastOptions
-    {
-        /// <summary>
-        /// Gets or sets the position of the toast on the screen.
-        /// </summary>
-        public ToastPosition Position { get; set; } = ToastPosition.Bottom;
+    public ToastPosition Position { get; set; } = ToastPosition.Bottom;
 
-        /// <summary>
-        /// Gets or sets the speed of the toast.
-        /// </summary>
-        public ToastSpeed Speed { get; set; } = ToastSpeed.Slow;
-    }
+    /// <summary>
+    /// Gets or sets the speed of the toast.
+    /// </summary>
+    public ToastSpeed Speed { get; set; } = ToastSpeed.Slow;
 }
diff --git a/Dalamud/Game/Gui/Toast/ToastPosition.cs b/Dalamud/Game/Gui/Toast/ToastPosition.cs
index 14f489711..3e5696c3e 100644
--- a/Dalamud/Game/Gui/Toast/ToastPosition.cs
+++ b/Dalamud/Game/Gui/Toast/ToastPosition.cs
@@ -1,18 +1,17 @@
-namespace Dalamud.Game.Gui.Toast
+namespace Dalamud.Game.Gui.Toast;
+
+/// <summary>
+/// The positioning of native toast windows.
+/// </summary>
+public enum ToastPosition : byte
 {
     /// <summary>
-    /// The positioning of native toast windows.
+    /// The toast will be towards the bottom.
     /// </summary>
-    public enum ToastPosition : byte
-    {
-        /// <summary>
-        /// The toast will be towards the bottom.
-        /// </summary>
-        Bottom = 0,
+    Bottom = 0,
 
-        /// <summary>
-        /// The toast will be towards the top.
-        /// </summary>
-        Top = 1,
-    }
+    /// <summary>
+    /// The toast will be towards the top.
+    /// </summary>
+    Top = 1,
 }
diff --git a/Dalamud/Game/Gui/Toast/ToastSpeed.cs b/Dalamud/Game/Gui/Toast/ToastSpeed.cs
index 0f54df273..1858764cc 100644
--- a/Dalamud/Game/Gui/Toast/ToastSpeed.cs
+++ b/Dalamud/Game/Gui/Toast/ToastSpeed.cs
@@ -1,18 +1,17 @@
-namespace Dalamud.Game.Gui.Toast
+namespace Dalamud.Game.Gui.Toast;
+
+/// <summary>
+/// The speed at which native toast windows will persist.
+/// </summary>
+public enum ToastSpeed : byte
 {
     /// <summary>
-    /// The speed at which native toast windows will persist.
+    /// The toast will take longer to disappear (around four seconds).
     /// </summary>
-    public enum ToastSpeed : byte
-    {
-        /// <summary>
-        /// The toast will take longer to disappear (around four seconds).
-        /// </summary>
-        Slow = 0,
+    Slow = 0,
 
-        /// <summary>
-        /// The toast will disappear more quickly (around two seconds).
-        /// </summary>
-        Fast = 1,
-    }
+    /// <summary>
+    /// The toast will disappear more quickly (around two seconds).
+    /// </summary>
+    Fast = 1,
 }
diff --git a/Dalamud/Game/Internal/AntiDebug.cs b/Dalamud/Game/Internal/AntiDebug.cs
index 3b84b6cce..ba482ef48 100644
--- a/Dalamud/Game/Internal/AntiDebug.cs
+++ b/Dalamud/Game/Internal/AntiDebug.cs
@@ -6,126 +6,125 @@ using Dalamud.Configuration.Internal;
 #endif
 using Serilog;
 
-namespace Dalamud.Game.Internal
+namespace Dalamud.Game.Internal;
+
+/// <summary>
+/// This class disables anti-debug functionality in the game client.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal sealed partial class AntiDebug : IServiceType
 {
-    /// <summary>
-    /// This class disables anti-debug functionality in the game client.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal sealed partial class AntiDebug : IServiceType
+    private readonly byte[] nop = new byte[] { 0x31, 0xC0, 0x90, 0x90, 0x90, 0x90 };
+    private byte[] original;
+    private IntPtr debugCheckAddress;
+
+    [ServiceManager.ServiceConstructor]
+    private AntiDebug(SigScanner sigScanner)
     {
-        private readonly byte[] nop = new byte[] { 0x31, 0xC0, 0x90, 0x90, 0x90, 0x90 };
-        private byte[] original;
-        private IntPtr debugCheckAddress;
-
-        [ServiceManager.ServiceConstructor]
-        private AntiDebug(SigScanner sigScanner)
+        try
         {
-            try
-            {
-                this.debugCheckAddress = sigScanner.ScanText("FF 15 ?? ?? ?? ?? 85 C0 74 11 41");
-            }
-            catch (KeyNotFoundException)
-            {
-                this.debugCheckAddress = IntPtr.Zero;
-            }
+            this.debugCheckAddress = sigScanner.ScanText("FF 15 ?? ?? ?? ?? 85 C0 74 11 41");
+        }
+        catch (KeyNotFoundException)
+        {
+            this.debugCheckAddress = IntPtr.Zero;
+        }
 
-            Log.Verbose($"Debug check address 0x{this.debugCheckAddress.ToInt64():X}");
+        Log.Verbose($"Debug check address 0x{this.debugCheckAddress.ToInt64():X}");
 
-            if (!this.IsEnabled)
-            {
+        if (!this.IsEnabled)
+        {
 #if DEBUG
                 this.Enable();
 #else
-                if (Service<DalamudConfiguration>.Get().IsAntiAntiDebugEnabled)
-                    this.Enable();
+            if (Service<DalamudConfiguration>.Get().IsAntiAntiDebugEnabled)
+                this.Enable();
 #endif
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the anti-debugging is enabled.
-        /// </summary>
-        public bool IsEnabled { get; private set; } = false;
-
-        /// <summary>
-        /// Enables the anti-debugging by overwriting code in memory.
-        /// </summary>
-        public void Enable()
-        {
-            this.original = new byte[this.nop.Length];
-            if (this.debugCheckAddress != IntPtr.Zero && !this.IsEnabled)
-            {
-                Log.Information($"Overwriting debug check at 0x{this.debugCheckAddress.ToInt64():X}");
-                SafeMemory.ReadBytes(this.debugCheckAddress, this.nop.Length, out this.original);
-                SafeMemory.WriteBytes(this.debugCheckAddress, this.nop);
-            }
-            else
-            {
-                Log.Information("Debug check already overwritten?");
-            }
-
-            this.IsEnabled = true;
-        }
-
-        /// <summary>
-        /// Disable the anti-debugging by reverting the overwritten code in memory.
-        /// </summary>
-        public void Disable()
-        {
-            if (this.debugCheckAddress != IntPtr.Zero && this.original != null)
-            {
-                Log.Information($"Reverting debug check at 0x{this.debugCheckAddress.ToInt64():X}");
-                SafeMemory.WriteBytes(this.debugCheckAddress, this.original);
-            }
-            else
-            {
-                Log.Information("Debug check was not overwritten?");
-            }
-
-            this.IsEnabled = false;
         }
     }
 
     /// <summary>
-    /// Implementing IDisposable.
+    /// Gets a value indicating whether the anti-debugging is enabled.
     /// </summary>
-    internal sealed partial class AntiDebug : IDisposable
+    public bool IsEnabled { get; private set; } = false;
+
+    /// <summary>
+    /// Enables the anti-debugging by overwriting code in memory.
+    /// </summary>
+    public void Enable()
     {
-        private bool disposed = false;
-
-        /// <summary>
-        /// Finalizes an instance of the <see cref="AntiDebug"/> class.
-        /// </summary>
-        ~AntiDebug() => this.Dispose(false);
-
-        /// <summary>
-        /// Disposes of managed and unmanaged resources.
-        /// </summary>
-        public void Dispose()
+        this.original = new byte[this.nop.Length];
+        if (this.debugCheckAddress != IntPtr.Zero && !this.IsEnabled)
         {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
+            Log.Information($"Overwriting debug check at 0x{this.debugCheckAddress.ToInt64():X}");
+            SafeMemory.ReadBytes(this.debugCheckAddress, this.nop.Length, out this.original);
+            SafeMemory.WriteBytes(this.debugCheckAddress, this.nop);
+        }
+        else
+        {
+            Log.Information("Debug check already overwritten?");
         }
 
-        /// <summary>
-        /// Disposes of managed and unmanaged resources.
-        /// </summary>
-        /// <param name="disposing">If this was disposed through calling Dispose() or from being finalized.</param>
-        private void Dispose(bool disposing)
+        this.IsEnabled = true;
+    }
+
+    /// <summary>
+    /// Disable the anti-debugging by reverting the overwritten code in memory.
+    /// </summary>
+    public void Disable()
+    {
+        if (this.debugCheckAddress != IntPtr.Zero && this.original != null)
         {
-            if (this.disposed)
-                return;
-
-            if (disposing)
-            {
-                // If anti-debug is enabled and is being disposed, odds are either the game is exiting, or Dalamud is being reloaded.
-                // If it is the latter, there's half a chance a debugger is currently attached. There's no real need to disable the
-                // check in either situation anyways. However if Dalamud is being reloaded, the sig may fail so may as well undo it.
-                this.Disable();
-            }
-
-            this.disposed = true;
+            Log.Information($"Reverting debug check at 0x{this.debugCheckAddress.ToInt64():X}");
+            SafeMemory.WriteBytes(this.debugCheckAddress, this.original);
         }
+        else
+        {
+            Log.Information("Debug check was not overwritten?");
+        }
+
+        this.IsEnabled = false;
+    }
+}
+
+/// <summary>
+/// Implementing IDisposable.
+/// </summary>
+internal sealed partial class AntiDebug : IDisposable
+{
+    private bool disposed = false;
+
+    /// <summary>
+    /// Finalizes an instance of the <see cref="AntiDebug"/> class.
+    /// </summary>
+    ~AntiDebug() => this.Dispose(false);
+
+    /// <summary>
+    /// Disposes of managed and unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+        this.Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Disposes of managed and unmanaged resources.
+    /// </summary>
+    /// <param name="disposing">If this was disposed through calling Dispose() or from being finalized.</param>
+    private void Dispose(bool disposing)
+    {
+        if (this.disposed)
+            return;
+
+        if (disposing)
+        {
+            // If anti-debug is enabled and is being disposed, odds are either the game is exiting, or Dalamud is being reloaded.
+            // If it is the latter, there's half a chance a debugger is currently attached. There's no real need to disable the
+            // check in either situation anyways. However if Dalamud is being reloaded, the sig may fail so may as well undo it.
+            this.Disable();
+        }
+
+        this.disposed = true;
     }
 }
diff --git a/Dalamud/Game/Internal/DXGI/Definitions/ID3D11DeviceVtbl.cs b/Dalamud/Game/Internal/DXGI/Definitions/ID3D11DeviceVtbl.cs
index 7703713b3..4bd369dd3 100644
--- a/Dalamud/Game/Internal/DXGI/Definitions/ID3D11DeviceVtbl.cs
+++ b/Dalamud/Game/Internal/DXGI/Definitions/ID3D11DeviceVtbl.cs
@@ -1,227 +1,226 @@
-namespace Dalamud.Game.Internal.DXGI.Definitions
+namespace Dalamud.Game.Internal.DXGI.Definitions;
+
+/// <summary>
+/// Contains a full list of ID3D11Device functions to be used as an indexer into the DirectX Virtual Function Table entries.
+/// </summary>
+internal enum ID3D11DeviceVtbl
 {
+    // IUnknown
+
     /// <summary>
-    /// Contains a full list of ID3D11Device functions to be used as an indexer into the DirectX Virtual Function Table entries.
+    /// IUnknown::QueryInterface method (unknwn.h).
     /// </summary>
-    internal enum ID3D11DeviceVtbl
-    {
-        // IUnknown
+    QueryInterface = 0,
 
-        /// <summary>
-        /// IUnknown::QueryInterface method (unknwn.h).
-        /// </summary>
-        QueryInterface = 0,
+    /// <summary>
+    /// IUnknown::AddRef method (unknwn.h).
+    /// </summary>
+    AddRef = 1,
 
-        /// <summary>
-        /// IUnknown::AddRef method (unknwn.h).
-        /// </summary>
-        AddRef = 1,
+    /// <summary>
+    /// IUnknown::Release method (unknwn.h).
+    /// </summary>
+    Release = 2,
 
-        /// <summary>
-        /// IUnknown::Release method (unknwn.h).
-        /// </summary>
-        Release = 2,
+    // ID3D11Device
 
-        // ID3D11Device
+    /// <summary>
+    /// ID3D11Device::CreateBuffer method (d3d11.h).
+    /// </summary>
+    CreateBuffer = 3,
 
-        /// <summary>
-        /// ID3D11Device::CreateBuffer method (d3d11.h).
-        /// </summary>
-        CreateBuffer = 3,
+    /// <summary>
+    /// ID3D11Device::CreateTexture1D method (d3d11.h).
+    /// </summary>
+    CreateTexture1D = 4,
 
-        /// <summary>
-        /// ID3D11Device::CreateTexture1D method (d3d11.h).
-        /// </summary>
-        CreateTexture1D = 4,
+    /// <summary>
+    /// ID3D11Device::CreateTexture2D method (d3d11.h).
+    /// </summary>
+    CreateTexture2D = 5,
 
-        /// <summary>
-        /// ID3D11Device::CreateTexture2D method (d3d11.h).
-        /// </summary>
-        CreateTexture2D = 5,
+    /// <summary>
+    /// ID3D11Device::CreateTexture3D method (d3d11.h).
+    /// </summary>
+    CreateTexture3D = 6,
 
-        /// <summary>
-        /// ID3D11Device::CreateTexture3D method (d3d11.h).
-        /// </summary>
-        CreateTexture3D = 6,
+    /// <summary>
+    /// ID3D11Device::CreateShaderResourceView method (d3d11.h).
+    /// </summary>
+    CreateShaderResourceView = 7,
 
-        /// <summary>
-        /// ID3D11Device::CreateShaderResourceView method (d3d11.h).
-        /// </summary>
-        CreateShaderResourceView = 7,
+    /// <summary>
+    /// ID3D11Device::CreateUnorderedAccessView method (d3d11.h).
+    /// </summary>
+    CreateUnorderedAccessView = 8,
 
-        /// <summary>
-        /// ID3D11Device::CreateUnorderedAccessView method (d3d11.h).
-        /// </summary>
-        CreateUnorderedAccessView = 8,
+    /// <summary>
+    /// ID3D11Device::CreateRenderTargetView method (d3d11.h).
+    /// </summary>
+    CreateRenderTargetView = 9,
 
-        /// <summary>
-        /// ID3D11Device::CreateRenderTargetView method (d3d11.h).
-        /// </summary>
-        CreateRenderTargetView = 9,
+    /// <summary>
+    /// ID3D11Device::CreateDepthStencilView method (d3d11.h).
+    /// </summary>
+    CreateDepthStencilView = 10,
 
-        /// <summary>
-        /// ID3D11Device::CreateDepthStencilView method (d3d11.h).
-        /// </summary>
-        CreateDepthStencilView = 10,
+    /// <summary>
+    /// ID3D11Device::CreateInputLayout method (d3d11.h).
+    /// </summary>
+    CreateInputLayout = 11,
 
-        /// <summary>
-        /// ID3D11Device::CreateInputLayout method (d3d11.h).
-        /// </summary>
-        CreateInputLayout = 11,
+    /// <summary>
+    /// ID3D11Device::CreateVertexShader method (d3d11.h).
+    /// </summary>
+    CreateVertexShader = 12,
 
-        /// <summary>
-        /// ID3D11Device::CreateVertexShader method (d3d11.h).
-        /// </summary>
-        CreateVertexShader = 12,
+    /// <summary>
+    /// ID3D11Device::CreateGeometryShader method (d3d11.h).
+    /// </summary>
+    CreateGeometryShader = 13,
 
-        /// <summary>
-        /// ID3D11Device::CreateGeometryShader method (d3d11.h).
-        /// </summary>
-        CreateGeometryShader = 13,
+    /// <summary>
+    /// ID3D11Device::CreateGeometryShaderWithStreamOutput method (d3d11.h).
+    /// </summary>
+    CreateGeometryShaderWithStreamOutput = 14,
 
-        /// <summary>
-        /// ID3D11Device::CreateGeometryShaderWithStreamOutput method (d3d11.h).
-        /// </summary>
-        CreateGeometryShaderWithStreamOutput = 14,
+    /// <summary>
+    /// ID3D11Device::CreatePixelShader method (d3d11.h).
+    /// </summary>
+    CreatePixelShader = 15,
 
-        /// <summary>
-        /// ID3D11Device::CreatePixelShader method (d3d11.h).
-        /// </summary>
-        CreatePixelShader = 15,
+    /// <summary>
+    /// ID3D11Device::CreateHullShader method (d3d11.h).
+    /// </summary>
+    CreateHullShader = 16,
 
-        /// <summary>
-        /// ID3D11Device::CreateHullShader method (d3d11.h).
-        /// </summary>
-        CreateHullShader = 16,
+    /// <summary>
+    /// ID3D11Device::CreateDomainShader method (d3d11.h).
+    /// </summary>
+    CreateDomainShader = 17,
 
-        /// <summary>
-        /// ID3D11Device::CreateDomainShader method (d3d11.h).
-        /// </summary>
-        CreateDomainShader = 17,
+    /// <summary>
+    /// ID3D11Device::CreateComputeShader method (d3d11.h).
+    /// </summary>
+    CreateComputeShader = 18,
 
-        /// <summary>
-        /// ID3D11Device::CreateComputeShader method (d3d11.h).
-        /// </summary>
-        CreateComputeShader = 18,
+    /// <summary>
+    /// ID3D11Device::CreateClassLinkage method (d3d11.h).
+    /// </summary>
+    CreateClassLinkage = 19,
 
-        /// <summary>
-        /// ID3D11Device::CreateClassLinkage method (d3d11.h).
-        /// </summary>
-        CreateClassLinkage = 19,
+    /// <summary>
+    /// ID3D11Device::CreateBlendState method (d3d11.h).
+    /// </summary>
+    CreateBlendState = 20,
 
-        /// <summary>
-        /// ID3D11Device::CreateBlendState method (d3d11.h).
-        /// </summary>
-        CreateBlendState = 20,
+    /// <summary>
+    /// ID3D11Device::CreateDepthStencilState method (d3d11.h).
+    /// </summary>
+    CreateDepthStencilState = 21,
 
-        /// <summary>
-        /// ID3D11Device::CreateDepthStencilState method (d3d11.h).
-        /// </summary>
-        CreateDepthStencilState = 21,
+    /// <summary>
+    /// ID3D11Device::CreateRasterizerState method (d3d11.h).
+    /// </summary>
+    CreateRasterizerState = 22,
 
-        /// <summary>
-        /// ID3D11Device::CreateRasterizerState method (d3d11.h).
-        /// </summary>
-        CreateRasterizerState = 22,
+    /// <summary>
+    /// ID3D11Device::CreateSamplerState method (d3d11.h).
+    /// </summary>
+    CreateSamplerState = 23,
 
-        /// <summary>
-        /// ID3D11Device::CreateSamplerState method (d3d11.h).
-        /// </summary>
-        CreateSamplerState = 23,
+    /// <summary>
+    /// ID3D11Device::CreateQuery method (d3d11.h).
+    /// </summary>
+    CreateQuery = 24,
 
-        /// <summary>
-        /// ID3D11Device::CreateQuery method (d3d11.h).
-        /// </summary>
-        CreateQuery = 24,
+    /// <summary>
+    /// ID3D11Device::CreatePredicate method (d3d11.h).
+    /// </summary>
+    CreatePredicate = 25,
 
-        /// <summary>
-        /// ID3D11Device::CreatePredicate method (d3d11.h).
-        /// </summary>
-        CreatePredicate = 25,
+    /// <summary>
+    /// ID3D11Device::CreateCounter method (d3d11.h).
+    /// </summary>
+    CreateCounter = 26,
 
-        /// <summary>
-        /// ID3D11Device::CreateCounter method (d3d11.h).
-        /// </summary>
-        CreateCounter = 26,
+    /// <summary>
+    /// ID3D11Device::CreateDeferredContext method (d3d11.h).
+    /// </summary>
+    CreateDeferredContext = 27,
 
-        /// <summary>
-        /// ID3D11Device::CreateDeferredContext method (d3d11.h).
-        /// </summary>
-        CreateDeferredContext = 27,
+    /// <summary>
+    /// ID3D11Device::OpenSharedResource method (d3d11.h).
+    /// </summary>
+    OpenSharedResource = 28,
 
-        /// <summary>
-        /// ID3D11Device::OpenSharedResource method (d3d11.h).
-        /// </summary>
-        OpenSharedResource = 28,
+    /// <summary>
+    /// ID3D11Device::CheckFormatSupport method (d3d11.h).
+    /// </summary>
+    CheckFormatSupport = 29,
 
-        /// <summary>
-        /// ID3D11Device::CheckFormatSupport method (d3d11.h).
-        /// </summary>
-        CheckFormatSupport = 29,
+    /// <summary>
+    /// ID3D11Device::CheckMultisampleQualityLevels method (d3d11.h).
+    /// </summary>
+    CheckMultisampleQualityLevels = 30,
 
-        /// <summary>
-        /// ID3D11Device::CheckMultisampleQualityLevels method (d3d11.h).
-        /// </summary>
-        CheckMultisampleQualityLevels = 30,
+    /// <summary>
+    /// ID3D11Device::CheckCounterInfo method (d3d11.h).
+    /// </summary>
+    CheckCounterInfo = 31,
 
-        /// <summary>
-        /// ID3D11Device::CheckCounterInfo method (d3d11.h).
-        /// </summary>
-        CheckCounterInfo = 31,
+    /// <summary>
+    /// ID3D11Device::CheckCounter method (d3d11.h).
+    /// </summary>
+    CheckCounter = 32,
 
-        /// <summary>
-        /// ID3D11Device::CheckCounter method (d3d11.h).
-        /// </summary>
-        CheckCounter = 32,
+    /// <summary>
+    /// ID3D11Device::CheckFeatureSupport method (d3d11.h).
+    /// </summary>
+    CheckFeatureSupport = 33,
 
-        /// <summary>
-        /// ID3D11Device::CheckFeatureSupport method (d3d11.h).
-        /// </summary>
-        CheckFeatureSupport = 33,
+    /// <summary>
+    /// ID3D11Device::GetPrivateData method (d3d11.h).
+    /// </summary>
+    GetPrivateData = 34,
 
-        /// <summary>
-        /// ID3D11Device::GetPrivateData method (d3d11.h).
-        /// </summary>
-        GetPrivateData = 34,
+    /// <summary>
+    /// ID3D11Device::SetPrivateData method (d3d11.h).
+    /// </summary>
+    SetPrivateData = 35,
 
-        /// <summary>
-        /// ID3D11Device::SetPrivateData method (d3d11.h).
-        /// </summary>
-        SetPrivateData = 35,
+    /// <summary>
+    /// ID3D11Device::SetPrivateDataInterface method (d3d11.h).
+    /// </summary>
+    SetPrivateDataInterface = 36,
 
-        /// <summary>
-        /// ID3D11Device::SetPrivateDataInterface method (d3d11.h).
-        /// </summary>
-        SetPrivateDataInterface = 36,
+    /// <summary>
+    /// ID3D11Device::GetFeatureLevel method (d3d11.h).
+    /// </summary>
+    GetFeatureLevel = 37,
 
-        /// <summary>
-        /// ID3D11Device::GetFeatureLevel method (d3d11.h).
-        /// </summary>
-        GetFeatureLevel = 37,
+    /// <summary>
+    /// ID3D11Device::GetCreationFlags method (d3d11.h).
+    /// </summary>
+    GetCreationFlags = 38,
 
-        /// <summary>
-        /// ID3D11Device::GetCreationFlags method (d3d11.h).
-        /// </summary>
-        GetCreationFlags = 38,
+    /// <summary>
+    /// ID3D11Device::GetDeviceRemovedReason method (d3d11.h).
+    /// </summary>
+    GetDeviceRemovedReason = 39,
 
-        /// <summary>
-        /// ID3D11Device::GetDeviceRemovedReason method (d3d11.h).
-        /// </summary>
-        GetDeviceRemovedReason = 39,
+    /// <summary>
+    /// ID3D11Device::GetImmediateContext method (d3d11.h).
+    /// </summary>
+    GetImmediateContext = 40,
 
-        /// <summary>
-        /// ID3D11Device::GetImmediateContext method (d3d11.h).
-        /// </summary>
-        GetImmediateContext = 40,
+    /// <summary>
+    /// ID3D11Device::SetExceptionMode method (d3d11.h).
+    /// </summary>
+    SetExceptionMode = 41,
 
-        /// <summary>
-        /// ID3D11Device::SetExceptionMode method (d3d11.h).
-        /// </summary>
-        SetExceptionMode = 41,
-
-        /// <summary>
-        /// ID3D11Device::GetExceptionMode method (d3d11.h).
-        /// </summary>
-        GetExceptionMode = 42,
-    }
+    /// <summary>
+    /// ID3D11Device::GetExceptionMode method (d3d11.h).
+    /// </summary>
+    GetExceptionMode = 42,
 }
diff --git a/Dalamud/Game/Internal/DXGI/Definitions/IDXGISwapChainVtbl.cs b/Dalamud/Game/Internal/DXGI/Definitions/IDXGISwapChainVtbl.cs
index e3d627ce3..4bcb6fb72 100644
--- a/Dalamud/Game/Internal/DXGI/Definitions/IDXGISwapChainVtbl.cs
+++ b/Dalamud/Game/Internal/DXGI/Definitions/IDXGISwapChainVtbl.cs
@@ -1,107 +1,106 @@
-namespace Dalamud.Game.Internal.DXGI.Definitions
+namespace Dalamud.Game.Internal.DXGI.Definitions;
+
+/// <summary>
+/// Contains a full list of IDXGISwapChain functions to be used as an indexer into the SwapChain Virtual Function Table
+/// entries.
+/// </summary>
+internal enum IDXGISwapChainVtbl
 {
+    // IUnknown
+
     /// <summary>
-    /// Contains a full list of IDXGISwapChain functions to be used as an indexer into the SwapChain Virtual Function Table
-    /// entries.
+    /// IUnknown::QueryInterface method (unknwn.h).
     /// </summary>
-    internal enum IDXGISwapChainVtbl
-    {
-        // IUnknown
+    QueryInterface = 0,
 
-        /// <summary>
-        /// IUnknown::QueryInterface method (unknwn.h).
-        /// </summary>
-        QueryInterface = 0,
+    /// <summary>
+    /// IUnknown::AddRef method (unknwn.h).
+    /// </summary>
+    AddRef = 1,
 
-        /// <summary>
-        /// IUnknown::AddRef method (unknwn.h).
-        /// </summary>
-        AddRef = 1,
+    /// <summary>
+    /// IUnknown::Release method (unknwn.h).
+    /// </summary>
+    Release = 2,
 
-        /// <summary>
-        /// IUnknown::Release method (unknwn.h).
-        /// </summary>
-        Release = 2,
+    // IDXGIObject
 
-        // IDXGIObject
+    /// <summary>
+    /// IDXGIObject::SetPrivateData method (dxgi.h).
+    /// </summary>
+    SetPrivateData = 3,
 
-        /// <summary>
-        /// IDXGIObject::SetPrivateData method (dxgi.h).
-        /// </summary>
-        SetPrivateData = 3,
+    /// <summary>
+    /// IDXGIObject::SetPrivateDataInterface method (dxgi.h).
+    /// </summary>
+    SetPrivateDataInterface = 4,
 
-        /// <summary>
-        /// IDXGIObject::SetPrivateDataInterface method (dxgi.h).
-        /// </summary>
-        SetPrivateDataInterface = 4,
+    /// <summary>
+    /// IDXGIObject::GetPrivateData method (dxgi.h).
+    /// </summary>
+    GetPrivateData = 5,
 
-        /// <summary>
-        /// IDXGIObject::GetPrivateData method (dxgi.h).
-        /// </summary>
-        GetPrivateData = 5,
+    /// <summary>
+    /// IDXGIObject::GetParent method (dxgi.h).
+    /// </summary>
+    GetParent = 6,
 
-        /// <summary>
-        /// IDXGIObject::GetParent method (dxgi.h).
-        /// </summary>
-        GetParent = 6,
+    // IDXGIDeviceSubObject
 
-        // IDXGIDeviceSubObject
+    /// <summary>
+    /// IDXGIDeviceSubObject::GetDevice method (dxgi.h).
+    /// </summary>
+    GetDevice = 7,
 
-        /// <summary>
-        /// IDXGIDeviceSubObject::GetDevice method (dxgi.h).
-        /// </summary>
-        GetDevice = 7,
+    // IDXGISwapChain
 
-        // IDXGISwapChain
+    /// <summary>
+    /// IDXGISwapChain::Present method (dxgi.h).
+    /// </summary>
+    Present = 8,
 
-        /// <summary>
-        /// IDXGISwapChain::Present method (dxgi.h).
-        /// </summary>
-        Present = 8,
+    /// <summary>
+    /// IUnknIDXGISwapChainown::GetBuffer method (dxgi.h).
+    /// </summary>
+    GetBuffer = 9,
 
-        /// <summary>
-        /// IUnknIDXGISwapChainown::GetBuffer method (dxgi.h).
-        /// </summary>
-        GetBuffer = 9,
+    /// <summary>
+    /// IDXGISwapChain::SetFullscreenState method (dxgi.h).
+    /// </summary>
+    SetFullscreenState = 10,
 
-        /// <summary>
-        /// IDXGISwapChain::SetFullscreenState method (dxgi.h).
-        /// </summary>
-        SetFullscreenState = 10,
+    /// <summary>
+    /// IDXGISwapChain::GetFullscreenState method (dxgi.h).
+    /// </summary>
+    GetFullscreenState = 11,
 
-        /// <summary>
-        /// IDXGISwapChain::GetFullscreenState method (dxgi.h).
-        /// </summary>
-        GetFullscreenState = 11,
+    /// <summary>
+    /// IDXGISwapChain::GetDesc method (dxgi.h).
+    /// </summary>
+    GetDesc = 12,
 
-        /// <summary>
-        /// IDXGISwapChain::GetDesc method (dxgi.h).
-        /// </summary>
-        GetDesc = 12,
+    /// <summary>
+    /// IDXGISwapChain::ResizeBuffers method (dxgi.h).
+    /// </summary>
+    ResizeBuffers = 13,
 
-        /// <summary>
-        /// IDXGISwapChain::ResizeBuffers method (dxgi.h).
-        /// </summary>
-        ResizeBuffers = 13,
+    /// <summary>
+    /// IDXGISwapChain::ResizeTarget method (dxgi.h).
+    /// </summary>
+    ResizeTarget = 14,
 
-        /// <summary>
-        /// IDXGISwapChain::ResizeTarget method (dxgi.h).
-        /// </summary>
-        ResizeTarget = 14,
+    /// <summary>
+    /// IDXGISwapChain::GetContainingOutput method (dxgi.h).
+    /// </summary>
+    GetContainingOutput = 15,
 
-        /// <summary>
-        /// IDXGISwapChain::GetContainingOutput method (dxgi.h).
-        /// </summary>
-        GetContainingOutput = 15,
+    /// <summary>
+    /// IDXGISwapChain::GetFrameStatistics method (dxgi.h).
+    /// </summary>
+    GetFrameStatistics = 16,
 
-        /// <summary>
-        /// IDXGISwapChain::GetFrameStatistics method (dxgi.h).
-        /// </summary>
-        GetFrameStatistics = 16,
-
-        /// <summary>
-        /// IDXGISwapChain::GetLastPresentCount method (dxgi.h).
-        /// </summary>
-        GetLastPresentCount = 17,
-    }
+    /// <summary>
+    /// IDXGISwapChain::GetLastPresentCount method (dxgi.h).
+    /// </summary>
+    GetLastPresentCount = 17,
 }
diff --git a/Dalamud/Game/Internal/DXGI/ISwapChainAddressResolver.cs b/Dalamud/Game/Internal/DXGI/ISwapChainAddressResolver.cs
index eb867dd5c..867119be5 100644
--- a/Dalamud/Game/Internal/DXGI/ISwapChainAddressResolver.cs
+++ b/Dalamud/Game/Internal/DXGI/ISwapChainAddressResolver.cs
@@ -1,20 +1,19 @@
 using System;
 
-namespace Dalamud.Game.Internal.DXGI
+namespace Dalamud.Game.Internal.DXGI;
+
+/// <summary>
+/// An interface binding for the address resolvers that attempt to find native D3D11 methods.
+/// </summary>
+public interface ISwapChainAddressResolver
 {
     /// <summary>
-    /// An interface binding for the address resolvers that attempt to find native D3D11 methods.
+    /// Gets or sets the address of the native D3D11.Present method.
     /// </summary>
-    public interface ISwapChainAddressResolver
-    {
-        /// <summary>
-        /// Gets or sets the address of the native D3D11.Present method.
-        /// </summary>
-        IntPtr Present { get; set; }
+    IntPtr Present { get; set; }
 
-        /// <summary>
-        /// Gets or sets the address of the native D3D11.ResizeBuffers method.
-        /// </summary>
-        IntPtr ResizeBuffers { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the address of the native D3D11.ResizeBuffers method.
+    /// </summary>
+    IntPtr ResizeBuffers { get; set; }
 }
diff --git a/Dalamud/Game/Internal/DXGI/SwapChainSigResolver.cs b/Dalamud/Game/Internal/DXGI/SwapChainSigResolver.cs
index ac1a419c2..ad79dff9f 100644
--- a/Dalamud/Game/Internal/DXGI/SwapChainSigResolver.cs
+++ b/Dalamud/Game/Internal/DXGI/SwapChainSigResolver.cs
@@ -4,33 +4,32 @@ using System.Linq;
 
 using Serilog;
 
-namespace Dalamud.Game.Internal.DXGI
+namespace Dalamud.Game.Internal.DXGI;
+
+/// <summary>
+/// The address resolver for native D3D11 methods to facilitate displaying the Dalamud UI.
+/// </summary>
+[Obsolete("This has been deprecated in favor of the VTable resolver.")]
+public sealed class SwapChainSigResolver : BaseAddressResolver, ISwapChainAddressResolver
 {
-    /// <summary>
-    /// The address resolver for native D3D11 methods to facilitate displaying the Dalamud UI.
-    /// </summary>
-    [Obsolete("This has been deprecated in favor of the VTable resolver.")]
-    public sealed class SwapChainSigResolver : BaseAddressResolver, ISwapChainAddressResolver
+    /// <inheritdoc/>
+    public IntPtr Present { get; set; }
+
+    /// <inheritdoc/>
+    public IntPtr ResizeBuffers { get; set; }
+
+    /// <inheritdoc/>
+    protected override void Setup64Bit(SigScanner sig)
     {
-        /// <inheritdoc/>
-        public IntPtr Present { get; set; }
+        var module = Process.GetCurrentProcess().Modules.Cast<ProcessModule>().First(m => m.ModuleName == "dxgi.dll");
 
-        /// <inheritdoc/>
-        public IntPtr ResizeBuffers { get; set; }
+        Log.Debug($"Found DXGI: 0x{module.BaseAddress.ToInt64():X}");
 
-        /// <inheritdoc/>
-        protected override void Setup64Bit(SigScanner sig)
-        {
-            var module = Process.GetCurrentProcess().Modules.Cast<ProcessModule>().First(m => m.ModuleName == "dxgi.dll");
+        var scanner = new SigScanner(module);
 
-            Log.Debug($"Found DXGI: 0x{module.BaseAddress.ToInt64():X}");
+        // This(code after the function head - offset of it) was picked to avoid running into issues with other hooks being installed into this function.
+        this.Present = scanner.ScanModule("41 8B F0 8B FA 89 54 24 ?? 48 8B D9 48 89 4D ?? C6 44 24 ?? 00") - 0x37;
 
-            var scanner = new SigScanner(module);
-
-            // This(code after the function head - offset of it) was picked to avoid running into issues with other hooks being installed into this function.
-            this.Present = scanner.ScanModule("41 8B F0 8B FA 89 54 24 ?? 48 8B D9 48 89 4D ?? C6 44 24 ?? 00") - 0x37;
-
-            this.ResizeBuffers = scanner.ScanModule("48 8B C4 55 41 54 41 55 41 56 41 57 48 8D 68 B1 48 81 EC ?? ?? ?? ?? 48 C7 45 ?? ?? ?? ?? ?? 48 89 58 10 48 89 70 18 48 89 78 20 45 8B F9 45 8B E0 44 8B EA 48 8B F9 8B 45 7F 89 44 24 30 8B 75 77 89 74 24 28 44 89 4C 24");
-        }
+        this.ResizeBuffers = scanner.ScanModule("48 8B C4 55 41 54 41 55 41 56 41 57 48 8D 68 B1 48 81 EC ?? ?? ?? ?? 48 C7 45 ?? ?? ?? ?? ?? 48 89 58 10 48 89 70 18 48 89 78 20 45 8B F9 45 8B E0 44 8B EA 48 8B F9 8B 45 7F 89 44 24 30 8B 75 77 89 74 24 28 44 89 4C 24");
     }
 }
diff --git a/Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs b/Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs
index 502390ca7..94d5e3be6 100644
--- a/Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs
+++ b/Dalamud/Game/Internal/DXGI/SwapChainVtableResolver.cs
@@ -7,97 +7,96 @@ using Dalamud.Game.Internal.DXGI.Definitions;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
 using Serilog;
 
-namespace Dalamud.Game.Internal.DXGI
+namespace Dalamud.Game.Internal.DXGI;
+
+/// <summary>
+/// This class attempts to determine the D3D11 SwapChain vtable addresses via instantiating a new form and inspecting it.
+/// </summary>
+/// <remarks>
+/// If the normal signature based method of resolution fails, this is the backup.
+/// </remarks>
+public class SwapChainVtableResolver : BaseAddressResolver, ISwapChainAddressResolver
 {
+    /// <inheritdoc/>
+    public IntPtr Present { get; set; }
+
+    /// <inheritdoc/>
+    public IntPtr ResizeBuffers { get; set; }
+
     /// <summary>
-    /// This class attempts to determine the D3D11 SwapChain vtable addresses via instantiating a new form and inspecting it.
+    /// Gets a value indicating whether or not ReShade is loaded/used.
     /// </summary>
-    /// <remarks>
-    /// If the normal signature based method of resolution fails, this is the backup.
-    /// </remarks>
-    public class SwapChainVtableResolver : BaseAddressResolver, ISwapChainAddressResolver
+    public bool IsReshade { get; private set; }
+
+    /// <inheritdoc/>
+    protected override unsafe void Setup64Bit(SigScanner sig)
     {
-        /// <inheritdoc/>
-        public IntPtr Present { get; set; }
+        Device* kernelDev;
+        SwapChain* swapChain;
+        void* dxgiSwapChain;
 
-        /// <inheritdoc/>
-        public IntPtr ResizeBuffers { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether or not ReShade is loaded/used.
-        /// </summary>
-        public bool IsReshade { get; private set; }
-
-        /// <inheritdoc/>
-        protected override unsafe void Setup64Bit(SigScanner sig)
+        while (true)
         {
-            Device* kernelDev;
-            SwapChain* swapChain;
-            void* dxgiSwapChain;
+            kernelDev = Device.Instance();
+            if (kernelDev == null)
+                continue;
 
-            while (true)
+            swapChain = kernelDev->SwapChain;
+            if (swapChain == null)
+                continue;
+
+            dxgiSwapChain = swapChain->DXGISwapChain;
+            if (dxgiSwapChain == null)
+                continue;
+
+            break;
+        }
+
+        var scVtbl = GetVTblAddresses(new IntPtr(dxgiSwapChain), Enum.GetValues(typeof(IDXGISwapChainVtbl)).Length);
+
+        this.Present = scVtbl[(int)IDXGISwapChainVtbl.Present];
+
+        var modules = Process.GetCurrentProcess().Modules;
+        foreach (ProcessModule processModule in modules)
+        {
+            if (processModule.FileName != null && processModule.FileName.EndsWith("game\\dxgi.dll"))
             {
-                kernelDev = Device.Instance();
-                if (kernelDev == null)
-                    continue;
+                // reshade master@4232872 RVA
+                // var p = processModule.BaseAddress + 0x82C7E0; // DXGISwapChain::Present
+                // var p = processModule.BaseAddress + 0x82FAC0; // DXGISwapChain::runtime_present
 
-                swapChain = kernelDev->SwapChain;
-                if (swapChain == null)
-                    continue;
-
-                dxgiSwapChain = swapChain->DXGISwapChain;
-                if (dxgiSwapChain == null)
-                    continue;
-
-                break;
-            }
-
-            var scVtbl = GetVTblAddresses(new IntPtr(dxgiSwapChain), Enum.GetValues(typeof(IDXGISwapChainVtbl)).Length);
-
-            this.Present = scVtbl[(int)IDXGISwapChainVtbl.Present];
-
-            var modules = Process.GetCurrentProcess().Modules;
-            foreach (ProcessModule processModule in modules)
-            {
-                if (processModule.FileName != null && processModule.FileName.EndsWith("game\\dxgi.dll"))
+                var scanner = new SigScanner(processModule);
+                try
                 {
-                    // reshade master@4232872 RVA
-                    // var p = processModule.BaseAddress + 0x82C7E0; // DXGISwapChain::Present
-                    // var p = processModule.BaseAddress + 0x82FAC0; // DXGISwapChain::runtime_present
+                    var p = scanner.ScanText("F6 C2 01 0F 85 ?? ?? ?? ??");
+                    Log.Information($"ReShade DLL: {processModule.FileName} with DXGISwapChain::runtime_present at {p:X}");
 
-                    var scanner = new SigScanner(processModule);
-                    try
-                    {
-                        var p = scanner.ScanText("F6 C2 01 0F 85 ?? ?? ?? ??");
-                        Log.Information($"ReShade DLL: {processModule.FileName} with DXGISwapChain::runtime_present at {p:X}");
-
-                        this.Present = p;
-                        this.IsReshade = true;
-                        break;
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error(ex, "Could not find reshade DXGISwapChain::runtime_present offset!");
-                    }
+                    this.Present = p;
+                    this.IsReshade = true;
+                    break;
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex, "Could not find reshade DXGISwapChain::runtime_present offset!");
                 }
             }
-
-            this.ResizeBuffers = scVtbl[(int)IDXGISwapChainVtbl.ResizeBuffers];
         }
 
-        private static List<IntPtr> GetVTblAddresses(IntPtr pointer, int numberOfMethods)
-        {
-            return GetVTblAddresses(pointer, 0, numberOfMethods);
-        }
+        this.ResizeBuffers = scVtbl[(int)IDXGISwapChainVtbl.ResizeBuffers];
+    }
 
-        private static List<IntPtr> GetVTblAddresses(IntPtr pointer, int startIndex, int numberOfMethods)
-        {
-            var vtblAddresses = new List<IntPtr>();
-            var vTable = Marshal.ReadIntPtr(pointer);
-            for (var i = startIndex; i < startIndex + numberOfMethods; i++)
-                vtblAddresses.Add(Marshal.ReadIntPtr(vTable, i * IntPtr.Size)); // using IntPtr.Size allows us to support both 32 and 64-bit processes
+    private static List<IntPtr> GetVTblAddresses(IntPtr pointer, int numberOfMethods)
+    {
+        return GetVTblAddresses(pointer, 0, numberOfMethods);
+    }
 
-            return vtblAddresses;
-        }
+    private static List<IntPtr> GetVTblAddresses(IntPtr pointer, int startIndex, int numberOfMethods)
+    {
+        var vtblAddresses = new List<IntPtr>();
+        var vTable = Marshal.ReadIntPtr(pointer);
+        for (var i = startIndex; i < startIndex + numberOfMethods; i++)
+            vtblAddresses.Add(Marshal.ReadIntPtr(vTable, i * IntPtr.Size)); // using IntPtr.Size allows us to support both 32 and 64-bit processes
+
+        return vtblAddresses;
     }
 }
diff --git a/Dalamud/Game/Internal/DalamudAtkTweaks.cs b/Dalamud/Game/Internal/DalamudAtkTweaks.cs
index cf2af2eb5..9ed5d7ab9 100644
--- a/Dalamud/Game/Internal/DalamudAtkTweaks.cs
+++ b/Dalamud/Game/Internal/DalamudAtkTweaks.cs
@@ -14,265 +14,264 @@ using Serilog;
 
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
 
-namespace Dalamud.Game.Internal
+namespace Dalamud.Game.Internal;
+
+/// <summary>
+/// This class implements in-game Dalamud options in the in-game System menu.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal sealed unsafe partial class DalamudAtkTweaks : IServiceType
 {
-    /// <summary>
-    /// This class implements in-game Dalamud options in the in-game System menu.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal sealed unsafe partial class DalamudAtkTweaks : IServiceType
+    private readonly AtkValueChangeType atkValueChangeType;
+    private readonly AtkValueSetString atkValueSetString;
+    private readonly Hook<AgentHudOpenSystemMenuPrototype> hookAgentHudOpenSystemMenu;
+
+    // TODO: Make this into events in Framework.Gui
+    private readonly Hook<UiModuleRequestMainCommand> hookUiModuleRequestMainCommand;
+
+    private readonly Hook<AtkUnitBaseReceiveGlobalEvent> hookAtkUnitBaseReceiveGlobalEvent;
+
+    [ServiceManager.ServiceDependency]
+    private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
+
+    // [ServiceManager.ServiceDependency]
+    // private readonly ContextMenu contextMenu = Service<ContextMenu>.Get();
+
+    private readonly string locDalamudPlugins;
+    private readonly string locDalamudSettings;
+
+    [ServiceManager.ServiceConstructor]
+    private DalamudAtkTweaks(SigScanner sigScanner)
     {
-        private readonly AtkValueChangeType atkValueChangeType;
-        private readonly AtkValueSetString atkValueSetString;
-        private readonly Hook<AgentHudOpenSystemMenuPrototype> hookAgentHudOpenSystemMenu;
+        var openSystemMenuAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 32 C0 4C 8B AC 24 ?? ?? ?? ?? 48 8B 8D ?? ?? ?? ??");
 
-        // TODO: Make this into events in Framework.Gui
-        private readonly Hook<UiModuleRequestMainCommand> hookUiModuleRequestMainCommand;
+        this.hookAgentHudOpenSystemMenu = Hook<AgentHudOpenSystemMenuPrototype>.FromAddress(openSystemMenuAddress, this.AgentHudOpenSystemMenuDetour);
 
-        private readonly Hook<AtkUnitBaseReceiveGlobalEvent> hookAtkUnitBaseReceiveGlobalEvent;
+        var atkValueChangeTypeAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 45 84 F6 48 8D 4C 24 ??");
+        this.atkValueChangeType = Marshal.GetDelegateForFunctionPointer<AtkValueChangeType>(atkValueChangeTypeAddress);
 
-        [ServiceManager.ServiceDependency]
-        private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
+        var atkValueSetStringAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 41 03 ED");
+        this.atkValueSetString = Marshal.GetDelegateForFunctionPointer<AtkValueSetString>(atkValueSetStringAddress);
 
-        // [ServiceManager.ServiceDependency]
-        // private readonly ContextMenu contextMenu = Service<ContextMenu>.Get();
+        var uiModuleRequestMainCommandAddress = sigScanner.ScanText("40 53 56 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 48 8B 01 8B DA 48 8B F1 FF 90 ?? ?? ?? ??");
+        this.hookUiModuleRequestMainCommand = Hook<UiModuleRequestMainCommand>.FromAddress(uiModuleRequestMainCommandAddress, this.UiModuleRequestMainCommandDetour);
 
-        private readonly string locDalamudPlugins;
-        private readonly string locDalamudSettings;
+        var atkUnitBaseReceiveGlobalEventAddress = sigScanner.ScanText("48 89 5C 24 ?? 48 89 7C 24 ?? 55 41 56 41 57 48 8B EC 48 83 EC 50 44 0F B7 F2 ");
+        this.hookAtkUnitBaseReceiveGlobalEvent = Hook<AtkUnitBaseReceiveGlobalEvent>.FromAddress(atkUnitBaseReceiveGlobalEventAddress, this.AtkUnitBaseReceiveGlobalEventDetour);
 
-        [ServiceManager.ServiceConstructor]
-        private DalamudAtkTweaks(SigScanner sigScanner)
-        {
-            var openSystemMenuAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 32 C0 4C 8B AC 24 ?? ?? ?? ?? 48 8B 8D ?? ?? ?? ??");
+        this.locDalamudPlugins = Loc.Localize("SystemMenuPlugins", "Dalamud Plugins");
+        this.locDalamudSettings = Loc.Localize("SystemMenuSettings", "Dalamud Settings");
 
-            this.hookAgentHudOpenSystemMenu = Hook<AgentHudOpenSystemMenuPrototype>.FromAddress(openSystemMenuAddress, this.AgentHudOpenSystemMenuDetour);
-
-            var atkValueChangeTypeAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 45 84 F6 48 8D 4C 24 ??");
-            this.atkValueChangeType = Marshal.GetDelegateForFunctionPointer<AtkValueChangeType>(atkValueChangeTypeAddress);
-
-            var atkValueSetStringAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 41 03 ED");
-            this.atkValueSetString = Marshal.GetDelegateForFunctionPointer<AtkValueSetString>(atkValueSetStringAddress);
-
-            var uiModuleRequestMainCommandAddress = sigScanner.ScanText("40 53 56 48 81 EC ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 84 24 ?? ?? ?? ?? 48 8B 01 8B DA 48 8B F1 FF 90 ?? ?? ?? ??");
-            this.hookUiModuleRequestMainCommand = Hook<UiModuleRequestMainCommand>.FromAddress(uiModuleRequestMainCommandAddress, this.UiModuleRequestMainCommandDetour);
-
-            var atkUnitBaseReceiveGlobalEventAddress = sigScanner.ScanText("48 89 5C 24 ?? 48 89 7C 24 ?? 55 41 56 41 57 48 8B EC 48 83 EC 50 44 0F B7 F2 ");
-            this.hookAtkUnitBaseReceiveGlobalEvent = Hook<AtkUnitBaseReceiveGlobalEvent>.FromAddress(atkUnitBaseReceiveGlobalEventAddress, this.AtkUnitBaseReceiveGlobalEventDetour);
-
-            this.locDalamudPlugins = Loc.Localize("SystemMenuPlugins", "Dalamud Plugins");
-            this.locDalamudSettings = Loc.Localize("SystemMenuSettings", "Dalamud Settings");
-
-            // this.contextMenu.ContextMenuOpened += this.ContextMenuOnContextMenuOpened;
-        }
-
-        private delegate void AgentHudOpenSystemMenuPrototype(void* thisPtr, AtkValue* atkValueArgs, uint menuSize);
-
-        private delegate void AtkValueChangeType(AtkValue* thisPtr, ValueType type);
-
-        private delegate void AtkValueSetString(AtkValue* thisPtr, byte* bytes);
-
-        private delegate void UiModuleRequestMainCommand(void* thisPtr, int commandId);
-
-        private delegate IntPtr AtkUnitBaseReceiveGlobalEvent(AtkUnitBase* thisPtr, ushort cmd, uint a3, IntPtr a4, uint* a5);
-
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction(DalamudInterface dalamudInterface)
-        {
-            this.hookAgentHudOpenSystemMenu.Enable();
-            this.hookUiModuleRequestMainCommand.Enable();
-            this.hookAtkUnitBaseReceiveGlobalEvent.Enable();
-        }
-
-        /*
-        private void ContextMenuOnContextMenuOpened(ContextMenuOpenedArgs args)
-        {
-            var systemText = Service<DataManager>.GetNullable()?.GetExcelSheet<Addon>()?.GetRow(1059)?.Text?.RawString; // "System"
-            var interfaceManager = Service<InterfaceManager>.GetNullable();
-
-            if (systemText == null || interfaceManager == null)
-                return;
-
-            if (args.Title == systemText && this.configuration.DoButtonsSystemMenu && interfaceManager.IsDispatchingEvents)
-            {
-                var dalamudInterface = Service<DalamudInterface>.Get();
-
-                args.Items.Insert(0, new CustomContextMenuItem(this.locDalamudSettings, selectedArgs =>
-                {
-                    dalamudInterface.ToggleSettingsWindow();
-                }));
-
-                args.Items.Insert(0, new CustomContextMenuItem(this.locDalamudPlugins, selectedArgs =>
-                {
-                    dalamudInterface.TogglePluginInstallerWindow();
-                }));
-            }
-        }
-        */
-
-        private IntPtr AtkUnitBaseReceiveGlobalEventDetour(AtkUnitBase* thisPtr, ushort cmd, uint a3, IntPtr a4, uint* arg)
-        {
-            // Log.Information("{0}: cmd#{1} a3#{2} - HasAnyFocus:{3}", Marshal.PtrToStringAnsi(new IntPtr(thisPtr->Name)), cmd, a3, WindowSystem.HasAnyWindowSystemFocus);
-
-            // "SendHotkey"
-            // 3 == Close
-            if (cmd == 12 && WindowSystem.HasAnyWindowSystemFocus && *arg == 3 && this.configuration.IsFocusManagementEnabled)
-            {
-                Log.Verbose($"Cancelling global event SendHotkey command due to WindowSystem {WindowSystem.FocusedWindowSystemNamespace}");
-                return IntPtr.Zero;
-            }
-
-            return this.hookAtkUnitBaseReceiveGlobalEvent.Original(thisPtr, cmd, a3, a4, arg);
-        }
-
-        private void AgentHudOpenSystemMenuDetour(void* thisPtr, AtkValue* atkValueArgs, uint menuSize)
-        {
-            if (WindowSystem.HasAnyWindowSystemFocus && this.configuration.IsFocusManagementEnabled)
-            {
-                Log.Verbose($"Cancelling OpenSystemMenu due to WindowSystem {WindowSystem.FocusedWindowSystemNamespace}");
-                return;
-            }
-
-            var interfaceManager = Service<InterfaceManager>.GetNullable();
-            if (interfaceManager == null)
-            {
-                this.hookAgentHudOpenSystemMenu.Original(thisPtr, atkValueArgs, menuSize);
-                return;
-            }
-
-            if (!this.configuration.DoButtonsSystemMenu || !interfaceManager.IsDispatchingEvents)
-            {
-                this.hookAgentHudOpenSystemMenu.Original(thisPtr, atkValueArgs, menuSize);
-                return;
-            }
-
-            // the max size (hardcoded) is 0x11/17, but the system menu currently uses 0xC/12
-            // this is a just in case that doesnt really matter
-            // see if we can add 2 entries
-            if (menuSize >= 0x11)
-            {
-                this.hookAgentHudOpenSystemMenu.Original(thisPtr, atkValueArgs, menuSize);
-                return;
-            }
-
-            // atkValueArgs is actually an array of AtkValues used as args. all their UI code works like this.
-            // in this case, menu size is stored in atkValueArgs[4], and the next 17 slots are the MainCommand
-            // the 17 slots after that, if they exist, are the entry names, but they are otherwise pulled from MainCommand EXD
-            // reference the original function for more details :)
-
-            // step 1) move all the current menu items down so we can put Dalamud at the top like it deserves
-            this.atkValueChangeType(&atkValueArgs[menuSize + 5], ValueType.Int); // currently this value has no type, set it to int
-            this.atkValueChangeType(&atkValueArgs[menuSize + 5 + 1], ValueType.Int);
-
-            for (var i = menuSize + 2; i > 1; i--)
-            {
-                var curEntry = &atkValueArgs[i + 5 - 2];
-                var nextEntry = &atkValueArgs[i + 5];
-
-                nextEntry->Int = curEntry->Int;
-            }
-
-            // step 2) set our new entries to dummy commands
-            var firstEntry = &atkValueArgs[5];
-            firstEntry->Int = 69420;
-            var secondEntry = &atkValueArgs[6];
-            secondEntry->Int = 69421;
-
-            // step 3) create strings for them
-            // since the game first checks for strings in the AtkValue argument before pulling them from the exd, if we create strings we dont have to worry
-            // about hooking the exd reader, thank god
-            var firstStringEntry = &atkValueArgs[5 + 17];
-            this.atkValueChangeType(firstStringEntry, ValueType.String);
-            var secondStringEntry = &atkValueArgs[6 + 17];
-            this.atkValueChangeType(secondStringEntry, ValueType.String);
-
-            const int color = 539;
-            var strPlugins = new SeString().Append(new UIForegroundPayload(color))
-                                           .Append($"{SeIconChar.BoxedLetterD.ToIconString()} ")
-                                           .Append(new UIForegroundPayload(0))
-                                           .Append(this.locDalamudPlugins).Encode();
-            var strSettings = new SeString().Append(new UIForegroundPayload(color))
-                                            .Append($"{SeIconChar.BoxedLetterD.ToIconString()} ")
-                                            .Append(new UIForegroundPayload(0))
-                                            .Append(this.locDalamudSettings).Encode();
-
-            // do this the most terrible way possible since im lazy
-            var bytes = stackalloc byte[strPlugins.Length + 1];
-            Marshal.Copy(strPlugins, 0, new IntPtr(bytes), strPlugins.Length);
-            bytes[strPlugins.Length] = 0x0;
-
-            this.atkValueSetString(firstStringEntry, bytes); // this allocs the string properly using the game's allocators and copies it, so we dont have to worry about memory fuckups
-
-            var bytes2 = stackalloc byte[strSettings.Length + 1];
-            Marshal.Copy(strSettings, 0, new IntPtr(bytes2), strSettings.Length);
-            bytes2[strSettings.Length] = 0x0;
-
-            this.atkValueSetString(secondStringEntry, bytes2);
-
-            // open menu with new size
-            var sizeEntry = &atkValueArgs[4];
-            sizeEntry->UInt = menuSize + 2;
-
-            this.hookAgentHudOpenSystemMenu.Original(thisPtr, atkValueArgs, menuSize + 2);
-        }
-
-        private void UiModuleRequestMainCommandDetour(void* thisPtr, int commandId)
-        {
-            var dalamudInterface = Service<DalamudInterface>.GetNullable();
-
-            switch (commandId)
-            {
-                case 69420:
-                    dalamudInterface?.TogglePluginInstallerWindow();
-                    break;
-                case 69421:
-                    dalamudInterface?.ToggleSettingsWindow();
-                    break;
-                default:
-                    this.hookUiModuleRequestMainCommand.Original(thisPtr, commandId);
-                    break;
-            }
-        }
+        // this.contextMenu.ContextMenuOpened += this.ContextMenuOnContextMenuOpened;
     }
 
-    /// <summary>
-    /// Implements IDisposable.
-    /// </summary>
-    internal sealed partial class DalamudAtkTweaks : IDisposable
+    private delegate void AgentHudOpenSystemMenuPrototype(void* thisPtr, AtkValue* atkValueArgs, uint menuSize);
+
+    private delegate void AtkValueChangeType(AtkValue* thisPtr, ValueType type);
+
+    private delegate void AtkValueSetString(AtkValue* thisPtr, byte* bytes);
+
+    private delegate void UiModuleRequestMainCommand(void* thisPtr, int commandId);
+
+    private delegate IntPtr AtkUnitBaseReceiveGlobalEvent(AtkUnitBase* thisPtr, ushort cmd, uint a3, IntPtr a4, uint* a5);
+
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction(DalamudInterface dalamudInterface)
     {
-        private bool disposed = false;
+        this.hookAgentHudOpenSystemMenu.Enable();
+        this.hookUiModuleRequestMainCommand.Enable();
+        this.hookAtkUnitBaseReceiveGlobalEvent.Enable();
+    }
 
-        /// <summary>
-        /// Finalizes an instance of the <see cref="DalamudAtkTweaks"/> class.
-        /// </summary>
-        ~DalamudAtkTweaks() => this.Dispose(false);
+    /*
+    private void ContextMenuOnContextMenuOpened(ContextMenuOpenedArgs args)
+    {
+        var systemText = Service<DataManager>.GetNullable()?.GetExcelSheet<Addon>()?.GetRow(1059)?.Text?.RawString; // "System"
+        var interfaceManager = Service<InterfaceManager>.GetNullable();
 
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        public void Dispose()
+        if (systemText == null || interfaceManager == null)
+            return;
+
+        if (args.Title == systemText && this.configuration.DoButtonsSystemMenu && interfaceManager.IsDispatchingEvents)
         {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
+            var dalamudInterface = Service<DalamudInterface>.Get();
+
+            args.Items.Insert(0, new CustomContextMenuItem(this.locDalamudSettings, selectedArgs =>
+            {
+                dalamudInterface.ToggleSettingsWindow();
+            }));
+
+            args.Items.Insert(0, new CustomContextMenuItem(this.locDalamudPlugins, selectedArgs =>
+            {
+                dalamudInterface.TogglePluginInstallerWindow();
+            }));
+        }
+    }
+    */
+
+    private IntPtr AtkUnitBaseReceiveGlobalEventDetour(AtkUnitBase* thisPtr, ushort cmd, uint a3, IntPtr a4, uint* arg)
+    {
+        // Log.Information("{0}: cmd#{1} a3#{2} - HasAnyFocus:{3}", Marshal.PtrToStringAnsi(new IntPtr(thisPtr->Name)), cmd, a3, WindowSystem.HasAnyWindowSystemFocus);
+
+        // "SendHotkey"
+        // 3 == Close
+        if (cmd == 12 && WindowSystem.HasAnyWindowSystemFocus && *arg == 3 && this.configuration.IsFocusManagementEnabled)
+        {
+            Log.Verbose($"Cancelling global event SendHotkey command due to WindowSystem {WindowSystem.FocusedWindowSystemNamespace}");
+            return IntPtr.Zero;
         }
 
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        private void Dispose(bool disposing)
+        return this.hookAtkUnitBaseReceiveGlobalEvent.Original(thisPtr, cmd, a3, a4, arg);
+    }
+
+    private void AgentHudOpenSystemMenuDetour(void* thisPtr, AtkValue* atkValueArgs, uint menuSize)
+    {
+        if (WindowSystem.HasAnyWindowSystemFocus && this.configuration.IsFocusManagementEnabled)
         {
-            if (this.disposed)
-                return;
+            Log.Verbose($"Cancelling OpenSystemMenu due to WindowSystem {WindowSystem.FocusedWindowSystemNamespace}");
+            return;
+        }
 
-            if (disposing)
-            {
-                this.hookAgentHudOpenSystemMenu.Dispose();
-                this.hookUiModuleRequestMainCommand.Dispose();
-                this.hookAtkUnitBaseReceiveGlobalEvent.Dispose();
+        var interfaceManager = Service<InterfaceManager>.GetNullable();
+        if (interfaceManager == null)
+        {
+            this.hookAgentHudOpenSystemMenu.Original(thisPtr, atkValueArgs, menuSize);
+            return;
+        }
 
-                // this.contextMenu.ContextMenuOpened -= this.ContextMenuOnContextMenuOpened;
-            }
+        if (!this.configuration.DoButtonsSystemMenu || !interfaceManager.IsDispatchingEvents)
+        {
+            this.hookAgentHudOpenSystemMenu.Original(thisPtr, atkValueArgs, menuSize);
+            return;
+        }
 
-            this.disposed = true;
+        // the max size (hardcoded) is 0x11/17, but the system menu currently uses 0xC/12
+        // this is a just in case that doesnt really matter
+        // see if we can add 2 entries
+        if (menuSize >= 0x11)
+        {
+            this.hookAgentHudOpenSystemMenu.Original(thisPtr, atkValueArgs, menuSize);
+            return;
+        }
+
+        // atkValueArgs is actually an array of AtkValues used as args. all their UI code works like this.
+        // in this case, menu size is stored in atkValueArgs[4], and the next 17 slots are the MainCommand
+        // the 17 slots after that, if they exist, are the entry names, but they are otherwise pulled from MainCommand EXD
+        // reference the original function for more details :)
+
+        // step 1) move all the current menu items down so we can put Dalamud at the top like it deserves
+        this.atkValueChangeType(&atkValueArgs[menuSize + 5], ValueType.Int); // currently this value has no type, set it to int
+        this.atkValueChangeType(&atkValueArgs[menuSize + 5 + 1], ValueType.Int);
+
+        for (var i = menuSize + 2; i > 1; i--)
+        {
+            var curEntry = &atkValueArgs[i + 5 - 2];
+            var nextEntry = &atkValueArgs[i + 5];
+
+            nextEntry->Int = curEntry->Int;
+        }
+
+        // step 2) set our new entries to dummy commands
+        var firstEntry = &atkValueArgs[5];
+        firstEntry->Int = 69420;
+        var secondEntry = &atkValueArgs[6];
+        secondEntry->Int = 69421;
+
+        // step 3) create strings for them
+        // since the game first checks for strings in the AtkValue argument before pulling them from the exd, if we create strings we dont have to worry
+        // about hooking the exd reader, thank god
+        var firstStringEntry = &atkValueArgs[5 + 17];
+        this.atkValueChangeType(firstStringEntry, ValueType.String);
+        var secondStringEntry = &atkValueArgs[6 + 17];
+        this.atkValueChangeType(secondStringEntry, ValueType.String);
+
+        const int color = 539;
+        var strPlugins = new SeString().Append(new UIForegroundPayload(color))
+                                       .Append($"{SeIconChar.BoxedLetterD.ToIconString()} ")
+                                       .Append(new UIForegroundPayload(0))
+                                       .Append(this.locDalamudPlugins).Encode();
+        var strSettings = new SeString().Append(new UIForegroundPayload(color))
+                                        .Append($"{SeIconChar.BoxedLetterD.ToIconString()} ")
+                                        .Append(new UIForegroundPayload(0))
+                                        .Append(this.locDalamudSettings).Encode();
+
+        // do this the most terrible way possible since im lazy
+        var bytes = stackalloc byte[strPlugins.Length + 1];
+        Marshal.Copy(strPlugins, 0, new IntPtr(bytes), strPlugins.Length);
+        bytes[strPlugins.Length] = 0x0;
+
+        this.atkValueSetString(firstStringEntry, bytes); // this allocs the string properly using the game's allocators and copies it, so we dont have to worry about memory fuckups
+
+        var bytes2 = stackalloc byte[strSettings.Length + 1];
+        Marshal.Copy(strSettings, 0, new IntPtr(bytes2), strSettings.Length);
+        bytes2[strSettings.Length] = 0x0;
+
+        this.atkValueSetString(secondStringEntry, bytes2);
+
+        // open menu with new size
+        var sizeEntry = &atkValueArgs[4];
+        sizeEntry->UInt = menuSize + 2;
+
+        this.hookAgentHudOpenSystemMenu.Original(thisPtr, atkValueArgs, menuSize + 2);
+    }
+
+    private void UiModuleRequestMainCommandDetour(void* thisPtr, int commandId)
+    {
+        var dalamudInterface = Service<DalamudInterface>.GetNullable();
+
+        switch (commandId)
+        {
+            case 69420:
+                dalamudInterface?.TogglePluginInstallerWindow();
+                break;
+            case 69421:
+                dalamudInterface?.ToggleSettingsWindow();
+                break;
+            default:
+                this.hookUiModuleRequestMainCommand.Original(thisPtr, commandId);
+                break;
         }
     }
 }
+
+/// <summary>
+/// Implements IDisposable.
+/// </summary>
+internal sealed partial class DalamudAtkTweaks : IDisposable
+{
+    private bool disposed = false;
+
+    /// <summary>
+    /// Finalizes an instance of the <see cref="DalamudAtkTweaks"/> class.
+    /// </summary>
+    ~DalamudAtkTweaks() => this.Dispose(false);
+
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+        this.Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    private void Dispose(bool disposing)
+    {
+        if (this.disposed)
+            return;
+
+        if (disposing)
+        {
+            this.hookAgentHudOpenSystemMenu.Dispose();
+            this.hookUiModuleRequestMainCommand.Dispose();
+            this.hookAtkUnitBaseReceiveGlobalEvent.Dispose();
+
+            // this.contextMenu.ContextMenuOpened -= this.ContextMenuOnContextMenuOpened;
+        }
+
+        this.disposed = true;
+    }
+}
diff --git a/Dalamud/Game/Libc/LibcFunction.cs b/Dalamud/Game/Libc/LibcFunction.cs
index aa149a3ce..4c58376f2 100644
--- a/Dalamud/Game/Libc/LibcFunction.cs
+++ b/Dalamud/Game/Libc/LibcFunction.cs
@@ -5,74 +5,73 @@ using System.Text;
 using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 
-namespace Dalamud.Game.Libc
+namespace Dalamud.Game.Libc;
+
+/// <summary>
+/// This class handles creating cstrings utilizing native game methods.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed class LibcFunction : IServiceType
 {
-    /// <summary>
-    /// This class handles creating cstrings utilizing native game methods.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed class LibcFunction : IServiceType
+    private readonly LibcFunctionAddressResolver address;
+    private readonly StdStringFromCStringDelegate stdStringCtorCString;
+    private readonly StdStringDeallocateDelegate stdStringDeallocate;
+
+    [ServiceManager.ServiceConstructor]
+    private LibcFunction(SigScanner sigScanner)
     {
-        private readonly LibcFunctionAddressResolver address;
-        private readonly StdStringFromCStringDelegate stdStringCtorCString;
-        private readonly StdStringDeallocateDelegate stdStringDeallocate;
+        this.address = new LibcFunctionAddressResolver();
+        this.address.Setup(sigScanner);
 
-        [ServiceManager.ServiceConstructor]
-        private LibcFunction(SigScanner sigScanner)
-        {
-            this.address = new LibcFunctionAddressResolver();
-            this.address.Setup(sigScanner);
+        this.stdStringCtorCString = Marshal.GetDelegateForFunctionPointer<StdStringFromCStringDelegate>(this.address.StdStringFromCstring);
+        this.stdStringDeallocate = Marshal.GetDelegateForFunctionPointer<StdStringDeallocateDelegate>(this.address.StdStringDeallocate);
+    }
 
-            this.stdStringCtorCString = Marshal.GetDelegateForFunctionPointer<StdStringFromCStringDelegate>(this.address.StdStringFromCstring);
-            this.stdStringDeallocate = Marshal.GetDelegateForFunctionPointer<StdStringDeallocateDelegate>(this.address.StdStringDeallocate);
-        }
+    // TODO: prolly callconv is not okay in x86
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr StdStringFromCStringDelegate(IntPtr pStdString, [MarshalAs(UnmanagedType.LPArray)] byte[] content, IntPtr size);
 
-        // TODO: prolly callconv is not okay in x86
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr StdStringFromCStringDelegate(IntPtr pStdString, [MarshalAs(UnmanagedType.LPArray)] byte[] content, IntPtr size);
+    // TODO: prolly callconv is not okay in x86
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr StdStringDeallocateDelegate(IntPtr address);
 
-        // TODO: prolly callconv is not okay in x86
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr StdStringDeallocateDelegate(IntPtr address);
+    /// <summary>
+    /// Create a new string from the given bytes.
+    /// </summary>
+    /// <param name="content">The bytes to convert.</param>
+    /// <returns>An owned std string object.</returns>
+    public OwnedStdString NewString(byte[] content)
+    {
+        // While 0x70 bytes in the memory should be enough in DX11 version,
+        // I don't trust my analysis so we're just going to allocate almost two times more than that.
+        var pString = Marshal.AllocHGlobal(256);
 
-        /// <summary>
-        /// Create a new string from the given bytes.
-        /// </summary>
-        /// <param name="content">The bytes to convert.</param>
-        /// <returns>An owned std string object.</returns>
-        public OwnedStdString NewString(byte[] content)
-        {
-            // While 0x70 bytes in the memory should be enough in DX11 version,
-            // I don't trust my analysis so we're just going to allocate almost two times more than that.
-            var pString = Marshal.AllocHGlobal(256);
+        // Initialize a string
+        var size = new IntPtr(content.Length);
+        var pReallocString = this.stdStringCtorCString(pString, content, size);
 
-            // Initialize a string
-            var size = new IntPtr(content.Length);
-            var pReallocString = this.stdStringCtorCString(pString, content, size);
+        // Log.Verbose("Prev: {Prev} Now: {Now}", pString, pReallocString);
 
-            // Log.Verbose("Prev: {Prev} Now: {Now}", pString, pReallocString);
+        return new OwnedStdString(pReallocString, this.DeallocateStdString);
+    }
 
-            return new OwnedStdString(pReallocString, this.DeallocateStdString);
-        }
+    /// <summary>
+    /// Create a new string form the given bytes.
+    /// </summary>
+    /// <param name="content">The bytes to convert.</param>
+    /// <param name="encoding">A non-default encoding.</param>
+    /// <returns>An owned std string object.</returns>
+    public OwnedStdString NewString(string content, Encoding encoding = null)
+    {
+        encoding ??= Encoding.UTF8;
 
-        /// <summary>
-        /// Create a new string form the given bytes.
-        /// </summary>
-        /// <param name="content">The bytes to convert.</param>
-        /// <param name="encoding">A non-default encoding.</param>
-        /// <returns>An owned std string object.</returns>
-        public OwnedStdString NewString(string content, Encoding encoding = null)
-        {
-            encoding ??= Encoding.UTF8;
+        return this.NewString(encoding.GetBytes(content));
+    }
 
-            return this.NewString(encoding.GetBytes(content));
-        }
-
-        private void DeallocateStdString(IntPtr address)
-        {
-            this.stdStringDeallocate(address);
-        }
+    private void DeallocateStdString(IntPtr address)
+    {
+        this.stdStringDeallocate(address);
     }
 }
diff --git a/Dalamud/Game/Libc/LibcFunctionAddressResolver.cs b/Dalamud/Game/Libc/LibcFunctionAddressResolver.cs
index 02b031b44..4189bc280 100644
--- a/Dalamud/Game/Libc/LibcFunctionAddressResolver.cs
+++ b/Dalamud/Game/Libc/LibcFunctionAddressResolver.cs
@@ -1,29 +1,28 @@
 using System;
 
-namespace Dalamud.Game.Libc
+namespace Dalamud.Game.Libc;
+
+/// <summary>
+/// The address resolver for the <see cref="LibcFunction"/> class.
+/// </summary>
+public sealed class LibcFunctionAddressResolver : BaseAddressResolver
 {
+    private delegate IntPtr StringFromCString();
+
     /// <summary>
-    /// The address resolver for the <see cref="LibcFunction"/> class.
+    /// Gets the address of the native StdStringFromCstring method.
     /// </summary>
-    public sealed class LibcFunctionAddressResolver : BaseAddressResolver
+    public IntPtr StdStringFromCstring { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the native StdStringDeallocate method.
+    /// </summary>
+    public IntPtr StdStringDeallocate { get; private set; }
+
+    /// <inheritdoc/>
+    protected override void Setup64Bit(SigScanner sig)
     {
-        private delegate IntPtr StringFromCString();
-
-        /// <summary>
-        /// Gets the address of the native StdStringFromCstring method.
-        /// </summary>
-        public IntPtr StdStringFromCstring { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the native StdStringDeallocate method.
-        /// </summary>
-        public IntPtr StdStringDeallocate { get; private set; }
-
-        /// <inheritdoc/>
-        protected override void Setup64Bit(SigScanner sig)
-        {
-            this.StdStringFromCstring = sig.ScanText("48895C2408 4889742410 57 4883EC20 488D4122 66C741200101 488901 498BD8");
-            this.StdStringDeallocate = sig.ScanText("80792100 7512 488B5108 41B833000000 488B09 E9??????00 C3");
-        }
+        this.StdStringFromCstring = sig.ScanText("48895C2408 4889742410 57 4883EC20 488D4122 66C741200101 488901 498BD8");
+        this.StdStringDeallocate = sig.ScanText("80792100 7512 488B5108 41B833000000 488B09 E9??????00 C3");
     }
 }
diff --git a/Dalamud/Game/Libc/OwnedStdString.cs b/Dalamud/Game/Libc/OwnedStdString.cs
index 1939e068e..db92257b3 100644
--- a/Dalamud/Game/Libc/OwnedStdString.cs
+++ b/Dalamud/Game/Libc/OwnedStdString.cs
@@ -1,101 +1,100 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Dalamud.Game.Libc
+namespace Dalamud.Game.Libc;
+
+/// <summary>
+/// An address wrapper around the <see cref="StdString"/> class.
+/// </summary>
+public sealed partial class OwnedStdString
 {
+    private readonly DeallocatorDelegate dealloc;
+
     /// <summary>
-    /// An address wrapper around the <see cref="StdString"/> class.
+    /// Initializes a new instance of the <see cref="OwnedStdString"/> class.
+    /// Construct a wrapper around std::string.
     /// </summary>
-    public sealed partial class OwnedStdString
+    /// <remarks>
+    /// Violating any of these might cause an undefined hehaviour.
+    /// 1. This function takes the ownership of the address.
+    /// 2. A memory pointed by address argument is assumed to be allocated by Marshal.AllocHGlobal thus will try to call Marshal.FreeHGlobal on the address.
+    /// 3. std::string object pointed by address must be initialized before calling this function.
+    /// </remarks>
+    /// <param name="address">The address of the owned std string.</param>
+    /// <param name="dealloc">A deallocator function.</param>
+    internal OwnedStdString(IntPtr address, DeallocatorDelegate dealloc)
     {
-        private readonly DeallocatorDelegate dealloc;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OwnedStdString"/> class.
-        /// Construct a wrapper around std::string.
-        /// </summary>
-        /// <remarks>
-        /// Violating any of these might cause an undefined hehaviour.
-        /// 1. This function takes the ownership of the address.
-        /// 2. A memory pointed by address argument is assumed to be allocated by Marshal.AllocHGlobal thus will try to call Marshal.FreeHGlobal on the address.
-        /// 3. std::string object pointed by address must be initialized before calling this function.
-        /// </remarks>
-        /// <param name="address">The address of the owned std string.</param>
-        /// <param name="dealloc">A deallocator function.</param>
-        internal OwnedStdString(IntPtr address, DeallocatorDelegate dealloc)
-        {
-            this.Address = address;
-            this.dealloc = dealloc;
-        }
-
-        /// <summary>
-        /// The delegate type that deallocates a std string.
-        /// </summary>
-        /// <param name="address">Address to deallocate.</param>
-        internal delegate void DeallocatorDelegate(IntPtr address);
-
-        /// <summary>
-        /// Gets the address of the std string.
-        /// </summary>
-        public IntPtr Address { get; private set; }
-
-        /// <summary>
-        /// Read the wrapped StdString.
-        /// </summary>
-        /// <returns>The StdString.</returns>
-        public StdString Read() => StdString.ReadFromPointer(this.Address);
+        this.Address = address;
+        this.dealloc = dealloc;
     }
 
     /// <summary>
-    /// Implements IDisposable.
+    /// The delegate type that deallocates a std string.
     /// </summary>
-    public sealed partial class OwnedStdString : IDisposable
+    /// <param name="address">Address to deallocate.</param>
+    internal delegate void DeallocatorDelegate(IntPtr address);
+
+    /// <summary>
+    /// Gets the address of the std string.
+    /// </summary>
+    public IntPtr Address { get; private set; }
+
+    /// <summary>
+    /// Read the wrapped StdString.
+    /// </summary>
+    /// <returns>The StdString.</returns>
+    public StdString Read() => StdString.ReadFromPointer(this.Address);
+}
+
+/// <summary>
+/// Implements IDisposable.
+/// </summary>
+public sealed partial class OwnedStdString : IDisposable
+{
+    private bool isDisposed;
+
+    /// <summary>
+    /// Finalizes an instance of the <see cref="OwnedStdString"/> class.
+    /// </summary>
+    ~OwnedStdString() => this.Dispose(false);
+
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    public void Dispose()
     {
-        private bool isDisposed;
+        GC.SuppressFinalize(this);
+        this.Dispose(true);
+    }
 
-        /// <summary>
-        /// Finalizes an instance of the <see cref="OwnedStdString"/> class.
-        /// </summary>
-        ~OwnedStdString() => this.Dispose(false);
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    /// <param name="disposing">A value indicating whether this was called via Dispose or finalized.</param>
+    public void Dispose(bool disposing)
+    {
+        if (this.isDisposed)
+            return;
 
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        public void Dispose()
+        this.isDisposed = true;
+
+        if (disposing)
         {
-            GC.SuppressFinalize(this);
-            this.Dispose(true);
         }
 
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        /// <param name="disposing">A value indicating whether this was called via Dispose or finalized.</param>
-        public void Dispose(bool disposing)
+        if (this.Address == IntPtr.Zero)
         {
-            if (this.isDisposed)
-                return;
-
-            this.isDisposed = true;
-
-            if (disposing)
-            {
-            }
-
-            if (this.Address == IntPtr.Zero)
-            {
-                // Something got seriously fucked.
-                throw new AccessViolationException();
-            }
-
-            // Deallocate inner string first
-            this.dealloc(this.Address);
-
-            // Free the heap
-            Marshal.FreeHGlobal(this.Address);
-
-            // Better safe (running on a nullptr) than sorry. (running on a dangling pointer)
-            this.Address = IntPtr.Zero;
+            // Something got seriously fucked.
+            throw new AccessViolationException();
         }
+
+        // Deallocate inner string first
+        this.dealloc(this.Address);
+
+        // Free the heap
+        Marshal.FreeHGlobal(this.Address);
+
+        // Better safe (running on a nullptr) than sorry. (running on a dangling pointer)
+        this.Address = IntPtr.Zero;
     }
 }
diff --git a/Dalamud/Game/Libc/StdString.cs b/Dalamud/Game/Libc/StdString.cs
index 4d4478687..816219a82 100644
--- a/Dalamud/Game/Libc/StdString.cs
+++ b/Dalamud/Game/Libc/StdString.cs
@@ -2,68 +2,67 @@ using System;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Dalamud.Game.Libc
+namespace Dalamud.Game.Libc;
+
+/// <summary>
+/// Interation with std::string.
+/// </summary>
+public class StdString
 {
     /// <summary>
-    /// Interation with std::string.
+    /// Initializes a new instance of the <see cref="StdString"/> class.
     /// </summary>
-    public class StdString
+    private StdString()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StdString"/> class.
-        /// </summary>
-        private StdString()
+    }
+
+    /// <summary>
+    /// Gets the value of the cstring.
+    /// </summary>
+    public string Value { get; private set; }
+
+    /// <summary>
+    /// Gets or sets the raw byte representation of the cstring.
+    /// </summary>
+    public byte[] RawData { get; set; }
+
+    /// <summary>
+    /// Marshal a null terminated cstring from memory to a UTF-8 encoded string.
+    /// </summary>
+    /// <param name="cstring">Address of the cstring.</param>
+    /// <returns>A UTF-8 encoded string.</returns>
+    public static StdString ReadFromPointer(IntPtr cstring)
+    {
+        unsafe
         {
-        }
-
-        /// <summary>
-        /// Gets the value of the cstring.
-        /// </summary>
-        public string Value { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the raw byte representation of the cstring.
-        /// </summary>
-        public byte[] RawData { get; set; }
-
-        /// <summary>
-        /// Marshal a null terminated cstring from memory to a UTF-8 encoded string.
-        /// </summary>
-        /// <param name="cstring">Address of the cstring.</param>
-        /// <returns>A UTF-8 encoded string.</returns>
-        public static StdString ReadFromPointer(IntPtr cstring)
-        {
-            unsafe
+            if (cstring == IntPtr.Zero)
             {
-                if (cstring == IntPtr.Zero)
-                {
-                    throw new ArgumentNullException(nameof(cstring));
-                }
-
-                var innerAddress = Marshal.ReadIntPtr(cstring);
-                if (innerAddress == IntPtr.Zero)
-                {
-                    throw new NullReferenceException("Inner reference to the cstring is null.");
-                }
-
-                // Count the number of chars. String is assumed to be zero-terminated.
-
-                var count = 0;
-                while (Marshal.ReadByte(innerAddress, count) != 0)
-                {
-                    count += 1;
-                }
-
-                // raw copy, as UTF8 string conversion is lossy
-                var rawData = new byte[count];
-                Marshal.Copy(innerAddress, rawData, 0, count);
-
-                return new StdString
-                {
-                    RawData = rawData,
-                    Value = Encoding.UTF8.GetString(rawData),
-                };
+                throw new ArgumentNullException(nameof(cstring));
             }
+
+            var innerAddress = Marshal.ReadIntPtr(cstring);
+            if (innerAddress == IntPtr.Zero)
+            {
+                throw new NullReferenceException("Inner reference to the cstring is null.");
+            }
+
+            // Count the number of chars. String is assumed to be zero-terminated.
+
+            var count = 0;
+            while (Marshal.ReadByte(innerAddress, count) != 0)
+            {
+                count += 1;
+            }
+
+            // raw copy, as UTF8 string conversion is lossy
+            var rawData = new byte[count];
+            Marshal.Copy(innerAddress, rawData, 0, count);
+
+            return new StdString
+            {
+                RawData = rawData,
+                Value = Encoding.UTF8.GetString(rawData),
+            };
         }
     }
 }
diff --git a/Dalamud/Game/Network/GameNetwork.cs b/Dalamud/Game/Network/GameNetwork.cs
index 0b1d5375d..0fab9bf74 100644
--- a/Dalamud/Game/Network/GameNetwork.cs
+++ b/Dalamud/Game/Network/GameNetwork.cs
@@ -7,176 +7,175 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Serilog;
 
-namespace Dalamud.Game.Network
+namespace Dalamud.Game.Network;
+
+/// <summary>
+/// This class handles interacting with game network events.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public sealed class GameNetwork : IDisposable, IServiceType
 {
-    /// <summary>
-    /// This class handles interacting with game network events.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public sealed class GameNetwork : IDisposable, IServiceType
+    private readonly GameNetworkAddressResolver address;
+    private readonly Hook<ProcessZonePacketDownDelegate> processZonePacketDownHook;
+    private readonly Hook<ProcessZonePacketUpDelegate> processZonePacketUpHook;
+    private readonly Queue<byte[]> zoneInjectQueue = new();
+
+    private IntPtr baseAddress;
+
+    [ServiceManager.ServiceConstructor]
+    private GameNetwork(SigScanner sigScanner)
     {
-        private readonly GameNetworkAddressResolver address;
-        private readonly Hook<ProcessZonePacketDownDelegate> processZonePacketDownHook;
-        private readonly Hook<ProcessZonePacketUpDelegate> processZonePacketUpHook;
-        private readonly Queue<byte[]> zoneInjectQueue = new();
+        this.address = new GameNetworkAddressResolver();
+        this.address.Setup(sigScanner);
 
-        private IntPtr baseAddress;
+        Log.Verbose("===== G A M E N E T W O R K =====");
+        Log.Verbose($"ProcessZonePacketDown address 0x{this.address.ProcessZonePacketDown.ToInt64():X}");
+        Log.Verbose($"ProcessZonePacketUp address 0x{this.address.ProcessZonePacketUp.ToInt64():X}");
 
-        [ServiceManager.ServiceConstructor]
-        private GameNetwork(SigScanner sigScanner)
-        {
-            this.address = new GameNetworkAddressResolver();
-            this.address.Setup(sigScanner);
-
-            Log.Verbose("===== G A M E N E T W O R K =====");
-            Log.Verbose($"ProcessZonePacketDown address 0x{this.address.ProcessZonePacketDown.ToInt64():X}");
-            Log.Verbose($"ProcessZonePacketUp address 0x{this.address.ProcessZonePacketUp.ToInt64():X}");
-
-            this.processZonePacketDownHook = Hook<ProcessZonePacketDownDelegate>.FromAddress(this.address.ProcessZonePacketDown, this.ProcessZonePacketDownDetour);
-            this.processZonePacketUpHook = Hook<ProcessZonePacketUpDelegate>.FromAddress(this.address.ProcessZonePacketUp, this.ProcessZonePacketUpDetour);
-        }
-
-        /// <summary>
-        /// The delegate type of a network message event.
-        /// </summary>
-        /// <param name="dataPtr">The pointer to the raw data.</param>
-        /// <param name="opCode">The operation ID code.</param>
-        /// <param name="sourceActorId">The source actor ID.</param>
-        /// <param name="targetActorId">The taret actor ID.</param>
-        /// <param name="direction">The direction of the packed.</param>
-        public delegate void OnNetworkMessageDelegate(IntPtr dataPtr, ushort opCode, uint sourceActorId, uint targetActorId, NetworkMessageDirection direction);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate void ProcessZonePacketDownDelegate(IntPtr a, uint targetId, IntPtr dataPtr);
-
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate byte ProcessZonePacketUpDelegate(IntPtr a1, IntPtr dataPtr, IntPtr a3, byte a4);
-
-        /// <summary>
-        /// Event that is called when a network message is sent/received.
-        /// </summary>
-        public event OnNetworkMessageDelegate NetworkMessage;
-
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        void IDisposable.Dispose()
-        {
-            this.processZonePacketDownHook.Dispose();
-            this.processZonePacketUpHook.Dispose();
-        }
-
-        /// <summary>
-        /// Process a chat queue.
-        /// </summary>
-        internal void UpdateQueue()
-        {
-            while (this.zoneInjectQueue.Count > 0)
-            {
-                var packetData = this.zoneInjectQueue.Dequeue();
-
-                var unmanagedPacketData = Marshal.AllocHGlobal(packetData.Length);
-                Marshal.Copy(packetData, 0, unmanagedPacketData, packetData.Length);
-
-                if (this.baseAddress != IntPtr.Zero)
-                {
-                    this.processZonePacketDownHook.Original(this.baseAddress, 0, unmanagedPacketData);
-                }
-
-                Marshal.FreeHGlobal(unmanagedPacketData);
-            }
-        }
-
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction()
-        {
-            this.processZonePacketDownHook.Enable();
-            this.processZonePacketUpHook.Enable();
-        }
-
-        private void ProcessZonePacketDownDetour(IntPtr a, uint targetId, IntPtr dataPtr)
-        {
-            this.baseAddress = a;
-
-            // Go back 0x10 to get back to the start of the packet header
-            dataPtr -= 0x10;
-
-            try
-            {
-                // Call events
-                this.NetworkMessage?.Invoke(dataPtr + 0x20, (ushort)Marshal.ReadInt16(dataPtr, 0x12), 0, targetId, NetworkMessageDirection.ZoneDown);
-
-                this.processZonePacketDownHook.Original(a, targetId, dataPtr + 0x10);
-            }
-            catch (Exception ex)
-            {
-                string header;
-                try
-                {
-                    var data = new byte[32];
-                    Marshal.Copy(dataPtr, data, 0, 32);
-                    header = BitConverter.ToString(data);
-                }
-                catch (Exception)
-                {
-                    header = "failed";
-                }
-
-                Log.Error(ex, "Exception on ProcessZonePacketDown hook. Header: " + header);
-
-                this.processZonePacketDownHook.Original(a, targetId, dataPtr + 0x10);
-            }
-        }
-
-        private byte ProcessZonePacketUpDetour(IntPtr a1, IntPtr dataPtr, IntPtr a3, byte a4)
-        {
-            try
-            {
-                // Call events
-                // TODO: Implement actor IDs
-                this.NetworkMessage?.Invoke(dataPtr + 0x20, (ushort)Marshal.ReadInt16(dataPtr), 0x0, 0x0, NetworkMessageDirection.ZoneUp);
-            }
-            catch (Exception ex)
-            {
-                string header;
-                try
-                {
-                    var data = new byte[32];
-                    Marshal.Copy(dataPtr, data, 0, 32);
-                    header = BitConverter.ToString(data);
-                }
-                catch (Exception)
-                {
-                    header = "failed";
-                }
-
-                Log.Error(ex, "Exception on ProcessZonePacketUp hook. Header: " + header);
-            }
-
-            return this.processZonePacketUpHook.Original(a1, dataPtr, a3, a4);
-        }
-
-        // private void InjectZoneProtoPacket(byte[] data)
-        // {
-        //     this.zoneInjectQueue.Enqueue(data);
-        // }
-
-        // private void InjectActorControl(short cat, int param1)
-        // {
-        //     var packetData = new byte[]
-        //     {
-        //         0x14, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x17, 0x7C, 0xC5, 0x5D, 0x00, 0x00, 0x00, 0x00,
-        //         0x05, 0x00, 0x48, 0xB2, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        //         0x00, 0x00, 0x00, 0x00, 0x43, 0x7F, 0x00, 0x00,
-        //     };
-        //
-        //     BitConverter.GetBytes((short)cat).CopyTo(packetData, 0x10);
-        //
-        //     BitConverter.GetBytes((uint)param1).CopyTo(packetData, 0x14);
-        //
-        //     this.InjectZoneProtoPacket(packetData);
-        // }
+        this.processZonePacketDownHook = Hook<ProcessZonePacketDownDelegate>.FromAddress(this.address.ProcessZonePacketDown, this.ProcessZonePacketDownDetour);
+        this.processZonePacketUpHook = Hook<ProcessZonePacketUpDelegate>.FromAddress(this.address.ProcessZonePacketUp, this.ProcessZonePacketUpDetour);
     }
+
+    /// <summary>
+    /// The delegate type of a network message event.
+    /// </summary>
+    /// <param name="dataPtr">The pointer to the raw data.</param>
+    /// <param name="opCode">The operation ID code.</param>
+    /// <param name="sourceActorId">The source actor ID.</param>
+    /// <param name="targetActorId">The taret actor ID.</param>
+    /// <param name="direction">The direction of the packed.</param>
+    public delegate void OnNetworkMessageDelegate(IntPtr dataPtr, ushort opCode, uint sourceActorId, uint targetActorId, NetworkMessageDirection direction);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate void ProcessZonePacketDownDelegate(IntPtr a, uint targetId, IntPtr dataPtr);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate byte ProcessZonePacketUpDelegate(IntPtr a1, IntPtr dataPtr, IntPtr a3, byte a4);
+
+    /// <summary>
+    /// Event that is called when a network message is sent/received.
+    /// </summary>
+    public event OnNetworkMessageDelegate NetworkMessage;
+
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.processZonePacketDownHook.Dispose();
+        this.processZonePacketUpHook.Dispose();
+    }
+
+    /// <summary>
+    /// Process a chat queue.
+    /// </summary>
+    internal void UpdateQueue()
+    {
+        while (this.zoneInjectQueue.Count > 0)
+        {
+            var packetData = this.zoneInjectQueue.Dequeue();
+
+            var unmanagedPacketData = Marshal.AllocHGlobal(packetData.Length);
+            Marshal.Copy(packetData, 0, unmanagedPacketData, packetData.Length);
+
+            if (this.baseAddress != IntPtr.Zero)
+            {
+                this.processZonePacketDownHook.Original(this.baseAddress, 0, unmanagedPacketData);
+            }
+
+            Marshal.FreeHGlobal(unmanagedPacketData);
+        }
+    }
+
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction()
+    {
+        this.processZonePacketDownHook.Enable();
+        this.processZonePacketUpHook.Enable();
+    }
+
+    private void ProcessZonePacketDownDetour(IntPtr a, uint targetId, IntPtr dataPtr)
+    {
+        this.baseAddress = a;
+
+        // Go back 0x10 to get back to the start of the packet header
+        dataPtr -= 0x10;
+
+        try
+        {
+            // Call events
+            this.NetworkMessage?.Invoke(dataPtr + 0x20, (ushort)Marshal.ReadInt16(dataPtr, 0x12), 0, targetId, NetworkMessageDirection.ZoneDown);
+
+            this.processZonePacketDownHook.Original(a, targetId, dataPtr + 0x10);
+        }
+        catch (Exception ex)
+        {
+            string header;
+            try
+            {
+                var data = new byte[32];
+                Marshal.Copy(dataPtr, data, 0, 32);
+                header = BitConverter.ToString(data);
+            }
+            catch (Exception)
+            {
+                header = "failed";
+            }
+
+            Log.Error(ex, "Exception on ProcessZonePacketDown hook. Header: " + header);
+
+            this.processZonePacketDownHook.Original(a, targetId, dataPtr + 0x10);
+        }
+    }
+
+    private byte ProcessZonePacketUpDetour(IntPtr a1, IntPtr dataPtr, IntPtr a3, byte a4)
+    {
+        try
+        {
+            // Call events
+            // TODO: Implement actor IDs
+            this.NetworkMessage?.Invoke(dataPtr + 0x20, (ushort)Marshal.ReadInt16(dataPtr), 0x0, 0x0, NetworkMessageDirection.ZoneUp);
+        }
+        catch (Exception ex)
+        {
+            string header;
+            try
+            {
+                var data = new byte[32];
+                Marshal.Copy(dataPtr, data, 0, 32);
+                header = BitConverter.ToString(data);
+            }
+            catch (Exception)
+            {
+                header = "failed";
+            }
+
+            Log.Error(ex, "Exception on ProcessZonePacketUp hook. Header: " + header);
+        }
+
+        return this.processZonePacketUpHook.Original(a1, dataPtr, a3, a4);
+    }
+
+    // private void InjectZoneProtoPacket(byte[] data)
+    // {
+    //     this.zoneInjectQueue.Enqueue(data);
+    // }
+
+    // private void InjectActorControl(short cat, int param1)
+    // {
+    //     var packetData = new byte[]
+    //     {
+    //         0x14, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x17, 0x7C, 0xC5, 0x5D, 0x00, 0x00, 0x00, 0x00,
+    //         0x05, 0x00, 0x48, 0xB2, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    //         0x00, 0x00, 0x00, 0x00, 0x43, 0x7F, 0x00, 0x00,
+    //     };
+    //
+    //     BitConverter.GetBytes((short)cat).CopyTo(packetData, 0x10);
+    //
+    //     BitConverter.GetBytes((uint)param1).CopyTo(packetData, 0x14);
+    //
+    //     this.InjectZoneProtoPacket(packetData);
+    // }
 }
diff --git a/Dalamud/Game/Network/GameNetworkAddressResolver.cs b/Dalamud/Game/Network/GameNetworkAddressResolver.cs
index 565a1e2b9..5be85bd35 100644
--- a/Dalamud/Game/Network/GameNetworkAddressResolver.cs
+++ b/Dalamud/Game/Network/GameNetworkAddressResolver.cs
@@ -1,29 +1,28 @@
 using System;
 
-namespace Dalamud.Game.Network
+namespace Dalamud.Game.Network;
+
+/// <summary>
+/// The address resolver for the <see cref="GameNetwork"/> class.
+/// </summary>
+public sealed class GameNetworkAddressResolver : BaseAddressResolver
 {
     /// <summary>
-    /// The address resolver for the <see cref="GameNetwork"/> class.
+    /// Gets the address of the ProcessZonePacketDown method.
     /// </summary>
-    public sealed class GameNetworkAddressResolver : BaseAddressResolver
+    public IntPtr ProcessZonePacketDown { get; private set; }
+
+    /// <summary>
+    /// Gets the address of the ProcessZonePacketUp method.
+    /// </summary>
+    public IntPtr ProcessZonePacketUp { get; private set; }
+
+    /// <inheritdoc/>
+    protected override void Setup64Bit(SigScanner sig)
     {
-        /// <summary>
-        /// Gets the address of the ProcessZonePacketDown method.
-        /// </summary>
-        public IntPtr ProcessZonePacketDown { get; private set; }
-
-        /// <summary>
-        /// Gets the address of the ProcessZonePacketUp method.
-        /// </summary>
-        public IntPtr ProcessZonePacketUp { get; private set; }
-
-        /// <inheritdoc/>
-        protected override void Setup64Bit(SigScanner sig)
-        {
-            // ProcessZonePacket = sig.ScanText("48 89 74 24 18 57 48 83  EC 50 8B F2 49 8B F8 41 0F B7 50 02 8B CE E8 ?? ?? 7A FF 0F B7 57 02 8D 42 89 3D 5F 02 00 00 0F 87 60 01 00 00 4C 8D 05");
-            // ProcessZonePacket = sig.ScanText("48 89 74 24 18 57 48 83  EC 50 8B F2 49 8B F8 41 0F B7 50 02 8B CE E8 ?? ?? 73 FF 0F B7 57 02 8D 42 ?? 3D ?? ?? 00 00 0F 87 60 01 00 00 4C 8D 05");
-            this.ProcessZonePacketDown = sig.ScanText("48 89 5C 24 ?? 56 48 83 EC 50 8B F2");
-            this.ProcessZonePacketUp = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 41 56 41 57 48 83 EC 70 8B 81 ?? ?? ?? ??");
-        }
+        // ProcessZonePacket = sig.ScanText("48 89 74 24 18 57 48 83  EC 50 8B F2 49 8B F8 41 0F B7 50 02 8B CE E8 ?? ?? 7A FF 0F B7 57 02 8D 42 89 3D 5F 02 00 00 0F 87 60 01 00 00 4C 8D 05");
+        // ProcessZonePacket = sig.ScanText("48 89 74 24 18 57 48 83  EC 50 8B F2 49 8B F8 41 0F B7 50 02 8B CE E8 ?? ?? 73 FF 0F B7 57 02 8D 42 ?? 3D ?? ?? 00 00 0F 87 60 01 00 00 4C 8D 05");
+        this.ProcessZonePacketDown = sig.ScanText("48 89 5C 24 ?? 56 48 83 EC 50 8B F2");
+        this.ProcessZonePacketUp = sig.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 41 56 41 57 48 83 EC 70 8B 81 ?? ?? ?? ??");
     }
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/IMarketBoardUploader.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/IMarketBoardUploader.cs
index 6ec2a997b..dadfef604 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/IMarketBoardUploader.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/IMarketBoardUploader.cs
@@ -2,32 +2,31 @@ using System.Threading.Tasks;
 
 using Dalamud.Game.Network.Structures;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders;
+
+/// <summary>
+/// An interface binding for the Universalis uploader.
+/// </summary>
+internal interface IMarketBoardUploader
 {
     /// <summary>
-    /// An interface binding for the Universalis uploader.
+    /// Upload data about an item.
     /// </summary>
-    internal interface IMarketBoardUploader
-    {
-        /// <summary>
-        /// Upload data about an item.
-        /// </summary>
-        /// <param name="item">The item request data being uploaded.</param>
-        /// <returns>An async task.</returns>
-        Task Upload(MarketBoardItemRequest item);
+    /// <param name="item">The item request data being uploaded.</param>
+    /// <returns>An async task.</returns>
+    Task Upload(MarketBoardItemRequest item);
 
-        /// <summary>
-        /// Upload tax rate data.
-        /// </summary>
-        /// <param name="taxRates">The tax rate data being uploaded.</param>
-        /// <returns>An async task.</returns>
-        Task UploadTax(MarketTaxRates taxRates);
+    /// <summary>
+    /// Upload tax rate data.
+    /// </summary>
+    /// <param name="taxRates">The tax rate data being uploaded.</param>
+    /// <returns>An async task.</returns>
+    Task UploadTax(MarketTaxRates taxRates);
 
-        /// <summary>
-        /// Upload information about a purchase this client has made.
-        /// </summary>
-        /// <param name="purchaseHandler">The purchase handler data associated with the sale.</param>
-        /// <returns>An async task.</returns>
-        Task UploadPurchase(MarketBoardPurchaseHandler purchaseHandler);
-    }
+    /// <summary>
+    /// Upload information about a purchase this client has made.
+    /// </summary>
+    /// <param name="purchaseHandler">The purchase handler data associated with the sale.</param>
+    /// <returns>An async task.</returns>
+    Task UploadPurchase(MarketBoardPurchaseHandler purchaseHandler);
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/MarketBoardItemRequest.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/MarketBoardItemRequest.cs
index bdd07a8af..18ed5c4b5 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/MarketBoardItemRequest.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/MarketBoardItemRequest.cs
@@ -4,64 +4,63 @@ using System.IO;
 
 using Dalamud.Game.Network.Structures;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders;
+
+/// <summary>
+/// This represents a submission to a marketboard aggregation website.
+/// </summary>
+internal class MarketBoardItemRequest
 {
-    /// <summary>
-    /// This represents a submission to a marketboard aggregation website.
-    /// </summary>
-    internal class MarketBoardItemRequest
+    private MarketBoardItemRequest()
     {
-        private MarketBoardItemRequest()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Gets the catalog ID.
-        /// </summary>
-        public uint CatalogId { get; private set; }
+    /// <summary>
+    /// Gets the catalog ID.
+    /// </summary>
+    public uint CatalogId { get; private set; }
 
-        /// <summary>
-        /// Gets the amount to arrive.
-        /// </summary>
-        public byte AmountToArrive { get; private set; }
+    /// <summary>
+    /// Gets the amount to arrive.
+    /// </summary>
+    public byte AmountToArrive { get; private set; }
 
-        /// <summary>
-        /// Gets the offered item listings.
-        /// </summary>
-        public List<MarketBoardCurrentOfferings.MarketBoardItemListing> Listings { get; } = new();
+    /// <summary>
+    /// Gets the offered item listings.
+    /// </summary>
+    public List<MarketBoardCurrentOfferings.MarketBoardItemListing> Listings { get; } = new();
 
-        /// <summary>
-        /// Gets the historical item listings.
-        /// </summary>
-        public List<MarketBoardHistory.MarketBoardHistoryListing> History { get; } = new();
+    /// <summary>
+    /// Gets the historical item listings.
+    /// </summary>
+    public List<MarketBoardHistory.MarketBoardHistoryListing> History { get; } = new();
 
-        /// <summary>
-        /// Gets or sets the listing request ID.
-        /// </summary>
-        public int ListingsRequestId { get; set; } = -1;
+    /// <summary>
+    /// Gets or sets the listing request ID.
+    /// </summary>
+    public int ListingsRequestId { get; set; } = -1;
 
-        /// <summary>
-        /// Gets a value indicating whether the upload is complete.
-        /// </summary>
-        public bool IsDone => this.Listings.Count == this.AmountToArrive && this.History.Count != 0;
+    /// <summary>
+    /// Gets a value indicating whether the upload is complete.
+    /// </summary>
+    public bool IsDone => this.Listings.Count == this.AmountToArrive && this.History.Count != 0;
 
-        /// <summary>
-        /// Read a packet off the wire.
-        /// </summary>
-        /// <param name="dataPtr">Packet data.</param>
-        /// <returns>An object representing the data read.</returns>
-        public static unsafe MarketBoardItemRequest Read(IntPtr dataPtr)
-        {
-            using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
-            using var reader = new BinaryReader(stream);
+    /// <summary>
+    /// Read a packet off the wire.
+    /// </summary>
+    /// <param name="dataPtr">Packet data.</param>
+    /// <returns>An object representing the data read.</returns>
+    public static unsafe MarketBoardItemRequest Read(IntPtr dataPtr)
+    {
+        using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
+        using var reader = new BinaryReader(stream);
 
-            var output = new MarketBoardItemRequest();
+        var output = new MarketBoardItemRequest();
 
-            output.CatalogId = reader.ReadUInt32();
-            stream.Position += 0x7;
-            output.AmountToArrive = reader.ReadByte();
+        output.CatalogId = reader.ReadUInt32();
+        stream.Position += 0x7;
+        output.AmountToArrive = reader.ReadByte();
 
-            return output;
-        }
+        return output;
     }
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisHistoryEntry.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisHistoryEntry.cs
index 37467377c..3b95349a9 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisHistoryEntry.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisHistoryEntry.cs
@@ -1,58 +1,57 @@
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types;
+
+/// <summary>
+/// A Universalis API structure.
+/// </summary>
+internal class UniversalisHistoryEntry
 {
     /// <summary>
-    /// A Universalis API structure.
+    /// Gets or sets a value indicating whether the item is HQ or not.
     /// </summary>
-    internal class UniversalisHistoryEntry
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether the item is HQ or not.
-        /// </summary>
-        [JsonProperty("hq")]
-        public bool Hq { get; set; }
+    [JsonProperty("hq")]
+    public bool Hq { get; set; }
 
-        /// <summary>
-        /// Gets or sets the item price per unit.
-        /// </summary>
-        [JsonProperty("pricePerUnit")]
-        public uint PricePerUnit { get; set; }
+    /// <summary>
+    /// Gets or sets the item price per unit.
+    /// </summary>
+    [JsonProperty("pricePerUnit")]
+    public uint PricePerUnit { get; set; }
 
-        /// <summary>
-        /// Gets or sets the quantity of items available.
-        /// </summary>
-        [JsonProperty("quantity")]
-        public uint Quantity { get; set; }
+    /// <summary>
+    /// Gets or sets the quantity of items available.
+    /// </summary>
+    [JsonProperty("quantity")]
+    public uint Quantity { get; set; }
 
-        /// <summary>
-        /// Gets or sets the name of the buyer.
-        /// </summary>
-        [JsonProperty("buyerName")]
-        public string BuyerName { get; set; }
+    /// <summary>
+    /// Gets or sets the name of the buyer.
+    /// </summary>
+    [JsonProperty("buyerName")]
+    public string BuyerName { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether this item was on a mannequin.
-        /// </summary>
-        [JsonProperty("onMannequin")]
-        public bool OnMannequin { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether this item was on a mannequin.
+    /// </summary>
+    [JsonProperty("onMannequin")]
+    public bool OnMannequin { get; set; }
 
-        /// <summary>
-        /// Gets or sets the seller ID.
-        /// </summary>
-        [JsonProperty("sellerID")]
-        public string SellerId { get; set; }
+    /// <summary>
+    /// Gets or sets the seller ID.
+    /// </summary>
+    [JsonProperty("sellerID")]
+    public string SellerId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the buyer ID.
-        /// </summary>
-        [JsonProperty("buyerID")]
-        public string BuyerId { get; set; }
+    /// <summary>
+    /// Gets or sets the buyer ID.
+    /// </summary>
+    [JsonProperty("buyerID")]
+    public string BuyerId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the timestamp of the transaction.
-        /// </summary>
-        [JsonProperty("timestamp")]
-        public long Timestamp { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the timestamp of the transaction.
+    /// </summary>
+    [JsonProperty("timestamp")]
+    public long Timestamp { get; set; }
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisHistoryUploadRequest.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisHistoryUploadRequest.cs
index afa8bf417..ba5e4ad47 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisHistoryUploadRequest.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisHistoryUploadRequest.cs
@@ -2,35 +2,34 @@ using System.Collections.Generic;
 
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types;
+
+/// <summary>
+/// A Universalis API structure.
+/// </summary>
+internal class UniversalisHistoryUploadRequest
 {
     /// <summary>
-    /// A Universalis API structure.
+    /// Gets or sets the world ID.
     /// </summary>
-    internal class UniversalisHistoryUploadRequest
-    {
-        /// <summary>
-        /// Gets or sets the world ID.
-        /// </summary>
-        [JsonProperty("worldID")]
-        public uint WorldId { get; set; }
+    [JsonProperty("worldID")]
+    public uint WorldId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the item ID.
-        /// </summary>
-        [JsonProperty("itemID")]
-        public uint ItemId { get; set; }
+    /// <summary>
+    /// Gets or sets the item ID.
+    /// </summary>
+    [JsonProperty("itemID")]
+    public uint ItemId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the list of available entries.
-        /// </summary>
-        [JsonProperty("entries")]
-        public List<UniversalisHistoryEntry> Entries { get; set; }
+    /// <summary>
+    /// Gets or sets the list of available entries.
+    /// </summary>
+    [JsonProperty("entries")]
+    public List<UniversalisHistoryEntry> Entries { get; set; }
 
-        /// <summary>
-        /// Gets or sets the uploader ID.
-        /// </summary>
-        [JsonProperty("uploaderID")]
-        public string UploaderId { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the uploader ID.
+    /// </summary>
+    [JsonProperty("uploaderID")]
+    public string UploaderId { get; set; }
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingDeleteRequest.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingDeleteRequest.cs
index ea96f934a..ed8a82bfa 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingDeleteRequest.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingDeleteRequest.cs
@@ -1,40 +1,39 @@
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types;
+
+/// <summary>
+/// Request payload for market board purchases.
+/// </summary>
+internal class UniversalisItemListingDeleteRequest
 {
     /// <summary>
-    /// Request payload for market board purchases.
+    /// Gets or sets the object ID of the retainer associated with the sale.
     /// </summary>
-    internal class UniversalisItemListingDeleteRequest
-    {
-        /// <summary>
-        /// Gets or sets the object ID of the retainer associated with the sale.
-        /// </summary>
-        [JsonProperty("retainerID")]
-        public string RetainerId { get; set; }
+    [JsonProperty("retainerID")]
+    public string RetainerId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the object ID of the item listing.
-        /// </summary>
-        [JsonProperty("listingID")]
-        public string ListingId { get; set; }
+    /// <summary>
+    /// Gets or sets the object ID of the item listing.
+    /// </summary>
+    [JsonProperty("listingID")]
+    public string ListingId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the quantity of the item that was purchased.
-        /// </summary>
-        [JsonProperty("quantity")]
-        public uint Quantity { get; set; }
+    /// <summary>
+    /// Gets or sets the quantity of the item that was purchased.
+    /// </summary>
+    [JsonProperty("quantity")]
+    public uint Quantity { get; set; }
 
-        /// <summary>
-        /// Gets or sets the unit price of the item.
-        /// </summary>
-        [JsonProperty("pricePerUnit")]
-        public uint PricePerUnit { get; set; }
+    /// <summary>
+    /// Gets or sets the unit price of the item.
+    /// </summary>
+    [JsonProperty("pricePerUnit")]
+    public uint PricePerUnit { get; set; }
 
-        /// <summary>
-        /// Gets or sets the uploader ID.
-        /// </summary>
-        [JsonProperty("uploaderID")]
-        public string UploaderId { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the uploader ID.
+    /// </summary>
+    [JsonProperty("uploaderID")]
+    public string UploaderId { get; set; }
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingsEntry.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingsEntry.cs
index 42ff15668..c4a51b49d 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingsEntry.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingsEntry.cs
@@ -2,95 +2,94 @@ using System.Collections.Generic;
 
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types;
+
+/// <summary>
+/// A Universalis API structure.
+/// </summary>
+internal class UniversalisItemListingsEntry
 {
     /// <summary>
-    /// A Universalis API structure.
+    /// Gets or sets the listing ID.
     /// </summary>
-    internal class UniversalisItemListingsEntry
-    {
-        /// <summary>
-        /// Gets or sets the listing ID.
-        /// </summary>
-        [JsonProperty("listingID")]
-        public string ListingId { get; set; }
+    [JsonProperty("listingID")]
+    public string ListingId { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the item is HQ.
-        /// </summary>
-        [JsonProperty("hq")]
-        public bool Hq { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether the item is HQ.
+    /// </summary>
+    [JsonProperty("hq")]
+    public bool Hq { get; set; }
 
-        /// <summary>
-        /// Gets or sets the item price per unit.
-        /// </summary>
-        [JsonProperty("pricePerUnit")]
-        public uint PricePerUnit { get; set; }
+    /// <summary>
+    /// Gets or sets the item price per unit.
+    /// </summary>
+    [JsonProperty("pricePerUnit")]
+    public uint PricePerUnit { get; set; }
 
-        /// <summary>
-        /// Gets or sets the item quantity.
-        /// </summary>
-        [JsonProperty("quantity")]
-        public uint Quantity { get; set; }
+    /// <summary>
+    /// Gets or sets the item quantity.
+    /// </summary>
+    [JsonProperty("quantity")]
+    public uint Quantity { get; set; }
 
-        /// <summary>
-        /// Gets or sets the name of the retainer selling the item.
-        /// </summary>
-        [JsonProperty("retainerName")]
-        public string RetainerName { get; set; }
+    /// <summary>
+    /// Gets or sets the name of the retainer selling the item.
+    /// </summary>
+    [JsonProperty("retainerName")]
+    public string RetainerName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ID of the retainer selling the item.
-        /// </summary>
-        [JsonProperty("retainerID")]
-        public string RetainerId { get; set; }
+    /// <summary>
+    /// Gets or sets the ID of the retainer selling the item.
+    /// </summary>
+    [JsonProperty("retainerID")]
+    public string RetainerId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the name of the user who created the entry.
-        /// </summary>
-        [JsonProperty("creatorName")]
-        public string CreatorName { get; set; }
+    /// <summary>
+    /// Gets or sets the name of the user who created the entry.
+    /// </summary>
+    [JsonProperty("creatorName")]
+    public string CreatorName { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the item is on a mannequin.
-        /// </summary>
-        [JsonProperty("onMannequin")]
-        public bool OnMannequin { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether the item is on a mannequin.
+    /// </summary>
+    [JsonProperty("onMannequin")]
+    public bool OnMannequin { get; set; }
 
-        /// <summary>
-        /// Gets or sets the seller ID.
-        /// </summary>
-        [JsonProperty("sellerID")]
-        public string SellerId { get; set; }
+    /// <summary>
+    /// Gets or sets the seller ID.
+    /// </summary>
+    [JsonProperty("sellerID")]
+    public string SellerId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ID of the user who created the entry.
-        /// </summary>
-        [JsonProperty("creatorID")]
-        public string CreatorId { get; set; }
+    /// <summary>
+    /// Gets or sets the ID of the user who created the entry.
+    /// </summary>
+    [JsonProperty("creatorID")]
+    public string CreatorId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ID of the dye on the item.
-        /// </summary>
-        [JsonProperty("stainID")]
-        public int StainId { get; set; }
+    /// <summary>
+    /// Gets or sets the ID of the dye on the item.
+    /// </summary>
+    [JsonProperty("stainID")]
+    public int StainId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the city where the selling retainer resides.
-        /// </summary>
-        [JsonProperty("retainerCity")]
-        public int RetainerCity { get; set; }
+    /// <summary>
+    /// Gets or sets the city where the selling retainer resides.
+    /// </summary>
+    [JsonProperty("retainerCity")]
+    public int RetainerCity { get; set; }
 
-        /// <summary>
-        /// Gets or sets the last time the entry was reviewed.
-        /// </summary>
-        [JsonProperty("lastReviewTime")]
-        public long LastReviewTime { get; set; }
+    /// <summary>
+    /// Gets or sets the last time the entry was reviewed.
+    /// </summary>
+    [JsonProperty("lastReviewTime")]
+    public long LastReviewTime { get; set; }
 
-        /// <summary>
-        /// Gets or sets the materia attached to the item.
-        /// </summary>
-        [JsonProperty("materia")]
-        public List<UniversalisItemMateria> Materia { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the materia attached to the item.
+    /// </summary>
+    [JsonProperty("materia")]
+    public List<UniversalisItemMateria> Materia { get; set; }
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingsUploadRequest.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingsUploadRequest.cs
index c055b30d9..e70b43588 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingsUploadRequest.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemListingsUploadRequest.cs
@@ -2,35 +2,34 @@ using System.Collections.Generic;
 
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types;
+
+/// <summary>
+/// A Universalis API structure.
+/// </summary>
+internal class UniversalisItemListingsUploadRequest
 {
     /// <summary>
-    /// A Universalis API structure.
+    /// Gets or sets the world ID.
     /// </summary>
-    internal class UniversalisItemListingsUploadRequest
-    {
-        /// <summary>
-        /// Gets or sets the world ID.
-        /// </summary>
-        [JsonProperty("worldID")]
-        public uint WorldId { get; set; }
+    [JsonProperty("worldID")]
+    public uint WorldId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the item ID.
-        /// </summary>
-        [JsonProperty("itemID")]
-        public uint ItemId { get; set; }
+    /// <summary>
+    /// Gets or sets the item ID.
+    /// </summary>
+    [JsonProperty("itemID")]
+    public uint ItemId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the list of available items.
-        /// </summary>
-        [JsonProperty("listings")]
-        public List<UniversalisItemListingsEntry> Listings { get; set; }
+    /// <summary>
+    /// Gets or sets the list of available items.
+    /// </summary>
+    [JsonProperty("listings")]
+    public List<UniversalisItemListingsEntry> Listings { get; set; }
 
-        /// <summary>
-        /// Gets or sets the uploader ID.
-        /// </summary>
-        [JsonProperty("uploaderID")]
-        public string UploaderId { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the uploader ID.
+    /// </summary>
+    [JsonProperty("uploaderID")]
+    public string UploaderId { get; set; }
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemMateria.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemMateria.cs
index 8c9c99bb5..3480470eb 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemMateria.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisItemMateria.cs
@@ -1,22 +1,21 @@
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types;
+
+/// <summary>
+/// A Universalis API structure.
+/// </summary>
+internal class UniversalisItemMateria
 {
     /// <summary>
-    /// A Universalis API structure.
+    /// Gets or sets the item slot ID.
     /// </summary>
-    internal class UniversalisItemMateria
-    {
-        /// <summary>
-        /// Gets or sets the item slot ID.
-        /// </summary>
-        [JsonProperty("slotID")]
-        public int SlotId { get; set; }
+    [JsonProperty("slotID")]
+    public int SlotId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the materia ID.
-        /// </summary>
-        [JsonProperty("materiaID")]
-        public int MateriaId { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the materia ID.
+    /// </summary>
+    [JsonProperty("materiaID")]
+    public int MateriaId { get; set; }
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisTaxData.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisTaxData.cs
index ff30a490c..72f54773d 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisTaxData.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisTaxData.cs
@@ -1,52 +1,51 @@
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types;
+
+/// <summary>
+/// A Universalis API structure.
+/// </summary>
+internal class UniversalisTaxData
 {
     /// <summary>
-    /// A Universalis API structure.
+    /// Gets or sets Limsa Lominsa's current tax rate.
     /// </summary>
-    internal class UniversalisTaxData
-    {
-        /// <summary>
-        /// Gets or sets Limsa Lominsa's current tax rate.
-        /// </summary>
-        [JsonProperty("limsaLominsa")]
-        public uint LimsaLominsa { get; set; }
+    [JsonProperty("limsaLominsa")]
+    public uint LimsaLominsa { get; set; }
 
-        /// <summary>
-        /// Gets or sets Gridania's current tax rate.
-        /// </summary>
-        [JsonProperty("gridania")]
-        public uint Gridania { get; set; }
+    /// <summary>
+    /// Gets or sets Gridania's current tax rate.
+    /// </summary>
+    [JsonProperty("gridania")]
+    public uint Gridania { get; set; }
 
-        /// <summary>
-        /// Gets or sets Ul'dah's current tax rate.
-        /// </summary>
-        [JsonProperty("uldah")]
-        public uint Uldah { get; set; }
+    /// <summary>
+    /// Gets or sets Ul'dah's current tax rate.
+    /// </summary>
+    [JsonProperty("uldah")]
+    public uint Uldah { get; set; }
 
-        /// <summary>
-        /// Gets or sets Ishgard's current tax rate.
-        /// </summary>
-        [JsonProperty("ishgard")]
-        public uint Ishgard { get; set; }
+    /// <summary>
+    /// Gets or sets Ishgard's current tax rate.
+    /// </summary>
+    [JsonProperty("ishgard")]
+    public uint Ishgard { get; set; }
 
-        /// <summary>
-        /// Gets or sets Kugane's current tax rate.
-        /// </summary>
-        [JsonProperty("kugane")]
-        public uint Kugane { get; set; }
+    /// <summary>
+    /// Gets or sets Kugane's current tax rate.
+    /// </summary>
+    [JsonProperty("kugane")]
+    public uint Kugane { get; set; }
 
-        /// <summary>
-        /// Gets or sets The Crystarium's current tax rate.
-        /// </summary>
-        [JsonProperty("crystarium")]
-        public uint Crystarium { get; set; }
+    /// <summary>
+    /// Gets or sets The Crystarium's current tax rate.
+    /// </summary>
+    [JsonProperty("crystarium")]
+    public uint Crystarium { get; set; }
 
-        /// <summary>
-        /// Gets or sets Old Sharlayan's current tax rate.
-        /// </summary>
-        [JsonProperty("sharlayan")]
-        public uint Sharlayan { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets Old Sharlayan's current tax rate.
+    /// </summary>
+    [JsonProperty("sharlayan")]
+    public uint Sharlayan { get; set; }
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisTaxUploadRequest.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisTaxUploadRequest.cs
index a11ac0e89..d7abb5f89 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisTaxUploadRequest.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/Types/UniversalisTaxUploadRequest.cs
@@ -1,28 +1,27 @@
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis.Types;
+
+/// <summary>
+/// A Universalis API structure.
+/// </summary>
+internal class UniversalisTaxUploadRequest
 {
     /// <summary>
-    /// A Universalis API structure.
+    /// Gets or sets the uploader's ID.
     /// </summary>
-    internal class UniversalisTaxUploadRequest
-    {
-        /// <summary>
-        /// Gets or sets the uploader's ID.
-        /// </summary>
-        [JsonProperty("uploaderID")]
-        public string UploaderId { get; set; }
+    [JsonProperty("uploaderID")]
+    public string UploaderId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the world to retrieve data from.
-        /// </summary>
-        [JsonProperty("worldID")]
-        public uint WorldId { get; set; }
+    /// <summary>
+    /// Gets or sets the world to retrieve data from.
+    /// </summary>
+    [JsonProperty("worldID")]
+    public uint WorldId { get; set; }
 
-        /// <summary>
-        /// Gets or sets tax data for each city's market.
-        /// </summary>
-        [JsonProperty("marketTaxRates")]
-        public UniversalisTaxData TaxData { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets tax data for each city's market.
+    /// </summary>
+    [JsonProperty("marketTaxRates")]
+    public UniversalisTaxData TaxData { get; set; }
 }
diff --git a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/UniversalisMarketBoardUploader.cs b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/UniversalisMarketBoardUploader.cs
index 55f005a5b..78634e608 100644
--- a/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/UniversalisMarketBoardUploader.cs
+++ b/Dalamud/Game/Network/Internal/MarketBoardUploaders/Universalis/UniversalisMarketBoardUploader.cs
@@ -10,189 +10,188 @@ using Dalamud.Utility;
 using Newtonsoft.Json;
 using Serilog;
 
-namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis
+namespace Dalamud.Game.Network.Internal.MarketBoardUploaders.Universalis;
+
+/// <summary>
+/// This class represents an uploader for contributing data to Universalis.
+/// </summary>
+internal class UniversalisMarketBoardUploader : IMarketBoardUploader
 {
+    private const string ApiBase = "https://universalis.app";
+    // private const string ApiBase = "https://127.0.0.1:443";
+
+    private const string ApiKey = "GGD6RdSfGyRiHM5WDnAo0Nj9Nv7aC5NDhMj3BebT";
+
     /// <summary>
-    /// This class represents an uploader for contributing data to Universalis.
+    /// Initializes a new instance of the <see cref="UniversalisMarketBoardUploader"/> class.
     /// </summary>
-    internal class UniversalisMarketBoardUploader : IMarketBoardUploader
+    public UniversalisMarketBoardUploader()
     {
-        private const string ApiBase = "https://universalis.app";
-        // private const string ApiBase = "https://127.0.0.1:443";
+    }
 
-        private const string ApiKey = "GGD6RdSfGyRiHM5WDnAo0Nj9Nv7aC5NDhMj3BebT";
+    /// <inheritdoc/>
+    public async Task Upload(MarketBoardItemRequest request)
+    {
+        var clientState = Service<ClientState.ClientState>.GetNullable();
+        if (clientState == null)
+            return;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UniversalisMarketBoardUploader"/> class.
-        /// </summary>
-        public UniversalisMarketBoardUploader()
+        Log.Verbose("Starting Universalis upload.");
+        var uploader = clientState.LocalContentId;
+
+        // ====================================================================================
+
+        var listingsUploadObject = new UniversalisItemListingsUploadRequest
         {
-        }
+            WorldId = clientState.LocalPlayer?.CurrentWorld.Id ?? 0,
+            UploaderId = uploader.ToString(),
+            ItemId = request.CatalogId,
+            Listings = new List<UniversalisItemListingsEntry>(),
+        };
 
-        /// <inheritdoc/>
-        public async Task Upload(MarketBoardItemRequest request)
+        foreach (var marketBoardItemListing in request.Listings)
         {
-            var clientState = Service<ClientState.ClientState>.GetNullable();
-            if (clientState == null)
-                return;
-
-            Log.Verbose("Starting Universalis upload.");
-            var uploader = clientState.LocalContentId;
-
-            // ====================================================================================
-
-            var listingsUploadObject = new UniversalisItemListingsUploadRequest
+            var universalisListing = new UniversalisItemListingsEntry
             {
-                WorldId = clientState.LocalPlayer?.CurrentWorld.Id ?? 0,
-                UploaderId = uploader.ToString(),
-                ItemId = request.CatalogId,
-                Listings = new List<UniversalisItemListingsEntry>(),
+                Hq = marketBoardItemListing.IsHq,
+                SellerId = marketBoardItemListing.RetainerOwnerId.ToString(),
+                RetainerName = marketBoardItemListing.RetainerName,
+                RetainerId = marketBoardItemListing.RetainerId.ToString(),
+                CreatorId = marketBoardItemListing.ArtisanId.ToString(),
+                CreatorName = marketBoardItemListing.PlayerName,
+                OnMannequin = marketBoardItemListing.OnMannequin,
+                LastReviewTime = ((DateTimeOffset)marketBoardItemListing.LastReviewTime).ToUnixTimeSeconds(),
+                PricePerUnit = marketBoardItemListing.PricePerUnit,
+                Quantity = marketBoardItemListing.ItemQuantity,
+                RetainerCity = marketBoardItemListing.RetainerCityId,
+                Materia = new List<UniversalisItemMateria>(),
             };
 
-            foreach (var marketBoardItemListing in request.Listings)
+            foreach (var itemMateria in marketBoardItemListing.Materia)
             {
-                var universalisListing = new UniversalisItemListingsEntry
+                universalisListing.Materia.Add(new UniversalisItemMateria
                 {
-                    Hq = marketBoardItemListing.IsHq,
-                    SellerId = marketBoardItemListing.RetainerOwnerId.ToString(),
-                    RetainerName = marketBoardItemListing.RetainerName,
-                    RetainerId = marketBoardItemListing.RetainerId.ToString(),
-                    CreatorId = marketBoardItemListing.ArtisanId.ToString(),
-                    CreatorName = marketBoardItemListing.PlayerName,
-                    OnMannequin = marketBoardItemListing.OnMannequin,
-                    LastReviewTime = ((DateTimeOffset)marketBoardItemListing.LastReviewTime).ToUnixTimeSeconds(),
-                    PricePerUnit = marketBoardItemListing.PricePerUnit,
-                    Quantity = marketBoardItemListing.ItemQuantity,
-                    RetainerCity = marketBoardItemListing.RetainerCityId,
-                    Materia = new List<UniversalisItemMateria>(),
-                };
-
-                foreach (var itemMateria in marketBoardItemListing.Materia)
-                {
-                    universalisListing.Materia.Add(new UniversalisItemMateria
-                    {
-                        MateriaId = itemMateria.MateriaId,
-                        SlotId = itemMateria.Index,
-                    });
-                }
-
-                listingsUploadObject.Listings.Add(universalisListing);
-            }
-
-            var listingPath = "/upload";
-            var listingUpload = JsonConvert.SerializeObject(listingsUploadObject);
-            Log.Verbose($"{listingPath}: {listingUpload}");
-            await Util.HttpClient.PostAsync($"{ApiBase}{listingPath}/{ApiKey}", new StringContent(listingUpload, Encoding.UTF8, "application/json"));
-
-            // ====================================================================================
-
-            var historyUploadObject = new UniversalisHistoryUploadRequest
-            {
-                WorldId = clientState.LocalPlayer?.CurrentWorld.Id ?? 0,
-                UploaderId = uploader.ToString(),
-                ItemId = request.CatalogId,
-                Entries = new List<UniversalisHistoryEntry>(),
-            };
-
-            foreach (var marketBoardHistoryListing in request.History)
-            {
-                historyUploadObject.Entries.Add(new UniversalisHistoryEntry
-                {
-                    BuyerName = marketBoardHistoryListing.BuyerName,
-                    Hq = marketBoardHistoryListing.IsHq,
-                    OnMannequin = marketBoardHistoryListing.OnMannequin,
-                    PricePerUnit = marketBoardHistoryListing.SalePrice,
-                    Quantity = marketBoardHistoryListing.Quantity,
-                    Timestamp = ((DateTimeOffset)marketBoardHistoryListing.PurchaseTime).ToUnixTimeSeconds(),
+                    MateriaId = itemMateria.MateriaId,
+                    SlotId = itemMateria.Index,
                 });
             }
 
-            var historyPath = "/upload";
-            var historyUpload = JsonConvert.SerializeObject(historyUploadObject);
-            Log.Verbose($"{historyPath}: {historyUpload}");
-            await Util.HttpClient.PostAsync($"{ApiBase}{historyPath}/{ApiKey}", new StringContent(historyUpload, Encoding.UTF8, "application/json"));
-
-            // ====================================================================================
-
-            Log.Verbose("Universalis data upload for item#{0} completed.", request.CatalogId);
+            listingsUploadObject.Listings.Add(universalisListing);
         }
 
-        /// <inheritdoc/>
-        public async Task UploadTax(MarketTaxRates taxRates)
+        var listingPath = "/upload";
+        var listingUpload = JsonConvert.SerializeObject(listingsUploadObject);
+        Log.Verbose($"{listingPath}: {listingUpload}");
+        await Util.HttpClient.PostAsync($"{ApiBase}{listingPath}/{ApiKey}", new StringContent(listingUpload, Encoding.UTF8, "application/json"));
+
+        // ====================================================================================
+
+        var historyUploadObject = new UniversalisHistoryUploadRequest
         {
-            var clientState = Service<ClientState.ClientState>.GetNullable();
-            if (clientState == null)
-                return;
+            WorldId = clientState.LocalPlayer?.CurrentWorld.Id ?? 0,
+            UploaderId = uploader.ToString(),
+            ItemId = request.CatalogId,
+            Entries = new List<UniversalisHistoryEntry>(),
+        };
 
-            // ====================================================================================
-
-            var taxUploadObject = new UniversalisTaxUploadRequest
-            {
-                WorldId = clientState.LocalPlayer?.CurrentWorld.Id ?? 0,
-                UploaderId = clientState.LocalContentId.ToString(),
-                TaxData = new UniversalisTaxData
-                {
-                    LimsaLominsa = taxRates.LimsaLominsaTax,
-                    Gridania = taxRates.GridaniaTax,
-                    Uldah = taxRates.UldahTax,
-                    Ishgard = taxRates.IshgardTax,
-                    Kugane = taxRates.KuganeTax,
-                    Crystarium = taxRates.CrystariumTax,
-                    Sharlayan = taxRates.SharlayanTax,
-                },
-            };
-
-            var taxPath = "/upload";
-            var taxUpload = JsonConvert.SerializeObject(taxUploadObject);
-            Log.Verbose($"{taxPath}: {taxUpload}");
-
-            await Util.HttpClient.PostAsync($"{ApiBase}{taxPath}/{ApiKey}", new StringContent(taxUpload, Encoding.UTF8, "application/json"));
-
-            // ====================================================================================
-
-            Log.Verbose("Universalis tax upload completed.");
-        }
-
-        /// <inheritdoc/>
-        /// <remarks>
-        /// It may seem backwards that an upload only performs a delete request, however this is not trying
-        /// to track the available listings, that is done via the listings packet. All this does is remove
-        /// a listing, or delete it, when a purchase has been made.
-        /// </remarks>
-        public async Task UploadPurchase(MarketBoardPurchaseHandler purchaseHandler)
+        foreach (var marketBoardHistoryListing in request.History)
         {
-            var clientState = Service<ClientState.ClientState>.GetNullable();
-            if (clientState == null)
-                return;
-
-            var itemId = purchaseHandler.CatalogId;
-            var worldId = clientState.LocalPlayer?.CurrentWorld.Id ?? 0;
-
-            // ====================================================================================
-
-            var deleteListingObject = new UniversalisItemListingDeleteRequest
+            historyUploadObject.Entries.Add(new UniversalisHistoryEntry
             {
-                PricePerUnit = purchaseHandler.PricePerUnit,
-                Quantity = purchaseHandler.ItemQuantity,
-                ListingId = purchaseHandler.ListingId.ToString(),
-                RetainerId = purchaseHandler.RetainerId.ToString(),
-                UploaderId = clientState.LocalContentId.ToString(),
-            };
-
-            var deletePath = $"/api/{worldId}/{itemId}/delete";
-            var deleteListing = JsonConvert.SerializeObject(deleteListingObject);
-            Log.Verbose($"{deletePath}: {deleteListing}");
-
-            var content = new StringContent(deleteListing, Encoding.UTF8, "application/json");
-            var message = new HttpRequestMessage(HttpMethod.Post, $"{ApiBase}{deletePath}");
-            message.Headers.Add("Authorization", ApiKey);
-            message.Content = content;
-
-            await Util.HttpClient.SendAsync(message);
-
-            // ====================================================================================
-
-            Log.Verbose("Universalis purchase upload completed.");
+                BuyerName = marketBoardHistoryListing.BuyerName,
+                Hq = marketBoardHistoryListing.IsHq,
+                OnMannequin = marketBoardHistoryListing.OnMannequin,
+                PricePerUnit = marketBoardHistoryListing.SalePrice,
+                Quantity = marketBoardHistoryListing.Quantity,
+                Timestamp = ((DateTimeOffset)marketBoardHistoryListing.PurchaseTime).ToUnixTimeSeconds(),
+            });
         }
+
+        var historyPath = "/upload";
+        var historyUpload = JsonConvert.SerializeObject(historyUploadObject);
+        Log.Verbose($"{historyPath}: {historyUpload}");
+        await Util.HttpClient.PostAsync($"{ApiBase}{historyPath}/{ApiKey}", new StringContent(historyUpload, Encoding.UTF8, "application/json"));
+
+        // ====================================================================================
+
+        Log.Verbose("Universalis data upload for item#{0} completed.", request.CatalogId);
+    }
+
+    /// <inheritdoc/>
+    public async Task UploadTax(MarketTaxRates taxRates)
+    {
+        var clientState = Service<ClientState.ClientState>.GetNullable();
+        if (clientState == null)
+            return;
+
+        // ====================================================================================
+
+        var taxUploadObject = new UniversalisTaxUploadRequest
+        {
+            WorldId = clientState.LocalPlayer?.CurrentWorld.Id ?? 0,
+            UploaderId = clientState.LocalContentId.ToString(),
+            TaxData = new UniversalisTaxData
+            {
+                LimsaLominsa = taxRates.LimsaLominsaTax,
+                Gridania = taxRates.GridaniaTax,
+                Uldah = taxRates.UldahTax,
+                Ishgard = taxRates.IshgardTax,
+                Kugane = taxRates.KuganeTax,
+                Crystarium = taxRates.CrystariumTax,
+                Sharlayan = taxRates.SharlayanTax,
+            },
+        };
+
+        var taxPath = "/upload";
+        var taxUpload = JsonConvert.SerializeObject(taxUploadObject);
+        Log.Verbose($"{taxPath}: {taxUpload}");
+
+        await Util.HttpClient.PostAsync($"{ApiBase}{taxPath}/{ApiKey}", new StringContent(taxUpload, Encoding.UTF8, "application/json"));
+
+        // ====================================================================================
+
+        Log.Verbose("Universalis tax upload completed.");
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>
+    /// It may seem backwards that an upload only performs a delete request, however this is not trying
+    /// to track the available listings, that is done via the listings packet. All this does is remove
+    /// a listing, or delete it, when a purchase has been made.
+    /// </remarks>
+    public async Task UploadPurchase(MarketBoardPurchaseHandler purchaseHandler)
+    {
+        var clientState = Service<ClientState.ClientState>.GetNullable();
+        if (clientState == null)
+            return;
+
+        var itemId = purchaseHandler.CatalogId;
+        var worldId = clientState.LocalPlayer?.CurrentWorld.Id ?? 0;
+
+        // ====================================================================================
+
+        var deleteListingObject = new UniversalisItemListingDeleteRequest
+        {
+            PricePerUnit = purchaseHandler.PricePerUnit,
+            Quantity = purchaseHandler.ItemQuantity,
+            ListingId = purchaseHandler.ListingId.ToString(),
+            RetainerId = purchaseHandler.RetainerId.ToString(),
+            UploaderId = clientState.LocalContentId.ToString(),
+        };
+
+        var deletePath = $"/api/{worldId}/{itemId}/delete";
+        var deleteListing = JsonConvert.SerializeObject(deleteListingObject);
+        Log.Verbose($"{deletePath}: {deleteListing}");
+
+        var content = new StringContent(deleteListing, Encoding.UTF8, "application/json");
+        var message = new HttpRequestMessage(HttpMethod.Post, $"{ApiBase}{deletePath}");
+        message.Headers.Add("Authorization", ApiKey);
+        message.Content = content;
+
+        await Util.HttpClient.SendAsync(message);
+
+        // ====================================================================================
+
+        Log.Verbose("Universalis purchase upload completed.");
     }
 }
diff --git a/Dalamud/Game/Network/Internal/NetworkHandlers.cs b/Dalamud/Game/Network/Internal/NetworkHandlers.cs
index 93c46f750..968d97682 100644
--- a/Dalamud/Game/Network/Internal/NetworkHandlers.cs
+++ b/Dalamud/Game/Network/Internal/NetworkHandlers.cs
@@ -16,280 +16,279 @@ using Dalamud.Utility;
 using Lumina.Excel.GeneratedSheets;
 using Serilog;
 
-namespace Dalamud.Game.Network.Internal
+namespace Dalamud.Game.Network.Internal;
+
+/// <summary>
+/// This class handles network notifications and uploading market board data.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class NetworkHandlers : IServiceType
 {
-    /// <summary>
-    /// This class handles network notifications and uploading market board data.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal class NetworkHandlers : IServiceType
+    private readonly List<MarketBoardItemRequest> marketBoardRequests = new();
+
+    private readonly IMarketBoardUploader uploader;
+
+    [ServiceManager.ServiceDependency]
+    private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
+
+    private MarketBoardPurchaseHandler marketBoardPurchaseHandler;
+
+    [ServiceManager.ServiceConstructor]
+    private NetworkHandlers(GameNetwork gameNetwork)
     {
-        private readonly List<MarketBoardItemRequest> marketBoardRequests = new();
+        this.uploader = new UniversalisMarketBoardUploader();
 
-        private readonly IMarketBoardUploader uploader;
+        gameNetwork.NetworkMessage += this.OnNetworkMessage;
+    }
 
-        [ServiceManager.ServiceDependency]
-        private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
+    /// <summary>
+    /// Event which gets fired when a duty is ready.
+    /// </summary>
+    public event EventHandler<ContentFinderCondition> CfPop;
 
-        private MarketBoardPurchaseHandler marketBoardPurchaseHandler;
+    private void OnNetworkMessage(IntPtr dataPtr, ushort opCode, uint sourceActorId, uint targetActorId, NetworkMessageDirection direction)
+    {
+        var dataManager = Service<DataManager>.GetNullable();
 
-        [ServiceManager.ServiceConstructor]
-        private NetworkHandlers(GameNetwork gameNetwork)
+        if (dataManager?.IsDataReady != true)
+            return;
+
+        if (direction == NetworkMessageDirection.ZoneUp)
         {
-            this.uploader = new UniversalisMarketBoardUploader();
-
-            gameNetwork.NetworkMessage += this.OnNetworkMessage;
-        }
-
-        /// <summary>
-        /// Event which gets fired when a duty is ready.
-        /// </summary>
-        public event EventHandler<ContentFinderCondition> CfPop;
-
-        private void OnNetworkMessage(IntPtr dataPtr, ushort opCode, uint sourceActorId, uint targetActorId, NetworkMessageDirection direction)
-        {
-            var dataManager = Service<DataManager>.GetNullable();
-
-            if (dataManager?.IsDataReady != true)
-                return;
-
-            if (direction == NetworkMessageDirection.ZoneUp)
-            {
-                if (this.configuration.IsMbCollect)
-                {
-                    if (opCode == dataManager.ClientOpCodes["MarketBoardPurchaseHandler"])
-                    {
-                        this.marketBoardPurchaseHandler = MarketBoardPurchaseHandler.Read(dataPtr);
-                        return;
-                    }
-                }
-
-                return;
-            }
-
-            if (opCode == dataManager.ServerOpCodes["CfNotifyPop"])
-            {
-                this.HandleCfPop(dataPtr);
-                return;
-            }
-
             if (this.configuration.IsMbCollect)
             {
-                if (opCode == dataManager.ServerOpCodes["MarketBoardItemRequestStart"])
+                if (opCode == dataManager.ClientOpCodes["MarketBoardPurchaseHandler"])
                 {
-                    var data = MarketBoardItemRequest.Read(dataPtr);
-                    this.marketBoardRequests.Add(data);
-
-                    Log.Verbose($"NEW MB REQUEST START: item#{data.CatalogId} amount#{data.AmountToArrive}");
-                    return;
-                }
-
-                if (opCode == dataManager.ServerOpCodes["MarketBoardOfferings"])
-                {
-                    var listing = MarketBoardCurrentOfferings.Read(dataPtr);
-
-                    var request = this.marketBoardRequests.LastOrDefault(r => r.CatalogId == listing.ItemListings[0].CatalogId && !r.IsDone);
-
-                    if (request == default)
-                    {
-                        Log.Error($"Market Board data arrived without a corresponding request: item#{listing.ItemListings[0].CatalogId}");
-                        return;
-                    }
-
-                    if (request.Listings.Count + listing.ItemListings.Count > request.AmountToArrive)
-                    {
-                        Log.Error($"Too many Market Board listings received for request: {request.Listings.Count + listing.ItemListings.Count} > {request.AmountToArrive} item#{listing.ItemListings[0].CatalogId}");
-                        return;
-                    }
-
-                    if (request.ListingsRequestId != -1 && request.ListingsRequestId != listing.RequestId)
-                    {
-                        Log.Error($"Non-matching RequestIds for Market Board data request: {request.ListingsRequestId}, {listing.RequestId}");
-                        return;
-                    }
-
-                    if (request.ListingsRequestId == -1 && request.Listings.Count > 0)
-                    {
-                        Log.Error($"Market Board data request sequence break: {request.ListingsRequestId}, {request.Listings.Count}");
-                        return;
-                    }
-
-                    if (request.ListingsRequestId == -1)
-                    {
-                        request.ListingsRequestId = listing.RequestId;
-                        Log.Verbose($"First Market Board packet in sequence: {listing.RequestId}");
-                    }
-
-                    request.Listings.AddRange(listing.ItemListings);
-
-                    Log.Verbose(
-                        "Added {0} ItemListings to request#{1}, now {2}/{3}, item#{4}",
-                        listing.ItemListings.Count,
-                        request.ListingsRequestId,
-                        request.Listings.Count,
-                        request.AmountToArrive,
-                        request.CatalogId);
-
-                    if (request.IsDone)
-                    {
-                        Log.Verbose(
-                            "Market Board request finished, starting upload: request#{0} item#{1} amount#{2}",
-                            request.ListingsRequestId,
-                            request.CatalogId,
-                            request.AmountToArrive);
-
-                        Task.Run(() => this.uploader.Upload(request))
-                            .ContinueWith((task) => Log.Error(task.Exception, "Market Board offerings data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
-                    }
-
-                    return;
-                }
-
-                if (opCode == dataManager.ServerOpCodes["MarketBoardHistory"])
-                {
-                    var listing = MarketBoardHistory.Read(dataPtr);
-
-                    var request = this.marketBoardRequests.LastOrDefault(r => r.CatalogId == listing.CatalogId);
-
-                    if (request == default)
-                    {
-                        Log.Error($"Market Board data arrived without a corresponding request: item#{listing.CatalogId}");
-                        return;
-                    }
-
-                    if (request.ListingsRequestId != -1)
-                    {
-                        Log.Error($"Market Board data history sequence break: {request.ListingsRequestId}, {request.Listings.Count}");
-                        return;
-                    }
-
-                    request.History.AddRange(listing.HistoryListings);
-
-                    Log.Verbose("Added history for item#{0}", listing.CatalogId);
-
-                    if (request.AmountToArrive == 0)
-                    {
-                        Log.Verbose("Request had 0 amount, uploading now");
-
-                        Task.Run(() => this.uploader.Upload(request))
-                            .ContinueWith((task) => Log.Error(task.Exception, "Market Board history data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
-                    }
-                }
-
-                if (opCode == dataManager.ServerOpCodes["MarketTaxRates"])
-                {
-                    var category = (uint)Marshal.ReadInt32(dataPtr);
-
-                    // Result dialog packet does not contain market tax rates
-                    if (category != 720905)
-                    {
-                        return;
-                    }
-
-                    var taxes = MarketTaxRates.Read(dataPtr);
-
-                    if (taxes.Category != 0xb0009)
-                        return;
-
-                    Log.Verbose(
-                        "MarketTaxRates: limsa#{0} grid#{1} uldah#{2} ish#{3} kugane#{4} cr#{5} sh#{6}",
-                        taxes.LimsaLominsaTax,
-                        taxes.GridaniaTax,
-                        taxes.UldahTax,
-                        taxes.IshgardTax,
-                        taxes.KuganeTax,
-                        taxes.CrystariumTax,
-                        taxes.SharlayanTax);
-
-                    Task.Run(() => this.uploader.UploadTax(taxes))
-                        .ContinueWith((task) => Log.Error(task.Exception, "Market Board tax data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
-
-                    return;
-                }
-
-                if (opCode == dataManager.ServerOpCodes["MarketBoardPurchase"])
-                {
-                    if (this.marketBoardPurchaseHandler == null)
-                        return;
-
-                    var purchase = MarketBoardPurchase.Read(dataPtr);
-
-                    var sameQty = purchase.ItemQuantity == this.marketBoardPurchaseHandler.ItemQuantity;
-                    var itemMatch = purchase.CatalogId == this.marketBoardPurchaseHandler.CatalogId;
-                    var itemMatchHq = purchase.CatalogId == this.marketBoardPurchaseHandler.CatalogId + 1_000_000;
-
-                    // Transaction succeeded
-                    if (sameQty && (itemMatch || itemMatchHq))
-                    {
-                        Log.Verbose($"Bought {purchase.ItemQuantity}x {this.marketBoardPurchaseHandler.CatalogId} for {this.marketBoardPurchaseHandler.PricePerUnit * purchase.ItemQuantity} gils, listing id is {this.marketBoardPurchaseHandler.ListingId}");
-
-                        var handler = this.marketBoardPurchaseHandler; // Capture the object so that we don't pass in a null one when the task starts.
-
-                        Task.Run(() => this.uploader.UploadPurchase(handler))
-                            .ContinueWith((task) => Log.Error(task.Exception, "Market Board purchase data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
-                    }
-
-                    this.marketBoardPurchaseHandler = null;
+                    this.marketBoardPurchaseHandler = MarketBoardPurchaseHandler.Read(dataPtr);
                     return;
                 }
             }
+
+            return;
         }
 
-        private unsafe void HandleCfPop(IntPtr dataPtr)
+        if (opCode == dataManager.ServerOpCodes["CfNotifyPop"])
         {
-            var dataManager = Service<DataManager>.GetNullable();
-            if (dataManager == null)
-                return;
+            this.HandleCfPop(dataPtr);
+            return;
+        }
 
-            using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 64);
-            using var reader = new BinaryReader(stream);
-
-            var notifyType = reader.ReadByte();
-            stream.Position += 0x1B;
-            var conditionId = reader.ReadUInt16();
-
-            if (notifyType != 3)
-                return;
-
-            var cfConditionSheet = dataManager.GetExcelSheet<ContentFinderCondition>()!;
-            var cfCondition = cfConditionSheet.GetRow(conditionId);
-
-            if (cfCondition == null)
+        if (this.configuration.IsMbCollect)
+        {
+            if (opCode == dataManager.ServerOpCodes["MarketBoardItemRequestStart"])
             {
-                Log.Error($"CFC key {conditionId} not in Lumina data.");
+                var data = MarketBoardItemRequest.Read(dataPtr);
+                this.marketBoardRequests.Add(data);
+
+                Log.Verbose($"NEW MB REQUEST START: item#{data.CatalogId} amount#{data.AmountToArrive}");
                 return;
             }
 
-            var cfcName = cfCondition.Name.ToString();
-            if (cfcName.IsNullOrEmpty())
+            if (opCode == dataManager.ServerOpCodes["MarketBoardOfferings"])
             {
-                cfcName = "Duty Roulette";
-                cfCondition.Image = 112324;
-            }
+                var listing = MarketBoardCurrentOfferings.Read(dataPtr);
 
-            // Flash window
-            if (this.configuration.DutyFinderTaskbarFlash && !NativeFunctions.ApplicationIsActivated())
-            {
-                var flashInfo = new NativeFunctions.FlashWindowInfo
+                var request = this.marketBoardRequests.LastOrDefault(r => r.CatalogId == listing.ItemListings[0].CatalogId && !r.IsDone);
+
+                if (request == default)
                 {
-                    Size = (uint)Marshal.SizeOf<NativeFunctions.FlashWindowInfo>(),
-                    Count = uint.MaxValue,
-                    Timeout = 0,
-                    Flags = NativeFunctions.FlashWindow.All | NativeFunctions.FlashWindow.TimerNoFG,
-                    Hwnd = Process.GetCurrentProcess().MainWindowHandle,
-                };
-                NativeFunctions.FlashWindowEx(ref flashInfo);
-            }
-
-            Task.Run(() =>
-            {
-                if (this.configuration.DutyFinderChatMessage)
-                {
-                    Service<ChatGui>.GetNullable()?.Print($"Duty pop: {cfcName}");
+                    Log.Error($"Market Board data arrived without a corresponding request: item#{listing.ItemListings[0].CatalogId}");
+                    return;
                 }
 
-                this.CfPop?.InvokeSafely(this, cfCondition);
-            }).ContinueWith((task) => Log.Error(task.Exception, "CfPop.Invoke failed."), TaskContinuationOptions.OnlyOnFaulted);
+                if (request.Listings.Count + listing.ItemListings.Count > request.AmountToArrive)
+                {
+                    Log.Error($"Too many Market Board listings received for request: {request.Listings.Count + listing.ItemListings.Count} > {request.AmountToArrive} item#{listing.ItemListings[0].CatalogId}");
+                    return;
+                }
+
+                if (request.ListingsRequestId != -1 && request.ListingsRequestId != listing.RequestId)
+                {
+                    Log.Error($"Non-matching RequestIds for Market Board data request: {request.ListingsRequestId}, {listing.RequestId}");
+                    return;
+                }
+
+                if (request.ListingsRequestId == -1 && request.Listings.Count > 0)
+                {
+                    Log.Error($"Market Board data request sequence break: {request.ListingsRequestId}, {request.Listings.Count}");
+                    return;
+                }
+
+                if (request.ListingsRequestId == -1)
+                {
+                    request.ListingsRequestId = listing.RequestId;
+                    Log.Verbose($"First Market Board packet in sequence: {listing.RequestId}");
+                }
+
+                request.Listings.AddRange(listing.ItemListings);
+
+                Log.Verbose(
+                    "Added {0} ItemListings to request#{1}, now {2}/{3}, item#{4}",
+                    listing.ItemListings.Count,
+                    request.ListingsRequestId,
+                    request.Listings.Count,
+                    request.AmountToArrive,
+                    request.CatalogId);
+
+                if (request.IsDone)
+                {
+                    Log.Verbose(
+                        "Market Board request finished, starting upload: request#{0} item#{1} amount#{2}",
+                        request.ListingsRequestId,
+                        request.CatalogId,
+                        request.AmountToArrive);
+
+                    Task.Run(() => this.uploader.Upload(request))
+                        .ContinueWith((task) => Log.Error(task.Exception, "Market Board offerings data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
+                }
+
+                return;
+            }
+
+            if (opCode == dataManager.ServerOpCodes["MarketBoardHistory"])
+            {
+                var listing = MarketBoardHistory.Read(dataPtr);
+
+                var request = this.marketBoardRequests.LastOrDefault(r => r.CatalogId == listing.CatalogId);
+
+                if (request == default)
+                {
+                    Log.Error($"Market Board data arrived without a corresponding request: item#{listing.CatalogId}");
+                    return;
+                }
+
+                if (request.ListingsRequestId != -1)
+                {
+                    Log.Error($"Market Board data history sequence break: {request.ListingsRequestId}, {request.Listings.Count}");
+                    return;
+                }
+
+                request.History.AddRange(listing.HistoryListings);
+
+                Log.Verbose("Added history for item#{0}", listing.CatalogId);
+
+                if (request.AmountToArrive == 0)
+                {
+                    Log.Verbose("Request had 0 amount, uploading now");
+
+                    Task.Run(() => this.uploader.Upload(request))
+                        .ContinueWith((task) => Log.Error(task.Exception, "Market Board history data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
+                }
+            }
+
+            if (opCode == dataManager.ServerOpCodes["MarketTaxRates"])
+            {
+                var category = (uint)Marshal.ReadInt32(dataPtr);
+
+                // Result dialog packet does not contain market tax rates
+                if (category != 720905)
+                {
+                    return;
+                }
+
+                var taxes = MarketTaxRates.Read(dataPtr);
+
+                if (taxes.Category != 0xb0009)
+                    return;
+
+                Log.Verbose(
+                    "MarketTaxRates: limsa#{0} grid#{1} uldah#{2} ish#{3} kugane#{4} cr#{5} sh#{6}",
+                    taxes.LimsaLominsaTax,
+                    taxes.GridaniaTax,
+                    taxes.UldahTax,
+                    taxes.IshgardTax,
+                    taxes.KuganeTax,
+                    taxes.CrystariumTax,
+                    taxes.SharlayanTax);
+
+                Task.Run(() => this.uploader.UploadTax(taxes))
+                    .ContinueWith((task) => Log.Error(task.Exception, "Market Board tax data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
+
+                return;
+            }
+
+            if (opCode == dataManager.ServerOpCodes["MarketBoardPurchase"])
+            {
+                if (this.marketBoardPurchaseHandler == null)
+                    return;
+
+                var purchase = MarketBoardPurchase.Read(dataPtr);
+
+                var sameQty = purchase.ItemQuantity == this.marketBoardPurchaseHandler.ItemQuantity;
+                var itemMatch = purchase.CatalogId == this.marketBoardPurchaseHandler.CatalogId;
+                var itemMatchHq = purchase.CatalogId == this.marketBoardPurchaseHandler.CatalogId + 1_000_000;
+
+                // Transaction succeeded
+                if (sameQty && (itemMatch || itemMatchHq))
+                {
+                    Log.Verbose($"Bought {purchase.ItemQuantity}x {this.marketBoardPurchaseHandler.CatalogId} for {this.marketBoardPurchaseHandler.PricePerUnit * purchase.ItemQuantity} gils, listing id is {this.marketBoardPurchaseHandler.ListingId}");
+
+                    var handler = this.marketBoardPurchaseHandler; // Capture the object so that we don't pass in a null one when the task starts.
+
+                    Task.Run(() => this.uploader.UploadPurchase(handler))
+                        .ContinueWith((task) => Log.Error(task.Exception, "Market Board purchase data upload failed."), TaskContinuationOptions.OnlyOnFaulted);
+                }
+
+                this.marketBoardPurchaseHandler = null;
+                return;
+            }
         }
     }
+
+    private unsafe void HandleCfPop(IntPtr dataPtr)
+    {
+        var dataManager = Service<DataManager>.GetNullable();
+        if (dataManager == null)
+            return;
+
+        using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 64);
+        using var reader = new BinaryReader(stream);
+
+        var notifyType = reader.ReadByte();
+        stream.Position += 0x1B;
+        var conditionId = reader.ReadUInt16();
+
+        if (notifyType != 3)
+            return;
+
+        var cfConditionSheet = dataManager.GetExcelSheet<ContentFinderCondition>()!;
+        var cfCondition = cfConditionSheet.GetRow(conditionId);
+
+        if (cfCondition == null)
+        {
+            Log.Error($"CFC key {conditionId} not in Lumina data.");
+            return;
+        }
+
+        var cfcName = cfCondition.Name.ToString();
+        if (cfcName.IsNullOrEmpty())
+        {
+            cfcName = "Duty Roulette";
+            cfCondition.Image = 112324;
+        }
+
+        // Flash window
+        if (this.configuration.DutyFinderTaskbarFlash && !NativeFunctions.ApplicationIsActivated())
+        {
+            var flashInfo = new NativeFunctions.FlashWindowInfo
+            {
+                Size = (uint)Marshal.SizeOf<NativeFunctions.FlashWindowInfo>(),
+                Count = uint.MaxValue,
+                Timeout = 0,
+                Flags = NativeFunctions.FlashWindow.All | NativeFunctions.FlashWindow.TimerNoFG,
+                Hwnd = Process.GetCurrentProcess().MainWindowHandle,
+            };
+            NativeFunctions.FlashWindowEx(ref flashInfo);
+        }
+
+        Task.Run(() =>
+        {
+            if (this.configuration.DutyFinderChatMessage)
+            {
+                Service<ChatGui>.GetNullable()?.Print($"Duty pop: {cfcName}");
+            }
+
+            this.CfPop?.InvokeSafely(this, cfCondition);
+        }).ContinueWith((task) => Log.Error(task.Exception, "CfPop.Invoke failed."), TaskContinuationOptions.OnlyOnFaulted);
+    }
 }
diff --git a/Dalamud/Game/Network/Internal/WinSockHandlers.cs b/Dalamud/Game/Network/Internal/WinSockHandlers.cs
index d3334ae96..8439389ff 100644
--- a/Dalamud/Game/Network/Internal/WinSockHandlers.cs
+++ b/Dalamud/Game/Network/Internal/WinSockHandlers.cs
@@ -4,57 +4,56 @@ using System.Runtime.InteropServices;
 
 using Dalamud.Hooking;
 
-namespace Dalamud.Game.Network.Internal
+namespace Dalamud.Game.Network.Internal;
+
+/// <summary>
+/// This class enables TCP optimizations in the game socket for better performance.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal sealed class WinSockHandlers : IDisposable, IServiceType
 {
-    /// <summary>
-    /// This class enables TCP optimizations in the game socket for better performance.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal sealed class WinSockHandlers : IDisposable, IServiceType
+    private Hook<SocketDelegate> ws2SocketHook;
+
+    [ServiceManager.ServiceConstructor]
+    private WinSockHandlers()
     {
-        private Hook<SocketDelegate> ws2SocketHook;
+        this.ws2SocketHook = Hook<SocketDelegate>.FromImport(null, "ws2_32.dll", "socket", 23, this.OnSocket);
+        this.ws2SocketHook?.Enable();
+    }
 
-        [ServiceManager.ServiceConstructor]
-        private WinSockHandlers()
+    [UnmanagedFunctionPointer(CallingConvention.Winapi)]
+    private delegate IntPtr SocketDelegate(int af, int type, int protocol);
+
+    /// <summary>
+    /// Disposes of managed and unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+        this.ws2SocketHook?.Dispose();
+    }
+
+    private IntPtr OnSocket(int af, int type, int protocol)
+    {
+        var socket = this.ws2SocketHook.Original(af, type, protocol);
+
+        // IPPROTO_TCP
+        if (type == 1)
         {
-            this.ws2SocketHook = Hook<SocketDelegate>.FromImport(null, "ws2_32.dll", "socket", 23, this.OnSocket);
-            this.ws2SocketHook?.Enable();
-        }
-
-        [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate IntPtr SocketDelegate(int af, int type, int protocol);
-
-        /// <summary>
-        /// Disposes of managed and unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            this.ws2SocketHook?.Dispose();
-        }
-
-        private IntPtr OnSocket(int af, int type, int protocol)
-        {
-            var socket = this.ws2SocketHook.Original(af, type, protocol);
-
-            // IPPROTO_TCP
-            if (type == 1)
+            // INVALID_SOCKET
+            if (socket != new IntPtr(-1))
             {
-                // INVALID_SOCKET
-                if (socket != new IntPtr(-1))
-                {
-                    // In case you're not aware of it: (albeit you should)
-                    // https://linux.die.net/man/7/tcp
-                    // https://assets.extrahop.com/whitepapers/TCP-Optimization-Guide-by-ExtraHop.pdf
-                    var value = new IntPtr(1);
-                    _ = NativeFunctions.SetSockOpt(socket, SocketOptionLevel.Tcp, SocketOptionName.NoDelay, ref value, 4);
+                // In case you're not aware of it: (albeit you should)
+                // https://linux.die.net/man/7/tcp
+                // https://assets.extrahop.com/whitepapers/TCP-Optimization-Guide-by-ExtraHop.pdf
+                var value = new IntPtr(1);
+                _ = NativeFunctions.SetSockOpt(socket, SocketOptionLevel.Tcp, SocketOptionName.NoDelay, ref value, 4);
 
-                    // Enable tcp_quickack option. This option is undocumented in MSDN but it is supported in Windows 7 and onwards.
-                    value = new IntPtr(1);
-                    _ = NativeFunctions.SetSockOpt(socket, SocketOptionLevel.Tcp, SocketOptionName.AddMembership, ref value, 4);
-                }
+                // Enable tcp_quickack option. This option is undocumented in MSDN but it is supported in Windows 7 and onwards.
+                value = new IntPtr(1);
+                _ = NativeFunctions.SetSockOpt(socket, SocketOptionLevel.Tcp, SocketOptionName.AddMembership, ref value, 4);
             }
-
-            return socket;
         }
+
+        return socket;
     }
 }
diff --git a/Dalamud/Game/Network/NetworkMessageDirection.cs b/Dalamud/Game/Network/NetworkMessageDirection.cs
index 79d9d2df2..87cce5173 100644
--- a/Dalamud/Game/Network/NetworkMessageDirection.cs
+++ b/Dalamud/Game/Network/NetworkMessageDirection.cs
@@ -1,18 +1,17 @@
-namespace Dalamud.Game.Network
+namespace Dalamud.Game.Network;
+
+/// <summary>
+/// This represents the direction of a network message.
+/// </summary>
+public enum NetworkMessageDirection
 {
     /// <summary>
-    /// This represents the direction of a network message.
+    /// A zone down message.
     /// </summary>
-    public enum NetworkMessageDirection
-    {
-        /// <summary>
-        /// A zone down message.
-        /// </summary>
-        ZoneDown,
+    ZoneDown,
 
-        /// <summary>
-        /// A zone up message.
-        /// </summary>
-        ZoneUp,
-    }
+    /// <summary>
+    /// A zone up message.
+    /// </summary>
+    ZoneUp,
 }
diff --git a/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs b/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs
index 364a21454..4d57a0fbd 100644
--- a/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs
+++ b/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs
@@ -3,225 +3,224 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace Dalamud.Game.Network.Structures
+namespace Dalamud.Game.Network.Structures;
+
+/// <summary>
+/// This class represents the current market board offerings from a game network packet.
+/// </summary>
+public class MarketBoardCurrentOfferings
 {
-    /// <summary>
-    /// This class represents the current market board offerings from a game network packet.
-    /// </summary>
-    public class MarketBoardCurrentOfferings
+    private MarketBoardCurrentOfferings()
     {
-        private MarketBoardCurrentOfferings()
+    }
+
+    /// <summary>
+    /// Gets the list of individual item listings.
+    /// </summary>
+    public List<MarketBoardItemListing> ItemListings { get; } = new();
+
+    /// <summary>
+    /// Gets the listing end index.
+    /// </summary>
+    public int ListingIndexEnd { get; internal set; }
+
+    /// <summary>
+    /// Gets the listing start index.
+    /// </summary>
+    public int ListingIndexStart { get; internal set; }
+
+    /// <summary>
+    /// Gets the request ID.
+    /// </summary>
+    public int RequestId { get; internal set; }
+
+    /// <summary>
+    /// Read a <see cref="MarketBoardCurrentOfferings"/> object from memory.
+    /// </summary>
+    /// <param name="dataPtr">Address to read.</param>
+    /// <returns>A new <see cref="MarketBoardCurrentOfferings"/> object.</returns>
+    public static unsafe MarketBoardCurrentOfferings Read(IntPtr dataPtr)
+    {
+        var output = new MarketBoardCurrentOfferings();
+
+        using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
+        using var reader = new BinaryReader(stream);
+
+        for (var i = 0; i < 10; i++)
+        {
+            var listingEntry = new MarketBoardItemListing();
+
+            listingEntry.ListingId = reader.ReadUInt64();
+            listingEntry.RetainerId = reader.ReadUInt64();
+            listingEntry.RetainerOwnerId = reader.ReadUInt64();
+            listingEntry.ArtisanId = reader.ReadUInt64();
+            listingEntry.PricePerUnit = reader.ReadUInt32();
+            listingEntry.TotalTax = reader.ReadUInt32();
+            listingEntry.ItemQuantity = reader.ReadUInt32();
+            listingEntry.CatalogId = reader.ReadUInt32();
+            listingEntry.LastReviewTime = DateTimeOffset.UtcNow.AddSeconds(-reader.ReadUInt16()).DateTime;
+
+            reader.ReadUInt16(); // container
+            reader.ReadUInt32(); // slot
+            reader.ReadUInt16(); // durability
+            reader.ReadUInt16(); // spiritbond
+
+            for (var materiaIndex = 0; materiaIndex < 5; materiaIndex++)
+            {
+                var materiaVal = reader.ReadUInt16();
+                var materiaEntry = new MarketBoardItemListing.ItemMateria()
+                {
+                    MateriaId = (materiaVal & 0xFF0) >> 4,
+                    Index = materiaVal & 0xF,
+                };
+
+                if (materiaEntry.MateriaId != 0)
+                    listingEntry.Materia.Add(materiaEntry);
+            }
+
+            reader.ReadUInt16();
+            reader.ReadUInt32();
+
+            listingEntry.RetainerName = Encoding.UTF8.GetString(reader.ReadBytes(32)).TrimEnd('\u0000');
+            listingEntry.PlayerName = Encoding.UTF8.GetString(reader.ReadBytes(32)).TrimEnd('\u0000');
+            listingEntry.IsHq = reader.ReadBoolean();
+            listingEntry.MateriaCount = reader.ReadByte();
+            listingEntry.OnMannequin = reader.ReadBoolean();
+            listingEntry.RetainerCityId = reader.ReadByte();
+            listingEntry.StainId = reader.ReadUInt16();
+
+            reader.ReadUInt16();
+            reader.ReadUInt32();
+
+            if (listingEntry.CatalogId != 0)
+                output.ItemListings.Add(listingEntry);
+        }
+
+        output.ListingIndexEnd = reader.ReadByte();
+        output.ListingIndexStart = reader.ReadByte();
+        output.RequestId = reader.ReadUInt16();
+
+        return output;
+    }
+
+    /// <summary>
+    /// This class represents the current market board offering of a single item from the <see cref="MarketBoardCurrentOfferings"/> network packet.
+    /// </summary>
+    public class MarketBoardItemListing
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MarketBoardItemListing"/> class.
+        /// </summary>
+        internal MarketBoardItemListing()
         {
         }
 
         /// <summary>
-        /// Gets the list of individual item listings.
+        /// Gets the artisan ID.
         /// </summary>
-        public List<MarketBoardItemListing> ItemListings { get; } = new();
+        public ulong ArtisanId { get; internal set; }
 
         /// <summary>
-        /// Gets the listing end index.
+        /// Gets the catalog ID.
         /// </summary>
-        public int ListingIndexEnd { get; internal set; }
+        public uint CatalogId { get; internal set; }
 
         /// <summary>
-        /// Gets the listing start index.
+        /// Gets a value indicating whether the item is HQ.
         /// </summary>
-        public int ListingIndexStart { get; internal set; }
+        public bool IsHq { get; internal set; }
 
         /// <summary>
-        /// Gets the request ID.
+        /// Gets the item quantity.
         /// </summary>
-        public int RequestId { get; internal set; }
+        public uint ItemQuantity { get; internal set; }
 
         /// <summary>
-        /// Read a <see cref="MarketBoardCurrentOfferings"/> object from memory.
+        /// Gets the time this offering was last reviewed.
         /// </summary>
-        /// <param name="dataPtr">Address to read.</param>
-        /// <returns>A new <see cref="MarketBoardCurrentOfferings"/> object.</returns>
-        public static unsafe MarketBoardCurrentOfferings Read(IntPtr dataPtr)
-        {
-            var output = new MarketBoardCurrentOfferings();
-
-            using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
-            using var reader = new BinaryReader(stream);
-
-            for (var i = 0; i < 10; i++)
-            {
-                var listingEntry = new MarketBoardItemListing();
-
-                listingEntry.ListingId = reader.ReadUInt64();
-                listingEntry.RetainerId = reader.ReadUInt64();
-                listingEntry.RetainerOwnerId = reader.ReadUInt64();
-                listingEntry.ArtisanId = reader.ReadUInt64();
-                listingEntry.PricePerUnit = reader.ReadUInt32();
-                listingEntry.TotalTax = reader.ReadUInt32();
-                listingEntry.ItemQuantity = reader.ReadUInt32();
-                listingEntry.CatalogId = reader.ReadUInt32();
-                listingEntry.LastReviewTime = DateTimeOffset.UtcNow.AddSeconds(-reader.ReadUInt16()).DateTime;
-
-                reader.ReadUInt16(); // container
-                reader.ReadUInt32(); // slot
-                reader.ReadUInt16(); // durability
-                reader.ReadUInt16(); // spiritbond
-
-                for (var materiaIndex = 0; materiaIndex < 5; materiaIndex++)
-                {
-                    var materiaVal = reader.ReadUInt16();
-                    var materiaEntry = new MarketBoardItemListing.ItemMateria()
-                    {
-                        MateriaId = (materiaVal & 0xFF0) >> 4,
-                        Index = materiaVal & 0xF,
-                    };
-
-                    if (materiaEntry.MateriaId != 0)
-                        listingEntry.Materia.Add(materiaEntry);
-                }
-
-                reader.ReadUInt16();
-                reader.ReadUInt32();
-
-                listingEntry.RetainerName = Encoding.UTF8.GetString(reader.ReadBytes(32)).TrimEnd('\u0000');
-                listingEntry.PlayerName = Encoding.UTF8.GetString(reader.ReadBytes(32)).TrimEnd('\u0000');
-                listingEntry.IsHq = reader.ReadBoolean();
-                listingEntry.MateriaCount = reader.ReadByte();
-                listingEntry.OnMannequin = reader.ReadBoolean();
-                listingEntry.RetainerCityId = reader.ReadByte();
-                listingEntry.StainId = reader.ReadUInt16();
-
-                reader.ReadUInt16();
-                reader.ReadUInt32();
-
-                if (listingEntry.CatalogId != 0)
-                    output.ItemListings.Add(listingEntry);
-            }
-
-            output.ListingIndexEnd = reader.ReadByte();
-            output.ListingIndexStart = reader.ReadByte();
-            output.RequestId = reader.ReadUInt16();
-
-            return output;
-        }
+        public DateTime LastReviewTime { get; internal set; }
 
         /// <summary>
-        /// This class represents the current market board offering of a single item from the <see cref="MarketBoardCurrentOfferings"/> network packet.
+        /// Gets the listing ID.
         /// </summary>
-        public class MarketBoardItemListing
+        public ulong ListingId { get; internal set; }
+
+        /// <summary>
+        /// Gets the list of materia attached to this item.
+        /// </summary>
+        public List<ItemMateria> Materia { get; } = new();
+
+        /// <summary>
+        /// Gets the amount of attached materia.
+        /// </summary>
+        public int MateriaCount { get; internal set; }
+
+        /// <summary>
+        /// Gets a value indicating whether this item is on a mannequin.
+        /// </summary>
+        public bool OnMannequin { get; internal set; }
+
+        /// <summary>
+        /// Gets the player name.
+        /// </summary>
+        public string PlayerName { get; internal set; }
+
+        /// <summary>
+        /// Gets the price per unit.
+        /// </summary>
+        public uint PricePerUnit { get; internal set; }
+
+        /// <summary>
+        /// Gets the city ID of the retainer selling the item.
+        /// </summary>
+        public int RetainerCityId { get; internal set; }
+
+        /// <summary>
+        /// Gets the ID of the retainer selling the item.
+        /// </summary>
+        public ulong RetainerId { get; internal set; }
+
+        /// <summary>
+        /// Gets the name of the retainer.
+        /// </summary>
+        public string RetainerName { get; internal set; }
+
+        /// <summary>
+        /// Gets the ID of the retainer's owner.
+        /// </summary>
+        public ulong RetainerOwnerId { get; internal set; }
+
+        /// <summary>
+        /// Gets the stain or applied dye of the item.
+        /// </summary>
+        public int StainId { get; internal set; }
+
+        /// <summary>
+        /// Gets the total tax.
+        /// </summary>
+        public uint TotalTax { get; internal set; }
+
+        /// <summary>
+        /// This represents the materia slotted to an <see cref="MarketBoardItemListing"/>.
+        /// </summary>
+        public class ItemMateria
         {
             /// <summary>
-            /// Initializes a new instance of the <see cref="MarketBoardItemListing"/> class.
+            /// Initializes a new instance of the <see cref="ItemMateria"/> class.
             /// </summary>
-            internal MarketBoardItemListing()
+            internal ItemMateria()
             {
             }
 
             /// <summary>
-            /// Gets the artisan ID.
+            /// Gets the materia index.
             /// </summary>
-            public ulong ArtisanId { get; internal set; }
+            public int Index { get; internal set; }
 
             /// <summary>
-            /// Gets the catalog ID.
+            /// Gets the materia ID.
             /// </summary>
-            public uint CatalogId { get; internal set; }
-
-            /// <summary>
-            /// Gets a value indicating whether the item is HQ.
-            /// </summary>
-            public bool IsHq { get; internal set; }
-
-            /// <summary>
-            /// Gets the item quantity.
-            /// </summary>
-            public uint ItemQuantity { get; internal set; }
-
-            /// <summary>
-            /// Gets the time this offering was last reviewed.
-            /// </summary>
-            public DateTime LastReviewTime { get; internal set; }
-
-            /// <summary>
-            /// Gets the listing ID.
-            /// </summary>
-            public ulong ListingId { get; internal set; }
-
-            /// <summary>
-            /// Gets the list of materia attached to this item.
-            /// </summary>
-            public List<ItemMateria> Materia { get; } = new();
-
-            /// <summary>
-            /// Gets the amount of attached materia.
-            /// </summary>
-            public int MateriaCount { get; internal set; }
-
-            /// <summary>
-            /// Gets a value indicating whether this item is on a mannequin.
-            /// </summary>
-            public bool OnMannequin { get; internal set; }
-
-            /// <summary>
-            /// Gets the player name.
-            /// </summary>
-            public string PlayerName { get; internal set; }
-
-            /// <summary>
-            /// Gets the price per unit.
-            /// </summary>
-            public uint PricePerUnit { get; internal set; }
-
-            /// <summary>
-            /// Gets the city ID of the retainer selling the item.
-            /// </summary>
-            public int RetainerCityId { get; internal set; }
-
-            /// <summary>
-            /// Gets the ID of the retainer selling the item.
-            /// </summary>
-            public ulong RetainerId { get; internal set; }
-
-            /// <summary>
-            /// Gets the name of the retainer.
-            /// </summary>
-            public string RetainerName { get; internal set; }
-
-            /// <summary>
-            /// Gets the ID of the retainer's owner.
-            /// </summary>
-            public ulong RetainerOwnerId { get; internal set; }
-
-            /// <summary>
-            /// Gets the stain or applied dye of the item.
-            /// </summary>
-            public int StainId { get; internal set; }
-
-            /// <summary>
-            /// Gets the total tax.
-            /// </summary>
-            public uint TotalTax { get; internal set; }
-
-            /// <summary>
-            /// This represents the materia slotted to an <see cref="MarketBoardItemListing"/>.
-            /// </summary>
-            public class ItemMateria
-            {
-                /// <summary>
-                /// Initializes a new instance of the <see cref="ItemMateria"/> class.
-                /// </summary>
-                internal ItemMateria()
-                {
-                }
-
-                /// <summary>
-                /// Gets the materia index.
-                /// </summary>
-                public int Index { get; internal set; }
-
-                /// <summary>
-                /// Gets the materia ID.
-                /// </summary>
-                public int MateriaId { get; internal set; }
-            }
+            public int MateriaId { get; internal set; }
         }
     }
 }
diff --git a/Dalamud/Game/Network/Structures/MarketBoardHistory.cs b/Dalamud/Game/Network/Structures/MarketBoardHistory.cs
index d753b0498..69532afd6 100644
--- a/Dalamud/Game/Network/Structures/MarketBoardHistory.cs
+++ b/Dalamud/Game/Network/Structures/MarketBoardHistory.cs
@@ -3,121 +3,120 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace Dalamud.Game.Network.Structures
+namespace Dalamud.Game.Network.Structures;
+
+/// <summary>
+/// This class represents the market board history from a game network packet.
+/// </summary>
+public class MarketBoardHistory
 {
     /// <summary>
-    /// This class represents the market board history from a game network packet.
+    /// Initializes a new instance of the <see cref="MarketBoardHistory"/> class.
     /// </summary>
-    public class MarketBoardHistory
+    internal MarketBoardHistory()
+    {
+    }
+
+    /// <summary>
+    /// Gets the catalog ID.
+    /// </summary>
+    public uint CatalogId { get; private set; }
+
+    /// <summary>
+    /// Gets the second catalog ID.
+    /// </summary>
+    public uint CatalogId2 { get; private set; }
+
+    /// <summary>
+    /// Gets the list of individual item history listings.
+    /// </summary>
+    public List<MarketBoardHistoryListing> HistoryListings { get; } = new();
+
+    /// <summary>
+    /// Read a <see cref="MarketBoardHistory"/> object from memory.
+    /// </summary>
+    /// <param name="dataPtr">Address to read.</param>
+    /// <returns>A new <see cref="MarketBoardHistory"/> object.</returns>
+    public static unsafe MarketBoardHistory Read(IntPtr dataPtr)
+    {
+        using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
+        using var reader = new BinaryReader(stream);
+
+        var output = new MarketBoardHistory();
+
+        output.CatalogId = reader.ReadUInt32();
+        output.CatalogId2 = reader.ReadUInt32();
+
+        for (var i = 0; i < 20; i++)
+        {
+            var listingEntry = new MarketBoardHistoryListing
+            {
+                SalePrice = reader.ReadUInt32(),
+                PurchaseTime = DateTimeOffset.FromUnixTimeSeconds(reader.ReadUInt32()).UtcDateTime,
+                Quantity = reader.ReadUInt32(),
+                IsHq = reader.ReadBoolean(),
+            };
+
+            reader.ReadBoolean();
+
+            listingEntry.OnMannequin = reader.ReadBoolean();
+            listingEntry.BuyerName = Encoding.UTF8.GetString(reader.ReadBytes(33)).TrimEnd('\u0000');
+            listingEntry.NextCatalogId = reader.ReadUInt32();
+
+            output.HistoryListings.Add(listingEntry);
+
+            if (listingEntry.NextCatalogId == 0)
+                break;
+        }
+
+        return output;
+    }
+
+    /// <summary>
+    /// This class represents the market board history of a single item from the <see cref="MarketBoardHistory"/> network packet.
+    /// </summary>
+    public class MarketBoardHistoryListing
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="MarketBoardHistory"/> class.
+        /// Initializes a new instance of the <see cref="MarketBoardHistoryListing"/> class.
         /// </summary>
-        internal MarketBoardHistory()
+        internal MarketBoardHistoryListing()
         {
         }
 
         /// <summary>
-        /// Gets the catalog ID.
+        /// Gets the buyer's name.
         /// </summary>
-        public uint CatalogId { get; private set; }
+        public string BuyerName { get; internal set; }
 
         /// <summary>
-        /// Gets the second catalog ID.
+        /// Gets the next entry's catalog ID.
         /// </summary>
-        public uint CatalogId2 { get; private set; }
+        public uint NextCatalogId { get; internal set; }
 
         /// <summary>
-        /// Gets the list of individual item history listings.
+        /// Gets a value indicating whether the item is HQ.
         /// </summary>
-        public List<MarketBoardHistoryListing> HistoryListings { get; } = new();
+        public bool IsHq { get; internal set; }
 
         /// <summary>
-        /// Read a <see cref="MarketBoardHistory"/> object from memory.
+        /// Gets a value indicating whether the item is on a mannequin.
         /// </summary>
-        /// <param name="dataPtr">Address to read.</param>
-        /// <returns>A new <see cref="MarketBoardHistory"/> object.</returns>
-        public static unsafe MarketBoardHistory Read(IntPtr dataPtr)
-        {
-            using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
-            using var reader = new BinaryReader(stream);
-
-            var output = new MarketBoardHistory();
-
-            output.CatalogId = reader.ReadUInt32();
-            output.CatalogId2 = reader.ReadUInt32();
-
-            for (var i = 0; i < 20; i++)
-            {
-                var listingEntry = new MarketBoardHistoryListing
-                {
-                    SalePrice = reader.ReadUInt32(),
-                    PurchaseTime = DateTimeOffset.FromUnixTimeSeconds(reader.ReadUInt32()).UtcDateTime,
-                    Quantity = reader.ReadUInt32(),
-                    IsHq = reader.ReadBoolean(),
-                };
-
-                reader.ReadBoolean();
-
-                listingEntry.OnMannequin = reader.ReadBoolean();
-                listingEntry.BuyerName = Encoding.UTF8.GetString(reader.ReadBytes(33)).TrimEnd('\u0000');
-                listingEntry.NextCatalogId = reader.ReadUInt32();
-
-                output.HistoryListings.Add(listingEntry);
-
-                if (listingEntry.NextCatalogId == 0)
-                    break;
-            }
-
-            return output;
-        }
+        public bool OnMannequin { get; internal set; }
 
         /// <summary>
-        /// This class represents the market board history of a single item from the <see cref="MarketBoardHistory"/> network packet.
+        /// Gets the time of purchase.
         /// </summary>
-        public class MarketBoardHistoryListing
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="MarketBoardHistoryListing"/> class.
-            /// </summary>
-            internal MarketBoardHistoryListing()
-            {
-            }
+        public DateTime PurchaseTime { get; internal set; }
 
-            /// <summary>
-            /// Gets the buyer's name.
-            /// </summary>
-            public string BuyerName { get; internal set; }
+        /// <summary>
+        /// Gets the quantity.
+        /// </summary>
+        public uint Quantity { get; internal set; }
 
-            /// <summary>
-            /// Gets the next entry's catalog ID.
-            /// </summary>
-            public uint NextCatalogId { get; internal set; }
-
-            /// <summary>
-            /// Gets a value indicating whether the item is HQ.
-            /// </summary>
-            public bool IsHq { get; internal set; }
-
-            /// <summary>
-            /// Gets a value indicating whether the item is on a mannequin.
-            /// </summary>
-            public bool OnMannequin { get; internal set; }
-
-            /// <summary>
-            /// Gets the time of purchase.
-            /// </summary>
-            public DateTime PurchaseTime { get; internal set; }
-
-            /// <summary>
-            /// Gets the quantity.
-            /// </summary>
-            public uint Quantity { get; internal set; }
-
-            /// <summary>
-            /// Gets the sale price.
-            /// </summary>
-            public uint SalePrice { get; internal set; }
-        }
+        /// <summary>
+        /// Gets the sale price.
+        /// </summary>
+        public uint SalePrice { get; internal set; }
     }
 }
diff --git a/Dalamud/Game/Network/Structures/MarketBoardPurchase.cs b/Dalamud/Game/Network/Structures/MarketBoardPurchase.cs
index 2af4757b2..4e9b67a74 100644
--- a/Dalamud/Game/Network/Structures/MarketBoardPurchase.cs
+++ b/Dalamud/Game/Network/Structures/MarketBoardPurchase.cs
@@ -1,45 +1,44 @@
 using System;
 using System.IO;
 
-namespace Dalamud.Game.Network.Structures
+namespace Dalamud.Game.Network.Structures;
+
+/// <summary>
+/// Represents market board purchase information. This message is received from the
+/// server when a purchase is made at a market board.
+/// </summary>
+public class MarketBoardPurchase
 {
-    /// <summary>
-    /// Represents market board purchase information. This message is received from the
-    /// server when a purchase is made at a market board.
-    /// </summary>
-    public class MarketBoardPurchase
+    private MarketBoardPurchase()
     {
-        private MarketBoardPurchase()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Gets the item ID of the item that was purchased.
-        /// </summary>
-        public uint CatalogId { get; private set; }
+    /// <summary>
+    /// Gets the item ID of the item that was purchased.
+    /// </summary>
+    public uint CatalogId { get; private set; }
 
-        /// <summary>
-        /// Gets the quantity of the item that was purchased.
-        /// </summary>
-        public uint ItemQuantity { get; private set; }
+    /// <summary>
+    /// Gets the quantity of the item that was purchased.
+    /// </summary>
+    public uint ItemQuantity { get; private set; }
 
-        /// <summary>
-        /// Reads market board purchase information from the struct at the provided pointer.
-        /// </summary>
-        /// <param name="dataPtr">A pointer to a struct containing market board purchase information from the server.</param>
-        /// <returns>An object representing the data read.</returns>
-        public static unsafe MarketBoardPurchase Read(IntPtr dataPtr)
-        {
-            using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
-            using var reader = new BinaryReader(stream);
+    /// <summary>
+    /// Reads market board purchase information from the struct at the provided pointer.
+    /// </summary>
+    /// <param name="dataPtr">A pointer to a struct containing market board purchase information from the server.</param>
+    /// <returns>An object representing the data read.</returns>
+    public static unsafe MarketBoardPurchase Read(IntPtr dataPtr)
+    {
+        using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
+        using var reader = new BinaryReader(stream);
 
-            var output = new MarketBoardPurchase();
+        var output = new MarketBoardPurchase();
 
-            output.CatalogId = reader.ReadUInt32();
-            stream.Position += 4;
-            output.ItemQuantity = reader.ReadUInt32();
+        output.CatalogId = reader.ReadUInt32();
+        stream.Position += 4;
+        output.ItemQuantity = reader.ReadUInt32();
 
-            return output;
-        }
+        return output;
     }
 }
diff --git a/Dalamud/Game/Network/Structures/MarketBoardPurchaseHandler.cs b/Dalamud/Game/Network/Structures/MarketBoardPurchaseHandler.cs
index 75bbdf332..fdc7bd83a 100644
--- a/Dalamud/Game/Network/Structures/MarketBoardPurchaseHandler.cs
+++ b/Dalamud/Game/Network/Structures/MarketBoardPurchaseHandler.cs
@@ -1,62 +1,61 @@
 using System;
 using System.IO;
 
-namespace Dalamud.Game.Network.Structures
+namespace Dalamud.Game.Network.Structures;
+
+/// <summary>
+/// Represents market board purchase information. This message is sent from the
+/// client when a purchase is made at a market board.
+/// </summary>
+public class MarketBoardPurchaseHandler
 {
-    /// <summary>
-    /// Represents market board purchase information. This message is sent from the
-    /// client when a purchase is made at a market board.
-    /// </summary>
-    public class MarketBoardPurchaseHandler
+    private MarketBoardPurchaseHandler()
     {
-        private MarketBoardPurchaseHandler()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Gets the object ID of the retainer associated with the sale.
-        /// </summary>
-        public ulong RetainerId { get; private set; }
+    /// <summary>
+    /// Gets the object ID of the retainer associated with the sale.
+    /// </summary>
+    public ulong RetainerId { get; private set; }
 
-        /// <summary>
-        /// Gets the object ID of the item listing.
-        /// </summary>
-        public ulong ListingId { get; private set; }
+    /// <summary>
+    /// Gets the object ID of the item listing.
+    /// </summary>
+    public ulong ListingId { get; private set; }
 
-        /// <summary>
-        /// Gets the item ID of the item that was purchased.
-        /// </summary>
-        public uint CatalogId { get; private set; }
+    /// <summary>
+    /// Gets the item ID of the item that was purchased.
+    /// </summary>
+    public uint CatalogId { get; private set; }
 
-        /// <summary>
-        /// Gets the quantity of the item that was purchased.
-        /// </summary>
-        public uint ItemQuantity { get; private set; }
+    /// <summary>
+    /// Gets the quantity of the item that was purchased.
+    /// </summary>
+    public uint ItemQuantity { get; private set; }
 
-        /// <summary>
-        /// Gets the unit price of the item.
-        /// </summary>
-        public uint PricePerUnit { get; private set; }
+    /// <summary>
+    /// Gets the unit price of the item.
+    /// </summary>
+    public uint PricePerUnit { get; private set; }
 
-        /// <summary>
-        /// Reads market board purchase information from the struct at the provided pointer.
-        /// </summary>
-        /// <param name="dataPtr">A pointer to a struct containing market board purchase information from the client.</param>
-        /// <returns>An object representing the data read.</returns>
-        public static unsafe MarketBoardPurchaseHandler Read(IntPtr dataPtr)
-        {
-            using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
-            using var reader = new BinaryReader(stream);
+    /// <summary>
+    /// Reads market board purchase information from the struct at the provided pointer.
+    /// </summary>
+    /// <param name="dataPtr">A pointer to a struct containing market board purchase information from the client.</param>
+    /// <returns>An object representing the data read.</returns>
+    public static unsafe MarketBoardPurchaseHandler Read(IntPtr dataPtr)
+    {
+        using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
+        using var reader = new BinaryReader(stream);
 
-            var output = new MarketBoardPurchaseHandler();
+        var output = new MarketBoardPurchaseHandler();
 
-            output.RetainerId = reader.ReadUInt64();
-            output.ListingId = reader.ReadUInt64();
-            output.CatalogId = reader.ReadUInt32();
-            output.ItemQuantity = reader.ReadUInt32();
-            output.PricePerUnit = reader.ReadUInt32();
+        output.RetainerId = reader.ReadUInt64();
+        output.ListingId = reader.ReadUInt64();
+        output.CatalogId = reader.ReadUInt32();
+        output.ItemQuantity = reader.ReadUInt32();
+        output.PricePerUnit = reader.ReadUInt32();
 
-            return output;
-        }
+        return output;
     }
 }
diff --git a/Dalamud/Game/Network/Structures/MarketTaxRates.cs b/Dalamud/Game/Network/Structures/MarketTaxRates.cs
index 0cb21e5d8..53ce41d44 100644
--- a/Dalamud/Game/Network/Structures/MarketTaxRates.cs
+++ b/Dalamud/Game/Network/Structures/MarketTaxRates.cs
@@ -1,81 +1,80 @@
 using System;
 using System.IO;
 
-namespace Dalamud.Game.Network.Structures
+namespace Dalamud.Game.Network.Structures;
+
+/// <summary>
+/// This class represents the "Result Dialog" packet. This is also used e.g. for reduction results, but we only care about tax rates.
+/// We can do that by checking the "Category" field.
+/// </summary>
+public class MarketTaxRates
 {
-    /// <summary>
-    /// This class represents the "Result Dialog" packet. This is also used e.g. for reduction results, but we only care about tax rates.
-    /// We can do that by checking the "Category" field.
-    /// </summary>
-    public class MarketTaxRates
+    private MarketTaxRates()
     {
-        private MarketTaxRates()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Gets the category of this ResultDialog packet.
-        /// </summary>
-        public uint Category { get; private set; }
+    /// <summary>
+    /// Gets the category of this ResultDialog packet.
+    /// </summary>
+    public uint Category { get; private set; }
 
-        /// <summary>
-        /// Gets the tax rate in Limsa Lominsa.
-        /// </summary>
-        public uint LimsaLominsaTax { get; private set; }
+    /// <summary>
+    /// Gets the tax rate in Limsa Lominsa.
+    /// </summary>
+    public uint LimsaLominsaTax { get; private set; }
 
-        /// <summary>
-        /// Gets the tax rate in Gridania.
-        /// </summary>
-        public uint GridaniaTax { get; private set; }
+    /// <summary>
+    /// Gets the tax rate in Gridania.
+    /// </summary>
+    public uint GridaniaTax { get; private set; }
 
-        /// <summary>
-        /// Gets the tax rate in Ul'dah.
-        /// </summary>
-        public uint UldahTax { get; private set; }
+    /// <summary>
+    /// Gets the tax rate in Ul'dah.
+    /// </summary>
+    public uint UldahTax { get; private set; }
 
-        /// <summary>
-        /// Gets the tax rate in Ishgard.
-        /// </summary>
-        public uint IshgardTax { get; private set; }
+    /// <summary>
+    /// Gets the tax rate in Ishgard.
+    /// </summary>
+    public uint IshgardTax { get; private set; }
 
-        /// <summary>
-        /// Gets the tax rate in Kugane.
-        /// </summary>
-        public uint KuganeTax { get; private set; }
+    /// <summary>
+    /// Gets the tax rate in Kugane.
+    /// </summary>
+    public uint KuganeTax { get; private set; }
 
-        /// <summary>
-        /// Gets the tax rate in the Crystarium.
-        /// </summary>
-        public uint CrystariumTax { get; private set; }
+    /// <summary>
+    /// Gets the tax rate in the Crystarium.
+    /// </summary>
+    public uint CrystariumTax { get; private set; }
 
-        /// <summary>
-        /// Gets the tax rate in the Crystarium.
-        /// </summary>
-        public uint SharlayanTax { get; private set; }
+    /// <summary>
+    /// Gets the tax rate in the Crystarium.
+    /// </summary>
+    public uint SharlayanTax { get; private set; }
 
-        /// <summary>
-        /// Read a <see cref="MarketTaxRates"/> object from memory.
-        /// </summary>
-        /// <param name="dataPtr">Address to read.</param>
-        /// <returns>A new <see cref="MarketTaxRates"/> object.</returns>
-        public static unsafe MarketTaxRates Read(IntPtr dataPtr)
-        {
-            using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
-            using var reader = new BinaryReader(stream);
+    /// <summary>
+    /// Read a <see cref="MarketTaxRates"/> object from memory.
+    /// </summary>
+    /// <param name="dataPtr">Address to read.</param>
+    /// <returns>A new <see cref="MarketTaxRates"/> object.</returns>
+    public static unsafe MarketTaxRates Read(IntPtr dataPtr)
+    {
+        using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
+        using var reader = new BinaryReader(stream);
 
-            var output = new MarketTaxRates();
+        var output = new MarketTaxRates();
 
-            output.Category = reader.ReadUInt32();
-            stream.Position += 4;
-            output.LimsaLominsaTax = reader.ReadUInt32();
-            output.GridaniaTax = reader.ReadUInt32();
-            output.UldahTax = reader.ReadUInt32();
-            output.IshgardTax = reader.ReadUInt32();
-            output.KuganeTax = reader.ReadUInt32();
-            output.CrystariumTax = reader.ReadUInt32();
-            output.SharlayanTax = reader.ReadUInt32();
+        output.Category = reader.ReadUInt32();
+        stream.Position += 4;
+        output.LimsaLominsaTax = reader.ReadUInt32();
+        output.GridaniaTax = reader.ReadUInt32();
+        output.UldahTax = reader.ReadUInt32();
+        output.IshgardTax = reader.ReadUInt32();
+        output.KuganeTax = reader.ReadUInt32();
+        output.CrystariumTax = reader.ReadUInt32();
+        output.SharlayanTax = reader.ReadUInt32();
 
-            return output;
-        }
+        return output;
     }
 }
diff --git a/Dalamud/Game/SigScanner.cs b/Dalamud/Game/SigScanner.cs
index 9f5a8e33c..197131c14 100644
--- a/Dalamud/Game/SigScanner.cs
+++ b/Dalamud/Game/SigScanner.cs
@@ -12,540 +12,539 @@ using Dalamud.IoC.Internal;
 using Newtonsoft.Json;
 using Serilog;
 
-namespace Dalamud.Game
+namespace Dalamud.Game;
+
+/// <summary>
+/// A SigScanner facilitates searching for memory signatures in a given ProcessModule.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+public class SigScanner : IDisposable, IServiceType
 {
+    private readonly FileInfo? cacheFile;
+
+    private IntPtr moduleCopyPtr;
+    private long moduleCopyOffset;
+
+    private ConcurrentDictionary<string, long>? textCache;
+
     /// <summary>
-    /// A SigScanner facilitates searching for memory signatures in a given ProcessModule.
+    /// Initializes a new instance of the <see cref="SigScanner"/> class using the main module of the current process.
     /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    public class SigScanner : IDisposable, IServiceType
+    /// <param name="doCopy">Whether or not to copy the module upon initialization for search operations to use, as to not get disturbed by possible hooks.</param>
+    /// <param name="cacheFile">File used to cached signatures.</param>
+    public SigScanner(bool doCopy = false, FileInfo? cacheFile = null)
+        : this(Process.GetCurrentProcess().MainModule!, doCopy, cacheFile)
     {
-        private readonly FileInfo? cacheFile;
+    }
 
-        private IntPtr moduleCopyPtr;
-        private long moduleCopyOffset;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SigScanner"/> class.
+    /// </summary>
+    /// <param name="module">The ProcessModule to be used for scanning.</param>
+    /// <param name="doCopy">Whether or not to copy the module upon initialization for search operations to use, as to not get disturbed by possible hooks.</param>
+    /// <param name="cacheFile">File used to cached signatures.</param>
+    public SigScanner(ProcessModule module, bool doCopy = false, FileInfo? cacheFile = null)
+    {
+        this.cacheFile = cacheFile;
+        this.Module = module;
+        this.Is32BitProcess = !Environment.Is64BitProcess;
+        this.IsCopy = doCopy;
 
-        private ConcurrentDictionary<string, long>? textCache;
+        // Limit the search space to .text section.
+        this.SetupSearchSpace(module);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SigScanner"/> class using the main module of the current process.
-        /// </summary>
-        /// <param name="doCopy">Whether or not to copy the module upon initialization for search operations to use, as to not get disturbed by possible hooks.</param>
-        /// <param name="cacheFile">File used to cached signatures.</param>
-        public SigScanner(bool doCopy = false, FileInfo? cacheFile = null)
-            : this(Process.GetCurrentProcess().MainModule!, doCopy, cacheFile)
+        if (this.IsCopy)
+            this.SetupCopiedSegments();
+
+        Log.Verbose($"Module base: 0x{this.TextSectionBase.ToInt64():X}");
+        Log.Verbose($"Module size: 0x{this.TextSectionSize:X}");
+
+        if (cacheFile != null)
+            this.Load();
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether or not the search on this module is performed on a copy.
+    /// </summary>
+    public bool IsCopy { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether or not the ProcessModule is 32-bit.
+    /// </summary>
+    public bool Is32BitProcess { get; }
+
+    /// <summary>
+    /// Gets the base address of the search area. When copied, this will be the address of the copy.
+    /// </summary>
+    public IntPtr SearchBase => this.IsCopy ? this.moduleCopyPtr : this.Module.BaseAddress;
+
+    /// <summary>
+    /// Gets the base address of the .text section search area.
+    /// </summary>
+    public IntPtr TextSectionBase => new(this.SearchBase.ToInt64() + this.TextSectionOffset);
+
+    /// <summary>
+    /// Gets the offset of the .text section from the base of the module.
+    /// </summary>
+    public long TextSectionOffset { get; private set; }
+
+    /// <summary>
+    /// Gets the size of the text section.
+    /// </summary>
+    public int TextSectionSize { get; private set; }
+
+    /// <summary>
+    /// Gets the base address of the .data section search area.
+    /// </summary>
+    public IntPtr DataSectionBase => new(this.SearchBase.ToInt64() + this.DataSectionOffset);
+
+    /// <summary>
+    /// Gets the offset of the .data section from the base of the module.
+    /// </summary>
+    public long DataSectionOffset { get; private set; }
+
+    /// <summary>
+    /// Gets the size of the .data section.
+    /// </summary>
+    public int DataSectionSize { get; private set; }
+
+    /// <summary>
+    /// Gets the base address of the .rdata section search area.
+    /// </summary>
+    public IntPtr RDataSectionBase => new(this.SearchBase.ToInt64() + this.RDataSectionOffset);
+
+    /// <summary>
+    /// Gets the offset of the .rdata section from the base of the module.
+    /// </summary>
+    public long RDataSectionOffset { get; private set; }
+
+    /// <summary>
+    /// Gets the size of the .rdata section.
+    /// </summary>
+    public int RDataSectionSize { get; private set; }
+
+    /// <summary>
+    /// Gets the ProcessModule on which the search is performed.
+    /// </summary>
+    public ProcessModule Module { get; }
+
+    private IntPtr TextSectionTop => this.TextSectionBase + this.TextSectionSize;
+
+    /// <summary>
+    /// Scan memory for a signature.
+    /// </summary>
+    /// <param name="baseAddress">The base address to scan from.</param>
+    /// <param name="size">The amount of bytes to scan.</param>
+    /// <param name="signature">The signature to search for.</param>
+    /// <returns>The found offset.</returns>
+    public static IntPtr Scan(IntPtr baseAddress, int size, string signature)
+    {
+        var (needle, mask) = ParseSignature(signature);
+        var index = IndexOf(baseAddress, size, needle, mask);
+        if (index < 0)
+            throw new KeyNotFoundException($"Can't find a signature of {signature}");
+        return baseAddress + index;
+    }
+
+    /// <summary>
+    /// Try scanning memory for a signature.
+    /// </summary>
+    /// <param name="baseAddress">The base address to scan from.</param>
+    /// <param name="size">The amount of bytes to scan.</param>
+    /// <param name="signature">The signature to search for.</param>
+    /// <param name="result">The offset, if found.</param>
+    /// <returns>true if the signature was found.</returns>
+    public static bool TryScan(IntPtr baseAddress, int size, string signature, out IntPtr result)
+    {
+        try
         {
+            result = Scan(baseAddress, size, signature);
+            return true;
         }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SigScanner"/> class.
-        /// </summary>
-        /// <param name="module">The ProcessModule to be used for scanning.</param>
-        /// <param name="doCopy">Whether or not to copy the module upon initialization for search operations to use, as to not get disturbed by possible hooks.</param>
-        /// <param name="cacheFile">File used to cached signatures.</param>
-        public SigScanner(ProcessModule module, bool doCopy = false, FileInfo? cacheFile = null)
+        catch (KeyNotFoundException)
         {
-            this.cacheFile = cacheFile;
-            this.Module = module;
-            this.Is32BitProcess = !Environment.Is64BitProcess;
-            this.IsCopy = doCopy;
-
-            // Limit the search space to .text section.
-            this.SetupSearchSpace(module);
-
-            if (this.IsCopy)
-                this.SetupCopiedSegments();
-
-            Log.Verbose($"Module base: 0x{this.TextSectionBase.ToInt64():X}");
-            Log.Verbose($"Module size: 0x{this.TextSectionSize:X}");
-
-            if (cacheFile != null)
-                this.Load();
+            result = IntPtr.Zero;
+            return false;
         }
+    }
 
-        /// <summary>
-        /// Gets a value indicating whether or not the search on this module is performed on a copy.
-        /// </summary>
-        public bool IsCopy { get; }
+    /// <summary>
+    /// Scan for a .data address using a .text function.
+    /// This is intended to be used with IDA sigs.
+    /// Place your cursor on the line calling a static address, and create and IDA sig.
+    /// </summary>
+    /// <param name="signature">The signature of the function using the data.</param>
+    /// <param name="offset">The offset from function start of the instruction using the data.</param>
+    /// <returns>An IntPtr to the static memory location.</returns>
+    public IntPtr GetStaticAddressFromSig(string signature, int offset = 0)
+    {
+        var instrAddr = this.ScanText(signature);
+        instrAddr = IntPtr.Add(instrAddr, offset);
+        var bAddr = (long)this.Module.BaseAddress;
+        long num;
 
-        /// <summary>
-        /// Gets a value indicating whether or not the ProcessModule is 32-bit.
-        /// </summary>
-        public bool Is32BitProcess { get; }
-
-        /// <summary>
-        /// Gets the base address of the search area. When copied, this will be the address of the copy.
-        /// </summary>
-        public IntPtr SearchBase => this.IsCopy ? this.moduleCopyPtr : this.Module.BaseAddress;
-
-        /// <summary>
-        /// Gets the base address of the .text section search area.
-        /// </summary>
-        public IntPtr TextSectionBase => new(this.SearchBase.ToInt64() + this.TextSectionOffset);
-
-        /// <summary>
-        /// Gets the offset of the .text section from the base of the module.
-        /// </summary>
-        public long TextSectionOffset { get; private set; }
-
-        /// <summary>
-        /// Gets the size of the text section.
-        /// </summary>
-        public int TextSectionSize { get; private set; }
-
-        /// <summary>
-        /// Gets the base address of the .data section search area.
-        /// </summary>
-        public IntPtr DataSectionBase => new(this.SearchBase.ToInt64() + this.DataSectionOffset);
-
-        /// <summary>
-        /// Gets the offset of the .data section from the base of the module.
-        /// </summary>
-        public long DataSectionOffset { get; private set; }
-
-        /// <summary>
-        /// Gets the size of the .data section.
-        /// </summary>
-        public int DataSectionSize { get; private set; }
-
-        /// <summary>
-        /// Gets the base address of the .rdata section search area.
-        /// </summary>
-        public IntPtr RDataSectionBase => new(this.SearchBase.ToInt64() + this.RDataSectionOffset);
-
-        /// <summary>
-        /// Gets the offset of the .rdata section from the base of the module.
-        /// </summary>
-        public long RDataSectionOffset { get; private set; }
-
-        /// <summary>
-        /// Gets the size of the .rdata section.
-        /// </summary>
-        public int RDataSectionSize { get; private set; }
-
-        /// <summary>
-        /// Gets the ProcessModule on which the search is performed.
-        /// </summary>
-        public ProcessModule Module { get; }
-
-        private IntPtr TextSectionTop => this.TextSectionBase + this.TextSectionSize;
-
-        /// <summary>
-        /// Scan memory for a signature.
-        /// </summary>
-        /// <param name="baseAddress">The base address to scan from.</param>
-        /// <param name="size">The amount of bytes to scan.</param>
-        /// <param name="signature">The signature to search for.</param>
-        /// <returns>The found offset.</returns>
-        public static IntPtr Scan(IntPtr baseAddress, int size, string signature)
+        do
         {
-            var (needle, mask) = ParseSignature(signature);
-            var index = IndexOf(baseAddress, size, needle, mask);
-            if (index < 0)
-                throw new KeyNotFoundException($"Can't find a signature of {signature}");
-            return baseAddress + index;
+            instrAddr = IntPtr.Add(instrAddr, 1);
+            num = Marshal.ReadInt32(instrAddr) + (long)instrAddr + 4 - bAddr;
         }
+        while (!(num >= this.DataSectionOffset && num <= this.DataSectionOffset + this.DataSectionSize)
+               && !(num >= this.RDataSectionOffset && num <= this.RDataSectionOffset + this.RDataSectionSize));
 
-        /// <summary>
-        /// Try scanning memory for a signature.
-        /// </summary>
-        /// <param name="baseAddress">The base address to scan from.</param>
-        /// <param name="size">The amount of bytes to scan.</param>
-        /// <param name="signature">The signature to search for.</param>
-        /// <param name="result">The offset, if found.</param>
-        /// <returns>true if the signature was found.</returns>
-        public static bool TryScan(IntPtr baseAddress, int size, string signature, out IntPtr result)
+        return IntPtr.Add(instrAddr, Marshal.ReadInt32(instrAddr) + 4);
+    }
+
+    /// <summary>
+    /// Try scanning for a .data address using a .text function.
+    /// This is intended to be used with IDA sigs.
+    /// Place your cursor on the line calling a static address, and create and IDA sig.
+    /// </summary>
+    /// <param name="signature">The signature of the function using the data.</param>
+    /// <param name="result">An IntPtr to the static memory location, if found.</param>
+    /// <param name="offset">The offset from function start of the instruction using the data.</param>
+    /// <returns>true if the signature was found.</returns>
+    public bool TryGetStaticAddressFromSig(string signature, out IntPtr result, int offset = 0)
+    {
+        try
         {
-            try
+            result = this.GetStaticAddressFromSig(signature, offset);
+            return true;
+        }
+        catch (KeyNotFoundException)
+        {
+            result = IntPtr.Zero;
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Scan for a byte signature in the .data section.
+    /// </summary>
+    /// <param name="signature">The signature.</param>
+    /// <returns>The real offset of the found signature.</returns>
+    public IntPtr ScanData(string signature)
+    {
+        var scanRet = Scan(this.DataSectionBase, this.DataSectionSize, signature);
+
+        if (this.IsCopy)
+            scanRet = new IntPtr(scanRet.ToInt64() - this.moduleCopyOffset);
+
+        return scanRet;
+    }
+
+    /// <summary>
+    /// Try scanning for a byte signature in the .data section.
+    /// </summary>
+    /// <param name="signature">The signature.</param>
+    /// <param name="result">The real offset of the signature, if found.</param>
+    /// <returns>true if the signature was found.</returns>
+    public bool TryScanData(string signature, out IntPtr result)
+    {
+        try
+        {
+            result = this.ScanData(signature);
+            return true;
+        }
+        catch (KeyNotFoundException)
+        {
+            result = IntPtr.Zero;
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Scan for a byte signature in the whole module search area.
+    /// </summary>
+    /// <param name="signature">The signature.</param>
+    /// <returns>The real offset of the found signature.</returns>
+    public IntPtr ScanModule(string signature)
+    {
+        var scanRet = Scan(this.SearchBase, this.Module.ModuleMemorySize, signature);
+
+        if (this.IsCopy)
+            scanRet = new IntPtr(scanRet.ToInt64() - this.moduleCopyOffset);
+
+        return scanRet;
+    }
+
+    /// <summary>
+    /// Try scanning for a byte signature in the whole module search area.
+    /// </summary>
+    /// <param name="signature">The signature.</param>
+    /// <param name="result">The real offset of the signature, if found.</param>
+    /// <returns>true if the signature was found.</returns>
+    public bool TryScanModule(string signature, out IntPtr result)
+    {
+        try
+        {
+            result = this.ScanModule(signature);
+            return true;
+        }
+        catch (KeyNotFoundException)
+        {
+            result = IntPtr.Zero;
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Resolve a RVA address.
+    /// </summary>
+    /// <param name="nextInstAddr">The address of the next instruction.</param>
+    /// <param name="relOffset">The relative offset.</param>
+    /// <returns>The calculated offset.</returns>
+    public IntPtr ResolveRelativeAddress(IntPtr nextInstAddr, int relOffset)
+    {
+        if (this.Is32BitProcess) throw new NotSupportedException("32 bit is not supported.");
+        return nextInstAddr + relOffset;
+    }
+
+    /// <summary>
+    /// Scan for a byte signature in the .text section.
+    /// </summary>
+    /// <param name="signature">The signature.</param>
+    /// <returns>The real offset of the found signature.</returns>
+    public IntPtr ScanText(string signature)
+    {
+        if (this.textCache != null)
+        {
+            if (this.textCache.TryGetValue(signature, out var address))
             {
-                result = Scan(baseAddress, size, signature);
-                return true;
-            }
-            catch (KeyNotFoundException)
-            {
-                result = IntPtr.Zero;
-                return false;
+                return new IntPtr(address + this.Module.BaseAddress.ToInt64());
             }
         }
 
-        /// <summary>
-        /// Scan for a .data address using a .text function.
-        /// This is intended to be used with IDA sigs.
-        /// Place your cursor on the line calling a static address, and create and IDA sig.
-        /// </summary>
-        /// <param name="signature">The signature of the function using the data.</param>
-        /// <param name="offset">The offset from function start of the instruction using the data.</param>
-        /// <returns>An IntPtr to the static memory location.</returns>
-        public IntPtr GetStaticAddressFromSig(string signature, int offset = 0)
+        var mBase = this.IsCopy ? this.moduleCopyPtr : this.TextSectionBase;
+        var scanRet = Scan(mBase, this.TextSectionSize, signature);
+
+        if (this.IsCopy)
+            scanRet = new IntPtr(scanRet.ToInt64() - this.moduleCopyOffset);
+
+        var insnByte = Marshal.ReadByte(scanRet);
+
+        if (insnByte == 0xE8 || insnByte == 0xE9)
+            scanRet = ReadJmpCallSig(scanRet);
+
+        // If this is below the module, there's bound to be a problem with the sig/resolution... Let's not save it
+        // TODO: THIS IS A HACK! FIX THE ROOT CAUSE!
+        if (this.textCache != null && scanRet.ToInt64() >= this.Module.BaseAddress.ToInt64())
         {
-            var instrAddr = this.ScanText(signature);
-            instrAddr = IntPtr.Add(instrAddr, offset);
-            var bAddr = (long)this.Module.BaseAddress;
-            long num;
-
-            do
-            {
-                instrAddr = IntPtr.Add(instrAddr, 1);
-                num = Marshal.ReadInt32(instrAddr) + (long)instrAddr + 4 - bAddr;
-            }
-            while (!(num >= this.DataSectionOffset && num <= this.DataSectionOffset + this.DataSectionSize)
-                   && !(num >= this.RDataSectionOffset && num <= this.RDataSectionOffset + this.RDataSectionSize));
-
-            return IntPtr.Add(instrAddr, Marshal.ReadInt32(instrAddr) + 4);
+            this.textCache[signature] = scanRet.ToInt64() - this.Module.BaseAddress.ToInt64();
         }
 
-        /// <summary>
-        /// Try scanning for a .data address using a .text function.
-        /// This is intended to be used with IDA sigs.
-        /// Place your cursor on the line calling a static address, and create and IDA sig.
-        /// </summary>
-        /// <param name="signature">The signature of the function using the data.</param>
-        /// <param name="result">An IntPtr to the static memory location, if found.</param>
-        /// <param name="offset">The offset from function start of the instruction using the data.</param>
-        /// <returns>true if the signature was found.</returns>
-        public bool TryGetStaticAddressFromSig(string signature, out IntPtr result, int offset = 0)
+        return scanRet;
+    }
+
+    /// <summary>
+    /// Try scanning for a byte signature in the .text section.
+    /// </summary>
+    /// <param name="signature">The signature.</param>
+    /// <param name="result">The real offset of the signature, if found.</param>
+    /// <returns>true if the signature was found.</returns>
+    public bool TryScanText(string signature, out IntPtr result)
+    {
+        try
         {
-            try
+            result = this.ScanText(signature);
+            return true;
+        }
+        catch (KeyNotFoundException)
+        {
+            result = IntPtr.Zero;
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Free the memory of the copied module search area on object disposal, if applicable.
+    /// </summary>
+    public void Dispose()
+    {
+        this.Save();
+        Marshal.FreeHGlobal(this.moduleCopyPtr);
+    }
+
+    /// <summary>
+    /// Save the current state of the cache.
+    /// </summary>
+    internal void Save()
+    {
+        if (this.cacheFile == null)
+            return;
+
+        try
+        {
+            File.WriteAllText(this.cacheFile.FullName, JsonConvert.SerializeObject(this.textCache));
+            Log.Information("Saved cache to {CachePath}", this.cacheFile);
+        }
+        catch (Exception e)
+        {
+            Log.Warning(e, "Failed to save cache to {CachePath}", this.cacheFile);
+        }
+    }
+
+    /// <summary>
+    /// Helper for ScanText to get the correct address for IDA sigs that mark the first JMP or CALL location.
+    /// </summary>
+    /// <param name="sigLocation">The address the JMP or CALL sig resolved to.</param>
+    /// <returns>The real offset of the signature.</returns>
+    private static IntPtr ReadJmpCallSig(IntPtr sigLocation)
+    {
+        var jumpOffset = Marshal.ReadInt32(sigLocation, 1);
+        return IntPtr.Add(sigLocation, 5 + jumpOffset);
+    }
+
+    private static (byte[] Needle, bool[] Mask) ParseSignature(string signature)
+    {
+        signature = signature.Replace(" ", string.Empty);
+        if (signature.Length % 2 != 0)
+            throw new ArgumentException("Signature without whitespaces must be divisible by two.", nameof(signature));
+
+        var needleLength = signature.Length / 2;
+        var needle = new byte[needleLength];
+        var mask = new bool[needleLength];
+        for (var i = 0; i < needleLength; i++)
+        {
+            var hexString = signature.Substring(i * 2, 2);
+            if (hexString == "??" || hexString == "**")
             {
-                result = this.GetStaticAddressFromSig(signature, offset);
-                return true;
-            }
-            catch (KeyNotFoundException)
-            {
-                result = IntPtr.Zero;
-                return false;
+                needle[i] = 0;
+                mask[i] = true;
+                continue;
             }
+
+            needle[i] = byte.Parse(hexString, NumberStyles.AllowHexSpecifier);
+            mask[i] = false;
         }
 
-        /// <summary>
-        /// Scan for a byte signature in the .data section.
-        /// </summary>
-        /// <param name="signature">The signature.</param>
-        /// <returns>The real offset of the found signature.</returns>
-        public IntPtr ScanData(string signature)
+        return (needle, mask);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static unsafe int IndexOf(IntPtr bufferPtr, int bufferLength, byte[] needle, bool[] mask)
+    {
+        if (needle.Length > bufferLength) return -1;
+        var badShift = BuildBadCharTable(needle, mask);
+        var last = needle.Length - 1;
+        var offset = 0;
+        var maxoffset = bufferLength - needle.Length;
+        var buffer = (byte*)bufferPtr;
+
+        while (offset <= maxoffset)
         {
-            var scanRet = Scan(this.DataSectionBase, this.DataSectionSize, signature);
-
-            if (this.IsCopy)
-                scanRet = new IntPtr(scanRet.ToInt64() - this.moduleCopyOffset);
-
-            return scanRet;
-        }
-
-        /// <summary>
-        /// Try scanning for a byte signature in the .data section.
-        /// </summary>
-        /// <param name="signature">The signature.</param>
-        /// <param name="result">The real offset of the signature, if found.</param>
-        /// <returns>true if the signature was found.</returns>
-        public bool TryScanData(string signature, out IntPtr result)
-        {
-            try
+            int position;
+            for (position = last; needle[position] == *(buffer + position + offset) || mask[position]; position--)
             {
-                result = this.ScanData(signature);
-                return true;
-            }
-            catch (KeyNotFoundException)
-            {
-                result = IntPtr.Zero;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Scan for a byte signature in the whole module search area.
-        /// </summary>
-        /// <param name="signature">The signature.</param>
-        /// <returns>The real offset of the found signature.</returns>
-        public IntPtr ScanModule(string signature)
-        {
-            var scanRet = Scan(this.SearchBase, this.Module.ModuleMemorySize, signature);
-
-            if (this.IsCopy)
-                scanRet = new IntPtr(scanRet.ToInt64() - this.moduleCopyOffset);
-
-            return scanRet;
-        }
-
-        /// <summary>
-        /// Try scanning for a byte signature in the whole module search area.
-        /// </summary>
-        /// <param name="signature">The signature.</param>
-        /// <param name="result">The real offset of the signature, if found.</param>
-        /// <returns>true if the signature was found.</returns>
-        public bool TryScanModule(string signature, out IntPtr result)
-        {
-            try
-            {
-                result = this.ScanModule(signature);
-                return true;
-            }
-            catch (KeyNotFoundException)
-            {
-                result = IntPtr.Zero;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Resolve a RVA address.
-        /// </summary>
-        /// <param name="nextInstAddr">The address of the next instruction.</param>
-        /// <param name="relOffset">The relative offset.</param>
-        /// <returns>The calculated offset.</returns>
-        public IntPtr ResolveRelativeAddress(IntPtr nextInstAddr, int relOffset)
-        {
-            if (this.Is32BitProcess) throw new NotSupportedException("32 bit is not supported.");
-            return nextInstAddr + relOffset;
-        }
-
-        /// <summary>
-        /// Scan for a byte signature in the .text section.
-        /// </summary>
-        /// <param name="signature">The signature.</param>
-        /// <returns>The real offset of the found signature.</returns>
-        public IntPtr ScanText(string signature)
-        {
-            if (this.textCache != null)
-            {
-                if (this.textCache.TryGetValue(signature, out var address))
-                {
-                    return new IntPtr(address + this.Module.BaseAddress.ToInt64());
-                }
+                if (position == 0)
+                    return offset;
             }
 
-            var mBase = this.IsCopy ? this.moduleCopyPtr : this.TextSectionBase;
-            var scanRet = Scan(mBase, this.TextSectionSize, signature);
-
-            if (this.IsCopy)
-                scanRet = new IntPtr(scanRet.ToInt64() - this.moduleCopyOffset);
-
-            var insnByte = Marshal.ReadByte(scanRet);
-
-            if (insnByte == 0xE8 || insnByte == 0xE9)
-                scanRet = ReadJmpCallSig(scanRet);
-
-            // If this is below the module, there's bound to be a problem with the sig/resolution... Let's not save it
-            // TODO: THIS IS A HACK! FIX THE ROOT CAUSE!
-            if (this.textCache != null && scanRet.ToInt64() >= this.Module.BaseAddress.ToInt64())
-            {
-                this.textCache[signature] = scanRet.ToInt64() - this.Module.BaseAddress.ToInt64();
-            }
-
-            return scanRet;
+            offset += badShift[*(buffer + offset + last)];
         }
 
-        /// <summary>
-        /// Try scanning for a byte signature in the .text section.
-        /// </summary>
-        /// <param name="signature">The signature.</param>
-        /// <param name="result">The real offset of the signature, if found.</param>
-        /// <returns>true if the signature was found.</returns>
-        public bool TryScanText(string signature, out IntPtr result)
+        return -1;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int[] BuildBadCharTable(byte[] needle, bool[] mask)
+    {
+        int idx;
+        var last = needle.Length - 1;
+        var badShift = new int[256];
+        for (idx = last; idx > 0 && !mask[idx]; --idx)
         {
-            try
-            {
-                result = this.ScanText(signature);
-                return true;
-            }
-            catch (KeyNotFoundException)
-            {
-                result = IntPtr.Zero;
-                return false;
-            }
         }
 
-        /// <summary>
-        /// Free the memory of the copied module search area on object disposal, if applicable.
-        /// </summary>
-        public void Dispose()
+        var diff = last - idx;
+        if (diff == 0) diff = 1;
+
+        for (idx = 0; idx <= 255; ++idx)
+            badShift[idx] = diff;
+        for (idx = last - diff; idx < last; ++idx)
+            badShift[needle[idx]] = last - idx;
+        return badShift;
+    }
+
+    private void SetupSearchSpace(ProcessModule module)
+    {
+        var baseAddress = module.BaseAddress;
+
+        // We don't want to read all of IMAGE_DOS_HEADER or IMAGE_NT_HEADER stuff so we cheat here.
+        var ntNewOffset = Marshal.ReadInt32(baseAddress, 0x3C);
+        var ntHeader = baseAddress + ntNewOffset;
+
+        // IMAGE_NT_HEADER
+        var fileHeader = ntHeader + 4;
+        var numSections = Marshal.ReadInt16(ntHeader, 6);
+
+        // IMAGE_OPTIONAL_HEADER
+        var optionalHeader = fileHeader + 20;
+
+        IntPtr sectionHeader;
+        if (this.Is32BitProcess) // IMAGE_OPTIONAL_HEADER32
+            sectionHeader = optionalHeader + 224;
+        else // IMAGE_OPTIONAL_HEADER64
+            sectionHeader = optionalHeader + 240;
+
+        // IMAGE_SECTION_HEADER
+        var sectionCursor = sectionHeader;
+        for (var i = 0; i < numSections; i++)
         {
-            this.Save();
-            Marshal.FreeHGlobal(this.moduleCopyPtr);
-        }
+            var sectionName = Marshal.ReadInt64(sectionCursor);
 
-        /// <summary>
-        /// Save the current state of the cache.
-        /// </summary>
-        internal void Save()
-        {
-            if (this.cacheFile == null)
-                return;
-
-            try
-            {
-                File.WriteAllText(this.cacheFile.FullName, JsonConvert.SerializeObject(this.textCache));
-                Log.Information("Saved cache to {CachePath}", this.cacheFile);
-            }
-            catch (Exception e)
-            {
-                Log.Warning(e, "Failed to save cache to {CachePath}", this.cacheFile);
-            }
-        }
-
-        /// <summary>
-        /// Helper for ScanText to get the correct address for IDA sigs that mark the first JMP or CALL location.
-        /// </summary>
-        /// <param name="sigLocation">The address the JMP or CALL sig resolved to.</param>
-        /// <returns>The real offset of the signature.</returns>
-        private static IntPtr ReadJmpCallSig(IntPtr sigLocation)
-        {
-            var jumpOffset = Marshal.ReadInt32(sigLocation, 1);
-            return IntPtr.Add(sigLocation, 5 + jumpOffset);
-        }
-
-        private static (byte[] Needle, bool[] Mask) ParseSignature(string signature)
-        {
-            signature = signature.Replace(" ", string.Empty);
-            if (signature.Length % 2 != 0)
-                throw new ArgumentException("Signature without whitespaces must be divisible by two.", nameof(signature));
-
-            var needleLength = signature.Length / 2;
-            var needle = new byte[needleLength];
-            var mask = new bool[needleLength];
-            for (var i = 0; i < needleLength; i++)
-            {
-                var hexString = signature.Substring(i * 2, 2);
-                if (hexString == "??" || hexString == "**")
-                {
-                    needle[i] = 0;
-                    mask[i] = true;
-                    continue;
-                }
-
-                needle[i] = byte.Parse(hexString, NumberStyles.AllowHexSpecifier);
-                mask[i] = false;
-            }
-
-            return (needle, mask);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static unsafe int IndexOf(IntPtr bufferPtr, int bufferLength, byte[] needle, bool[] mask)
-        {
-            if (needle.Length > bufferLength) return -1;
-            var badShift = BuildBadCharTable(needle, mask);
-            var last = needle.Length - 1;
-            var offset = 0;
-            var maxoffset = bufferLength - needle.Length;
-            var buffer = (byte*)bufferPtr;
-
-            while (offset <= maxoffset)
-            {
-                int position;
-                for (position = last; needle[position] == *(buffer + position + offset) || mask[position]; position--)
-                {
-                    if (position == 0)
-                        return offset;
-                }
-
-                offset += badShift[*(buffer + offset + last)];
-            }
-
-            return -1;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static int[] BuildBadCharTable(byte[] needle, bool[] mask)
-        {
-            int idx;
-            var last = needle.Length - 1;
-            var badShift = new int[256];
-            for (idx = last; idx > 0 && !mask[idx]; --idx)
-            {
-            }
-
-            var diff = last - idx;
-            if (diff == 0) diff = 1;
-
-            for (idx = 0; idx <= 255; ++idx)
-                badShift[idx] = diff;
-            for (idx = last - diff; idx < last; ++idx)
-                badShift[needle[idx]] = last - idx;
-            return badShift;
-        }
-
-        private void SetupSearchSpace(ProcessModule module)
-        {
-            var baseAddress = module.BaseAddress;
-
-            // We don't want to read all of IMAGE_DOS_HEADER or IMAGE_NT_HEADER stuff so we cheat here.
-            var ntNewOffset = Marshal.ReadInt32(baseAddress, 0x3C);
-            var ntHeader = baseAddress + ntNewOffset;
-
-            // IMAGE_NT_HEADER
-            var fileHeader = ntHeader + 4;
-            var numSections = Marshal.ReadInt16(ntHeader, 6);
-
-            // IMAGE_OPTIONAL_HEADER
-            var optionalHeader = fileHeader + 20;
-
-            IntPtr sectionHeader;
-            if (this.Is32BitProcess) // IMAGE_OPTIONAL_HEADER32
-                sectionHeader = optionalHeader + 224;
-            else // IMAGE_OPTIONAL_HEADER64
-                sectionHeader = optionalHeader + 240;
-
-            // IMAGE_SECTION_HEADER
-            var sectionCursor = sectionHeader;
-            for (var i = 0; i < numSections; i++)
-            {
-                var sectionName = Marshal.ReadInt64(sectionCursor);
-
-                // .text
-                switch (sectionName)
-                {
-                    case 0x747865742E: // .text
-                        this.TextSectionOffset = Marshal.ReadInt32(sectionCursor, 12);
-                        this.TextSectionSize = Marshal.ReadInt32(sectionCursor, 8);
-                        break;
-                    case 0x617461642E: // .data
-                        this.DataSectionOffset = Marshal.ReadInt32(sectionCursor, 12);
-                        this.DataSectionSize = Marshal.ReadInt32(sectionCursor, 8);
-                        break;
-                    case 0x61746164722E: // .rdata
-                        this.RDataSectionOffset = Marshal.ReadInt32(sectionCursor, 12);
-                        this.RDataSectionSize = Marshal.ReadInt32(sectionCursor, 8);
-                        break;
-                }
-
-                sectionCursor += 40;
-            }
-        }
-
-        private unsafe void SetupCopiedSegments()
-        {
             // .text
-            this.moduleCopyPtr = Marshal.AllocHGlobal(this.Module.ModuleMemorySize);
-            Buffer.MemoryCopy(
-                this.Module.BaseAddress.ToPointer(),
-                this.moduleCopyPtr.ToPointer(),
-                this.Module.ModuleMemorySize,
-                this.Module.ModuleMemorySize);
+            switch (sectionName)
+            {
+                case 0x747865742E: // .text
+                    this.TextSectionOffset = Marshal.ReadInt32(sectionCursor, 12);
+                    this.TextSectionSize = Marshal.ReadInt32(sectionCursor, 8);
+                    break;
+                case 0x617461642E: // .data
+                    this.DataSectionOffset = Marshal.ReadInt32(sectionCursor, 12);
+                    this.DataSectionSize = Marshal.ReadInt32(sectionCursor, 8);
+                    break;
+                case 0x61746164722E: // .rdata
+                    this.RDataSectionOffset = Marshal.ReadInt32(sectionCursor, 12);
+                    this.RDataSectionSize = Marshal.ReadInt32(sectionCursor, 8);
+                    break;
+            }
 
-            this.moduleCopyOffset = this.moduleCopyPtr.ToInt64() - this.Module.BaseAddress.ToInt64();
+            sectionCursor += 40;
+        }
+    }
+
+    private unsafe void SetupCopiedSegments()
+    {
+        // .text
+        this.moduleCopyPtr = Marshal.AllocHGlobal(this.Module.ModuleMemorySize);
+        Buffer.MemoryCopy(
+            this.Module.BaseAddress.ToPointer(),
+            this.moduleCopyPtr.ToPointer(),
+            this.Module.ModuleMemorySize,
+            this.Module.ModuleMemorySize);
+
+        this.moduleCopyOffset = this.moduleCopyPtr.ToInt64() - this.Module.BaseAddress.ToInt64();
+    }
+
+    private void Load()
+    {
+        if (this.cacheFile is not { Exists: true })
+        {
+            this.textCache = new();
+            return;
         }
 
-        private void Load()
+        try
         {
-            if (this.cacheFile is not { Exists: true })
-            {
-                this.textCache = new();
-                return;
-            }
-
-            try
-            {
-                this.textCache =
-                    JsonConvert.DeserializeObject<ConcurrentDictionary<string, long>>(
-                        File.ReadAllText(this.cacheFile.FullName)) ?? new ConcurrentDictionary<string, long>();
-            }
-            catch (Exception ex)
-            {
-                this.textCache = new ConcurrentDictionary<string, long>();
-                Log.Error(ex, "Couldn't load cached sigs");
-            }
+            this.textCache =
+                JsonConvert.DeserializeObject<ConcurrentDictionary<string, long>>(
+                    File.ReadAllText(this.cacheFile.FullName)) ?? new ConcurrentDictionary<string, long>();
+        }
+        catch (Exception ex)
+        {
+            this.textCache = new ConcurrentDictionary<string, long>();
+            Log.Error(ex, "Couldn't load cached sigs");
         }
     }
 }
diff --git a/Dalamud/Game/Text/Sanitizer/ISanitizer.cs b/Dalamud/Game/Text/Sanitizer/ISanitizer.cs
index ffaa9cc0a..65603951a 100644
--- a/Dalamud/Game/Text/Sanitizer/ISanitizer.cs
+++ b/Dalamud/Game/Text/Sanitizer/ISanitizer.cs
@@ -1,40 +1,39 @@
 using System.Collections.Generic;
 
-namespace Dalamud.Game.Text.Sanitizer
+namespace Dalamud.Game.Text.Sanitizer;
+
+/// <summary>
+/// Sanitize strings to remove soft hyphens and other special characters.
+/// </summary>
+public interface ISanitizer
 {
     /// <summary>
-    /// Sanitize strings to remove soft hyphens and other special characters.
+    /// Creates a sanitized string using current clientLanguage.
     /// </summary>
-    public interface ISanitizer
-    {
-        /// <summary>
-        /// Creates a sanitized string using current clientLanguage.
-        /// </summary>
-        /// <param name="unsanitizedString">An unsanitized string to sanitize.</param>
-        /// <returns>A sanitized string.</returns>
-        string Sanitize(string unsanitizedString);
+    /// <param name="unsanitizedString">An unsanitized string to sanitize.</param>
+    /// <returns>A sanitized string.</returns>
+    string Sanitize(string unsanitizedString);
 
-        /// <summary>
-        /// Creates a sanitized string using request clientLanguage.
-        /// </summary>
-        /// <param name="unsanitizedString">An unsanitized string to sanitize.</param>
-        /// <param name="clientLanguage">Target language for sanitized strings.</param>
-        /// <returns>A sanitized string.</returns>
-        string Sanitize(string unsanitizedString, ClientLanguage clientLanguage);
+    /// <summary>
+    /// Creates a sanitized string using request clientLanguage.
+    /// </summary>
+    /// <param name="unsanitizedString">An unsanitized string to sanitize.</param>
+    /// <param name="clientLanguage">Target language for sanitized strings.</param>
+    /// <returns>A sanitized string.</returns>
+    string Sanitize(string unsanitizedString, ClientLanguage clientLanguage);
 
-        /// <summary>
-        /// Creates a list of sanitized strings using current clientLanguage.
-        /// </summary>
-        /// <param name="unsanitizedStrings">List of unsanitized string to sanitize.</param>
-        /// <returns>A list of sanitized strings.</returns>
-        IEnumerable<string> Sanitize(IEnumerable<string> unsanitizedStrings);
+    /// <summary>
+    /// Creates a list of sanitized strings using current clientLanguage.
+    /// </summary>
+    /// <param name="unsanitizedStrings">List of unsanitized string to sanitize.</param>
+    /// <returns>A list of sanitized strings.</returns>
+    IEnumerable<string> Sanitize(IEnumerable<string> unsanitizedStrings);
 
-        /// <summary>
-        /// Creates a list of sanitized strings using requested clientLanguage.
-        /// </summary>
-        /// <param name="unsanitizedStrings">List of unsanitized string to sanitize.</param>
-        /// <param name="clientLanguage">Target language for sanitized strings.</param>
-        /// <returns>A list of sanitized strings.</returns>
-        IEnumerable<string> Sanitize(IEnumerable<string> unsanitizedStrings, ClientLanguage clientLanguage);
-    }
+    /// <summary>
+    /// Creates a list of sanitized strings using requested clientLanguage.
+    /// </summary>
+    /// <param name="unsanitizedStrings">List of unsanitized string to sanitize.</param>
+    /// <param name="clientLanguage">Target language for sanitized strings.</param>
+    /// <returns>A list of sanitized strings.</returns>
+    IEnumerable<string> Sanitize(IEnumerable<string> unsanitizedStrings, ClientLanguage clientLanguage);
 }
diff --git a/Dalamud/Game/Text/Sanitizer/Sanitizer.cs b/Dalamud/Game/Text/Sanitizer/Sanitizer.cs
index 0cf1f1ea6..0647f5d28 100644
--- a/Dalamud/Game/Text/Sanitizer/Sanitizer.cs
+++ b/Dalamud/Game/Text/Sanitizer/Sanitizer.cs
@@ -2,110 +2,109 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Dalamud.Game.Text.Sanitizer
+namespace Dalamud.Game.Text.Sanitizer;
+
+/// <summary>
+/// Sanitize strings to remove soft hyphens and other special characters.
+/// </summary>
+public class Sanitizer : ISanitizer
 {
-    /// <summary>
-    /// Sanitize strings to remove soft hyphens and other special characters.
-    /// </summary>
-    public class Sanitizer : ISanitizer
+    private static readonly Dictionary<string, string> DESanitizationDict = new()
     {
-        private static readonly Dictionary<string, string> DESanitizationDict = new()
+        { "\u0020\u2020", string.Empty }, // dagger
+    };
+
+    private static readonly Dictionary<string, string> FRSanitizationDict = new()
+    {
+        { "\u0153", "\u006F\u0065" }, // ligature oe
+    };
+
+    private readonly ClientLanguage defaultClientLanguage;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Sanitizer"/> class.
+    /// </summary>
+    /// <param name="defaultClientLanguage">Default clientLanguage for sanitizing strings.</param>
+    public Sanitizer(ClientLanguage defaultClientLanguage)
+    {
+        this.defaultClientLanguage = defaultClientLanguage;
+    }
+
+    /// <summary>
+    /// Creates a sanitized string using current clientLanguage.
+    /// </summary>
+    /// <param name="unsanitizedString">An unsanitized string to sanitize.</param>
+    /// <returns>A sanitized string.</returns>
+    public string Sanitize(string unsanitizedString)
+    {
+        return SanitizeByLanguage(unsanitizedString, this.defaultClientLanguage);
+    }
+
+    /// <summary>
+    /// Creates a sanitized string using request clientLanguage.
+    /// </summary>
+    /// <param name="unsanitizedString">An unsanitized string to sanitize.</param>
+    /// <param name="clientLanguage">Target language for sanitized strings.</param>
+    /// <returns>A sanitized string.</returns>
+    public string Sanitize(string unsanitizedString, ClientLanguage clientLanguage)
+    {
+        return SanitizeByLanguage(unsanitizedString, clientLanguage);
+    }
+
+    /// <summary>
+    /// Creates a list of sanitized strings using current clientLanguage.
+    /// </summary>
+    /// <param name="unsanitizedStrings">List of unsanitized string to sanitize.</param>
+    /// <returns>A list of sanitized strings.</returns>
+    public IEnumerable<string> Sanitize(IEnumerable<string> unsanitizedStrings)
+    {
+        return SanitizeByLanguage(unsanitizedStrings, this.defaultClientLanguage);
+    }
+
+    /// <summary>
+    /// Creates a list of sanitized strings using requested clientLanguage.
+    /// </summary>
+    /// <param name="unsanitizedStrings">List of unsanitized string to sanitize.</param>
+    /// <param name="clientLanguage">Target language for sanitized strings.</param>
+    /// <returns>A list of sanitized strings.</returns>
+    public IEnumerable<string> Sanitize(IEnumerable<string> unsanitizedStrings, ClientLanguage clientLanguage)
+    {
+        return SanitizeByLanguage(unsanitizedStrings, clientLanguage);
+    }
+
+    private static string SanitizeByLanguage(string unsanitizedString, ClientLanguage clientLanguage)
+    {
+        var sanitizedString = FilterUnprintableCharacters(unsanitizedString);
+        return clientLanguage switch
         {
-            { "\u0020\u2020", string.Empty }, // dagger
+            ClientLanguage.Japanese or ClientLanguage.English => sanitizedString,
+            ClientLanguage.German => FilterByDict(sanitizedString, DESanitizationDict),
+            ClientLanguage.French => FilterByDict(sanitizedString, FRSanitizationDict),
+            _ => throw new ArgumentOutOfRangeException(nameof(clientLanguage), clientLanguage, null),
         };
+    }
 
-        private static readonly Dictionary<string, string> FRSanitizationDict = new()
+    private static IEnumerable<string> SanitizeByLanguage(IEnumerable<string> unsanitizedStrings, ClientLanguage clientLanguage)
+    {
+        return clientLanguage switch
         {
-            { "\u0153", "\u006F\u0065" }, // ligature oe
+            ClientLanguage.Japanese => unsanitizedStrings.Select(FilterUnprintableCharacters),
+            ClientLanguage.English => unsanitizedStrings.Select(FilterUnprintableCharacters),
+            ClientLanguage.German => unsanitizedStrings.Select(original => FilterByDict(FilterUnprintableCharacters(original), DESanitizationDict)),
+            ClientLanguage.French => unsanitizedStrings.Select(original => FilterByDict(FilterUnprintableCharacters(original), FRSanitizationDict)),
+            _ => throw new ArgumentOutOfRangeException(nameof(clientLanguage), clientLanguage, null),
         };
+    }
 
-        private readonly ClientLanguage defaultClientLanguage;
+    private static string FilterUnprintableCharacters(string str)
+    {
+        return new string(str?.Where(ch => ch >= 0x20).ToArray());
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Sanitizer"/> class.
-        /// </summary>
-        /// <param name="defaultClientLanguage">Default clientLanguage for sanitizing strings.</param>
-        public Sanitizer(ClientLanguage defaultClientLanguage)
-        {
-            this.defaultClientLanguage = defaultClientLanguage;
-        }
-
-        /// <summary>
-        /// Creates a sanitized string using current clientLanguage.
-        /// </summary>
-        /// <param name="unsanitizedString">An unsanitized string to sanitize.</param>
-        /// <returns>A sanitized string.</returns>
-        public string Sanitize(string unsanitizedString)
-        {
-            return SanitizeByLanguage(unsanitizedString, this.defaultClientLanguage);
-        }
-
-        /// <summary>
-        /// Creates a sanitized string using request clientLanguage.
-        /// </summary>
-        /// <param name="unsanitizedString">An unsanitized string to sanitize.</param>
-        /// <param name="clientLanguage">Target language for sanitized strings.</param>
-        /// <returns>A sanitized string.</returns>
-        public string Sanitize(string unsanitizedString, ClientLanguage clientLanguage)
-        {
-            return SanitizeByLanguage(unsanitizedString, clientLanguage);
-        }
-
-        /// <summary>
-        /// Creates a list of sanitized strings using current clientLanguage.
-        /// </summary>
-        /// <param name="unsanitizedStrings">List of unsanitized string to sanitize.</param>
-        /// <returns>A list of sanitized strings.</returns>
-        public IEnumerable<string> Sanitize(IEnumerable<string> unsanitizedStrings)
-        {
-            return SanitizeByLanguage(unsanitizedStrings, this.defaultClientLanguage);
-        }
-
-        /// <summary>
-        /// Creates a list of sanitized strings using requested clientLanguage.
-        /// </summary>
-        /// <param name="unsanitizedStrings">List of unsanitized string to sanitize.</param>
-        /// <param name="clientLanguage">Target language for sanitized strings.</param>
-        /// <returns>A list of sanitized strings.</returns>
-        public IEnumerable<string> Sanitize(IEnumerable<string> unsanitizedStrings, ClientLanguage clientLanguage)
-        {
-            return SanitizeByLanguage(unsanitizedStrings, clientLanguage);
-        }
-
-        private static string SanitizeByLanguage(string unsanitizedString, ClientLanguage clientLanguage)
-        {
-            var sanitizedString = FilterUnprintableCharacters(unsanitizedString);
-            return clientLanguage switch
-            {
-                ClientLanguage.Japanese or ClientLanguage.English => sanitizedString,
-                ClientLanguage.German => FilterByDict(sanitizedString, DESanitizationDict),
-                ClientLanguage.French => FilterByDict(sanitizedString, FRSanitizationDict),
-                _ => throw new ArgumentOutOfRangeException(nameof(clientLanguage), clientLanguage, null),
-            };
-        }
-
-        private static IEnumerable<string> SanitizeByLanguage(IEnumerable<string> unsanitizedStrings, ClientLanguage clientLanguage)
-        {
-            return clientLanguage switch
-            {
-                ClientLanguage.Japanese => unsanitizedStrings.Select(FilterUnprintableCharacters),
-                ClientLanguage.English => unsanitizedStrings.Select(FilterUnprintableCharacters),
-                ClientLanguage.German => unsanitizedStrings.Select(original => FilterByDict(FilterUnprintableCharacters(original), DESanitizationDict)),
-                ClientLanguage.French => unsanitizedStrings.Select(original => FilterByDict(FilterUnprintableCharacters(original), FRSanitizationDict)),
-                _ => throw new ArgumentOutOfRangeException(nameof(clientLanguage), clientLanguage, null),
-            };
-        }
-
-        private static string FilterUnprintableCharacters(string str)
-        {
-            return new string(str?.Where(ch => ch >= 0x20).ToArray());
-        }
-
-        private static string FilterByDict(string str, Dictionary<string, string> dict)
-        {
-            return dict.Aggregate(
-                str, (current, kvp) =>
-                    current.Replace(kvp.Key, kvp.Value));
-        }
+    private static string FilterByDict(string str, Dictionary<string, string> dict)
+    {
+        return dict.Aggregate(
+            str, (current, kvp) =>
+                current.Replace(kvp.Key, kvp.Value));
     }
 }
diff --git a/Dalamud/Game/Text/SeIconChar.cs b/Dalamud/Game/Text/SeIconChar.cs
index b913b2ec9..c1be00613 100644
--- a/Dalamud/Game/Text/SeIconChar.cs
+++ b/Dalamud/Game/Text/SeIconChar.cs
@@ -1,748 +1,747 @@
-namespace Dalamud.Game.Text
+namespace Dalamud.Game.Text;
+
+/// <summary>
+/// Special unicode characters with game-related symbols that work both in-game and in any dalamud window.
+/// </summary>
+public enum SeIconChar
 {
     /// <summary>
-    /// Special unicode characters with game-related symbols that work both in-game and in any dalamud window.
+    /// The sprout icon unicode character.
     /// </summary>
-    public enum SeIconChar
-    {
-        /// <summary>
-        /// The sprout icon unicode character.
-        /// </summary>
-        BotanistSprout = 0xE034,
-
-        /// <summary>
-        /// The item level icon unicode character.
-        /// </summary>
-        ItemLevel = 0xE033,
-
-        /// <summary>
-        /// The auto translate open icon unicode character.
-        /// </summary>
-        AutoTranslateOpen = 0xE040,
-
-        /// <summary>
-        /// The auto translate close icon unicode character.
-        /// </summary>
-        AutoTranslateClose = 0xE041,
-
-        /// <summary>
-        /// The high quality icon unicode character.
-        /// </summary>
-        HighQuality = 0xE03C,
-
-        /// <summary>
-        /// The collectible icon unicode character.
-        /// </summary>
-        Collectible = 0xE03D,
-
-        /// <summary>
-        /// The clock icon unicode character.
-        /// </summary>
-        Clock = 0xE031,
-
-        /// <summary>
-        /// The gil icon unicode character.
-        /// </summary>
-        Gil = 0xE049,
-
-        /// <summary>
-        /// The Hydaelyn icon unicode character.
-        /// </summary>
-        Hyadelyn = 0xE048,
-
-        /// <summary>
-        /// The no mouse click icon unicode character.
-        /// </summary>
-        MouseNoClick = 0xE050,
-
-        /// <summary>
-        /// The left mouse click icon unicode character.
-        /// </summary>
-        MouseLeftClick = 0xE051,
-
-        /// <summary>
-        /// The right mouse click icon unicode character.
-        /// </summary>
-        MouseRightClick = 0xE052,
-
-        /// <summary>
-        /// The left/right mouse click icon unicode character.
-        /// </summary>
-        MouseBothClick = 0xE053,
-
-        /// <summary>
-        /// The mouse wheel icon unicode character.
-        /// </summary>
-        MouseWheel = 0xE054,
-
-        /// <summary>
-        /// The mouse with a 1 icon unicode character.
-        /// </summary>
-        Mouse1 = 0xE055,
-
-        /// <summary>
-        /// The mouse with a 2 icon unicode character.
-        /// </summary>
-        Mouse2 = 0xE056,
-
-        /// <summary>
-        /// The mouse with a 3 icon unicode character.
-        /// </summary>
-        Mouse3 = 0xE057,
-
-        /// <summary>
-        /// The mouse with a 4 icon unicode character.
-        /// </summary>
-        Mouse4 = 0xE058,
-
-        /// <summary>
-        /// The mouse with a 5 icon unicode character.
-        /// </summary>
-        Mouse5 = 0xE059,
-
-        /// <summary>
-        /// The level English icon unicode character.
-        /// </summary>
-        LevelEn = 0xE06A,
-
-        /// <summary>
-        /// The level German icon unicode character.
-        /// </summary>
-        LevelDe = 0xE06B,
-
-        /// <summary>
-        /// The level French icon unicode character.
-        /// </summary>
-        LevelFr = 0xE06C,
-
-        /// <summary>
-        /// The experience icon unicode character.
-        /// </summary>
-        Experience = 0xE0BC,
-
-        /// <summary>
-        /// The experience filled icon unicode character.
-        /// </summary>
-        ExperienceFilled = 0xE0BD,
-
-        /// <summary>
-        /// The A.M. time icon unicode character.
-        /// </summary>
-        TimeAm = 0xE06D,
-
-        /// <summary>
-        /// The P.M. time icon unicode character.
-        /// </summary>
-        TimePm = 0xE06E,
-
-        /// <summary>
-        /// The right arrow icon unicode character.
-        /// </summary>
-        ArrowRight = 0xE06F,
-
-        /// <summary>
-        /// The down arrow  icon unicode character.
-        /// </summary>
-        ArrowDown = 0xE035,
-
-        /// <summary>
-        /// The number 0 icon unicode character.
-        /// </summary>
-        Number0 = 0xE060,
-
-        /// <summary>
-        /// The number 1 icon unicode character.
-        /// </summary>
-        Number1 = 0xE061,
-
-        /// <summary>
-        /// The number 2 icon unicode character.
-        /// </summary>
-        Number2 = 0xE062,
-
-        /// <summary>
-        /// The number 3 icon unicode character.
-        /// </summary>
-        Number3 = 0xE063,
-
-        /// <summary>
-        /// The number 4 icon unicode character.
-        /// </summary>
-        Number4 = 0xE064,
-
-        /// <summary>
-        /// The number 5 icon unicode character.
-        /// </summary>
-        Number5 = 0xE065,
-
-        /// <summary>
-        /// The number 6 icon unicode character.
-        /// </summary>
-        Number6 = 0xE066,
-
-        /// <summary>
-        /// The number 7 icon unicode character.
-        /// </summary>
-        Number7 = 0xE067,
-
-        /// <summary>
-        /// The number 8 icon unicode character.
-        /// </summary>
-        Number8 = 0xE068,
-
-        /// <summary>
-        /// The number 9 icon unicode character.
-        /// </summary>
-        Number9 = 0xE069,
-
-        /// <summary>
-        /// The boxed number 0 icon unicode character.
-        /// </summary>
-        BoxedNumber0 = 0xE08F,
-
-        /// <summary>
-        /// The boxed number 1 icon unicode character.
-        /// </summary>
-        BoxedNumber1 = 0xE090,
-
-        /// <summary>
-        /// The boxed number 2 icon unicode character.
-        /// </summary>
-        BoxedNumber2 = 0xE091,
-
-        /// <summary>
-        /// The boxed number 3 icon unicode character.
-        /// </summary>
-        BoxedNumber3 = 0xE092,
-
-        /// <summary>
-        /// The boxed number 4 icon unicode character.
-        /// </summary>
-        BoxedNumber4 = 0xE093,
-
-        /// <summary>
-        /// The boxed number 5 icon unicode character.
-        /// </summary>
-        BoxedNumber5 = 0xE094,
-
-        /// <summary>
-        /// The boxed number 6 icon unicode character.
-        /// </summary>
-        BoxedNumber6 = 0xE095,
-
-        /// <summary>
-        /// The boxed number 7 icon unicode character.
-        /// </summary>
-        BoxedNumber7 = 0xE096,
-
-        /// <summary>
-        /// The boxed number 8 icon unicode character.
-        /// </summary>
-        BoxedNumber8 = 0xE097,
-
-        /// <summary>
-        /// The boxed number 9 icon unicode character.
-        /// </summary>
-        BoxedNumber9 = 0xE098,
-
-        /// <summary>
-        /// The boxed number 10 icon unicode character.
-        /// </summary>
-        BoxedNumber10 = 0xE099,
-
-        /// <summary>
-        /// The boxed number 11 icon unicode character.
-        /// </summary>
-        BoxedNumber11 = 0xE09A,
-
-        /// <summary>
-        /// The boxed number 12 icon unicode character.
-        /// </summary>
-        BoxedNumber12 = 0xE09B,
-
-        /// <summary>
-        /// The boxed number 13 icon unicode character.
-        /// </summary>
-        BoxedNumber13 = 0xE09C,
-
-        /// <summary>
-        /// The boxed number 14 icon unicode character.
-        /// </summary>
-        BoxedNumber14 = 0xE09D,
-
-        /// <summary>
-        /// The boxed number 15 icon unicode character.
-        /// </summary>
-        BoxedNumber15 = 0xE09E,
-
-        /// <summary>
-        /// The boxed number 16 icon unicode character.
-        /// </summary>
-        BoxedNumber16 = 0xE09F,
-
-        /// <summary>
-        /// The boxed number 17 icon unicode character.
-        /// </summary>
-        BoxedNumber17 = 0xE0A0,
-
-        /// <summary>
-        /// The boxed number 18 icon unicode character.
-        /// </summary>
-        BoxedNumber18 = 0xE0A1,
-
-        /// <summary>
-        /// The boxed number 19 icon unicode character.
-        /// </summary>
-        BoxedNumber19 = 0xE0A2,
-
-        /// <summary>
-        /// The boxed number 20 icon unicode character.
-        /// </summary>
-        BoxedNumber20 = 0xE0A3,
-
-        /// <summary>
-        /// The boxed number 21 icon unicode character.
-        /// </summary>
-        BoxedNumber21 = 0xE0A4,
-
-        /// <summary>
-        /// The boxed number 22 icon unicode character.
-        /// </summary>
-        BoxedNumber22 = 0xE0A5,
-
-        /// <summary>
-        /// The boxed number 23 icon unicode character.
-        /// </summary>
-        BoxedNumber23 = 0xE0A6,
-
-        /// <summary>
-        /// The boxed number 24 icon unicode character.
-        /// </summary>
-        BoxedNumber24 = 0xE0A7,
-
-        /// <summary>
-        /// The boxed number 25 icon unicode character.
-        /// </summary>
-        BoxedNumber25 = 0xE0A8,
-
-        /// <summary>
-        /// The boxed number 26 icon unicode character.
-        /// </summary>
-        BoxedNumber26 = 0xE0A9,
-
-        /// <summary>
-        /// The boxed number 27 icon unicode character.
-        /// </summary>
-        BoxedNumber27 = 0xE0AA,
-
-        /// <summary>
-        /// The boxed number 28 icon unicode character.
-        /// </summary>
-        BoxedNumber28 = 0xE0AB,
-
-        /// <summary>
-        /// The boxed number 29 icon unicode character.
-        /// </summary>
-        BoxedNumber29 = 0xE0AC,
-
-        /// <summary>
-        /// The boxed number 30 icon unicode character.
-        /// </summary>
-        BoxedNumber30 = 0xE0AD,
-
-        /// <summary>
-        /// The boxed number 31 icon unicode character.
-        /// </summary>
-        BoxedNumber31 = 0xE0AE,
-
-        /// <summary>
-        /// The boxed plus icon unicode character.
-        /// </summary>
-        BoxedPlus = 0xE0AF,
-
-        /// <summary>
-        /// The bosed question mark icon unicode character.
-        /// </summary>
-        BoxedQuestionMark = 0xE070,
-
-        /// <summary>
-        /// The boxed star icon unicode character.
-        /// </summary>
-        BoxedStar = 0xE0C0,
-
-        /// <summary>
-        /// The boxed Roman numeral 1 (I) icon unicode character.
-        /// </summary>
-        BoxedRoman1 = 0xE0C1,
-
-        /// <summary>
-        /// The boxed Roman numeral 2 (II) icon unicode character.
-        /// </summary>
-        BoxedRoman2 = 0xE0C2,
-
-        /// <summary>
-        /// The boxed Roman numeral 3 (III) icon unicode character.
-        /// </summary>
-        BoxedRoman3 = 0xE0C3,
-
-        /// <summary>
-        /// The boxed Roman numeral 4 (IV) icon unicode character.
-        /// </summary>
-        BoxedRoman4 = 0xE0C4,
-
-        /// <summary>
-        /// The boxed Roman numeral 5 (V) icon unicode character.
-        /// </summary>
-        BoxedRoman5 = 0xE0C5,
-
-        /// <summary>
-        /// The boxed Roman numeral 6 (VI) icon unicode character.
-        /// </summary>
-        BoxedRoman6 = 0xE0C6,
-
-        /// <summary>
-        /// The boxed letter A icon unicode character.
-        /// </summary>
-        BoxedLetterA = 0xE071,
-
-        /// <summary>
-        /// The boxed letter B icon unicode character.
-        /// </summary>
-        BoxedLetterB = 0xE072,
-
-        /// <summary>
-        /// The boxed letter C icon unicode character.
-        /// </summary>
-        BoxedLetterC = 0xE073,
-
-        /// <summary>
-        /// The boxed letter D icon unicode character.
-        /// </summary>
-        BoxedLetterD = 0xE074,
-
-        /// <summary>
-        /// The boxed letter E icon unicode character.
-        /// </summary>
-        BoxedLetterE = 0xE075,
-
-        /// <summary>
-        /// The boxed letter F icon unicode character.
-        /// </summary>
-        BoxedLetterF = 0xE076,
-
-        /// <summary>
-        /// The boxed letter G icon unicode character.
-        /// </summary>
-        BoxedLetterG = 0xE077,
-
-        /// <summary>
-        /// The boxed letter H icon unicode character.
-        /// </summary>
-        BoxedLetterH = 0xE078,
-
-        /// <summary>
-        /// The boxed letter I icon unicode character.
-        /// </summary>
-        BoxedLetterI = 0xE079,
-
-        /// <summary>
-        /// The boxed letter J icon unicode character.
-        /// </summary>
-        BoxedLetterJ = 0xE07A,
-
-        /// <summary>
-        /// The boxed letter K icon unicode character.
-        /// </summary>
-        BoxedLetterK = 0xE07B,
-
-        /// <summary>
-        /// The boxed letter L icon unicode character.
-        /// </summary>
-        BoxedLetterL = 0xE07C,
-
-        /// <summary>
-        /// The boxed letter M icon unicode character.
-        /// </summary>
-        BoxedLetterM = 0xE07D,
-
-        /// <summary>
-        /// The boxed letter N icon unicode character.
-        /// </summary>
-        BoxedLetterN = 0xE07E,
-
-        /// <summary>
-        /// The boxed letter O icon unicode character.
-        /// </summary>
-        BoxedLetterO = 0xE07F,
-
-        /// <summary>
-        /// The boxed letter P icon unicode character.
-        /// </summary>
-        BoxedLetterP = 0xE080,
-
-        /// <summary>
-        /// The boxed letter Q icon unicode character.
-        /// </summary>
-        BoxedLetterQ = 0xE081,
-
-        /// <summary>
-        /// The boxed letter R icon unicode character.
-        /// </summary>
-        BoxedLetterR = 0xE082,
-
-        /// <summary>
-        /// The boxed letter S icon unicode character.
-        /// </summary>
-        BoxedLetterS = 0xE083,
-
-        /// <summary>
-        /// The boxed letter T icon unicode character.
-        /// </summary>
-        BoxedLetterT = 0xE084,
-
-        /// <summary>
-        /// The boxed letter U icon unicode character.
-        /// </summary>
-        BoxedLetterU = 0xE085,
-
-        /// <summary>
-        /// The boxed letter V icon unicode character.
-        /// </summary>
-        BoxedLetterV = 0xE086,
-
-        /// <summary>
-        /// The boxed letter W icon unicode character.
-        /// </summary>
-        BoxedLetterW = 0xE087,
-
-        /// <summary>
-        /// The boxed letter X icon unicode character.
-        /// </summary>
-        BoxedLetterX = 0xE088,
-
-        /// <summary>
-        /// The boxed letter Y icon unicode character.
-        /// </summary>
-        BoxedLetterY = 0xE089,
-
-        /// <summary>
-        /// The boxed letter Z icon unicode character.
-        /// </summary>
-        BoxedLetterZ = 0xE08A,
-
-        /// <summary>
-        /// The circle icon unicode character.
-        /// </summary>
-        Circle = 0xE04A,
-
-        /// <summary>
-        /// The square icon unicode character.
-        /// </summary>
-        Square = 0xE04B,
-
-        /// <summary>
-        /// The cross icon unicode character.
-        /// </summary>
-        Cross = 0xE04C,
-
-        /// <summary>
-        /// The triangle icon unicode character.
-        /// </summary>
-        Triangle = 0xE04D,
-
-        /// <summary>
-        /// The hexagon icon unicode character.
-        /// </summary>
-        Hexagon = 0xE042,
-
-        /// <summary>
-        /// The no-circle/prohobited icon unicode character.
-        /// </summary>
-        Prohibited = 0xE043,
-
-        /// <summary>
-        /// The dice icon unicode character.
-        /// </summary>
-        Dice = 0xE03E,
-
-        /// <summary>
-        /// The debuff icon unicode character.
-        /// </summary>
-        Debuff = 0xE05B,
-
-        /// <summary>
-        /// The buff icon unicode character.
-        /// </summary>
-        Buff = 0xE05C,
-
-        /// <summary>
-        /// The cross-world icon unicode character.
-        /// </summary>
-        CrossWorld = 0xE05D,
-
-        /// <summary>
-        /// The Eureka level icon unicode character.
-        /// </summary>
-        EurekaLevel = 0xE03A,
-
-        /// <summary>
-        /// The link marker icon unicode character.
-        /// </summary>
-        LinkMarker = 0xE0BB,
-
-        /// <summary>
-        /// The glamoured icon unicode character.
-        /// </summary>
-        Glamoured = 0xE03B,
-
-        /// <summary>
-        /// The glamoured and dyed icon unicode character.
-        /// </summary>
-        GlamouredDyed = 0xE04E,
-
-        /// <summary>
-        /// The synced quest icon unicode character.
-        /// </summary>
-        QuestSync = 0xE0BE,
-
-        /// <summary>
-        /// The repeatable quest icon unicode character.
-        /// </summary>
-        QuestRepeatable = 0xE0BF,
-
-        /// <summary>
-        /// The IME hiragana icon unicode character.
-        /// </summary>
-        ImeHiragana = 0xE020,
-
-        /// <summary>
-        /// The IME katakana icon unicode character.
-        /// </summary>
-        ImeKatakana = 0xE021,
-
-        /// <summary>
-        /// The IME alphanumeric icon unicode character.
-        /// </summary>
-        ImeAlphanumeric = 0xE022,
-
-        /// <summary>
-        /// The IME katakana half-width icon unicode character.
-        /// </summary>
-        ImeKatakanaHalfWidth = 0xE023,
-
-        /// <summary>
-        /// The IME alphanumeric half-width icon unicode character.
-        /// </summary>
-        ImeAlphanumericHalfWidth = 0xE024,
-
-        /// <summary>
-        /// The instance (1) icon unicode character.
-        /// </summary>
-        Instance1 = 0xE0B1,
-
-        /// <summary>
-        /// The instance (2) icon unicode character.
-        /// </summary>
-        Instance2 = 0xE0B2,
-
-        /// <summary>
-        /// The instance (3) icon unicode character.
-        /// </summary>
-        Instance3 = 0xE0B3,
-
-        /// <summary>
-        /// The instance (4) icon unicode character.
-        /// </summary>
-        Instance4 = 0xE0B4,
-
-        /// <summary>
-        /// The instance (5) icon unicode character.
-        /// </summary>
-        Instance5 = 0xE0B5,
-
-        /// <summary>
-        /// The instance (6) icon unicode character.
-        /// </summary>
-        Instance6 = 0xE0B6,
-
-        /// <summary>
-        /// The instance (7) icon unicode character.
-        /// </summary>
-        Instance7 = 0xE0B7,
-
-        /// <summary>
-        /// The instance (8) icon unicode character.
-        /// </summary>
-        Instance8 = 0xE0B8,
-
-        /// <summary>
-        /// The instance (9) icon unicode character.
-        /// </summary>
-        Instance9 = 0xE0B9,
-
-        /// <summary>
-        /// The instance merged icon unicode character.
-        /// </summary>
-        InstanceMerged = 0xE0BA,
-
-        /// <summary>
-        /// The English local time icon unicode character.
-        /// </summary>
-        LocalTimeEn = 0xE0D0,
-
-        /// <summary>
-        /// The English server time icon unicode character.
-        /// </summary>
-        ServerTimeEn = 0xE0D1,
-
-        /// <summary>
-        /// The English Eorzea time icon unicode character.
-        /// </summary>
-        EorzeaTimeEn = 0xE0D2,
-
-        /// <summary>
-        /// The German local time icon unicode character.
-        /// </summary>
-        LocalTimeDe = 0xE0D3,
-
-        /// <summary>
-        /// The German server time icon unicode character.
-        /// </summary>
-        ServerTimeDe = 0xE0D4,
-
-        /// <summary>
-        /// The German Eorzea time icon unicode character.
-        /// </summary>
-        EorzeaTimeDe = 0xE0D5,
-
-        /// <summary>
-        /// The French local time icon unicode character.
-        /// </summary>
-        LocalTimeFr = 0xE0D6,
-
-        /// <summary>
-        /// The French server time icon unicode character.
-        /// </summary>
-        ServerTimeFr = 0xE0D7,
-
-        /// <summary>
-        /// The French Eorzea time icon unicode character.
-        /// </summary>
-        EorzeaTimeFr = 0xE0D8,
-
-        /// <summary>
-        /// The Japanese local time icon unicode character.
-        /// </summary>
-        LocalTimeJa = 0xE0D9,
-
-        /// <summary>
-        /// The Japanese server time icon unicode character.
-        /// </summary>
-        ServerTimeJa = 0xE0DA,
-
-        /// <summary>
-        /// The Japanese Eorzea time icon unicode character.
-        /// </summary>
-        EorzeaTimeJa = 0xE0DB,
-    }
+    BotanistSprout = 0xE034,
+
+    /// <summary>
+    /// The item level icon unicode character.
+    /// </summary>
+    ItemLevel = 0xE033,
+
+    /// <summary>
+    /// The auto translate open icon unicode character.
+    /// </summary>
+    AutoTranslateOpen = 0xE040,
+
+    /// <summary>
+    /// The auto translate close icon unicode character.
+    /// </summary>
+    AutoTranslateClose = 0xE041,
+
+    /// <summary>
+    /// The high quality icon unicode character.
+    /// </summary>
+    HighQuality = 0xE03C,
+
+    /// <summary>
+    /// The collectible icon unicode character.
+    /// </summary>
+    Collectible = 0xE03D,
+
+    /// <summary>
+    /// The clock icon unicode character.
+    /// </summary>
+    Clock = 0xE031,
+
+    /// <summary>
+    /// The gil icon unicode character.
+    /// </summary>
+    Gil = 0xE049,
+
+    /// <summary>
+    /// The Hydaelyn icon unicode character.
+    /// </summary>
+    Hyadelyn = 0xE048,
+
+    /// <summary>
+    /// The no mouse click icon unicode character.
+    /// </summary>
+    MouseNoClick = 0xE050,
+
+    /// <summary>
+    /// The left mouse click icon unicode character.
+    /// </summary>
+    MouseLeftClick = 0xE051,
+
+    /// <summary>
+    /// The right mouse click icon unicode character.
+    /// </summary>
+    MouseRightClick = 0xE052,
+
+    /// <summary>
+    /// The left/right mouse click icon unicode character.
+    /// </summary>
+    MouseBothClick = 0xE053,
+
+    /// <summary>
+    /// The mouse wheel icon unicode character.
+    /// </summary>
+    MouseWheel = 0xE054,
+
+    /// <summary>
+    /// The mouse with a 1 icon unicode character.
+    /// </summary>
+    Mouse1 = 0xE055,
+
+    /// <summary>
+    /// The mouse with a 2 icon unicode character.
+    /// </summary>
+    Mouse2 = 0xE056,
+
+    /// <summary>
+    /// The mouse with a 3 icon unicode character.
+    /// </summary>
+    Mouse3 = 0xE057,
+
+    /// <summary>
+    /// The mouse with a 4 icon unicode character.
+    /// </summary>
+    Mouse4 = 0xE058,
+
+    /// <summary>
+    /// The mouse with a 5 icon unicode character.
+    /// </summary>
+    Mouse5 = 0xE059,
+
+    /// <summary>
+    /// The level English icon unicode character.
+    /// </summary>
+    LevelEn = 0xE06A,
+
+    /// <summary>
+    /// The level German icon unicode character.
+    /// </summary>
+    LevelDe = 0xE06B,
+
+    /// <summary>
+    /// The level French icon unicode character.
+    /// </summary>
+    LevelFr = 0xE06C,
+
+    /// <summary>
+    /// The experience icon unicode character.
+    /// </summary>
+    Experience = 0xE0BC,
+
+    /// <summary>
+    /// The experience filled icon unicode character.
+    /// </summary>
+    ExperienceFilled = 0xE0BD,
+
+    /// <summary>
+    /// The A.M. time icon unicode character.
+    /// </summary>
+    TimeAm = 0xE06D,
+
+    /// <summary>
+    /// The P.M. time icon unicode character.
+    /// </summary>
+    TimePm = 0xE06E,
+
+    /// <summary>
+    /// The right arrow icon unicode character.
+    /// </summary>
+    ArrowRight = 0xE06F,
+
+    /// <summary>
+    /// The down arrow  icon unicode character.
+    /// </summary>
+    ArrowDown = 0xE035,
+
+    /// <summary>
+    /// The number 0 icon unicode character.
+    /// </summary>
+    Number0 = 0xE060,
+
+    /// <summary>
+    /// The number 1 icon unicode character.
+    /// </summary>
+    Number1 = 0xE061,
+
+    /// <summary>
+    /// The number 2 icon unicode character.
+    /// </summary>
+    Number2 = 0xE062,
+
+    /// <summary>
+    /// The number 3 icon unicode character.
+    /// </summary>
+    Number3 = 0xE063,
+
+    /// <summary>
+    /// The number 4 icon unicode character.
+    /// </summary>
+    Number4 = 0xE064,
+
+    /// <summary>
+    /// The number 5 icon unicode character.
+    /// </summary>
+    Number5 = 0xE065,
+
+    /// <summary>
+    /// The number 6 icon unicode character.
+    /// </summary>
+    Number6 = 0xE066,
+
+    /// <summary>
+    /// The number 7 icon unicode character.
+    /// </summary>
+    Number7 = 0xE067,
+
+    /// <summary>
+    /// The number 8 icon unicode character.
+    /// </summary>
+    Number8 = 0xE068,
+
+    /// <summary>
+    /// The number 9 icon unicode character.
+    /// </summary>
+    Number9 = 0xE069,
+
+    /// <summary>
+    /// The boxed number 0 icon unicode character.
+    /// </summary>
+    BoxedNumber0 = 0xE08F,
+
+    /// <summary>
+    /// The boxed number 1 icon unicode character.
+    /// </summary>
+    BoxedNumber1 = 0xE090,
+
+    /// <summary>
+    /// The boxed number 2 icon unicode character.
+    /// </summary>
+    BoxedNumber2 = 0xE091,
+
+    /// <summary>
+    /// The boxed number 3 icon unicode character.
+    /// </summary>
+    BoxedNumber3 = 0xE092,
+
+    /// <summary>
+    /// The boxed number 4 icon unicode character.
+    /// </summary>
+    BoxedNumber4 = 0xE093,
+
+    /// <summary>
+    /// The boxed number 5 icon unicode character.
+    /// </summary>
+    BoxedNumber5 = 0xE094,
+
+    /// <summary>
+    /// The boxed number 6 icon unicode character.
+    /// </summary>
+    BoxedNumber6 = 0xE095,
+
+    /// <summary>
+    /// The boxed number 7 icon unicode character.
+    /// </summary>
+    BoxedNumber7 = 0xE096,
+
+    /// <summary>
+    /// The boxed number 8 icon unicode character.
+    /// </summary>
+    BoxedNumber8 = 0xE097,
+
+    /// <summary>
+    /// The boxed number 9 icon unicode character.
+    /// </summary>
+    BoxedNumber9 = 0xE098,
+
+    /// <summary>
+    /// The boxed number 10 icon unicode character.
+    /// </summary>
+    BoxedNumber10 = 0xE099,
+
+    /// <summary>
+    /// The boxed number 11 icon unicode character.
+    /// </summary>
+    BoxedNumber11 = 0xE09A,
+
+    /// <summary>
+    /// The boxed number 12 icon unicode character.
+    /// </summary>
+    BoxedNumber12 = 0xE09B,
+
+    /// <summary>
+    /// The boxed number 13 icon unicode character.
+    /// </summary>
+    BoxedNumber13 = 0xE09C,
+
+    /// <summary>
+    /// The boxed number 14 icon unicode character.
+    /// </summary>
+    BoxedNumber14 = 0xE09D,
+
+    /// <summary>
+    /// The boxed number 15 icon unicode character.
+    /// </summary>
+    BoxedNumber15 = 0xE09E,
+
+    /// <summary>
+    /// The boxed number 16 icon unicode character.
+    /// </summary>
+    BoxedNumber16 = 0xE09F,
+
+    /// <summary>
+    /// The boxed number 17 icon unicode character.
+    /// </summary>
+    BoxedNumber17 = 0xE0A0,
+
+    /// <summary>
+    /// The boxed number 18 icon unicode character.
+    /// </summary>
+    BoxedNumber18 = 0xE0A1,
+
+    /// <summary>
+    /// The boxed number 19 icon unicode character.
+    /// </summary>
+    BoxedNumber19 = 0xE0A2,
+
+    /// <summary>
+    /// The boxed number 20 icon unicode character.
+    /// </summary>
+    BoxedNumber20 = 0xE0A3,
+
+    /// <summary>
+    /// The boxed number 21 icon unicode character.
+    /// </summary>
+    BoxedNumber21 = 0xE0A4,
+
+    /// <summary>
+    /// The boxed number 22 icon unicode character.
+    /// </summary>
+    BoxedNumber22 = 0xE0A5,
+
+    /// <summary>
+    /// The boxed number 23 icon unicode character.
+    /// </summary>
+    BoxedNumber23 = 0xE0A6,
+
+    /// <summary>
+    /// The boxed number 24 icon unicode character.
+    /// </summary>
+    BoxedNumber24 = 0xE0A7,
+
+    /// <summary>
+    /// The boxed number 25 icon unicode character.
+    /// </summary>
+    BoxedNumber25 = 0xE0A8,
+
+    /// <summary>
+    /// The boxed number 26 icon unicode character.
+    /// </summary>
+    BoxedNumber26 = 0xE0A9,
+
+    /// <summary>
+    /// The boxed number 27 icon unicode character.
+    /// </summary>
+    BoxedNumber27 = 0xE0AA,
+
+    /// <summary>
+    /// The boxed number 28 icon unicode character.
+    /// </summary>
+    BoxedNumber28 = 0xE0AB,
+
+    /// <summary>
+    /// The boxed number 29 icon unicode character.
+    /// </summary>
+    BoxedNumber29 = 0xE0AC,
+
+    /// <summary>
+    /// The boxed number 30 icon unicode character.
+    /// </summary>
+    BoxedNumber30 = 0xE0AD,
+
+    /// <summary>
+    /// The boxed number 31 icon unicode character.
+    /// </summary>
+    BoxedNumber31 = 0xE0AE,
+
+    /// <summary>
+    /// The boxed plus icon unicode character.
+    /// </summary>
+    BoxedPlus = 0xE0AF,
+
+    /// <summary>
+    /// The bosed question mark icon unicode character.
+    /// </summary>
+    BoxedQuestionMark = 0xE070,
+
+    /// <summary>
+    /// The boxed star icon unicode character.
+    /// </summary>
+    BoxedStar = 0xE0C0,
+
+    /// <summary>
+    /// The boxed Roman numeral 1 (I) icon unicode character.
+    /// </summary>
+    BoxedRoman1 = 0xE0C1,
+
+    /// <summary>
+    /// The boxed Roman numeral 2 (II) icon unicode character.
+    /// </summary>
+    BoxedRoman2 = 0xE0C2,
+
+    /// <summary>
+    /// The boxed Roman numeral 3 (III) icon unicode character.
+    /// </summary>
+    BoxedRoman3 = 0xE0C3,
+
+    /// <summary>
+    /// The boxed Roman numeral 4 (IV) icon unicode character.
+    /// </summary>
+    BoxedRoman4 = 0xE0C4,
+
+    /// <summary>
+    /// The boxed Roman numeral 5 (V) icon unicode character.
+    /// </summary>
+    BoxedRoman5 = 0xE0C5,
+
+    /// <summary>
+    /// The boxed Roman numeral 6 (VI) icon unicode character.
+    /// </summary>
+    BoxedRoman6 = 0xE0C6,
+
+    /// <summary>
+    /// The boxed letter A icon unicode character.
+    /// </summary>
+    BoxedLetterA = 0xE071,
+
+    /// <summary>
+    /// The boxed letter B icon unicode character.
+    /// </summary>
+    BoxedLetterB = 0xE072,
+
+    /// <summary>
+    /// The boxed letter C icon unicode character.
+    /// </summary>
+    BoxedLetterC = 0xE073,
+
+    /// <summary>
+    /// The boxed letter D icon unicode character.
+    /// </summary>
+    BoxedLetterD = 0xE074,
+
+    /// <summary>
+    /// The boxed letter E icon unicode character.
+    /// </summary>
+    BoxedLetterE = 0xE075,
+
+    /// <summary>
+    /// The boxed letter F icon unicode character.
+    /// </summary>
+    BoxedLetterF = 0xE076,
+
+    /// <summary>
+    /// The boxed letter G icon unicode character.
+    /// </summary>
+    BoxedLetterG = 0xE077,
+
+    /// <summary>
+    /// The boxed letter H icon unicode character.
+    /// </summary>
+    BoxedLetterH = 0xE078,
+
+    /// <summary>
+    /// The boxed letter I icon unicode character.
+    /// </summary>
+    BoxedLetterI = 0xE079,
+
+    /// <summary>
+    /// The boxed letter J icon unicode character.
+    /// </summary>
+    BoxedLetterJ = 0xE07A,
+
+    /// <summary>
+    /// The boxed letter K icon unicode character.
+    /// </summary>
+    BoxedLetterK = 0xE07B,
+
+    /// <summary>
+    /// The boxed letter L icon unicode character.
+    /// </summary>
+    BoxedLetterL = 0xE07C,
+
+    /// <summary>
+    /// The boxed letter M icon unicode character.
+    /// </summary>
+    BoxedLetterM = 0xE07D,
+
+    /// <summary>
+    /// The boxed letter N icon unicode character.
+    /// </summary>
+    BoxedLetterN = 0xE07E,
+
+    /// <summary>
+    /// The boxed letter O icon unicode character.
+    /// </summary>
+    BoxedLetterO = 0xE07F,
+
+    /// <summary>
+    /// The boxed letter P icon unicode character.
+    /// </summary>
+    BoxedLetterP = 0xE080,
+
+    /// <summary>
+    /// The boxed letter Q icon unicode character.
+    /// </summary>
+    BoxedLetterQ = 0xE081,
+
+    /// <summary>
+    /// The boxed letter R icon unicode character.
+    /// </summary>
+    BoxedLetterR = 0xE082,
+
+    /// <summary>
+    /// The boxed letter S icon unicode character.
+    /// </summary>
+    BoxedLetterS = 0xE083,
+
+    /// <summary>
+    /// The boxed letter T icon unicode character.
+    /// </summary>
+    BoxedLetterT = 0xE084,
+
+    /// <summary>
+    /// The boxed letter U icon unicode character.
+    /// </summary>
+    BoxedLetterU = 0xE085,
+
+    /// <summary>
+    /// The boxed letter V icon unicode character.
+    /// </summary>
+    BoxedLetterV = 0xE086,
+
+    /// <summary>
+    /// The boxed letter W icon unicode character.
+    /// </summary>
+    BoxedLetterW = 0xE087,
+
+    /// <summary>
+    /// The boxed letter X icon unicode character.
+    /// </summary>
+    BoxedLetterX = 0xE088,
+
+    /// <summary>
+    /// The boxed letter Y icon unicode character.
+    /// </summary>
+    BoxedLetterY = 0xE089,
+
+    /// <summary>
+    /// The boxed letter Z icon unicode character.
+    /// </summary>
+    BoxedLetterZ = 0xE08A,
+
+    /// <summary>
+    /// The circle icon unicode character.
+    /// </summary>
+    Circle = 0xE04A,
+
+    /// <summary>
+    /// The square icon unicode character.
+    /// </summary>
+    Square = 0xE04B,
+
+    /// <summary>
+    /// The cross icon unicode character.
+    /// </summary>
+    Cross = 0xE04C,
+
+    /// <summary>
+    /// The triangle icon unicode character.
+    /// </summary>
+    Triangle = 0xE04D,
+
+    /// <summary>
+    /// The hexagon icon unicode character.
+    /// </summary>
+    Hexagon = 0xE042,
+
+    /// <summary>
+    /// The no-circle/prohobited icon unicode character.
+    /// </summary>
+    Prohibited = 0xE043,
+
+    /// <summary>
+    /// The dice icon unicode character.
+    /// </summary>
+    Dice = 0xE03E,
+
+    /// <summary>
+    /// The debuff icon unicode character.
+    /// </summary>
+    Debuff = 0xE05B,
+
+    /// <summary>
+    /// The buff icon unicode character.
+    /// </summary>
+    Buff = 0xE05C,
+
+    /// <summary>
+    /// The cross-world icon unicode character.
+    /// </summary>
+    CrossWorld = 0xE05D,
+
+    /// <summary>
+    /// The Eureka level icon unicode character.
+    /// </summary>
+    EurekaLevel = 0xE03A,
+
+    /// <summary>
+    /// The link marker icon unicode character.
+    /// </summary>
+    LinkMarker = 0xE0BB,
+
+    /// <summary>
+    /// The glamoured icon unicode character.
+    /// </summary>
+    Glamoured = 0xE03B,
+
+    /// <summary>
+    /// The glamoured and dyed icon unicode character.
+    /// </summary>
+    GlamouredDyed = 0xE04E,
+
+    /// <summary>
+    /// The synced quest icon unicode character.
+    /// </summary>
+    QuestSync = 0xE0BE,
+
+    /// <summary>
+    /// The repeatable quest icon unicode character.
+    /// </summary>
+    QuestRepeatable = 0xE0BF,
+
+    /// <summary>
+    /// The IME hiragana icon unicode character.
+    /// </summary>
+    ImeHiragana = 0xE020,
+
+    /// <summary>
+    /// The IME katakana icon unicode character.
+    /// </summary>
+    ImeKatakana = 0xE021,
+
+    /// <summary>
+    /// The IME alphanumeric icon unicode character.
+    /// </summary>
+    ImeAlphanumeric = 0xE022,
+
+    /// <summary>
+    /// The IME katakana half-width icon unicode character.
+    /// </summary>
+    ImeKatakanaHalfWidth = 0xE023,
+
+    /// <summary>
+    /// The IME alphanumeric half-width icon unicode character.
+    /// </summary>
+    ImeAlphanumericHalfWidth = 0xE024,
+
+    /// <summary>
+    /// The instance (1) icon unicode character.
+    /// </summary>
+    Instance1 = 0xE0B1,
+
+    /// <summary>
+    /// The instance (2) icon unicode character.
+    /// </summary>
+    Instance2 = 0xE0B2,
+
+    /// <summary>
+    /// The instance (3) icon unicode character.
+    /// </summary>
+    Instance3 = 0xE0B3,
+
+    /// <summary>
+    /// The instance (4) icon unicode character.
+    /// </summary>
+    Instance4 = 0xE0B4,
+
+    /// <summary>
+    /// The instance (5) icon unicode character.
+    /// </summary>
+    Instance5 = 0xE0B5,
+
+    /// <summary>
+    /// The instance (6) icon unicode character.
+    /// </summary>
+    Instance6 = 0xE0B6,
+
+    /// <summary>
+    /// The instance (7) icon unicode character.
+    /// </summary>
+    Instance7 = 0xE0B7,
+
+    /// <summary>
+    /// The instance (8) icon unicode character.
+    /// </summary>
+    Instance8 = 0xE0B8,
+
+    /// <summary>
+    /// The instance (9) icon unicode character.
+    /// </summary>
+    Instance9 = 0xE0B9,
+
+    /// <summary>
+    /// The instance merged icon unicode character.
+    /// </summary>
+    InstanceMerged = 0xE0BA,
+
+    /// <summary>
+    /// The English local time icon unicode character.
+    /// </summary>
+    LocalTimeEn = 0xE0D0,
+
+    /// <summary>
+    /// The English server time icon unicode character.
+    /// </summary>
+    ServerTimeEn = 0xE0D1,
+
+    /// <summary>
+    /// The English Eorzea time icon unicode character.
+    /// </summary>
+    EorzeaTimeEn = 0xE0D2,
+
+    /// <summary>
+    /// The German local time icon unicode character.
+    /// </summary>
+    LocalTimeDe = 0xE0D3,
+
+    /// <summary>
+    /// The German server time icon unicode character.
+    /// </summary>
+    ServerTimeDe = 0xE0D4,
+
+    /// <summary>
+    /// The German Eorzea time icon unicode character.
+    /// </summary>
+    EorzeaTimeDe = 0xE0D5,
+
+    /// <summary>
+    /// The French local time icon unicode character.
+    /// </summary>
+    LocalTimeFr = 0xE0D6,
+
+    /// <summary>
+    /// The French server time icon unicode character.
+    /// </summary>
+    ServerTimeFr = 0xE0D7,
+
+    /// <summary>
+    /// The French Eorzea time icon unicode character.
+    /// </summary>
+    EorzeaTimeFr = 0xE0D8,
+
+    /// <summary>
+    /// The Japanese local time icon unicode character.
+    /// </summary>
+    LocalTimeJa = 0xE0D9,
+
+    /// <summary>
+    /// The Japanese server time icon unicode character.
+    /// </summary>
+    ServerTimeJa = 0xE0DA,
+
+    /// <summary>
+    /// The Japanese Eorzea time icon unicode character.
+    /// </summary>
+    EorzeaTimeJa = 0xE0DB,
 }
diff --git a/Dalamud/Game/Text/SeIconCharExtensions.cs b/Dalamud/Game/Text/SeIconCharExtensions.cs
index 648b332c2..717b5e842 100644
--- a/Dalamud/Game/Text/SeIconCharExtensions.cs
+++ b/Dalamud/Game/Text/SeIconCharExtensions.cs
@@ -1,28 +1,27 @@
-namespace Dalamud.Game.Text
+namespace Dalamud.Game.Text;
+
+/// <summary>
+/// Extension methods for <see cref="SeIconChar"/>.
+/// </summary>
+public static class SeIconCharExtensions
 {
     /// <summary>
-    /// Extension methods for <see cref="SeIconChar"/>.
+    /// Convert the SeIconChar to a <see cref="char"/> type.
     /// </summary>
-    public static class SeIconCharExtensions
+    /// <param name="icon">The icon to convert.</param>
+    /// <returns>The converted icon.</returns>
+    public static char ToIconChar(this SeIconChar icon)
     {
-        /// <summary>
-        /// Convert the SeIconChar to a <see cref="char"/> type.
-        /// </summary>
-        /// <param name="icon">The icon to convert.</param>
-        /// <returns>The converted icon.</returns>
-        public static char ToIconChar(this SeIconChar icon)
-        {
-            return (char)icon;
-        }
+        return (char)icon;
+    }
 
-        /// <summary>
-        /// Conver the SeIconChar to a <see cref="string"/> type.
-        /// </summary>
-        /// <param name="icon">The icon to convert.</param>
-        /// <returns>The converted icon.</returns>
-        public static string ToIconString(this SeIconChar icon)
-        {
-            return string.Empty + (char)icon;
-        }
+    /// <summary>
+    /// Conver the SeIconChar to a <see cref="string"/> type.
+    /// </summary>
+    /// <param name="icon">The icon to convert.</param>
+    /// <returns>The converted icon.</returns>
+    public static string ToIconString(this SeIconChar icon)
+    {
+        return string.Empty + (char)icon;
     }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/BitmapFontIcon.cs b/Dalamud/Game/Text/SeStringHandling/BitmapFontIcon.cs
index 3209d1496..64af2a2a9 100644
--- a/Dalamud/Game/Text/SeStringHandling/BitmapFontIcon.cs
+++ b/Dalamud/Game/Text/SeStringHandling/BitmapFontIcon.cs
@@ -1,463 +1,462 @@
-namespace Dalamud.Game.Text.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling;
+
+/// <summary>
+/// This class represents special icons that can appear in chat naturally or as IconPayloads.
+/// </summary>
+public enum BitmapFontIcon : uint
 {
     /// <summary>
-    /// This class represents special icons that can appear in chat naturally or as IconPayloads.
+    /// No icon.
     /// </summary>
-    public enum BitmapFontIcon : uint
-    {
-        /// <summary>
-        /// No icon.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// The controller D-pad up icon.
-        /// </summary>
-        ControllerDPadUp = 1,
-
-        /// <summary>
-        /// The controller D-pad down icon.
-        /// </summary>
-        ControllerDPadDown = 2,
-
-        /// <summary>
-        /// The controller D-pad left icon.
-        /// </summary>
-        ControllerDPadLeft = 3,
-
-        /// <summary>
-        /// The controller D-pad right icon.
-        /// </summary>
-        ControllerDPadRight = 4,
-
-        /// <summary>
-        /// The controller D-pad up/down icon.
-        /// </summary>
-        ControllerDPadUpDown = 5,
-
-        /// <summary>
-        /// The controller D-pad left/right icon.
-        /// </summary>
-        ControllerDPadLeftRight = 6,
-
-        /// <summary>
-        /// The controller D-pad all directions icon.
-        /// </summary>
-        ControllerDPadAll = 7,
-
-        /// <summary>
-        /// The controller button 0 icon (Xbox: B, PlayStation: Circle).
-        /// </summary>
-        ControllerButton0 = 8,
-
-        /// <summary>
-        /// The controller button 1 icon (XBox: A, PlayStation: Cross).
-        /// </summary>
-        ControllerButton1 = 9,
-
-        /// <summary>
-        /// The controller button 2 icon (XBox: X, PlayStation: Square).
-        /// </summary>
-        ControllerButton2 = 10,
-
-        /// <summary>
-        /// The controller button 3 icon (BBox: Y, PlayStation: Triangle).
-        /// </summary>
-        ControllerButton3 = 11,
-
-        /// <summary>
-        /// The controller left shoulder button icon.
-        /// </summary>
-        ControllerShoulderLeft = 12,
-
-        /// <summary>
-        /// The controller right shoulder button icon.
-        /// </summary>
-        ControllerShoulderRight = 13,
-
-        /// <summary>
-        /// The controller left trigger button icon.
-        /// </summary>
-        ControllerTriggerLeft = 14,
-
-        /// <summary>
-        /// The controller right trigger button icon.
-        /// </summary>
-        ControllerTriggerRight = 15,
-
-        /// <summary>
-        /// The controller left analog stick in icon.
-        /// </summary>
-        ControllerAnalogLeftStickIn = 16,
-
-        /// <summary>
-        /// The controller right analog stick in icon.
-        /// </summary>
-        ControllerAnalogRightStickIn = 17,
-
-        /// <summary>
-        /// The controller start button icon.
-        /// </summary>
-        ControllerStart = 18,
-
-        /// <summary>
-        /// The controller back button icon.
-        /// </summary>
-        ControllerBack = 19,
-
-        /// <summary>
-        /// The controller left analog stick icon.
-        /// </summary>
-        ControllerAnalogLeftStick = 20,
-
-        /// <summary>
-        /// The controller left analog stick up/down icon.
-        /// </summary>
-        ControllerAnalogLeftStickUpDown = 21,
-
-        /// <summary>
-        /// The controller left analog stick left/right icon.
-        /// </summary>
-        ControllerAnalogLeftStickLeftRight = 22,
-
-        /// <summary>
-        /// The controller right analog stick icon.
-        /// </summary>
-        ControllerAnalogRightStick = 23,
-
-        /// <summary>
-        /// The controller right analog stick up/down icon.
-        /// </summary>
-        ControllerAnalogRightStickUpDown = 24,
-
-        /// <summary>
-        /// The controller right analog stick left/right icon.
-        /// </summary>
-        ControllerAnalogRightStickLeftRight = 25,
-
-        /// <summary>
-        /// The La Noscea region icon.
-        /// </summary>
-        LaNoscea = 51,
-
-        /// <summary>
-        /// The Black Shroud region icon.
-        /// </summary>
-        BlackShroud = 52,
-
-        /// <summary>
-        /// The Thanalan region icon.
-        /// </summary>
-        Thanalan = 53,
-
-        /// <summary>
-        /// The auto translate begin icon.
-        /// </summary>
-        AutoTranslateBegin = 54,
-
-        /// <summary>
-        /// The auto translate end icon.
-        /// </summary>
-        AutoTranslateEnd = 55,
-
-        /// <summary>
-        /// The fire element icon.
-        /// </summary>
-        ElementFire = 56,
-
-        /// <summary>
-        /// The ice element icon.
-        /// </summary>
-        ElementIce = 57,
-
-        /// <summary>
-        /// The wind element icon.
-        /// </summary>
-        ElementWind = 58,
-
-        /// <summary>
-        /// The earth element icon.
-        /// </summary>
-        ElementEarth = 59,
-
-        /// <summary>
-        /// The lightning element icon.
-        /// </summary>
-        ElementLightning = 60,
-
-        /// <summary>
-        /// The water element icon.
-        /// </summary>
-        ElementWater = 61,
-
-        /// <summary>
-        /// The level sync icon.
-        /// </summary>
-        LevelSync = 62,
-
-        /// <summary>
-        /// The warning icon.
-        /// </summary>
-        Warning = 63,
-
-        /// <summary>
-        /// The Ishgard region icon.
-        /// </summary>
-        Ishgard = 64,
-
-        /// <summary>
-        /// The Aetheryte icon.
-        /// </summary>
-        Aetheryte = 65,
-
-        /// <summary>
-        /// The Aethernet icon.
-        /// </summary>
-        Aethernet = 66,
-
-        /// <summary>
-        /// The gold star icon.
-        /// </summary>
-        GoldStar = 67,
-
-        /// <summary>
-        /// The silver star icon.
-        /// </summary>
-        SilverStar = 68,
-
-        /// <summary>
-        /// The green dot icon.
-        /// </summary>
-        GreenDot = 70,
-
-        /// <summary>
-        /// The unsheathed sword icon.
-        /// </summary>
-        SwordUnsheathed = 71,
-
-        /// <summary>
-        /// The sheathed sword icon.
-        /// </summary>
-        SwordSheathed = 72,
-
-        /// <summary>
-        /// The dice icon.
-        /// </summary>
-        Dice = 73,
-
-        /// <summary>
-        /// The flyable zone icon.
-        /// </summary>
-        FlyZone = 74,
-
-        /// <summary>
-        /// The no-flying zone icon.
-        /// </summary>
-        FlyZoneLocked = 75,
-
-        /// <summary>
-        /// The no-circle/prohibited icon.
-        /// </summary>
-        NoCircle = 76,
-
-        /// <summary>
-        /// The sprout icon.
-        /// </summary>
-        NewAdventurer = 77,
-
-        /// <summary>
-        /// The mentor icon.
-        /// </summary>
-        Mentor = 78,
-
-        /// <summary>
-        /// The PvE mentor icon.
-        /// </summary>
-        MentorPvE = 79,
-
-        /// <summary>
-        /// The crafting mentor icon.
-        /// </summary>
-        MentorCrafting = 80,
-
-        /// <summary>
-        /// The PvP mentor icon.
-        /// </summary>
-        MentorPvP = 81,
-
-        /// <summary>
-        /// The tank role icon.
-        /// </summary>
-        Tank = 82,
-
-        /// <summary>
-        /// The healer role icon.
-        /// </summary>
-        Healer = 83,
-
-        /// <summary>
-        /// The DPS role icon.
-        /// </summary>
-        DPS = 84,
-
-        /// <summary>
-        /// The crafter role icon.
-        /// </summary>
-        Crafter = 85,
-
-        /// <summary>
-        /// The gatherer role icon.
-        /// </summary>
-        Gatherer = 86,
-
-        /// <summary>
-        /// The "any" role icon.
-        /// </summary>
-        AnyClass = 87,
-
-        /// <summary>
-        /// The cross-world icon.
-        /// </summary>
-        CrossWorld = 88,
-
-        /// <summary>
-        /// The slay type Fate icon.
-        /// </summary>
-        FateSlay = 89,
-
-        /// <summary>
-        /// The boss type Fate icon.
-        /// </summary>
-        FateBoss = 90,
-
-        /// <summary>
-        /// The gather type Fate icon.
-        /// </summary>
-        FateGather = 91,
-
-        /// <summary>
-        /// The defend type Fate icon.
-        /// </summary>
-        FateDefend = 92,
-
-        /// <summary>
-        /// The escort type Fate icon.
-        /// </summary>
-        FateEscort = 93,
-
-        /// <summary>
-        /// The special type 1 Fate icon.
-        /// </summary>
-        FateSpecial1 = 94,
-
-        /// <summary>
-        /// The returner icon.
-        /// </summary>
-        Returner = 95,
-
-        /// <summary>
-        /// The Far-East region icon.
-        /// </summary>
-        FarEast = 96,
-
-        /// <summary>
-        /// The Gyr Albania region icon.
-        /// </summary>
-        GyrAbania = 97,
-
-        /// <summary>
-        /// The special type 2 Fate icon.
-        /// </summary>
-        FateSpecial2 = 98,
-
-        /// <summary>
-        /// The priority world icon.
-        /// </summary>
-        PriorityWorld = 99,
-
-        /// <summary>
-        /// The elemental level icon.
-        /// </summary>
-        ElementalLevel = 100,
-
-        /// <summary>
-        /// The exclamation rectangle icon.
-        /// </summary>
-        ExclamationRectangle = 101,
-
-        /// <summary>
-        /// The notorious monster icon.
-        /// </summary>
-        NotoriousMonster = 102,
-
-        /// <summary>
-        /// The recording icon.
-        /// </summary>
-        Recording = 103,
-
-        /// <summary>
-        /// The alarm icon.
-        /// </summary>
-        Alarm = 104,
-
-        /// <summary>
-        /// The arrow up icon.
-        /// </summary>
-        ArrowUp = 105,
-
-        /// <summary>
-        /// The arrow down icon.
-        /// </summary>
-        ArrowDown = 106,
-
-        /// <summary>
-        /// The Crystarium region icon.
-        /// </summary>
-        Crystarium = 107,
-
-        /// <summary>
-        /// The mentor problem icon.
-        /// </summary>
-        MentorProblem = 108,
-
-        /// <summary>
-        /// The unknown gold type Fate icon.
-        /// </summary>
-        FateUnknownGold = 109,
-
-        /// <summary>
-        /// The orange diamond icon.
-        /// </summary>
-        OrangeDiamond = 110,
-
-        /// <summary>
-        /// The crafting type Fate icon.
-        /// </summary>
-        FateCrafting = 111,
-
-        /// <summary>
-        /// The Fan Festival logo.
-        /// </summary>
-        FanFestival = 112,
-
-        /// <summary>
-        /// The Sharlayan region icon.
-        /// </summary>
-        Sharlayan = 113,
-
-        /// <summary>
-        /// The Ilsabard region icon.
-        /// </summary>
-        Ilsabard = 114,
-
-        /// <summary>
-        /// The Garlemald region icon.
-        /// </summary>
-        Garlemald = 115,
-
-        /// <summary>
-        /// The Island Sanctuary icon.
-        /// </summary>
-        IslandSanctuary = 116,
-    }
+    None = 0,
+
+    /// <summary>
+    /// The controller D-pad up icon.
+    /// </summary>
+    ControllerDPadUp = 1,
+
+    /// <summary>
+    /// The controller D-pad down icon.
+    /// </summary>
+    ControllerDPadDown = 2,
+
+    /// <summary>
+    /// The controller D-pad left icon.
+    /// </summary>
+    ControllerDPadLeft = 3,
+
+    /// <summary>
+    /// The controller D-pad right icon.
+    /// </summary>
+    ControllerDPadRight = 4,
+
+    /// <summary>
+    /// The controller D-pad up/down icon.
+    /// </summary>
+    ControllerDPadUpDown = 5,
+
+    /// <summary>
+    /// The controller D-pad left/right icon.
+    /// </summary>
+    ControllerDPadLeftRight = 6,
+
+    /// <summary>
+    /// The controller D-pad all directions icon.
+    /// </summary>
+    ControllerDPadAll = 7,
+
+    /// <summary>
+    /// The controller button 0 icon (Xbox: B, PlayStation: Circle).
+    /// </summary>
+    ControllerButton0 = 8,
+
+    /// <summary>
+    /// The controller button 1 icon (XBox: A, PlayStation: Cross).
+    /// </summary>
+    ControllerButton1 = 9,
+
+    /// <summary>
+    /// The controller button 2 icon (XBox: X, PlayStation: Square).
+    /// </summary>
+    ControllerButton2 = 10,
+
+    /// <summary>
+    /// The controller button 3 icon (BBox: Y, PlayStation: Triangle).
+    /// </summary>
+    ControllerButton3 = 11,
+
+    /// <summary>
+    /// The controller left shoulder button icon.
+    /// </summary>
+    ControllerShoulderLeft = 12,
+
+    /// <summary>
+    /// The controller right shoulder button icon.
+    /// </summary>
+    ControllerShoulderRight = 13,
+
+    /// <summary>
+    /// The controller left trigger button icon.
+    /// </summary>
+    ControllerTriggerLeft = 14,
+
+    /// <summary>
+    /// The controller right trigger button icon.
+    /// </summary>
+    ControllerTriggerRight = 15,
+
+    /// <summary>
+    /// The controller left analog stick in icon.
+    /// </summary>
+    ControllerAnalogLeftStickIn = 16,
+
+    /// <summary>
+    /// The controller right analog stick in icon.
+    /// </summary>
+    ControllerAnalogRightStickIn = 17,
+
+    /// <summary>
+    /// The controller start button icon.
+    /// </summary>
+    ControllerStart = 18,
+
+    /// <summary>
+    /// The controller back button icon.
+    /// </summary>
+    ControllerBack = 19,
+
+    /// <summary>
+    /// The controller left analog stick icon.
+    /// </summary>
+    ControllerAnalogLeftStick = 20,
+
+    /// <summary>
+    /// The controller left analog stick up/down icon.
+    /// </summary>
+    ControllerAnalogLeftStickUpDown = 21,
+
+    /// <summary>
+    /// The controller left analog stick left/right icon.
+    /// </summary>
+    ControllerAnalogLeftStickLeftRight = 22,
+
+    /// <summary>
+    /// The controller right analog stick icon.
+    /// </summary>
+    ControllerAnalogRightStick = 23,
+
+    /// <summary>
+    /// The controller right analog stick up/down icon.
+    /// </summary>
+    ControllerAnalogRightStickUpDown = 24,
+
+    /// <summary>
+    /// The controller right analog stick left/right icon.
+    /// </summary>
+    ControllerAnalogRightStickLeftRight = 25,
+
+    /// <summary>
+    /// The La Noscea region icon.
+    /// </summary>
+    LaNoscea = 51,
+
+    /// <summary>
+    /// The Black Shroud region icon.
+    /// </summary>
+    BlackShroud = 52,
+
+    /// <summary>
+    /// The Thanalan region icon.
+    /// </summary>
+    Thanalan = 53,
+
+    /// <summary>
+    /// The auto translate begin icon.
+    /// </summary>
+    AutoTranslateBegin = 54,
+
+    /// <summary>
+    /// The auto translate end icon.
+    /// </summary>
+    AutoTranslateEnd = 55,
+
+    /// <summary>
+    /// The fire element icon.
+    /// </summary>
+    ElementFire = 56,
+
+    /// <summary>
+    /// The ice element icon.
+    /// </summary>
+    ElementIce = 57,
+
+    /// <summary>
+    /// The wind element icon.
+    /// </summary>
+    ElementWind = 58,
+
+    /// <summary>
+    /// The earth element icon.
+    /// </summary>
+    ElementEarth = 59,
+
+    /// <summary>
+    /// The lightning element icon.
+    /// </summary>
+    ElementLightning = 60,
+
+    /// <summary>
+    /// The water element icon.
+    /// </summary>
+    ElementWater = 61,
+
+    /// <summary>
+    /// The level sync icon.
+    /// </summary>
+    LevelSync = 62,
+
+    /// <summary>
+    /// The warning icon.
+    /// </summary>
+    Warning = 63,
+
+    /// <summary>
+    /// The Ishgard region icon.
+    /// </summary>
+    Ishgard = 64,
+
+    /// <summary>
+    /// The Aetheryte icon.
+    /// </summary>
+    Aetheryte = 65,
+
+    /// <summary>
+    /// The Aethernet icon.
+    /// </summary>
+    Aethernet = 66,
+
+    /// <summary>
+    /// The gold star icon.
+    /// </summary>
+    GoldStar = 67,
+
+    /// <summary>
+    /// The silver star icon.
+    /// </summary>
+    SilverStar = 68,
+
+    /// <summary>
+    /// The green dot icon.
+    /// </summary>
+    GreenDot = 70,
+
+    /// <summary>
+    /// The unsheathed sword icon.
+    /// </summary>
+    SwordUnsheathed = 71,
+
+    /// <summary>
+    /// The sheathed sword icon.
+    /// </summary>
+    SwordSheathed = 72,
+
+    /// <summary>
+    /// The dice icon.
+    /// </summary>
+    Dice = 73,
+
+    /// <summary>
+    /// The flyable zone icon.
+    /// </summary>
+    FlyZone = 74,
+
+    /// <summary>
+    /// The no-flying zone icon.
+    /// </summary>
+    FlyZoneLocked = 75,
+
+    /// <summary>
+    /// The no-circle/prohibited icon.
+    /// </summary>
+    NoCircle = 76,
+
+    /// <summary>
+    /// The sprout icon.
+    /// </summary>
+    NewAdventurer = 77,
+
+    /// <summary>
+    /// The mentor icon.
+    /// </summary>
+    Mentor = 78,
+
+    /// <summary>
+    /// The PvE mentor icon.
+    /// </summary>
+    MentorPvE = 79,
+
+    /// <summary>
+    /// The crafting mentor icon.
+    /// </summary>
+    MentorCrafting = 80,
+
+    /// <summary>
+    /// The PvP mentor icon.
+    /// </summary>
+    MentorPvP = 81,
+
+    /// <summary>
+    /// The tank role icon.
+    /// </summary>
+    Tank = 82,
+
+    /// <summary>
+    /// The healer role icon.
+    /// </summary>
+    Healer = 83,
+
+    /// <summary>
+    /// The DPS role icon.
+    /// </summary>
+    DPS = 84,
+
+    /// <summary>
+    /// The crafter role icon.
+    /// </summary>
+    Crafter = 85,
+
+    /// <summary>
+    /// The gatherer role icon.
+    /// </summary>
+    Gatherer = 86,
+
+    /// <summary>
+    /// The "any" role icon.
+    /// </summary>
+    AnyClass = 87,
+
+    /// <summary>
+    /// The cross-world icon.
+    /// </summary>
+    CrossWorld = 88,
+
+    /// <summary>
+    /// The slay type Fate icon.
+    /// </summary>
+    FateSlay = 89,
+
+    /// <summary>
+    /// The boss type Fate icon.
+    /// </summary>
+    FateBoss = 90,
+
+    /// <summary>
+    /// The gather type Fate icon.
+    /// </summary>
+    FateGather = 91,
+
+    /// <summary>
+    /// The defend type Fate icon.
+    /// </summary>
+    FateDefend = 92,
+
+    /// <summary>
+    /// The escort type Fate icon.
+    /// </summary>
+    FateEscort = 93,
+
+    /// <summary>
+    /// The special type 1 Fate icon.
+    /// </summary>
+    FateSpecial1 = 94,
+
+    /// <summary>
+    /// The returner icon.
+    /// </summary>
+    Returner = 95,
+
+    /// <summary>
+    /// The Far-East region icon.
+    /// </summary>
+    FarEast = 96,
+
+    /// <summary>
+    /// The Gyr Albania region icon.
+    /// </summary>
+    GyrAbania = 97,
+
+    /// <summary>
+    /// The special type 2 Fate icon.
+    /// </summary>
+    FateSpecial2 = 98,
+
+    /// <summary>
+    /// The priority world icon.
+    /// </summary>
+    PriorityWorld = 99,
+
+    /// <summary>
+    /// The elemental level icon.
+    /// </summary>
+    ElementalLevel = 100,
+
+    /// <summary>
+    /// The exclamation rectangle icon.
+    /// </summary>
+    ExclamationRectangle = 101,
+
+    /// <summary>
+    /// The notorious monster icon.
+    /// </summary>
+    NotoriousMonster = 102,
+
+    /// <summary>
+    /// The recording icon.
+    /// </summary>
+    Recording = 103,
+
+    /// <summary>
+    /// The alarm icon.
+    /// </summary>
+    Alarm = 104,
+
+    /// <summary>
+    /// The arrow up icon.
+    /// </summary>
+    ArrowUp = 105,
+
+    /// <summary>
+    /// The arrow down icon.
+    /// </summary>
+    ArrowDown = 106,
+
+    /// <summary>
+    /// The Crystarium region icon.
+    /// </summary>
+    Crystarium = 107,
+
+    /// <summary>
+    /// The mentor problem icon.
+    /// </summary>
+    MentorProblem = 108,
+
+    /// <summary>
+    /// The unknown gold type Fate icon.
+    /// </summary>
+    FateUnknownGold = 109,
+
+    /// <summary>
+    /// The orange diamond icon.
+    /// </summary>
+    OrangeDiamond = 110,
+
+    /// <summary>
+    /// The crafting type Fate icon.
+    /// </summary>
+    FateCrafting = 111,
+
+    /// <summary>
+    /// The Fan Festival logo.
+    /// </summary>
+    FanFestival = 112,
+
+    /// <summary>
+    /// The Sharlayan region icon.
+    /// </summary>
+    Sharlayan = 113,
+
+    /// <summary>
+    /// The Ilsabard region icon.
+    /// </summary>
+    Ilsabard = 114,
+
+    /// <summary>
+    /// The Garlemald region icon.
+    /// </summary>
+    Garlemald = 115,
+
+    /// <summary>
+    /// The Island Sanctuary icon.
+    /// </summary>
+    IslandSanctuary = 116,
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/ITextProvider.cs b/Dalamud/Game/Text/SeStringHandling/ITextProvider.cs
index 5bcb2deb0..7be809ba2 100644
--- a/Dalamud/Game/Text/SeStringHandling/ITextProvider.cs
+++ b/Dalamud/Game/Text/SeStringHandling/ITextProvider.cs
@@ -1,13 +1,12 @@
-namespace Dalamud.Game.Text.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling;
+
+/// <summary>
+/// An interface binding for a payload that can provide readable Text.
+/// </summary>
+public interface ITextProvider
 {
     /// <summary>
-    /// An interface binding for a payload that can provide readable Text.
+    /// Gets the readable text.
     /// </summary>
-    public interface ITextProvider
-    {
-        /// <summary>
-        /// Gets the readable text.
-        /// </summary>
-        string Text { get; }
-    }
+    string Text { get; }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payload.cs b/Dalamud/Game/Text/SeStringHandling/Payload.cs
index 9f8b4e9ff..dc4b7cba0 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payload.cs
@@ -16,406 +16,405 @@ using Serilog;
 //   - [SeString] some way to add surrounding formatting information as flags/data to text (or other?) payloads?
 //     eg, if a text payload is surrounded by italics payloads, strip them out and mark the text payload as italicized
 
-namespace Dalamud.Game.Text.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling;
+
+/// <summary>
+/// This class represents a parsed SeString payload.
+/// </summary>
+public abstract partial class Payload
 {
+    // private for now, since subclasses shouldn't interact with this.
+    // To force-invalidate it, Dirty can be set to true
+    private byte[] encodedData;
+
     /// <summary>
-    /// This class represents a parsed SeString payload.
+    /// Gets the Lumina instance to use for any necessary data lookups.
     /// </summary>
-    public abstract partial class Payload
+    [JsonIgnore]
+    public DataManager DataResolver => Service<DataManager>.Get();
+
+    /// <summary>
+    /// Gets the type of this payload.
+    /// </summary>
+    public abstract PayloadType Type { get; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether whether this payload has been modified since the last Encode().
+    /// </summary>
+    public bool Dirty { get; protected set; } = true;
+
+    /// <summary>
+    /// Decodes a binary representation of a payload into its corresponding nice object payload.
+    /// </summary>
+    /// <param name="reader">A reader positioned at the start of the payload, and containing at least one entire payload.</param>
+    /// <returns>The constructed Payload-derived object that was decoded from the binary data.</returns>
+    public static Payload Decode(BinaryReader reader)
     {
-        // private for now, since subclasses shouldn't interact with this.
-        // To force-invalidate it, Dirty can be set to true
-        private byte[] encodedData;
+        var payloadStartPos = reader.BaseStream.Position;
 
-        /// <summary>
-        /// Gets the Lumina instance to use for any necessary data lookups.
-        /// </summary>
-        [JsonIgnore]
-        public DataManager DataResolver => Service<DataManager>.Get();
+        Payload payload;
 
-        /// <summary>
-        /// Gets the type of this payload.
-        /// </summary>
-        public abstract PayloadType Type { get; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether whether this payload has been modified since the last Encode().
-        /// </summary>
-        public bool Dirty { get; protected set; } = true;
-
-        /// <summary>
-        /// Decodes a binary representation of a payload into its corresponding nice object payload.
-        /// </summary>
-        /// <param name="reader">A reader positioned at the start of the payload, and containing at least one entire payload.</param>
-        /// <returns>The constructed Payload-derived object that was decoded from the binary data.</returns>
-        public static Payload Decode(BinaryReader reader)
+        var initialByte = reader.ReadByte();
+        reader.BaseStream.Position--;
+        if (initialByte != START_BYTE)
         {
-            var payloadStartPos = reader.BaseStream.Position;
-
-            Payload payload;
-
-            var initialByte = reader.ReadByte();
-            reader.BaseStream.Position--;
-            if (initialByte != START_BYTE)
-            {
-                payload = DecodeText(reader);
-            }
-            else
-            {
-                payload = DecodeChunk(reader);
-            }
-
-            // for now, cache off the actual binary data for this payload, so we don't have to
-            // regenerate it if the payload isn't modified
-            // TODO: probably better ways to handle this
-            var payloadEndPos = reader.BaseStream.Position;
-
-            reader.BaseStream.Position = payloadStartPos;
-            payload.encodedData = reader.ReadBytes((int)(payloadEndPos - payloadStartPos));
-            payload.Dirty = false;
-
-            // Log.Verbose($"got payload bytes {BitConverter.ToString(payload.encodedData).Replace("-", " ")}");
-
-            reader.BaseStream.Position = payloadEndPos;
-
-            return payload;
+            payload = DecodeText(reader);
+        }
+        else
+        {
+            payload = DecodeChunk(reader);
         }
 
-        /// <summary>
-        /// Encode this payload object into a byte[] useable in-game for things like the chat log.
-        /// </summary>
-        /// <param name="force">If true, ignores any cached value and forcibly reencodes the payload from its internal representation.</param>
-        /// <returns>A byte[] suitable for use with in-game handlers such as the chat log.</returns>
-        public byte[] Encode(bool force = false)
-        {
-            if (this.Dirty || force)
-            {
-                this.encodedData = this.EncodeImpl();
-                this.Dirty = false;
-            }
+        // for now, cache off the actual binary data for this payload, so we don't have to
+        // regenerate it if the payload isn't modified
+        // TODO: probably better ways to handle this
+        var payloadEndPos = reader.BaseStream.Position;
 
-            return this.encodedData;
-        }
+        reader.BaseStream.Position = payloadStartPos;
+        payload.encodedData = reader.ReadBytes((int)(payloadEndPos - payloadStartPos));
+        payload.Dirty = false;
 
-        /// <summary>
-        /// Encodes the internal state of this payload into a byte[] suitable for sending to in-game
-        /// handlers such as the chat log.
-        /// </summary>
-        /// <returns>Encoded binary payload data suitable for use with in-game handlers.</returns>
-        protected abstract byte[] EncodeImpl();
+        // Log.Verbose($"got payload bytes {BitConverter.ToString(payload.encodedData).Replace("-", " ")}");
 
-        /// <summary>
-        /// Decodes a byte stream from the game into a payload object.
-        /// </summary>
-        /// <param name="reader">A BinaryReader containing at least all the data for this payload.</param>
-        /// <param name="endOfStream">The location holding the end of the data for this payload.</param>
-        // TODO: endOfStream is somewhat legacy now that payload length is always handled correctly.
-        // This could be changed to just take a straight byte[], but that would complicate reading
-        // but we could probably at least remove the end param
-        protected abstract void DecodeImpl(BinaryReader reader, long endOfStream);
+        reader.BaseStream.Position = payloadEndPos;
 
-        private static Payload DecodeChunk(BinaryReader reader)
-        {
-            Payload payload = null;
-
-            reader.ReadByte();  // START_BYTE
-            var chunkType = (SeStringChunkType)reader.ReadByte();
-            var chunkLen = GetInteger(reader);
-
-            var packetStart = reader.BaseStream.Position;
-
-            // any unhandled payload types will be turned into a RawPayload with the exact same binary data
-            switch (chunkType)
-            {
-                case SeStringChunkType.EmphasisItalic:
-                    payload = new EmphasisItalicPayload();
-                    break;
-
-                case SeStringChunkType.NewLine:
-                    payload = NewLinePayload.Payload;
-                    break;
-
-                case SeStringChunkType.SeHyphen:
-                    payload = SeHyphenPayload.Payload;
-                    break;
-
-                case SeStringChunkType.Interactable:
-                    {
-                        var subType = (EmbeddedInfoType)reader.ReadByte();
-                        switch (subType)
-                        {
-                            case EmbeddedInfoType.PlayerName:
-                                payload = new PlayerPayload();
-                                break;
-
-                            case EmbeddedInfoType.ItemLink:
-                                payload = new ItemPayload();
-                                break;
-
-                            case EmbeddedInfoType.MapPositionLink:
-                                payload = new MapLinkPayload();
-                                break;
-
-                            case EmbeddedInfoType.Status:
-                                payload = new StatusPayload();
-                                break;
-
-                            case EmbeddedInfoType.QuestLink:
-                                payload = new QuestPayload();
-                                break;
-
-                            case EmbeddedInfoType.DalamudLink:
-                                payload = new DalamudLinkPayload();
-                                break;
-
-                            case EmbeddedInfoType.LinkTerminator:
-                            // this has no custom handling and so needs to fallthrough to ensure it is captured
-                            default:
-                                // but I'm also tired of this log
-                                if (subType != EmbeddedInfoType.LinkTerminator)
-                                {
-                                    Log.Verbose("Unhandled EmbeddedInfoType: {0}", subType);
-                                }
-
-                                // rewind so we capture the Interactable byte in the raw data
-                                reader.BaseStream.Seek(-1, SeekOrigin.Current);
-                                break;
-                        }
-                    }
-
-                    break;
-
-                case SeStringChunkType.AutoTranslateKey:
-                    payload = new AutoTranslatePayload();
-                    break;
-
-                case SeStringChunkType.UIForeground:
-                    payload = new UIForegroundPayload();
-                    break;
-
-                case SeStringChunkType.UIGlow:
-                    payload = new UIGlowPayload();
-                    break;
-
-                case SeStringChunkType.Icon:
-                    payload = new IconPayload();
-                    break;
-
-                default:
-                    Log.Verbose("Unhandled SeStringChunkType: {0}", chunkType);
-                    break;
-            }
-
-            payload ??= new RawPayload((byte)chunkType);
-            payload.DecodeImpl(reader, reader.BaseStream.Position + chunkLen - 1);
-
-            // read through the rest of the packet
-            var readBytes = (uint)(reader.BaseStream.Position - packetStart);
-            reader.ReadBytes((int)(chunkLen - readBytes + 1)); // +1 for the END_BYTE marker
-
-            return payload;
-        }
-
-        private static Payload DecodeText(BinaryReader reader)
-        {
-            var payload = new TextPayload();
-            payload.DecodeImpl(reader, reader.BaseStream.Length);
-
-            return payload;
-        }
+        return payload;
     }
 
     /// <summary>
-    /// Parsing helpers.
+    /// Encode this payload object into a byte[] useable in-game for things like the chat log.
     /// </summary>
-    public abstract partial class Payload
+    /// <param name="force">If true, ignores any cached value and forcibly reencodes the payload from its internal representation.</param>
+    /// <returns>A byte[] suitable for use with in-game handlers such as the chat log.</returns>
+    public byte[] Encode(bool force = false)
     {
-        /// <summary>
-        /// The start byte of a payload.
-        /// </summary>
-        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "This is preferred.")]
-        protected const byte START_BYTE = 0x02;
-
-        /// <summary>
-        /// The end byte of a payload.
-        /// </summary>
-        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "This is preferred.")]
-        protected const byte END_BYTE = 0x03;
-
-        /// <summary>
-        /// This represents the type of embedded info in a payload.
-        /// </summary>
-        public enum EmbeddedInfoType
+        if (this.Dirty || force)
         {
-            /// <summary>
-            /// A player's name.
-            /// </summary>
-            PlayerName = 0x01,
-
-            /// <summary>
-            /// The link to an iteme.
-            /// </summary>
-            ItemLink = 0x03,
-
-            /// <summary>
-            /// The link to a map position.
-            /// </summary>
-            MapPositionLink = 0x04,
-
-            /// <summary>
-            /// The link to a quest.
-            /// </summary>
-            QuestLink = 0x05,
-
-            /// <summary>
-            /// A status effect.
-            /// </summary>
-            Status = 0x09,
-
-            /// <summary>
-            /// A custom Dalamud link.
-            /// </summary>
-            DalamudLink = 0x0F,
-
-            /// <summary>
-            /// A link terminator.
-            /// </summary>
-            /// <remarks>
-            /// It is not exactly clear what this is, but seems to always follow a link.
-            /// </remarks>
-            LinkTerminator = 0xCF,
+            this.encodedData = this.EncodeImpl();
+            this.Dirty = false;
         }
 
-        /// <summary>
-        /// This represents the type of payload and how it should be encoded.
-        /// </summary>
-        protected enum SeStringChunkType
+        return this.encodedData;
+    }
+
+    /// <summary>
+    /// Encodes the internal state of this payload into a byte[] suitable for sending to in-game
+    /// handlers such as the chat log.
+    /// </summary>
+    /// <returns>Encoded binary payload data suitable for use with in-game handlers.</returns>
+    protected abstract byte[] EncodeImpl();
+
+    /// <summary>
+    /// Decodes a byte stream from the game into a payload object.
+    /// </summary>
+    /// <param name="reader">A BinaryReader containing at least all the data for this payload.</param>
+    /// <param name="endOfStream">The location holding the end of the data for this payload.</param>
+    // TODO: endOfStream is somewhat legacy now that payload length is always handled correctly.
+    // This could be changed to just take a straight byte[], but that would complicate reading
+    // but we could probably at least remove the end param
+    protected abstract void DecodeImpl(BinaryReader reader, long endOfStream);
+
+    private static Payload DecodeChunk(BinaryReader reader)
+    {
+        Payload payload = null;
+
+        reader.ReadByte(); // START_BYTE
+        var chunkType = (SeStringChunkType)reader.ReadByte();
+        var chunkLen = GetInteger(reader);
+
+        var packetStart = reader.BaseStream.Position;
+
+        // any unhandled payload types will be turned into a RawPayload with the exact same binary data
+        switch (chunkType)
         {
-            /// <summary>
-            /// See the <see cref="IconPayload"/> class.
-            /// </summary>
-            Icon = 0x12,
+            case SeStringChunkType.EmphasisItalic:
+                payload = new EmphasisItalicPayload();
+                break;
 
-            /// <summary>
-            /// See the <see cref="EmphasisItalicPayload"/> class.
-            /// </summary>
-            EmphasisItalic = 0x1A,
+            case SeStringChunkType.NewLine:
+                payload = NewLinePayload.Payload;
+                break;
 
-            /// <summary>
-            /// See the <see cref="NewLinePayload"/>.
-            /// </summary>
-            NewLine = 0x10,
+            case SeStringChunkType.SeHyphen:
+                payload = SeHyphenPayload.Payload;
+                break;
 
-            /// <summary>
-            /// See the <see cref="SeHyphenPayload"/> class.
-            /// </summary>
-            SeHyphen = 0x1F,
-
-            /// <summary>
-            /// See any of the link-type classes:
-            /// <see cref="PlayerPayload"/>,
-            /// <see cref="ItemPayload"/>,
-            /// <see cref="MapLinkPayload"/>,
-            /// <see cref="StatusPayload"/>,
-            /// <see cref="QuestPayload"/>,
-            /// <see cref="DalamudLinkPayload"/>.
-            /// </summary>
-            Interactable = 0x27,
-
-            /// <summary>
-            /// See the <see cref="AutoTranslatePayload"/> class.
-            /// </summary>
-            AutoTranslateKey = 0x2E,
-
-            /// <summary>
-            /// See the <see cref="UIForegroundPayload"/> class.
-            /// </summary>
-            UIForeground = 0x48,
-
-            /// <summary>
-            /// See the <see cref="UIGlowPayload"/> class.
-            /// </summary>
-            UIGlow = 0x49,
-        }
-
-        /// <summary>
-        /// Retrieve the packed integer from SE's native data format.
-        /// </summary>
-        /// <param name="input">The BinaryReader instance.</param>
-        /// <returns>An integer.</returns>
-        // made protected, unless we actually want to use it externally
-        // in which case it should probably go live somewhere else
-        protected static uint GetInteger(BinaryReader input)
-        {
-            uint marker = input.ReadByte();
-            if (marker < 0xD0)
-                return marker - 1;
-
-            // the game adds 0xF0 marker for values >= 0xCF
-            // uasge of 0xD0-0xEF is unknown, should we throw here?
-            // if (marker < 0xF0) throw new NotSupportedException();
-
-            marker = (marker + 1) & 0b1111;
-
-            var ret = new byte[4];
-            for (var i = 3; i >= 0; i--)
-            {
-                ret[i] = (marker & (1 << i)) == 0 ? (byte)0 : input.ReadByte();
-            }
-
-            return BitConverter.ToUInt32(ret, 0);
-        }
-
-        /// <summary>
-        /// Create a packed integer in Se's native data format.
-        /// </summary>
-        /// <param name="value">The value to pack.</param>
-        /// <returns>A packed integer.</returns>
-        protected static byte[] MakeInteger(uint value)
-        {
-            if (value < 0xCF)
-            {
-                return new byte[] { (byte)(value + 1) };
-            }
-
-            var bytes = BitConverter.GetBytes(value);
-
-            var ret = new List<byte>() { 0xF0 };
-            for (var i = 3; i >= 0; i--)
-            {
-                if (bytes[i] != 0)
+            case SeStringChunkType.Interactable:
                 {
-                    ret.Add(bytes[i]);
-                    ret[0] |= (byte)(1 << i);
+                    var subType = (EmbeddedInfoType)reader.ReadByte();
+                    switch (subType)
+                    {
+                        case EmbeddedInfoType.PlayerName:
+                            payload = new PlayerPayload();
+                            break;
+
+                        case EmbeddedInfoType.ItemLink:
+                            payload = new ItemPayload();
+                            break;
+
+                        case EmbeddedInfoType.MapPositionLink:
+                            payload = new MapLinkPayload();
+                            break;
+
+                        case EmbeddedInfoType.Status:
+                            payload = new StatusPayload();
+                            break;
+
+                        case EmbeddedInfoType.QuestLink:
+                            payload = new QuestPayload();
+                            break;
+
+                        case EmbeddedInfoType.DalamudLink:
+                            payload = new DalamudLinkPayload();
+                            break;
+
+                        case EmbeddedInfoType.LinkTerminator:
+                        // this has no custom handling and so needs to fallthrough to ensure it is captured
+                        default:
+                            // but I'm also tired of this log
+                            if (subType != EmbeddedInfoType.LinkTerminator)
+                            {
+                                Log.Verbose("Unhandled EmbeddedInfoType: {0}", subType);
+                            }
+
+                            // rewind so we capture the Interactable byte in the raw data
+                            reader.BaseStream.Seek(-1, SeekOrigin.Current);
+                            break;
+                    }
                 }
-            }
 
-            ret[0] -= 1;
+                break;
 
-            return ret.ToArray();
+            case SeStringChunkType.AutoTranslateKey:
+                payload = new AutoTranslatePayload();
+                break;
+
+            case SeStringChunkType.UIForeground:
+                payload = new UIForegroundPayload();
+                break;
+
+            case SeStringChunkType.UIGlow:
+                payload = new UIGlowPayload();
+                break;
+
+            case SeStringChunkType.Icon:
+                payload = new IconPayload();
+                break;
+
+            default:
+                Log.Verbose("Unhandled SeStringChunkType: {0}", chunkType);
+                break;
         }
 
-        /// <summary>
-        /// From a binary packed integer, get the high and low bytes.
-        /// </summary>
-        /// <param name="input">The BinaryReader instance.</param>
-        /// <returns>The high and low bytes.</returns>
-        protected static (uint High, uint Low) GetPackedIntegers(BinaryReader input)
-        {
-            var value = GetInteger(input);
-            return (value >> 16, value & 0xFFFF);
-        }
+        payload ??= new RawPayload((byte)chunkType);
+        payload.DecodeImpl(reader, reader.BaseStream.Position + chunkLen - 1);
 
-        /// <summary>
-        /// Create a packed integer from the given high and low bytes.
-        /// </summary>
-        /// <param name="high">The high order bytes.</param>
-        /// <param name="low">The low order bytes.</param>
-        /// <returns>A packed integer.</returns>
-        protected static byte[] MakePackedInteger(uint high, uint low)
-        {
-            var value = (high << 16) | (low & 0xFFFF);
-            return MakeInteger(value);
-        }
+        // read through the rest of the packet
+        var readBytes = (uint)(reader.BaseStream.Position - packetStart);
+        reader.ReadBytes((int)(chunkLen - readBytes + 1)); // +1 for the END_BYTE marker
+
+        return payload;
+    }
+
+    private static Payload DecodeText(BinaryReader reader)
+    {
+        var payload = new TextPayload();
+        payload.DecodeImpl(reader, reader.BaseStream.Length);
+
+        return payload;
+    }
+}
+
+/// <summary>
+/// Parsing helpers.
+/// </summary>
+public abstract partial class Payload
+{
+    /// <summary>
+    /// The start byte of a payload.
+    /// </summary>
+    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "This is preferred.")]
+    protected const byte START_BYTE = 0x02;
+
+    /// <summary>
+    /// The end byte of a payload.
+    /// </summary>
+    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "This is preferred.")]
+    protected const byte END_BYTE = 0x03;
+
+    /// <summary>
+    /// This represents the type of embedded info in a payload.
+    /// </summary>
+    public enum EmbeddedInfoType
+    {
+        /// <summary>
+        /// A player's name.
+        /// </summary>
+        PlayerName = 0x01,
+
+        /// <summary>
+        /// The link to an iteme.
+        /// </summary>
+        ItemLink = 0x03,
+
+        /// <summary>
+        /// The link to a map position.
+        /// </summary>
+        MapPositionLink = 0x04,
+
+        /// <summary>
+        /// The link to a quest.
+        /// </summary>
+        QuestLink = 0x05,
+
+        /// <summary>
+        /// A status effect.
+        /// </summary>
+        Status = 0x09,
+
+        /// <summary>
+        /// A custom Dalamud link.
+        /// </summary>
+        DalamudLink = 0x0F,
+
+        /// <summary>
+        /// A link terminator.
+        /// </summary>
+        /// <remarks>
+        /// It is not exactly clear what this is, but seems to always follow a link.
+        /// </remarks>
+        LinkTerminator = 0xCF,
+    }
+
+    /// <summary>
+    /// This represents the type of payload and how it should be encoded.
+    /// </summary>
+    protected enum SeStringChunkType
+    {
+        /// <summary>
+        /// See the <see cref="IconPayload"/> class.
+        /// </summary>
+        Icon = 0x12,
+
+        /// <summary>
+        /// See the <see cref="EmphasisItalicPayload"/> class.
+        /// </summary>
+        EmphasisItalic = 0x1A,
+
+        /// <summary>
+        /// See the <see cref="NewLinePayload"/>.
+        /// </summary>
+        NewLine = 0x10,
+
+        /// <summary>
+        /// See the <see cref="SeHyphenPayload"/> class.
+        /// </summary>
+        SeHyphen = 0x1F,
+
+        /// <summary>
+        /// See any of the link-type classes:
+        /// <see cref="PlayerPayload"/>,
+        /// <see cref="ItemPayload"/>,
+        /// <see cref="MapLinkPayload"/>,
+        /// <see cref="StatusPayload"/>,
+        /// <see cref="QuestPayload"/>,
+        /// <see cref="DalamudLinkPayload"/>.
+        /// </summary>
+        Interactable = 0x27,
+
+        /// <summary>
+        /// See the <see cref="AutoTranslatePayload"/> class.
+        /// </summary>
+        AutoTranslateKey = 0x2E,
+
+        /// <summary>
+        /// See the <see cref="UIForegroundPayload"/> class.
+        /// </summary>
+        UIForeground = 0x48,
+
+        /// <summary>
+        /// See the <see cref="UIGlowPayload"/> class.
+        /// </summary>
+        UIGlow = 0x49,
+    }
+
+    /// <summary>
+    /// Retrieve the packed integer from SE's native data format.
+    /// </summary>
+    /// <param name="input">The BinaryReader instance.</param>
+    /// <returns>An integer.</returns>
+    // made protected, unless we actually want to use it externally
+    // in which case it should probably go live somewhere else
+    protected static uint GetInteger(BinaryReader input)
+    {
+        uint marker = input.ReadByte();
+        if (marker < 0xD0)
+            return marker - 1;
+
+        // the game adds 0xF0 marker for values >= 0xCF
+        // uasge of 0xD0-0xEF is unknown, should we throw here?
+        // if (marker < 0xF0) throw new NotSupportedException();
+
+        marker = (marker + 1) & 0b1111;
+
+        var ret = new byte[4];
+        for (var i = 3; i >= 0; i--)
+        {
+            ret[i] = (marker & (1 << i)) == 0 ? (byte)0 : input.ReadByte();
+        }
+
+        return BitConverter.ToUInt32(ret, 0);
+    }
+
+    /// <summary>
+    /// Create a packed integer in Se's native data format.
+    /// </summary>
+    /// <param name="value">The value to pack.</param>
+    /// <returns>A packed integer.</returns>
+    protected static byte[] MakeInteger(uint value)
+    {
+        if (value < 0xCF)
+        {
+            return new byte[] { (byte)(value + 1) };
+        }
+
+        var bytes = BitConverter.GetBytes(value);
+
+        var ret = new List<byte>() { 0xF0 };
+        for (var i = 3; i >= 0; i--)
+        {
+            if (bytes[i] != 0)
+            {
+                ret.Add(bytes[i]);
+                ret[0] |= (byte)(1 << i);
+            }
+        }
+
+        ret[0] -= 1;
+
+        return ret.ToArray();
+    }
+
+    /// <summary>
+    /// From a binary packed integer, get the high and low bytes.
+    /// </summary>
+    /// <param name="input">The BinaryReader instance.</param>
+    /// <returns>The high and low bytes.</returns>
+    protected static (uint High, uint Low) GetPackedIntegers(BinaryReader input)
+    {
+        var value = GetInteger(input);
+        return (value >> 16, value & 0xFFFF);
+    }
+
+    /// <summary>
+    /// Create a packed integer from the given high and low bytes.
+    /// </summary>
+    /// <param name="high">The high order bytes.</param>
+    /// <param name="low">The low order bytes.</param>
+    /// <returns>A packed integer.</returns>
+    protected static byte[] MakePackedInteger(uint high, uint low)
+    {
+        var value = (high << 16) | (low & 0xFFFF);
+        return MakeInteger(value);
     }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/PayloadType.cs b/Dalamud/Game/Text/SeStringHandling/PayloadType.cs
index 93bcc7e3e..c58f2954d 100644
--- a/Dalamud/Game/Text/SeStringHandling/PayloadType.cs
+++ b/Dalamud/Game/Text/SeStringHandling/PayloadType.cs
@@ -1,83 +1,82 @@
-namespace Dalamud.Game.Text.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling;
+
+/// <summary>
+/// All parsed types of SeString payloads.
+/// </summary>
+public enum PayloadType
 {
     /// <summary>
-    /// All parsed types of SeString payloads.
+    /// An unknown SeString.
     /// </summary>
-    public enum PayloadType
-    {
-        /// <summary>
-        /// An unknown SeString.
-        /// </summary>
-        Unknown,
+    Unknown,
 
-        /// <summary>
-        /// An SeString payload representing a player link.
-        /// </summary>
-        Player,
+    /// <summary>
+    /// An SeString payload representing a player link.
+    /// </summary>
+    Player,
 
-        /// <summary>
-        /// An SeString payload representing an Item link.
-        /// </summary>
-        Item,
+    /// <summary>
+    /// An SeString payload representing an Item link.
+    /// </summary>
+    Item,
 
-        /// <summary>
-        /// An SeString payload representing an Status Effect link.
-        /// </summary>
-        Status,
+    /// <summary>
+    /// An SeString payload representing an Status Effect link.
+    /// </summary>
+    Status,
 
-        /// <summary>
-        /// An SeString payload representing raw, typed text.
-        /// </summary>
-        RawText,
+    /// <summary>
+    /// An SeString payload representing raw, typed text.
+    /// </summary>
+    RawText,
 
-        /// <summary>
-        /// An SeString payload representing a text foreground color.
-        /// </summary>
-        UIForeground,
+    /// <summary>
+    /// An SeString payload representing a text foreground color.
+    /// </summary>
+    UIForeground,
 
-        /// <summary>
-        /// An SeString payload representing a text glow color.
-        /// </summary>
-        UIGlow,
+    /// <summary>
+    /// An SeString payload representing a text glow color.
+    /// </summary>
+    UIGlow,
 
-        /// <summary>
-        /// An SeString payload representing a map position link, such as from &lt;flag&gt; or &lt;pos&gt;.
-        /// </summary>
-        MapLink,
+    /// <summary>
+    /// An SeString payload representing a map position link, such as from &lt;flag&gt; or &lt;pos&gt;.
+    /// </summary>
+    MapLink,
 
-        /// <summary>
-        /// An SeString payload representing an auto-translate dictionary entry.
-        /// </summary>
-        AutoTranslateText,
+    /// <summary>
+    /// An SeString payload representing an auto-translate dictionary entry.
+    /// </summary>
+    AutoTranslateText,
 
-        /// <summary>
-        /// An SeString payload representing italic emphasis formatting on text.
-        /// </summary>
-        EmphasisItalic,
+    /// <summary>
+    /// An SeString payload representing italic emphasis formatting on text.
+    /// </summary>
+    EmphasisItalic,
 
-        /// <summary>
-        /// An SeString payload representing a bitmap icon.
-        /// </summary>
-        Icon,
+    /// <summary>
+    /// An SeString payload representing a bitmap icon.
+    /// </summary>
+    Icon,
 
-        /// <summary>
-        /// A SeString payload representing a quest link.
-        /// </summary>
-        Quest,
+    /// <summary>
+    /// A SeString payload representing a quest link.
+    /// </summary>
+    Quest,
 
-        /// <summary>
-        /// A SeString payload representing a custom clickable link for dalamud plugins.
-        /// </summary>
-        DalamudLink,
+    /// <summary>
+    /// A SeString payload representing a custom clickable link for dalamud plugins.
+    /// </summary>
+    DalamudLink,
 
-        /// <summary>
-        /// An SeString payload representing a newline character.
-        /// </summary>
-        NewLine,
+    /// <summary>
+    /// An SeString payload representing a newline character.
+    /// </summary>
+    NewLine,
 
-        /// <summary>
-        /// An SeString payload representing a doublewide SE hypen.
-        /// </summary>
-        SeHyphen,
-    }
+    /// <summary>
+    /// An SeString payload representing a doublewide SE hypen.
+    /// </summary>
+    SeHyphen,
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs
index 8e9eb5b65..7b8ffd146 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/AutoTranslatePayload.cs
@@ -7,165 +7,164 @@ using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 using Serilog;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload containing an auto-translation/completion chat message.
+/// </summary>
+public class AutoTranslatePayload : Payload, ITextProvider
 {
+    private string text;
+
+    [JsonProperty]
+    private uint group;
+
+    [JsonProperty]
+    private uint key;
+
     /// <summary>
-    /// An SeString Payload containing an auto-translation/completion chat message.
+    /// Initializes a new instance of the <see cref="AutoTranslatePayload"/> class.
+    /// Creates a new auto-translate payload.
     /// </summary>
-    public class AutoTranslatePayload : Payload, ITextProvider
+    /// <param name="group">The group id for this message.</param>
+    /// <param name="key">The key/row id for this message.  Which table this is in depends on the group id and details the Completion table.</param>
+    /// <remarks>
+    /// This table is somewhat complicated in structure, and so using this constructor may not be very nice.
+    /// There is probably little use to create one of these, however.
+    /// </remarks>
+    public AutoTranslatePayload(uint group, uint key)
     {
-        private string text;
+        // TODO: friendlier ctor? not sure how to handle that given how weird the tables are
+        this.group = group;
+        this.key = key;
+    }
 
-        [JsonProperty]
-        private uint group;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AutoTranslatePayload"/> class.
+    /// </summary>
+    internal AutoTranslatePayload()
+    {
+    }
 
-        [JsonProperty]
-        private uint key;
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.AutoTranslateText;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AutoTranslatePayload"/> class.
-        /// Creates a new auto-translate payload.
-        /// </summary>
-        /// <param name="group">The group id for this message.</param>
-        /// <param name="key">The key/row id for this message.  Which table this is in depends on the group id and details the Completion table.</param>
-        /// <remarks>
-        /// This table is somewhat complicated in structure, and so using this constructor may not be very nice.
-        /// There is probably little use to create one of these, however.
-        /// </remarks>
-        public AutoTranslatePayload(uint group, uint key)
+    /// <summary>
+    /// Gets the actual text displayed in-game for this payload.
+    /// </summary>
+    /// <remarks>
+    /// Value is evaluated lazily and cached.
+    /// </remarks>
+    public string Text
+    {
+        get
         {
-            // TODO: friendlier ctor? not sure how to handle that given how weird the tables are
-            this.group = group;
-            this.key = key;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AutoTranslatePayload"/> class.
-        /// </summary>
-        internal AutoTranslatePayload()
-        {
-        }
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.AutoTranslateText;
-
-        /// <summary>
-        /// Gets the actual text displayed in-game for this payload.
-        /// </summary>
-        /// <remarks>
-        /// Value is evaluated lazily and cached.
-        /// </remarks>
-        public string Text
-        {
-            get
-            {
-                // wrap the text in the colored brackets that is uses in-game, since those are not actually part of any of the payloads
-                return this.text ??= $"{(char)SeIconChar.AutoTranslateOpen} {this.Resolve()} {(char)SeIconChar.AutoTranslateClose}";
-            }
-        }
-
-        /// <summary>
-        /// Returns a string that represents the current object.
-        /// </summary>
-        /// <returns>A string that represents the current object.</returns>
-        public override string ToString()
-        {
-            return $"{this.Type} - Group: {this.group}, Key: {this.key}, Text: {this.Text}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            var keyBytes = MakeInteger(this.key);
-
-            var chunkLen = keyBytes.Length + 2;
-            var bytes = new List<byte>()
-            {
-                START_BYTE,
-                (byte)SeStringChunkType.AutoTranslateKey, (byte)chunkLen,
-                (byte)this.group,
-            };
-            bytes.AddRange(keyBytes);
-            bytes.Add(END_BYTE);
-
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            // this seems to always be a bare byte, and not following normal integer encoding
-            // the values in the table are all <70 so this is presumably ok
-            this.group = reader.ReadByte();
-
-            this.key = GetInteger(reader);
-        }
-
-        private string Resolve()
-        {
-            string value = null;
-
-            var sheet = this.DataResolver.GetExcelSheet<Completion>();
-
-            Completion row = null;
-            try
-            {
-                // try to get the row in the Completion table itself, because this is 'easiest'
-                // The row may not exist at all (if the Key is for another table), or it could be the wrong row
-                // (again, if it's meant for another table)
-                row = sheet.GetRow(this.key);
-            }
-            catch
-            {
-            } // don't care, row will be null
-
-            if (row?.Group == this.group)
-            {
-                // if the row exists in this table and the group matches, this is actually the correct data
-                value = row.Text;
-            }
-            else
-            {
-                try
-                {
-                    // we need to get the linked table and do the lookup there instead
-                    // in this case, there will only be one entry for this group id
-                    row = sheet.First(r => r.Group == this.group);
-                    // many of the names contain valid id ranges after the table name, but we don't need those
-                    var actualTableName = row.LookupTable.RawString.Split('[')[0];
-
-                    var name = actualTableName switch
-                    {
-                        "Action" => this.DataResolver.GetExcelSheet<Lumina.Excel.GeneratedSheets.Action>().GetRow(this.key).Name,
-                        "ActionComboRoute" => this.DataResolver.GetExcelSheet<ActionComboRoute>().GetRow(this.key).Name,
-                        "BuddyAction" => this.DataResolver.GetExcelSheet<BuddyAction>().GetRow(this.key).Name,
-                        "ClassJob" => this.DataResolver.GetExcelSheet<ClassJob>().GetRow(this.key).Name,
-                        "Companion" => this.DataResolver.GetExcelSheet<Companion>().GetRow(this.key).Singular,
-                        "CraftAction" => this.DataResolver.GetExcelSheet<CraftAction>().GetRow(this.key).Name,
-                        "GeneralAction" => this.DataResolver.GetExcelSheet<GeneralAction>().GetRow(this.key).Name,
-                        "GuardianDeity" => this.DataResolver.GetExcelSheet<GuardianDeity>().GetRow(this.key).Name,
-                        "MainCommand" => this.DataResolver.GetExcelSheet<MainCommand>().GetRow(this.key).Name,
-                        "Mount" => this.DataResolver.GetExcelSheet<Mount>().GetRow(this.key).Singular,
-                        "Pet" => this.DataResolver.GetExcelSheet<Pet>().GetRow(this.key).Name,
-                        "PetAction" => this.DataResolver.GetExcelSheet<PetAction>().GetRow(this.key).Name,
-                        "PetMirage" => this.DataResolver.GetExcelSheet<PetMirage>().GetRow(this.key).Name,
-                        "PlaceName" => this.DataResolver.GetExcelSheet<PlaceName>().GetRow(this.key).Name,
-                        "Race" => this.DataResolver.GetExcelSheet<Race>().GetRow(this.key).Masculine,
-                        "TextCommand" => this.DataResolver.GetExcelSheet<TextCommand>().GetRow(this.key).Command,
-                        "Tribe" => this.DataResolver.GetExcelSheet<Tribe>().GetRow(this.key).Masculine,
-                        "Weather" => this.DataResolver.GetExcelSheet<Weather>().GetRow(this.key).Name,
-                        _ => throw new Exception(actualTableName),
-                    };
-
-                    value = name;
-                }
-                catch (Exception e)
-                {
-                    Log.Error(e, $"AutoTranslatePayload - failed to resolve: {this.Type} - Group: {this.group}, Key: {this.key}");
-                }
-            }
-
-            return value;
+            // wrap the text in the colored brackets that is uses in-game, since those are not actually part of any of the payloads
+            return this.text ??= $"{(char)SeIconChar.AutoTranslateOpen} {this.Resolve()} {(char)SeIconChar.AutoTranslateClose}";
         }
     }
+
+    /// <summary>
+    /// Returns a string that represents the current object.
+    /// </summary>
+    /// <returns>A string that represents the current object.</returns>
+    public override string ToString()
+    {
+        return $"{this.Type} - Group: {this.group}, Key: {this.key}, Text: {this.Text}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        var keyBytes = MakeInteger(this.key);
+
+        var chunkLen = keyBytes.Length + 2;
+        var bytes = new List<byte>()
+        {
+            START_BYTE,
+            (byte)SeStringChunkType.AutoTranslateKey, (byte)chunkLen,
+            (byte)this.group,
+        };
+        bytes.AddRange(keyBytes);
+        bytes.Add(END_BYTE);
+
+        return bytes.ToArray();
+    }
+
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        // this seems to always be a bare byte, and not following normal integer encoding
+        // the values in the table are all <70 so this is presumably ok
+        this.group = reader.ReadByte();
+
+        this.key = GetInteger(reader);
+    }
+
+    private string Resolve()
+    {
+        string value = null;
+
+        var sheet = this.DataResolver.GetExcelSheet<Completion>();
+
+        Completion row = null;
+        try
+        {
+            // try to get the row in the Completion table itself, because this is 'easiest'
+            // The row may not exist at all (if the Key is for another table), or it could be the wrong row
+            // (again, if it's meant for another table)
+            row = sheet.GetRow(this.key);
+        }
+        catch
+        {
+        } // don't care, row will be null
+
+        if (row?.Group == this.group)
+        {
+            // if the row exists in this table and the group matches, this is actually the correct data
+            value = row.Text;
+        }
+        else
+        {
+            try
+            {
+                // we need to get the linked table and do the lookup there instead
+                // in this case, there will only be one entry for this group id
+                row = sheet.First(r => r.Group == this.group);
+                // many of the names contain valid id ranges after the table name, but we don't need those
+                var actualTableName = row.LookupTable.RawString.Split('[')[0];
+
+                var name = actualTableName switch
+                {
+                    "Action" => this.DataResolver.GetExcelSheet<Lumina.Excel.GeneratedSheets.Action>().GetRow(this.key).Name,
+                    "ActionComboRoute" => this.DataResolver.GetExcelSheet<ActionComboRoute>().GetRow(this.key).Name,
+                    "BuddyAction" => this.DataResolver.GetExcelSheet<BuddyAction>().GetRow(this.key).Name,
+                    "ClassJob" => this.DataResolver.GetExcelSheet<ClassJob>().GetRow(this.key).Name,
+                    "Companion" => this.DataResolver.GetExcelSheet<Companion>().GetRow(this.key).Singular,
+                    "CraftAction" => this.DataResolver.GetExcelSheet<CraftAction>().GetRow(this.key).Name,
+                    "GeneralAction" => this.DataResolver.GetExcelSheet<GeneralAction>().GetRow(this.key).Name,
+                    "GuardianDeity" => this.DataResolver.GetExcelSheet<GuardianDeity>().GetRow(this.key).Name,
+                    "MainCommand" => this.DataResolver.GetExcelSheet<MainCommand>().GetRow(this.key).Name,
+                    "Mount" => this.DataResolver.GetExcelSheet<Mount>().GetRow(this.key).Singular,
+                    "Pet" => this.DataResolver.GetExcelSheet<Pet>().GetRow(this.key).Name,
+                    "PetAction" => this.DataResolver.GetExcelSheet<PetAction>().GetRow(this.key).Name,
+                    "PetMirage" => this.DataResolver.GetExcelSheet<PetMirage>().GetRow(this.key).Name,
+                    "PlaceName" => this.DataResolver.GetExcelSheet<PlaceName>().GetRow(this.key).Name,
+                    "Race" => this.DataResolver.GetExcelSheet<Race>().GetRow(this.key).Masculine,
+                    "TextCommand" => this.DataResolver.GetExcelSheet<TextCommand>().GetRow(this.key).Command,
+                    "Tribe" => this.DataResolver.GetExcelSheet<Tribe>().GetRow(this.key).Masculine,
+                    "Weather" => this.DataResolver.GetExcelSheet<Weather>().GetRow(this.key).Name,
+                    _ => throw new Exception(actualTableName),
+                };
+
+                value = name;
+            }
+            catch (Exception e)
+            {
+                Log.Error(e, $"AutoTranslatePayload - failed to resolve: {this.Type} - Group: {this.group}, Key: {this.key}");
+            }
+        }
+
+        return value;
+    }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs
index 6aedf04ed..7a1ed417c 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/DalamudLinkPayload.cs
@@ -3,57 +3,56 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// This class represents a custom Dalamud clickable chat link.
+/// </summary>
+public class DalamudLinkPayload : Payload
 {
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.DalamudLink;
+
     /// <summary>
-    /// This class represents a custom Dalamud clickable chat link.
+    /// Gets the plugin command ID to be linked.
     /// </summary>
-    public class DalamudLinkPayload : Payload
+    public uint CommandId { get; internal set; } = 0;
+
+    /// <summary>
+    /// Gets the plugin name to be linked.
+    /// </summary>
+    public string Plugin { get; internal set; } = string.Empty;
+
+    /// <inheritdoc/>
+    public override string ToString()
     {
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.DalamudLink;
+        return $"{this.Type} -  Plugin: {this.Plugin}, Command: {this.CommandId}";
+    }
 
-        /// <summary>
-        /// Gets the plugin command ID to be linked.
-        /// </summary>
-        public uint CommandId { get; internal set; } = 0;
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        var pluginBytes = Encoding.UTF8.GetBytes(this.Plugin);
+        var commandBytes = MakeInteger(this.CommandId);
+        var chunkLen = 3 + pluginBytes.Length + commandBytes.Length;
 
-        /// <summary>
-        /// Gets the plugin name to be linked.
-        /// </summary>
-        public string Plugin { get; internal set; } = string.Empty;
-
-        /// <inheritdoc/>
-        public override string ToString()
+        if (chunkLen > 255)
         {
-            return $"{this.Type} -  Plugin: {this.Plugin}, Command: {this.CommandId}";
+            throw new Exception("Chunk is too long. Plugin name exceeds limits for DalamudLinkPayload");
         }
 
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            var pluginBytes = Encoding.UTF8.GetBytes(this.Plugin);
-            var commandBytes = MakeInteger(this.CommandId);
-            var chunkLen = 3 + pluginBytes.Length + commandBytes.Length;
+        var bytes = new List<byte> { START_BYTE, (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.DalamudLink };
+        bytes.Add((byte)pluginBytes.Length);
+        bytes.AddRange(pluginBytes);
+        bytes.AddRange(commandBytes);
+        bytes.Add(END_BYTE);
+        return bytes.ToArray();
+    }
 
-            if (chunkLen > 255)
-            {
-                throw new Exception("Chunk is too long. Plugin name exceeds limits for DalamudLinkPayload");
-            }
-
-            var bytes = new List<byte> { START_BYTE, (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.DalamudLink };
-            bytes.Add((byte)pluginBytes.Length);
-            bytes.AddRange(pluginBytes);
-            bytes.AddRange(commandBytes);
-            bytes.Add(END_BYTE);
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            this.Plugin = Encoding.UTF8.GetString(reader.ReadBytes(reader.ReadByte()));
-            this.CommandId = GetInteger(reader);
-        }
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        this.Plugin = Encoding.UTF8.GetString(reader.ReadBytes(reader.ReadByte()));
+        this.CommandId = GetInteger(reader);
     }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/EmphasisItalicPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/EmphasisItalicPayload.cs
index 0a61f5ef3..37fb863a5 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/EmphasisItalicPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/EmphasisItalicPayload.cs
@@ -1,81 +1,80 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload containing information about enabling or disabling italics formatting on following text.
+/// </summary>
+/// <remarks>
+/// As with other formatting payloads, this is only useful in a payload block, where it affects any subsequent
+/// text payloads.
+/// </remarks>
+public class EmphasisItalicPayload : Payload
 {
     /// <summary>
-    /// An SeString Payload containing information about enabling or disabling italics formatting on following text.
+    /// Initializes a new instance of the <see cref="EmphasisItalicPayload"/> class.
+    /// Creates an EmphasisItalicPayload.
     /// </summary>
-    /// <remarks>
-    /// As with other formatting payloads, this is only useful in a payload block, where it affects any subsequent
-    /// text payloads.
-    /// </remarks>
-    public class EmphasisItalicPayload : Payload
+    /// <param name="enabled">Whether italics formatting should be enabled or disabled for following text.</param>
+    public EmphasisItalicPayload(bool enabled)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmphasisItalicPayload"/> class.
-        /// Creates an EmphasisItalicPayload.
-        /// </summary>
-        /// <param name="enabled">Whether italics formatting should be enabled or disabled for following text.</param>
-        public EmphasisItalicPayload(bool enabled)
+        this.IsEnabled = enabled;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EmphasisItalicPayload"/> class.
+    /// Creates an EmphasisItalicPayload.
+    /// </summary>
+    internal EmphasisItalicPayload()
+    {
+    }
+
+    /// <summary>
+    /// Gets a payload representing enabling italics on following text.
+    /// </summary>
+    public static EmphasisItalicPayload ItalicsOn => new(true);
+
+    /// <summary>
+    /// Gets a payload representing disabling italics on following text.
+    /// </summary>
+    public static EmphasisItalicPayload ItalicsOff => new(false);
+
+    /// <summary>
+    /// Gets a value indicating whether this payload enables italics formatting for following text.
+    /// </summary>
+    public bool IsEnabled { get; private set; }
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.EmphasisItalic;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{this.Type} - Enabled: {this.IsEnabled}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        // realistically this will always be a single byte of value 1 or 2
+        // but we'll treat it normally anyway
+        var enabledBytes = MakeInteger(this.IsEnabled ? 1u : 0);
+
+        var chunkLen = enabledBytes.Length + 1;
+        var bytes = new List<byte>()
         {
-            this.IsEnabled = enabled;
-        }
+            START_BYTE, (byte)SeStringChunkType.EmphasisItalic, (byte)chunkLen,
+        };
+        bytes.AddRange(enabledBytes);
+        bytes.Add(END_BYTE);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmphasisItalicPayload"/> class.
-        /// Creates an EmphasisItalicPayload.
-        /// </summary>
-        internal EmphasisItalicPayload()
-        {
-        }
+        return bytes.ToArray();
+    }
 
-        /// <summary>
-        /// Gets a payload representing enabling italics on following text.
-        /// </summary>
-        public static EmphasisItalicPayload ItalicsOn => new(true);
-
-        /// <summary>
-        /// Gets a payload representing disabling italics on following text.
-        /// </summary>
-        public static EmphasisItalicPayload ItalicsOff => new(false);
-
-        /// <summary>
-        /// Gets a value indicating whether this payload enables italics formatting for following text.
-        /// </summary>
-        public bool IsEnabled { get; private set; }
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.EmphasisItalic;
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"{this.Type} - Enabled: {this.IsEnabled}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            // realistically this will always be a single byte of value 1 or 2
-            // but we'll treat it normally anyway
-            var enabledBytes = MakeInteger(this.IsEnabled ? 1u : 0);
-
-            var chunkLen = enabledBytes.Length + 1;
-            var bytes = new List<byte>()
-            {
-                START_BYTE, (byte)SeStringChunkType.EmphasisItalic, (byte)chunkLen,
-            };
-            bytes.AddRange(enabledBytes);
-            bytes.Add(END_BYTE);
-
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            this.IsEnabled = GetInteger(reader) == 1;
-        }
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        this.IsEnabled = GetInteger(reader) == 1;
     }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs
index 69588f085..7963d422f 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/IconPayload.cs
@@ -1,63 +1,62 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// SeString payload representing a bitmap icon from fontIcon.
+/// </summary>
+public class IconPayload : Payload
 {
     /// <summary>
-    /// SeString payload representing a bitmap icon from fontIcon.
+    /// Initializes a new instance of the <see cref="IconPayload"/> class.
+    /// Create a Icon payload for the specified icon.
     /// </summary>
-    public class IconPayload : Payload
+    /// <param name="icon">The Icon.</param>
+    public IconPayload(BitmapFontIcon icon)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IconPayload"/> class.
-        /// Create a Icon payload for the specified icon.
-        /// </summary>
-        /// <param name="icon">The Icon.</param>
-        public IconPayload(BitmapFontIcon icon)
+        this.Icon = icon;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="IconPayload"/> class.
+    /// Create a Icon payload for the specified icon.
+    /// </summary>
+    internal IconPayload()
+    {
+    }
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.Icon;
+
+    /// <summary>
+    /// Gets or sets the icon the payload represents.
+    /// </summary>
+    public BitmapFontIcon Icon { get; set; } = BitmapFontIcon.None;
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return $"{this.Type} - {this.Icon}";
+    }
+
+    /// <inheritdoc />
+    protected override byte[] EncodeImpl()
+    {
+        var indexBytes = MakeInteger((uint)this.Icon);
+        var chunkLen = indexBytes.Length + 1;
+        var bytes = new List<byte>(new byte[]
         {
-            this.Icon = icon;
-        }
+            START_BYTE, (byte)SeStringChunkType.Icon, (byte)chunkLen,
+        });
+        bytes.AddRange(indexBytes);
+        bytes.Add(END_BYTE);
+        return bytes.ToArray();
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IconPayload"/> class.
-        /// Create a Icon payload for the specified icon.
-        /// </summary>
-        internal IconPayload()
-        {
-        }
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.Icon;
-
-        /// <summary>
-        /// Gets or sets the icon the payload represents.
-        /// </summary>
-        public BitmapFontIcon Icon { get; set; } = BitmapFontIcon.None;
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            return $"{this.Type} - {this.Icon}";
-        }
-
-        /// <inheritdoc />
-        protected override byte[] EncodeImpl()
-        {
-            var indexBytes = MakeInteger((uint)this.Icon);
-            var chunkLen = indexBytes.Length + 1;
-            var bytes = new List<byte>(new byte[]
-            {
-                START_BYTE, (byte)SeStringChunkType.Icon, (byte)chunkLen,
-            });
-            bytes.AddRange(indexBytes);
-            bytes.Add(END_BYTE);
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc />
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            this.Icon = (BitmapFontIcon)GetInteger(reader);
-        }
+    /// <inheritdoc />
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        this.Icon = (BitmapFontIcon)GetInteger(reader);
     }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs
index 06e4dfc76..e3415b2dc 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/ItemPayload.cs
@@ -7,278 +7,277 @@ using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 using Serilog;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload representing an interactable item link.
+/// </summary>
+public class ItemPayload : Payload
 {
+    private Item? item;
+
+    // mainly to allow overriding the name (for things like owo)
+    // TODO: even though this is present in some item links, it may not really have a use at all
+    //   For things like owo, changing the text payload is probably correct, whereas changing the
+    //   actual embedded name might not work properly.
+    private string? displayName;
+
+    [JsonProperty]
+    private uint rawItemId;
+
     /// <summary>
-    /// An SeString Payload representing an interactable item link.
+    /// Initializes a new instance of the <see cref="ItemPayload"/> class.
+    /// Creates a payload representing an interactable item link for the specified item.
     /// </summary>
-    public class ItemPayload : Payload
+    /// <param name="itemId">The id of the item.</param>
+    /// <param name="isHq">Whether or not the link should be for the high-quality variant of the item.</param>
+    /// <param name="displayNameOverride">An optional name to include in the item link.  Typically this should
+    /// be left as null, or set to the normal item name.  Actual overrides are better done with the subsequent
+    /// TextPayload that is a part of a full item link in chat.</param>
+    public ItemPayload(uint itemId, bool isHq, string? displayNameOverride = null)
     {
-        private Item? item;
+        this.rawItemId = itemId;
+        if (isHq)
+            this.rawItemId += (uint)ItemKind.Hq;
 
-        // mainly to allow overriding the name (for things like owo)
-        // TODO: even though this is present in some item links, it may not really have a use at all
-        //   For things like owo, changing the text payload is probably correct, whereas changing the
-        //   actual embedded name might not work properly.
-        private string? displayName;
+        this.Kind = isHq ? ItemKind.Hq : ItemKind.Normal;
+        this.displayName = displayNameOverride;
+    }
 
-        [JsonProperty]
-        private uint rawItemId;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ItemPayload"/> class.
+    /// Creates a payload representing an interactable item link for the specified item.
+    /// </summary>
+    /// <param name="itemId">The id of the item.</param>
+    /// <param name="kind">Kind of item to encode.</param>
+    /// <param name="displayNameOverride">An optional name to include in the item link.  Typically this should
+    /// be left as null, or set to the normal item name.  Actual overrides are better done with the subsequent
+    /// TextPayload that is a part of a full item link in chat.</param>
+    public ItemPayload(uint itemId, ItemKind kind = ItemKind.Normal, string? displayNameOverride = null)
+    {
+        this.Kind = kind;
+        this.rawItemId = itemId;
+        if (kind != ItemKind.EventItem)
+            this.rawItemId += (uint)kind;
+
+        this.displayName = displayNameOverride;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ItemPayload"/> class.
+    /// Creates a payload representing an interactable item link for the specified item.
+    /// </summary>
+    internal ItemPayload()
+    {
+    }
+
+    /// <summary>
+    /// Kinds of items that can be fetched from this payload.
+    /// </summary>
+    public enum ItemKind : uint
+    {
+        /// <summary>
+        /// Normal items.
+        /// </summary>
+        Normal,
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ItemPayload"/> class.
-        /// Creates a payload representing an interactable item link for the specified item.
+        /// Collectible Items.
         /// </summary>
-        /// <param name="itemId">The id of the item.</param>
-        /// <param name="isHq">Whether or not the link should be for the high-quality variant of the item.</param>
-        /// <param name="displayNameOverride">An optional name to include in the item link.  Typically this should
-        /// be left as null, or set to the normal item name.  Actual overrides are better done with the subsequent
-        /// TextPayload that is a part of a full item link in chat.</param>
-        public ItemPayload(uint itemId, bool isHq, string? displayNameOverride = null)
-        {
-            this.rawItemId = itemId;
-            if (isHq)
-                this.rawItemId += (uint)ItemKind.Hq;
+        Collectible = 500_000,
 
-            this.Kind = isHq ? ItemKind.Hq : ItemKind.Normal;
-            this.displayName = displayNameOverride;
+        /// <summary>
+        /// High-Quality items.
+        /// </summary>
+        Hq = 1_000_000,
+
+        /// <summary>
+        /// Event/Key items.
+        /// </summary>
+        EventItem = 2_000_000,
+    }
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.Item;
+
+    /// <summary>
+    /// Gets or sets the displayed name for this item link.  Note that incoming links only sometimes have names embedded,
+    /// often the name is only present in a following text payload.
+    /// </summary>
+    public string? DisplayName
+    {
+        get
+        {
+            return this.displayName;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ItemPayload"/> class.
-        /// Creates a payload representing an interactable item link for the specified item.
-        /// </summary>
-        /// <param name="itemId">The id of the item.</param>
-        /// <param name="kind">Kind of item to encode.</param>
-        /// <param name="displayNameOverride">An optional name to include in the item link.  Typically this should
-        /// be left as null, or set to the normal item name.  Actual overrides are better done with the subsequent
-        /// TextPayload that is a part of a full item link in chat.</param>
-        public ItemPayload(uint itemId, ItemKind kind = ItemKind.Normal, string? displayNameOverride = null)
+        set
         {
-            this.Kind = kind;
-            this.rawItemId = itemId;
-            if (kind != ItemKind.EventItem)
-                this.rawItemId += (uint)kind;
-
-            this.displayName = displayNameOverride;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ItemPayload"/> class.
-        /// Creates a payload representing an interactable item link for the specified item.
-        /// </summary>
-        internal ItemPayload()
-        {
-        }
-
-        /// <summary>
-        /// Kinds of items that can be fetched from this payload.
-        /// </summary>
-        public enum ItemKind : uint
-        {
-            /// <summary>
-            /// Normal items.
-            /// </summary>
-            Normal,
-
-            /// <summary>
-            /// Collectible Items.
-            /// </summary>
-            Collectible = 500_000,
-
-            /// <summary>
-            /// High-Quality items.
-            /// </summary>
-            Hq = 1_000_000,
-
-            /// <summary>
-            /// Event/Key items.
-            /// </summary>
-            EventItem = 2_000_000,
-        }
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.Item;
-
-        /// <summary>
-        /// Gets or sets the displayed name for this item link.  Note that incoming links only sometimes have names embedded,
-        /// often the name is only present in a following text payload.
-        /// </summary>
-        public string? DisplayName
-        {
-            get
-            {
-                return this.displayName;
-            }
-
-            set
-            {
-                this.displayName = value;
-                this.Dirty = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets the actual item ID of this payload.
-        /// </summary>
-        [JsonIgnore]
-        public uint ItemId => GetAdjustedId(this.rawItemId).ItemId;
-
-        /// <summary>
-        /// Gets the raw, unadjusted item ID of this payload.
-        /// </summary>
-        [JsonIgnore]
-        public uint RawItemId => this.rawItemId;
-
-        /// <summary>
-        /// Gets the underlying Lumina Item represented by this payload.
-        /// </summary>
-        /// <remarks>
-        /// The value is evaluated lazily and cached.
-        /// </remarks>
-        [JsonIgnore]
-        public Item? Item
-        {
-            get
-            {
-                // TODO(goat): This should be revamped/removed on an API level change.
-                if (this.Kind == ItemKind.EventItem)
-                {
-                    Log.Warning("Event items cannot be fetched from the ItemPayload");
-                    return null;
-                }
-
-                this.item ??= this.DataResolver.GetExcelSheet<Item>()!.GetRow(this.ItemId);
-                return this.item;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether or not this item link is for a high-quality version of the item.
-        /// </summary>
-        [JsonProperty]
-        public bool IsHQ => this.Kind == ItemKind.Hq;
-
-        /// <summary>
-        /// Gets or sets the kind of item represented by this payload.
-        /// </summary>
-        [JsonProperty]
-        public ItemKind Kind { get; set; } = ItemKind.Normal;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ItemPayload"/> class.
-        /// Creates a payload representing an interactable item link for the specified item.
-        /// </summary>
-        /// <param name="rawItemId">The raw, unadjusted id of the item.</param>
-        /// <param name="displayNameOverride">An optional name to include in the item link.  Typically this should
-        /// be left as null, or set to the normal item name.  Actual overrides are better done with the subsequent
-        /// TextPayload that is a part of a full item link in chat.</param>
-        /// <returns>The created item payload.</returns>
-        public static ItemPayload FromRaw(uint rawItemId, string? displayNameOverride = null)
-        {
-            var (id, kind) = GetAdjustedId(rawItemId);
-            return new ItemPayload(id, kind, displayNameOverride);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"{this.Type} - ItemId: {this.ItemId}, Kind: {this.Kind}, Name: {this.displayName ?? this.Item?.Name}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            var idBytes = MakeInteger(this.rawItemId);
-            var hasName = !string.IsNullOrEmpty(this.displayName);
-
-            var chunkLen = idBytes.Length + 4;
-            if (hasName)
-            {
-                // 1 additional unknown byte compared to the nameless version, 1 byte for the name length, and then the name itself
-                chunkLen += 1 + 1 + this.displayName.Length;
-                if (this.IsHQ)
-                {
-                    chunkLen += 4;  // unicode representation of the HQ symbol is 3 bytes, preceded by a space
-                }
-            }
-
-            var bytes = new List<byte>()
-            {
-                START_BYTE,
-                (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.ItemLink,
-            };
-            bytes.AddRange(idBytes);
-            // unk
-            bytes.AddRange(new byte[] { 0x02, 0x01 });
-
-            // Links don't have to include the name, but if they do, it requires additional work
-            if (hasName)
-            {
-                var nameLen = this.displayName.Length + 1;
-                if (this.IsHQ)
-                {
-                    nameLen += 4;   // space plus 3 bytes for HQ symbol
-                }
-
-                bytes.AddRange(new byte[]
-                {
-                    0xFF,   // unk
-                    (byte)nameLen,
-                });
-                bytes.AddRange(Encoding.UTF8.GetBytes(this.displayName));
-
-                if (this.IsHQ)
-                {
-                    // space and HQ symbol
-                    bytes.AddRange(new byte[] { 0x20, 0xEE, 0x80, 0xBC });
-                }
-            }
-
-            bytes.Add(END_BYTE);
-
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            this.rawItemId = GetInteger(reader);
-            this.Kind = GetAdjustedId(this.rawItemId).Kind;
-
-            if (reader.BaseStream.Position + 3 < endOfStream)
-            {
-                // unk
-                reader.ReadBytes(3);
-
-                var itemNameLen = (int)GetInteger(reader);
-                var itemNameBytes = reader.ReadBytes(itemNameLen);
-
-                // it probably isn't necessary to store this, as we now get the lumina Item
-                // on demand from the id, which will have the name
-                // For incoming links, the name "should?" always match
-                // but we'll store it for use in encode just in case it doesn't
-
-                // HQ items have the HQ symbol as part of the name, but since we already recorded
-                // the HQ flag, we want just the bare name
-                if (this.IsHQ)
-                {
-                    itemNameBytes = itemNameBytes.Take(itemNameLen - 4).ToArray();
-                }
-
-                this.displayName = Encoding.UTF8.GetString(itemNameBytes);
-            }
-        }
-
-        private static (uint ItemId, ItemKind Kind) GetAdjustedId(uint rawItemId)
-        {
-            return rawItemId switch
-            {
-                > 500_000 and < 1_000_000 => (rawItemId - 500_000, ItemKind.Collectible),
-                > 1_000_000 and < 2_000_000 => (rawItemId - 1_000_000, ItemKind.Hq),
-                > 2_000_000 => (rawItemId, ItemKind.EventItem), // EventItem IDs are NOT adjusted
-                _ => (rawItemId, ItemKind.Normal),
-            };
+            this.displayName = value;
+            this.Dirty = true;
         }
     }
+
+    /// <summary>
+    /// Gets the actual item ID of this payload.
+    /// </summary>
+    [JsonIgnore]
+    public uint ItemId => GetAdjustedId(this.rawItemId).ItemId;
+
+    /// <summary>
+    /// Gets the raw, unadjusted item ID of this payload.
+    /// </summary>
+    [JsonIgnore]
+    public uint RawItemId => this.rawItemId;
+
+    /// <summary>
+    /// Gets the underlying Lumina Item represented by this payload.
+    /// </summary>
+    /// <remarks>
+    /// The value is evaluated lazily and cached.
+    /// </remarks>
+    [JsonIgnore]
+    public Item? Item
+    {
+        get
+        {
+            // TODO(goat): This should be revamped/removed on an API level change.
+            if (this.Kind == ItemKind.EventItem)
+            {
+                Log.Warning("Event items cannot be fetched from the ItemPayload");
+                return null;
+            }
+
+            this.item ??= this.DataResolver.GetExcelSheet<Item>()!.GetRow(this.ItemId);
+            return this.item;
+        }
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether or not this item link is for a high-quality version of the item.
+    /// </summary>
+    [JsonProperty]
+    public bool IsHQ => this.Kind == ItemKind.Hq;
+
+    /// <summary>
+    /// Gets or sets the kind of item represented by this payload.
+    /// </summary>
+    [JsonProperty]
+    public ItemKind Kind { get; set; } = ItemKind.Normal;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ItemPayload"/> class.
+    /// Creates a payload representing an interactable item link for the specified item.
+    /// </summary>
+    /// <param name="rawItemId">The raw, unadjusted id of the item.</param>
+    /// <param name="displayNameOverride">An optional name to include in the item link.  Typically this should
+    /// be left as null, or set to the normal item name.  Actual overrides are better done with the subsequent
+    /// TextPayload that is a part of a full item link in chat.</param>
+    /// <returns>The created item payload.</returns>
+    public static ItemPayload FromRaw(uint rawItemId, string? displayNameOverride = null)
+    {
+        var (id, kind) = GetAdjustedId(rawItemId);
+        return new ItemPayload(id, kind, displayNameOverride);
+    }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{this.Type} - ItemId: {this.ItemId}, Kind: {this.Kind}, Name: {this.displayName ?? this.Item?.Name}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        var idBytes = MakeInteger(this.rawItemId);
+        var hasName = !string.IsNullOrEmpty(this.displayName);
+
+        var chunkLen = idBytes.Length + 4;
+        if (hasName)
+        {
+            // 1 additional unknown byte compared to the nameless version, 1 byte for the name length, and then the name itself
+            chunkLen += 1 + 1 + this.displayName.Length;
+            if (this.IsHQ)
+            {
+                chunkLen += 4; // unicode representation of the HQ symbol is 3 bytes, preceded by a space
+            }
+        }
+
+        var bytes = new List<byte>()
+        {
+            START_BYTE,
+            (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.ItemLink,
+        };
+        bytes.AddRange(idBytes);
+        // unk
+        bytes.AddRange(new byte[] { 0x02, 0x01 });
+
+        // Links don't have to include the name, but if they do, it requires additional work
+        if (hasName)
+        {
+            var nameLen = this.displayName.Length + 1;
+            if (this.IsHQ)
+            {
+                nameLen += 4; // space plus 3 bytes for HQ symbol
+            }
+
+            bytes.AddRange(new byte[]
+            {
+                0xFF, // unk
+                (byte)nameLen,
+            });
+            bytes.AddRange(Encoding.UTF8.GetBytes(this.displayName));
+
+            if (this.IsHQ)
+            {
+                // space and HQ symbol
+                bytes.AddRange(new byte[] { 0x20, 0xEE, 0x80, 0xBC });
+            }
+        }
+
+        bytes.Add(END_BYTE);
+
+        return bytes.ToArray();
+    }
+
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        this.rawItemId = GetInteger(reader);
+        this.Kind = GetAdjustedId(this.rawItemId).Kind;
+
+        if (reader.BaseStream.Position + 3 < endOfStream)
+        {
+            // unk
+            reader.ReadBytes(3);
+
+            var itemNameLen = (int)GetInteger(reader);
+            var itemNameBytes = reader.ReadBytes(itemNameLen);
+
+            // it probably isn't necessary to store this, as we now get the lumina Item
+            // on demand from the id, which will have the name
+            // For incoming links, the name "should?" always match
+            // but we'll store it for use in encode just in case it doesn't
+
+            // HQ items have the HQ symbol as part of the name, but since we already recorded
+            // the HQ flag, we want just the bare name
+            if (this.IsHQ)
+            {
+                itemNameBytes = itemNameBytes.Take(itemNameLen - 4).ToArray();
+            }
+
+            this.displayName = Encoding.UTF8.GetString(itemNameBytes);
+        }
+    }
+
+    private static (uint ItemId, ItemKind Kind) GetAdjustedId(uint rawItemId)
+    {
+        return rawItemId switch
+        {
+            > 500_000 and < 1_000_000 => (rawItemId - 500_000, ItemKind.Collectible),
+            > 1_000_000 and < 2_000_000 => (rawItemId - 1_000_000, ItemKind.Hq),
+            > 2_000_000 => (rawItemId, ItemKind.EventItem), // EventItem IDs are NOT adjusted
+            _ => (rawItemId, ItemKind.Normal),
+        };
+    }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs
index 24b6e8ebe..50945a7ce 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/MapLinkPayload.cs
@@ -5,244 +5,243 @@ using System.IO;
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload representing an interactable map position link.
+/// </summary>
+public class MapLinkPayload : Payload
 {
+    private Map map;
+    private TerritoryType territoryType;
+    private string placeNameRegion;
+    private string placeName;
+
+    [JsonProperty]
+    private uint territoryTypeId;
+
+    [JsonProperty]
+    private uint mapId;
+
     /// <summary>
-    /// An SeString Payload representing an interactable map position link.
+    /// Initializes a new instance of the <see cref="MapLinkPayload"/> class.
+    /// Creates an interactable MapLinkPayload from a human-readable position.
     /// </summary>
-    public class MapLinkPayload : Payload
+    /// <param name="territoryTypeId">The id of the TerritoryType entry for this link.</param>
+    /// <param name="mapId">The id of the Map entry for this link.</param>
+    /// <param name="niceXCoord">The human-readable x-coordinate for this link.</param>
+    /// <param name="niceYCoord">The human-readable y-coordinate for this link.</param>
+    /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
+    public MapLinkPayload(uint territoryTypeId, uint mapId, float niceXCoord, float niceYCoord, float fudgeFactor = 0.05f)
     {
-        private Map map;
-        private TerritoryType territoryType;
-        private string placeNameRegion;
-        private string placeName;
-
-        [JsonProperty]
-        private uint territoryTypeId;
-
-        [JsonProperty]
-        private uint mapId;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MapLinkPayload"/> class.
-        /// Creates an interactable MapLinkPayload from a human-readable position.
-        /// </summary>
-        /// <param name="territoryTypeId">The id of the TerritoryType entry for this link.</param>
-        /// <param name="mapId">The id of the Map entry for this link.</param>
-        /// <param name="niceXCoord">The human-readable x-coordinate for this link.</param>
-        /// <param name="niceYCoord">The human-readable y-coordinate for this link.</param>
-        /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
-        public MapLinkPayload(uint territoryTypeId, uint mapId, float niceXCoord, float niceYCoord, float fudgeFactor = 0.05f)
-        {
-            this.territoryTypeId = territoryTypeId;
-            this.mapId = mapId;
-            // this fudge is necessary basically to ensure we don't shift down a full tenth
-            // because essentially values are truncated instead of rounded, so 3.09999f will become
-            // 3.0f and not 3.1f
-            this.RawX = this.ConvertMapCoordinateToRawPosition(niceXCoord + fudgeFactor, this.Map.SizeFactor, this.Map.OffsetX);
-            this.RawY = this.ConvertMapCoordinateToRawPosition(niceYCoord + fudgeFactor, this.Map.SizeFactor, this.Map.OffsetY);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MapLinkPayload"/> class.
-        /// Creates an interactable MapLinkPayload from a raw position.
-        /// </summary>
-        /// <param name="territoryTypeId">The id of the TerritoryType entry for this link.</param>
-        /// <param name="mapId">The id of the Map entry for this link.</param>
-        /// <param name="rawX">The internal raw x-coordinate for this link.</param>
-        /// <param name="rawY">The internal raw y-coordinate for this link.</param>
-        public MapLinkPayload(uint territoryTypeId, uint mapId, int rawX, int rawY)
-        {
-            this.territoryTypeId = territoryTypeId;
-            this.mapId = mapId;
-            this.RawX = rawX;
-            this.RawY = rawY;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MapLinkPayload"/> class.
-        /// Creates an interactable MapLinkPayload from a human-readable position.
-        /// </summary>
-        internal MapLinkPayload()
-        {
-        }
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.MapLink;
-
-        /// <summary>
-        /// Gets the Map specified for this map link.
-        /// </summary>
-        /// <remarks>
-        /// The value is evaluated lazily and cached.
-        /// </remarks>
-        [JsonIgnore]
-        public Map Map => this.map ??= this.DataResolver.GetExcelSheet<Map>().GetRow(this.mapId);
-
-        /// <summary>
-        /// Gets the TerritoryType specified for this map link.
-        /// </summary>
-        /// <remarks>
-        /// The value is evaluated lazily and cached.
-        /// </remarks>
-        [JsonIgnore]
-        public TerritoryType TerritoryType => this.territoryType ??= this.DataResolver.GetExcelSheet<TerritoryType>().GetRow(this.territoryTypeId);
-
-        /// <summary>
-        /// Gets the internal x-coordinate for this map position.
-        /// </summary>
-        public int RawX { get; private set; }
-
-        /// <summary>
-        /// Gets the internal y-coordinate for this map position.
-        /// </summary>
-        public int RawY { get; private set; }
-
-        // these could be cached, but this isn't really too egregious
-
-        /// <summary>
-        /// Gets the readable x-coordinate position for this map link.  This value is approximate and unrounded.
-        /// </summary>
-        public float XCoord => this.ConvertRawPositionToMapCoordinate(this.RawX, this.Map.SizeFactor, this.Map.OffsetX);
-
-        /// <summary>
-        /// Gets the readable y-coordinate position for this map link.  This value is approximate and unrounded.
-        /// </summary>
-        [JsonIgnore]
-        public float YCoord => this.ConvertRawPositionToMapCoordinate(this.RawY, this.Map.SizeFactor, this.Map.OffsetY);
-
-        // there is no Z; it's purely in the text payload where applicable
-
-        /// <summary>
-        /// Gets the printable map coordinates for this link.  This value tries to match the in-game printable text as closely
-        /// as possible but is an approximation and may be slightly off for some positions.
-        /// </summary>
-        [JsonIgnore]
-        public string CoordinateString
-        {
-            get
-            {
-                // this truncates the values to one decimal without rounding, which is what the game does
-                // the fudge also just attempts to correct the truncated/displayed value for rounding/fp issues
-                // TODO: should this fudge factor be the same as in the ctor? currently not since that is customizable
-                const float fudge = 0.02f;
-                var x = Math.Truncate((this.XCoord + fudge) * 10.0f) / 10.0f;
-                var y = Math.Truncate((this.YCoord + fudge) * 10.0f) / 10.0f;
-
-                // the formatting and spacing the game uses
-                return $"( {x:0.0}  , {y:0.0} )";
-            }
-        }
-
-        /// <summary>
-        /// Gets the region name for this map link. This corresponds to the upper zone name found in the actual in-game map UI. eg, "La Noscea".
-        /// </summary>
-        [JsonIgnore]
-        public string PlaceNameRegion => this.placeNameRegion ??= this.TerritoryType.PlaceNameRegion.Value?.Name;
-
-        /// <summary>
-        /// Gets the place name for this map link. This corresponds to the lower zone name found in the actual in-game map UI. eg, "Limsa Lominsa Upper Decks".
-        /// </summary>
-        [JsonIgnore]
-        public string PlaceName => this.placeName ??= this.TerritoryType.PlaceName.Value?.Name;
-
-        /// <summary>
-        /// Gets the data string for this map link, for use by internal game functions that take a string variant and not a binary payload.
-        /// </summary>
-        public string DataString => $"m:{this.TerritoryType.RowId},{this.Map.RowId},{this.RawX},{this.RawY}";
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"{this.Type} - TerritoryTypeId: {this.territoryTypeId}, MapId: {this.mapId}, RawX: {this.RawX}, RawY: {this.RawY}, display: {this.PlaceName} {this.CoordinateString}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            var packedTerritoryAndMapBytes = MakePackedInteger(this.territoryTypeId, this.mapId);
-            var xBytes = MakeInteger(unchecked((uint)this.RawX));
-            var yBytes = MakeInteger(unchecked((uint)this.RawY));
-
-            var chunkLen = 4 + packedTerritoryAndMapBytes.Length + xBytes.Length + yBytes.Length;
-
-            var bytes = new List<byte>()
-            {
-                START_BYTE,
-                (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.MapPositionLink,
-            };
-
-            bytes.AddRange(packedTerritoryAndMapBytes);
-            bytes.AddRange(xBytes);
-            bytes.AddRange(yBytes);
-
-            // unk
-            bytes.AddRange(new byte[] { 0xFF, 0x01, END_BYTE });
-
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            // for debugging for now
-            var oldPos = reader.BaseStream.Position;
-            var bytes = reader.ReadBytes((int)(endOfStream - reader.BaseStream.Position));
-            reader.BaseStream.Position = oldPos;
-
-            try
-            {
-                (this.territoryTypeId, this.mapId) = GetPackedIntegers(reader);
-                this.RawX = unchecked((int)GetInteger(reader));
-                this.RawY = unchecked((int)GetInteger(reader));
-                // the Z coordinate is never in this chunk, just the text (if applicable)
-
-                // seems to always be FF 01
-                reader.ReadBytes(2);
-            }
-            catch (NotSupportedException)
-            {
-                Serilog.Log.Information($"Unsupported map bytes {BitConverter.ToString(bytes).Replace("-", " ")}");
-                // we still want to break here for now, or we'd just throw again later
-                throw;
-            }
-        }
-
-        #region ugliness
-
-        // from https://github.com/xivapi/ffxiv-datamining/blob/master/docs/MapCoordinates.md
-        // from https://github.com/xivapi/xivapi-mappy/blob/master/Mappy/Helpers/MapHelper.cs
-        // the raw scale from the map needs to be scaled down by a factor of 100
-        // the raw pos also needs to be scaled down by a factor of 1000
-        // the tile scale is ~50, but is exactly 2048/41, more info in the md file
-        private float ConvertRawPositionToMapCoordinate(int pos, float scale, short offset)
-        {
-            // extra 1/1000 because that is how the network ints are done
-            const float networkAdjustment = 1f;
-
-            // scaling
-            var trueScale = scale / 100f;
-            var truePos = pos / 1000f;
-
-            var computedPos = (truePos + offset) * trueScale;
-            // pretty weird formula, but obviously has something to do with the tile scaling
-            return (41f / trueScale * ((computedPos + 1024f) / 2048f)) + networkAdjustment;
-        }
-
-        // Created as the inverse of ConvertRawPositionToMapCoordinate(), since no one seemed to have a version of that
-        private int ConvertMapCoordinateToRawPosition(float pos, float scale, short offset)
-        {
-            const float networkAdjustment = 1f;
-
-            // scaling
-            var trueScale = scale / 100f;
-
-            var num2 = (((pos - networkAdjustment) * trueScale / 41f * 2048f) - 1024f) / trueScale;
-            // (pos - offset) / scale, with the scaling on num2 done before for precision
-            num2 *= 1000f;
-            return (int)num2 - (offset * 1000);
-        }
-
-        #endregion
+        this.territoryTypeId = territoryTypeId;
+        this.mapId = mapId;
+        // this fudge is necessary basically to ensure we don't shift down a full tenth
+        // because essentially values are truncated instead of rounded, so 3.09999f will become
+        // 3.0f and not 3.1f
+        this.RawX = this.ConvertMapCoordinateToRawPosition(niceXCoord + fudgeFactor, this.Map.SizeFactor, this.Map.OffsetX);
+        this.RawY = this.ConvertMapCoordinateToRawPosition(niceYCoord + fudgeFactor, this.Map.SizeFactor, this.Map.OffsetY);
     }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MapLinkPayload"/> class.
+    /// Creates an interactable MapLinkPayload from a raw position.
+    /// </summary>
+    /// <param name="territoryTypeId">The id of the TerritoryType entry for this link.</param>
+    /// <param name="mapId">The id of the Map entry for this link.</param>
+    /// <param name="rawX">The internal raw x-coordinate for this link.</param>
+    /// <param name="rawY">The internal raw y-coordinate for this link.</param>
+    public MapLinkPayload(uint territoryTypeId, uint mapId, int rawX, int rawY)
+    {
+        this.territoryTypeId = territoryTypeId;
+        this.mapId = mapId;
+        this.RawX = rawX;
+        this.RawY = rawY;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MapLinkPayload"/> class.
+    /// Creates an interactable MapLinkPayload from a human-readable position.
+    /// </summary>
+    internal MapLinkPayload()
+    {
+    }
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.MapLink;
+
+    /// <summary>
+    /// Gets the Map specified for this map link.
+    /// </summary>
+    /// <remarks>
+    /// The value is evaluated lazily and cached.
+    /// </remarks>
+    [JsonIgnore]
+    public Map Map => this.map ??= this.DataResolver.GetExcelSheet<Map>().GetRow(this.mapId);
+
+    /// <summary>
+    /// Gets the TerritoryType specified for this map link.
+    /// </summary>
+    /// <remarks>
+    /// The value is evaluated lazily and cached.
+    /// </remarks>
+    [JsonIgnore]
+    public TerritoryType TerritoryType => this.territoryType ??= this.DataResolver.GetExcelSheet<TerritoryType>().GetRow(this.territoryTypeId);
+
+    /// <summary>
+    /// Gets the internal x-coordinate for this map position.
+    /// </summary>
+    public int RawX { get; private set; }
+
+    /// <summary>
+    /// Gets the internal y-coordinate for this map position.
+    /// </summary>
+    public int RawY { get; private set; }
+
+    // these could be cached, but this isn't really too egregious
+
+    /// <summary>
+    /// Gets the readable x-coordinate position for this map link.  This value is approximate and unrounded.
+    /// </summary>
+    public float XCoord => this.ConvertRawPositionToMapCoordinate(this.RawX, this.Map.SizeFactor, this.Map.OffsetX);
+
+    /// <summary>
+    /// Gets the readable y-coordinate position for this map link.  This value is approximate and unrounded.
+    /// </summary>
+    [JsonIgnore]
+    public float YCoord => this.ConvertRawPositionToMapCoordinate(this.RawY, this.Map.SizeFactor, this.Map.OffsetY);
+
+    // there is no Z; it's purely in the text payload where applicable
+
+    /// <summary>
+    /// Gets the printable map coordinates for this link.  This value tries to match the in-game printable text as closely
+    /// as possible but is an approximation and may be slightly off for some positions.
+    /// </summary>
+    [JsonIgnore]
+    public string CoordinateString
+    {
+        get
+        {
+            // this truncates the values to one decimal without rounding, which is what the game does
+            // the fudge also just attempts to correct the truncated/displayed value for rounding/fp issues
+            // TODO: should this fudge factor be the same as in the ctor? currently not since that is customizable
+            const float fudge = 0.02f;
+            var x = Math.Truncate((this.XCoord + fudge) * 10.0f) / 10.0f;
+            var y = Math.Truncate((this.YCoord + fudge) * 10.0f) / 10.0f;
+
+            // the formatting and spacing the game uses
+            return $"( {x:0.0}  , {y:0.0} )";
+        }
+    }
+
+    /// <summary>
+    /// Gets the region name for this map link. This corresponds to the upper zone name found in the actual in-game map UI. eg, "La Noscea".
+    /// </summary>
+    [JsonIgnore]
+    public string PlaceNameRegion => this.placeNameRegion ??= this.TerritoryType.PlaceNameRegion.Value?.Name;
+
+    /// <summary>
+    /// Gets the place name for this map link. This corresponds to the lower zone name found in the actual in-game map UI. eg, "Limsa Lominsa Upper Decks".
+    /// </summary>
+    [JsonIgnore]
+    public string PlaceName => this.placeName ??= this.TerritoryType.PlaceName.Value?.Name;
+
+    /// <summary>
+    /// Gets the data string for this map link, for use by internal game functions that take a string variant and not a binary payload.
+    /// </summary>
+    public string DataString => $"m:{this.TerritoryType.RowId},{this.Map.RowId},{this.RawX},{this.RawY}";
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{this.Type} - TerritoryTypeId: {this.territoryTypeId}, MapId: {this.mapId}, RawX: {this.RawX}, RawY: {this.RawY}, display: {this.PlaceName} {this.CoordinateString}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        var packedTerritoryAndMapBytes = MakePackedInteger(this.territoryTypeId, this.mapId);
+        var xBytes = MakeInteger(unchecked((uint)this.RawX));
+        var yBytes = MakeInteger(unchecked((uint)this.RawY));
+
+        var chunkLen = 4 + packedTerritoryAndMapBytes.Length + xBytes.Length + yBytes.Length;
+
+        var bytes = new List<byte>()
+        {
+            START_BYTE,
+            (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.MapPositionLink,
+        };
+
+        bytes.AddRange(packedTerritoryAndMapBytes);
+        bytes.AddRange(xBytes);
+        bytes.AddRange(yBytes);
+
+        // unk
+        bytes.AddRange(new byte[] { 0xFF, 0x01, END_BYTE });
+
+        return bytes.ToArray();
+    }
+
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        // for debugging for now
+        var oldPos = reader.BaseStream.Position;
+        var bytes = reader.ReadBytes((int)(endOfStream - reader.BaseStream.Position));
+        reader.BaseStream.Position = oldPos;
+
+        try
+        {
+            (this.territoryTypeId, this.mapId) = GetPackedIntegers(reader);
+            this.RawX = unchecked((int)GetInteger(reader));
+            this.RawY = unchecked((int)GetInteger(reader));
+            // the Z coordinate is never in this chunk, just the text (if applicable)
+
+            // seems to always be FF 01
+            reader.ReadBytes(2);
+        }
+        catch (NotSupportedException)
+        {
+            Serilog.Log.Information($"Unsupported map bytes {BitConverter.ToString(bytes).Replace("-", " ")}");
+            // we still want to break here for now, or we'd just throw again later
+            throw;
+        }
+    }
+
+    #region ugliness
+
+    // from https://github.com/xivapi/ffxiv-datamining/blob/master/docs/MapCoordinates.md
+    // from https://github.com/xivapi/xivapi-mappy/blob/master/Mappy/Helpers/MapHelper.cs
+    // the raw scale from the map needs to be scaled down by a factor of 100
+    // the raw pos also needs to be scaled down by a factor of 1000
+    // the tile scale is ~50, but is exactly 2048/41, more info in the md file
+    private float ConvertRawPositionToMapCoordinate(int pos, float scale, short offset)
+    {
+        // extra 1/1000 because that is how the network ints are done
+        const float networkAdjustment = 1f;
+
+        // scaling
+        var trueScale = scale / 100f;
+        var truePos = pos / 1000f;
+
+        var computedPos = (truePos + offset) * trueScale;
+        // pretty weird formula, but obviously has something to do with the tile scaling
+        return (41f / trueScale * ((computedPos + 1024f) / 2048f)) + networkAdjustment;
+    }
+
+    // Created as the inverse of ConvertRawPositionToMapCoordinate(), since no one seemed to have a version of that
+    private int ConvertMapCoordinateToRawPosition(float pos, float scale, short offset)
+    {
+        const float networkAdjustment = 1f;
+
+        // scaling
+        var trueScale = scale / 100f;
+
+        var num2 = (((pos - networkAdjustment) * trueScale / 41f * 2048f) - 1024f) / trueScale;
+        // (pos - offset) / scale, with the scaling on num2 done before for precision
+        num2 *= 1000f;
+        return (int)num2 - (offset * 1000);
+    }
+
+    #endregion
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs
index 13aba8077..3df724e75 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/NewLinePayload.cs
@@ -1,34 +1,33 @@
 using System;
 using System.IO;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// A wrapped newline character.
+/// </summary>
+public class NewLinePayload : Payload, ITextProvider
 {
+    private readonly byte[] bytes = { START_BYTE, (byte)SeStringChunkType.NewLine, 0x01, END_BYTE };
+
     /// <summary>
-    /// A wrapped newline character.
+    /// Gets an instance of NewLinePayload.
     /// </summary>
-    public class NewLinePayload : Payload, ITextProvider
+    public static NewLinePayload Payload => new();
+
+    /// <summary>
+    /// Gets the text of this payload, evaluates to <c>Environment.NewLine</c>.
+    /// </summary>
+    public string Text => Environment.NewLine;
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.NewLine;
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl() => this.bytes;
+
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
     {
-        private readonly byte[] bytes = { START_BYTE, (byte)SeStringChunkType.NewLine, 0x01, END_BYTE };
-
-        /// <summary>
-        /// Gets an instance of NewLinePayload.
-        /// </summary>
-        public static NewLinePayload Payload => new();
-
-        /// <summary>
-        /// Gets the text of this payload, evaluates to <c>Environment.NewLine</c>.
-        /// </summary>
-        public string Text => Environment.NewLine;
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.NewLine;
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl() => this.bytes;
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-        }
     }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/PlayerPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/PlayerPayload.cs
index 01d8331e1..b9d6bc896 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/PlayerPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/PlayerPayload.cs
@@ -5,132 +5,131 @@ using System.Text;
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload representing a player link.
+/// </summary>
+public class PlayerPayload : Payload
 {
+    private World world;
+
+    [JsonProperty]
+    private uint serverId;
+
+    [JsonProperty]
+    private string playerName;
+
     /// <summary>
-    /// An SeString Payload representing a player link.
+    /// Initializes a new instance of the <see cref="PlayerPayload"/> class.
+    /// Create a PlayerPayload link for the specified player.
     /// </summary>
-    public class PlayerPayload : Payload
+    /// <param name="playerName">The player's displayed name.</param>
+    /// <param name="serverId">The player's home server id.</param>
+    public PlayerPayload(string playerName, uint serverId)
     {
-        private World world;
+        this.playerName = playerName;
+        this.serverId = serverId;
+    }
 
-        [JsonProperty]
-        private uint serverId;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PlayerPayload"/> class.
+    /// Create a PlayerPayload link for the specified player.
+    /// </summary>
+    internal PlayerPayload()
+    {
+    }
 
-        [JsonProperty]
-        private string playerName;
+    /// <summary>
+    /// Gets the Lumina object representing the player's home server.
+    /// </summary>
+    /// <remarks>
+    /// Value is evaluated lazily and cached.
+    /// </remarks>
+    [JsonIgnore]
+    public World World => this.world ??= this.DataResolver.GetExcelSheet<World>().GetRow(this.serverId);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PlayerPayload"/> class.
-        /// Create a PlayerPayload link for the specified player.
-        /// </summary>
-        /// <param name="playerName">The player's displayed name.</param>
-        /// <param name="serverId">The player's home server id.</param>
-        public PlayerPayload(string playerName, uint serverId)
+    /// <summary>
+    /// Gets or sets the player's displayed name.  This does not contain the server name.
+    /// </summary>
+    [JsonIgnore]
+    public string PlayerName
+    {
+        get
         {
-            this.playerName = playerName;
-            this.serverId = serverId;
+            return this.playerName;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PlayerPayload"/> class.
-        /// Create a PlayerPayload link for the specified player.
-        /// </summary>
-        internal PlayerPayload()
+        set
         {
-        }
-
-        /// <summary>
-        /// Gets the Lumina object representing the player's home server.
-        /// </summary>
-        /// <remarks>
-        /// Value is evaluated lazily and cached.
-        /// </remarks>
-        [JsonIgnore]
-        public World World => this.world ??= this.DataResolver.GetExcelSheet<World>().GetRow(this.serverId);
-
-        /// <summary>
-        /// Gets or sets the player's displayed name.  This does not contain the server name.
-        /// </summary>
-        [JsonIgnore]
-        public string PlayerName
-        {
-            get
-            {
-                return this.playerName;
-            }
-
-            set
-            {
-                this.playerName = value;
-                this.Dirty = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets the text representation of this player link matching how it might appear in-game.
-        /// The world name will always be present.
-        /// </summary>
-        [JsonIgnore]
-        public string DisplayedName => $"{this.PlayerName}{(char)SeIconChar.CrossWorld}{this.World.Name}";
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.Player;
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"{this.Type} - PlayerName: {this.PlayerName}, ServerId: {this.serverId}, ServerName: {this.World.Name}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            var chunkLen = this.playerName.Length + 7;
-            var bytes = new List<byte>()
-            {
-                START_BYTE,
-                (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.PlayerName,
-                /* unk */ 0x01,
-                (byte)(this.serverId + 1), // I didn't want to deal with single-byte values in MakeInteger, so we have to do the +1 manually
-                /* unk */ 0x01,
-                /* unk */ 0xFF,             // these sometimes vary but are frequently this
-                (byte)(this.playerName.Length + 1),
-            };
-
-            bytes.AddRange(Encoding.UTF8.GetBytes(this.playerName));
-            bytes.Add(END_BYTE);
-
-            // TODO: should these really be here? additional payloads should come in separately already...
-
-            // encoded names are followed by the name in plain text again
-            // use the payload parsing for consistency, as this is technically a new chunk
-            bytes.AddRange(new TextPayload(this.playerName).Encode());
-
-            // unsure about this entire packet, but it seems to always follow a name
-            bytes.AddRange(new byte[]
-            {
-                START_BYTE, (byte)SeStringChunkType.Interactable, 0x07, (byte)EmbeddedInfoType.LinkTerminator,
-                0x01, 0x01, 0x01, 0xFF, 0x01,
-                END_BYTE,
-            });
-
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            // unk
-            reader.ReadByte();
-
-            this.serverId = GetInteger(reader);
-
-            // unk
-            reader.ReadBytes(2);
-
-            var nameLen = (int)GetInteger(reader);
-            this.playerName = Encoding.UTF8.GetString(reader.ReadBytes(nameLen));
+            this.playerName = value;
+            this.Dirty = true;
         }
     }
+
+    /// <summary>
+    /// Gets the text representation of this player link matching how it might appear in-game.
+    /// The world name will always be present.
+    /// </summary>
+    [JsonIgnore]
+    public string DisplayedName => $"{this.PlayerName}{(char)SeIconChar.CrossWorld}{this.World.Name}";
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.Player;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{this.Type} - PlayerName: {this.PlayerName}, ServerId: {this.serverId}, ServerName: {this.World.Name}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        var chunkLen = this.playerName.Length + 7;
+        var bytes = new List<byte>()
+        {
+            START_BYTE,
+            (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.PlayerName,
+            /* unk */ 0x01,
+            (byte)(this.serverId + 1), // I didn't want to deal with single-byte values in MakeInteger, so we have to do the +1 manually
+            /* unk */ 0x01,
+            /* unk */ 0xFF, // these sometimes vary but are frequently this
+            (byte)(this.playerName.Length + 1),
+        };
+
+        bytes.AddRange(Encoding.UTF8.GetBytes(this.playerName));
+        bytes.Add(END_BYTE);
+
+        // TODO: should these really be here? additional payloads should come in separately already...
+
+        // encoded names are followed by the name in plain text again
+        // use the payload parsing for consistency, as this is technically a new chunk
+        bytes.AddRange(new TextPayload(this.playerName).Encode());
+
+        // unsure about this entire packet, but it seems to always follow a name
+        bytes.AddRange(new byte[]
+        {
+            START_BYTE, (byte)SeStringChunkType.Interactable, 0x07, (byte)EmbeddedInfoType.LinkTerminator,
+            0x01, 0x01, 0x01, 0xFF, 0x01,
+            END_BYTE,
+        });
+
+        return bytes.ToArray();
+    }
+
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        // unk
+        reader.ReadByte();
+
+        this.serverId = GetInteger(reader);
+
+        // unk
+        reader.ReadBytes(2);
+
+        var nameLen = (int)GetInteger(reader);
+        this.playerName = Encoding.UTF8.GetString(reader.ReadBytes(nameLen));
+    }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/QuestPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/QuestPayload.cs
index d9dca651b..e5b9e635e 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/QuestPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/QuestPayload.cs
@@ -4,75 +4,74 @@ using System.IO;
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload representing an interactable quest link.
+/// </summary>
+public class QuestPayload : Payload
 {
+    private Quest quest;
+
+    [JsonProperty]
+    private uint questId;
+
     /// <summary>
-    /// An SeString Payload representing an interactable quest link.
+    /// Initializes a new instance of the <see cref="QuestPayload"/> class.
+    /// Creates a payload representing an interactable quest link for the specified quest.
     /// </summary>
-    public class QuestPayload : Payload
+    /// <param name="questId">The id of the quest.</param>
+    public QuestPayload(uint questId)
     {
-        private Quest quest;
+        this.questId = questId;
+    }
 
-        [JsonProperty]
-        private uint questId;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="QuestPayload"/> class.
+    /// Creates a payload representing an interactable quest link for the specified quest.
+    /// </summary>
+    internal QuestPayload()
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QuestPayload"/> class.
-        /// Creates a payload representing an interactable quest link for the specified quest.
-        /// </summary>
-        /// <param name="questId">The id of the quest.</param>
-        public QuestPayload(uint questId)
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.Quest;
+
+    /// <summary>
+    /// Gets the underlying Lumina Quest represented by this payload.
+    /// </summary>
+    /// <remarks>
+    /// The value is evaluated lazily and cached.
+    /// </remarks>
+    [JsonIgnore]
+    public Quest Quest => this.quest ??= this.DataResolver.GetExcelSheet<Quest>().GetRow(this.questId);
+
+    /// <inheritdoc />
+    public override string ToString()
+    {
+        return $"{this.Type} - QuestId: {this.questId}, Name: {this.Quest?.Name ?? "QUEST NOT FOUND"}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        var idBytes = MakeInteger((ushort)this.questId);
+        var chunkLen = idBytes.Length + 4;
+
+        var bytes = new List<byte>()
         {
-            this.questId = questId;
-        }
+            START_BYTE, (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.QuestLink,
+        };
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QuestPayload"/> class.
-        /// Creates a payload representing an interactable quest link for the specified quest.
-        /// </summary>
-        internal QuestPayload()
-        {
-        }
+        bytes.AddRange(idBytes);
+        bytes.AddRange(new byte[] { 0x01, 0x01, END_BYTE });
+        return bytes.ToArray();
+    }
 
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.Quest;
-
-        /// <summary>
-        /// Gets the underlying Lumina Quest represented by this payload.
-        /// </summary>
-        /// <remarks>
-        /// The value is evaluated lazily and cached.
-        /// </remarks>
-        [JsonIgnore]
-        public Quest Quest => this.quest ??= this.DataResolver.GetExcelSheet<Quest>().GetRow(this.questId);
-
-        /// <inheritdoc />
-        public override string ToString()
-        {
-            return $"{this.Type} - QuestId: {this.questId}, Name: {this.Quest?.Name ?? "QUEST NOT FOUND"}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            var idBytes = MakeInteger((ushort)this.questId);
-            var chunkLen = idBytes.Length + 4;
-
-            var bytes = new List<byte>()
-            {
-                START_BYTE, (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.QuestLink,
-            };
-
-            bytes.AddRange(idBytes);
-            bytes.AddRange(new byte[] { 0x01, 0x01, END_BYTE });
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            // Game uses int16, Luimina uses int32
-            this.questId = GetInteger(reader) + 65536;
-        }
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        // Game uses int16, Luimina uses int32
+        this.questId = GetInteger(reader) + 65536;
     }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs
index 0d80f015d..c42805b92 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/RawPayload.cs
@@ -5,116 +5,115 @@ using System.Linq;
 
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload representing unhandled raw payload data.
+/// Mainly useful for constructing unhandled hardcoded payloads, or forwarding any unknown
+/// payloads without modification.
+/// </summary>
+public class RawPayload : Payload
 {
+    [JsonProperty]
+    private byte chunkType;
+
+    [JsonProperty]
+    private byte[] data;
+
     /// <summary>
-    /// An SeString Payload representing unhandled raw payload data.
-    /// Mainly useful for constructing unhandled hardcoded payloads, or forwarding any unknown
-    /// payloads without modification.
+    /// Initializes a new instance of the <see cref="RawPayload"/> class.
     /// </summary>
-    public class RawPayload : Payload
+    /// <param name="data">The payload data.</param>
+    public RawPayload(byte[] data)
     {
-        [JsonProperty]
-        private byte chunkType;
+        // this payload is 'special' in that we require the entire chunk to be passed in
+        // and not just the data after the header
+        // This sets data to hold the chunk data fter the header, excluding the END_BYTE
+        this.chunkType = data[1];
+        this.data = data.Skip(3).Take(data.Length - 4).ToArray();
+    }
 
-        [JsonProperty]
-        private byte[] data;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RawPayload"/> class.
+    /// </summary>
+    /// <param name="chunkType">The chunk type.</param>
+    [JsonConstructor]
+    internal RawPayload(byte chunkType)
+    {
+        this.chunkType = chunkType;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RawPayload"/> class.
-        /// </summary>
-        /// <param name="data">The payload data.</param>
-        public RawPayload(byte[] data)
+    /// <summary>
+    /// Gets a fixed Payload representing a common link-termination sequence, found in many payload chains.
+    /// </summary>
+    public static RawPayload LinkTerminator => new(new byte[] { 0x02, 0x27, 0x07, 0xCF, 0x01, 0x01, 0x01, 0xFF, 0x01, 0x03 });
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.Unknown;
+
+    /// <summary>
+    /// Gets the entire payload byte sequence for this payload.
+    /// The returned data is a clone and modifications will not be persisted.
+    /// </summary>
+    [JsonIgnore]
+    public byte[] Data
+    {
+        // this is a bit different from the underlying data
+        // We need to store just the chunk data for decode to behave nicely, but when reading data out
+        // it makes more sense to get the entire payload
+        get
         {
-            // this payload is 'special' in that we require the entire chunk to be passed in
-            // and not just the data after the header
-            // This sets data to hold the chunk data fter the header, excluding the END_BYTE
-            this.chunkType = data[1];
-            this.data = data.Skip(3).Take(data.Length - 4).ToArray();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RawPayload"/> class.
-        /// </summary>
-        /// <param name="chunkType">The chunk type.</param>
-        [JsonConstructor]
-        internal RawPayload(byte chunkType)
-        {
-            this.chunkType = chunkType;
-        }
-
-        /// <summary>
-        /// Gets a fixed Payload representing a common link-termination sequence, found in many payload chains.
-        /// </summary>
-        public static RawPayload LinkTerminator => new(new byte[] { 0x02, 0x27, 0x07, 0xCF, 0x01, 0x01, 0x01, 0xFF, 0x01, 0x03 });
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.Unknown;
-
-        /// <summary>
-        /// Gets the entire payload byte sequence for this payload.
-        /// The returned data is a clone and modifications will not be persisted.
-        /// </summary>
-        [JsonIgnore]
-        public byte[] Data
-        {
-            // this is a bit different from the underlying data
-            // We need to store just the chunk data for decode to behave nicely, but when reading data out
-            // it makes more sense to get the entire payload
-            get
-            {
-                // for now don't allow modifying the contents
-                // because we don't really have a way to track Dirty
-                return (byte[])this.Encode().Clone();
-            }
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            if (obj is RawPayload rp)
-            {
-                if (rp.Data.Length != this.Data.Length) return false;
-                return !this.Data.Where((t, i) => rp.Data[i] != t).Any();
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(this.Type, this.chunkType, this.data);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"{this.Type} - Data: {BitConverter.ToString(this.Data).Replace("-", " ")}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            var chunkLen = this.data.Length + 1;
-
-            var bytes = new List<byte>()
-            {
-                START_BYTE,
-                this.chunkType,
-                (byte)chunkLen,
-            };
-            bytes.AddRange(this.data);
-
-            bytes.Add(END_BYTE);
-
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            this.data = reader.ReadBytes((int)(endOfStream - reader.BaseStream.Position + 1));
+            // for now don't allow modifying the contents
+            // because we don't really have a way to track Dirty
+            return (byte[])this.Encode().Clone();
         }
     }
+
+    /// <inheritdoc/>
+    public override bool Equals(object obj)
+    {
+        if (obj is RawPayload rp)
+        {
+            if (rp.Data.Length != this.Data.Length) return false;
+            return !this.Data.Where((t, i) => rp.Data[i] != t).Any();
+        }
+
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(this.Type, this.chunkType, this.data);
+    }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{this.Type} - Data: {BitConverter.ToString(this.Data).Replace("-", " ")}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        var chunkLen = this.data.Length + 1;
+
+        var bytes = new List<byte>()
+        {
+            START_BYTE,
+            this.chunkType,
+            (byte)chunkLen,
+        };
+        bytes.AddRange(this.data);
+
+        bytes.Add(END_BYTE);
+
+        return bytes.ToArray();
+    }
+
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        this.data = reader.ReadBytes((int)(endOfStream - reader.BaseStream.Position + 1));
+    }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/SeHyphenPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/SeHyphenPayload.cs
index bb50f6a02..1739b9cda 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/SeHyphenPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/SeHyphenPayload.cs
@@ -1,33 +1,32 @@
 using System.IO;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// A wrapped '–'.
+/// </summary>
+public class SeHyphenPayload : Payload, ITextProvider
 {
+    private readonly byte[] bytes = { START_BYTE, (byte)SeStringChunkType.SeHyphen, 0x01, END_BYTE };
+
     /// <summary>
-    /// A wrapped '–'.
+    /// Gets an instance of SeHyphenPayload.
     /// </summary>
-    public class SeHyphenPayload : Payload, ITextProvider
+    public static SeHyphenPayload Payload => new();
+
+    /// <summary>
+    /// Gets the text, just a '–'.
+    /// </summary>
+    public string Text => "–";
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.SeHyphen;
+
+    /// <inheritdoc />
+    protected override byte[] EncodeImpl() => this.bytes;
+
+    /// <inheritdoc />
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
     {
-        private readonly byte[] bytes = { START_BYTE, (byte)SeStringChunkType.SeHyphen, 0x01, END_BYTE };
-
-        /// <summary>
-        /// Gets an instance of SeHyphenPayload.
-        /// </summary>
-        public static SeHyphenPayload Payload => new();
-
-        /// <summary>
-        /// Gets the text, just a '–'.
-        /// </summary>
-        public string Text => "–";
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.SeHyphen;
-
-        /// <inheritdoc />
-        protected override byte[] EncodeImpl() => this.bytes;
-
-        /// <inheritdoc />
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-        }
     }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/StatusPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/StatusPayload.cs
index e7df98ae8..3e10f7659 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/StatusPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/StatusPayload.cs
@@ -4,76 +4,75 @@ using System.IO;
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload representing an interactable status link.
+/// </summary>
+public class StatusPayload : Payload
 {
+    private Status status;
+
+    [JsonProperty]
+    private uint statusId;
+
     /// <summary>
-    /// An SeString Payload representing an interactable status link.
+    /// Initializes a new instance of the <see cref="StatusPayload"/> class.
+    /// Creates a new StatusPayload for the given status id.
     /// </summary>
-    public class StatusPayload : Payload
+    /// <param name="statusId">The id of the Status for this link.</param>
+    public StatusPayload(uint statusId)
     {
-        private Status status;
+        this.statusId = statusId;
+    }
 
-        [JsonProperty]
-        private uint statusId;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StatusPayload"/> class.
+    /// Creates a new StatusPayload for the given status id.
+    /// </summary>
+    internal StatusPayload()
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StatusPayload"/> class.
-        /// Creates a new StatusPayload for the given status id.
-        /// </summary>
-        /// <param name="statusId">The id of the Status for this link.</param>
-        public StatusPayload(uint statusId)
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.Status;
+
+    /// <summary>
+    /// Gets the Lumina Status object represented by this payload.
+    /// </summary>
+    /// <remarks>
+    /// The value is evaluated lazily and cached.
+    /// </remarks>
+    [JsonIgnore]
+    public Status Status => this.status ??= this.DataResolver.GetExcelSheet<Status>().GetRow(this.statusId);
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{this.Type} - StatusId: {this.statusId}, Name: {this.Status.Name}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        var idBytes = MakeInteger(this.statusId);
+
+        var chunkLen = idBytes.Length + 7;
+        var bytes = new List<byte>()
         {
-            this.statusId = statusId;
-        }
+            START_BYTE, (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.Status,
+        };
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StatusPayload"/> class.
-        /// Creates a new StatusPayload for the given status id.
-        /// </summary>
-        internal StatusPayload()
-        {
-        }
+        bytes.AddRange(idBytes);
+        // unk
+        bytes.AddRange(new byte[] { 0x01, 0x01, 0xFF, 0x02, 0x20, END_BYTE });
 
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.Status;
+        return bytes.ToArray();
+    }
 
-        /// <summary>
-        /// Gets the Lumina Status object represented by this payload.
-        /// </summary>
-        /// <remarks>
-        /// The value is evaluated lazily and cached.
-        /// </remarks>
-        [JsonIgnore]
-        public Status Status => this.status ??= this.DataResolver.GetExcelSheet<Status>().GetRow(this.statusId);
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"{this.Type} - StatusId: {this.statusId}, Name: {this.Status.Name}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            var idBytes = MakeInteger(this.statusId);
-
-            var chunkLen = idBytes.Length + 7;
-            var bytes = new List<byte>()
-            {
-                START_BYTE, (byte)SeStringChunkType.Interactable, (byte)chunkLen, (byte)EmbeddedInfoType.Status,
-            };
-
-            bytes.AddRange(idBytes);
-            // unk
-            bytes.AddRange(new byte[] { 0x01, 0x01, 0xFF, 0x02, 0x20, END_BYTE });
-
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            this.statusId = GetInteger(reader);
-        }
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        this.statusId = GetInteger(reader);
     }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/TextPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/TextPayload.cs
index 8242f8b3f..1cb27f4ea 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/TextPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/TextPayload.cs
@@ -5,95 +5,94 @@ using System.Text;
 
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload representing a plain text string.
+/// </summary>
+public class TextPayload : Payload, ITextProvider
 {
+    [JsonProperty]
+    private string? text;
+
     /// <summary>
-    /// An SeString Payload representing a plain text string.
+    /// Initializes a new instance of the <see cref="TextPayload"/> class.
+    /// Creates a new TextPayload for the given text.
     /// </summary>
-    public class TextPayload : Payload, ITextProvider
+    /// <param name="text">The text to include for this payload.</param>
+    public TextPayload(string? text)
     {
-        [JsonProperty]
-        private string? text;
+        this.text = text;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextPayload"/> class.
-        /// Creates a new TextPayload for the given text.
-        /// </summary>
-        /// <param name="text">The text to include for this payload.</param>
-        public TextPayload(string? text)
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TextPayload"/> class.
+    /// Creates a new TextPayload for the given text.
+    /// </summary>
+    internal TextPayload()
+    {
+    }
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.RawText;
+
+    /// <summary>
+    /// Gets or sets the text contained in this payload.
+    /// This may contain SE's special unicode characters.
+    /// </summary>
+    [JsonIgnore]
+    public string? Text
+    {
+        get => this.text;
+
+        set
         {
-            this.text = text;
+            this.text = value;
+            this.Dirty = true;
+        }
+    }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{this.Type} - Text: {this.Text}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        // special case to allow for empty text payloads, so users don't have to check
+        // this may change or go away
+        if (string.IsNullOrEmpty(this.text))
+        {
+            return Array.Empty<byte>();
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextPayload"/> class.
-        /// Creates a new TextPayload for the given text.
-        /// </summary>
-        internal TextPayload()
+        return Encoding.UTF8.GetBytes(this.text);
+    }
+
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        var textBytes = new List<byte>();
+
+        while (reader.BaseStream.Position < endOfStream)
         {
-        }
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.RawText;
-
-        /// <summary>
-        /// Gets or sets the text contained in this payload.
-        /// This may contain SE's special unicode characters.
-        /// </summary>
-        [JsonIgnore]
-        public string? Text
-        {
-            get => this.text;
-
-            set
+            var nextByte = reader.ReadByte();
+            if (nextByte == START_BYTE)
             {
-                this.text = value;
-                this.Dirty = true;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"{this.Type} - Text: {this.Text}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            // special case to allow for empty text payloads, so users don't have to check
-            // this may change or go away
-            if (string.IsNullOrEmpty(this.text))
-            {
-                return Array.Empty<byte>();
+                // rewind since this byte isn't part of this payload
+                reader.BaseStream.Position--;
+                break;
             }
 
-            return Encoding.UTF8.GetBytes(this.text);
+            textBytes.Add(nextByte);
         }
 
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+        if (textBytes.Count > 0)
         {
-            var textBytes = new List<byte>();
-
-            while (reader.BaseStream.Position < endOfStream)
-            {
-                var nextByte = reader.ReadByte();
-                if (nextByte == START_BYTE)
-                {
-                    // rewind since this byte isn't part of this payload
-                    reader.BaseStream.Position--;
-                    break;
-                }
-
-                textBytes.Add(nextByte);
-            }
-
-            if (textBytes.Count > 0)
-            {
-                // TODO: handling of the game's assorted special unicode characters
-                this.text = Encoding.UTF8.GetString(textBytes.ToArray());
-            }
+            // TODO: handling of the game's assorted special unicode characters
+            this.text = Encoding.UTF8.GetString(textBytes.ToArray());
         }
     }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/UIForegroundPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/UIForegroundPayload.cs
index 4934004bf..0586089f8 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/UIForegroundPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/UIForegroundPayload.cs
@@ -4,111 +4,110 @@ using System.IO;
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload representing a UI foreground color applied to following text payloads.
+/// </summary>
+public class UIForegroundPayload : Payload
 {
+    private UIColor color;
+
+    [JsonProperty]
+    private ushort colorKey;
+
     /// <summary>
-    /// An SeString Payload representing a UI foreground color applied to following text payloads.
+    /// Initializes a new instance of the <see cref="UIForegroundPayload"/> class.
+    /// Creates a new UIForegroundPayload for the given UIColor key.
     /// </summary>
-    public class UIForegroundPayload : Payload
+    /// <param name="colorKey">A UIColor key.</param>
+    public UIForegroundPayload(ushort colorKey)
     {
-        private UIColor color;
+        this.colorKey = colorKey;
+    }
 
-        [JsonProperty]
-        private ushort colorKey;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="UIForegroundPayload"/> class.
+    /// Creates a new UIForegroundPayload for the given UIColor key.
+    /// </summary>
+    internal UIForegroundPayload()
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UIForegroundPayload"/> class.
-        /// Creates a new UIForegroundPayload for the given UIColor key.
-        /// </summary>
-        /// <param name="colorKey">A UIColor key.</param>
-        public UIForegroundPayload(ushort colorKey)
+    /// <summary>
+    /// Gets a payload representing disabling foreground color on following text.
+    /// </summary>
+    // TODO Make this work with DI
+    public static UIForegroundPayload UIForegroundOff => new(0);
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.UIForeground;
+
+    /// <summary>
+    /// Gets a value indicating whether or not this payload represents applying a foreground color, or disabling one.
+    /// </summary>
+    public bool IsEnabled => this.ColorKey != 0;
+
+    /// <summary>
+    /// Gets a Lumina UIColor object representing this payload.  The actual color data is at UIColor.UIForeground.
+    /// </summary>
+    /// <remarks>
+    /// The value is evaluated lazily and cached.
+    /// </remarks>
+    [JsonIgnore]
+    public UIColor UIColor => this.color ??= this.DataResolver.GetExcelSheet<UIColor>().GetRow(this.colorKey);
+
+    /// <summary>
+    /// Gets or sets the color key used as a lookup in the UIColor table for this foreground color.
+    /// </summary>
+    [JsonIgnore]
+    public ushort ColorKey
+    {
+        get
         {
-            this.colorKey = colorKey;
+            return this.colorKey;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UIForegroundPayload"/> class.
-        /// Creates a new UIForegroundPayload for the given UIColor key.
-        /// </summary>
-        internal UIForegroundPayload()
+        set
         {
-        }
-
-        /// <summary>
-        /// Gets a payload representing disabling foreground color on following text.
-        /// </summary>
-        // TODO Make this work with DI
-        public static UIForegroundPayload UIForegroundOff => new(0);
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.UIForeground;
-
-        /// <summary>
-        /// Gets a value indicating whether or not this payload represents applying a foreground color, or disabling one.
-        /// </summary>
-        public bool IsEnabled => this.ColorKey != 0;
-
-        /// <summary>
-        /// Gets a Lumina UIColor object representing this payload.  The actual color data is at UIColor.UIForeground.
-        /// </summary>
-        /// <remarks>
-        /// The value is evaluated lazily and cached.
-        /// </remarks>
-        [JsonIgnore]
-        public UIColor UIColor => this.color ??= this.DataResolver.GetExcelSheet<UIColor>().GetRow(this.colorKey);
-
-        /// <summary>
-        /// Gets or sets the color key used as a lookup in the UIColor table for this foreground color.
-        /// </summary>
-        [JsonIgnore]
-        public ushort ColorKey
-        {
-            get
-            {
-                return this.colorKey;
-            }
-
-            set
-            {
-                this.colorKey = value;
-                this.color = null;
-                this.Dirty = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets the Red/Green/Blue values for this foreground color, encoded as a typical hex color.
-        /// </summary>
-        [JsonIgnore]
-        public uint RGB => this.UIColor.UIForeground & 0xFFFFFF;
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"{this.Type} - UIColor: {this.colorKey} color: {(this.IsEnabled ? this.RGB : 0)}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            var colorBytes = MakeInteger(this.colorKey);
-            var chunkLen = colorBytes.Length + 1;
-
-            var bytes = new List<byte>(new byte[]
-            {
-                START_BYTE, (byte)SeStringChunkType.UIForeground, (byte)chunkLen,
-            });
-
-            bytes.AddRange(colorBytes);
-            bytes.Add(END_BYTE);
-
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            this.colorKey = (ushort)GetInteger(reader);
+            this.colorKey = value;
+            this.color = null;
+            this.Dirty = true;
         }
     }
+
+    /// <summary>
+    /// Gets the Red/Green/Blue values for this foreground color, encoded as a typical hex color.
+    /// </summary>
+    [JsonIgnore]
+    public uint RGB => this.UIColor.UIForeground & 0xFFFFFF;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{this.Type} - UIColor: {this.colorKey} color: {(this.IsEnabled ? this.RGB : 0)}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        var colorBytes = MakeInteger(this.colorKey);
+        var chunkLen = colorBytes.Length + 1;
+
+        var bytes = new List<byte>(new byte[]
+        {
+            START_BYTE, (byte)SeStringChunkType.UIForeground, (byte)chunkLen,
+        });
+
+        bytes.AddRange(colorBytes);
+        bytes.Add(END_BYTE);
+
+        return bytes.ToArray();
+    }
+
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        this.colorKey = (ushort)GetInteger(reader);
+    }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/Payloads/UIGlowPayload.cs b/Dalamud/Game/Text/SeStringHandling/Payloads/UIGlowPayload.cs
index 480aae24a..0d9081c08 100644
--- a/Dalamud/Game/Text/SeStringHandling/Payloads/UIGlowPayload.cs
+++ b/Dalamud/Game/Text/SeStringHandling/Payloads/UIGlowPayload.cs
@@ -4,111 +4,110 @@ using System.IO;
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Text.SeStringHandling.Payloads
+namespace Dalamud.Game.Text.SeStringHandling.Payloads;
+
+/// <summary>
+/// An SeString Payload representing a UI glow color applied to following text payloads.
+/// </summary>
+public class UIGlowPayload : Payload
 {
+    private UIColor color;
+
+    [JsonProperty]
+    private ushort colorKey;
+
     /// <summary>
-    /// An SeString Payload representing a UI glow color applied to following text payloads.
+    /// Initializes a new instance of the <see cref="UIGlowPayload"/> class.
+    /// Creates a new UIForegroundPayload for the given UIColor key.
     /// </summary>
-    public class UIGlowPayload : Payload
+    /// <param name="colorKey">A UIColor key.</param>
+    public UIGlowPayload(ushort colorKey)
     {
-        private UIColor color;
+        this.colorKey = colorKey;
+    }
 
-        [JsonProperty]
-        private ushort colorKey;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="UIGlowPayload"/> class.
+    /// Creates a new UIForegroundPayload for the given UIColor key.
+    /// </summary>
+    internal UIGlowPayload()
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UIGlowPayload"/> class.
-        /// Creates a new UIForegroundPayload for the given UIColor key.
-        /// </summary>
-        /// <param name="colorKey">A UIColor key.</param>
-        public UIGlowPayload(ushort colorKey)
+    /// <summary>
+    /// Gets a payload representing disabling glow color on following text.
+    /// </summary>
+    // TODO Make this work with DI
+    public static UIGlowPayload UIGlowOff => new(0);
+
+    /// <inheritdoc/>
+    public override PayloadType Type => PayloadType.UIGlow;
+
+    /// <summary>
+    /// Gets or sets the color key used as a lookup in the UIColor table for this glow color.
+    /// </summary>
+    [JsonIgnore]
+    public ushort ColorKey
+    {
+        get
         {
-            this.colorKey = colorKey;
+            return this.colorKey;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UIGlowPayload"/> class.
-        /// Creates a new UIForegroundPayload for the given UIColor key.
-        /// </summary>
-        internal UIGlowPayload()
+        set
         {
-        }
-
-        /// <summary>
-        /// Gets a payload representing disabling glow color on following text.
-        /// </summary>
-        // TODO Make this work with DI
-        public static UIGlowPayload UIGlowOff => new(0);
-
-        /// <inheritdoc/>
-        public override PayloadType Type => PayloadType.UIGlow;
-
-        /// <summary>
-        /// Gets or sets the color key used as a lookup in the UIColor table for this glow color.
-        /// </summary>
-        [JsonIgnore]
-        public ushort ColorKey
-        {
-            get
-            {
-                return this.colorKey;
-            }
-
-            set
-            {
-                this.colorKey = value;
-                this.color = null;
-                this.Dirty = true;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether or not this payload represents applying a glow color, or disabling one.
-        /// </summary>
-        public bool IsEnabled => this.ColorKey != 0;
-
-        /// <summary>
-        /// Gets the Red/Green/Blue values for this glow color, encoded as a typical hex color.
-        /// </summary>
-        [JsonIgnore]
-        public uint RGB => this.UIColor.UIGlow & 0xFFFFFF;
-
-        /// <summary>
-        /// Gets a Lumina UIColor object representing this payload.  The actual color data is at UIColor.UIGlow.
-        /// </summary>
-        /// <remarks>
-        /// The value is evaluated lazily and cached.
-        /// </remarks>
-        [JsonIgnore]
-        public UIColor UIColor => this.color ??= this.DataResolver.GetExcelSheet<UIColor>().GetRow(this.colorKey);
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"{this.Type} - UIColor: {this.colorKey} color: {(this.IsEnabled ? this.RGB : 0)}";
-        }
-
-        /// <inheritdoc/>
-        protected override byte[] EncodeImpl()
-        {
-            var colorBytes = MakeInteger(this.colorKey);
-            var chunkLen = colorBytes.Length + 1;
-
-            var bytes = new List<byte>(new byte[]
-            {
-                START_BYTE, (byte)SeStringChunkType.UIGlow, (byte)chunkLen,
-            });
-
-            bytes.AddRange(colorBytes);
-            bytes.Add(END_BYTE);
-
-            return bytes.ToArray();
-        }
-
-        /// <inheritdoc/>
-        protected override void DecodeImpl(BinaryReader reader, long endOfStream)
-        {
-            this.colorKey = (ushort)GetInteger(reader);
+            this.colorKey = value;
+            this.color = null;
+            this.Dirty = true;
         }
     }
+
+    /// <summary>
+    /// Gets a value indicating whether or not this payload represents applying a glow color, or disabling one.
+    /// </summary>
+    public bool IsEnabled => this.ColorKey != 0;
+
+    /// <summary>
+    /// Gets the Red/Green/Blue values for this glow color, encoded as a typical hex color.
+    /// </summary>
+    [JsonIgnore]
+    public uint RGB => this.UIColor.UIGlow & 0xFFFFFF;
+
+    /// <summary>
+    /// Gets a Lumina UIColor object representing this payload.  The actual color data is at UIColor.UIGlow.
+    /// </summary>
+    /// <remarks>
+    /// The value is evaluated lazily and cached.
+    /// </remarks>
+    [JsonIgnore]
+    public UIColor UIColor => this.color ??= this.DataResolver.GetExcelSheet<UIColor>().GetRow(this.colorKey);
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"{this.Type} - UIColor: {this.colorKey} color: {(this.IsEnabled ? this.RGB : 0)}";
+    }
+
+    /// <inheritdoc/>
+    protected override byte[] EncodeImpl()
+    {
+        var colorBytes = MakeInteger(this.colorKey);
+        var chunkLen = colorBytes.Length + 1;
+
+        var bytes = new List<byte>(new byte[]
+        {
+            START_BYTE, (byte)SeStringChunkType.UIGlow, (byte)chunkLen,
+        });
+
+        bytes.AddRange(colorBytes);
+        bytes.Add(END_BYTE);
+
+        return bytes.ToArray();
+    }
+
+    /// <inheritdoc/>
+    protected override void DecodeImpl(BinaryReader reader, long endOfStream)
+    {
+        this.colorKey = (ushort)GetInteger(reader);
+    }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/SeString.cs b/Dalamud/Game/Text/SeStringHandling/SeString.cs
index 012839c00..412a78c3f 100644
--- a/Dalamud/Game/Text/SeStringHandling/SeString.cs
+++ b/Dalamud/Game/Text/SeStringHandling/SeString.cs
@@ -10,397 +10,396 @@ using Dalamud.Utility;
 using Lumina.Excel.GeneratedSheets;
 using Newtonsoft.Json;
 
-namespace Dalamud.Game.Text.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling;
+
+/// <summary>
+/// This class represents a parsed SeString.
+/// </summary>
+public class SeString
 {
     /// <summary>
-    /// This class represents a parsed SeString.
+    /// Initializes a new instance of the <see cref="SeString"/> class.
+    /// Creates a new SeString from an ordered list of payloads.
     /// </summary>
-    public class SeString
+    public SeString()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SeString"/> class.
-        /// Creates a new SeString from an ordered list of payloads.
-        /// </summary>
-        public SeString()
+        this.Payloads = new List<Payload>();
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SeString"/> class.
+    /// Creates a new SeString from an ordered list of payloads.
+    /// </summary>
+    /// <param name="payloads">The Payload objects to make up this string.</param>
+    [JsonConstructor]
+    public SeString(List<Payload> payloads)
+    {
+        this.Payloads = payloads;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SeString"/> class.
+    /// Creates a new SeString from an ordered list of payloads.
+    /// </summary>
+    /// <param name="payloads">The Payload objects to make up this string.</param>
+    public SeString(params Payload[] payloads)
+    {
+        this.Payloads = new List<Payload>(payloads);
+    }
+
+    /// <summary>
+    /// Gets a list of Payloads necessary to display the arrow link marker icon in chat
+    /// with the appropriate glow and coloring.
+    /// </summary>
+    /// <returns>A list of all the payloads required to insert the link marker.</returns>
+    public static IEnumerable<Payload> TextArrowPayloads => new List<Payload>(new Payload[]
+    {
+        new UIForegroundPayload(0x01F4),
+        new UIGlowPayload(0x01F5),
+        new TextPayload($"{(char)SeIconChar.LinkMarker}"),
+        UIGlowPayload.UIGlowOff,
+        UIForegroundPayload.UIForegroundOff,
+    });
+
+    /// <summary>
+    /// Gets an empty SeString.
+    /// </summary>
+    public static SeString Empty => new();
+
+    /// <summary>
+    /// Gets the ordered list of payloads included in this SeString.
+    /// </summary>
+    public List<Payload> Payloads { get; }
+
+    /// <summary>
+    /// Gets all of the raw text from a message as a single joined string.
+    /// </summary>
+    /// <returns>
+    /// All the raw text from the contained payloads, joined into a single string.
+    /// </returns>
+    public string TextValue
+    {
+        get
         {
-            this.Payloads = new List<Payload>();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SeString"/> class.
-        /// Creates a new SeString from an ordered list of payloads.
-        /// </summary>
-        /// <param name="payloads">The Payload objects to make up this string.</param>
-        [JsonConstructor]
-        public SeString(List<Payload> payloads)
-        {
-            this.Payloads = payloads;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SeString"/> class.
-        /// Creates a new SeString from an ordered list of payloads.
-        /// </summary>
-        /// <param name="payloads">The Payload objects to make up this string.</param>
-        public SeString(params Payload[] payloads)
-        {
-            this.Payloads = new List<Payload>(payloads);
-        }
-
-        /// <summary>
-        /// Gets a list of Payloads necessary to display the arrow link marker icon in chat
-        /// with the appropriate glow and coloring.
-        /// </summary>
-        /// <returns>A list of all the payloads required to insert the link marker.</returns>
-        public static IEnumerable<Payload> TextArrowPayloads => new List<Payload>(new Payload[]
-        {
-            new UIForegroundPayload(0x01F4),
-            new UIGlowPayload(0x01F5),
-            new TextPayload($"{(char)SeIconChar.LinkMarker}"),
-            UIGlowPayload.UIGlowOff,
-            UIForegroundPayload.UIForegroundOff,
-        });
-
-        /// <summary>
-        /// Gets an empty SeString.
-        /// </summary>
-        public static SeString Empty => new();
-
-        /// <summary>
-        /// Gets the ordered list of payloads included in this SeString.
-        /// </summary>
-        public List<Payload> Payloads { get; }
-
-        /// <summary>
-        /// Gets all of the raw text from a message as a single joined string.
-        /// </summary>
-        /// <returns>
-        /// All the raw text from the contained payloads, joined into a single string.
-        /// </returns>
-        public string TextValue
-        {
-            get
-            {
-                return this.Payloads
-                    .Where(p => p is ITextProvider)
-                    .Cast<ITextProvider>()
-                    .Aggregate(new StringBuilder(), (sb, tp) => sb.Append(tp.Text), sb => sb.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Implicitly convert a string into a SeString containing a <see cref="TextPayload"/>.
-        /// </summary>
-        /// <param name="str">string to convert.</param>
-        /// <returns>Equivalent SeString.</returns>
-        public static implicit operator SeString(string str) => new(new TextPayload(str));
-
-        /// <summary>
-        /// Implicitly convert a string into a SeString containing a <see cref="TextPayload"/>.
-        /// </summary>
-        /// <param name="str">string to convert.</param>
-        /// <returns>Equivalent SeString.</returns>
-        public static explicit operator SeString(Lumina.Text.SeString str) => str.ToDalamudString();
-
-        /// <summary>
-        /// Parse a binary game message into an SeString.
-        /// </summary>
-        /// <param name="ptr">Pointer to the string's data in memory.</param>
-        /// <param name="len">Length of the string's data in memory.</param>
-        /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
-        public static unsafe SeString Parse(byte* ptr, int len)
-        {
-            if (ptr == null)
-                return Empty;
-
-            var payloads = new List<Payload>();
-
-            using (var stream = new UnmanagedMemoryStream(ptr, len))
-            using (var reader = new BinaryReader(stream))
-            {
-                while (stream.Position < len)
-                {
-                    var payload = Payload.Decode(reader);
-                    if (payload != null)
-                        payloads.Add(payload);
-                }
-            }
-
-            return new SeString(payloads);
-        }
-
-        /// <summary>
-        /// Parse a binary game message into an SeString.
-        /// </summary>
-        /// <param name="data">Binary message payload data in SE's internal format.</param>
-        /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
-        public static unsafe SeString Parse(ReadOnlySpan<byte> data)
-        {
-            fixed (byte* ptr = data)
-            {
-                return Parse(ptr, data.Length);
-            }
-        }
-
-        /// <summary>
-        /// Parse a binary game message into an SeString.
-        /// </summary>
-        /// <param name="bytes">Binary message payload data in SE's internal format.</param>
-        /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
-        public static SeString Parse(byte[] bytes) => Parse(new ReadOnlySpan<byte>(bytes));
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
-        /// </summary>
-        /// <param name="itemId">The id of the item to link.</param>
-        /// <param name="isHq">Whether to link the high-quality variant of the item.</param>
-        /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
-        /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
-        public static SeString CreateItemLink(uint itemId, bool isHq, string? displayNameOverride = null) =>
-            CreateItemLink(itemId, isHq ? ItemPayload.ItemKind.Hq : ItemPayload.ItemKind.Normal, displayNameOverride);
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
-        /// </summary>
-        /// <param name="itemId">The id of the item to link.</param>
-        /// <param name="kind">The kind of item to link.</param>
-        /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
-        /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
-        public static SeString CreateItemLink(uint itemId, ItemPayload.ItemKind kind = ItemPayload.ItemKind.Normal, string? displayNameOverride = null)
-        {
-            var data = Service<DataManager>.Get();
-
-            var displayName = displayNameOverride;
-            if (displayName == null)
-            {
-                switch (kind)
-                {
-                    case ItemPayload.ItemKind.Normal:
-                    case ItemPayload.ItemKind.Collectible:
-                    case ItemPayload.ItemKind.Hq:
-                        displayName = data.GetExcelSheet<Item>()?.GetRow(itemId)?.Name;
-                        break;
-                    case ItemPayload.ItemKind.EventItem:
-                        displayName = data.GetExcelSheet<EventItem>()?.GetRow(itemId)?.Name;
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException(nameof(kind), kind, null);
-                }
-            }
-
-            if (displayName == null)
-            {
-                throw new Exception("Invalid item ID specified, could not determine item name.");
-            }
-
-            if (kind == ItemPayload.ItemKind.Hq)
-            {
-                displayName += $" {(char)SeIconChar.HighQuality}";
-            }
-            else if (kind == ItemPayload.ItemKind.Collectible)
-            {
-                displayName += $" {(char)SeIconChar.Collectible}";
-            }
-
-            // TODO: probably a cleaner way to build these than doing the bulk+insert
-            var payloads = new List<Payload>(new Payload[]
-            {
-                new UIForegroundPayload(0x0225),
-                new UIGlowPayload(0x0226),
-                new ItemPayload(itemId, kind),
-                // arrow goes here
-                new TextPayload(displayName),
-                RawPayload.LinkTerminator,
-                // sometimes there is another set of uiglow/foreground off payloads here
-                // might be necessary when including additional text after the item name
-            });
-            payloads.InsertRange(3, TextArrowPayloads);
-
-            return new SeString(payloads);
-        }
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
-        /// </summary>
-        /// <param name="item">The Lumina Item to link.</param>
-        /// <param name="isHq">Whether to link the high-quality variant of the item.</param>
-        /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
-        /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
-        public static SeString CreateItemLink(Item item, bool isHq, string? displayNameOverride = null)
-        {
-            return CreateItemLink(item.RowId, isHq, displayNameOverride ?? item.Name);
-        }
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log.
-        /// </summary>
-        /// <param name="territoryId">The id of the TerritoryType for this map link.</param>
-        /// <param name="mapId">The id of the Map for this map link.</param>
-        /// <param name="rawX">The raw x-coordinate for this link.</param>
-        /// <param name="rawY">The raw y-coordinate for this link..</param>
-        /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
-        public static SeString CreateMapLink(uint territoryId, uint mapId, int rawX, int rawY)
-        {
-            var mapPayload = new MapLinkPayload(territoryId, mapId, rawX, rawY);
-            var nameString = $"{mapPayload.PlaceName} {mapPayload.CoordinateString}";
-
-            var payloads = new List<Payload>(new Payload[]
-            {
-                mapPayload,
-                // arrow goes here
-                new TextPayload(nameString),
-                RawPayload.LinkTerminator,
-            });
-            payloads.InsertRange(1, TextArrowPayloads);
-
-            return new SeString(payloads);
-        }
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log.
-        /// </summary>
-        /// <param name="territoryId">The id of the TerritoryType for this map link.</param>
-        /// <param name="mapId">The id of the Map for this map link.</param>
-        /// <param name="xCoord">The human-readable x-coordinate for this link.</param>
-        /// <param name="yCoord">The human-readable y-coordinate for this link.</param>
-        /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
-        /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
-        public static SeString CreateMapLink(uint territoryId, uint mapId, float xCoord, float yCoord, float fudgeFactor = 0.05f)
-        {
-            var mapPayload = new MapLinkPayload(territoryId, mapId, xCoord, yCoord, fudgeFactor);
-            var nameString = $"{mapPayload.PlaceName} {mapPayload.CoordinateString}";
-
-            var payloads = new List<Payload>(new Payload[]
-            {
-                mapPayload,
-                // arrow goes here
-                new TextPayload(nameString),
-                RawPayload.LinkTerminator,
-            });
-            payloads.InsertRange(1, TextArrowPayloads);
-
-            return new SeString(payloads);
-        }
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log, matching a specified zone name.
-        /// Returns null if no corresponding PlaceName was found.
-        /// </summary>
-        /// <param name="placeName">The name of the location for this link.  This should be exactly the name as seen in a displayed map link in-game for the same zone.</param>
-        /// <param name="xCoord">The human-readable x-coordinate for this link.</param>
-        /// <param name="yCoord">The human-readable y-coordinate for this link.</param>
-        /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
-        /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
-        public static SeString? CreateMapLink(string placeName, float xCoord, float yCoord, float fudgeFactor = 0.05f)
-        {
-            var data = Service<DataManager>.Get();
-
-            var mapSheet = data.GetExcelSheet<Map>();
-
-            var matches = data.GetExcelSheet<PlaceName>()
-                              .Where(row => row.Name.ToString().ToLowerInvariant() == placeName.ToLowerInvariant())
-                              .ToArray();
-
-            foreach (var place in matches)
-            {
-                var map = mapSheet.FirstOrDefault(row => row.PlaceName.Row == place.RowId);
-                if (map != null)
-                {
-                    return CreateMapLink(map.TerritoryType.Row, map.RowId, xCoord, yCoord, fudgeFactor);
-                }
-            }
-
-            // TODO: empty? throw?
-            return null;
-        }
-
-        /// <summary>
-        /// Creates a SeString from a json. (For testing - not recommended for production use.)
-        /// </summary>
-        /// <param name="json">A serialized SeString produced by ToJson() <see cref="ToJson"/>.</param>
-        /// <returns>A SeString initialized with values from the json.</returns>
-        public static SeString? FromJson(string json)
-        {
-            var s = JsonConvert.DeserializeObject<SeString>(json, new JsonSerializerSettings
-            {
-                PreserveReferencesHandling = PreserveReferencesHandling.Objects,
-                TypeNameHandling = TypeNameHandling.Auto,
-                ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor,
-            });
-
-            return s;
-        }
-
-        /// <summary>
-        /// Serializes the SeString to json.
-        /// </summary>
-        /// <returns>An json representation of this object.</returns>
-        public string ToJson()
-        {
-            return JsonConvert.SerializeObject(this, Formatting.Indented, new JsonSerializerSettings()
-            {
-                PreserveReferencesHandling = PreserveReferencesHandling.Objects,
-                ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
-                TypeNameHandling = TypeNameHandling.Auto,
-            });
-        }
-
-        /// <summary>
-        /// Appends the contents of one SeString to this one.
-        /// </summary>
-        /// <param name="other">The SeString to append to this one.</param>
-        /// <returns>This object.</returns>
-        public SeString Append(SeString other)
-        {
-            this.Payloads.AddRange(other.Payloads);
-            return this;
-        }
-
-        /// <summary>
-        /// Appends a list of payloads to this SeString.
-        /// </summary>
-        /// <param name="payloads">The Payloads to append.</param>
-        /// <returns>This object.</returns>
-        public SeString Append(List<Payload> payloads)
-        {
-            this.Payloads.AddRange(payloads);
-            return this;
-        }
-
-        /// <summary>
-        /// Appends a single payload to this SeString.
-        /// </summary>
-        /// <param name="payload">The payload to append.</param>
-        /// <returns>This object.</returns>
-        public SeString Append(Payload payload)
-        {
-            this.Payloads.Add(payload);
-            return this;
-        }
-
-        /// <summary>
-        /// Encodes the Payloads in this SeString into a binary representation
-        /// suitable for use by in-game handlers, such as the chat log.
-        /// </summary>
-        /// <returns>The binary encoded payload data.</returns>
-        public byte[] Encode()
-        {
-            var messageBytes = new List<byte>();
-            foreach (var p in this.Payloads)
-            {
-                messageBytes.AddRange(p.Encode());
-            }
-
-            return messageBytes.ToArray();
-        }
-
-        /// <summary>
-        /// Get the text value of this SeString.
-        /// </summary>
-        /// <returns>The TextValue property.</returns>
-        public override string ToString()
-        {
-            return this.TextValue;
+            return this.Payloads
+                       .Where(p => p is ITextProvider)
+                       .Cast<ITextProvider>()
+                       .Aggregate(new StringBuilder(), (sb, tp) => sb.Append(tp.Text), sb => sb.ToString());
         }
     }
+
+    /// <summary>
+    /// Implicitly convert a string into a SeString containing a <see cref="TextPayload"/>.
+    /// </summary>
+    /// <param name="str">string to convert.</param>
+    /// <returns>Equivalent SeString.</returns>
+    public static implicit operator SeString(string str) => new(new TextPayload(str));
+
+    /// <summary>
+    /// Implicitly convert a string into a SeString containing a <see cref="TextPayload"/>.
+    /// </summary>
+    /// <param name="str">string to convert.</param>
+    /// <returns>Equivalent SeString.</returns>
+    public static explicit operator SeString(Lumina.Text.SeString str) => str.ToDalamudString();
+
+    /// <summary>
+    /// Parse a binary game message into an SeString.
+    /// </summary>
+    /// <param name="ptr">Pointer to the string's data in memory.</param>
+    /// <param name="len">Length of the string's data in memory.</param>
+    /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
+    public static unsafe SeString Parse(byte* ptr, int len)
+    {
+        if (ptr == null)
+            return Empty;
+
+        var payloads = new List<Payload>();
+
+        using (var stream = new UnmanagedMemoryStream(ptr, len))
+        using (var reader = new BinaryReader(stream))
+        {
+            while (stream.Position < len)
+            {
+                var payload = Payload.Decode(reader);
+                if (payload != null)
+                    payloads.Add(payload);
+            }
+        }
+
+        return new SeString(payloads);
+    }
+
+    /// <summary>
+    /// Parse a binary game message into an SeString.
+    /// </summary>
+    /// <param name="data">Binary message payload data in SE's internal format.</param>
+    /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
+    public static unsafe SeString Parse(ReadOnlySpan<byte> data)
+    {
+        fixed (byte* ptr = data)
+        {
+            return Parse(ptr, data.Length);
+        }
+    }
+
+    /// <summary>
+    /// Parse a binary game message into an SeString.
+    /// </summary>
+    /// <param name="bytes">Binary message payload data in SE's internal format.</param>
+    /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
+    public static SeString Parse(byte[] bytes) => Parse(new ReadOnlySpan<byte>(bytes));
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
+    /// </summary>
+    /// <param name="itemId">The id of the item to link.</param>
+    /// <param name="isHq">Whether to link the high-quality variant of the item.</param>
+    /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
+    /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
+    public static SeString CreateItemLink(uint itemId, bool isHq, string? displayNameOverride = null) =>
+        CreateItemLink(itemId, isHq ? ItemPayload.ItemKind.Hq : ItemPayload.ItemKind.Normal, displayNameOverride);
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
+    /// </summary>
+    /// <param name="itemId">The id of the item to link.</param>
+    /// <param name="kind">The kind of item to link.</param>
+    /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
+    /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
+    public static SeString CreateItemLink(uint itemId, ItemPayload.ItemKind kind = ItemPayload.ItemKind.Normal, string? displayNameOverride = null)
+    {
+        var data = Service<DataManager>.Get();
+
+        var displayName = displayNameOverride;
+        if (displayName == null)
+        {
+            switch (kind)
+            {
+                case ItemPayload.ItemKind.Normal:
+                case ItemPayload.ItemKind.Collectible:
+                case ItemPayload.ItemKind.Hq:
+                    displayName = data.GetExcelSheet<Item>()?.GetRow(itemId)?.Name;
+                    break;
+                case ItemPayload.ItemKind.EventItem:
+                    displayName = data.GetExcelSheet<EventItem>()?.GetRow(itemId)?.Name;
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(kind), kind, null);
+            }
+        }
+
+        if (displayName == null)
+        {
+            throw new Exception("Invalid item ID specified, could not determine item name.");
+        }
+
+        if (kind == ItemPayload.ItemKind.Hq)
+        {
+            displayName += $" {(char)SeIconChar.HighQuality}";
+        }
+        else if (kind == ItemPayload.ItemKind.Collectible)
+        {
+            displayName += $" {(char)SeIconChar.Collectible}";
+        }
+
+        // TODO: probably a cleaner way to build these than doing the bulk+insert
+        var payloads = new List<Payload>(new Payload[]
+        {
+            new UIForegroundPayload(0x0225),
+            new UIGlowPayload(0x0226),
+            new ItemPayload(itemId, kind),
+            // arrow goes here
+            new TextPayload(displayName),
+            RawPayload.LinkTerminator,
+            // sometimes there is another set of uiglow/foreground off payloads here
+            // might be necessary when including additional text after the item name
+        });
+        payloads.InsertRange(3, TextArrowPayloads);
+
+        return new SeString(payloads);
+    }
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
+    /// </summary>
+    /// <param name="item">The Lumina Item to link.</param>
+    /// <param name="isHq">Whether to link the high-quality variant of the item.</param>
+    /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
+    /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
+    public static SeString CreateItemLink(Item item, bool isHq, string? displayNameOverride = null)
+    {
+        return CreateItemLink(item.RowId, isHq, displayNameOverride ?? item.Name);
+    }
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log.
+    /// </summary>
+    /// <param name="territoryId">The id of the TerritoryType for this map link.</param>
+    /// <param name="mapId">The id of the Map for this map link.</param>
+    /// <param name="rawX">The raw x-coordinate for this link.</param>
+    /// <param name="rawY">The raw y-coordinate for this link..</param>
+    /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
+    public static SeString CreateMapLink(uint territoryId, uint mapId, int rawX, int rawY)
+    {
+        var mapPayload = new MapLinkPayload(territoryId, mapId, rawX, rawY);
+        var nameString = $"{mapPayload.PlaceName} {mapPayload.CoordinateString}";
+
+        var payloads = new List<Payload>(new Payload[]
+        {
+            mapPayload,
+            // arrow goes here
+            new TextPayload(nameString),
+            RawPayload.LinkTerminator,
+        });
+        payloads.InsertRange(1, TextArrowPayloads);
+
+        return new SeString(payloads);
+    }
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log.
+    /// </summary>
+    /// <param name="territoryId">The id of the TerritoryType for this map link.</param>
+    /// <param name="mapId">The id of the Map for this map link.</param>
+    /// <param name="xCoord">The human-readable x-coordinate for this link.</param>
+    /// <param name="yCoord">The human-readable y-coordinate for this link.</param>
+    /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
+    /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
+    public static SeString CreateMapLink(uint territoryId, uint mapId, float xCoord, float yCoord, float fudgeFactor = 0.05f)
+    {
+        var mapPayload = new MapLinkPayload(territoryId, mapId, xCoord, yCoord, fudgeFactor);
+        var nameString = $"{mapPayload.PlaceName} {mapPayload.CoordinateString}";
+
+        var payloads = new List<Payload>(new Payload[]
+        {
+            mapPayload,
+            // arrow goes here
+            new TextPayload(nameString),
+            RawPayload.LinkTerminator,
+        });
+        payloads.InsertRange(1, TextArrowPayloads);
+
+        return new SeString(payloads);
+    }
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log, matching a specified zone name.
+    /// Returns null if no corresponding PlaceName was found.
+    /// </summary>
+    /// <param name="placeName">The name of the location for this link.  This should be exactly the name as seen in a displayed map link in-game for the same zone.</param>
+    /// <param name="xCoord">The human-readable x-coordinate for this link.</param>
+    /// <param name="yCoord">The human-readable y-coordinate for this link.</param>
+    /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
+    /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
+    public static SeString? CreateMapLink(string placeName, float xCoord, float yCoord, float fudgeFactor = 0.05f)
+    {
+        var data = Service<DataManager>.Get();
+
+        var mapSheet = data.GetExcelSheet<Map>();
+
+        var matches = data.GetExcelSheet<PlaceName>()
+                          .Where(row => row.Name.ToString().ToLowerInvariant() == placeName.ToLowerInvariant())
+                          .ToArray();
+
+        foreach (var place in matches)
+        {
+            var map = mapSheet.FirstOrDefault(row => row.PlaceName.Row == place.RowId);
+            if (map != null)
+            {
+                return CreateMapLink(map.TerritoryType.Row, map.RowId, xCoord, yCoord, fudgeFactor);
+            }
+        }
+
+        // TODO: empty? throw?
+        return null;
+    }
+
+    /// <summary>
+    /// Creates a SeString from a json. (For testing - not recommended for production use.)
+    /// </summary>
+    /// <param name="json">A serialized SeString produced by ToJson() <see cref="ToJson"/>.</param>
+    /// <returns>A SeString initialized with values from the json.</returns>
+    public static SeString? FromJson(string json)
+    {
+        var s = JsonConvert.DeserializeObject<SeString>(json, new JsonSerializerSettings
+        {
+            PreserveReferencesHandling = PreserveReferencesHandling.Objects,
+            TypeNameHandling = TypeNameHandling.Auto,
+            ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor,
+        });
+
+        return s;
+    }
+
+    /// <summary>
+    /// Serializes the SeString to json.
+    /// </summary>
+    /// <returns>An json representation of this object.</returns>
+    public string ToJson()
+    {
+        return JsonConvert.SerializeObject(this, Formatting.Indented, new JsonSerializerSettings()
+        {
+            PreserveReferencesHandling = PreserveReferencesHandling.Objects,
+            ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+            TypeNameHandling = TypeNameHandling.Auto,
+        });
+    }
+
+    /// <summary>
+    /// Appends the contents of one SeString to this one.
+    /// </summary>
+    /// <param name="other">The SeString to append to this one.</param>
+    /// <returns>This object.</returns>
+    public SeString Append(SeString other)
+    {
+        this.Payloads.AddRange(other.Payloads);
+        return this;
+    }
+
+    /// <summary>
+    /// Appends a list of payloads to this SeString.
+    /// </summary>
+    /// <param name="payloads">The Payloads to append.</param>
+    /// <returns>This object.</returns>
+    public SeString Append(List<Payload> payloads)
+    {
+        this.Payloads.AddRange(payloads);
+        return this;
+    }
+
+    /// <summary>
+    /// Appends a single payload to this SeString.
+    /// </summary>
+    /// <param name="payload">The payload to append.</param>
+    /// <returns>This object.</returns>
+    public SeString Append(Payload payload)
+    {
+        this.Payloads.Add(payload);
+        return this;
+    }
+
+    /// <summary>
+    /// Encodes the Payloads in this SeString into a binary representation
+    /// suitable for use by in-game handlers, such as the chat log.
+    /// </summary>
+    /// <returns>The binary encoded payload data.</returns>
+    public byte[] Encode()
+    {
+        var messageBytes = new List<byte>();
+        foreach (var p in this.Payloads)
+        {
+            messageBytes.AddRange(p.Encode());
+        }
+
+        return messageBytes.ToArray();
+    }
+
+    /// <summary>
+    /// Get the text value of this SeString.
+    /// </summary>
+    /// <returns>The TextValue property.</returns>
+    public override string ToString()
+    {
+        return this.TextValue;
+    }
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/SeStringBuilder.cs b/Dalamud/Game/Text/SeStringHandling/SeStringBuilder.cs
index a1401594d..b32741005 100644
--- a/Dalamud/Game/Text/SeStringHandling/SeStringBuilder.cs
+++ b/Dalamud/Game/Text/SeStringHandling/SeStringBuilder.cs
@@ -1,218 +1,217 @@
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 
-namespace Dalamud.Game.Text.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling;
+
+/// <summary>
+/// Helper class to build SeStrings using a builder pattern.
+/// </summary>
+public class SeStringBuilder
 {
     /// <summary>
-    /// Helper class to build SeStrings using a builder pattern.
+    /// Gets the built SeString.
     /// </summary>
-    public class SeStringBuilder
+    public SeString BuiltString { get; init; } = new SeString();
+
+    /// <summary>
+    /// Append another SeString to the builder.
+    /// </summary>
+    /// <param name="toAppend">The SeString to append.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder Append(SeString toAppend)
     {
-        /// <summary>
-        /// Gets the built SeString.
-        /// </summary>
-        public SeString BuiltString { get; init; } = new SeString();
-
-        /// <summary>
-        /// Append another SeString to the builder.
-        /// </summary>
-        /// <param name="toAppend">The SeString to append.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder Append(SeString toAppend)
-        {
-            this.BuiltString.Append(toAppend);
-            return this;
-        }
-
-        /// <summary>
-        /// Append raw text to the builder.
-        /// </summary>
-        /// <param name="text">The raw text.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder Append(string text) => this.AddText(text);
-
-        /// <summary>
-        /// Append raw text to the builder.
-        /// </summary>
-        /// <param name="text">The raw text.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddText(string text) => this.Add(new TextPayload(text));
-
-        /// <summary>
-        /// Start colored text in the current builder.
-        /// </summary>
-        /// <param name="colorKey">The text color.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddUiForeground(ushort colorKey) => this.Add(new UIForegroundPayload(colorKey));
-
-        /// <summary>
-        /// Turn off a previous colored text.
-        /// </summary>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddUiForegroundOff() => this.Add(UIForegroundPayload.UIForegroundOff);
-
-        /// <summary>
-        /// Add colored text to the current builder.
-        /// </summary>
-        /// <param name="text">The raw text.</param>
-        /// <param name="colorKey">The text color.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddUiForeground(string text, ushort colorKey)
-        {
-            this.AddUiForeground(colorKey);
-            this.AddText(text);
-            return this.AddUiForegroundOff();
-        }
-
-        /// <summary>
-        /// Start an UiGlow in the current builder.
-        /// </summary>
-        /// <param name="colorKey">The glow color.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddUiGlow(ushort colorKey) => this.Add(new UIGlowPayload(colorKey));
-
-        /// <summary>
-        /// Turn off a previous UiGlow.
-        /// </summary>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddUiGlowOff() => this.Add(UIGlowPayload.UIGlowOff);
-
-        /// <summary>
-        /// Add glowing text to the current builder.
-        /// </summary>
-        /// <param name="text">The raw text.</param>
-        /// <param name="colorKey">The glow color.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddUiGlow(string text, ushort colorKey)
-        {
-            this.AddUiGlow(colorKey);
-            this.AddText(text);
-            return this.AddUiGlowOff();
-        }
-
-        /// <summary>
-        /// Add an icon to the builder.
-        /// </summary>
-        /// <param name="icon">The icon to add.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddIcon(BitmapFontIcon icon) => this.Add(new IconPayload(icon));
-
-        /// <summary>
-        /// Add an item link to the builder.
-        /// </summary>
-        /// <param name="itemId">The item ID.</param>
-        /// <param name="isHq">Whether or not the item is high quality.</param>
-        /// <param name="itemNameOverride">Override for the item's name.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddItemLink(uint itemId, bool isHq, string? itemNameOverride = null) =>
-            this.Add(new ItemPayload(itemId, isHq, itemNameOverride));
-
-        /// <summary>
-        /// Add an item link to the builder.
-        /// </summary>
-        /// <param name="itemId">The item ID.</param>
-        /// <param name="kind">Kind of item to encode.</param>
-        /// <param name="itemNameOverride">Override for the item's name.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddItemLink(uint itemId, ItemPayload.ItemKind kind, string? itemNameOverride = null) =>
-            this.Add(new ItemPayload(itemId, kind, itemNameOverride));
-
-        /// <summary>
-        /// Add an item link to the builder.
-        /// </summary>
-        /// <param name="rawItemId">The raw item ID.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddItemLinkRaw(uint rawItemId) =>
-            this.Add(ItemPayload.FromRaw(rawItemId));
-
-        /// <summary>
-        /// Add italicized raw text to the builder.
-        /// </summary>
-        /// <param name="text">The raw text.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddItalics(string text)
-        {
-            this.Add(EmphasisItalicPayload.ItalicsOn);
-            this.AddText(text);
-            return this.Add(EmphasisItalicPayload.ItalicsOff);
-        }
-
-        /// <summary>
-        /// Turn italics on.
-        /// </summary>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddItalicsOn() => this.Add(EmphasisItalicPayload.ItalicsOn);
-
-        /// <summary>
-        /// Turn italics off.
-        /// </summary>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddItalicsOff() => this.Add(EmphasisItalicPayload.ItalicsOff);
-
-        /// <summary>
-        /// Add a map link payload to the builder.
-        /// </summary>
-        /// <param name="territoryTypeId">The id of the TerritoryType entry for this link.</param>
-        /// <param name="mapId">The id of the Map entry for this link.</param>
-        /// <param name="rawX">The internal raw x-coordinate for this link.</param>
-        /// <param name="rawY">The internal raw y-coordinate for this link.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddMapLink(uint territoryTypeId, uint mapId, int rawX, int rawY) =>
-            this.Add(new MapLinkPayload(territoryTypeId, mapId, rawX, rawY));
-
-        /// <summary>
-        /// Add a map link payload to the builder.
-        /// </summary>
-        /// <param name="territoryTypeId">The id of the TerritoryType entry for this link.</param>
-        /// <param name="mapId">The id of the Map entry for this link.</param>
-        /// <param name="niceXCoord">The human-readable x-coordinate for this link.</param>
-        /// <param name="niceYCoord">The human-readable y-coordinate for this link.</param>
-        /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddMapLink(
-            uint territoryTypeId, uint mapId, float niceXCoord, float niceYCoord, float fudgeFactor = 0.05f) =>
-            this.Add(new MapLinkPayload(territoryTypeId, mapId, niceXCoord, niceYCoord, fudgeFactor));
-
-        /// <summary>
-        /// Add a quest link to the builder.
-        /// </summary>
-        /// <param name="questId">The quest ID.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddQuestLink(uint questId) => this.Add(new QuestPayload(questId));
-
-        /// <summary>
-        /// Add a status effect link to the builder.
-        /// </summary>
-        /// <param name="statusId">The status effect ID.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder AddStatusLink(uint statusId) => this.Add(new StatusPayload(statusId));
-
-        /// <summary>
-        /// Add a payload to the builder.
-        /// </summary>
-        /// <param name="payload">The payload to add.</param>
-        /// <returns>The current builder.</returns>
-        public SeStringBuilder Add(Payload payload)
-        {
-            this.BuiltString.Payloads.Add(payload);
-            return this;
-        }
-
-        /// <summary>
-        /// Return the built string.
-        /// </summary>
-        /// <returns>The built string.</returns>
-        public SeString Build() => this.BuiltString;
-
-        /// <summary>
-        /// Encode the built string to bytes.
-        /// </summary>
-        /// <returns>The built string, encoded to UTF-8 bytes.</returns>
-        public byte[] Encode() => this.BuiltString.Encode();
-
-        /// <summary>
-        /// Return the text representation of this string.
-        /// </summary>
-        /// <returns>The text representation of this string.</returns>
-        public override string ToString() => this.BuiltString.ToString();
+        this.BuiltString.Append(toAppend);
+        return this;
     }
+
+    /// <summary>
+    /// Append raw text to the builder.
+    /// </summary>
+    /// <param name="text">The raw text.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder Append(string text) => this.AddText(text);
+
+    /// <summary>
+    /// Append raw text to the builder.
+    /// </summary>
+    /// <param name="text">The raw text.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddText(string text) => this.Add(new TextPayload(text));
+
+    /// <summary>
+    /// Start colored text in the current builder.
+    /// </summary>
+    /// <param name="colorKey">The text color.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddUiForeground(ushort colorKey) => this.Add(new UIForegroundPayload(colorKey));
+
+    /// <summary>
+    /// Turn off a previous colored text.
+    /// </summary>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddUiForegroundOff() => this.Add(UIForegroundPayload.UIForegroundOff);
+
+    /// <summary>
+    /// Add colored text to the current builder.
+    /// </summary>
+    /// <param name="text">The raw text.</param>
+    /// <param name="colorKey">The text color.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddUiForeground(string text, ushort colorKey)
+    {
+        this.AddUiForeground(colorKey);
+        this.AddText(text);
+        return this.AddUiForegroundOff();
+    }
+
+    /// <summary>
+    /// Start an UiGlow in the current builder.
+    /// </summary>
+    /// <param name="colorKey">The glow color.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddUiGlow(ushort colorKey) => this.Add(new UIGlowPayload(colorKey));
+
+    /// <summary>
+    /// Turn off a previous UiGlow.
+    /// </summary>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddUiGlowOff() => this.Add(UIGlowPayload.UIGlowOff);
+
+    /// <summary>
+    /// Add glowing text to the current builder.
+    /// </summary>
+    /// <param name="text">The raw text.</param>
+    /// <param name="colorKey">The glow color.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddUiGlow(string text, ushort colorKey)
+    {
+        this.AddUiGlow(colorKey);
+        this.AddText(text);
+        return this.AddUiGlowOff();
+    }
+
+    /// <summary>
+    /// Add an icon to the builder.
+    /// </summary>
+    /// <param name="icon">The icon to add.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddIcon(BitmapFontIcon icon) => this.Add(new IconPayload(icon));
+
+    /// <summary>
+    /// Add an item link to the builder.
+    /// </summary>
+    /// <param name="itemId">The item ID.</param>
+    /// <param name="isHq">Whether or not the item is high quality.</param>
+    /// <param name="itemNameOverride">Override for the item's name.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddItemLink(uint itemId, bool isHq, string? itemNameOverride = null) =>
+        this.Add(new ItemPayload(itemId, isHq, itemNameOverride));
+
+    /// <summary>
+    /// Add an item link to the builder.
+    /// </summary>
+    /// <param name="itemId">The item ID.</param>
+    /// <param name="kind">Kind of item to encode.</param>
+    /// <param name="itemNameOverride">Override for the item's name.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddItemLink(uint itemId, ItemPayload.ItemKind kind, string? itemNameOverride = null) =>
+        this.Add(new ItemPayload(itemId, kind, itemNameOverride));
+
+    /// <summary>
+    /// Add an item link to the builder.
+    /// </summary>
+    /// <param name="rawItemId">The raw item ID.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddItemLinkRaw(uint rawItemId) =>
+        this.Add(ItemPayload.FromRaw(rawItemId));
+
+    /// <summary>
+    /// Add italicized raw text to the builder.
+    /// </summary>
+    /// <param name="text">The raw text.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddItalics(string text)
+    {
+        this.Add(EmphasisItalicPayload.ItalicsOn);
+        this.AddText(text);
+        return this.Add(EmphasisItalicPayload.ItalicsOff);
+    }
+
+    /// <summary>
+    /// Turn italics on.
+    /// </summary>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddItalicsOn() => this.Add(EmphasisItalicPayload.ItalicsOn);
+
+    /// <summary>
+    /// Turn italics off.
+    /// </summary>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddItalicsOff() => this.Add(EmphasisItalicPayload.ItalicsOff);
+
+    /// <summary>
+    /// Add a map link payload to the builder.
+    /// </summary>
+    /// <param name="territoryTypeId">The id of the TerritoryType entry for this link.</param>
+    /// <param name="mapId">The id of the Map entry for this link.</param>
+    /// <param name="rawX">The internal raw x-coordinate for this link.</param>
+    /// <param name="rawY">The internal raw y-coordinate for this link.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddMapLink(uint territoryTypeId, uint mapId, int rawX, int rawY) =>
+        this.Add(new MapLinkPayload(territoryTypeId, mapId, rawX, rawY));
+
+    /// <summary>
+    /// Add a map link payload to the builder.
+    /// </summary>
+    /// <param name="territoryTypeId">The id of the TerritoryType entry for this link.</param>
+    /// <param name="mapId">The id of the Map entry for this link.</param>
+    /// <param name="niceXCoord">The human-readable x-coordinate for this link.</param>
+    /// <param name="niceYCoord">The human-readable y-coordinate for this link.</param>
+    /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddMapLink(
+        uint territoryTypeId, uint mapId, float niceXCoord, float niceYCoord, float fudgeFactor = 0.05f) =>
+        this.Add(new MapLinkPayload(territoryTypeId, mapId, niceXCoord, niceYCoord, fudgeFactor));
+
+    /// <summary>
+    /// Add a quest link to the builder.
+    /// </summary>
+    /// <param name="questId">The quest ID.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddQuestLink(uint questId) => this.Add(new QuestPayload(questId));
+
+    /// <summary>
+    /// Add a status effect link to the builder.
+    /// </summary>
+    /// <param name="statusId">The status effect ID.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder AddStatusLink(uint statusId) => this.Add(new StatusPayload(statusId));
+
+    /// <summary>
+    /// Add a payload to the builder.
+    /// </summary>
+    /// <param name="payload">The payload to add.</param>
+    /// <returns>The current builder.</returns>
+    public SeStringBuilder Add(Payload payload)
+    {
+        this.BuiltString.Payloads.Add(payload);
+        return this;
+    }
+
+    /// <summary>
+    /// Return the built string.
+    /// </summary>
+    /// <returns>The built string.</returns>
+    public SeString Build() => this.BuiltString;
+
+    /// <summary>
+    /// Encode the built string to bytes.
+    /// </summary>
+    /// <returns>The built string, encoded to UTF-8 bytes.</returns>
+    public byte[] Encode() => this.BuiltString.Encode();
+
+    /// <summary>
+    /// Return the text representation of this string.
+    /// </summary>
+    /// <returns>The text representation of this string.</returns>
+    public override string ToString() => this.BuiltString.ToString();
 }
diff --git a/Dalamud/Game/Text/SeStringHandling/SeStringManager.cs b/Dalamud/Game/Text/SeStringHandling/SeStringManager.cs
index 02c187bad..f0b38d429 100644
--- a/Dalamud/Game/Text/SeStringHandling/SeStringManager.cs
+++ b/Dalamud/Game/Text/SeStringHandling/SeStringManager.cs
@@ -5,108 +5,107 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using Lumina.Excel.GeneratedSheets;
 
-namespace Dalamud.Game.Text.SeStringHandling
+namespace Dalamud.Game.Text.SeStringHandling;
+
+/// <summary>
+/// This class facilitates creating new SeStrings and breaking down existing ones into their individual payload components.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+[Obsolete("This class is obsolete. Please use the static methods on SeString instead.")]
+public sealed class SeStringManager : IServiceType
 {
-    /// <summary>
-    /// This class facilitates creating new SeStrings and breaking down existing ones into their individual payload components.
-    /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    [Obsolete("This class is obsolete. Please use the static methods on SeString instead.")]
-    public sealed class SeStringManager : IServiceType
+    [ServiceManager.ServiceConstructor]
+    private SeStringManager()
     {
-        [ServiceManager.ServiceConstructor]
-        private SeStringManager()
-        {
-        }
-
-        /// <summary>
-        /// Parse a binary game message into an SeString.
-        /// </summary>
-        /// <param name="ptr">Pointer to the string's data in memory.</param>
-        /// <param name="len">Length of the string's data in memory.</param>
-        /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
-        [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
-        public unsafe SeString Parse(byte* ptr, int len) => SeString.Parse(ptr, len);
-
-        /// <summary>
-        /// Parse a binary game message into an SeString.
-        /// </summary>
-        /// <param name="data">Binary message payload data in SE's internal format.</param>
-        /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
-        [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
-        public unsafe SeString Parse(ReadOnlySpan<byte> data) => SeString.Parse(data);
-
-        /// <summary>
-        /// Parse a binary game message into an SeString.
-        /// </summary>
-        /// <param name="bytes">Binary message payload data in SE's internal format.</param>
-        /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
-        [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
-        public SeString Parse(byte[] bytes) => SeString.Parse(new ReadOnlySpan<byte>(bytes));
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
-        /// </summary>
-        /// <param name="itemId">The id of the item to link.</param>
-        /// <param name="isHQ">Whether to link the high-quality variant of the item.</param>
-        /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
-        /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
-        [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
-        public SeString CreateItemLink(uint itemId, bool isHQ, string displayNameOverride = null) => SeString.CreateItemLink(itemId, isHQ, displayNameOverride);
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
-        /// </summary>
-        /// <param name="item">The Lumina Item to link.</param>
-        /// <param name="isHQ">Whether to link the high-quality variant of the item.</param>
-        /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
-        /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
-        [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
-        public SeString CreateItemLink(Item item, bool isHQ, string displayNameOverride = null) => SeString.CreateItemLink(item, isHQ, displayNameOverride);
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log.
-        /// </summary>
-        /// <param name="territoryId">The id of the TerritoryType for this map link.</param>
-        /// <param name="mapId">The id of the Map for this map link.</param>
-        /// <param name="rawX">The raw x-coordinate for this link.</param>
-        /// <param name="rawY">The raw y-coordinate for this link..</param>
-        /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
-        [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
-        public SeString CreateMapLink(uint territoryId, uint mapId, int rawX, int rawY) =>
-            SeString.CreateMapLink(territoryId, mapId, rawX, rawY);
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log.
-        /// </summary>
-        /// <param name="territoryId">The id of the TerritoryType for this map link.</param>
-        /// <param name="mapId">The id of the Map for this map link.</param>
-        /// <param name="xCoord">The human-readable x-coordinate for this link.</param>
-        /// <param name="yCoord">The human-readable y-coordinate for this link.</param>
-        /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
-        /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
-        [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
-        public SeString CreateMapLink(uint territoryId, uint mapId, float xCoord, float yCoord, float fudgeFactor = 0.05f) => SeString.CreateMapLink(territoryId, mapId, xCoord, yCoord, fudgeFactor);
-
-        /// <summary>
-        /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log, matching a specified zone name.
-        /// </summary>
-        /// <param name="placeName">The name of the location for this link.  This should be exactly the name as seen in a displayed map link in-game for the same zone.</param>
-        /// <param name="xCoord">The human-readable x-coordinate for this link.</param>
-        /// <param name="yCoord">The human-readable y-coordinate for this link.</param>
-        /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
-        /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
-        [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
-        public SeString CreateMapLink(string placeName, float xCoord, float yCoord, float fudgeFactor = 0.05f) => SeString.CreateMapLink(placeName, xCoord, yCoord, fudgeFactor);
-
-        /// <summary>
-        /// Creates a list of Payloads necessary to display the arrow link marker icon in chat
-        /// with the appropriate glow and coloring.
-        /// </summary>
-        /// <returns>A list of all the payloads required to insert the link marker.</returns>
-        [Obsolete("This data is obsolete. Please use the static version on SeString instead.", true)]
-        public List<Payload> TextArrowPayloads() => new(SeString.TextArrowPayloads);
     }
+
+    /// <summary>
+    /// Parse a binary game message into an SeString.
+    /// </summary>
+    /// <param name="ptr">Pointer to the string's data in memory.</param>
+    /// <param name="len">Length of the string's data in memory.</param>
+    /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
+    [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
+    public unsafe SeString Parse(byte* ptr, int len) => SeString.Parse(ptr, len);
+
+    /// <summary>
+    /// Parse a binary game message into an SeString.
+    /// </summary>
+    /// <param name="data">Binary message payload data in SE's internal format.</param>
+    /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
+    [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
+    public unsafe SeString Parse(ReadOnlySpan<byte> data) => SeString.Parse(data);
+
+    /// <summary>
+    /// Parse a binary game message into an SeString.
+    /// </summary>
+    /// <param name="bytes">Binary message payload data in SE's internal format.</param>
+    /// <returns>An SeString containing parsed Payload objects for each payload in the data.</returns>
+    [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
+    public SeString Parse(byte[] bytes) => SeString.Parse(new ReadOnlySpan<byte>(bytes));
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
+    /// </summary>
+    /// <param name="itemId">The id of the item to link.</param>
+    /// <param name="isHQ">Whether to link the high-quality variant of the item.</param>
+    /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
+    /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
+    [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
+    public SeString CreateItemLink(uint itemId, bool isHQ, string displayNameOverride = null) => SeString.CreateItemLink(itemId, isHQ, displayNameOverride);
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link an item in the chat log.
+    /// </summary>
+    /// <param name="item">The Lumina Item to link.</param>
+    /// <param name="isHQ">Whether to link the high-quality variant of the item.</param>
+    /// <param name="displayNameOverride">An optional name override to display, instead of the actual item name.</param>
+    /// <returns>An SeString containing all the payloads necessary to display an item link in the chat log.</returns>
+    [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
+    public SeString CreateItemLink(Item item, bool isHQ, string displayNameOverride = null) => SeString.CreateItemLink(item, isHQ, displayNameOverride);
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log.
+    /// </summary>
+    /// <param name="territoryId">The id of the TerritoryType for this map link.</param>
+    /// <param name="mapId">The id of the Map for this map link.</param>
+    /// <param name="rawX">The raw x-coordinate for this link.</param>
+    /// <param name="rawY">The raw y-coordinate for this link..</param>
+    /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
+    [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
+    public SeString CreateMapLink(uint territoryId, uint mapId, int rawX, int rawY) =>
+        SeString.CreateMapLink(territoryId, mapId, rawX, rawY);
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log.
+    /// </summary>
+    /// <param name="territoryId">The id of the TerritoryType for this map link.</param>
+    /// <param name="mapId">The id of the Map for this map link.</param>
+    /// <param name="xCoord">The human-readable x-coordinate for this link.</param>
+    /// <param name="yCoord">The human-readable y-coordinate for this link.</param>
+    /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
+    /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
+    [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
+    public SeString CreateMapLink(uint territoryId, uint mapId, float xCoord, float yCoord, float fudgeFactor = 0.05f) => SeString.CreateMapLink(territoryId, mapId, xCoord, yCoord, fudgeFactor);
+
+    /// <summary>
+    /// Creates an SeString representing an entire Payload chain that can be used to link a map position in the chat log, matching a specified zone name.
+    /// </summary>
+    /// <param name="placeName">The name of the location for this link.  This should be exactly the name as seen in a displayed map link in-game for the same zone.</param>
+    /// <param name="xCoord">The human-readable x-coordinate for this link.</param>
+    /// <param name="yCoord">The human-readable y-coordinate for this link.</param>
+    /// <param name="fudgeFactor">An optional offset to account for rounding and truncation errors; it is best to leave this untouched in most cases.</param>
+    /// <returns>An SeString containing all of the payloads necessary to display a map link in the chat log.</returns>
+    [Obsolete("This method is obsolete. Please use the static methods on SeString instead.", true)]
+    public SeString CreateMapLink(string placeName, float xCoord, float yCoord, float fudgeFactor = 0.05f) => SeString.CreateMapLink(placeName, xCoord, yCoord, fudgeFactor);
+
+    /// <summary>
+    /// Creates a list of Payloads necessary to display the arrow link marker icon in chat
+    /// with the appropriate glow and coloring.
+    /// </summary>
+    /// <returns>A list of all the payloads required to insert the link marker.</returns>
+    [Obsolete("This data is obsolete. Please use the static version on SeString instead.", true)]
+    public List<Payload> TextArrowPayloads() => new(SeString.TextArrowPayloads);
 }
diff --git a/Dalamud/Game/Text/XivChatEntry.cs b/Dalamud/Game/Text/XivChatEntry.cs
index a5a11766e..afc89b906 100644
--- a/Dalamud/Game/Text/XivChatEntry.cs
+++ b/Dalamud/Game/Text/XivChatEntry.cs
@@ -2,36 +2,35 @@ using System;
 
 using Dalamud.Game.Text.SeStringHandling;
 
-namespace Dalamud.Game.Text
+namespace Dalamud.Game.Text;
+
+/// <summary>
+/// This class represents a single chat log entry.
+/// </summary>
+public sealed class XivChatEntry
 {
     /// <summary>
-    /// This class represents a single chat log entry.
+    /// Gets or sets the type of entry.
     /// </summary>
-    public sealed class XivChatEntry
-    {
-        /// <summary>
-        /// Gets or sets the type of entry.
-        /// </summary>
-        public XivChatType Type { get; set; } = XivChatType.Debug;
+    public XivChatType Type { get; set; } = XivChatType.Debug;
 
-        /// <summary>
-        /// Gets or sets the sender ID.
-        /// </summary>
-        public uint SenderId { get; set; }
+    /// <summary>
+    /// Gets or sets the sender ID.
+    /// </summary>
+    public uint SenderId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the sender name.
-        /// </summary>
-        public SeString Name { get; set; } = string.Empty;
+    /// <summary>
+    /// Gets or sets the sender name.
+    /// </summary>
+    public SeString Name { get; set; } = string.Empty;
 
-        /// <summary>
-        /// Gets or sets the message.
-        /// </summary>
-        public SeString Message { get; set; } = string.Empty;
+    /// <summary>
+    /// Gets or sets the message.
+    /// </summary>
+    public SeString Message { get; set; } = string.Empty;
 
-        /// <summary>
-        /// Gets or sets the message parameters.
-        /// </summary>
-        public IntPtr Parameters { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the message parameters.
+    /// </summary>
+    public IntPtr Parameters { get; set; }
 }
diff --git a/Dalamud/Game/Text/XivChatType.cs b/Dalamud/Game/Text/XivChatType.cs
index 0d8081f62..be9fb8e91 100644
--- a/Dalamud/Game/Text/XivChatType.cs
+++ b/Dalamud/Game/Text/XivChatType.cs
@@ -1,247 +1,246 @@
-namespace Dalamud.Game.Text
+namespace Dalamud.Game.Text;
+
+/// <summary>
+/// The FFXIV chat types as seen in the LogKind ex table.
+/// </summary>
+public enum XivChatType : ushort // FIXME: this is a single byte
 {
     /// <summary>
-    /// The FFXIV chat types as seen in the LogKind ex table.
+    /// No chat type.
     /// </summary>
-    public enum XivChatType : ushort // FIXME: this is a single byte
-    {
-        /// <summary>
-        /// No chat type.
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// The debug chat type.
-        /// </summary>
-        Debug = 1,
+    /// <summary>
+    /// The debug chat type.
+    /// </summary>
+    Debug = 1,
 
-        /// <summary>
-        /// The urgent chat type.
-        /// </summary>
-        [XivChatTypeInfo("Urgent", "urgent", 0xFF9400D3)]
-        Urgent = 2,
+    /// <summary>
+    /// The urgent chat type.
+    /// </summary>
+    [XivChatTypeInfo("Urgent", "urgent", 0xFF9400D3)]
+    Urgent = 2,
 
-        /// <summary>
-        /// The notice chat type.
-        /// </summary>
-        [XivChatTypeInfo("Notice", "notice", 0xFF9400D3)]
-        Notice = 3,
+    /// <summary>
+    /// The notice chat type.
+    /// </summary>
+    [XivChatTypeInfo("Notice", "notice", 0xFF9400D3)]
+    Notice = 3,
 
-        /// <summary>
-        /// The say chat type.
-        /// </summary>
-        [XivChatTypeInfo("Say", "say", 0xFFFFFFFF)]
-        Say = 10,
+    /// <summary>
+    /// The say chat type.
+    /// </summary>
+    [XivChatTypeInfo("Say", "say", 0xFFFFFFFF)]
+    Say = 10,
 
-        /// <summary>
-        /// The shout chat type.
-        /// </summary>
-        [XivChatTypeInfo("Shout", "shout", 0xFFFF4500)]
-        Shout = 11,
+    /// <summary>
+    /// The shout chat type.
+    /// </summary>
+    [XivChatTypeInfo("Shout", "shout", 0xFFFF4500)]
+    Shout = 11,
 
-        /// <summary>
-        /// The outgoing tell chat type.
-        /// </summary>
-        TellOutgoing = 12,
+    /// <summary>
+    /// The outgoing tell chat type.
+    /// </summary>
+    TellOutgoing = 12,
 
-        /// <summary>
-        /// The incoming tell chat type.
-        /// </summary>
-        [XivChatTypeInfo("Tell", "tell", 0xFFFF69B4)]
-        TellIncoming = 13,
+    /// <summary>
+    /// The incoming tell chat type.
+    /// </summary>
+    [XivChatTypeInfo("Tell", "tell", 0xFFFF69B4)]
+    TellIncoming = 13,
 
-        /// <summary>
-        /// The party chat type.
-        /// </summary>
-        [XivChatTypeInfo("Party", "party", 0xFF1E90FF)]
-        Party = 14,
+    /// <summary>
+    /// The party chat type.
+    /// </summary>
+    [XivChatTypeInfo("Party", "party", 0xFF1E90FF)]
+    Party = 14,
 
-        /// <summary>
-        /// The alliance chat type.
-        /// </summary>
-        [XivChatTypeInfo("Alliance", "alliance", 0xFFFF4500)]
-        Alliance = 15,
+    /// <summary>
+    /// The alliance chat type.
+    /// </summary>
+    [XivChatTypeInfo("Alliance", "alliance", 0xFFFF4500)]
+    Alliance = 15,
 
-        /// <summary>
-        /// The linkshell 1 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Linkshell 1", "ls1", 0xFF228B22)]
-        Ls1 = 16,
+    /// <summary>
+    /// The linkshell 1 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Linkshell 1", "ls1", 0xFF228B22)]
+    Ls1 = 16,
 
-        /// <summary>
-        /// The linkshell 2 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Linkshell 2", "ls2", 0xFF228B22)]
-        Ls2 = 17,
+    /// <summary>
+    /// The linkshell 2 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Linkshell 2", "ls2", 0xFF228B22)]
+    Ls2 = 17,
 
-        /// <summary>
-        /// The linkshell 3 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Linkshell 3", "ls3", 0xFF228B22)]
-        Ls3 = 18,
+    /// <summary>
+    /// The linkshell 3 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Linkshell 3", "ls3", 0xFF228B22)]
+    Ls3 = 18,
 
-        /// <summary>
-        /// The linkshell 4 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Linkshell 4", "ls4", 0xFF228B22)]
-        Ls4 = 19,
+    /// <summary>
+    /// The linkshell 4 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Linkshell 4", "ls4", 0xFF228B22)]
+    Ls4 = 19,
 
-        /// <summary>
-        /// The linkshell 5 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Linkshell 5", "ls5", 0xFF228B22)]
-        Ls5 = 20,
+    /// <summary>
+    /// The linkshell 5 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Linkshell 5", "ls5", 0xFF228B22)]
+    Ls5 = 20,
 
-        /// <summary>
-        /// The linkshell 6 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Linkshell 6", "ls6", 0xFF228B22)]
-        Ls6 = 21,
+    /// <summary>
+    /// The linkshell 6 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Linkshell 6", "ls6", 0xFF228B22)]
+    Ls6 = 21,
 
-        /// <summary>
-        /// The linkshell 7 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Linkshell 7", "ls7", 0xFF228B22)]
-        Ls7 = 22,
+    /// <summary>
+    /// The linkshell 7 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Linkshell 7", "ls7", 0xFF228B22)]
+    Ls7 = 22,
 
-        /// <summary>
-        /// The linkshell 8 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Linkshell 8", "ls8", 0xFF228B22)]
-        Ls8 = 23,
+    /// <summary>
+    /// The linkshell 8 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Linkshell 8", "ls8", 0xFF228B22)]
+    Ls8 = 23,
 
-        /// <summary>
-        /// The free company chat type.
-        /// </summary>
-        [XivChatTypeInfo("Free Company", "fc", 0xFF00BFFF)]
-        FreeCompany = 24,
+    /// <summary>
+    /// The free company chat type.
+    /// </summary>
+    [XivChatTypeInfo("Free Company", "fc", 0xFF00BFFF)]
+    FreeCompany = 24,
 
-        /// <summary>
-        /// The novice network chat type.
-        /// </summary>
-        [XivChatTypeInfo("Novice Network", "nn", 0xFF8B4513)]
-        NoviceNetwork = 27,
+    /// <summary>
+    /// The novice network chat type.
+    /// </summary>
+    [XivChatTypeInfo("Novice Network", "nn", 0xFF8B4513)]
+    NoviceNetwork = 27,
 
-        /// <summary>
-        /// The custom emotes chat type.
-        /// </summary>
-        [XivChatTypeInfo("Custom Emotes", "emote", 0xFF8B4513)]
-        CustomEmote = 28,
+    /// <summary>
+    /// The custom emotes chat type.
+    /// </summary>
+    [XivChatTypeInfo("Custom Emotes", "emote", 0xFF8B4513)]
+    CustomEmote = 28,
 
-        /// <summary>
-        /// The standard emotes chat type.
-        /// </summary>
-        [XivChatTypeInfo("Standard Emotes", "emote", 0xFF8B4513)]
-        StandardEmote = 29,
+    /// <summary>
+    /// The standard emotes chat type.
+    /// </summary>
+    [XivChatTypeInfo("Standard Emotes", "emote", 0xFF8B4513)]
+    StandardEmote = 29,
 
-        /// <summary>
-        /// The yell chat type.
-        /// </summary>
-        [XivChatTypeInfo("Yell", "yell", 0xFFFFFF00)]
-        Yell = 30,
+    /// <summary>
+    /// The yell chat type.
+    /// </summary>
+    [XivChatTypeInfo("Yell", "yell", 0xFFFFFF00)]
+    Yell = 30,
 
-        /// <summary>
-        /// The cross-world party chat type.
-        /// </summary>
-        [XivChatTypeInfo("Party", "party", 0xFF1E90FF)]
-        CrossParty = 32,
+    /// <summary>
+    /// The cross-world party chat type.
+    /// </summary>
+    [XivChatTypeInfo("Party", "party", 0xFF1E90FF)]
+    CrossParty = 32,
 
-        /// <summary>
-        /// The PvP team chat type.
-        /// </summary>
-        [XivChatTypeInfo("PvP Team", "pvpt", 0xFFF4A460)]
-        PvPTeam = 36,
+    /// <summary>
+    /// The PvP team chat type.
+    /// </summary>
+    [XivChatTypeInfo("PvP Team", "pvpt", 0xFFF4A460)]
+    PvPTeam = 36,
 
-        /// <summary>
-        /// The cross-world linkshell chat type.
-        /// </summary>
-        [XivChatTypeInfo("Crossworld Linkshell 1", "cw1", 0xFF1E90FF)]
-        CrossLinkShell1 = 37,
+    /// <summary>
+    /// The cross-world linkshell chat type.
+    /// </summary>
+    [XivChatTypeInfo("Crossworld Linkshell 1", "cw1", 0xFF1E90FF)]
+    CrossLinkShell1 = 37,
 
-        /// <summary>
-        /// The echo chat type.
-        /// </summary>
-        [XivChatTypeInfo("Echo", "echo", 0xFF808080)]
-        Echo = 56,
+    /// <summary>
+    /// The echo chat type.
+    /// </summary>
+    [XivChatTypeInfo("Echo", "echo", 0xFF808080)]
+    Echo = 56,
 
-        /// <summary>
-        /// The system error chat type.
-        /// </summary>
-        SystemError = 58,
+    /// <summary>
+    /// The system error chat type.
+    /// </summary>
+    SystemError = 58,
 
-        /// <summary>
-        /// The system message chat type.
-        /// </summary>
-        SystemMessage = 57,
+    /// <summary>
+    /// The system message chat type.
+    /// </summary>
+    SystemMessage = 57,
 
-        /// <summary>
-        /// The system message (gathering) chat type.
-        /// </summary>
-        GatheringSystemMessage = 59,
+    /// <summary>
+    /// The system message (gathering) chat type.
+    /// </summary>
+    GatheringSystemMessage = 59,
 
-        /// <summary>
-        /// The error message chat type.
-        /// </summary>
-        ErrorMessage = 60,
+    /// <summary>
+    /// The error message chat type.
+    /// </summary>
+    ErrorMessage = 60,
 
-        /// <summary>
-        /// The NPC Dialogue chat type.
-        /// </summary>
-        NPCDialogue = 61,
+    /// <summary>
+    /// The NPC Dialogue chat type.
+    /// </summary>
+    NPCDialogue = 61,
 
-        /// <summary>
-        /// The NPC Dialogue (Announcements) chat type.
-        /// </summary>
-        NPCDialogueAnnouncements = 68,
+    /// <summary>
+    /// The NPC Dialogue (Announcements) chat type.
+    /// </summary>
+    NPCDialogueAnnouncements = 68,
 
-        /// <summary>
-        /// The retainer sale chat type.
-        /// </summary>
-        /// <remarks>
-        /// This might be used for other purposes.
-        /// </remarks>
-        RetainerSale = 71,
+    /// <summary>
+    /// The retainer sale chat type.
+    /// </summary>
+    /// <remarks>
+    /// This might be used for other purposes.
+    /// </remarks>
+    RetainerSale = 71,
 
-        /// <summary>
-        /// The cross-world linkshell 2 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Crossworld Linkshell 2", "cw2", 0xFF1E90FF)]
-        CrossLinkShell2 = 101,
+    /// <summary>
+    /// The cross-world linkshell 2 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Crossworld Linkshell 2", "cw2", 0xFF1E90FF)]
+    CrossLinkShell2 = 101,
 
-        /// <summary>
-        /// The cross-world linkshell 3 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Crossworld Linkshell 3", "cw3", 0xFF1E90FF)]
-        CrossLinkShell3 = 102,
+    /// <summary>
+    /// The cross-world linkshell 3 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Crossworld Linkshell 3", "cw3", 0xFF1E90FF)]
+    CrossLinkShell3 = 102,
 
-        /// <summary>
-        /// The cross-world linkshell 4 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Crossworld Linkshell 4", "cw4", 0xFF1E90FF)]
-        CrossLinkShell4 = 103,
+    /// <summary>
+    /// The cross-world linkshell 4 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Crossworld Linkshell 4", "cw4", 0xFF1E90FF)]
+    CrossLinkShell4 = 103,
 
-        /// <summary>
-        /// The cross-world linkshell 5 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Crossworld Linkshell 5", "cw5", 0xFF1E90FF)]
-        CrossLinkShell5 = 104,
+    /// <summary>
+    /// The cross-world linkshell 5 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Crossworld Linkshell 5", "cw5", 0xFF1E90FF)]
+    CrossLinkShell5 = 104,
 
-        /// <summary>
-        /// The cross-world linkshell 6 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Crossworld Linkshell 6", "cw6", 0xFF1E90FF)]
-        CrossLinkShell6 = 105,
+    /// <summary>
+    /// The cross-world linkshell 6 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Crossworld Linkshell 6", "cw6", 0xFF1E90FF)]
+    CrossLinkShell6 = 105,
 
-        /// <summary>
-        /// The cross-world linkshell 7 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Crossworld Linkshell 7", "cw7", 0xFF1E90FF)]
-        CrossLinkShell7 = 106,
+    /// <summary>
+    /// The cross-world linkshell 7 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Crossworld Linkshell 7", "cw7", 0xFF1E90FF)]
+    CrossLinkShell7 = 106,
 
-        /// <summary>
-        /// The cross-world linkshell 8 chat type.
-        /// </summary>
-        [XivChatTypeInfo("Crossworld Linkshell 8", "cw8", 0xFF1E90FF)]
-        CrossLinkShell8 = 107,
-    }
+    /// <summary>
+    /// The cross-world linkshell 8 chat type.
+    /// </summary>
+    [XivChatTypeInfo("Crossworld Linkshell 8", "cw8", 0xFF1E90FF)]
+    CrossLinkShell8 = 107,
 }
diff --git a/Dalamud/Game/Text/XivChatTypeExtensions.cs b/Dalamud/Game/Text/XivChatTypeExtensions.cs
index a26687c47..3bdeb1525 100644
--- a/Dalamud/Game/Text/XivChatTypeExtensions.cs
+++ b/Dalamud/Game/Text/XivChatTypeExtensions.cs
@@ -1,20 +1,19 @@
 using Dalamud.Utility;
 
-namespace Dalamud.Game.Text
+namespace Dalamud.Game.Text;
+
+/// <summary>
+/// Extension methods for the <see cref="XivChatType"/> type.
+/// </summary>
+public static class XivChatTypeExtensions
 {
     /// <summary>
-    /// Extension methods for the <see cref="XivChatType"/> type.
+    /// Get the InfoAttribute associated with this chat type.
     /// </summary>
-    public static class XivChatTypeExtensions
+    /// <param name="chatType">The chat type.</param>
+    /// <returns>The info attribute.</returns>
+    public static XivChatTypeInfoAttribute GetDetails(this XivChatType chatType)
     {
-        /// <summary>
-        /// Get the InfoAttribute associated with this chat type.
-        /// </summary>
-        /// <param name="chatType">The chat type.</param>
-        /// <returns>The info attribute.</returns>
-        public static XivChatTypeInfoAttribute GetDetails(this XivChatType chatType)
-        {
-            return chatType.GetAttribute<XivChatTypeInfoAttribute>();
-        }
+        return chatType.GetAttribute<XivChatTypeInfoAttribute>();
     }
 }
diff --git a/Dalamud/Game/Text/XivChatTypeInfoAttribute.cs b/Dalamud/Game/Text/XivChatTypeInfoAttribute.cs
index e549ac761..91bdeef40 100644
--- a/Dalamud/Game/Text/XivChatTypeInfoAttribute.cs
+++ b/Dalamud/Game/Text/XivChatTypeInfoAttribute.cs
@@ -1,39 +1,38 @@
 using System;
 
-namespace Dalamud.Game.Text
+namespace Dalamud.Game.Text;
+
+/// <summary>
+/// Storage for relevant information associated with the chat type.
+/// </summary>
+[AttributeUsage(AttributeTargets.Field)]
+public class XivChatTypeInfoAttribute : Attribute
 {
     /// <summary>
-    /// Storage for relevant information associated with the chat type.
+    /// Initializes a new instance of the <see cref="XivChatTypeInfoAttribute"/> class.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Field)]
-    public class XivChatTypeInfoAttribute : Attribute
+    /// <param name="fancyName">The fancy name.</param>
+    /// <param name="slug">The name slug.</param>
+    /// <param name="defaultColor">The default color.</param>
+    internal XivChatTypeInfoAttribute(string fancyName, string slug, uint defaultColor)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XivChatTypeInfoAttribute"/> class.
-        /// </summary>
-        /// <param name="fancyName">The fancy name.</param>
-        /// <param name="slug">The name slug.</param>
-        /// <param name="defaultColor">The default color.</param>
-        internal XivChatTypeInfoAttribute(string fancyName, string slug, uint defaultColor)
-        {
-            this.FancyName = fancyName;
-            this.Slug = slug;
-            this.DefaultColor = defaultColor;
-        }
-
-        /// <summary>
-        /// Gets the "fancy" name of the type.
-        /// </summary>
-        public string FancyName { get; }
-
-        /// <summary>
-        /// Gets the type name slug or short-form.
-        /// </summary>
-        public string Slug { get; }
-
-        /// <summary>
-        /// Gets the type default color.
-        /// </summary>
-        public uint DefaultColor { get; }
+        this.FancyName = fancyName;
+        this.Slug = slug;
+        this.DefaultColor = defaultColor;
     }
+
+    /// <summary>
+    /// Gets the "fancy" name of the type.
+    /// </summary>
+    public string FancyName { get; }
+
+    /// <summary>
+    /// Gets the type name slug or short-form.
+    /// </summary>
+    public string Slug { get; }
+
+    /// <summary>
+    /// Gets the type default color.
+    /// </summary>
+    public uint DefaultColor { get; }
 }
diff --git a/Dalamud/Hooking/AsmHook.cs b/Dalamud/Hooking/AsmHook.cs
index e12d7f4f8..4c551db04 100644
--- a/Dalamud/Hooking/AsmHook.cs
+++ b/Dalamud/Hooking/AsmHook.cs
@@ -6,178 +6,177 @@ using Dalamud.Hooking.Internal;
 using Dalamud.Memory;
 using Reloaded.Hooks;
 
-namespace Dalamud.Hooking
+namespace Dalamud.Hooking;
+
+/// <summary>
+/// Manages a hook which can be used to intercept a call to native function.
+/// This class is basically a thin wrapper around the LocalHook type to provide helper functions.
+/// </summary>
+public sealed class AsmHook : IDisposable, IDalamudHook
 {
+    private readonly IntPtr address;
+    private readonly Reloaded.Hooks.Definitions.IAsmHook hookImpl;
+
+    private bool isActivated = false;
+    private bool isEnabled = false;
+
+    private DynamicMethod statsMethod;
+
     /// <summary>
-    /// Manages a hook which can be used to intercept a call to native function.
-    /// This class is basically a thin wrapper around the LocalHook type to provide helper functions.
+    /// Initializes a new instance of the <see cref="AsmHook"/> class.
+    /// This is an assembly hook and should not be used for except under unique circumstances.
+    /// Hook is not activated until Enable() method is called.
     /// </summary>
-    public sealed class AsmHook : IDisposable, IDalamudHook
+    /// <param name="address">A memory address to install a hook.</param>
+    /// <param name="assembly">Assembly code representing your hook.</param>
+    /// <param name="name">The name of what you are hooking, since a delegate is not required.</param>
+    /// <param name="asmHookBehaviour">How the hook is inserted into the execution flow.</param>
+    public AsmHook(IntPtr address, byte[] assembly, string name, AsmHookBehaviour asmHookBehaviour = AsmHookBehaviour.ExecuteFirst)
     {
-        private readonly IntPtr address;
-        private readonly Reloaded.Hooks.Definitions.IAsmHook hookImpl;
+        address = HookManager.FollowJmp(address);
 
-        private bool isActivated = false;
-        private bool isEnabled = false;
-
-        private DynamicMethod statsMethod;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AsmHook"/> class.
-        /// This is an assembly hook and should not be used for except under unique circumstances.
-        /// Hook is not activated until Enable() method is called.
-        /// </summary>
-        /// <param name="address">A memory address to install a hook.</param>
-        /// <param name="assembly">Assembly code representing your hook.</param>
-        /// <param name="name">The name of what you are hooking, since a delegate is not required.</param>
-        /// <param name="asmHookBehaviour">How the hook is inserted into the execution flow.</param>
-        public AsmHook(IntPtr address, byte[] assembly, string name, AsmHookBehaviour asmHookBehaviour = AsmHookBehaviour.ExecuteFirst)
+        var hasOtherHooks = HookManager.Originals.ContainsKey(address);
+        if (!hasOtherHooks)
         {
-            address = HookManager.FollowJmp(address);
-
-            var hasOtherHooks = HookManager.Originals.ContainsKey(address);
-            if (!hasOtherHooks)
-            {
-                MemoryHelper.ReadRaw(address, 0x32, out var original);
-                HookManager.Originals[address] = original;
-            }
-
-            this.address = address;
-            this.hookImpl = ReloadedHooks.Instance.CreateAsmHook(assembly, address.ToInt64(), (Reloaded.Hooks.Definitions.Enums.AsmHookBehaviour)asmHookBehaviour);
-
-            this.statsMethod = new DynamicMethod(name, null, null);
-            this.statsMethod.GetILGenerator().Emit(OpCodes.Ret);
-            var dele = this.statsMethod.CreateDelegate(typeof(Action));
-
-            HookManager.TrackedHooks.TryAdd(Guid.NewGuid(), new HookInfo(this, dele, Assembly.GetCallingAssembly()));
+            MemoryHelper.ReadRaw(address, 0x32, out var original);
+            HookManager.Originals[address] = original;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AsmHook"/> class.
-        /// This is an assembly hook and should not be used for except under unique circumstances.
-        /// Hook is not activated until Enable() method is called.
-        /// </summary>
-        /// <param name="address">A memory address to install a hook.</param>
-        /// <param name="assembly">FASM syntax assembly code representing your hook. The first line should be use64.</param>
-        /// <param name="name">The name of what you are hooking, since a delegate is not required.</param>
-        /// <param name="asmHookBehaviour">How the hook is inserted into the execution flow.</param>
-        public AsmHook(IntPtr address, string[] assembly, string name, AsmHookBehaviour asmHookBehaviour = AsmHookBehaviour.ExecuteFirst)
+        this.address = address;
+        this.hookImpl = ReloadedHooks.Instance.CreateAsmHook(assembly, address.ToInt64(), (Reloaded.Hooks.Definitions.Enums.AsmHookBehaviour)asmHookBehaviour);
+
+        this.statsMethod = new DynamicMethod(name, null, null);
+        this.statsMethod.GetILGenerator().Emit(OpCodes.Ret);
+        var dele = this.statsMethod.CreateDelegate(typeof(Action));
+
+        HookManager.TrackedHooks.TryAdd(Guid.NewGuid(), new HookInfo(this, dele, Assembly.GetCallingAssembly()));
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AsmHook"/> class.
+    /// This is an assembly hook and should not be used for except under unique circumstances.
+    /// Hook is not activated until Enable() method is called.
+    /// </summary>
+    /// <param name="address">A memory address to install a hook.</param>
+    /// <param name="assembly">FASM syntax assembly code representing your hook. The first line should be use64.</param>
+    /// <param name="name">The name of what you are hooking, since a delegate is not required.</param>
+    /// <param name="asmHookBehaviour">How the hook is inserted into the execution flow.</param>
+    public AsmHook(IntPtr address, string[] assembly, string name, AsmHookBehaviour asmHookBehaviour = AsmHookBehaviour.ExecuteFirst)
+    {
+        address = HookManager.FollowJmp(address);
+
+        var hasOtherHooks = HookManager.Originals.ContainsKey(address);
+        if (!hasOtherHooks)
         {
-            address = HookManager.FollowJmp(address);
-
-            var hasOtherHooks = HookManager.Originals.ContainsKey(address);
-            if (!hasOtherHooks)
-            {
-                MemoryHelper.ReadRaw(address, 0x32, out var original);
-                HookManager.Originals[address] = original;
-            }
-
-            this.address = address;
-            this.hookImpl = ReloadedHooks.Instance.CreateAsmHook(assembly, address.ToInt64(), (Reloaded.Hooks.Definitions.Enums.AsmHookBehaviour)asmHookBehaviour);
-
-            this.statsMethod = new DynamicMethod(name, null, null);
-            this.statsMethod.GetILGenerator().Emit(OpCodes.Ret);
-            var dele = this.statsMethod.CreateDelegate(typeof(Action));
-
-            HookManager.TrackedHooks.TryAdd(Guid.NewGuid(), new HookInfo(this, dele, Assembly.GetCallingAssembly()));
+            MemoryHelper.ReadRaw(address, 0x32, out var original);
+            HookManager.Originals[address] = original;
         }
 
-        /// <summary>
-        /// Gets a memory address of the target function.
-        /// </summary>
-        /// <exception cref="ObjectDisposedException">Hook is already disposed.</exception>
-        public IntPtr Address
-        {
-            get
-            {
-                this.CheckDisposed();
-                return this.address;
-            }
-        }
+        this.address = address;
+        this.hookImpl = ReloadedHooks.Instance.CreateAsmHook(assembly, address.ToInt64(), (Reloaded.Hooks.Definitions.Enums.AsmHookBehaviour)asmHookBehaviour);
 
-        /// <summary>
-        /// Gets a value indicating whether or not the hook is enabled.
-        /// </summary>
-        public bool IsEnabled
-        {
-            get
-            {
-                this.CheckDisposed();
-                return this.isEnabled;
-            }
-        }
+        this.statsMethod = new DynamicMethod(name, null, null);
+        this.statsMethod.GetILGenerator().Emit(OpCodes.Ret);
+        var dele = this.statsMethod.CreateDelegate(typeof(Action));
 
-        /// <summary>
-        /// Gets a value indicating whether or not the hook has been disposed.
-        /// </summary>
-        public bool IsDisposed { get; private set; }
+        HookManager.TrackedHooks.TryAdd(Guid.NewGuid(), new HookInfo(this, dele, Assembly.GetCallingAssembly()));
+    }
 
-        /// <inheritdoc/>
-        public string BackendName => "Reloaded/Asm";
-
-        /// <summary>
-        /// Remove a hook from the current process.
-        /// </summary>
-        public void Dispose()
-        {
-            if (this.IsDisposed)
-                return;
-
-            this.IsDisposed = true;
-
-            if (this.isEnabled)
-            {
-                this.isEnabled = false;
-                this.hookImpl.Disable();
-            }
-        }
-
-        /// <summary>
-        /// Starts intercepting a call to the function.
-        /// </summary>
-        public void Enable()
+    /// <summary>
+    /// Gets a memory address of the target function.
+    /// </summary>
+    /// <exception cref="ObjectDisposedException">Hook is already disposed.</exception>
+    public IntPtr Address
+    {
+        get
         {
             this.CheckDisposed();
-
-            if (!this.isActivated)
-            {
-                this.isActivated = true;
-                this.hookImpl.Activate();
-            }
-
-            if (!this.isEnabled)
-            {
-                this.isEnabled = true;
-                this.hookImpl.Enable();
-            }
+            return this.address;
         }
+    }
 
-        /// <summary>
-        /// Stops intercepting a call to the function.
-        /// </summary>
-        public void Disable()
+    /// <summary>
+    /// Gets a value indicating whether or not the hook is enabled.
+    /// </summary>
+    public bool IsEnabled
+    {
+        get
         {
             this.CheckDisposed();
+            return this.isEnabled;
+        }
+    }
 
-            if (!this.isEnabled)
-                return;
+    /// <summary>
+    /// Gets a value indicating whether or not the hook has been disposed.
+    /// </summary>
+    public bool IsDisposed { get; private set; }
 
-            if (this.isEnabled)
-            {
-                this.isEnabled = false;
-                this.hookImpl.Disable();
-            }
+    /// <inheritdoc/>
+    public string BackendName => "Reloaded/Asm";
+
+    /// <summary>
+    /// Remove a hook from the current process.
+    /// </summary>
+    public void Dispose()
+    {
+        if (this.IsDisposed)
+            return;
+
+        this.IsDisposed = true;
+
+        if (this.isEnabled)
+        {
+            this.isEnabled = false;
+            this.hookImpl.Disable();
+        }
+    }
+
+    /// <summary>
+    /// Starts intercepting a call to the function.
+    /// </summary>
+    public void Enable()
+    {
+        this.CheckDisposed();
+
+        if (!this.isActivated)
+        {
+            this.isActivated = true;
+            this.hookImpl.Activate();
         }
 
-        /// <summary>
-        /// Check if this object has been disposed already.
-        /// </summary>
-        private void CheckDisposed()
+        if (!this.isEnabled)
         {
-            if (this.IsDisposed)
-            {
-                throw new ObjectDisposedException(message: "Hook is already disposed", null);
-            }
+            this.isEnabled = true;
+            this.hookImpl.Enable();
+        }
+    }
+
+    /// <summary>
+    /// Stops intercepting a call to the function.
+    /// </summary>
+    public void Disable()
+    {
+        this.CheckDisposed();
+
+        if (!this.isEnabled)
+            return;
+
+        if (this.isEnabled)
+        {
+            this.isEnabled = false;
+            this.hookImpl.Disable();
+        }
+    }
+
+    /// <summary>
+    /// Check if this object has been disposed already.
+    /// </summary>
+    private void CheckDisposed()
+    {
+        if (this.IsDisposed)
+        {
+            throw new ObjectDisposedException(message: "Hook is already disposed", null);
         }
     }
 }
diff --git a/Dalamud/Hooking/AsmHookBehaviour.cs b/Dalamud/Hooking/AsmHookBehaviour.cs
index 9f856ae67..6676ee670 100644
--- a/Dalamud/Hooking/AsmHookBehaviour.cs
+++ b/Dalamud/Hooking/AsmHookBehaviour.cs
@@ -1,24 +1,23 @@
-namespace Dalamud.Hooking
+namespace Dalamud.Hooking;
+
+/// <summary>
+/// Defines the behaviour used by the Dalamud.Hooking.AsmHook.
+/// This is equivalent to the same enumeration in Reloaded and is included so you do not have to reference the assembly.
+/// </summary>
+public enum AsmHookBehaviour
 {
     /// <summary>
-    /// Defines the behaviour used by the Dalamud.Hooking.AsmHook.
-    /// This is equivalent to the same enumeration in Reloaded and is included so you do not have to reference the assembly.
+    /// Executes your assembly code before the original.
     /// </summary>
-    public enum AsmHookBehaviour
-    {
-        /// <summary>
-        /// Executes your assembly code before the original.
-        /// </summary>
-        ExecuteFirst = 0,
+    ExecuteFirst = 0,
 
-        /// <summary>
-        /// Executes your assembly code after the original.
-        /// </summary>
-        ExecuteAfter = 1,
+    /// <summary>
+    /// Executes your assembly code after the original.
+    /// </summary>
+    ExecuteAfter = 1,
 
-        /// <summary>
-        /// Do not execute original replaced code (Dangerous!).
-        /// </summary>
-        DoNotExecuteOriginal = 2,
-    }
+    /// <summary>
+    /// Do not execute original replaced code (Dangerous!).
+    /// </summary>
+    DoNotExecuteOriginal = 2,
 }
diff --git a/Dalamud/Hooking/Hook.cs b/Dalamud/Hooking/Hook.cs
index 8c12d5563..6e1fa24f2 100644
--- a/Dalamud/Hooking/Hook.cs
+++ b/Dalamud/Hooking/Hook.cs
@@ -6,405 +6,404 @@ using System.Runtime.InteropServices;
 using Dalamud.Configuration.Internal;
 using Dalamud.Hooking.Internal;
 
-namespace Dalamud.Hooking
+namespace Dalamud.Hooking;
+
+/// <summary>
+/// Manages a hook which can be used to intercept a call to native function.
+/// This class is basically a thin wrapper around the LocalHook type to provide helper functions.
+/// </summary>
+/// <typeparam name="T">Delegate type to represents a function prototype. This must be the same prototype as original function do.</typeparam>
+public class Hook<T> : IDisposable, IDalamudHook where T : Delegate
 {
-    /// <summary>
-    /// Manages a hook which can be used to intercept a call to native function.
-    /// This class is basically a thin wrapper around the LocalHook type to provide helper functions.
-    /// </summary>
-    /// <typeparam name="T">Delegate type to represents a function prototype. This must be the same prototype as original function do.</typeparam>
-    public class Hook<T> : IDisposable, IDalamudHook where T : Delegate
-    {
 #pragma warning disable SA1310
-        // ReSharper disable once InconsistentNaming
-        private const ulong IMAGE_ORDINAL_FLAG64 = 0x8000000000000000;
-        // ReSharper disable once InconsistentNaming
-        private const uint IMAGE_ORDINAL_FLAG32 = 0x80000000;
+    // ReSharper disable once InconsistentNaming
+    private const ulong IMAGE_ORDINAL_FLAG64 = 0x8000000000000000;
+    // ReSharper disable once InconsistentNaming
+    private const uint IMAGE_ORDINAL_FLAG32 = 0x80000000;
 #pragma warning restore SA1310
 
-        private readonly IntPtr address;
+    private readonly IntPtr address;
 
-        private readonly Hook<T>? compatHookImpl;
+    private readonly Hook<T>? compatHookImpl;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Hook{T}"/> class.
-        /// Hook is not activated until Enable() method is called.
-        /// </summary>
-        /// <param name="address">A memory address to install a hook.</param>
-        /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
-        [Obsolete("Use Hook<T>.FromAddress instead.")]
-        public Hook(IntPtr address, T detour)
-            : this(address, detour, false, Assembly.GetCallingAssembly())
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Hook{T}"/> class.
+    /// Hook is not activated until Enable() method is called.
+    /// </summary>
+    /// <param name="address">A memory address to install a hook.</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    [Obsolete("Use Hook<T>.FromAddress instead.")]
+    public Hook(IntPtr address, T detour)
+        : this(address, detour, false, Assembly.GetCallingAssembly())
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Hook{T}"/> class.
+    /// Hook is not activated until Enable() method is called.
+    /// Please do not use MinHook unless you have thoroughly troubleshot why Reloaded does not work.
+    /// </summary>
+    /// <param name="address">A memory address to install a hook.</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <param name="useMinHook">Use the MinHook hooking library instead of Reloaded.</param>
+    [Obsolete("Use Hook<T>.FromAddress instead.")]
+    public Hook(IntPtr address, T detour, bool useMinHook)
+        : this(address, detour, useMinHook, Assembly.GetCallingAssembly())
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Hook{T}"/> class.
+    /// </summary>
+    /// <param name="address">A memory address to install a hook.</param>
+    internal Hook(IntPtr address)
+    {
+        this.address = address;
+    }
+
+    [Obsolete("Use Hook<T>.FromAddress instead.")]
+    private Hook(IntPtr address, T detour, bool useMinHook, Assembly callingAssembly)
+    {
+        if (EnvironmentConfiguration.DalamudForceMinHook)
+            useMinHook = true;
+
+        address = HookManager.FollowJmp(address);
+        if (useMinHook)
+            this.compatHookImpl = new MinHookHook<T>(address, detour, callingAssembly);
+        else
+            this.compatHookImpl = new ReloadedHook<T>(address, detour, callingAssembly);
+    }
+
+    /// <summary>
+    /// Gets a memory address of the target function.
+    /// </summary>
+    /// <exception cref="ObjectDisposedException">Hook is already disposed.</exception>
+    public IntPtr Address
+    {
+        get
         {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Hook{T}"/> class.
-        /// Hook is not activated until Enable() method is called.
-        /// Please do not use MinHook unless you have thoroughly troubleshot why Reloaded does not work.
-        /// </summary>
-        /// <param name="address">A memory address to install a hook.</param>
-        /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
-        /// <param name="useMinHook">Use the MinHook hooking library instead of Reloaded.</param>
-        [Obsolete("Use Hook<T>.FromAddress instead.")]
-        public Hook(IntPtr address, T detour, bool useMinHook)
-            : this(address, detour, useMinHook, Assembly.GetCallingAssembly())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Hook{T}"/> class.
-        /// </summary>
-        /// <param name="address">A memory address to install a hook.</param>
-        internal Hook(IntPtr address)
-        {
-            this.address = address;
-        }
-
-        [Obsolete("Use Hook<T>.FromAddress instead.")]
-        private Hook(IntPtr address, T detour, bool useMinHook, Assembly callingAssembly)
-        {
-            if (EnvironmentConfiguration.DalamudForceMinHook)
-                useMinHook = true;
-
-            address = HookManager.FollowJmp(address);
-            if (useMinHook)
-                this.compatHookImpl = new MinHookHook<T>(address, detour, callingAssembly);
-            else
-                this.compatHookImpl = new ReloadedHook<T>(address, detour, callingAssembly);
-        }
-
-        /// <summary>
-        /// Gets a memory address of the target function.
-        /// </summary>
-        /// <exception cref="ObjectDisposedException">Hook is already disposed.</exception>
-        public IntPtr Address
-        {
-            get
-            {
-                this.CheckDisposed();
-                return this.address;
-            }
-        }
-
-        /// <summary>
-        /// Gets a delegate function that can be used to call the actual function as if function is not hooked yet.
-        /// </summary>
-        /// <exception cref="ObjectDisposedException">Hook is already disposed.</exception>
-        public virtual T Original => this.compatHookImpl != null ? this.compatHookImpl!.Original : throw new NotImplementedException();
-
-        /// <summary>
-        /// Gets a delegate function that can be used to call the actual function as if function is not hooked yet.
-        /// This can be called even after Dispose.
-        /// </summary>
-        public T OriginalDisposeSafe
-        {
-            get
-            {
-                if (this.compatHookImpl != null)
-                    return this.compatHookImpl!.OriginalDisposeSafe;
-                if (this.IsDisposed)
-                    return Marshal.GetDelegateForFunctionPointer<T>(this.address);
-                return this.Original;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether or not the hook is enabled.
-        /// </summary>
-        public virtual bool IsEnabled => this.compatHookImpl != null ? this.compatHookImpl!.IsEnabled : throw new NotImplementedException();
-
-        /// <summary>
-        /// Gets a value indicating whether or not the hook has been disposed.
-        /// </summary>
-        public bool IsDisposed { get; private set; }
-
-        /// <inheritdoc/>
-        public virtual string BackendName => this.compatHookImpl != null ? this.compatHookImpl!.BackendName : throw new NotImplementedException();
-
-        /// <summary>
-        /// Creates a hook by rewriting import table address.
-        /// </summary>
-        /// <param name="address">A memory address to install a hook.</param>
-        /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
-        /// <returns>The hook with the supplied parameters.</returns>
-        public static unsafe Hook<T> FromFunctionPointerVariable(IntPtr address, T detour)
-        {
-            return new FunctionPointerVariableHook<T>(address, detour, Assembly.GetCallingAssembly());
-        }
-
-        /// <summary>
-        /// Creates a hook by rewriting import table address.
-        /// </summary>
-        /// <param name="module">Module to check for. Current process' main module if null.</param>
-        /// <param name="moduleName">Name of the DLL, including the extension.</param>
-        /// <param name="functionName">Decorated name of the function.</param>
-        /// <param name="hintOrOrdinal">Hint or ordinal. 0 to unspecify.</param>
-        /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
-        /// <returns>The hook with the supplied parameters.</returns>
-        public static unsafe Hook<T> FromImport(ProcessModule? module, string moduleName, string functionName, uint hintOrOrdinal, T detour)
-        {
-            module ??= Process.GetCurrentProcess().MainModule;
-            if (module == null)
-                throw new InvalidOperationException("Current module is null?");
-            var pDos = (PeHeader.IMAGE_DOS_HEADER*)module.BaseAddress;
-            var pNt = (PeHeader.IMAGE_FILE_HEADER*)(module.BaseAddress + (int)pDos->e_lfanew + 4);
-            var isPe64 = pNt->SizeOfOptionalHeader == Marshal.SizeOf<PeHeader.IMAGE_OPTIONAL_HEADER64>();
-            PeHeader.IMAGE_DATA_DIRECTORY* pDataDirectory;
-            if (isPe64)
-            {
-                var pOpt = (PeHeader.IMAGE_OPTIONAL_HEADER64*)(module.BaseAddress + (int)pDos->e_lfanew + 4 + Marshal.SizeOf<PeHeader.IMAGE_FILE_HEADER>());
-                pDataDirectory = &pOpt->ImportTable;
-            }
-            else
-            {
-                var pOpt = (PeHeader.IMAGE_OPTIONAL_HEADER32*)(module.BaseAddress + (int)pDos->e_lfanew + 4 + Marshal.SizeOf<PeHeader.IMAGE_FILE_HEADER>());
-                pDataDirectory = &pOpt->ImportTable;
-            }
-
-            var moduleNameLowerWithNullTerminator = (moduleName + "\0").ToLowerInvariant();
-            foreach (ref var importDescriptor in new Span<PeHeader.IMAGE_IMPORT_DESCRIPTOR>(
-                (PeHeader.IMAGE_IMPORT_DESCRIPTOR*)(module.BaseAddress + (int)pDataDirectory->VirtualAddress),
-                (int)(pDataDirectory->Size / Marshal.SizeOf<PeHeader.IMAGE_IMPORT_DESCRIPTOR>())))
-            {
-                // Having all zero values signals the end of the table. We didn't find anything.
-                if (importDescriptor.Characteristics == 0)
-                    throw new MissingMethodException("Specified dll not found");
-
-                // Skip invalid entries, just in case.
-                if (importDescriptor.Name == 0)
-                    continue;
-
-                // Name must be contained in this directory.
-                if (importDescriptor.Name < pDataDirectory->VirtualAddress)
-                    continue;
-                var currentDllNameWithNullTerminator = Marshal.PtrToStringUTF8(
-                    module.BaseAddress + (int)importDescriptor.Name,
-                    (int)Math.Min(pDataDirectory->Size + pDataDirectory->VirtualAddress - importDescriptor.Name, moduleNameLowerWithNullTerminator.Length));
-
-                // Is this entry about the DLL that we're looking for? (Case insensitive)
-                if (currentDllNameWithNullTerminator.ToLowerInvariant() != moduleNameLowerWithNullTerminator)
-                    continue;
-
-                if (isPe64)
-                {
-                    return new FunctionPointerVariableHook<T>(FromImportHelper64(module.BaseAddress, ref importDescriptor, ref *pDataDirectory, functionName, hintOrOrdinal), detour, Assembly.GetCallingAssembly());
-                }
-                else
-                {
-                    return new FunctionPointerVariableHook<T>(FromImportHelper32(module.BaseAddress, ref importDescriptor, ref *pDataDirectory, functionName, hintOrOrdinal), detour, Assembly.GetCallingAssembly());
-                }
-            }
-
-            throw new MissingMethodException("Specified dll not found");
-        }
-
-        /// <summary>
-        /// Creates a hook. Hooking address is inferred by calling to GetProcAddress() function.
-        /// The hook is not activated until Enable() method is called.
-        /// </summary>
-        /// <param name="moduleName">A name of the module currently loaded in the memory. (e.g. ws2_32.dll).</param>
-        /// <param name="exportName">A name of the exported function name (e.g. send).</param>
-        /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
-        /// <returns>The hook with the supplied parameters.</returns>
-        public static Hook<T> FromSymbol(string moduleName, string exportName, T detour)
-            => FromSymbol(moduleName, exportName, detour, false);
-
-        /// <summary>
-        /// Creates a hook. Hooking address is inferred by calling to GetProcAddress() function.
-        /// The hook is not activated until Enable() method is called.
-        /// Please do not use MinHook unless you have thoroughly troubleshot why Reloaded does not work.
-        /// </summary>
-        /// <param name="moduleName">A name of the module currently loaded in the memory. (e.g. ws2_32.dll).</param>
-        /// <param name="exportName">A name of the exported function name (e.g. send).</param>
-        /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
-        /// <param name="useMinHook">Use the MinHook hooking library instead of Reloaded.</param>
-        /// <returns>The hook with the supplied parameters.</returns>
-        public static Hook<T> FromSymbol(string moduleName, string exportName, T detour, bool useMinHook)
-        {
-            if (EnvironmentConfiguration.DalamudForceMinHook)
-                useMinHook = true;
-
-            var moduleHandle = NativeFunctions.GetModuleHandleW(moduleName);
-            if (moduleHandle == IntPtr.Zero)
-                throw new Exception($"Could not get a handle to module {moduleName}");
-
-            var procAddress = NativeFunctions.GetProcAddress(moduleHandle, exportName);
-            if (procAddress == IntPtr.Zero)
-                throw new Exception($"Could not get the address of {moduleName}::{exportName}");
-
-            procAddress = HookManager.FollowJmp(procAddress);
-            if (useMinHook)
-                return new MinHookHook<T>(procAddress, detour, Assembly.GetCallingAssembly());
-            else
-                return new ReloadedHook<T>(procAddress, detour, Assembly.GetCallingAssembly());
-        }
-
-        /// <summary>
-        /// Creates a hook. Hooking address is inferred by calling to GetProcAddress() function.
-        /// The hook is not activated until Enable() method is called.
-        /// Please do not use MinHook unless you have thoroughly troubleshot why Reloaded does not work.
-        /// </summary>
-        /// <param name="procAddress">A memory address to install a hook.</param>
-        /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
-        /// <param name="useMinHook">Use the MinHook hooking library instead of Reloaded.</param>
-        /// <returns>The hook with the supplied parameters.</returns>
-        public static Hook<T> FromAddress(IntPtr procAddress, T detour, bool useMinHook = false)
-        {
-            if (EnvironmentConfiguration.DalamudForceMinHook)
-                useMinHook = true;
-
-            procAddress = HookManager.FollowJmp(procAddress);
-            if (useMinHook)
-                return new MinHookHook<T>(procAddress, detour, Assembly.GetCallingAssembly());
-            else
-                return new ReloadedHook<T>(procAddress, detour, Assembly.GetCallingAssembly());
-        }
-
-        /// <summary>
-        /// Remove a hook from the current process.
-        /// </summary>
-        public virtual void Dispose()
-        {
-            if (this.IsDisposed)
-                return;
-
-            this.compatHookImpl?.Dispose();
-
-            this.IsDisposed = true;
-        }
-
-        /// <summary>
-        /// Starts intercepting a call to the function.
-        /// </summary>
-        public virtual void Enable()
-        {
-            if (this.compatHookImpl != null)
-                this.compatHookImpl.Enable();
-            else
-                throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Stops intercepting a call to the function.
-        /// </summary>
-        public virtual void Disable()
-        {
-            if (this.compatHookImpl != null)
-                this.compatHookImpl.Disable();
-            else
-                throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Check if this object has been disposed already.
-        /// </summary>
-        protected void CheckDisposed()
-        {
-            if (this.IsDisposed)
-            {
-                throw new ObjectDisposedException(message: "Hook is already disposed", null);
-            }
-        }
-
-        private static unsafe IntPtr FromImportHelper32(IntPtr baseAddress, ref PeHeader.IMAGE_IMPORT_DESCRIPTOR desc, ref PeHeader.IMAGE_DATA_DIRECTORY dir, string functionName, uint hintOrOrdinal)
-        {
-            var importLookupsOversizedSpan = new Span<uint>((uint*)(baseAddress + (int)desc.OriginalFirstThunk), (int)((dir.Size - desc.OriginalFirstThunk) / Marshal.SizeOf<int>()));
-            var importAddressesOversizedSpan = new Span<uint>((uint*)(baseAddress + (int)desc.FirstThunk), (int)((dir.Size - desc.FirstThunk) / Marshal.SizeOf<int>()));
-
-            var functionNameWithNullTerminator = functionName + "\0";
-            for (int i = 0, i_ = Math.Min(importLookupsOversizedSpan.Length, importAddressesOversizedSpan.Length); i < i_ && importLookupsOversizedSpan[i] != 0 && importAddressesOversizedSpan[i] != 0; i++)
-            {
-                var importLookup = importLookupsOversizedSpan[i];
-
-                // Is this entry importing by ordinals? A lot of socket functions are the case.
-                if ((importLookup & IMAGE_ORDINAL_FLAG32) != 0)
-                {
-                    var ordinal = importLookup & ~IMAGE_ORDINAL_FLAG32;
-
-                    // Is this the entry?
-                    if (hintOrOrdinal == 0 || ordinal != hintOrOrdinal)
-                        continue;
-
-                    // Is this entry not importing by ordinals, and are we using hint exclusively to find the entry?
-                }
-                else
-                {
-                    var hint = Marshal.ReadInt16(baseAddress + (int)importLookup);
-
-                    if (functionName.Length > 0)
-                    {
-                        // Is this the entry?
-                        if (hint != hintOrOrdinal)
-                            continue;
-                    }
-                    else
-                    {
-                        // Name must be contained in this directory.
-                        var currentFunctionNameWithNullTerminator = Marshal.PtrToStringUTF8(
-                            baseAddress + (int)importLookup + 2,
-                            (int)Math.Min(dir.VirtualAddress + dir.Size - (uint)baseAddress - importLookup - 2, (uint)functionNameWithNullTerminator.Length));
-
-                        // Is this entry about the function that we're looking for?
-                        if (currentFunctionNameWithNullTerminator != functionNameWithNullTerminator)
-                            continue;
-                    }
-                }
-
-                return baseAddress + (int)desc.FirstThunk + (i * Marshal.SizeOf<int>());
-            }
-
-            throw new MissingMethodException("Specified method not found");
-        }
-
-        private static unsafe IntPtr FromImportHelper64(IntPtr baseAddress, ref PeHeader.IMAGE_IMPORT_DESCRIPTOR desc, ref PeHeader.IMAGE_DATA_DIRECTORY dir, string functionName, uint hintOrOrdinal)
-        {
-            var importLookupsOversizedSpan = new Span<ulong>((ulong*)(baseAddress + (int)desc.OriginalFirstThunk), (int)((dir.Size - desc.OriginalFirstThunk) / Marshal.SizeOf<ulong>()));
-            var importAddressesOversizedSpan = new Span<ulong>((ulong*)(baseAddress + (int)desc.FirstThunk), (int)((dir.Size - desc.FirstThunk) / Marshal.SizeOf<ulong>()));
-
-            var functionNameWithNullTerminator = functionName + "\0";
-            for (int i = 0, i_ = Math.Min(importLookupsOversizedSpan.Length, importAddressesOversizedSpan.Length); i < i_ && importLookupsOversizedSpan[i] != 0 && importAddressesOversizedSpan[i] != 0; i++)
-            {
-                var importLookup = importLookupsOversizedSpan[i];
-
-                // Is this entry importing by ordinals? A lot of socket functions are the case.
-                if ((importLookup & IMAGE_ORDINAL_FLAG64) != 0)
-                {
-                    var ordinal = importLookup & ~IMAGE_ORDINAL_FLAG64;
-
-                    // Is this the entry?
-                    if (hintOrOrdinal == 0 || ordinal != hintOrOrdinal)
-                        continue;
-
-                    // Is this entry not importing by ordinals, and are we using hint exclusively to find the entry?
-                }
-                else
-                {
-                    var hint = Marshal.ReadInt16(baseAddress + (int)importLookup);
-
-                    if (functionName.Length == 0)
-                    {
-                        // Is this the entry?
-                        if (hint != hintOrOrdinal)
-                            continue;
-                    }
-                    else
-                    {
-                        // Name must be contained in this directory.
-                        var currentFunctionNameWithNullTerminator = Marshal.PtrToStringUTF8(
-                            baseAddress + (int)importLookup + 2,
-                            (int)Math.Min((ulong)dir.VirtualAddress + dir.Size - (ulong)baseAddress - importLookup - 2, (ulong)functionNameWithNullTerminator.Length));
-
-                        // Is this entry about the function that we're looking for?
-                        if (currentFunctionNameWithNullTerminator != functionNameWithNullTerminator)
-                            continue;
-                    }
-                }
-
-                return baseAddress + (int)desc.FirstThunk + (i * Marshal.SizeOf<ulong>());
-            }
-
-            throw new MissingMethodException("Specified method not found");
+            this.CheckDisposed();
+            return this.address;
         }
     }
+
+    /// <summary>
+    /// Gets a delegate function that can be used to call the actual function as if function is not hooked yet.
+    /// </summary>
+    /// <exception cref="ObjectDisposedException">Hook is already disposed.</exception>
+    public virtual T Original => this.compatHookImpl != null ? this.compatHookImpl!.Original : throw new NotImplementedException();
+
+    /// <summary>
+    /// Gets a delegate function that can be used to call the actual function as if function is not hooked yet.
+    /// This can be called even after Dispose.
+    /// </summary>
+    public T OriginalDisposeSafe
+    {
+        get
+        {
+            if (this.compatHookImpl != null)
+                return this.compatHookImpl!.OriginalDisposeSafe;
+            if (this.IsDisposed)
+                return Marshal.GetDelegateForFunctionPointer<T>(this.address);
+            return this.Original;
+        }
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether or not the hook is enabled.
+    /// </summary>
+    public virtual bool IsEnabled => this.compatHookImpl != null ? this.compatHookImpl!.IsEnabled : throw new NotImplementedException();
+
+    /// <summary>
+    /// Gets a value indicating whether or not the hook has been disposed.
+    /// </summary>
+    public bool IsDisposed { get; private set; }
+
+    /// <inheritdoc/>
+    public virtual string BackendName => this.compatHookImpl != null ? this.compatHookImpl!.BackendName : throw new NotImplementedException();
+
+    /// <summary>
+    /// Creates a hook by rewriting import table address.
+    /// </summary>
+    /// <param name="address">A memory address to install a hook.</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <returns>The hook with the supplied parameters.</returns>
+    public static unsafe Hook<T> FromFunctionPointerVariable(IntPtr address, T detour)
+    {
+        return new FunctionPointerVariableHook<T>(address, detour, Assembly.GetCallingAssembly());
+    }
+
+    /// <summary>
+    /// Creates a hook by rewriting import table address.
+    /// </summary>
+    /// <param name="module">Module to check for. Current process' main module if null.</param>
+    /// <param name="moduleName">Name of the DLL, including the extension.</param>
+    /// <param name="functionName">Decorated name of the function.</param>
+    /// <param name="hintOrOrdinal">Hint or ordinal. 0 to unspecify.</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <returns>The hook with the supplied parameters.</returns>
+    public static unsafe Hook<T> FromImport(ProcessModule? module, string moduleName, string functionName, uint hintOrOrdinal, T detour)
+    {
+        module ??= Process.GetCurrentProcess().MainModule;
+        if (module == null)
+            throw new InvalidOperationException("Current module is null?");
+        var pDos = (PeHeader.IMAGE_DOS_HEADER*)module.BaseAddress;
+        var pNt = (PeHeader.IMAGE_FILE_HEADER*)(module.BaseAddress + (int)pDos->e_lfanew + 4);
+        var isPe64 = pNt->SizeOfOptionalHeader == Marshal.SizeOf<PeHeader.IMAGE_OPTIONAL_HEADER64>();
+        PeHeader.IMAGE_DATA_DIRECTORY* pDataDirectory;
+        if (isPe64)
+        {
+            var pOpt = (PeHeader.IMAGE_OPTIONAL_HEADER64*)(module.BaseAddress + (int)pDos->e_lfanew + 4 + Marshal.SizeOf<PeHeader.IMAGE_FILE_HEADER>());
+            pDataDirectory = &pOpt->ImportTable;
+        }
+        else
+        {
+            var pOpt = (PeHeader.IMAGE_OPTIONAL_HEADER32*)(module.BaseAddress + (int)pDos->e_lfanew + 4 + Marshal.SizeOf<PeHeader.IMAGE_FILE_HEADER>());
+            pDataDirectory = &pOpt->ImportTable;
+        }
+
+        var moduleNameLowerWithNullTerminator = (moduleName + "\0").ToLowerInvariant();
+        foreach (ref var importDescriptor in new Span<PeHeader.IMAGE_IMPORT_DESCRIPTOR>(
+                     (PeHeader.IMAGE_IMPORT_DESCRIPTOR*)(module.BaseAddress + (int)pDataDirectory->VirtualAddress),
+                     (int)(pDataDirectory->Size / Marshal.SizeOf<PeHeader.IMAGE_IMPORT_DESCRIPTOR>())))
+        {
+            // Having all zero values signals the end of the table. We didn't find anything.
+            if (importDescriptor.Characteristics == 0)
+                throw new MissingMethodException("Specified dll not found");
+
+            // Skip invalid entries, just in case.
+            if (importDescriptor.Name == 0)
+                continue;
+
+            // Name must be contained in this directory.
+            if (importDescriptor.Name < pDataDirectory->VirtualAddress)
+                continue;
+            var currentDllNameWithNullTerminator = Marshal.PtrToStringUTF8(
+                module.BaseAddress + (int)importDescriptor.Name,
+                (int)Math.Min(pDataDirectory->Size + pDataDirectory->VirtualAddress - importDescriptor.Name, moduleNameLowerWithNullTerminator.Length));
+
+            // Is this entry about the DLL that we're looking for? (Case insensitive)
+            if (currentDllNameWithNullTerminator.ToLowerInvariant() != moduleNameLowerWithNullTerminator)
+                continue;
+
+            if (isPe64)
+            {
+                return new FunctionPointerVariableHook<T>(FromImportHelper64(module.BaseAddress, ref importDescriptor, ref *pDataDirectory, functionName, hintOrOrdinal), detour, Assembly.GetCallingAssembly());
+            }
+            else
+            {
+                return new FunctionPointerVariableHook<T>(FromImportHelper32(module.BaseAddress, ref importDescriptor, ref *pDataDirectory, functionName, hintOrOrdinal), detour, Assembly.GetCallingAssembly());
+            }
+        }
+
+        throw new MissingMethodException("Specified dll not found");
+    }
+
+    /// <summary>
+    /// Creates a hook. Hooking address is inferred by calling to GetProcAddress() function.
+    /// The hook is not activated until Enable() method is called.
+    /// </summary>
+    /// <param name="moduleName">A name of the module currently loaded in the memory. (e.g. ws2_32.dll).</param>
+    /// <param name="exportName">A name of the exported function name (e.g. send).</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <returns>The hook with the supplied parameters.</returns>
+    public static Hook<T> FromSymbol(string moduleName, string exportName, T detour)
+        => FromSymbol(moduleName, exportName, detour, false);
+
+    /// <summary>
+    /// Creates a hook. Hooking address is inferred by calling to GetProcAddress() function.
+    /// The hook is not activated until Enable() method is called.
+    /// Please do not use MinHook unless you have thoroughly troubleshot why Reloaded does not work.
+    /// </summary>
+    /// <param name="moduleName">A name of the module currently loaded in the memory. (e.g. ws2_32.dll).</param>
+    /// <param name="exportName">A name of the exported function name (e.g. send).</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <param name="useMinHook">Use the MinHook hooking library instead of Reloaded.</param>
+    /// <returns>The hook with the supplied parameters.</returns>
+    public static Hook<T> FromSymbol(string moduleName, string exportName, T detour, bool useMinHook)
+    {
+        if (EnvironmentConfiguration.DalamudForceMinHook)
+            useMinHook = true;
+
+        var moduleHandle = NativeFunctions.GetModuleHandleW(moduleName);
+        if (moduleHandle == IntPtr.Zero)
+            throw new Exception($"Could not get a handle to module {moduleName}");
+
+        var procAddress = NativeFunctions.GetProcAddress(moduleHandle, exportName);
+        if (procAddress == IntPtr.Zero)
+            throw new Exception($"Could not get the address of {moduleName}::{exportName}");
+
+        procAddress = HookManager.FollowJmp(procAddress);
+        if (useMinHook)
+            return new MinHookHook<T>(procAddress, detour, Assembly.GetCallingAssembly());
+        else
+            return new ReloadedHook<T>(procAddress, detour, Assembly.GetCallingAssembly());
+    }
+
+    /// <summary>
+    /// Creates a hook. Hooking address is inferred by calling to GetProcAddress() function.
+    /// The hook is not activated until Enable() method is called.
+    /// Please do not use MinHook unless you have thoroughly troubleshot why Reloaded does not work.
+    /// </summary>
+    /// <param name="procAddress">A memory address to install a hook.</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <param name="useMinHook">Use the MinHook hooking library instead of Reloaded.</param>
+    /// <returns>The hook with the supplied parameters.</returns>
+    public static Hook<T> FromAddress(IntPtr procAddress, T detour, bool useMinHook = false)
+    {
+        if (EnvironmentConfiguration.DalamudForceMinHook)
+            useMinHook = true;
+
+        procAddress = HookManager.FollowJmp(procAddress);
+        if (useMinHook)
+            return new MinHookHook<T>(procAddress, detour, Assembly.GetCallingAssembly());
+        else
+            return new ReloadedHook<T>(procAddress, detour, Assembly.GetCallingAssembly());
+    }
+
+    /// <summary>
+    /// Remove a hook from the current process.
+    /// </summary>
+    public virtual void Dispose()
+    {
+        if (this.IsDisposed)
+            return;
+
+        this.compatHookImpl?.Dispose();
+
+        this.IsDisposed = true;
+    }
+
+    /// <summary>
+    /// Starts intercepting a call to the function.
+    /// </summary>
+    public virtual void Enable()
+    {
+        if (this.compatHookImpl != null)
+            this.compatHookImpl.Enable();
+        else
+            throw new NotImplementedException();
+    }
+
+    /// <summary>
+    /// Stops intercepting a call to the function.
+    /// </summary>
+    public virtual void Disable()
+    {
+        if (this.compatHookImpl != null)
+            this.compatHookImpl.Disable();
+        else
+            throw new NotImplementedException();
+    }
+
+    /// <summary>
+    /// Check if this object has been disposed already.
+    /// </summary>
+    protected void CheckDisposed()
+    {
+        if (this.IsDisposed)
+        {
+            throw new ObjectDisposedException(message: "Hook is already disposed", null);
+        }
+    }
+
+    private static unsafe IntPtr FromImportHelper32(IntPtr baseAddress, ref PeHeader.IMAGE_IMPORT_DESCRIPTOR desc, ref PeHeader.IMAGE_DATA_DIRECTORY dir, string functionName, uint hintOrOrdinal)
+    {
+        var importLookupsOversizedSpan = new Span<uint>((uint*)(baseAddress + (int)desc.OriginalFirstThunk), (int)((dir.Size - desc.OriginalFirstThunk) / Marshal.SizeOf<int>()));
+        var importAddressesOversizedSpan = new Span<uint>((uint*)(baseAddress + (int)desc.FirstThunk), (int)((dir.Size - desc.FirstThunk) / Marshal.SizeOf<int>()));
+
+        var functionNameWithNullTerminator = functionName + "\0";
+        for (int i = 0, i_ = Math.Min(importLookupsOversizedSpan.Length, importAddressesOversizedSpan.Length); i < i_ && importLookupsOversizedSpan[i] != 0 && importAddressesOversizedSpan[i] != 0; i++)
+        {
+            var importLookup = importLookupsOversizedSpan[i];
+
+            // Is this entry importing by ordinals? A lot of socket functions are the case.
+            if ((importLookup & IMAGE_ORDINAL_FLAG32) != 0)
+            {
+                var ordinal = importLookup & ~IMAGE_ORDINAL_FLAG32;
+
+                // Is this the entry?
+                if (hintOrOrdinal == 0 || ordinal != hintOrOrdinal)
+                    continue;
+
+                // Is this entry not importing by ordinals, and are we using hint exclusively to find the entry?
+            }
+            else
+            {
+                var hint = Marshal.ReadInt16(baseAddress + (int)importLookup);
+
+                if (functionName.Length > 0)
+                {
+                    // Is this the entry?
+                    if (hint != hintOrOrdinal)
+                        continue;
+                }
+                else
+                {
+                    // Name must be contained in this directory.
+                    var currentFunctionNameWithNullTerminator = Marshal.PtrToStringUTF8(
+                        baseAddress + (int)importLookup + 2,
+                        (int)Math.Min(dir.VirtualAddress + dir.Size - (uint)baseAddress - importLookup - 2, (uint)functionNameWithNullTerminator.Length));
+
+                    // Is this entry about the function that we're looking for?
+                    if (currentFunctionNameWithNullTerminator != functionNameWithNullTerminator)
+                        continue;
+                }
+            }
+
+            return baseAddress + (int)desc.FirstThunk + (i * Marshal.SizeOf<int>());
+        }
+
+        throw new MissingMethodException("Specified method not found");
+    }
+
+    private static unsafe IntPtr FromImportHelper64(IntPtr baseAddress, ref PeHeader.IMAGE_IMPORT_DESCRIPTOR desc, ref PeHeader.IMAGE_DATA_DIRECTORY dir, string functionName, uint hintOrOrdinal)
+    {
+        var importLookupsOversizedSpan = new Span<ulong>((ulong*)(baseAddress + (int)desc.OriginalFirstThunk), (int)((dir.Size - desc.OriginalFirstThunk) / Marshal.SizeOf<ulong>()));
+        var importAddressesOversizedSpan = new Span<ulong>((ulong*)(baseAddress + (int)desc.FirstThunk), (int)((dir.Size - desc.FirstThunk) / Marshal.SizeOf<ulong>()));
+
+        var functionNameWithNullTerminator = functionName + "\0";
+        for (int i = 0, i_ = Math.Min(importLookupsOversizedSpan.Length, importAddressesOversizedSpan.Length); i < i_ && importLookupsOversizedSpan[i] != 0 && importAddressesOversizedSpan[i] != 0; i++)
+        {
+            var importLookup = importLookupsOversizedSpan[i];
+
+            // Is this entry importing by ordinals? A lot of socket functions are the case.
+            if ((importLookup & IMAGE_ORDINAL_FLAG64) != 0)
+            {
+                var ordinal = importLookup & ~IMAGE_ORDINAL_FLAG64;
+
+                // Is this the entry?
+                if (hintOrOrdinal == 0 || ordinal != hintOrOrdinal)
+                    continue;
+
+                // Is this entry not importing by ordinals, and are we using hint exclusively to find the entry?
+            }
+            else
+            {
+                var hint = Marshal.ReadInt16(baseAddress + (int)importLookup);
+
+                if (functionName.Length == 0)
+                {
+                    // Is this the entry?
+                    if (hint != hintOrOrdinal)
+                        continue;
+                }
+                else
+                {
+                    // Name must be contained in this directory.
+                    var currentFunctionNameWithNullTerminator = Marshal.PtrToStringUTF8(
+                        baseAddress + (int)importLookup + 2,
+                        (int)Math.Min((ulong)dir.VirtualAddress + dir.Size - (ulong)baseAddress - importLookup - 2, (ulong)functionNameWithNullTerminator.Length));
+
+                    // Is this entry about the function that we're looking for?
+                    if (currentFunctionNameWithNullTerminator != functionNameWithNullTerminator)
+                        continue;
+                }
+            }
+
+            return baseAddress + (int)desc.FirstThunk + (i * Marshal.SizeOf<ulong>());
+        }
+
+        throw new MissingMethodException("Specified method not found");
+    }
 }
diff --git a/Dalamud/Hooking/IDalamudHook.cs b/Dalamud/Hooking/IDalamudHook.cs
index 5a9ae2716..1104597a1 100644
--- a/Dalamud/Hooking/IDalamudHook.cs
+++ b/Dalamud/Hooking/IDalamudHook.cs
@@ -1,30 +1,29 @@
 using System;
 
-namespace Dalamud.Hooking
+namespace Dalamud.Hooking;
+
+/// <summary>
+/// Interface describing a generic hook.
+/// </summary>
+public interface IDalamudHook
 {
     /// <summary>
-    /// Interface describing a generic hook.
+    /// Gets the address to hook.
     /// </summary>
-    public interface IDalamudHook
-    {
-        /// <summary>
-        /// Gets the address to hook.
-        /// </summary>
-        public IntPtr Address { get; }
+    public IntPtr Address { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether or not the hook is enabled.
-        /// </summary>
-        public bool IsEnabled { get; }
+    /// <summary>
+    /// Gets a value indicating whether or not the hook is enabled.
+    /// </summary>
+    public bool IsEnabled { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether or not the hook is disposed.
-        /// </summary>
-        public bool IsDisposed { get; }
+    /// <summary>
+    /// Gets a value indicating whether or not the hook is disposed.
+    /// </summary>
+    public bool IsDisposed { get; }
 
-        /// <summary>
-        /// Gets the name of the hooking backend used for the hook.
-        /// </summary>
-        public string BackendName { get; }
-    }
+    /// <summary>
+    /// Gets the name of the hooking backend used for the hook.
+    /// </summary>
+    public string BackendName { get; }
 }
diff --git a/Dalamud/Hooking/Internal/FunctionPointerVariableHook.cs b/Dalamud/Hooking/Internal/FunctionPointerVariableHook.cs
index fcdba357a..3272f50b3 100644
--- a/Dalamud/Hooking/Internal/FunctionPointerVariableHook.cs
+++ b/Dalamud/Hooking/Internal/FunctionPointerVariableHook.cs
@@ -5,122 +5,121 @@ using System.Runtime.InteropServices;
 
 using Dalamud.Memory;
 
-namespace Dalamud.Hooking.Internal
+namespace Dalamud.Hooking.Internal;
+
+/// <summary>
+/// Manages a hook with MinHook.
+/// </summary>
+/// <typeparam name="T">Delegate type to represents a function prototype. This must be the same prototype as original function do.</typeparam>
+internal class FunctionPointerVariableHook<T> : Hook<T> where T : Delegate
 {
+    private readonly IntPtr pfnOriginal;
+    private readonly T originalDelegate;
+    private readonly T detourDelegate;
+
+    private bool enabled = false;
+
     /// <summary>
-    /// Manages a hook with MinHook.
+    /// Initializes a new instance of the <see cref="FunctionPointerVariableHook{T}"/> class.
     /// </summary>
-    /// <typeparam name="T">Delegate type to represents a function prototype. This must be the same prototype as original function do.</typeparam>
-    internal class FunctionPointerVariableHook<T> : Hook<T> where T : Delegate
+    /// <param name="address">A memory address to install a hook.</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <param name="callingAssembly">Calling assembly.</param>
+    internal FunctionPointerVariableHook(IntPtr address, T detour, Assembly callingAssembly)
+        : base(address)
     {
-        private readonly IntPtr pfnOriginal;
-        private readonly T originalDelegate;
-        private readonly T detourDelegate;
+        lock (HookManager.HookEnableSyncRoot)
+        {
+            var hasOtherHooks = HookManager.Originals.ContainsKey(this.Address);
+            if (!hasOtherHooks)
+            {
+                MemoryHelper.ReadRaw(this.Address, 0x32, out var original);
+                HookManager.Originals[this.Address] = original;
+            }
 
-        private bool enabled = false;
+            if (!HookManager.MultiHookTracker.TryGetValue(this.Address, out var indexList))
+                indexList = HookManager.MultiHookTracker[this.Address] = new();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FunctionPointerVariableHook{T}"/> class.
-        /// </summary>
-        /// <param name="address">A memory address to install a hook.</param>
-        /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
-        /// <param name="callingAssembly">Calling assembly.</param>
-        internal FunctionPointerVariableHook(IntPtr address, T detour, Assembly callingAssembly)
-            : base(address)
+            this.pfnOriginal = Marshal.ReadIntPtr(this.Address);
+            this.originalDelegate = Marshal.GetDelegateForFunctionPointer<T>(this.pfnOriginal);
+            this.detourDelegate = detour;
+
+            // Add afterwards, so the hookIdent starts at 0.
+            indexList.Add(this);
+
+            HookManager.TrackedHooks.TryAdd(Guid.NewGuid(), new HookInfo(this, detour, callingAssembly));
+        }
+    }
+
+    /// <inheritdoc/>
+    public override T Original
+    {
+        get
+        {
+            this.CheckDisposed();
+            return this.originalDelegate;
+        }
+    }
+
+    /// <inheritdoc/>
+    public override bool IsEnabled
+    {
+        get
+        {
+            this.CheckDisposed();
+            return this.enabled;
+        }
+    }
+
+    /// <inheritdoc/>
+    public override string BackendName => "MinHook";
+
+    /// <inheritdoc/>
+    public override void Dispose()
+    {
+        if (this.IsDisposed)
+            return;
+
+        this.Disable();
+
+        var index = HookManager.MultiHookTracker[this.Address].IndexOf(this);
+        HookManager.MultiHookTracker[this.Address][index] = null;
+
+        base.Dispose();
+    }
+
+    /// <inheritdoc/>
+    public override void Enable()
+    {
+        this.CheckDisposed();
+
+        if (!this.enabled)
         {
             lock (HookManager.HookEnableSyncRoot)
             {
-                var hasOtherHooks = HookManager.Originals.ContainsKey(this.Address);
-                if (!hasOtherHooks)
-                {
-                    MemoryHelper.ReadRaw(this.Address, 0x32, out var original);
-                    HookManager.Originals[this.Address] = original;
-                }
+                if (!NativeFunctions.VirtualProtect(this.Address, (UIntPtr)Marshal.SizeOf<IntPtr>(), MemoryProtection.ExecuteReadWrite, out var oldProtect))
+                    throw new Win32Exception(Marshal.GetLastWin32Error());
 
-                if (!HookManager.MultiHookTracker.TryGetValue(this.Address, out var indexList))
-                    indexList = HookManager.MultiHookTracker[this.Address] = new();
-
-                this.pfnOriginal = Marshal.ReadIntPtr(this.Address);
-                this.originalDelegate = Marshal.GetDelegateForFunctionPointer<T>(this.pfnOriginal);
-                this.detourDelegate = detour;
-
-                // Add afterwards, so the hookIdent starts at 0.
-                indexList.Add(this);
-
-                HookManager.TrackedHooks.TryAdd(Guid.NewGuid(), new HookInfo(this, detour, callingAssembly));
+                Marshal.WriteIntPtr(this.Address, Marshal.GetFunctionPointerForDelegate(this.detourDelegate));
+                NativeFunctions.VirtualProtect(this.Address, (UIntPtr)Marshal.SizeOf<IntPtr>(), oldProtect, out _);
             }
         }
+    }
 
-        /// <inheritdoc/>
-        public override T Original
+    /// <inheritdoc/>
+    public override void Disable()
+    {
+        this.CheckDisposed();
+
+        if (this.enabled)
         {
-            get
+            lock (HookManager.HookEnableSyncRoot)
             {
-                this.CheckDisposed();
-                return this.originalDelegate;
-            }
-        }
+                if (!NativeFunctions.VirtualProtect(this.Address, (UIntPtr)Marshal.SizeOf<IntPtr>(), MemoryProtection.ExecuteReadWrite, out var oldProtect))
+                    throw new Win32Exception(Marshal.GetLastWin32Error());
 
-        /// <inheritdoc/>
-        public override bool IsEnabled
-        {
-            get
-            {
-                this.CheckDisposed();
-                return this.enabled;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override string BackendName => "MinHook";
-
-        /// <inheritdoc/>
-        public override void Dispose()
-        {
-            if (this.IsDisposed)
-                return;
-
-            this.Disable();
-
-            var index = HookManager.MultiHookTracker[this.Address].IndexOf(this);
-            HookManager.MultiHookTracker[this.Address][index] = null;
-
-            base.Dispose();
-        }
-
-        /// <inheritdoc/>
-        public override void Enable()
-        {
-            this.CheckDisposed();
-
-            if (!this.enabled)
-            {
-                lock (HookManager.HookEnableSyncRoot)
-                {
-                    if (!NativeFunctions.VirtualProtect(this.Address, (UIntPtr)Marshal.SizeOf<IntPtr>(), MemoryProtection.ExecuteReadWrite, out var oldProtect))
-                        throw new Win32Exception(Marshal.GetLastWin32Error());
-
-                    Marshal.WriteIntPtr(this.Address, Marshal.GetFunctionPointerForDelegate(this.detourDelegate));
-                    NativeFunctions.VirtualProtect(this.Address, (UIntPtr)Marshal.SizeOf<IntPtr>(), oldProtect, out _);
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Disable()
-        {
-            this.CheckDisposed();
-
-            if (this.enabled)
-            {
-                lock (HookManager.HookEnableSyncRoot)
-                {
-                    if (!NativeFunctions.VirtualProtect(this.Address, (UIntPtr)Marshal.SizeOf<IntPtr>(), MemoryProtection.ExecuteReadWrite, out var oldProtect))
-                        throw new Win32Exception(Marshal.GetLastWin32Error());
-
-                    Marshal.WriteIntPtr(this.Address, this.pfnOriginal);
-                    NativeFunctions.VirtualProtect(this.Address, (UIntPtr)Marshal.SizeOf<IntPtr>(), oldProtect, out _);
-                }
+                Marshal.WriteIntPtr(this.Address, this.pfnOriginal);
+                NativeFunctions.VirtualProtect(this.Address, (UIntPtr)Marshal.SizeOf<IntPtr>(), oldProtect, out _);
             }
         }
     }
diff --git a/Dalamud/Hooking/Internal/HookInfo.cs b/Dalamud/Hooking/Internal/HookInfo.cs
index 73db6864b..0ab05c314 100644
--- a/Dalamud/Hooking/Internal/HookInfo.cs
+++ b/Dalamud/Hooking/Internal/HookInfo.cs
@@ -2,73 +2,72 @@ using System;
 using System.Diagnostics;
 using System.Reflection;
 
-namespace Dalamud.Hooking.Internal
+namespace Dalamud.Hooking.Internal;
+
+/// <summary>
+/// Class containing information about registered hooks.
+/// </summary>
+internal class HookInfo
 {
+    private ulong? inProcessMemory = 0;
+
     /// <summary>
-    /// Class containing information about registered hooks.
+    /// Initializes a new instance of the <see cref="HookInfo"/> class.
     /// </summary>
-    internal class HookInfo
+    /// <param name="hook">The tracked hook.</param>
+    /// <param name="hookDelegate">The hook delegate.</param>
+    /// <param name="assembly">The assembly implementing the hook.</param>
+    public HookInfo(IDalamudHook hook, Delegate hookDelegate, Assembly assembly)
     {
-        private ulong? inProcessMemory = 0;
+        this.Hook = hook;
+        this.Delegate = hookDelegate;
+        this.Assembly = assembly;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HookInfo"/> class.
-        /// </summary>
-        /// <param name="hook">The tracked hook.</param>
-        /// <param name="hookDelegate">The hook delegate.</param>
-        /// <param name="assembly">The assembly implementing the hook.</param>
-        public HookInfo(IDalamudHook hook, Delegate hookDelegate, Assembly assembly)
+    /// <summary>
+    /// Gets the RVA of the hook.
+    /// </summary>
+    internal ulong? InProcessMemory
+    {
+        get
         {
-            this.Hook = hook;
-            this.Delegate = hookDelegate;
-            this.Assembly = assembly;
-        }
+            if (this.Hook.IsDisposed)
+                return 0;
 
-        /// <summary>
-        /// Gets the RVA of the hook.
-        /// </summary>
-        internal ulong? InProcessMemory
-        {
-            get
+            if (this.inProcessMemory == null)
+                return null;
+
+            if (this.inProcessMemory.Value > 0)
+                return this.inProcessMemory.Value;
+
+            var p = Process.GetCurrentProcess().MainModule;
+            var begin = (ulong)p.BaseAddress.ToInt64();
+            var end = begin + (ulong)p.ModuleMemorySize;
+            var hookAddr = (ulong)this.Hook.Address.ToInt64();
+
+            if (hookAddr >= begin && hookAddr <= end)
             {
-                if (this.Hook.IsDisposed)
-                    return 0;
-
-                if (this.inProcessMemory == null)
-                    return null;
-
-                if (this.inProcessMemory.Value > 0)
-                    return this.inProcessMemory.Value;
-
-                var p = Process.GetCurrentProcess().MainModule;
-                var begin = (ulong)p.BaseAddress.ToInt64();
-                var end = begin + (ulong)p.ModuleMemorySize;
-                var hookAddr = (ulong)this.Hook.Address.ToInt64();
-
-                if (hookAddr >= begin && hookAddr <= end)
-                {
-                    return this.inProcessMemory = hookAddr - begin;
-                }
-                else
-                {
-                    return this.inProcessMemory = null;
-                }
+                return this.inProcessMemory = hookAddr - begin;
+            }
+            else
+            {
+                return this.inProcessMemory = null;
             }
         }
-
-        /// <summary>
-        /// Gets the tracked hook.
-        /// </summary>
-        internal IDalamudHook Hook { get; }
-
-        /// <summary>
-        /// Gets the tracked delegate.
-        /// </summary>
-        internal Delegate Delegate { get; }
-
-        /// <summary>
-        /// Gets the assembly implementing the hook.
-        /// </summary>
-        internal Assembly Assembly { get; }
     }
+
+    /// <summary>
+    /// Gets the tracked hook.
+    /// </summary>
+    internal IDalamudHook Hook { get; }
+
+    /// <summary>
+    /// Gets the tracked delegate.
+    /// </summary>
+    internal Delegate Delegate { get; }
+
+    /// <summary>
+    /// Gets the assembly implementing the hook.
+    /// </summary>
+    internal Assembly Assembly { get; }
 }
diff --git a/Dalamud/Hooking/Internal/HookManager.cs b/Dalamud/Hooking/Internal/HookManager.cs
index 51047b97e..303802ff6 100644
--- a/Dalamud/Hooking/Internal/HookManager.cs
+++ b/Dalamud/Hooking/Internal/HookManager.cs
@@ -8,144 +8,143 @@ using Dalamud.Logging.Internal;
 using Dalamud.Memory;
 using Iced.Intel;
 
-namespace Dalamud.Hooking.Internal
+namespace Dalamud.Hooking.Internal;
+
+/// <summary>
+/// This class manages the final disposition of hooks, cleaning up any that have not reverted their changes.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class HookManager : IDisposable, IServiceType
 {
-    /// <summary>
-    /// This class manages the final disposition of hooks, cleaning up any that have not reverted their changes.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal class HookManager : IDisposable, IServiceType
+    private static readonly ModuleLog Log = new("HM");
+
+    [ServiceManager.ServiceConstructor]
+    private HookManager()
     {
-        private static readonly ModuleLog Log = new("HM");
+    }
 
-        [ServiceManager.ServiceConstructor]
-        private HookManager()
+    /// <summary>
+    /// Gets sync root object for hook enabling/disabling.
+    /// </summary>
+    internal static object HookEnableSyncRoot { get; } = new();
+
+    /// <summary>
+    /// Gets a static list of tracked and registered hooks.
+    /// </summary>
+    internal static ConcurrentDictionary<Guid, HookInfo> TrackedHooks { get; } = new();
+
+    /// <summary>
+    /// Gets a static dictionary of original code for a hooked address.
+    /// </summary>
+    internal static ConcurrentDictionary<IntPtr, byte[]> Originals { get; } = new();
+
+    /// <summary>
+    /// Gets a static dictionary of the number of hooks on a given address.
+    /// </summary>
+    internal static ConcurrentDictionary<IntPtr, List<IDalamudHook?>> MultiHookTracker { get; } = new();
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        RevertHooks();
+        TrackedHooks.Clear();
+        Originals.Clear();
+    }
+
+    /// <summary>
+    /// Follow a JMP or Jcc instruction to the next logical location.
+    /// </summary>
+    /// <param name="address">Address of the instruction.</param>
+    /// <returns>The address referenced by the jmp.</returns>
+    internal static IntPtr FollowJmp(IntPtr address)
+    {
+        while (true)
         {
-        }
-
-        /// <summary>
-        /// Gets sync root object for hook enabling/disabling.
-        /// </summary>
-        internal static object HookEnableSyncRoot { get; } = new();
-
-        /// <summary>
-        /// Gets a static list of tracked and registered hooks.
-        /// </summary>
-        internal static ConcurrentDictionary<Guid, HookInfo> TrackedHooks { get; } = new();
-
-        /// <summary>
-        /// Gets a static dictionary of original code for a hooked address.
-        /// </summary>
-        internal static ConcurrentDictionary<IntPtr, byte[]> Originals { get; } = new();
-
-        /// <summary>
-        /// Gets a static dictionary of the number of hooks on a given address.
-        /// </summary>
-        internal static ConcurrentDictionary<IntPtr, List<IDalamudHook?>> MultiHookTracker { get; } = new();
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            RevertHooks();
-            TrackedHooks.Clear();
-            Originals.Clear();
-        }
-
-        /// <summary>
-        /// Follow a JMP or Jcc instruction to the next logical location.
-        /// </summary>
-        /// <param name="address">Address of the instruction.</param>
-        /// <returns>The address referenced by the jmp.</returns>
-        internal static IntPtr FollowJmp(IntPtr address)
-        {
-            while (true)
+            var hasOtherHooks = HookManager.Originals.ContainsKey(address);
+            if (hasOtherHooks)
             {
-                var hasOtherHooks = HookManager.Originals.ContainsKey(address);
-                if (hasOtherHooks)
-                {
-                    // This address has been hooked already. Do not follow a jmp into a trampoline of our own making.
-                    Log.Verbose($"Detected hook trampoline at {address.ToInt64():X}, stopping jump resolution.");
-                    return address;
-                }
-
-                if (address.ToInt64() <= 0)
-                    throw new InvalidOperationException($"Address was <= 0, this can't be happening?! ({address:X})");
-
-                var bytes = MemoryHelper.ReadRaw(address, 8);
-
-                var codeReader = new ByteArrayCodeReader(bytes);
-                var decoder = Decoder.Create(64, codeReader);
-                decoder.IP = (ulong)address.ToInt64();
-                decoder.Decode(out var inst);
-
-                if (inst.Mnemonic == Mnemonic.Jmp)
-                {
-                    var kind = inst.Op0Kind;
-
-                    IntPtr newAddress;
-                    switch (inst.Op0Kind)
-                    {
-                        case OpKind.NearBranch64:
-                        case OpKind.NearBranch32:
-                        case OpKind.NearBranch16:
-                            newAddress = (IntPtr)inst.NearBranchTarget;
-                            break;
-                        case OpKind.Immediate16:
-                        case OpKind.Immediate8to16:
-                        case OpKind.Immediate8to32:
-                        case OpKind.Immediate8to64:
-                        case OpKind.Immediate32to64:
-                        case OpKind.Immediate32 when IntPtr.Size == 4:
-                        case OpKind.Immediate64:
-                            newAddress = (IntPtr)inst.GetImmediate(0);
-                            break;
-                        case OpKind.Memory when inst.IsIPRelativeMemoryOperand:
-                            newAddress = (IntPtr)inst.IPRelativeMemoryAddress;
-                            newAddress = Marshal.ReadIntPtr(newAddress);
-                            break;
-                        case OpKind.Memory:
-                            newAddress = (IntPtr)inst.MemoryDisplacement64;
-                            newAddress = Marshal.ReadIntPtr(newAddress);
-                            break;
-                        default:
-                            var debugBytes = string.Join(" ", bytes.Take(inst.Length).Select(b => $"{b:X2}"));
-                            throw new Exception($"Unknown OpKind {inst.Op0Kind} from {debugBytes}");
-                    }
-
-                    Log.Verbose($"Resolving assembly jump ({kind}) from {address.ToInt64():X} to {newAddress.ToInt64():X}");
-                    address = newAddress;
-                }
-                else
-                {
-                    break;
-                }
+                // This address has been hooked already. Do not follow a jmp into a trampoline of our own making.
+                Log.Verbose($"Detected hook trampoline at {address.ToInt64():X}, stopping jump resolution.");
+                return address;
             }
 
-            return address;
+            if (address.ToInt64() <= 0)
+                throw new InvalidOperationException($"Address was <= 0, this can't be happening?! ({address:X})");
+
+            var bytes = MemoryHelper.ReadRaw(address, 8);
+
+            var codeReader = new ByteArrayCodeReader(bytes);
+            var decoder = Decoder.Create(64, codeReader);
+            decoder.IP = (ulong)address.ToInt64();
+            decoder.Decode(out var inst);
+
+            if (inst.Mnemonic == Mnemonic.Jmp)
+            {
+                var kind = inst.Op0Kind;
+
+                IntPtr newAddress;
+                switch (inst.Op0Kind)
+                {
+                    case OpKind.NearBranch64:
+                    case OpKind.NearBranch32:
+                    case OpKind.NearBranch16:
+                        newAddress = (IntPtr)inst.NearBranchTarget;
+                        break;
+                    case OpKind.Immediate16:
+                    case OpKind.Immediate8to16:
+                    case OpKind.Immediate8to32:
+                    case OpKind.Immediate8to64:
+                    case OpKind.Immediate32to64:
+                    case OpKind.Immediate32 when IntPtr.Size == 4:
+                    case OpKind.Immediate64:
+                        newAddress = (IntPtr)inst.GetImmediate(0);
+                        break;
+                    case OpKind.Memory when inst.IsIPRelativeMemoryOperand:
+                        newAddress = (IntPtr)inst.IPRelativeMemoryAddress;
+                        newAddress = Marshal.ReadIntPtr(newAddress);
+                        break;
+                    case OpKind.Memory:
+                        newAddress = (IntPtr)inst.MemoryDisplacement64;
+                        newAddress = Marshal.ReadIntPtr(newAddress);
+                        break;
+                    default:
+                        var debugBytes = string.Join(" ", bytes.Take(inst.Length).Select(b => $"{b:X2}"));
+                        throw new Exception($"Unknown OpKind {inst.Op0Kind} from {debugBytes}");
+                }
+
+                Log.Verbose($"Resolving assembly jump ({kind}) from {address.ToInt64():X} to {newAddress.ToInt64():X}");
+                address = newAddress;
+            }
+            else
+            {
+                break;
+            }
         }
 
-        private static unsafe void RevertHooks()
+        return address;
+    }
+
+    private static unsafe void RevertHooks()
+    {
+        foreach (var (address, originalBytes) in Originals)
         {
-            foreach (var (address, originalBytes) in Originals)
+            var i = 0;
+            var current = (byte*)address;
+            // Find how many bytes have been modified by comparing to the saved original
+            for (; i < originalBytes.Length; i++)
             {
-                var i = 0;
-                var current = (byte*)address;
-                // Find how many bytes have been modified by comparing to the saved original
-                for (; i < originalBytes.Length; i++)
-                {
-                    if (current[i] == originalBytes[i])
-                        break;
-                }
+                if (current[i] == originalBytes[i])
+                    break;
+            }
 
-                var snippet = originalBytes[0..i];
+            var snippet = originalBytes[0..i];
 
-                if (i > 0)
-                {
-                    Log.Verbose($"Reverting hook at 0x{address.ToInt64():X} ({snippet.Length} bytes)");
-                    MemoryHelper.ChangePermission(address, i, MemoryProtection.ExecuteReadWrite, out var oldPermissions);
-                    MemoryHelper.WriteRaw(address, snippet);
-                    MemoryHelper.ChangePermission(address, i, oldPermissions);
-                }
+            if (i > 0)
+            {
+                Log.Verbose($"Reverting hook at 0x{address.ToInt64():X} ({snippet.Length} bytes)");
+                MemoryHelper.ChangePermission(address, i, MemoryProtection.ExecuteReadWrite, out var oldPermissions);
+                MemoryHelper.WriteRaw(address, snippet);
+                MemoryHelper.ChangePermission(address, i, oldPermissions);
             }
         }
     }
diff --git a/Dalamud/Hooking/Internal/MinHookHook.cs b/Dalamud/Hooking/Internal/MinHookHook.cs
index ce4478ba8..0da289371 100644
--- a/Dalamud/Hooking/Internal/MinHookHook.cs
+++ b/Dalamud/Hooking/Internal/MinHookHook.cs
@@ -3,113 +3,112 @@ using System.Reflection;
 
 using Dalamud.Memory;
 
-namespace Dalamud.Hooking.Internal
+namespace Dalamud.Hooking.Internal;
+
+/// <summary>
+/// Manages a hook with MinHook.
+/// </summary>
+/// <typeparam name="T">Delegate type to represents a function prototype. This must be the same prototype as original function do.</typeparam>
+internal class MinHookHook<T> : Hook<T> where T : Delegate
 {
+    private readonly MinSharp.Hook<T> minHookImpl;
+
     /// <summary>
-    /// Manages a hook with MinHook.
+    /// Initializes a new instance of the <see cref="MinHookHook{T}"/> class.
     /// </summary>
-    /// <typeparam name="T">Delegate type to represents a function prototype. This must be the same prototype as original function do.</typeparam>
-    internal class MinHookHook<T> : Hook<T> where T : Delegate
+    /// <param name="address">A memory address to install a hook.</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <param name="callingAssembly">Calling assembly.</param>
+    internal MinHookHook(IntPtr address, T detour, Assembly callingAssembly)
+        : base(address)
     {
-        private readonly MinSharp.Hook<T> minHookImpl;
+        lock (HookManager.HookEnableSyncRoot)
+        {
+            var hasOtherHooks = HookManager.Originals.ContainsKey(this.Address);
+            if (!hasOtherHooks)
+            {
+                MemoryHelper.ReadRaw(this.Address, 0x32, out var original);
+                HookManager.Originals[this.Address] = original;
+            }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinHookHook{T}"/> class.
-        /// </summary>
-        /// <param name="address">A memory address to install a hook.</param>
-        /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
-        /// <param name="callingAssembly">Calling assembly.</param>
-        internal MinHookHook(IntPtr address, T detour, Assembly callingAssembly)
-            : base(address)
+            if (!HookManager.MultiHookTracker.TryGetValue(this.Address, out var indexList))
+                indexList = HookManager.MultiHookTracker[this.Address] = new();
+
+            var index = (ulong)indexList.Count;
+
+            this.minHookImpl = new MinSharp.Hook<T>(this.Address, detour, index);
+
+            // Add afterwards, so the hookIdent starts at 0.
+            indexList.Add(this);
+
+            HookManager.TrackedHooks.TryAdd(Guid.NewGuid(), new HookInfo(this, detour, callingAssembly));
+        }
+    }
+
+    /// <inheritdoc/>
+    public override T Original
+    {
+        get
+        {
+            this.CheckDisposed();
+            return this.minHookImpl.Original;
+        }
+    }
+
+    /// <inheritdoc/>
+    public override bool IsEnabled
+    {
+        get
+        {
+            this.CheckDisposed();
+            return this.minHookImpl.Enabled;
+        }
+    }
+
+    /// <inheritdoc/>
+    public override string BackendName => "MinHook";
+
+    /// <inheritdoc/>
+    public override void Dispose()
+    {
+        if (this.IsDisposed)
+            return;
+
+        lock (HookManager.HookEnableSyncRoot)
+        {
+            this.minHookImpl.Dispose();
+
+            var index = HookManager.MultiHookTracker[this.Address].IndexOf(this);
+            HookManager.MultiHookTracker[this.Address][index] = null;
+        }
+
+        base.Dispose();
+    }
+
+    /// <inheritdoc/>
+    public override void Enable()
+    {
+        this.CheckDisposed();
+
+        if (!this.minHookImpl.Enabled)
         {
             lock (HookManager.HookEnableSyncRoot)
             {
-                var hasOtherHooks = HookManager.Originals.ContainsKey(this.Address);
-                if (!hasOtherHooks)
-                {
-                    MemoryHelper.ReadRaw(this.Address, 0x32, out var original);
-                    HookManager.Originals[this.Address] = original;
-                }
-
-                if (!HookManager.MultiHookTracker.TryGetValue(this.Address, out var indexList))
-                    indexList = HookManager.MultiHookTracker[this.Address] = new();
-
-                var index = (ulong)indexList.Count;
-
-                this.minHookImpl = new MinSharp.Hook<T>(this.Address, detour, index);
-
-                // Add afterwards, so the hookIdent starts at 0.
-                indexList.Add(this);
-
-                HookManager.TrackedHooks.TryAdd(Guid.NewGuid(), new HookInfo(this, detour, callingAssembly));
+                this.minHookImpl.Enable();
             }
         }
+    }
 
-        /// <inheritdoc/>
-        public override T Original
+    /// <inheritdoc/>
+    public override void Disable()
+    {
+        this.CheckDisposed();
+
+        if (this.minHookImpl.Enabled)
         {
-            get
-            {
-                this.CheckDisposed();
-                return this.minHookImpl.Original;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override bool IsEnabled
-        {
-            get
-            {
-                this.CheckDisposed();
-                return this.minHookImpl.Enabled;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override string BackendName => "MinHook";
-
-        /// <inheritdoc/>
-        public override void Dispose()
-        {
-            if (this.IsDisposed)
-                return;
-
             lock (HookManager.HookEnableSyncRoot)
             {
-                this.minHookImpl.Dispose();
-
-                var index = HookManager.MultiHookTracker[this.Address].IndexOf(this);
-                HookManager.MultiHookTracker[this.Address][index] = null;
-            }
-
-            base.Dispose();
-        }
-
-        /// <inheritdoc/>
-        public override void Enable()
-        {
-            this.CheckDisposed();
-
-            if (!this.minHookImpl.Enabled)
-            {
-                lock (HookManager.HookEnableSyncRoot)
-                {
-                    this.minHookImpl.Enable();
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Disable()
-        {
-            this.CheckDisposed();
-
-            if (this.minHookImpl.Enabled)
-            {
-                lock (HookManager.HookEnableSyncRoot)
-                {
-                    this.minHookImpl.Disable();
-                }
+                this.minHookImpl.Disable();
             }
         }
     }
diff --git a/Dalamud/Hooking/Internal/PeHeader.cs b/Dalamud/Hooking/Internal/PeHeader.cs
index 89898ccb9..b0e1770f5 100644
--- a/Dalamud/Hooking/Internal/PeHeader.cs
+++ b/Dalamud/Hooking/Internal/PeHeader.cs
@@ -2,391 +2,390 @@ using System;
 using System.Runtime.InteropServices;
 
 #pragma warning disable
-namespace Dalamud.Hooking.Internal
+namespace Dalamud.Hooking.Internal;
+
+internal class PeHeader
 {
-    internal class PeHeader
+    public struct IMAGE_DOS_HEADER
     {
-        public struct IMAGE_DOS_HEADER
+        public UInt16 e_magic;
+        public UInt16 e_cblp;
+        public UInt16 e_cp;
+        public UInt16 e_crlc;
+        public UInt16 e_cparhdr;
+        public UInt16 e_minalloc;
+        public UInt16 e_maxalloc;
+        public UInt16 e_ss;
+        public UInt16 e_sp;
+        public UInt16 e_csum;
+        public UInt16 e_ip;
+        public UInt16 e_cs;
+        public UInt16 e_lfarlc;
+        public UInt16 e_ovno;
+        public UInt16 e_res_0;
+        public UInt16 e_res_1;
+        public UInt16 e_res_2;
+        public UInt16 e_res_3;
+        public UInt16 e_oemid;
+        public UInt16 e_oeminfo;
+        public UInt16 e_res2_0;
+        public UInt16 e_res2_1;
+        public UInt16 e_res2_2;
+        public UInt16 e_res2_3;
+        public UInt16 e_res2_4;
+        public UInt16 e_res2_5;
+        public UInt16 e_res2_6;
+        public UInt16 e_res2_7;
+        public UInt16 e_res2_8;
+        public UInt16 e_res2_9;
+        public UInt32 e_lfanew;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct IMAGE_DATA_DIRECTORY
+    {
+        public UInt32 VirtualAddress;
+        public UInt32 Size;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct IMAGE_OPTIONAL_HEADER32
+    {
+        public UInt16 Magic;
+        public Byte MajorLinkerVersion;
+        public Byte MinorLinkerVersion;
+        public UInt32 SizeOfCode;
+        public UInt32 SizeOfInitializedData;
+        public UInt32 SizeOfUninitializedData;
+        public UInt32 AddressOfEntryPoint;
+        public UInt32 BaseOfCode;
+        public UInt32 BaseOfData;
+        public UInt32 ImageBase;
+        public UInt32 SectionAlignment;
+        public UInt32 FileAlignment;
+        public UInt16 MajorOperatingSystemVersion;
+        public UInt16 MinorOperatingSystemVersion;
+        public UInt16 MajorImageVersion;
+        public UInt16 MinorImageVersion;
+        public UInt16 MajorSubsystemVersion;
+        public UInt16 MinorSubsystemVersion;
+        public UInt32 Win32VersionValue;
+        public UInt32 SizeOfImage;
+        public UInt32 SizeOfHeaders;
+        public UInt32 CheckSum;
+        public UInt16 Subsystem;
+        public UInt16 DllCharacteristics;
+        public UInt32 SizeOfStackReserve;
+        public UInt32 SizeOfStackCommit;
+        public UInt32 SizeOfHeapReserve;
+        public UInt32 SizeOfHeapCommit;
+        public UInt32 LoaderFlags;
+        public UInt32 NumberOfRvaAndSizes;
+
+        public IMAGE_DATA_DIRECTORY ExportTable;
+        public IMAGE_DATA_DIRECTORY ImportTable;
+        public IMAGE_DATA_DIRECTORY ResourceTable;
+        public IMAGE_DATA_DIRECTORY ExceptionTable;
+        public IMAGE_DATA_DIRECTORY CertificateTable;
+        public IMAGE_DATA_DIRECTORY BaseRelocationTable;
+        public IMAGE_DATA_DIRECTORY Debug;
+        public IMAGE_DATA_DIRECTORY Architecture;
+        public IMAGE_DATA_DIRECTORY GlobalPtr;
+        public IMAGE_DATA_DIRECTORY TLSTable;
+        public IMAGE_DATA_DIRECTORY LoadConfigTable;
+        public IMAGE_DATA_DIRECTORY BoundImport;
+        public IMAGE_DATA_DIRECTORY IAT;
+        public IMAGE_DATA_DIRECTORY DelayImportDescriptor;
+        public IMAGE_DATA_DIRECTORY CLRRuntimeHeader;
+        public IMAGE_DATA_DIRECTORY Reserved;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct IMAGE_OPTIONAL_HEADER64
+    {
+        public UInt16 Magic;
+        public Byte MajorLinkerVersion;
+        public Byte MinorLinkerVersion;
+        public UInt32 SizeOfCode;
+        public UInt32 SizeOfInitializedData;
+        public UInt32 SizeOfUninitializedData;
+        public UInt32 AddressOfEntryPoint;
+        public UInt32 BaseOfCode;
+        public UInt64 ImageBase;
+        public UInt32 SectionAlignment;
+        public UInt32 FileAlignment;
+        public UInt16 MajorOperatingSystemVersion;
+        public UInt16 MinorOperatingSystemVersion;
+        public UInt16 MajorImageVersion;
+        public UInt16 MinorImageVersion;
+        public UInt16 MajorSubsystemVersion;
+        public UInt16 MinorSubsystemVersion;
+        public UInt32 Win32VersionValue;
+        public UInt32 SizeOfImage;
+        public UInt32 SizeOfHeaders;
+        public UInt32 CheckSum;
+        public UInt16 Subsystem;
+        public UInt16 DllCharacteristics;
+        public UInt64 SizeOfStackReserve;
+        public UInt64 SizeOfStackCommit;
+        public UInt64 SizeOfHeapReserve;
+        public UInt64 SizeOfHeapCommit;
+        public UInt32 LoaderFlags;
+        public UInt32 NumberOfRvaAndSizes;
+
+        public IMAGE_DATA_DIRECTORY ExportTable;
+        public IMAGE_DATA_DIRECTORY ImportTable;
+        public IMAGE_DATA_DIRECTORY ResourceTable;
+        public IMAGE_DATA_DIRECTORY ExceptionTable;
+        public IMAGE_DATA_DIRECTORY CertificateTable;
+        public IMAGE_DATA_DIRECTORY BaseRelocationTable;
+        public IMAGE_DATA_DIRECTORY Debug;
+        public IMAGE_DATA_DIRECTORY Architecture;
+        public IMAGE_DATA_DIRECTORY GlobalPtr;
+        public IMAGE_DATA_DIRECTORY TLSTable;
+        public IMAGE_DATA_DIRECTORY LoadConfigTable;
+        public IMAGE_DATA_DIRECTORY BoundImport;
+        public IMAGE_DATA_DIRECTORY IAT;
+        public IMAGE_DATA_DIRECTORY DelayImportDescriptor;
+        public IMAGE_DATA_DIRECTORY CLRRuntimeHeader;
+        public IMAGE_DATA_DIRECTORY Reserved;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct IMAGE_FILE_HEADER
+    {
+        public UInt16 Machine;
+        public UInt16 NumberOfSections;
+        public UInt32 TimeDateStamp;
+        public UInt32 PointerToSymbolTable;
+        public UInt32 NumberOfSymbols;
+        public UInt16 SizeOfOptionalHeader;
+        public UInt16 Characteristics;
+    }
+
+    [StructLayout(LayoutKind.Explicit)]
+    public struct IMAGE_SECTION_HEADER
+    {
+        [FieldOffset(0)]
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public char[] Name;
+        [FieldOffset(8)]
+        public UInt32 VirtualSize;
+        [FieldOffset(12)]
+        public UInt32 VirtualAddress;
+        [FieldOffset(16)]
+        public UInt32 SizeOfRawData;
+        [FieldOffset(20)]
+        public UInt32 PointerToRawData;
+        [FieldOffset(24)]
+        public UInt32 PointerToRelocations;
+        [FieldOffset(28)]
+        public UInt32 PointerToLinenumbers;
+        [FieldOffset(32)]
+        public UInt16 NumberOfRelocations;
+        [FieldOffset(34)]
+        public UInt16 NumberOfLinenumbers;
+        [FieldOffset(36)]
+        public DataSectionFlags Characteristics;
+
+        public string Section
         {
-            public UInt16 e_magic;
-            public UInt16 e_cblp;
-            public UInt16 e_cp;
-            public UInt16 e_crlc;
-            public UInt16 e_cparhdr;
-            public UInt16 e_minalloc;
-            public UInt16 e_maxalloc;
-            public UInt16 e_ss;
-            public UInt16 e_sp;
-            public UInt16 e_csum;
-            public UInt16 e_ip;
-            public UInt16 e_cs;
-            public UInt16 e_lfarlc;
-            public UInt16 e_ovno;
-            public UInt16 e_res_0;
-            public UInt16 e_res_1;
-            public UInt16 e_res_2;
-            public UInt16 e_res_3;
-            public UInt16 e_oemid;
-            public UInt16 e_oeminfo;
-            public UInt16 e_res2_0;
-            public UInt16 e_res2_1;
-            public UInt16 e_res2_2;
-            public UInt16 e_res2_3;
-            public UInt16 e_res2_4;
-            public UInt16 e_res2_5;
-            public UInt16 e_res2_6;
-            public UInt16 e_res2_7;
-            public UInt16 e_res2_8;
-            public UInt16 e_res2_9;
-            public UInt32 e_lfanew;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct IMAGE_DATA_DIRECTORY
-        {
-            public UInt32 VirtualAddress;
-            public UInt32 Size;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public struct IMAGE_OPTIONAL_HEADER32
-        {
-            public UInt16 Magic;
-            public Byte MajorLinkerVersion;
-            public Byte MinorLinkerVersion;
-            public UInt32 SizeOfCode;
-            public UInt32 SizeOfInitializedData;
-            public UInt32 SizeOfUninitializedData;
-            public UInt32 AddressOfEntryPoint;
-            public UInt32 BaseOfCode;
-            public UInt32 BaseOfData;
-            public UInt32 ImageBase;
-            public UInt32 SectionAlignment;
-            public UInt32 FileAlignment;
-            public UInt16 MajorOperatingSystemVersion;
-            public UInt16 MinorOperatingSystemVersion;
-            public UInt16 MajorImageVersion;
-            public UInt16 MinorImageVersion;
-            public UInt16 MajorSubsystemVersion;
-            public UInt16 MinorSubsystemVersion;
-            public UInt32 Win32VersionValue;
-            public UInt32 SizeOfImage;
-            public UInt32 SizeOfHeaders;
-            public UInt32 CheckSum;
-            public UInt16 Subsystem;
-            public UInt16 DllCharacteristics;
-            public UInt32 SizeOfStackReserve;
-            public UInt32 SizeOfStackCommit;
-            public UInt32 SizeOfHeapReserve;
-            public UInt32 SizeOfHeapCommit;
-            public UInt32 LoaderFlags;
-            public UInt32 NumberOfRvaAndSizes;
-
-            public IMAGE_DATA_DIRECTORY ExportTable;
-            public IMAGE_DATA_DIRECTORY ImportTable;
-            public IMAGE_DATA_DIRECTORY ResourceTable;
-            public IMAGE_DATA_DIRECTORY ExceptionTable;
-            public IMAGE_DATA_DIRECTORY CertificateTable;
-            public IMAGE_DATA_DIRECTORY BaseRelocationTable;
-            public IMAGE_DATA_DIRECTORY Debug;
-            public IMAGE_DATA_DIRECTORY Architecture;
-            public IMAGE_DATA_DIRECTORY GlobalPtr;
-            public IMAGE_DATA_DIRECTORY TLSTable;
-            public IMAGE_DATA_DIRECTORY LoadConfigTable;
-            public IMAGE_DATA_DIRECTORY BoundImport;
-            public IMAGE_DATA_DIRECTORY IAT;
-            public IMAGE_DATA_DIRECTORY DelayImportDescriptor;
-            public IMAGE_DATA_DIRECTORY CLRRuntimeHeader;
-            public IMAGE_DATA_DIRECTORY Reserved;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public struct IMAGE_OPTIONAL_HEADER64
-        {
-            public UInt16 Magic;
-            public Byte MajorLinkerVersion;
-            public Byte MinorLinkerVersion;
-            public UInt32 SizeOfCode;
-            public UInt32 SizeOfInitializedData;
-            public UInt32 SizeOfUninitializedData;
-            public UInt32 AddressOfEntryPoint;
-            public UInt32 BaseOfCode;
-            public UInt64 ImageBase;
-            public UInt32 SectionAlignment;
-            public UInt32 FileAlignment;
-            public UInt16 MajorOperatingSystemVersion;
-            public UInt16 MinorOperatingSystemVersion;
-            public UInt16 MajorImageVersion;
-            public UInt16 MinorImageVersion;
-            public UInt16 MajorSubsystemVersion;
-            public UInt16 MinorSubsystemVersion;
-            public UInt32 Win32VersionValue;
-            public UInt32 SizeOfImage;
-            public UInt32 SizeOfHeaders;
-            public UInt32 CheckSum;
-            public UInt16 Subsystem;
-            public UInt16 DllCharacteristics;
-            public UInt64 SizeOfStackReserve;
-            public UInt64 SizeOfStackCommit;
-            public UInt64 SizeOfHeapReserve;
-            public UInt64 SizeOfHeapCommit;
-            public UInt32 LoaderFlags;
-            public UInt32 NumberOfRvaAndSizes;
-
-            public IMAGE_DATA_DIRECTORY ExportTable;
-            public IMAGE_DATA_DIRECTORY ImportTable;
-            public IMAGE_DATA_DIRECTORY ResourceTable;
-            public IMAGE_DATA_DIRECTORY ExceptionTable;
-            public IMAGE_DATA_DIRECTORY CertificateTable;
-            public IMAGE_DATA_DIRECTORY BaseRelocationTable;
-            public IMAGE_DATA_DIRECTORY Debug;
-            public IMAGE_DATA_DIRECTORY Architecture;
-            public IMAGE_DATA_DIRECTORY GlobalPtr;
-            public IMAGE_DATA_DIRECTORY TLSTable;
-            public IMAGE_DATA_DIRECTORY LoadConfigTable;
-            public IMAGE_DATA_DIRECTORY BoundImport;
-            public IMAGE_DATA_DIRECTORY IAT;
-            public IMAGE_DATA_DIRECTORY DelayImportDescriptor;
-            public IMAGE_DATA_DIRECTORY CLRRuntimeHeader;
-            public IMAGE_DATA_DIRECTORY Reserved;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public struct IMAGE_FILE_HEADER
-        {
-            public UInt16 Machine;
-            public UInt16 NumberOfSections;
-            public UInt32 TimeDateStamp;
-            public UInt32 PointerToSymbolTable;
-            public UInt32 NumberOfSymbols;
-            public UInt16 SizeOfOptionalHeader;
-            public UInt16 Characteristics;
-        }
-
-        [StructLayout(LayoutKind.Explicit)]
-        public struct IMAGE_SECTION_HEADER
-        {
-            [FieldOffset(0)]
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public char[] Name;
-            [FieldOffset(8)]
-            public UInt32 VirtualSize;
-            [FieldOffset(12)]
-            public UInt32 VirtualAddress;
-            [FieldOffset(16)]
-            public UInt32 SizeOfRawData;
-            [FieldOffset(20)]
-            public UInt32 PointerToRawData;
-            [FieldOffset(24)]
-            public UInt32 PointerToRelocations;
-            [FieldOffset(28)]
-            public UInt32 PointerToLinenumbers;
-            [FieldOffset(32)]
-            public UInt16 NumberOfRelocations;
-            [FieldOffset(34)]
-            public UInt16 NumberOfLinenumbers;
-            [FieldOffset(36)]
-            public DataSectionFlags Characteristics;
-
-            public string Section
-            {
-                get { return new string(Name); }
-            }
-        }
-
-        [Flags]
-        public enum DataSectionFlags : uint
-        {
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            TypeReg = 0x00000000,
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            TypeDsect = 0x00000001,
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            TypeNoLoad = 0x00000002,
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            TypeGroup = 0x00000004,
-            /// <summary>
-            /// The section should not be padded to the next boundary. This flag is obsolete and is replaced by IMAGE_SCN_ALIGN_1BYTES. This is valid only for object files.
-            /// </summary>
-            TypeNoPadded = 0x00000008,
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            TypeCopy = 0x00000010,
-            /// <summary>
-            /// The section contains executable code.
-            /// </summary>
-            ContentCode = 0x00000020,
-            /// <summary>
-            /// The section contains initialized data.
-            /// </summary>
-            ContentInitializedData = 0x00000040,
-            /// <summary>
-            /// The section contains uninitialized data.
-            /// </summary>
-            ContentUninitializedData = 0x00000080,
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            LinkOther = 0x00000100,
-            /// <summary>
-            /// The section contains comments or other information. The .drectve section has this type. This is valid for object files only.
-            /// </summary>
-            LinkInfo = 0x00000200,
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            TypeOver = 0x00000400,
-            /// <summary>
-            /// The section will not become part of the image. This is valid only for object files.
-            /// </summary>
-            LinkRemove = 0x00000800,
-            /// <summary>
-            /// The section contains COMDAT data. For more information, see section 5.5.6, COMDAT Sections (Object Only). This is valid only for object files.
-            /// </summary>
-            LinkComDat = 0x00001000,
-            /// <summary>
-            /// Reset speculative exceptions handling bits in the TLB entries for this section.
-            /// </summary>
-            NoDeferSpecExceptions = 0x00004000,
-            /// <summary>
-            /// The section contains data referenced through the global pointer (GP).
-            /// </summary>
-            RelativeGP = 0x00008000,
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            MemPurgeable = 0x00020000,
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            Memory16Bit = 0x00020000,
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            MemoryLocked = 0x00040000,
-            /// <summary>
-            /// Reserved for future use.
-            /// </summary>
-            MemoryPreload = 0x00080000,
-            /// <summary>
-            /// Align data on a 1-byte boundary. Valid only for object files.
-            /// </summary>
-            Align1Bytes = 0x00100000,
-            /// <summary>
-            /// Align data on a 2-byte boundary. Valid only for object files.
-            /// </summary>
-            Align2Bytes = 0x00200000,
-            /// <summary>
-            /// Align data on a 4-byte boundary. Valid only for object files.
-            /// </summary>
-            Align4Bytes = 0x00300000,
-            /// <summary>
-            /// Align data on an 8-byte boundary. Valid only for object files.
-            /// </summary>
-            Align8Bytes = 0x00400000,
-            /// <summary>
-            /// Align data on a 16-byte boundary. Valid only for object files.
-            /// </summary>
-            Align16Bytes = 0x00500000,
-            /// <summary>
-            /// Align data on a 32-byte boundary. Valid only for object files.
-            /// </summary>
-            Align32Bytes = 0x00600000,
-            /// <summary>
-            /// Align data on a 64-byte boundary. Valid only for object files.
-            /// </summary>
-            Align64Bytes = 0x00700000,
-            /// <summary>
-            /// Align data on a 128-byte boundary. Valid only for object files.
-            /// </summary>
-            Align128Bytes = 0x00800000,
-            /// <summary>
-            /// Align data on a 256-byte boundary. Valid only for object files.
-            /// </summary>
-            Align256Bytes = 0x00900000,
-            /// <summary>
-            /// Align data on a 512-byte boundary. Valid only for object files.
-            /// </summary>
-            Align512Bytes = 0x00A00000,
-            /// <summary>
-            /// Align data on a 1024-byte boundary. Valid only for object files.
-            /// </summary>
-            Align1024Bytes = 0x00B00000,
-            /// <summary>
-            /// Align data on a 2048-byte boundary. Valid only for object files.
-            /// </summary>
-            Align2048Bytes = 0x00C00000,
-            /// <summary>
-            /// Align data on a 4096-byte boundary. Valid only for object files.
-            /// </summary>
-            Align4096Bytes = 0x00D00000,
-            /// <summary>
-            /// Align data on an 8192-byte boundary. Valid only for object files.
-            /// </summary>
-            Align8192Bytes = 0x00E00000,
-            /// <summary>
-            /// The section contains extended relocations.
-            /// </summary>
-            LinkExtendedRelocationOverflow = 0x01000000,
-            /// <summary>
-            /// The section can be discarded as needed.
-            /// </summary>
-            MemoryDiscardable = 0x02000000,
-            /// <summary>
-            /// The section cannot be cached.
-            /// </summary>
-            MemoryNotCached = 0x04000000,
-            /// <summary>
-            /// The section is not pageable.
-            /// </summary>
-            MemoryNotPaged = 0x08000000,
-            /// <summary>
-            /// The section can be shared in memory.
-            /// </summary>
-            MemoryShared = 0x10000000,
-            /// <summary>
-            /// The section can be executed as code.
-            /// </summary>
-            MemoryExecute = 0x20000000,
-            /// <summary>
-            /// The section can be read.
-            /// </summary>
-            MemoryRead = 0x40000000,
-            /// <summary>
-            /// The section can be written to.
-            /// </summary>
-            MemoryWrite = 0x80000000
-        }
-
-        [StructLayout(LayoutKind.Explicit)]
-        public struct IMAGE_IMPORT_DESCRIPTOR
-        {
-            [FieldOffset(0)]
-            public uint Characteristics;
-
-            [FieldOffset(0)]
-            public uint OriginalFirstThunk;
-
-            [FieldOffset(4)]
-            public uint TimeDateStamp;
-
-            [FieldOffset(8)]
-            public uint ForwarderChain;
-
-            [FieldOffset(12)]
-            public uint Name;
-
-            [FieldOffset(16)]
-            public uint FirstThunk;
+            get { return new string(Name); }
         }
     }
+
+    [Flags]
+    public enum DataSectionFlags : uint
+    {
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        TypeReg = 0x00000000,
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        TypeDsect = 0x00000001,
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        TypeNoLoad = 0x00000002,
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        TypeGroup = 0x00000004,
+        /// <summary>
+        /// The section should not be padded to the next boundary. This flag is obsolete and is replaced by IMAGE_SCN_ALIGN_1BYTES. This is valid only for object files.
+        /// </summary>
+        TypeNoPadded = 0x00000008,
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        TypeCopy = 0x00000010,
+        /// <summary>
+        /// The section contains executable code.
+        /// </summary>
+        ContentCode = 0x00000020,
+        /// <summary>
+        /// The section contains initialized data.
+        /// </summary>
+        ContentInitializedData = 0x00000040,
+        /// <summary>
+        /// The section contains uninitialized data.
+        /// </summary>
+        ContentUninitializedData = 0x00000080,
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        LinkOther = 0x00000100,
+        /// <summary>
+        /// The section contains comments or other information. The .drectve section has this type. This is valid for object files only.
+        /// </summary>
+        LinkInfo = 0x00000200,
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        TypeOver = 0x00000400,
+        /// <summary>
+        /// The section will not become part of the image. This is valid only for object files.
+        /// </summary>
+        LinkRemove = 0x00000800,
+        /// <summary>
+        /// The section contains COMDAT data. For more information, see section 5.5.6, COMDAT Sections (Object Only). This is valid only for object files.
+        /// </summary>
+        LinkComDat = 0x00001000,
+        /// <summary>
+        /// Reset speculative exceptions handling bits in the TLB entries for this section.
+        /// </summary>
+        NoDeferSpecExceptions = 0x00004000,
+        /// <summary>
+        /// The section contains data referenced through the global pointer (GP).
+        /// </summary>
+        RelativeGP = 0x00008000,
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        MemPurgeable = 0x00020000,
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        Memory16Bit = 0x00020000,
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        MemoryLocked = 0x00040000,
+        /// <summary>
+        /// Reserved for future use.
+        /// </summary>
+        MemoryPreload = 0x00080000,
+        /// <summary>
+        /// Align data on a 1-byte boundary. Valid only for object files.
+        /// </summary>
+        Align1Bytes = 0x00100000,
+        /// <summary>
+        /// Align data on a 2-byte boundary. Valid only for object files.
+        /// </summary>
+        Align2Bytes = 0x00200000,
+        /// <summary>
+        /// Align data on a 4-byte boundary. Valid only for object files.
+        /// </summary>
+        Align4Bytes = 0x00300000,
+        /// <summary>
+        /// Align data on an 8-byte boundary. Valid only for object files.
+        /// </summary>
+        Align8Bytes = 0x00400000,
+        /// <summary>
+        /// Align data on a 16-byte boundary. Valid only for object files.
+        /// </summary>
+        Align16Bytes = 0x00500000,
+        /// <summary>
+        /// Align data on a 32-byte boundary. Valid only for object files.
+        /// </summary>
+        Align32Bytes = 0x00600000,
+        /// <summary>
+        /// Align data on a 64-byte boundary. Valid only for object files.
+        /// </summary>
+        Align64Bytes = 0x00700000,
+        /// <summary>
+        /// Align data on a 128-byte boundary. Valid only for object files.
+        /// </summary>
+        Align128Bytes = 0x00800000,
+        /// <summary>
+        /// Align data on a 256-byte boundary. Valid only for object files.
+        /// </summary>
+        Align256Bytes = 0x00900000,
+        /// <summary>
+        /// Align data on a 512-byte boundary. Valid only for object files.
+        /// </summary>
+        Align512Bytes = 0x00A00000,
+        /// <summary>
+        /// Align data on a 1024-byte boundary. Valid only for object files.
+        /// </summary>
+        Align1024Bytes = 0x00B00000,
+        /// <summary>
+        /// Align data on a 2048-byte boundary. Valid only for object files.
+        /// </summary>
+        Align2048Bytes = 0x00C00000,
+        /// <summary>
+        /// Align data on a 4096-byte boundary. Valid only for object files.
+        /// </summary>
+        Align4096Bytes = 0x00D00000,
+        /// <summary>
+        /// Align data on an 8192-byte boundary. Valid only for object files.
+        /// </summary>
+        Align8192Bytes = 0x00E00000,
+        /// <summary>
+        /// The section contains extended relocations.
+        /// </summary>
+        LinkExtendedRelocationOverflow = 0x01000000,
+        /// <summary>
+        /// The section can be discarded as needed.
+        /// </summary>
+        MemoryDiscardable = 0x02000000,
+        /// <summary>
+        /// The section cannot be cached.
+        /// </summary>
+        MemoryNotCached = 0x04000000,
+        /// <summary>
+        /// The section is not pageable.
+        /// </summary>
+        MemoryNotPaged = 0x08000000,
+        /// <summary>
+        /// The section can be shared in memory.
+        /// </summary>
+        MemoryShared = 0x10000000,
+        /// <summary>
+        /// The section can be executed as code.
+        /// </summary>
+        MemoryExecute = 0x20000000,
+        /// <summary>
+        /// The section can be read.
+        /// </summary>
+        MemoryRead = 0x40000000,
+        /// <summary>
+        /// The section can be written to.
+        /// </summary>
+        MemoryWrite = 0x80000000
+    }
+
+    [StructLayout(LayoutKind.Explicit)]
+    public struct IMAGE_IMPORT_DESCRIPTOR
+    {
+        [FieldOffset(0)]
+        public uint Characteristics;
+
+        [FieldOffset(0)]
+        public uint OriginalFirstThunk;
+
+        [FieldOffset(4)]
+        public uint TimeDateStamp;
+
+        [FieldOffset(8)]
+        public uint ForwarderChain;
+
+        [FieldOffset(12)]
+        public uint Name;
+
+        [FieldOffset(16)]
+        public uint FirstThunk;
+    }
 }
diff --git a/Dalamud/Hooking/Internal/ReloadedHook.cs b/Dalamud/Hooking/Internal/ReloadedHook.cs
index 68c23e14f..77c0c9c19 100644
--- a/Dalamud/Hooking/Internal/ReloadedHook.cs
+++ b/Dalamud/Hooking/Internal/ReloadedHook.cs
@@ -4,101 +4,100 @@ using System.Reflection;
 using Dalamud.Memory;
 using Reloaded.Hooks;
 
-namespace Dalamud.Hooking.Internal
+namespace Dalamud.Hooking.Internal;
+
+/// <summary>
+/// Class facilitating hooks via reloaded.
+/// </summary>
+/// <typeparam name="T">Delegate of the hook.</typeparam>
+internal class ReloadedHook<T> : Hook<T> where T : Delegate
 {
+    private readonly Reloaded.Hooks.Definitions.IHook<T> hookImpl;
+
     /// <summary>
-    /// Class facilitating hooks via reloaded.
+    /// Initializes a new instance of the <see cref="ReloadedHook{T}"/> class.
     /// </summary>
-    /// <typeparam name="T">Delegate of the hook.</typeparam>
-    internal class ReloadedHook<T> : Hook<T> where T : Delegate
+    /// <param name="address">A memory address to install a hook.</param>
+    /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
+    /// <param name="callingAssembly">Calling assembly.</param>
+    internal ReloadedHook(IntPtr address, T detour, Assembly callingAssembly)
+        : base(address)
     {
-        private readonly Reloaded.Hooks.Definitions.IHook<T> hookImpl;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReloadedHook{T}"/> class.
-        /// </summary>
-        /// <param name="address">A memory address to install a hook.</param>
-        /// <param name="detour">Callback function. Delegate must have a same original function prototype.</param>
-        /// <param name="callingAssembly">Calling assembly.</param>
-        internal ReloadedHook(IntPtr address, T detour, Assembly callingAssembly)
-            : base(address)
+        lock (HookManager.HookEnableSyncRoot)
         {
-            lock (HookManager.HookEnableSyncRoot)
+            var hasOtherHooks = HookManager.Originals.ContainsKey(this.Address);
+            if (!hasOtherHooks)
             {
-                var hasOtherHooks = HookManager.Originals.ContainsKey(this.Address);
-                if (!hasOtherHooks)
-                {
-                    MemoryHelper.ReadRaw(this.Address, 0x32, out var original);
-                    HookManager.Originals[this.Address] = original;
-                }
-
-                this.hookImpl = ReloadedHooks.Instance.CreateHook<T>(detour, address.ToInt64());
-                this.hookImpl.Activate();
-                this.hookImpl.Disable();
-
-                HookManager.TrackedHooks.TryAdd(Guid.NewGuid(), new HookInfo(this, detour, callingAssembly));
+                MemoryHelper.ReadRaw(this.Address, 0x32, out var original);
+                HookManager.Originals[this.Address] = original;
             }
+
+            this.hookImpl = ReloadedHooks.Instance.CreateHook<T>(detour, address.ToInt64());
+            this.hookImpl.Activate();
+            this.hookImpl.Disable();
+
+            HookManager.TrackedHooks.TryAdd(Guid.NewGuid(), new HookInfo(this, detour, callingAssembly));
         }
+    }
 
-        /// <inheritdoc/>
-        public override T Original
+    /// <inheritdoc/>
+    public override T Original
+    {
+        get
         {
-            get
-            {
-                this.CheckDisposed();
-                return this.hookImpl.OriginalFunction;
-            }
+            this.CheckDisposed();
+            return this.hookImpl.OriginalFunction;
         }
+    }
 
-        /// <inheritdoc/>
-        public override bool IsEnabled
+    /// <inheritdoc/>
+    public override bool IsEnabled
+    {
+        get
         {
-            get
-            {
-                this.CheckDisposed();
-                return this.hookImpl.IsHookEnabled;
-            }
+            this.CheckDisposed();
+            return this.hookImpl.IsHookEnabled;
         }
+    }
 
-        /// <inheritdoc/>
-        public override string BackendName => "Reloaded";
+    /// <inheritdoc/>
+    public override string BackendName => "Reloaded";
 
-        /// <inheritdoc/>
-        public override void Dispose()
+    /// <inheritdoc/>
+    public override void Dispose()
+    {
+        if (this.IsDisposed)
+            return;
+
+        this.Disable();
+
+        base.Dispose();
+    }
+
+    /// <inheritdoc/>
+    public override void Enable()
+    {
+        this.CheckDisposed();
+
+        lock (HookManager.HookEnableSyncRoot)
         {
-            if (this.IsDisposed)
+            if (!this.hookImpl.IsHookEnabled)
+                this.hookImpl.Enable();
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Disable()
+    {
+        this.CheckDisposed();
+
+        lock (HookManager.HookEnableSyncRoot)
+        {
+            if (!this.hookImpl.IsHookActivated)
                 return;
 
-            this.Disable();
-
-            base.Dispose();
-        }
-
-        /// <inheritdoc/>
-        public override void Enable()
-        {
-            this.CheckDisposed();
-
-            lock (HookManager.HookEnableSyncRoot)
-            {
-                if (!this.hookImpl.IsHookEnabled)
-                    this.hookImpl.Enable();
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Disable()
-        {
-            this.CheckDisposed();
-
-            lock (HookManager.HookEnableSyncRoot)
-            {
-                if (!this.hookImpl.IsHookActivated)
-                    return;
-
-                if (this.hookImpl.IsHookEnabled)
-                    this.hookImpl.Disable();
-            }
+            if (this.hookImpl.IsHookEnabled)
+                this.hookImpl.Disable();
         }
     }
 }
diff --git a/Dalamud/Interface/Animation/AnimUtil.cs b/Dalamud/Interface/Animation/AnimUtil.cs
index cff36b21c..35a797df8 100644
--- a/Dalamud/Interface/Animation/AnimUtil.cs
+++ b/Dalamud/Interface/Animation/AnimUtil.cs
@@ -1,36 +1,35 @@
 using System.Numerics;
 
-namespace Dalamud.Interface.Animation
+namespace Dalamud.Interface.Animation;
+
+/// <summary>
+/// Class providing helper functions when facilitating animations.
+/// </summary>
+public static class AnimUtil
 {
     /// <summary>
-    /// Class providing helper functions when facilitating animations.
+    /// Lerp between two floats.
     /// </summary>
-    public static class AnimUtil
+    /// <param name="firstFloat">The first float.</param>
+    /// <param name="secondFloat">The second float.</param>
+    /// <param name="by">The point to lerp to.</param>
+    /// <returns>The lerped value.</returns>
+    public static float Lerp(float firstFloat, float secondFloat, float by)
     {
-        /// <summary>
-        /// Lerp between two floats.
-        /// </summary>
-        /// <param name="firstFloat">The first float.</param>
-        /// <param name="secondFloat">The second float.</param>
-        /// <param name="by">The point to lerp to.</param>
-        /// <returns>The lerped value.</returns>
-        public static float Lerp(float firstFloat, float secondFloat, float by)
-        {
-            return (firstFloat * (1 - @by)) + (secondFloat * by);
-        }
+        return (firstFloat * (1 - @by)) + (secondFloat * by);
+    }
 
-        /// <summary>
-        /// Lerp between two vectors.
-        /// </summary>
-        /// <param name="firstVector">The first vector.</param>
-        /// <param name="secondVector">The second float.</param>
-        /// <param name="by">The point to lerp to.</param>
-        /// <returns>The lerped vector.</returns>
-        public static Vector2 Lerp(Vector2 firstVector, Vector2 secondVector, float by)
-        {
-            var retX = Lerp(firstVector.X, secondVector.X, by);
-            var retY = Lerp(firstVector.Y, secondVector.Y, by);
-            return new Vector2(retX, retY);
-        }
+    /// <summary>
+    /// Lerp between two vectors.
+    /// </summary>
+    /// <param name="firstVector">The first vector.</param>
+    /// <param name="secondVector">The second float.</param>
+    /// <param name="by">The point to lerp to.</param>
+    /// <returns>The lerped vector.</returns>
+    public static Vector2 Lerp(Vector2 firstVector, Vector2 secondVector, float by)
+    {
+        var retX = Lerp(firstVector.X, secondVector.X, by);
+        var retY = Lerp(firstVector.Y, secondVector.Y, by);
+        return new Vector2(retX, retY);
     }
 }
diff --git a/Dalamud/Interface/Animation/Easing.cs b/Dalamud/Interface/Animation/Easing.cs
index 00509169f..2ac040143 100644
--- a/Dalamud/Interface/Animation/Easing.cs
+++ b/Dalamud/Interface/Animation/Easing.cs
@@ -2,116 +2,115 @@
 using System.Diagnostics;
 using System.Numerics;
 
-namespace Dalamud.Interface.Animation
+namespace Dalamud.Interface.Animation;
+
+/// <summary>
+/// Base class facilitating the implementation of easing functions.
+/// </summary>
+public abstract class Easing
 {
+    // TODO: Use game delta time here instead
+    private readonly Stopwatch animationTimer = new();
+
+    private double valueInternal;
+
     /// <summary>
-    /// Base class facilitating the implementation of easing functions.
+    /// Initializes a new instance of the <see cref="Easing"/> class with the specified duration.
     /// </summary>
-    public abstract class Easing
+    /// <param name="duration">The animation duration.</param>
+    protected Easing(TimeSpan duration)
     {
-        // TODO: Use game delta time here instead
-        private readonly Stopwatch animationTimer = new();
-
-        private double valueInternal;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Easing"/> class with the specified duration.
-        /// </summary>
-        /// <param name="duration">The animation duration.</param>
-        protected Easing(TimeSpan duration)
-        {
-            this.Duration = duration;
-        }
-
-        /// <summary>
-        /// Gets or sets the origin point of the animation.
-        /// </summary>
-        public Vector2? Point1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the destination point of the animation.
-        /// </summary>
-        public Vector2? Point2 { get; set; }
-
-        /// <summary>
-        /// Gets the resulting point at the current timestep.
-        /// </summary>
-        public Vector2 EasedPoint { get; private set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the result of the easing should be inversed.
-        /// </summary>
-        public bool IsInverse { get; set; }
-
-        /// <summary>
-        /// Gets or sets the current value of the animation, from 0 to 1.
-        /// </summary>
-        public double Value
-        {
-            get
-            {
-                if (this.IsInverse)
-                    return 1 - this.valueInternal;
-
-                return this.valueInternal;
-            }
-
-            protected set
-            {
-                this.valueInternal = value;
-
-                if (this.Point1.HasValue && this.Point2.HasValue)
-                    this.EasedPoint = AnimUtil.Lerp(this.Point1.Value, this.Point2.Value, (float)this.valueInternal);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the duration of the animation.
-        /// </summary>
-        public TimeSpan Duration { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether or not the animation is running.
-        /// </summary>
-        public bool IsRunning => this.animationTimer.IsRunning;
-
-        /// <summary>
-        /// Gets a value indicating whether or not the animation is done.
-        /// </summary>
-        public bool IsDone => this.animationTimer.ElapsedMilliseconds > this.Duration.TotalMilliseconds;
-
-        /// <summary>
-        /// Gets the progress of the animation, from 0 to 1.
-        /// </summary>
-        protected double Progress => this.animationTimer.ElapsedMilliseconds / this.Duration.TotalMilliseconds;
-
-        /// <summary>
-        /// Starts the animation from where it was last stopped, or from the start if it was never started before.
-        /// </summary>
-        public void Start()
-        {
-            this.animationTimer.Start();
-        }
-
-        /// <summary>
-        /// Stops the animation at the current point.
-        /// </summary>
-        public void Stop()
-        {
-            this.animationTimer.Stop();
-        }
-
-        /// <summary>
-        /// Restarts the animation.
-        /// </summary>
-        public void Restart()
-        {
-            this.animationTimer.Restart();
-        }
-
-        /// <summary>
-        /// Updates the animation.
-        /// </summary>
-        public abstract void Update();
+        this.Duration = duration;
     }
+
+    /// <summary>
+    /// Gets or sets the origin point of the animation.
+    /// </summary>
+    public Vector2? Point1 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the destination point of the animation.
+    /// </summary>
+    public Vector2? Point2 { get; set; }
+
+    /// <summary>
+    /// Gets the resulting point at the current timestep.
+    /// </summary>
+    public Vector2 EasedPoint { get; private set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the result of the easing should be inversed.
+    /// </summary>
+    public bool IsInverse { get; set; }
+
+    /// <summary>
+    /// Gets or sets the current value of the animation, from 0 to 1.
+    /// </summary>
+    public double Value
+    {
+        get
+        {
+            if (this.IsInverse)
+                return 1 - this.valueInternal;
+
+            return this.valueInternal;
+        }
+
+        protected set
+        {
+            this.valueInternal = value;
+
+            if (this.Point1.HasValue && this.Point2.HasValue)
+                this.EasedPoint = AnimUtil.Lerp(this.Point1.Value, this.Point2.Value, (float)this.valueInternal);
+        }
+    }
+
+    /// <summary>
+    /// Gets or sets the duration of the animation.
+    /// </summary>
+    public TimeSpan Duration { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether or not the animation is running.
+    /// </summary>
+    public bool IsRunning => this.animationTimer.IsRunning;
+
+    /// <summary>
+    /// Gets a value indicating whether or not the animation is done.
+    /// </summary>
+    public bool IsDone => this.animationTimer.ElapsedMilliseconds > this.Duration.TotalMilliseconds;
+
+    /// <summary>
+    /// Gets the progress of the animation, from 0 to 1.
+    /// </summary>
+    protected double Progress => this.animationTimer.ElapsedMilliseconds / this.Duration.TotalMilliseconds;
+
+    /// <summary>
+    /// Starts the animation from where it was last stopped, or from the start if it was never started before.
+    /// </summary>
+    public void Start()
+    {
+        this.animationTimer.Start();
+    }
+
+    /// <summary>
+    /// Stops the animation at the current point.
+    /// </summary>
+    public void Stop()
+    {
+        this.animationTimer.Stop();
+    }
+
+    /// <summary>
+    /// Restarts the animation.
+    /// </summary>
+    public void Restart()
+    {
+        this.animationTimer.Restart();
+    }
+
+    /// <summary>
+    /// Updates the animation.
+    /// </summary>
+    public abstract void Update();
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/InCirc.cs b/Dalamud/Interface/Animation/EasingFunctions/InCirc.cs
index 952e3539d..ebfc1341c 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/InCirc.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/InCirc.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "InCirc" easing animation.
+/// </summary>
+public class InCirc : Easing
 {
     /// <summary>
-    /// Class providing an "InCirc" easing animation.
+    /// Initializes a new instance of the <see cref="InCirc"/> class.
     /// </summary>
-    public class InCirc : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public InCirc(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InCirc"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public InCirc(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = 1 - Math.Sqrt(1 - Math.Pow(p, 2));
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = 1 - Math.Sqrt(1 - Math.Pow(p, 2));
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/InCubic.cs b/Dalamud/Interface/Animation/EasingFunctions/InCubic.cs
index ebca3203d..d49715893 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/InCubic.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/InCubic.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "InCubic" easing animation.
+/// </summary>
+public class InCubic : Easing
 {
     /// <summary>
-    /// Class providing an "InCubic" easing animation.
+    /// Initializes a new instance of the <see cref="InCubic"/> class.
     /// </summary>
-    public class InCubic : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public InCubic(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InCubic"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public InCubic(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = p * p * p;
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = p * p * p;
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/InElastic.cs b/Dalamud/Interface/Animation/EasingFunctions/InElastic.cs
index 97159df47..30e21cca8 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/InElastic.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/InElastic.cs
@@ -1,33 +1,32 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "InElastic" easing animation.
+/// </summary>
+public class InElastic : Easing
 {
+    private const double Constant = (2 * Math.PI) / 3;
+
     /// <summary>
-    /// Class providing an "InElastic" easing animation.
+    /// Initializes a new instance of the <see cref="InElastic"/> class.
     /// </summary>
-    public class InElastic : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public InElastic(TimeSpan duration)
+        : base(duration)
     {
-        private const double Constant = (2 * Math.PI) / 3;
+        // ignored
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InElastic"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public InElastic(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
-
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = p == 0
-                        ? 0
-                        : p == 1
-                            ? 1
-                            : -Math.Pow(2, (10 * p) - 10) * Math.Sin(((p * 10) - 10.75) * Constant);
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = p == 0
+                         ? 0
+                         : p == 1
+                             ? 1
+                             : -Math.Pow(2, (10 * p) - 10) * Math.Sin(((p * 10) - 10.75) * Constant);
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/InOutCirc.cs b/Dalamud/Interface/Animation/EasingFunctions/InOutCirc.cs
index 97fd1a2d2..fa90c9fd3 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/InOutCirc.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/InOutCirc.cs
@@ -1,29 +1,28 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "InOutCirc" easing animation.
+/// </summary>
+public class InOutCirc : Easing
 {
     /// <summary>
-    /// Class providing an "InOutCirc" easing animation.
+    /// Initializes a new instance of the <see cref="InOutCirc"/> class.
     /// </summary>
-    public class InOutCirc : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public InOutCirc(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InOutCirc"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public InOutCirc(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = p < 0.5
-                             ? (1 - Math.Sqrt(1 - Math.Pow(2 * p, 2))) / 2
-                             : (Math.Sqrt(1 - Math.Pow((-2 * p) + 2, 2)) + 1) / 2;
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = p < 0.5
+                         ? (1 - Math.Sqrt(1 - Math.Pow(2 * p, 2))) / 2
+                         : (Math.Sqrt(1 - Math.Pow((-2 * p) + 2, 2)) + 1) / 2;
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/InOutCubic.cs b/Dalamud/Interface/Animation/EasingFunctions/InOutCubic.cs
index c075da538..bc55bff70 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/InOutCubic.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/InOutCubic.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "InOutCubic" easing animation.
+/// </summary>
+public class InOutCubic : Easing
 {
     /// <summary>
-    /// Class providing an "InOutCubic" easing animation.
+    /// Initializes a new instance of the <see cref="InOutCubic"/> class.
     /// </summary>
-    public class InOutCubic : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public InOutCubic(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InOutCubic"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public InOutCubic(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = p < 0.5 ? 4 * p * p * p : 1 - (Math.Pow((-2 * p) + 2, 3) / 2);
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = p < 0.5 ? 4 * p * p * p : 1 - (Math.Pow((-2 * p) + 2, 3) / 2);
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/InOutElastic.cs b/Dalamud/Interface/Animation/EasingFunctions/InOutElastic.cs
index 7bb36dd74..b0c76b725 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/InOutElastic.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/InOutElastic.cs
@@ -1,35 +1,34 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "InOutCirc" easing animation.
+/// </summary>
+public class InOutElastic : Easing
 {
+    private const double Constant = (2 * Math.PI) / 4.5;
+
     /// <summary>
-    /// Class providing an "InOutCirc" easing animation.
+    /// Initializes a new instance of the <see cref="InOutElastic"/> class.
     /// </summary>
-    public class InOutElastic : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public InOutElastic(TimeSpan duration)
+        : base(duration)
     {
-        private const double Constant = (2 * Math.PI) / 4.5;
+        // ignored
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InOutElastic"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public InOutElastic(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
-
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = p == 0
-                        ? 0
-                        : p == 1
-                            ? 1
-                            : p < 0.5
-                                ? -(Math.Pow(2, (20 * p) - 10) * Math.Sin(((20 * p) - 11.125) * Constant)) / 2
-                                : (Math.Pow(2, (-20 * p) + 10) * Math.Sin(((20 * p) - 11.125) * Constant) / 2) + 1;
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = p == 0
+                         ? 0
+                         : p == 1
+                             ? 1
+                             : p < 0.5
+                                 ? -(Math.Pow(2, (20 * p) - 10) * Math.Sin(((20 * p) - 11.125) * Constant)) / 2
+                                 : (Math.Pow(2, (-20 * p) + 10) * Math.Sin(((20 * p) - 11.125) * Constant) / 2) + 1;
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/InOutQuint.cs b/Dalamud/Interface/Animation/EasingFunctions/InOutQuint.cs
index 70f3123aa..a4d427710 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/InOutQuint.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/InOutQuint.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "InOutQuint" easing animation.
+/// </summary>
+public class InOutQuint : Easing
 {
     /// <summary>
-    /// Class providing an "InOutQuint" easing animation.
+    /// Initializes a new instance of the <see cref="InOutQuint"/> class.
     /// </summary>
-    public class InOutQuint : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public InOutQuint(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InOutQuint"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public InOutQuint(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = p < 0.5 ? 16 * p * p * p * p * p : 1 - (Math.Pow((-2 * p) + 2, 5) / 2);
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = p < 0.5 ? 16 * p * p * p * p * p : 1 - (Math.Pow((-2 * p) + 2, 5) / 2);
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/InOutSine.cs b/Dalamud/Interface/Animation/EasingFunctions/InOutSine.cs
index 4808079d3..a3700d6c5 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/InOutSine.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/InOutSine.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "InOutSine" easing animation.
+/// </summary>
+public class InOutSine : Easing
 {
     /// <summary>
-    /// Class providing an "InOutSine" easing animation.
+    /// Initializes a new instance of the <see cref="InOutSine"/> class.
     /// </summary>
-    public class InOutSine : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public InOutSine(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InOutSine"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public InOutSine(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = -(Math.Cos(Math.PI * p) - 1) / 2;
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = -(Math.Cos(Math.PI * p) - 1) / 2;
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/InQuint.cs b/Dalamud/Interface/Animation/EasingFunctions/InQuint.cs
index 42604f136..20122efc6 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/InQuint.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/InQuint.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "InQuint" easing animation.
+/// </summary>
+public class InQuint : Easing
 {
     /// <summary>
-    /// Class providing an "InQuint" easing animation.
+    /// Initializes a new instance of the <see cref="InQuint"/> class.
     /// </summary>
-    public class InQuint : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public InQuint(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InQuint"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public InQuint(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = p * p * p * p * p;
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = p * p * p * p * p;
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/InSine.cs b/Dalamud/Interface/Animation/EasingFunctions/InSine.cs
index aaa19aa40..553996303 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/InSine.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/InSine.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "InSine" easing animation.
+/// </summary>
+public class InSine : Easing
 {
     /// <summary>
-    /// Class providing an "InSine" easing animation.
+    /// Initializes a new instance of the <see cref="InSine"/> class.
     /// </summary>
-    public class InSine : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public InSine(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InSine"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public InSine(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = 1 - Math.Cos((p * Math.PI) / 2);
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = 1 - Math.Cos((p * Math.PI) / 2);
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/OutCirc.cs b/Dalamud/Interface/Animation/EasingFunctions/OutCirc.cs
index da7b0029a..356beb13d 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/OutCirc.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/OutCirc.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "OutCirc" easing animation.
+/// </summary>
+public class OutCirc : Easing
 {
     /// <summary>
-    /// Class providing an "OutCirc" easing animation.
+    /// Initializes a new instance of the <see cref="OutCirc"/> class.
     /// </summary>
-    public class OutCirc : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public OutCirc(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OutCirc"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public OutCirc(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = Math.Sqrt(1 - Math.Pow(p - 1, 2));
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = Math.Sqrt(1 - Math.Pow(p - 1, 2));
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/OutCubic.cs b/Dalamud/Interface/Animation/EasingFunctions/OutCubic.cs
index e527b228f..9fbe48b26 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/OutCubic.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/OutCubic.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "OutCubic" easing animation.
+/// </summary>
+public class OutCubic : Easing
 {
     /// <summary>
-    /// Class providing an "OutCubic" easing animation.
+    /// Initializes a new instance of the <see cref="OutCubic"/> class.
     /// </summary>
-    public class OutCubic : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public OutCubic(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OutCubic"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public OutCubic(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = 1 - Math.Pow(1 - p, 3);
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = 1 - Math.Pow(1 - p, 3);
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/OutElastic.cs b/Dalamud/Interface/Animation/EasingFunctions/OutElastic.cs
index 3475c4a72..d73fca30e 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/OutElastic.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/OutElastic.cs
@@ -1,33 +1,32 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "OutElastic" easing animation.
+/// </summary>
+public class OutElastic : Easing
 {
+    private const double Constant = (2 * Math.PI) / 3;
+
     /// <summary>
-    /// Class providing an "OutElastic" easing animation.
+    /// Initializes a new instance of the <see cref="OutElastic"/> class.
     /// </summary>
-    public class OutElastic : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public OutElastic(TimeSpan duration)
+        : base(duration)
     {
-        private const double Constant = (2 * Math.PI) / 3;
+        // ignored
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OutElastic"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public OutElastic(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
-
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = p == 0
-                        ? 0
-                        : p == 1
-                            ? 1
-                            : (Math.Pow(2, -10 * p) * Math.Sin(((p * 10) - 0.75) * Constant)) + 1;
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = p == 0
+                         ? 0
+                         : p == 1
+                             ? 1
+                             : (Math.Pow(2, -10 * p) * Math.Sin(((p * 10) - 0.75) * Constant)) + 1;
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/OutQuint.cs b/Dalamud/Interface/Animation/EasingFunctions/OutQuint.cs
index c99c77a57..f83a4eb47 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/OutQuint.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/OutQuint.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "OutQuint" easing animation.
+/// </summary>
+public class OutQuint : Easing
 {
     /// <summary>
-    /// Class providing an "OutQuint" easing animation.
+    /// Initializes a new instance of the <see cref="OutQuint"/> class.
     /// </summary>
-    public class OutQuint : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public OutQuint(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OutQuint"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public OutQuint(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = 1 - Math.Pow(1 - p, 5);
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = 1 - Math.Pow(1 - p, 5);
     }
 }
diff --git a/Dalamud/Interface/Animation/EasingFunctions/OutSine.cs b/Dalamud/Interface/Animation/EasingFunctions/OutSine.cs
index c1becf81c..1576f697b 100644
--- a/Dalamud/Interface/Animation/EasingFunctions/OutSine.cs
+++ b/Dalamud/Interface/Animation/EasingFunctions/OutSine.cs
@@ -1,27 +1,26 @@
 using System;
 
-namespace Dalamud.Interface.Animation.EasingFunctions
+namespace Dalamud.Interface.Animation.EasingFunctions;
+
+/// <summary>
+/// Class providing an "OutSine" easing animation.
+/// </summary>
+public class OutSine : Easing
 {
     /// <summary>
-    /// Class providing an "OutSine" easing animation.
+    /// Initializes a new instance of the <see cref="OutSine"/> class.
     /// </summary>
-    public class OutSine : Easing
+    /// <param name="duration">The duration of the animation.</param>
+    public OutSine(TimeSpan duration)
+        : base(duration)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OutSine"/> class.
-        /// </summary>
-        /// <param name="duration">The duration of the animation.</param>
-        public OutSine(TimeSpan duration)
-            : base(duration)
-        {
-            // ignored
-        }
+        // ignored
+    }
 
-        /// <inheritdoc/>
-        public override void Update()
-        {
-            var p = this.Progress;
-            this.Value = Math.Sin((p * Math.PI) / 2);
-        }
+    /// <inheritdoc/>
+    public override void Update()
+    {
+        var p = this.Progress;
+        this.Value = Math.Sin((p * Math.PI) / 2);
     }
 }
diff --git a/Dalamud/Interface/Colors/ImGuiColors.cs b/Dalamud/Interface/Colors/ImGuiColors.cs
index e1a3356fa..93a41e877 100644
--- a/Dalamud/Interface/Colors/ImGuiColors.cs
+++ b/Dalamud/Interface/Colors/ImGuiColors.cs
@@ -1,105 +1,104 @@
 using System.Numerics;
 
-namespace Dalamud.Interface.Colors
+namespace Dalamud.Interface.Colors;
+
+/// <summary>
+/// Class containing frequently used colors for easier reference.
+/// </summary>
+public static class ImGuiColors
 {
     /// <summary>
-    /// Class containing frequently used colors for easier reference.
+    /// Gets red used in dalamud.
     /// </summary>
-    public static class ImGuiColors
-    {
-        /// <summary>
-        /// Gets red used in dalamud.
-        /// </summary>
-        public static Vector4 DalamudRed { get; internal set; } = new(1f, 0f, 0f, 1f);
+    public static Vector4 DalamudRed { get; internal set; } = new(1f, 0f, 0f, 1f);
 
-        /// <summary>
-        /// Gets grey used in dalamud.
-        /// </summary>
-        public static Vector4 DalamudGrey { get; internal set; } = new(0.7f, 0.7f, 0.7f, 1f);
+    /// <summary>
+    /// Gets grey used in dalamud.
+    /// </summary>
+    public static Vector4 DalamudGrey { get; internal set; } = new(0.7f, 0.7f, 0.7f, 1f);
 
-        /// <summary>
-        /// Gets grey used in dalamud.
-        /// </summary>
-        public static Vector4 DalamudGrey2 { get; internal set; } = new(0.7f, 0.7f, 0.7f, 1f);
+    /// <summary>
+    /// Gets grey used in dalamud.
+    /// </summary>
+    public static Vector4 DalamudGrey2 { get; internal set; } = new(0.7f, 0.7f, 0.7f, 1f);
 
-        /// <summary>
-        /// Gets grey used in dalamud.
-        /// </summary>
-        public static Vector4 DalamudGrey3 { get; internal set; } = new(0.5f, 0.5f, 0.5f, 1f);
+    /// <summary>
+    /// Gets grey used in dalamud.
+    /// </summary>
+    public static Vector4 DalamudGrey3 { get; internal set; } = new(0.5f, 0.5f, 0.5f, 1f);
 
-        /// <summary>
-        /// Gets white used in dalamud.
-        /// </summary>
-        public static Vector4 DalamudWhite { get; internal set; } = new(1f, 1f, 1f, 1f);
+    /// <summary>
+    /// Gets white used in dalamud.
+    /// </summary>
+    public static Vector4 DalamudWhite { get; internal set; } = new(1f, 1f, 1f, 1f);
 
-        /// <summary>
-        /// Gets white used in dalamud.
-        /// </summary>
-        public static Vector4 DalamudWhite2 { get; internal set; } = new(0.878f, 0.878f, 0.878f, 1f);
+    /// <summary>
+    /// Gets white used in dalamud.
+    /// </summary>
+    public static Vector4 DalamudWhite2 { get; internal set; } = new(0.878f, 0.878f, 0.878f, 1f);
 
-        /// <summary>
-        /// Gets orange used in dalamud.
-        /// </summary>
-        public static Vector4 DalamudOrange { get; internal set; } = new(1f, 0.709f, 0f, 1f);
+    /// <summary>
+    /// Gets orange used in dalamud.
+    /// </summary>
+    public static Vector4 DalamudOrange { get; internal set; } = new(1f, 0.709f, 0f, 1f);
 
-        /// <summary>
-        /// Gets yellow used in dalamud.
-        /// </summary>
-        public static Vector4 DalamudYellow { get; internal set; } = new(1f, 1f, .4f, 1f);
+    /// <summary>
+    /// Gets yellow used in dalamud.
+    /// </summary>
+    public static Vector4 DalamudYellow { get; internal set; } = new(1f, 1f, .4f, 1f);
 
-        /// <summary>
-        /// Gets violet used in dalamud.
-        /// </summary>
-        public static Vector4 DalamudViolet { get; internal set; } = new(0.770f, 0.700f, 0.965f, 1.000f);
+    /// <summary>
+    /// Gets violet used in dalamud.
+    /// </summary>
+    public static Vector4 DalamudViolet { get; internal set; } = new(0.770f, 0.700f, 0.965f, 1.000f);
 
-        /// <summary>
-        /// Gets tank blue (UIColor37).
-        /// </summary>
-        public static Vector4 TankBlue { get; internal set; } = new(0f, 0.6f, 1f, 1f);
+    /// <summary>
+    /// Gets tank blue (UIColor37).
+    /// </summary>
+    public static Vector4 TankBlue { get; internal set; } = new(0f, 0.6f, 1f, 1f);
 
-        /// <summary>
-        /// Gets healer green (UIColor504).
-        /// </summary>
-        public static Vector4 HealerGreen { get; internal set; } = new(0f, 0.8f, 0.1333333f, 1f);
+    /// <summary>
+    /// Gets healer green (UIColor504).
+    /// </summary>
+    public static Vector4 HealerGreen { get; internal set; } = new(0f, 0.8f, 0.1333333f, 1f);
 
-        /// <summary>
-        /// Gets dps red (UIColor545).
-        /// </summary>
-        public static Vector4 DPSRed { get; internal set; } = new(0.7058824f, 0f, 0f, 1f);
+    /// <summary>
+    /// Gets dps red (UIColor545).
+    /// </summary>
+    public static Vector4 DPSRed { get; internal set; } = new(0.7058824f, 0f, 0f, 1f);
 
-        /// <summary>
-        /// Gets parsed grey.
-        /// </summary>
-        public static Vector4 ParsedGrey { get; internal set; } = new(0.4f, 0.4f, 0.4f, 1f);
+    /// <summary>
+    /// Gets parsed grey.
+    /// </summary>
+    public static Vector4 ParsedGrey { get; internal set; } = new(0.4f, 0.4f, 0.4f, 1f);
 
-        /// <summary>
-        /// Gets parsed green.
-        /// </summary>
-        public static Vector4 ParsedGreen { get; internal set; } = new(0.117f, 1f, 0f, 1f);
+    /// <summary>
+    /// Gets parsed green.
+    /// </summary>
+    public static Vector4 ParsedGreen { get; internal set; } = new(0.117f, 1f, 0f, 1f);
 
-        /// <summary>
-        /// Gets parsed blue.
-        /// </summary>
-        public static Vector4 ParsedBlue { get; internal set; } = new(0f, 0.439f, 1f, 1f);
+    /// <summary>
+    /// Gets parsed blue.
+    /// </summary>
+    public static Vector4 ParsedBlue { get; internal set; } = new(0f, 0.439f, 1f, 1f);
 
-        /// <summary>
-        /// Gets parsed purple.
-        /// </summary>
-        public static Vector4 ParsedPurple { get; internal set; } = new(0.639f, 0.207f, 0.933f, 1f);
+    /// <summary>
+    /// Gets parsed purple.
+    /// </summary>
+    public static Vector4 ParsedPurple { get; internal set; } = new(0.639f, 0.207f, 0.933f, 1f);
 
-        /// <summary>
-        /// Gets parsed orange.
-        /// </summary>
-        public static Vector4 ParsedOrange { get; internal set; } = new(1f, 0.501f, 0f, 1f);
+    /// <summary>
+    /// Gets parsed orange.
+    /// </summary>
+    public static Vector4 ParsedOrange { get; internal set; } = new(1f, 0.501f, 0f, 1f);
 
-        /// <summary>
-        /// Gets parsed pink.
-        /// </summary>
-        public static Vector4 ParsedPink { get; internal set; } = new(0.886f, 0.407f, 0.658f, 1f);
+    /// <summary>
+    /// Gets parsed pink.
+    /// </summary>
+    public static Vector4 ParsedPink { get; internal set; } = new(0.886f, 0.407f, 0.658f, 1f);
 
-        /// <summary>
-        /// Gets parsed gold.
-        /// </summary>
-        public static Vector4 ParsedGold { get; internal set; } = new(0.898f, 0.8f, 0.501f, 1f);
-    }
+    /// <summary>
+    /// Gets parsed gold.
+    /// </summary>
+    public static Vector4 ParsedGold { get; internal set; } = new(0.898f, 0.8f, 0.501f, 1f);
 }
diff --git a/Dalamud/Interface/Components/ImGuiComponents.ColorPickerWithPalette.cs b/Dalamud/Interface/Components/ImGuiComponents.ColorPickerWithPalette.cs
index 447d0cf03..e9db345cb 100644
--- a/Dalamud/Interface/Components/ImGuiComponents.ColorPickerWithPalette.cs
+++ b/Dalamud/Interface/Components/ImGuiComponents.ColorPickerWithPalette.cs
@@ -2,69 +2,68 @@ using System.Numerics;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Components
+namespace Dalamud.Interface.Components;
+
+/// <summary>
+/// Class containing various methods providing ImGui components.
+/// </summary>
+public static partial class ImGuiComponents
 {
     /// <summary>
-    /// Class containing various methods providing ImGui components.
+    /// ColorPicker with palette.
     /// </summary>
-    public static partial class ImGuiComponents
+    /// <param name="id">Id for the color picker.</param>
+    /// <param name="description">The description of the color picker.</param>
+    /// <param name="originalColor">The current color.</param>
+    /// <returns>Selected color.</returns>
+    public static Vector4 ColorPickerWithPalette(int id, string description, Vector4 originalColor)
     {
-        /// <summary>
-        /// ColorPicker with palette.
-        /// </summary>
-        /// <param name="id">Id for the color picker.</param>
-        /// <param name="description">The description of the color picker.</param>
-        /// <param name="originalColor">The current color.</param>
-        /// <returns>Selected color.</returns>
-        public static Vector4 ColorPickerWithPalette(int id, string description, Vector4 originalColor)
+        const ImGuiColorEditFlags flags = ImGuiColorEditFlags.NoSidePreview | ImGuiColorEditFlags.NoSmallPreview;
+        return ColorPickerWithPalette(id, description, originalColor, flags);
+    }
+
+    /// <summary>
+    /// ColorPicker with palette with color picker options.
+    /// </summary>
+    /// <param name="id">Id for the color picker.</param>
+    /// <param name="description">The description of the color picker.</param>
+    /// <param name="originalColor">The current color.</param>
+    /// <param name="flags">Flags to customize color picker.</param>
+    /// <returns>Selected color.</returns>
+    public static Vector4 ColorPickerWithPalette(int id, string description, Vector4 originalColor, ImGuiColorEditFlags flags)
+    {
+        var existingColor = originalColor;
+        var selectedColor = originalColor;
+        var colorPalette = ImGuiHelpers.DefaultColorPalette(36);
+        if (ImGui.ColorButton($"{description}###ColorPickerButton{id}", originalColor))
         {
-            const ImGuiColorEditFlags flags = ImGuiColorEditFlags.NoSidePreview | ImGuiColorEditFlags.NoSmallPreview;
-            return ColorPickerWithPalette(id, description, originalColor, flags);
+            ImGui.OpenPopup($"###ColorPickerPopup{id}");
         }
 
-        /// <summary>
-        /// ColorPicker with palette with color picker options.
-        /// </summary>
-        /// <param name="id">Id for the color picker.</param>
-        /// <param name="description">The description of the color picker.</param>
-        /// <param name="originalColor">The current color.</param>
-        /// <param name="flags">Flags to customize color picker.</param>
-        /// <returns>Selected color.</returns>
-        public static Vector4 ColorPickerWithPalette(int id, string description, Vector4 originalColor, ImGuiColorEditFlags flags)
+        if (ImGui.BeginPopup($"###ColorPickerPopup{id}"))
         {
-            var existingColor = originalColor;
-            var selectedColor = originalColor;
-            var colorPalette = ImGuiHelpers.DefaultColorPalette(36);
-            if (ImGui.ColorButton($"{description}###ColorPickerButton{id}", originalColor))
+            if (ImGui.ColorPicker4($"###ColorPicker{id}", ref existingColor, flags))
             {
-                ImGui.OpenPopup($"###ColorPickerPopup{id}");
+                selectedColor = existingColor;
             }
 
-            if (ImGui.BeginPopup($"###ColorPickerPopup{id}"))
+            for (var i = 0; i < 4; i++)
             {
-                if (ImGui.ColorPicker4($"###ColorPicker{id}", ref existingColor, flags))
+                ImGui.Spacing();
+                for (var j = i * 9; j < (i * 9) + 9; j++)
                 {
-                    selectedColor = existingColor;
-                }
-
-                for (var i = 0; i < 4; i++)
-                {
-                    ImGui.Spacing();
-                    for (var j = i * 9; j < (i * 9) + 9; j++)
+                    if (ImGui.ColorButton($"###ColorPickerSwatch{id}{i}{j}", colorPalette[j]))
                     {
-                        if (ImGui.ColorButton($"###ColorPickerSwatch{id}{i}{j}", colorPalette[j]))
-                        {
-                            selectedColor = colorPalette[j];
-                        }
-
-                        ImGui.SameLine();
+                        selectedColor = colorPalette[j];
                     }
-                }
 
-                ImGui.EndPopup();
+                    ImGui.SameLine();
+                }
             }
 
-            return selectedColor;
+            ImGui.EndPopup();
         }
+
+        return selectedColor;
     }
 }
diff --git a/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs b/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs
index 225b171bb..181bbbfd7 100644
--- a/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs
+++ b/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs
@@ -2,75 +2,74 @@ using System.Numerics;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Components
+namespace Dalamud.Interface.Components;
+
+/// <summary>
+/// Class containing various methods providing ImGui components.
+/// </summary>
+public static partial class ImGuiComponents
 {
     /// <summary>
-    /// Class containing various methods providing ImGui components.
+    /// Alpha modified IconButton component to use an icon as a button with alpha and color options.
     /// </summary>
-    public static partial class ImGuiComponents
+    /// <param name="icon">The icon for the button.</param>
+    /// <param name="id">The ID of the button.</param>
+    /// <param name="defaultColor">The default color of the button.</param>
+    /// <param name="activeColor">The color of the button when active.</param>
+    /// <param name="hoveredColor">The color of the button when hovered.</param>
+    /// <param name="alphaMult">A multiplier for the current alpha levels.</param>
+    /// <returns>Indicator if button is clicked.</returns>
+    public static bool DisabledButton(FontAwesomeIcon icon, int? id = null, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null, float alphaMult = .5f)
     {
-        /// <summary>
-        /// Alpha modified IconButton component to use an icon as a button with alpha and color options.
-        /// </summary>
-        /// <param name="icon">The icon for the button.</param>
-        /// <param name="id">The ID of the button.</param>
-        /// <param name="defaultColor">The default color of the button.</param>
-        /// <param name="activeColor">The color of the button when active.</param>
-        /// <param name="hoveredColor">The color of the button when hovered.</param>
-        /// <param name="alphaMult">A multiplier for the current alpha levels.</param>
-        /// <returns>Indicator if button is clicked.</returns>
-        public static bool DisabledButton(FontAwesomeIcon icon, int? id = null, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null, float alphaMult = .5f)
-        {
-            ImGui.PushFont(UiBuilder.IconFont);
+        ImGui.PushFont(UiBuilder.IconFont);
 
-            var text = icon.ToIconString();
-            if (id.HasValue)
-                text = $"{text}{id}";
+        var text = icon.ToIconString();
+        if (id.HasValue)
+            text = $"{text}{id}";
 
-            var button = DisabledButton(text, defaultColor, activeColor, hoveredColor, alphaMult);
+        var button = DisabledButton(text, defaultColor, activeColor, hoveredColor, alphaMult);
 
-            ImGui.PopFont();
+        ImGui.PopFont();
 
-            return button;
-        }
+        return button;
+    }
 
-        /// <summary>
-        /// Alpha modified Button component to use as a disabled button with alpha and color options.
-        /// </summary>
-        /// <param name="labelWithId">The button label with ID.</param>
-        /// <param name="defaultColor">The default color of the button.</param>
-        /// <param name="activeColor">The color of the button when active.</param>
-        /// <param name="hoveredColor">The color of the button when hovered.</param>
-        /// <param name="alphaMult">A multiplier for the current alpha levels.</param>
-        /// <returns>Indicator if button is clicked.</returns>
-        public static bool DisabledButton(string labelWithId, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null, float alphaMult = .5f)
-        {
-            if (defaultColor.HasValue)
-                ImGui.PushStyleColor(ImGuiCol.Button, defaultColor.Value);
+    /// <summary>
+    /// Alpha modified Button component to use as a disabled button with alpha and color options.
+    /// </summary>
+    /// <param name="labelWithId">The button label with ID.</param>
+    /// <param name="defaultColor">The default color of the button.</param>
+    /// <param name="activeColor">The color of the button when active.</param>
+    /// <param name="hoveredColor">The color of the button when hovered.</param>
+    /// <param name="alphaMult">A multiplier for the current alpha levels.</param>
+    /// <returns>Indicator if button is clicked.</returns>
+    public static bool DisabledButton(string labelWithId, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null, float alphaMult = .5f)
+    {
+        if (defaultColor.HasValue)
+            ImGui.PushStyleColor(ImGuiCol.Button, defaultColor.Value);
 
-            if (activeColor.HasValue)
-                ImGui.PushStyleColor(ImGuiCol.ButtonActive, activeColor.Value);
+        if (activeColor.HasValue)
+            ImGui.PushStyleColor(ImGuiCol.ButtonActive, activeColor.Value);
 
-            if (hoveredColor.HasValue)
-                ImGui.PushStyleColor(ImGuiCol.ButtonHovered, hoveredColor.Value);
+        if (hoveredColor.HasValue)
+            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, hoveredColor.Value);
 
-            var style = ImGui.GetStyle();
-            ImGui.PushStyleVar(ImGuiStyleVar.Alpha, style.Alpha * alphaMult);
+        var style = ImGui.GetStyle();
+        ImGui.PushStyleVar(ImGuiStyleVar.Alpha, style.Alpha * alphaMult);
 
-            var button = ImGui.Button(labelWithId);
+        var button = ImGui.Button(labelWithId);
 
-            ImGui.PopStyleVar();
+        ImGui.PopStyleVar();
 
-            if (defaultColor.HasValue)
-                ImGui.PopStyleColor();
+        if (defaultColor.HasValue)
+            ImGui.PopStyleColor();
 
-            if (activeColor.HasValue)
-                ImGui.PopStyleColor();
+        if (activeColor.HasValue)
+            ImGui.PopStyleColor();
 
-            if (hoveredColor.HasValue)
-                ImGui.PopStyleColor();
+        if (hoveredColor.HasValue)
+            ImGui.PopStyleColor();
 
-            return button;
-        }
+        return button;
     }
 }
diff --git a/Dalamud/Interface/Components/ImGuiComponents.HelpMarker.cs b/Dalamud/Interface/Components/ImGuiComponents.HelpMarker.cs
index dfb86cf79..f57746eca 100644
--- a/Dalamud/Interface/Components/ImGuiComponents.HelpMarker.cs
+++ b/Dalamud/Interface/Components/ImGuiComponents.HelpMarker.cs
@@ -1,28 +1,27 @@
 using ImGuiNET;
 
-namespace Dalamud.Interface.Components
+namespace Dalamud.Interface.Components;
+
+/// <summary>
+/// Class containing various methods providing ImGui components.
+/// </summary>
+public static partial class ImGuiComponents
 {
     /// <summary>
-    /// Class containing various methods providing ImGui components.
+    /// HelpMarker component to add a help icon with text on hover.
     /// </summary>
-    public static partial class ImGuiComponents
+    /// <param name="helpText">The text to display on hover.</param>
+    public static void HelpMarker(string helpText)
     {
-        /// <summary>
-        /// HelpMarker component to add a help icon with text on hover.
-        /// </summary>
-        /// <param name="helpText">The text to display on hover.</param>
-        public static void HelpMarker(string helpText)
-        {
-            ImGui.SameLine();
-            ImGui.PushFont(UiBuilder.IconFont);
-            ImGui.TextDisabled(FontAwesomeIcon.InfoCircle.ToIconString());
-            ImGui.PopFont();
-            if (!ImGui.IsItemHovered()) return;
-            ImGui.BeginTooltip();
-            ImGui.PushTextWrapPos(ImGui.GetFontSize() * 35.0f);
-            ImGui.TextUnformatted(helpText);
-            ImGui.PopTextWrapPos();
-            ImGui.EndTooltip();
-        }
+        ImGui.SameLine();
+        ImGui.PushFont(UiBuilder.IconFont);
+        ImGui.TextDisabled(FontAwesomeIcon.InfoCircle.ToIconString());
+        ImGui.PopFont();
+        if (!ImGui.IsItemHovered()) return;
+        ImGui.BeginTooltip();
+        ImGui.PushTextWrapPos(ImGui.GetFontSize() * 35.0f);
+        ImGui.TextUnformatted(helpText);
+        ImGui.PopTextWrapPos();
+        ImGui.EndTooltip();
     }
 }
diff --git a/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs b/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs
index 3d65deb74..7ef3f56e5 100644
--- a/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs
+++ b/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs
@@ -2,101 +2,100 @@ using System.Numerics;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Components
+namespace Dalamud.Interface.Components;
+
+/// <summary>
+/// Class containing various methods providing ImGui components.
+/// </summary>
+public static partial class ImGuiComponents
 {
     /// <summary>
-    /// Class containing various methods providing ImGui components.
+    /// IconButton component to use an icon as a button.
     /// </summary>
-    public static partial class ImGuiComponents
+    /// <param name="icon">The icon for the button.</param>
+    /// <returns>Indicator if button is clicked.</returns>
+    public static bool IconButton(FontAwesomeIcon icon)
+        => IconButton(icon, null, null, null);
+
+    /// <summary>
+    /// IconButton component to use an icon as a button.
+    /// </summary>
+    /// <param name="id">The ID of the button.</param>
+    /// <param name="icon">The icon for the button.</param>
+    /// <returns>Indicator if button is clicked.</returns>
+    public static bool IconButton(int id, FontAwesomeIcon icon)
+        => IconButton(id, icon, null, null, null);
+
+    /// <summary>
+    /// IconButton component to use an icon as a button.
+    /// </summary>
+    /// <param name="iconText">Text already containing the icon string.</param>
+    /// <returns>Indicator if button is clicked.</returns>
+    public static bool IconButton(string iconText)
+        => IconButton(iconText, null, null, null);
+
+    /// <summary>
+    /// IconButton component to use an icon as a button.
+    /// </summary>
+    /// <param name="icon">The icon for the button.</param>
+    /// <param name="defaultColor">The default color of the button.</param>
+    /// <param name="activeColor">The color of the button when active.</param>
+    /// <param name="hoveredColor">The color of the button when hovered.</param>
+    /// <returns>Indicator if button is clicked.</returns>
+    public static bool IconButton(FontAwesomeIcon icon, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null)
+        => IconButton($"{icon.ToIconString()}", defaultColor, activeColor, hoveredColor);
+
+    /// <summary>
+    /// IconButton component to use an icon as a button with color options.
+    /// </summary>
+    /// <param name="id">The ID of the button.</param>
+    /// <param name="icon">The icon for the button.</param>
+    /// <param name="defaultColor">The default color of the button.</param>
+    /// <param name="activeColor">The color of the button when active.</param>
+    /// <param name="hoveredColor">The color of the button when hovered.</param>
+    /// <returns>Indicator if button is clicked.</returns>
+    public static bool IconButton(int id, FontAwesomeIcon icon, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null)
+        => IconButton($"{icon.ToIconString()}{id}", defaultColor, activeColor, hoveredColor);
+
+    /// <summary>
+    /// IconButton component to use an icon as a button with color options.
+    /// </summary>
+    /// <param name="iconText">Text already containing the icon string.</param>
+    /// <param name="defaultColor">The default color of the button.</param>
+    /// <param name="activeColor">The color of the button when active.</param>
+    /// <param name="hoveredColor">The color of the button when hovered.</param>
+    /// <returns>Indicator if button is clicked.</returns>
+    public static bool IconButton(string iconText, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null)
     {
-        /// <summary>
-        /// IconButton component to use an icon as a button.
-        /// </summary>
-        /// <param name="icon">The icon for the button.</param>
-        /// <returns>Indicator if button is clicked.</returns>
-        public static bool IconButton(FontAwesomeIcon icon)
-            => IconButton(icon, null, null, null);
+        var numColors = 0;
 
-        /// <summary>
-        /// IconButton component to use an icon as a button.
-        /// </summary>
-        /// <param name="id">The ID of the button.</param>
-        /// <param name="icon">The icon for the button.</param>
-        /// <returns>Indicator if button is clicked.</returns>
-        public static bool IconButton(int id, FontAwesomeIcon icon)
-            => IconButton(id, icon, null, null, null);
-
-        /// <summary>
-        /// IconButton component to use an icon as a button.
-        /// </summary>
-        /// <param name="iconText">Text already containing the icon string.</param>
-        /// <returns>Indicator if button is clicked.</returns>
-        public static bool IconButton(string iconText)
-            => IconButton(iconText, null, null, null);
-
-        /// <summary>
-        /// IconButton component to use an icon as a button.
-        /// </summary>
-        /// <param name="icon">The icon for the button.</param>
-        /// <param name="defaultColor">The default color of the button.</param>
-        /// <param name="activeColor">The color of the button when active.</param>
-        /// <param name="hoveredColor">The color of the button when hovered.</param>
-        /// <returns>Indicator if button is clicked.</returns>
-        public static bool IconButton(FontAwesomeIcon icon, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null)
-            => IconButton($"{icon.ToIconString()}", defaultColor, activeColor, hoveredColor);
-
-        /// <summary>
-        /// IconButton component to use an icon as a button with color options.
-        /// </summary>
-        /// <param name="id">The ID of the button.</param>
-        /// <param name="icon">The icon for the button.</param>
-        /// <param name="defaultColor">The default color of the button.</param>
-        /// <param name="activeColor">The color of the button when active.</param>
-        /// <param name="hoveredColor">The color of the button when hovered.</param>
-        /// <returns>Indicator if button is clicked.</returns>
-        public static bool IconButton(int id, FontAwesomeIcon icon, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null)
-            => IconButton($"{icon.ToIconString()}{id}", defaultColor, activeColor, hoveredColor);
-
-        /// <summary>
-        /// IconButton component to use an icon as a button with color options.
-        /// </summary>
-        /// <param name="iconText">Text already containing the icon string.</param>
-        /// <param name="defaultColor">The default color of the button.</param>
-        /// <param name="activeColor">The color of the button when active.</param>
-        /// <param name="hoveredColor">The color of the button when hovered.</param>
-        /// <returns>Indicator if button is clicked.</returns>
-        public static bool IconButton(string iconText, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null)
+        if (defaultColor.HasValue)
         {
-            var numColors = 0;
-
-            if (defaultColor.HasValue)
-            {
-                ImGui.PushStyleColor(ImGuiCol.Button, defaultColor.Value);
-                numColors++;
-            }
-
-            if (activeColor.HasValue)
-            {
-                ImGui.PushStyleColor(ImGuiCol.ButtonActive, activeColor.Value);
-                numColors++;
-            }
-
-            if (hoveredColor.HasValue)
-            {
-                ImGui.PushStyleColor(ImGuiCol.ButtonHovered, hoveredColor.Value);
-                numColors++;
-            }
-
-            ImGui.PushFont(UiBuilder.IconFont);
-
-            var button = ImGui.Button(iconText);
-
-            ImGui.PopFont();
-
-            if (numColors > 0)
-                ImGui.PopStyleColor(numColors);
-
-            return button;
+            ImGui.PushStyleColor(ImGuiCol.Button, defaultColor.Value);
+            numColors++;
         }
+
+        if (activeColor.HasValue)
+        {
+            ImGui.PushStyleColor(ImGuiCol.ButtonActive, activeColor.Value);
+            numColors++;
+        }
+
+        if (hoveredColor.HasValue)
+        {
+            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, hoveredColor.Value);
+            numColors++;
+        }
+
+        ImGui.PushFont(UiBuilder.IconFont);
+
+        var button = ImGui.Button(iconText);
+
+        ImGui.PopFont();
+
+        if (numColors > 0)
+            ImGui.PopStyleColor(numColors);
+
+        return button;
     }
 }
diff --git a/Dalamud/Interface/Components/ImGuiComponents.Test.cs b/Dalamud/Interface/Components/ImGuiComponents.Test.cs
index 54026b379..ddc083cd8 100644
--- a/Dalamud/Interface/Components/ImGuiComponents.Test.cs
+++ b/Dalamud/Interface/Components/ImGuiComponents.Test.cs
@@ -1,18 +1,17 @@
 using ImGuiNET;
 
-namespace Dalamud.Interface.Components
+namespace Dalamud.Interface.Components;
+
+/// <summary>
+/// Class containing various methods providing ImGui components.
+/// </summary>
+public static partial class ImGuiComponents
 {
     /// <summary>
-    /// Class containing various methods providing ImGui components.
+    /// Test component to demonstrate how ImGui components work.
     /// </summary>
-    public static partial class ImGuiComponents
+    public static void Test()
     {
-        /// <summary>
-        /// Test component to demonstrate how ImGui components work.
-        /// </summary>
-        public static void Test()
-        {
-            ImGui.Text("You are viewing the test component. The test was a success.");
-        }
+        ImGui.Text("You are viewing the test component. The test was a success.");
     }
 }
diff --git a/Dalamud/Interface/Components/ImGuiComponents.TextWithLabel.cs b/Dalamud/Interface/Components/ImGuiComponents.TextWithLabel.cs
index 991fefb3a..597b472c6 100644
--- a/Dalamud/Interface/Components/ImGuiComponents.TextWithLabel.cs
+++ b/Dalamud/Interface/Components/ImGuiComponents.TextWithLabel.cs
@@ -1,31 +1,30 @@
 using ImGuiNET;
 
-namespace Dalamud.Interface.Components
+namespace Dalamud.Interface.Components;
+
+/// <summary>
+/// Class containing various methods providing ImGui components.
+/// </summary>
+public static partial class ImGuiComponents
 {
     /// <summary>
-    /// Class containing various methods providing ImGui components.
+    /// TextWithLabel component to show labeled text.
     /// </summary>
-    public static partial class ImGuiComponents
+    /// <param name="label">The label for text.</param>
+    /// <param name="value">The text value.</param>
+    /// <param name="hint">The hint to show on hover.</param>
+    public static void TextWithLabel(string label, string value, string hint = "")
     {
-        /// <summary>
-        /// TextWithLabel component to show labeled text.
-        /// </summary>
-        /// <param name="label">The label for text.</param>
-        /// <param name="value">The text value.</param>
-        /// <param name="hint">The hint to show on hover.</param>
-        public static void TextWithLabel(string label, string value, string hint = "")
+        ImGui.Text(label + ": ");
+        ImGui.SameLine();
+        if (string.IsNullOrEmpty(hint))
         {
-            ImGui.Text(label + ": ");
-            ImGui.SameLine();
-            if (string.IsNullOrEmpty(hint))
-            {
-                ImGui.Text(value);
-            }
-            else
-            {
-                ImGui.Text(value + "*");
-                if (ImGui.IsItemHovered()) ImGui.SetTooltip(hint);
-            }
+            ImGui.Text(value);
+        }
+        else
+        {
+            ImGui.Text(value + "*");
+            if (ImGui.IsItemHovered()) ImGui.SetTooltip(hint);
         }
     }
 }
diff --git a/Dalamud/Interface/Components/ImGuiComponents.ToggleSwitch.cs b/Dalamud/Interface/Components/ImGuiComponents.ToggleSwitch.cs
index bdf14b430..64f3d01eb 100644
--- a/Dalamud/Interface/Components/ImGuiComponents.ToggleSwitch.cs
+++ b/Dalamud/Interface/Components/ImGuiComponents.ToggleSwitch.cs
@@ -2,70 +2,69 @@ using System.Numerics;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.Components
+namespace Dalamud.Interface.Components;
+
+/// <summary>
+/// Component for toggle buttons.
+/// </summary>
+public static partial class ImGuiComponents
 {
     /// <summary>
-    /// Component for toggle buttons.
+    /// Draw a toggle button.
     /// </summary>
-    public static partial class ImGuiComponents
+    /// <param name="id">The id of the button.</param>
+    /// <param name="v">The state of the switch.</param>
+    /// <returns>If the button has been interacted with this frame.</returns>
+    public static bool ToggleButton(string id, ref bool v)
     {
-        /// <summary>
-        /// Draw a toggle button.
-        /// </summary>
-        /// <param name="id">The id of the button.</param>
-        /// <param name="v">The state of the switch.</param>
-        /// <returns>If the button has been interacted with this frame.</returns>
-        public static bool ToggleButton(string id, ref bool v)
+        var colors = ImGui.GetStyle().Colors;
+        var p = ImGui.GetCursorScreenPos();
+        var drawList = ImGui.GetWindowDrawList();
+
+        var height = ImGui.GetFrameHeight();
+        var width = height * 1.55f;
+        var radius = height * 0.50f;
+
+        // TODO: animate
+
+        var changed = false;
+        ImGui.InvisibleButton(id, new Vector2(width, height));
+        if (ImGui.IsItemClicked())
         {
-            var colors = ImGui.GetStyle().Colors;
-            var p = ImGui.GetCursorScreenPos();
-            var drawList = ImGui.GetWindowDrawList();
-
-            var height = ImGui.GetFrameHeight();
-            var width = height * 1.55f;
-            var radius = height * 0.50f;
-
-            // TODO: animate
-
-            var changed = false;
-            ImGui.InvisibleButton(id, new Vector2(width, height));
-            if (ImGui.IsItemClicked())
-            {
-                v = !v;
-                changed = true;
-            }
-
-            if (ImGui.IsItemHovered())
-                drawList.AddRectFilled(p, new Vector2(p.X + width, p.Y + height), ImGui.GetColorU32(!v ? colors[(int)ImGuiCol.ButtonActive] : new Vector4(0.78f, 0.78f, 0.78f, 1.0f)), height * 0.5f);
-            else
-                drawList.AddRectFilled(p, new Vector2(p.X + width, p.Y + height), ImGui.GetColorU32(!v ? colors[(int)ImGuiCol.Button] * 0.6f : new Vector4(0.35f, 0.35f, 0.35f, 1.0f)), height * 0.50f);
-            drawList.AddCircleFilled(new Vector2(p.X + radius + ((v ? 1 : 0) * (width - (radius * 2.0f))), p.Y + radius), radius - 1.5f, ImGui.ColorConvertFloat4ToU32(new Vector4(1, 1, 1, 1)));
-
-            return changed;
+            v = !v;
+            changed = true;
         }
 
-        /// <summary>
-        /// Draw a disabled toggle button.
-        /// </summary>
-        /// <param name="id">The id of the button.</param>
-        /// <param name="v">The state of the switch.</param>
-        public static void DisabledToggleButton(string id, bool v)
-        {
-            var colors = ImGui.GetStyle().Colors;
-            var p = ImGui.GetCursorScreenPos();
-            var drawList = ImGui.GetWindowDrawList();
+        if (ImGui.IsItemHovered())
+            drawList.AddRectFilled(p, new Vector2(p.X + width, p.Y + height), ImGui.GetColorU32(!v ? colors[(int)ImGuiCol.ButtonActive] : new Vector4(0.78f, 0.78f, 0.78f, 1.0f)), height * 0.5f);
+        else
+            drawList.AddRectFilled(p, new Vector2(p.X + width, p.Y + height), ImGui.GetColorU32(!v ? colors[(int)ImGuiCol.Button] * 0.6f : new Vector4(0.35f, 0.35f, 0.35f, 1.0f)), height * 0.50f);
+        drawList.AddCircleFilled(new Vector2(p.X + radius + ((v ? 1 : 0) * (width - (radius * 2.0f))), p.Y + radius), radius - 1.5f, ImGui.ColorConvertFloat4ToU32(new Vector4(1, 1, 1, 1)));
 
-            var height = ImGui.GetFrameHeight();
-            var width = height * 1.55f;
-            var radius = height * 0.50f;
+        return changed;
+    }
 
-            // TODO: animate
-            ImGui.InvisibleButton(id, new Vector2(width, height));
+    /// <summary>
+    /// Draw a disabled toggle button.
+    /// </summary>
+    /// <param name="id">The id of the button.</param>
+    /// <param name="v">The state of the switch.</param>
+    public static void DisabledToggleButton(string id, bool v)
+    {
+        var colors = ImGui.GetStyle().Colors;
+        var p = ImGui.GetCursorScreenPos();
+        var drawList = ImGui.GetWindowDrawList();
 
-            var dimFactor = 0.5f;
+        var height = ImGui.GetFrameHeight();
+        var width = height * 1.55f;
+        var radius = height * 0.50f;
 
-            drawList.AddRectFilled(p, new Vector2(p.X + width, p.Y + height), ImGui.GetColorU32(v ? colors[(int)ImGuiCol.Button] * dimFactor : new Vector4(0.55f, 0.55f, 0.55f, 1.0f) * dimFactor), height * 0.50f);
-            drawList.AddCircleFilled(new Vector2(p.X + radius + ((v ? 1 : 0) * (width - (radius * 2.0f))), p.Y + radius), radius - 1.5f, ImGui.ColorConvertFloat4ToU32(new Vector4(1, 1, 1, 1) * dimFactor));
-        }
+        // TODO: animate
+        ImGui.InvisibleButton(id, new Vector2(width, height));
+
+        var dimFactor = 0.5f;
+
+        drawList.AddRectFilled(p, new Vector2(p.X + width, p.Y + height), ImGui.GetColorU32(v ? colors[(int)ImGuiCol.Button] * dimFactor : new Vector4(0.55f, 0.55f, 0.55f, 1.0f) * dimFactor), height * 0.50f);
+        drawList.AddCircleFilled(new Vector2(p.X + radius + ((v ? 1 : 0) * (width - (radius * 2.0f))), p.Y + radius), radius - 1.5f, ImGui.ColorConvertFloat4ToU32(new Vector4(1, 1, 1, 1) * dimFactor));
     }
 }
diff --git a/Dalamud/Interface/Components/ImGuiComponents.cs b/Dalamud/Interface/Components/ImGuiComponents.cs
index 60d6a0e06..e63ebd890 100644
--- a/Dalamud/Interface/Components/ImGuiComponents.cs
+++ b/Dalamud/Interface/Components/ImGuiComponents.cs
@@ -1,9 +1,8 @@
-namespace Dalamud.Interface.Components
+namespace Dalamud.Interface.Components;
+
+/// <summary>
+/// Class containing various methods providing ImGui components.
+/// </summary>
+public static partial class ImGuiComponents
 {
-    /// <summary>
-    /// Class containing various methods providing ImGui components.
-    /// </summary>
-    public static partial class ImGuiComponents
-    {
-    }
 }
diff --git a/Dalamud/Interface/FontAwesomeExtensions.cs b/Dalamud/Interface/FontAwesomeExtensions.cs
index 734ec128d..bd5738cc3 100644
--- a/Dalamud/Interface/FontAwesomeExtensions.cs
+++ b/Dalamud/Interface/FontAwesomeExtensions.cs
@@ -1,30 +1,29 @@
 // Font-Awesome - Version 5.0.9
 
-namespace Dalamud.Interface
+namespace Dalamud.Interface;
+
+/// <summary>
+/// Extension methods for <see cref="FontAwesomeIcon"/>.
+/// </summary>
+public static class FontAwesomeExtensions
 {
     /// <summary>
-    /// Extension methods for <see cref="FontAwesomeIcon"/>.
+    /// Convert the FontAwesomeIcon to a <see cref="char"/> type.
     /// </summary>
-    public static class FontAwesomeExtensions
+    /// <param name="icon">The icon to convert.</param>
+    /// <returns>The converted icon.</returns>
+    public static char ToIconChar(this FontAwesomeIcon icon)
     {
-        /// <summary>
-        /// Convert the FontAwesomeIcon to a <see cref="char"/> type.
-        /// </summary>
-        /// <param name="icon">The icon to convert.</param>
-        /// <returns>The converted icon.</returns>
-        public static char ToIconChar(this FontAwesomeIcon icon)
-        {
-            return (char)icon;
-        }
+        return (char)icon;
+    }
 
-        /// <summary>
-        /// Conver the FontAwesomeIcon to a <see cref="string"/> type.
-        /// </summary>
-        /// <param name="icon">The icon to convert.</param>
-        /// <returns>The converted icon.</returns>
-        public static string ToIconString(this FontAwesomeIcon icon)
-        {
-            return string.Empty + (char)icon;
-        }
+    /// <summary>
+    /// Conver the FontAwesomeIcon to a <see cref="string"/> type.
+    /// </summary>
+    /// <param name="icon">The icon to convert.</param>
+    /// <returns>The converted icon.</returns>
+    public static string ToIconString(this FontAwesomeIcon icon)
+    {
+        return string.Empty + (char)icon;
     }
 }
diff --git a/Dalamud/Interface/FontAwesomeIcon.cs b/Dalamud/Interface/FontAwesomeIcon.cs
index 9435b808f..3c056bf23 100644
--- a/Dalamud/Interface/FontAwesomeIcon.cs
+++ b/Dalamud/Interface/FontAwesomeIcon.cs
@@ -1,7050 +1,7049 @@
 // Font-Awesome - Version 5.0.9
 
-namespace Dalamud.Interface
+namespace Dalamud.Interface;
+
+/// <summary>
+/// Font Awesome unicode characters for use with the <see cref="UiBuilder.IconFont"/> font.
+/// </summary>
+public enum FontAwesomeIcon
 {
     /// <summary>
-    /// Font Awesome unicode characters for use with the <see cref="UiBuilder.IconFont"/> font.
+    /// No icon.
     /// </summary>
-    public enum FontAwesomeIcon
-    {
-        /// <summary>
-        /// No icon.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// The Font Awesome "500px" icon unicode character.
-        /// </summary>
-        _500Px = 0xF26E,
-
-        /// <summary>
-        /// The Font Awesome "accessible-icon" icon unicode character.
-        /// </summary>
-        AccessibleIcon = 0xF368,
-
-        /// <summary>
-        /// The Font Awesome "accusoft" icon unicode character.
-        /// </summary>
-        Accusoft = 0xF369,
-
-        /// <summary>
-        /// The Font Awesome "acquisitions-incorporated" icon unicode character.
-        /// </summary>
-        AcquisitionsIncorporated = 0xF6AF,
-
-        /// <summary>
-        /// The Font Awesome "ad" icon unicode character.
-        /// </summary>
-        Ad = 0xF641,
-
-        /// <summary>
-        /// The Font Awesome "address-book" icon unicode character.
-        /// </summary>
-        AddressBook = 0xF2B9,
-
-        /// <summary>
-        /// The Font Awesome "address-card" icon unicode character.
-        /// </summary>
-        AddressCard = 0xF2BB,
-
-        /// <summary>
-        /// The Font Awesome "adjust" icon unicode character.
-        /// </summary>
-        Adjust = 0xF042,
-
-        /// <summary>
-        /// The Font Awesome "adn" icon unicode character.
-        /// </summary>
-        Adn = 0xF170,
-
-        /// <summary>
-        /// The Font Awesome "adobe" icon unicode character.
-        /// </summary>
-        Adobe = 0xF778,
-
-        /// <summary>
-        /// The Font Awesome "adversal" icon unicode character.
-        /// </summary>
-        Adversal = 0xF36A,
-
-        /// <summary>
-        /// The Font Awesome "affiliatetheme" icon unicode character.
-        /// </summary>
-        Affiliatetheme = 0xF36B,
-
-        /// <summary>
-        /// The Font Awesome "airbnb" icon unicode character.
-        /// </summary>
-        Airbnb = 0xF834,
-
-        /// <summary>
-        /// The Font Awesome "air-freshener" icon unicode character.
-        /// </summary>
-        AirFreshener = 0xF5D0,
-
-        /// <summary>
-        /// The Font Awesome "algolia" icon unicode character.
-        /// </summary>
-        Algolia = 0xF36C,
-
-        /// <summary>
-        /// The Font Awesome "align-center" icon unicode character.
-        /// </summary>
-        AlignCenter = 0xF037,
-
-        /// <summary>
-        /// The Font Awesome "align-justify" icon unicode character.
-        /// </summary>
-        AlignJustify = 0xF039,
-
-        /// <summary>
-        /// The Font Awesome "align-left" icon unicode character.
-        /// </summary>
-        AlignLeft = 0xF036,
-
-        /// <summary>
-        /// The Font Awesome "align-right" icon unicode character.
-        /// </summary>
-        AlignRight = 0xF038,
-
-        /// <summary>
-        /// The Font Awesome "alipay" icon unicode character.
-        /// </summary>
-        Alipay = 0xF642,
-
-        /// <summary>
-        /// The Font Awesome "allergies" icon unicode character.
-        /// </summary>
-        Allergies = 0xF461,
-
-        /// <summary>
-        /// The Font Awesome "amazon" icon unicode character.
-        /// </summary>
-        Amazon = 0xF270,
-
-        /// <summary>
-        /// The Font Awesome "amazon-pay" icon unicode character.
-        /// </summary>
-        AmazonPay = 0xF42C,
-
-        /// <summary>
-        /// The Font Awesome "ambulance" icon unicode character.
-        /// </summary>
-        Ambulance = 0xF0F9,
-
-        /// <summary>
-        /// The Font Awesome "american-sign-language-interpreting" icon unicode character.
-        /// </summary>
-        AmericanSignLanguageInterpreting = 0xF2A3,
-
-        /// <summary>
-        /// The Font Awesome "amilia" icon unicode character.
-        /// </summary>
-        Amilia = 0xF36D,
-
-        /// <summary>
-        /// The Font Awesome "anchor" icon unicode character.
-        /// </summary>
-        Anchor = 0xF13D,
-
-        /// <summary>
-        /// The Font Awesome "android" icon unicode character.
-        /// </summary>
-        Android = 0xF17B,
-
-        /// <summary>
-        /// The Font Awesome "angellist" icon unicode character.
-        /// </summary>
-        Angellist = 0xF209,
-
-        /// <summary>
-        /// The Font Awesome "angle-double-down" icon unicode character.
-        /// </summary>
-        AngleDoubleDown = 0xF103,
-
-        /// <summary>
-        /// The Font Awesome "angle-double-left" icon unicode character.
-        /// </summary>
-        AngleDoubleLeft = 0xF100,
-
-        /// <summary>
-        /// The Font Awesome "angle-double-right" icon unicode character.
-        /// </summary>
-        AngleDoubleRight = 0xF101,
-
-        /// <summary>
-        /// The Font Awesome "angle-double-up" icon unicode character.
-        /// </summary>
-        AngleDoubleUp = 0xF102,
-
-        /// <summary>
-        /// The Font Awesome "angle-down" icon unicode character.
-        /// </summary>
-        AngleDown = 0xF107,
-
-        /// <summary>
-        /// The Font Awesome "angle-left" icon unicode character.
-        /// </summary>
-        AngleLeft = 0xF104,
-
-        /// <summary>
-        /// The Font Awesome "angle-right" icon unicode character.
-        /// </summary>
-        AngleRight = 0xF105,
-
-        /// <summary>
-        /// The Font Awesome "angle-up" icon unicode character.
-        /// </summary>
-        AngleUp = 0xF106,
-
-        /// <summary>
-        /// The Font Awesome "angry" icon unicode character.
-        /// </summary>
-        Angry = 0xF556,
-
-        /// <summary>
-        /// The Font Awesome "angrycreative" icon unicode character.
-        /// </summary>
-        Angrycreative = 0xF36E,
-
-        /// <summary>
-        /// The Font Awesome "angular" icon unicode character.
-        /// </summary>
-        Angular = 0xF420,
-
-        /// <summary>
-        /// The Font Awesome "ankh" icon unicode character.
-        /// </summary>
-        Ankh = 0xF644,
-
-        /// <summary>
-        /// The Font Awesome "apper" icon unicode character.
-        /// </summary>
-        Apper = 0xF371,
-
-        /// <summary>
-        /// The Font Awesome "apple" icon unicode character.
-        /// </summary>
-        Apple = 0xF179,
-
-        /// <summary>
-        /// The Font Awesome "apple-alt" icon unicode character.
-        /// </summary>
-        AppleAlt = 0xF5D1,
-
-        /// <summary>
-        /// The Font Awesome "apple-pay" icon unicode character.
-        /// </summary>
-        ApplePay = 0xF415,
-
-        /// <summary>
-        /// The Font Awesome "app-store" icon unicode character.
-        /// </summary>
-        AppStore = 0xF36F,
-
-        /// <summary>
-        /// The Font Awesome "app-store-ios" icon unicode character.
-        /// </summary>
-        AppStoreIos = 0xF370,
-
-        /// <summary>
-        /// The Font Awesome "archive" icon unicode character.
-        /// </summary>
-        Archive = 0xF187,
-
-        /// <summary>
-        /// The Font Awesome "archway" icon unicode character.
-        /// </summary>
-        Archway = 0xF557,
-
-        /// <summary>
-        /// The Font Awesome "arrow-alt-circle-down" icon unicode character.
-        /// </summary>
-        ArrowAltCircleDown = 0xF358,
-
-        /// <summary>
-        /// The Font Awesome "arrow-alt-circle-left" icon unicode character.
-        /// </summary>
-        ArrowAltCircleLeft = 0xF359,
-
-        /// <summary>
-        /// The Font Awesome "arrow-alt-circle-right" icon unicode character.
-        /// </summary>
-        ArrowAltCircleRight = 0xF35A,
-
-        /// <summary>
-        /// The Font Awesome "arrow-alt-circle-up" icon unicode character.
-        /// </summary>
-        ArrowAltCircleUp = 0xF35B,
-
-        /// <summary>
-        /// The Font Awesome "arrow-circle-down" icon unicode character.
-        /// </summary>
-        ArrowCircleDown = 0xF0AB,
-
-        /// <summary>
-        /// The Font Awesome "arrow-circle-left" icon unicode character.
-        /// </summary>
-        ArrowCircleLeft = 0xF0A8,
-
-        /// <summary>
-        /// The Font Awesome "arrow-circle-right" icon unicode character.
-        /// </summary>
-        ArrowCircleRight = 0xF0A9,
-
-        /// <summary>
-        /// The Font Awesome "arrow-circle-up" icon unicode character.
-        /// </summary>
-        ArrowCircleUp = 0xF0AA,
-
-        /// <summary>
-        /// The Font Awesome "arrow-down" icon unicode character.
-        /// </summary>
-        ArrowDown = 0xF063,
-
-        /// <summary>
-        /// The Font Awesome "arrow-left" icon unicode character.
-        /// </summary>
-        ArrowLeft = 0xF060,
-
-        /// <summary>
-        /// The Font Awesome "arrow-right" icon unicode character.
-        /// </summary>
-        ArrowRight = 0xF061,
-
-        /// <summary>
-        /// The Font Awesome "arrows-alt" icon unicode character.
-        /// </summary>
-        ArrowsAlt = 0xF0B2,
-
-        /// <summary>
-        /// The Font Awesome "arrows-alt-h" icon unicode character.
-        /// </summary>
-        ArrowsAltH = 0xF337,
-
-        /// <summary>
-        /// The Font Awesome "arrows-alt-v" icon unicode character.
-        /// </summary>
-        ArrowsAltV = 0xF338,
-
-        /// <summary>
-        /// The Font Awesome "arrow-up" icon unicode character.
-        /// </summary>
-        ArrowUp = 0xF062,
-
-        /// <summary>
-        /// The Font Awesome "artstation" icon unicode character.
-        /// </summary>
-        Artstation = 0xF77A,
-
-        /// <summary>
-        /// The Font Awesome "assistive-listening-systems" icon unicode character.
-        /// </summary>
-        AssistiveListeningSystems = 0xF2A2,
-
-        /// <summary>
-        /// The Font Awesome "asterisk" icon unicode character.
-        /// </summary>
-        Asterisk = 0xF069,
-
-        /// <summary>
-        /// The Font Awesome "asymmetrik" icon unicode character.
-        /// </summary>
-        Asymmetrik = 0xF372,
-
-        /// <summary>
-        /// The Font Awesome "at" icon unicode character.
-        /// </summary>
-        At = 0xF1FA,
-
-        /// <summary>
-        /// The Font Awesome "atlas" icon unicode character.
-        /// </summary>
-        Atlas = 0xF558,
-
-        /// <summary>
-        /// The Font Awesome "atlassian" icon unicode character.
-        /// </summary>
-        Atlassian = 0xF77B,
-
-        /// <summary>
-        /// The Font Awesome "atom" icon unicode character.
-        /// </summary>
-        Atom = 0xF5D2,
-
-        /// <summary>
-        /// The Font Awesome "audible" icon unicode character.
-        /// </summary>
-        Audible = 0xF373,
-
-        /// <summary>
-        /// The Font Awesome "audio-description" icon unicode character.
-        /// </summary>
-        AudioDescription = 0xF29E,
-
-        /// <summary>
-        /// The Font Awesome "autoprefixer" icon unicode character.
-        /// </summary>
-        Autoprefixer = 0xF41C,
-
-        /// <summary>
-        /// The Font Awesome "avianex" icon unicode character.
-        /// </summary>
-        Avianex = 0xF374,
-
-        /// <summary>
-        /// The Font Awesome "aviato" icon unicode character.
-        /// </summary>
-        Aviato = 0xF421,
-
-        /// <summary>
-        /// The Font Awesome "award" icon unicode character.
-        /// </summary>
-        Award = 0xF559,
-
-        /// <summary>
-        /// The Font Awesome "aws" icon unicode character.
-        /// </summary>
-        Aws = 0xF375,
-
-        /// <summary>
-        /// The Font Awesome "baby" icon unicode character.
-        /// </summary>
-        Baby = 0xF77C,
-
-        /// <summary>
-        /// The Font Awesome "baby-carriage" icon unicode character.
-        /// </summary>
-        BabyCarriage = 0xF77D,
-
-        /// <summary>
-        /// The Font Awesome "backspace" icon unicode character.
-        /// </summary>
-        Backspace = 0xF55A,
-
-        /// <summary>
-        /// The Font Awesome "backward" icon unicode character.
-        /// </summary>
-        Backward = 0xF04A,
-
-        /// <summary>
-        /// The Font Awesome "bacon" icon unicode character.
-        /// </summary>
-        Bacon = 0xF7E5,
-
-        /// <summary>
-        /// The Font Awesome "bahai" icon unicode character.
-        /// </summary>
-        Bahai = 0xF666,
-
-        /// <summary>
-        /// The Font Awesome "balance-scale" icon unicode character.
-        /// </summary>
-        BalanceScale = 0xF24E,
-
-        /// <summary>
-        /// The Font Awesome "balance-scale-left" icon unicode character.
-        /// </summary>
-        BalanceScaleLeft = 0xF515,
-
-        /// <summary>
-        /// The Font Awesome "balance-scale-right" icon unicode character.
-        /// </summary>
-        BalanceScaleRight = 0xF516,
-
-        /// <summary>
-        /// The Font Awesome "ban" icon unicode character.
-        /// </summary>
-        Ban = 0xF05E,
-
-        /// <summary>
-        /// The Font Awesome "band-aid" icon unicode character.
-        /// </summary>
-        BandAid = 0xF462,
-
-        /// <summary>
-        /// The Font Awesome "bandcamp" icon unicode character.
-        /// </summary>
-        Bandcamp = 0xF2D5,
-
-        /// <summary>
-        /// The Font Awesome "barcode" icon unicode character.
-        /// </summary>
-        Barcode = 0xF02A,
-
-        /// <summary>
-        /// The Font Awesome "bars" icon unicode character.
-        /// </summary>
-        Bars = 0xF0C9,
-
-        /// <summary>
-        /// The Font Awesome "baseball-ball" icon unicode character.
-        /// </summary>
-        BaseballBall = 0xF433,
-
-        /// <summary>
-        /// The Font Awesome "basketball-ball" icon unicode character.
-        /// </summary>
-        BasketballBall = 0xF434,
-
-        /// <summary>
-        /// The Font Awesome "bath" icon unicode character.
-        /// </summary>
-        Bath = 0xF2CD,
-
-        /// <summary>
-        /// The Font Awesome "battery-empty" icon unicode character.
-        /// </summary>
-        BatteryEmpty = 0xF244,
-
-        /// <summary>
-        /// The Font Awesome "battery-full" icon unicode character.
-        /// </summary>
-        BatteryFull = 0xF240,
-
-        /// <summary>
-        /// The Font Awesome "battery-half" icon unicode character.
-        /// </summary>
-        BatteryHalf = 0xF242,
-
-        /// <summary>
-        /// The Font Awesome "battery-quarter" icon unicode character.
-        /// </summary>
-        BatteryQuarter = 0xF243,
-
-        /// <summary>
-        /// The Font Awesome "battery-three-quarters" icon unicode character.
-        /// </summary>
-        BatteryThreeQuarters = 0xF241,
-
-        /// <summary>
-        /// The Font Awesome "battle-net" icon unicode character.
-        /// </summary>
-        BattleNet = 0xF835,
-
-        /// <summary>
-        /// The Font Awesome "bed" icon unicode character.
-        /// </summary>
-        Bed = 0xF236,
-
-        /// <summary>
-        /// The Font Awesome "beer" icon unicode character.
-        /// </summary>
-        Beer = 0xF0FC,
-
-        /// <summary>
-        /// The Font Awesome "behance" icon unicode character.
-        /// </summary>
-        Behance = 0xF1B4,
-
-        /// <summary>
-        /// The Font Awesome "behance-square" icon unicode character.
-        /// </summary>
-        BehanceSquare = 0xF1B5,
-
-        /// <summary>
-        /// The Font Awesome "bell" icon unicode character.
-        /// </summary>
-        Bell = 0xF0F3,
-
-        /// <summary>
-        /// The Font Awesome "bell-slash" icon unicode character.
-        /// </summary>
-        BellSlash = 0xF1F6,
-
-        /// <summary>
-        /// The Font Awesome "bezier-curve" icon unicode character.
-        /// </summary>
-        BezierCurve = 0xF55B,
-
-        /// <summary>
-        /// The Font Awesome "bible" icon unicode character.
-        /// </summary>
-        Bible = 0xF647,
-
-        /// <summary>
-        /// The Font Awesome "bicycle" icon unicode character.
-        /// </summary>
-        Bicycle = 0xF206,
-
-        /// <summary>
-        /// The Font Awesome "biking" icon unicode character.
-        /// </summary>
-        Biking = 0xF84A,
-
-        /// <summary>
-        /// The Font Awesome "bimobject" icon unicode character.
-        /// </summary>
-        Bimobject = 0xF378,
-
-        /// <summary>
-        /// The Font Awesome "binoculars" icon unicode character.
-        /// </summary>
-        Binoculars = 0xF1E5,
-
-        /// <summary>
-        /// The Font Awesome "biohazard" icon unicode character.
-        /// </summary>
-        Biohazard = 0xF780,
-
-        /// <summary>
-        /// The Font Awesome "birthday-cake" icon unicode character.
-        /// </summary>
-        BirthdayCake = 0xF1FD,
-
-        /// <summary>
-        /// The Font Awesome "bitbucket" icon unicode character.
-        /// </summary>
-        Bitbucket = 0xF171,
-
-        /// <summary>
-        /// The Font Awesome "bitcoin" icon unicode character.
-        /// </summary>
-        Bitcoin = 0xF379,
-
-        /// <summary>
-        /// The Font Awesome "bity" icon unicode character.
-        /// </summary>
-        Bity = 0xF37A,
-
-        /// <summary>
-        /// The Font Awesome "blackberry" icon unicode character.
-        /// </summary>
-        Blackberry = 0xF37B,
-
-        /// <summary>
-        /// The Font Awesome "black-tie" icon unicode character.
-        /// </summary>
-        BlackTie = 0xF27E,
-
-        /// <summary>
-        /// The Font Awesome "blender" icon unicode character.
-        /// </summary>
-        Blender = 0xF517,
-
-        /// <summary>
-        /// The Font Awesome "blender-phone" icon unicode character.
-        /// </summary>
-        BlenderPhone = 0xF6B6,
-
-        /// <summary>
-        /// The Font Awesome "blind" icon unicode character.
-        /// </summary>
-        Blind = 0xF29D,
-
-        /// <summary>
-        /// The Font Awesome "blog" icon unicode character.
-        /// </summary>
-        Blog = 0xF781,
-
-        /// <summary>
-        /// The Font Awesome "blogger" icon unicode character.
-        /// </summary>
-        Blogger = 0xF37C,
-
-        /// <summary>
-        /// The Font Awesome "blogger-b" icon unicode character.
-        /// </summary>
-        BloggerB = 0xF37D,
-
-        /// <summary>
-        /// The Font Awesome "bluetooth" icon unicode character.
-        /// </summary>
-        Bluetooth = 0xF293,
-
-        /// <summary>
-        /// The Font Awesome "bluetooth-b" icon unicode character.
-        /// </summary>
-        BluetoothB = 0xF294,
-
-        /// <summary>
-        /// The Font Awesome "bold" icon unicode character.
-        /// </summary>
-        Bold = 0xF032,
-
-        /// <summary>
-        /// The Font Awesome "bolt" icon unicode character.
-        /// </summary>
-        Bolt = 0xF0E7,
-
-        /// <summary>
-        /// The Font Awesome "bomb" icon unicode character.
-        /// </summary>
-        Bomb = 0xF1E2,
-
-        /// <summary>
-        /// The Font Awesome "bone" icon unicode character.
-        /// </summary>
-        Bone = 0xF5D7,
-
-        /// <summary>
-        /// The Font Awesome "bong" icon unicode character.
-        /// </summary>
-        Bong = 0xF55C,
-
-        /// <summary>
-        /// The Font Awesome "book" icon unicode character.
-        /// </summary>
-        Book = 0xF02D,
-
-        /// <summary>
-        /// The Font Awesome "book-dead" icon unicode character.
-        /// </summary>
-        BookDead = 0xF6B7,
-
-        /// <summary>
-        /// The Font Awesome "bookmark" icon unicode character.
-        /// </summary>
-        Bookmark = 0xF02E,
-
-        /// <summary>
-        /// The Font Awesome "book-medical" icon unicode character.
-        /// </summary>
-        BookMedical = 0xF7E6,
-
-        /// <summary>
-        /// The Font Awesome "book-open" icon unicode character.
-        /// </summary>
-        BookOpen = 0xF518,
-
-        /// <summary>
-        /// The Font Awesome "book-reader" icon unicode character.
-        /// </summary>
-        BookReader = 0xF5DA,
-
-        /// <summary>
-        /// The Font Awesome "bootstrap" icon unicode character.
-        /// </summary>
-        Bootstrap = 0xF836,
-
-        /// <summary>
-        /// The Font Awesome "border-all" icon unicode character.
-        /// </summary>
-        BorderAll = 0xF84C,
-
-        /// <summary>
-        /// The Font Awesome "border-none" icon unicode character.
-        /// </summary>
-        BorderNone = 0xF850,
-
-        /// <summary>
-        /// The Font Awesome "border-style" icon unicode character.
-        /// </summary>
-        BorderStyle = 0xF853,
-
-        /// <summary>
-        /// The Font Awesome "bowling-ball" icon unicode character.
-        /// </summary>
-        BowlingBall = 0xF436,
-
-        /// <summary>
-        /// The Font Awesome "box" icon unicode character.
-        /// </summary>
-        Box = 0xF466,
-
-        /// <summary>
-        /// The Font Awesome "boxes" icon unicode character.
-        /// </summary>
-        Boxes = 0xF468,
-
-        /// <summary>
-        /// The Font Awesome "box-open" icon unicode character.
-        /// </summary>
-        BoxOpen = 0xF49E,
-
-        /// <summary>
-        /// The Font Awesome "braille" icon unicode character.
-        /// </summary>
-        Braille = 0xF2A1,
-
-        /// <summary>
-        /// The Font Awesome "brain" icon unicode character.
-        /// </summary>
-        Brain = 0xF5DC,
-
-        /// <summary>
-        /// The Font Awesome "bread-slice" icon unicode character.
-        /// </summary>
-        BreadSlice = 0xF7EC,
-
-        /// <summary>
-        /// The Font Awesome "briefcase" icon unicode character.
-        /// </summary>
-        Briefcase = 0xF0B1,
-
-        /// <summary>
-        /// The Font Awesome "briefcase-medical" icon unicode character.
-        /// </summary>
-        BriefcaseMedical = 0xF469,
-
-        /// <summary>
-        /// The Font Awesome "broadcast-tower" icon unicode character.
-        /// </summary>
-        BroadcastTower = 0xF519,
-
-        /// <summary>
-        /// The Font Awesome "broom" icon unicode character.
-        /// </summary>
-        Broom = 0xF51A,
-
-        /// <summary>
-        /// The Font Awesome "brush" icon unicode character.
-        /// </summary>
-        Brush = 0xF55D,
-
-        /// <summary>
-        /// The Font Awesome "btc" icon unicode character.
-        /// </summary>
-        Btc = 0xF15A,
-
-        /// <summary>
-        /// The Font Awesome "buffer" icon unicode character.
-        /// </summary>
-        Buffer = 0xF837,
-
-        /// <summary>
-        /// The Font Awesome "bug" icon unicode character.
-        /// </summary>
-        Bug = 0xF188,
-
-        /// <summary>
-        /// The Font Awesome "building" icon unicode character.
-        /// </summary>
-        Building = 0xF1AD,
-
-        /// <summary>
-        /// The Font Awesome "bullhorn" icon unicode character.
-        /// </summary>
-        Bullhorn = 0xF0A1,
-
-        /// <summary>
-        /// The Font Awesome "bullseye" icon unicode character.
-        /// </summary>
-        Bullseye = 0xF140,
-
-        /// <summary>
-        /// The Font Awesome "burn" icon unicode character.
-        /// </summary>
-        Burn = 0xF46A,
-
-        /// <summary>
-        /// The Font Awesome "buromobelexperte" icon unicode character.
-        /// </summary>
-        Buromobelexperte = 0xF37F,
-
-        /// <summary>
-        /// The Font Awesome "bus" icon unicode character.
-        /// </summary>
-        Bus = 0xF207,
-
-        /// <summary>
-        /// The Font Awesome "bus-alt" icon unicode character.
-        /// </summary>
-        BusAlt = 0xF55E,
-
-        /// <summary>
-        /// The Font Awesome "business-time" icon unicode character.
-        /// </summary>
-        BusinessTime = 0xF64A,
-
-        /// <summary>
-        /// The Font Awesome "buy-n-large" icon unicode character.
-        /// </summary>
-        BuyNLarge = 0xF8A6,
-
-        /// <summary>
-        /// The Font Awesome "buysellads" icon unicode character.
-        /// </summary>
-        Buysellads = 0xF20D,
-
-        /// <summary>
-        /// The Font Awesome "calculator" icon unicode character.
-        /// </summary>
-        Calculator = 0xF1EC,
-
-        /// <summary>
-        /// The Font Awesome "calendar" icon unicode character.
-        /// </summary>
-        Calendar = 0xF133,
-
-        /// <summary>
-        /// The Font Awesome "calendar-alt" icon unicode character.
-        /// </summary>
-        CalendarAlt = 0xF073,
-
-        /// <summary>
-        /// The Font Awesome "calendar-check" icon unicode character.
-        /// </summary>
-        CalendarCheck = 0xF274,
-
-        /// <summary>
-        /// The Font Awesome "calendar-day" icon unicode character.
-        /// </summary>
-        CalendarDay = 0xF783,
-
-        /// <summary>
-        /// The Font Awesome "calendar-minus" icon unicode character.
-        /// </summary>
-        CalendarMinus = 0xF272,
-
-        /// <summary>
-        /// The Font Awesome "calendar-plus" icon unicode character.
-        /// </summary>
-        CalendarPlus = 0xF271,
-
-        /// <summary>
-        /// The Font Awesome "calendar-times" icon unicode character.
-        /// </summary>
-        CalendarTimes = 0xF273,
-
-        /// <summary>
-        /// The Font Awesome "calendar-week" icon unicode character.
-        /// </summary>
-        CalendarWeek = 0xF784,
-
-        /// <summary>
-        /// The Font Awesome "camera" icon unicode character.
-        /// </summary>
-        Camera = 0xF030,
-
-        /// <summary>
-        /// The Font Awesome "camera-retro" icon unicode character.
-        /// </summary>
-        CameraRetro = 0xF083,
-
-        /// <summary>
-        /// The Font Awesome "campground" icon unicode character.
-        /// </summary>
-        Campground = 0xF6BB,
-
-        /// <summary>
-        /// The Font Awesome "canadian-maple-leaf" icon unicode character.
-        /// </summary>
-        CanadianMapleLeaf = 0xF785,
-
-        /// <summary>
-        /// The Font Awesome "candy-cane" icon unicode character.
-        /// </summary>
-        CandyCane = 0xF786,
-
-        /// <summary>
-        /// The Font Awesome "cannabis" icon unicode character.
-        /// </summary>
-        Cannabis = 0xF55F,
-
-        /// <summary>
-        /// The Font Awesome "capsules" icon unicode character.
-        /// </summary>
-        Capsules = 0xF46B,
-
-        /// <summary>
-        /// The Font Awesome "car" icon unicode character.
-        /// </summary>
-        Car = 0xF1B9,
-
-        /// <summary>
-        /// The Font Awesome "car-alt" icon unicode character.
-        /// </summary>
-        CarAlt = 0xF5DE,
-
-        /// <summary>
-        /// The Font Awesome "caravan" icon unicode character.
-        /// </summary>
-        Caravan = 0xF8FF,
-
-        /// <summary>
-        /// The Font Awesome "car-battery" icon unicode character.
-        /// </summary>
-        CarBattery = 0xF5DF,
-
-        /// <summary>
-        /// The Font Awesome "car-crash" icon unicode character.
-        /// </summary>
-        CarCrash = 0xF5E1,
-
-        /// <summary>
-        /// The Font Awesome "caret-down" icon unicode character.
-        /// </summary>
-        CaretDown = 0xF0D7,
-
-        /// <summary>
-        /// The Font Awesome "caret-left" icon unicode character.
-        /// </summary>
-        CaretLeft = 0xF0D9,
-
-        /// <summary>
-        /// The Font Awesome "caret-right" icon unicode character.
-        /// </summary>
-        CaretRight = 0xF0DA,
-
-        /// <summary>
-        /// The Font Awesome "caret-square-down" icon unicode character.
-        /// </summary>
-        CaretSquareDown = 0xF150,
-
-        /// <summary>
-        /// The Font Awesome "caret-square-left" icon unicode character.
-        /// </summary>
-        CaretSquareLeft = 0xF191,
-
-        /// <summary>
-        /// The Font Awesome "caret-square-right" icon unicode character.
-        /// </summary>
-        CaretSquareRight = 0xF152,
-
-        /// <summary>
-        /// The Font Awesome "caret-square-up" icon unicode character.
-        /// </summary>
-        CaretSquareUp = 0xF151,
-
-        /// <summary>
-        /// The Font Awesome "caret-up" icon unicode character.
-        /// </summary>
-        CaretUp = 0xF0D8,
-
-        /// <summary>
-        /// The Font Awesome "carrot" icon unicode character.
-        /// </summary>
-        Carrot = 0xF787,
-
-        /// <summary>
-        /// The Font Awesome "car-side" icon unicode character.
-        /// </summary>
-        CarSide = 0xF5E4,
-
-        /// <summary>
-        /// The Font Awesome "cart-arrow-down" icon unicode character.
-        /// </summary>
-        CartArrowDown = 0xF218,
-
-        /// <summary>
-        /// The Font Awesome "cart-plus" icon unicode character.
-        /// </summary>
-        CartPlus = 0xF217,
-
-        /// <summary>
-        /// The Font Awesome "cash-register" icon unicode character.
-        /// </summary>
-        CashRegister = 0xF788,
-
-        /// <summary>
-        /// The Font Awesome "cat" icon unicode character.
-        /// </summary>
-        Cat = 0xF6BE,
-
-        /// <summary>
-        /// The Font Awesome "cc-amazon-pay" icon unicode character.
-        /// </summary>
-        CcAmazonPay = 0xF42D,
-
-        /// <summary>
-        /// The Font Awesome "cc-amex" icon unicode character.
-        /// </summary>
-        CcAmex = 0xF1F3,
-
-        /// <summary>
-        /// The Font Awesome "cc-apple-pay" icon unicode character.
-        /// </summary>
-        CcApplePay = 0xF416,
-
-        /// <summary>
-        /// The Font Awesome "cc-diners-club" icon unicode character.
-        /// </summary>
-        CcDinersClub = 0xF24C,
-
-        /// <summary>
-        /// The Font Awesome "cc-discover" icon unicode character.
-        /// </summary>
-        CcDiscover = 0xF1F2,
-
-        /// <summary>
-        /// The Font Awesome "cc-jcb" icon unicode character.
-        /// </summary>
-        CcJcb = 0xF24B,
-
-        /// <summary>
-        /// The Font Awesome "cc-mastercard" icon unicode character.
-        /// </summary>
-        CcMastercard = 0xF1F1,
-
-        /// <summary>
-        /// The Font Awesome "cc-paypal" icon unicode character.
-        /// </summary>
-        CcPaypal = 0xF1F4,
-
-        /// <summary>
-        /// The Font Awesome "cc-stripe" icon unicode character.
-        /// </summary>
-        CcStripe = 0xF1F5,
-
-        /// <summary>
-        /// The Font Awesome "cc-visa" icon unicode character.
-        /// </summary>
-        CcVisa = 0xF1F0,
-
-        /// <summary>
-        /// The Font Awesome "centercode" icon unicode character.
-        /// </summary>
-        Centercode = 0xF380,
-
-        /// <summary>
-        /// The Font Awesome "centos" icon unicode character.
-        /// </summary>
-        Centos = 0xF789,
-
-        /// <summary>
-        /// The Font Awesome "certificate" icon unicode character.
-        /// </summary>
-        Certificate = 0xF0A3,
-
-        /// <summary>
-        /// The Font Awesome "chair" icon unicode character.
-        /// </summary>
-        Chair = 0xF6C0,
-
-        /// <summary>
-        /// The Font Awesome "chalkboard" icon unicode character.
-        /// </summary>
-        Chalkboard = 0xF51B,
-
-        /// <summary>
-        /// The Font Awesome "chalkboard-teacher" icon unicode character.
-        /// </summary>
-        ChalkboardTeacher = 0xF51C,
-
-        /// <summary>
-        /// The Font Awesome "charging-station" icon unicode character.
-        /// </summary>
-        ChargingStation = 0xF5E7,
-
-        /// <summary>
-        /// The Font Awesome "chart-area" icon unicode character.
-        /// </summary>
-        ChartArea = 0xF1FE,
-
-        /// <summary>
-        /// The Font Awesome "chart-bar" icon unicode character.
-        /// </summary>
-        ChartBar = 0xF080,
-
-        /// <summary>
-        /// The Font Awesome "chart-line" icon unicode character.
-        /// </summary>
-        ChartLine = 0xF201,
-
-        /// <summary>
-        /// The Font Awesome "chart-pie" icon unicode character.
-        /// </summary>
-        ChartPie = 0xF200,
-
-        /// <summary>
-        /// The Font Awesome "check" icon unicode character.
-        /// </summary>
-        Check = 0xF00C,
-
-        /// <summary>
-        /// The Font Awesome "check-circle" icon unicode character.
-        /// </summary>
-        CheckCircle = 0xF058,
-
-        /// <summary>
-        /// The Font Awesome "check-double" icon unicode character.
-        /// </summary>
-        CheckDouble = 0xF560,
-
-        /// <summary>
-        /// The Font Awesome "check-square" icon unicode character.
-        /// </summary>
-        CheckSquare = 0xF14A,
-
-        /// <summary>
-        /// The Font Awesome "cheese" icon unicode character.
-        /// </summary>
-        Cheese = 0xF7EF,
-
-        /// <summary>
-        /// The Font Awesome "chess" icon unicode character.
-        /// </summary>
-        Chess = 0xF439,
-
-        /// <summary>
-        /// The Font Awesome "chess-bishop" icon unicode character.
-        /// </summary>
-        ChessBishop = 0xF43A,
-
-        /// <summary>
-        /// The Font Awesome "chess-board" icon unicode character.
-        /// </summary>
-        ChessBoard = 0xF43C,
-
-        /// <summary>
-        /// The Font Awesome "chess-king" icon unicode character.
-        /// </summary>
-        ChessKing = 0xF43F,
-
-        /// <summary>
-        /// The Font Awesome "chess-knight" icon unicode character.
-        /// </summary>
-        ChessKnight = 0xF441,
-
-        /// <summary>
-        /// The Font Awesome "chess-pawn" icon unicode character.
-        /// </summary>
-        ChessPawn = 0xF443,
-
-        /// <summary>
-        /// The Font Awesome "chess-queen" icon unicode character.
-        /// </summary>
-        ChessQueen = 0xF445,
-
-        /// <summary>
-        /// The Font Awesome "chess-rook" icon unicode character.
-        /// </summary>
-        ChessRook = 0xF447,
-
-        /// <summary>
-        /// The Font Awesome "chevron-circle-down" icon unicode character.
-        /// </summary>
-        ChevronCircleDown = 0xF13A,
-
-        /// <summary>
-        /// The Font Awesome "chevron-circle-left" icon unicode character.
-        /// </summary>
-        ChevronCircleLeft = 0xF137,
-
-        /// <summary>
-        /// The Font Awesome "chevron-circle-right" icon unicode character.
-        /// </summary>
-        ChevronCircleRight = 0xF138,
-
-        /// <summary>
-        /// The Font Awesome "chevron-circle-up" icon unicode character.
-        /// </summary>
-        ChevronCircleUp = 0xF139,
-
-        /// <summary>
-        /// The Font Awesome "chevron-down" icon unicode character.
-        /// </summary>
-        ChevronDown = 0xF078,
-
-        /// <summary>
-        /// The Font Awesome "chevron-left" icon unicode character.
-        /// </summary>
-        ChevronLeft = 0xF053,
-
-        /// <summary>
-        /// The Font Awesome "chevron-right" icon unicode character.
-        /// </summary>
-        ChevronRight = 0xF054,
-
-        /// <summary>
-        /// The Font Awesome "chevron-up" icon unicode character.
-        /// </summary>
-        ChevronUp = 0xF077,
-
-        /// <summary>
-        /// The Font Awesome "child" icon unicode character.
-        /// </summary>
-        Child = 0xF1AE,
-
-        /// <summary>
-        /// The Font Awesome "chrome" icon unicode character.
-        /// </summary>
-        Chrome = 0xF268,
-
-        /// <summary>
-        /// The Font Awesome "chromecast" icon unicode character.
-        /// </summary>
-        Chromecast = 0xF838,
-
-        /// <summary>
-        /// The Font Awesome "church" icon unicode character.
-        /// </summary>
-        Church = 0xF51D,
-
-        /// <summary>
-        /// The Font Awesome "circle" icon unicode character.
-        /// </summary>
-        Circle = 0xF111,
-
-        /// <summary>
-        /// The Font Awesome "circle-notch" icon unicode character.
-        /// </summary>
-        CircleNotch = 0xF1CE,
-
-        /// <summary>
-        /// The Font Awesome "city" icon unicode character.
-        /// </summary>
-        City = 0xF64F,
-
-        /// <summary>
-        /// The Font Awesome "clinic-medical" icon unicode character.
-        /// </summary>
-        ClinicMedical = 0xF7F2,
-
-        /// <summary>
-        /// The Font Awesome "clipboard" icon unicode character.
-        /// </summary>
-        Clipboard = 0xF328,
-
-        /// <summary>
-        /// The Font Awesome "clipboard-check" icon unicode character.
-        /// </summary>
-        ClipboardCheck = 0xF46C,
-
-        /// <summary>
-        /// The Font Awesome "clipboard-list" icon unicode character.
-        /// </summary>
-        ClipboardList = 0xF46D,
-
-        /// <summary>
-        /// The Font Awesome "clock" icon unicode character.
-        /// </summary>
-        Clock = 0xF017,
-
-        /// <summary>
-        /// The Font Awesome "clone" icon unicode character.
-        /// </summary>
-        Clone = 0xF24D,
-
-        /// <summary>
-        /// The Font Awesome "closed-captioning" icon unicode character.
-        /// </summary>
-        ClosedCaptioning = 0xF20A,
-
-        /// <summary>
-        /// The Font Awesome "cloud" icon unicode character.
-        /// </summary>
-        Cloud = 0xF0C2,
-
-        /// <summary>
-        /// The Font Awesome "cloud-download-alt" icon unicode character.
-        /// </summary>
-        CloudDownloadAlt = 0xF381,
-
-        /// <summary>
-        /// The Font Awesome "cloud-meatball" icon unicode character.
-        /// </summary>
-        CloudMeatball = 0xF73B,
-
-        /// <summary>
-        /// The Font Awesome "cloud-moon" icon unicode character.
-        /// </summary>
-        CloudMoon = 0xF6C3,
-
-        /// <summary>
-        /// The Font Awesome "cloud-moon-rain" icon unicode character.
-        /// </summary>
-        CloudMoonRain = 0xF73C,
-
-        /// <summary>
-        /// The Font Awesome "cloud-rain" icon unicode character.
-        /// </summary>
-        CloudRain = 0xF73D,
-
-        /// <summary>
-        /// The Font Awesome "cloudscale" icon unicode character.
-        /// </summary>
-        Cloudscale = 0xF383,
-
-        /// <summary>
-        /// The Font Awesome "cloud-showers-heavy" icon unicode character.
-        /// </summary>
-        CloudShowersHeavy = 0xF740,
-
-        /// <summary>
-        /// The Font Awesome "cloudsmith" icon unicode character.
-        /// </summary>
-        Cloudsmith = 0xF384,
-
-        /// <summary>
-        /// The Font Awesome "cloud-sun" icon unicode character.
-        /// </summary>
-        CloudSun = 0xF6C4,
-
-        /// <summary>
-        /// The Font Awesome "cloud-sun-rain" icon unicode character.
-        /// </summary>
-        CloudSunRain = 0xF743,
-
-        /// <summary>
-        /// The Font Awesome "cloud-upload-alt" icon unicode character.
-        /// </summary>
-        CloudUploadAlt = 0xF382,
-
-        /// <summary>
-        /// The Font Awesome "cloudversify" icon unicode character.
-        /// </summary>
-        Cloudversify = 0xF385,
-
-        /// <summary>
-        /// The Font Awesome "cocktail" icon unicode character.
-        /// </summary>
-        Cocktail = 0xF561,
-
-        /// <summary>
-        /// The Font Awesome "code" icon unicode character.
-        /// </summary>
-        Code = 0xF121,
-
-        /// <summary>
-        /// The Font Awesome "code-branch" icon unicode character.
-        /// </summary>
-        CodeBranch = 0xF126,
-
-        /// <summary>
-        /// The Font Awesome "codepen" icon unicode character.
-        /// </summary>
-        Codepen = 0xF1CB,
-
-        /// <summary>
-        /// The Font Awesome "codiepie" icon unicode character.
-        /// </summary>
-        Codiepie = 0xF284,
-
-        /// <summary>
-        /// The Font Awesome "coffee" icon unicode character.
-        /// </summary>
-        Coffee = 0xF0F4,
-
-        /// <summary>
-        /// The Font Awesome "cog" icon unicode character.
-        /// </summary>
-        Cog = 0xF013,
-
-        /// <summary>
-        /// The Font Awesome "cogs" icon unicode character.
-        /// </summary>
-        Cogs = 0xF085,
-
-        /// <summary>
-        /// The Font Awesome "coins" icon unicode character.
-        /// </summary>
-        Coins = 0xF51E,
-
-        /// <summary>
-        /// The Font Awesome "columns" icon unicode character.
-        /// </summary>
-        Columns = 0xF0DB,
-
-        /// <summary>
-        /// The Font Awesome "comment" icon unicode character.
-        /// </summary>
-        Comment = 0xF075,
-
-        /// <summary>
-        /// The Font Awesome "comment-alt" icon unicode character.
-        /// </summary>
-        CommentAlt = 0xF27A,
-
-        /// <summary>
-        /// The Font Awesome "comment-dollar" icon unicode character.
-        /// </summary>
-        CommentDollar = 0xF651,
-
-        /// <summary>
-        /// The Font Awesome "comment-dots" icon unicode character.
-        /// </summary>
-        CommentDots = 0xF4AD,
-
-        /// <summary>
-        /// The Font Awesome "comment-medical" icon unicode character.
-        /// </summary>
-        CommentMedical = 0xF7F5,
-
-        /// <summary>
-        /// The Font Awesome "comments" icon unicode character.
-        /// </summary>
-        Comments = 0xF086,
-
-        /// <summary>
-        /// The Font Awesome "comments-dollar" icon unicode character.
-        /// </summary>
-        CommentsDollar = 0xF653,
-
-        /// <summary>
-        /// The Font Awesome "comment-slash" icon unicode character.
-        /// </summary>
-        CommentSlash = 0xF4B3,
-
-        /// <summary>
-        /// The Font Awesome "compact-disc" icon unicode character.
-        /// </summary>
-        CompactDisc = 0xF51F,
-
-        /// <summary>
-        /// The Font Awesome "compass" icon unicode character.
-        /// </summary>
-        Compass = 0xF14E,
-
-        /// <summary>
-        /// The Font Awesome "compress" icon unicode character.
-        /// </summary>
-        Compress = 0xF066,
-
-        /// <summary>
-        /// The Font Awesome "compress-alt" icon unicode character.
-        /// </summary>
-        CompressAlt = 0xF422,
-
-        /// <summary>
-        /// The Font Awesome "compress-arrows-alt" icon unicode character.
-        /// </summary>
-        CompressArrowsAlt = 0xF78C,
-
-        /// <summary>
-        /// The Font Awesome "concierge-bell" icon unicode character.
-        /// </summary>
-        ConciergeBell = 0xF562,
-
-        /// <summary>
-        /// The Font Awesome "confluence" icon unicode character.
-        /// </summary>
-        Confluence = 0xF78D,
-
-        /// <summary>
-        /// The Font Awesome "connectdevelop" icon unicode character.
-        /// </summary>
-        Connectdevelop = 0xF20E,
-
-        /// <summary>
-        /// The Font Awesome "contao" icon unicode character.
-        /// </summary>
-        Contao = 0xF26D,
-
-        /// <summary>
-        /// The Font Awesome "cookie" icon unicode character.
-        /// </summary>
-        Cookie = 0xF563,
-
-        /// <summary>
-        /// The Font Awesome "cookie-bite" icon unicode character.
-        /// </summary>
-        CookieBite = 0xF564,
-
-        /// <summary>
-        /// The Font Awesome "copy" icon unicode character.
-        /// </summary>
-        Copy = 0xF0C5,
-
-        /// <summary>
-        /// The Font Awesome "copyright" icon unicode character.
-        /// </summary>
-        Copyright = 0xF1F9,
-
-        /// <summary>
-        /// The Font Awesome "cotton-bureau" icon unicode character.
-        /// </summary>
-        CottonBureau = 0xF89E,
-
-        /// <summary>
-        /// The Font Awesome "couch" icon unicode character.
-        /// </summary>
-        Couch = 0xF4B8,
-
-        /// <summary>
-        /// The Font Awesome "cpanel" icon unicode character.
-        /// </summary>
-        Cpanel = 0xF388,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons" icon unicode character.
-        /// </summary>
-        CreativeCommons = 0xF25E,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-by" icon unicode character.
-        /// </summary>
-        CreativeCommonsBy = 0xF4E7,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-nc" icon unicode character.
-        /// </summary>
-        CreativeCommonsNc = 0xF4E8,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-nc-eu" icon unicode character.
-        /// </summary>
-        CreativeCommonsNcEu = 0xF4E9,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-nc-jp" icon unicode character.
-        /// </summary>
-        CreativeCommonsNcJp = 0xF4EA,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-nd" icon unicode character.
-        /// </summary>
-        CreativeCommonsNd = 0xF4EB,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-pd" icon unicode character.
-        /// </summary>
-        CreativeCommonsPd = 0xF4EC,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-pd-alt" icon unicode character.
-        /// </summary>
-        CreativeCommonsPdAlt = 0xF4ED,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-remix" icon unicode character.
-        /// </summary>
-        CreativeCommonsRemix = 0xF4EE,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-sa" icon unicode character.
-        /// </summary>
-        CreativeCommonsSa = 0xF4EF,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-sampling" icon unicode character.
-        /// </summary>
-        CreativeCommonsSampling = 0xF4F0,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-sampling-plus" icon unicode character.
-        /// </summary>
-        CreativeCommonsSamplingPlus = 0xF4F1,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-share" icon unicode character.
-        /// </summary>
-        CreativeCommonsShare = 0xF4F2,
-
-        /// <summary>
-        /// The Font Awesome "creative-commons-zero" icon unicode character.
-        /// </summary>
-        CreativeCommonsZero = 0xF4F3,
-
-        /// <summary>
-        /// The Font Awesome "credit-card" icon unicode character.
-        /// </summary>
-        CreditCard = 0xF09D,
-
-        /// <summary>
-        /// The Font Awesome "critical-role" icon unicode character.
-        /// </summary>
-        CriticalRole = 0xF6C9,
-
-        /// <summary>
-        /// The Font Awesome "crop" icon unicode character.
-        /// </summary>
-        Crop = 0xF125,
-
-        /// <summary>
-        /// The Font Awesome "crop-alt" icon unicode character.
-        /// </summary>
-        CropAlt = 0xF565,
-
-        /// <summary>
-        /// The Font Awesome "cross" icon unicode character.
-        /// </summary>
-        Cross = 0xF654,
-
-        /// <summary>
-        /// The Font Awesome "crosshairs" icon unicode character.
-        /// </summary>
-        Crosshairs = 0xF05B,
-
-        /// <summary>
-        /// The Font Awesome "crow" icon unicode character.
-        /// </summary>
-        Crow = 0xF520,
-
-        /// <summary>
-        /// The Font Awesome "crown" icon unicode character.
-        /// </summary>
-        Crown = 0xF521,
-
-        /// <summary>
-        /// The Font Awesome "crutch" icon unicode character.
-        /// </summary>
-        Crutch = 0xF7F7,
-
-        /// <summary>
-        /// The Font Awesome "css3" icon unicode character.
-        /// </summary>
-        Css3 = 0xF13C,
-
-        /// <summary>
-        /// The Font Awesome "css3-alt" icon unicode character.
-        /// </summary>
-        Css3Alt = 0xF38B,
-
-        /// <summary>
-        /// The Font Awesome "cube" icon unicode character.
-        /// </summary>
-        Cube = 0xF1B2,
-
-        /// <summary>
-        /// The Font Awesome "cubes" icon unicode character.
-        /// </summary>
-        Cubes = 0xF1B3,
-
-        /// <summary>
-        /// The Font Awesome "cut" icon unicode character.
-        /// </summary>
-        Cut = 0xF0C4,
-
-        /// <summary>
-        /// The Font Awesome "cuttlefish" icon unicode character.
-        /// </summary>
-        Cuttlefish = 0xF38C,
-
-        /// <summary>
-        /// The Font Awesome "dailymotion" icon unicode character.
-        /// </summary>
-        Dailymotion = 0xF952,
-
-        /// <summary>
-        /// The Font Awesome "d-and-d" icon unicode character.
-        /// </summary>
-        DAndD = 0xF38D,
-
-        /// <summary>
-        /// The Font Awesome "d-and-d-beyond" icon unicode character.
-        /// </summary>
-        DAndDBeyond = 0xF6CA,
-
-        /// <summary>
-        /// The Font Awesome "dashcube" icon unicode character.
-        /// </summary>
-        Dashcube = 0xF210,
-
-        /// <summary>
-        /// The Font Awesome "database" icon unicode character.
-        /// </summary>
-        Database = 0xF1C0,
-
-        /// <summary>
-        /// The Font Awesome "deaf" icon unicode character.
-        /// </summary>
-        Deaf = 0xF2A4,
-
-        /// <summary>
-        /// The Font Awesome "delicious" icon unicode character.
-        /// </summary>
-        Delicious = 0xF1A5,
-
-        /// <summary>
-        /// The Font Awesome "democrat" icon unicode character.
-        /// </summary>
-        Democrat = 0xF747,
-
-        /// <summary>
-        /// The Font Awesome "deploydog" icon unicode character.
-        /// </summary>
-        Deploydog = 0xF38E,
-
-        /// <summary>
-        /// The Font Awesome "deskpro" icon unicode character.
-        /// </summary>
-        Deskpro = 0xF38F,
-
-        /// <summary>
-        /// The Font Awesome "desktop" icon unicode character.
-        /// </summary>
-        Desktop = 0xF108,
-
-        /// <summary>
-        /// The Font Awesome "dev" icon unicode character.
-        /// </summary>
-        Dev = 0xF6CC,
-
-        /// <summary>
-        /// The Font Awesome "deviantart" icon unicode character.
-        /// </summary>
-        Deviantart = 0xF1BD,
-
-        /// <summary>
-        /// The Font Awesome "dharmachakra" icon unicode character.
-        /// </summary>
-        Dharmachakra = 0xF655,
-
-        /// <summary>
-        /// The Font Awesome "dhl" icon unicode character.
-        /// </summary>
-        Dhl = 0xF790,
-
-        /// <summary>
-        /// The Font Awesome "diagnoses" icon unicode character.
-        /// </summary>
-        Diagnoses = 0xF470,
-
-        /// <summary>
-        /// The Font Awesome "diaspora" icon unicode character.
-        /// </summary>
-        Diaspora = 0xF791,
-
-        /// <summary>
-        /// The Font Awesome "dice" icon unicode character.
-        /// </summary>
-        Dice = 0xF522,
-
-        /// <summary>
-        /// The Font Awesome "dice-d20" icon unicode character.
-        /// </summary>
-        DiceD20 = 0xF6CF,
-
-        /// <summary>
-        /// The Font Awesome "dice-d6" icon unicode character.
-        /// </summary>
-        DiceD6 = 0xF6D1,
-
-        /// <summary>
-        /// The Font Awesome "dice-five" icon unicode character.
-        /// </summary>
-        DiceFive = 0xF523,
-
-        /// <summary>
-        /// The Font Awesome "dice-four" icon unicode character.
-        /// </summary>
-        DiceFour = 0xF524,
-
-        /// <summary>
-        /// The Font Awesome "dice-one" icon unicode character.
-        /// </summary>
-        DiceOne = 0xF525,
-
-        /// <summary>
-        /// The Font Awesome "dice-six" icon unicode character.
-        /// </summary>
-        DiceSix = 0xF526,
-
-        /// <summary>
-        /// The Font Awesome "dice-three" icon unicode character.
-        /// </summary>
-        DiceThree = 0xF527,
-
-        /// <summary>
-        /// The Font Awesome "dice-two" icon unicode character.
-        /// </summary>
-        DiceTwo = 0xF528,
-
-        /// <summary>
-        /// The Font Awesome "digg" icon unicode character.
-        /// </summary>
-        Digg = 0xF1A6,
-
-        /// <summary>
-        /// The Font Awesome "digital-ocean" icon unicode character.
-        /// </summary>
-        DigitalOcean = 0xF391,
-
-        /// <summary>
-        /// The Font Awesome "digital-tachograph" icon unicode character.
-        /// </summary>
-        DigitalTachograph = 0xF566,
-
-        /// <summary>
-        /// The Font Awesome "directions" icon unicode character.
-        /// </summary>
-        Directions = 0xF5EB,
-
-        /// <summary>
-        /// The Font Awesome "discord" icon unicode character.
-        /// </summary>
-        Discord = 0xF392,
-
-        /// <summary>
-        /// The Font Awesome "discourse" icon unicode character.
-        /// </summary>
-        Discourse = 0xF393,
-
-        /// <summary>
-        /// The Font Awesome "divide" icon unicode character.
-        /// </summary>
-        Divide = 0xF529,
-
-        /// <summary>
-        /// The Font Awesome "dizzy" icon unicode character.
-        /// </summary>
-        Dizzy = 0xF567,
-
-        /// <summary>
-        /// The Font Awesome "dna" icon unicode character.
-        /// </summary>
-        Dna = 0xF471,
-
-        /// <summary>
-        /// The Font Awesome "dochub" icon unicode character.
-        /// </summary>
-        Dochub = 0xF394,
-
-        /// <summary>
-        /// The Font Awesome "docker" icon unicode character.
-        /// </summary>
-        Docker = 0xF395,
-
-        /// <summary>
-        /// The Font Awesome "dog" icon unicode character.
-        /// </summary>
-        Dog = 0xF6D3,
-
-        /// <summary>
-        /// The Font Awesome "dollar-sign" icon unicode character.
-        /// </summary>
-        DollarSign = 0xF155,
-
-        /// <summary>
-        /// The Font Awesome "dolly" icon unicode character.
-        /// </summary>
-        Dolly = 0xF472,
-
-        /// <summary>
-        /// The Font Awesome "dolly-flatbed" icon unicode character.
-        /// </summary>
-        DollyFlatbed = 0xF474,
-
-        /// <summary>
-        /// The Font Awesome "donate" icon unicode character.
-        /// </summary>
-        Donate = 0xF4B9,
-
-        /// <summary>
-        /// The Font Awesome "door-closed" icon unicode character.
-        /// </summary>
-        DoorClosed = 0xF52A,
-
-        /// <summary>
-        /// The Font Awesome "door-open" icon unicode character.
-        /// </summary>
-        DoorOpen = 0xF52B,
-
-        /// <summary>
-        /// The Font Awesome "dot-circle" icon unicode character.
-        /// </summary>
-        DotCircle = 0xF192,
-
-        /// <summary>
-        /// The Font Awesome "dove" icon unicode character.
-        /// </summary>
-        Dove = 0xF4BA,
-
-        /// <summary>
-        /// The Font Awesome "download" icon unicode character.
-        /// </summary>
-        Download = 0xF019,
-
-        /// <summary>
-        /// The Font Awesome "draft2digital" icon unicode character.
-        /// </summary>
-        Draft2digital = 0xF396,
-
-        /// <summary>
-        /// The Font Awesome "drafting-compass" icon unicode character.
-        /// </summary>
-        DraftingCompass = 0xF568,
-
-        /// <summary>
-        /// The Font Awesome "dragon" icon unicode character.
-        /// </summary>
-        Dragon = 0xF6D5,
-
-        /// <summary>
-        /// The Font Awesome "draw-polygon" icon unicode character.
-        /// </summary>
-        DrawPolygon = 0xF5EE,
-
-        /// <summary>
-        /// The Font Awesome "dribbble" icon unicode character.
-        /// </summary>
-        Dribbble = 0xF17D,
-
-        /// <summary>
-        /// The Font Awesome "dribbble-square" icon unicode character.
-        /// </summary>
-        DribbbleSquare = 0xF397,
-
-        /// <summary>
-        /// The Font Awesome "dropbox" icon unicode character.
-        /// </summary>
-        Dropbox = 0xF16B,
-
-        /// <summary>
-        /// The Font Awesome "drum" icon unicode character.
-        /// </summary>
-        Drum = 0xF569,
-
-        /// <summary>
-        /// The Font Awesome "drum-steelpan" icon unicode character.
-        /// </summary>
-        DrumSteelpan = 0xF56A,
-
-        /// <summary>
-        /// The Font Awesome "drumstick-bite" icon unicode character.
-        /// </summary>
-        DrumstickBite = 0xF6D7,
-
-        /// <summary>
-        /// The Font Awesome "drupal" icon unicode character.
-        /// </summary>
-        Drupal = 0xF1A9,
-
-        /// <summary>
-        /// The Font Awesome "dumbbell" icon unicode character.
-        /// </summary>
-        Dumbbell = 0xF44B,
-
-        /// <summary>
-        /// The Font Awesome "dumpster" icon unicode character.
-        /// </summary>
-        Dumpster = 0xF793,
-
-        /// <summary>
-        /// The Font Awesome "dumpster-fire" icon unicode character.
-        /// </summary>
-        DumpsterFire = 0xF794,
-
-        /// <summary>
-        /// The Font Awesome "dungeon" icon unicode character.
-        /// </summary>
-        Dungeon = 0xF6D9,
-
-        /// <summary>
-        /// The Font Awesome "dyalog" icon unicode character.
-        /// </summary>
-        Dyalog = 0xF399,
-
-        /// <summary>
-        /// The Font Awesome "earlybirds" icon unicode character.
-        /// </summary>
-        Earlybirds = 0xF39A,
-
-        /// <summary>
-        /// The Font Awesome "ebay" icon unicode character.
-        /// </summary>
-        Ebay = 0xF4F4,
-
-        /// <summary>
-        /// The Font Awesome "edge" icon unicode character.
-        /// </summary>
-        Edge = 0xF282,
-
-        /// <summary>
-        /// The Font Awesome "edit" icon unicode character.
-        /// </summary>
-        Edit = 0xF044,
-
-        /// <summary>
-        /// The Font Awesome "egg" icon unicode character.
-        /// </summary>
-        Egg = 0xF7FB,
-
-        /// <summary>
-        /// The Font Awesome "eject" icon unicode character.
-        /// </summary>
-        Eject = 0xF052,
-
-        /// <summary>
-        /// The Font Awesome "elementor" icon unicode character.
-        /// </summary>
-        Elementor = 0xF430,
-
-        /// <summary>
-        /// The Font Awesome "ellipsis-h" icon unicode character.
-        /// </summary>
-        EllipsisH = 0xF141,
-
-        /// <summary>
-        /// The Font Awesome "ellipsis-v" icon unicode character.
-        /// </summary>
-        EllipsisV = 0xF142,
-
-        /// <summary>
-        /// The Font Awesome "ello" icon unicode character.
-        /// </summary>
-        Ello = 0xF5F1,
-
-        /// <summary>
-        /// The Font Awesome "ember" icon unicode character.
-        /// </summary>
-        Ember = 0xF423,
-
-        /// <summary>
-        /// The Font Awesome "empire" icon unicode character.
-        /// </summary>
-        Empire = 0xF1D1,
-
-        /// <summary>
-        /// The Font Awesome "envelope" icon unicode character.
-        /// </summary>
-        Envelope = 0xF0E0,
-
-        /// <summary>
-        /// The Font Awesome "envelope-open" icon unicode character.
-        /// </summary>
-        EnvelopeOpen = 0xF2B6,
-
-        /// <summary>
-        /// The Font Awesome "envelope-open-text" icon unicode character.
-        /// </summary>
-        EnvelopeOpenText = 0xF658,
-
-        /// <summary>
-        /// The Font Awesome "envelope-square" icon unicode character.
-        /// </summary>
-        EnvelopeSquare = 0xF199,
-
-        /// <summary>
-        /// The Font Awesome "envira" icon unicode character.
-        /// </summary>
-        Envira = 0xF299,
-
-        /// <summary>
-        /// The Font Awesome "equals" icon unicode character.
-        /// </summary>
-        Equals = 0xF52C,
-
-        /// <summary>
-        /// The Font Awesome "eraser" icon unicode character.
-        /// </summary>
-        Eraser = 0xF12D,
-
-        /// <summary>
-        /// The Font Awesome "erlang" icon unicode character.
-        /// </summary>
-        Erlang = 0xF39D,
-
-        /// <summary>
-        /// The Font Awesome "ethereum" icon unicode character.
-        /// </summary>
-        Ethereum = 0xF42E,
-
-        /// <summary>
-        /// The Font Awesome "ethernet" icon unicode character.
-        /// </summary>
-        Ethernet = 0xF796,
-
-        /// <summary>
-        /// The Font Awesome "etsy" icon unicode character.
-        /// </summary>
-        Etsy = 0xF2D7,
-
-        /// <summary>
-        /// The Font Awesome "euro-sign" icon unicode character.
-        /// </summary>
-        EuroSign = 0xF153,
-
-        /// <summary>
-        /// The Font Awesome "evernote" icon unicode character.
-        /// </summary>
-        Evernote = 0xF839,
-
-        /// <summary>
-        /// The Font Awesome "exchange-alt" icon unicode character.
-        /// </summary>
-        ExchangeAlt = 0xF362,
-
-        /// <summary>
-        /// The Font Awesome "exclamation" icon unicode character.
-        /// </summary>
-        Exclamation = 0xF12A,
-
-        /// <summary>
-        /// The Font Awesome "exclamation-circle" icon unicode character.
-        /// </summary>
-        ExclamationCircle = 0xF06A,
-
-        /// <summary>
-        /// The Font Awesome "exclamation-triangle" icon unicode character.
-        /// </summary>
-        ExclamationTriangle = 0xF071,
-
-        /// <summary>
-        /// The Font Awesome "expand" icon unicode character.
-        /// </summary>
-        Expand = 0xF065,
-
-        /// <summary>
-        /// The Font Awesome "expand-alt" icon unicode character.
-        /// </summary>
-        ExpandAlt = 0xF424,
-
-        /// <summary>
-        /// The Font Awesome "expand-arrows-alt" icon unicode character.
-        /// </summary>
-        ExpandArrowsAlt = 0xF31E,
-
-        /// <summary>
-        /// The Font Awesome "expeditedssl" icon unicode character.
-        /// </summary>
-        Expeditedssl = 0xF23E,
-
-        /// <summary>
-        /// The Font Awesome "external-link-alt" icon unicode character.
-        /// </summary>
-        ExternalLinkAlt = 0xF35D,
-
-        /// <summary>
-        /// The Font Awesome "external-link-square-alt" icon unicode character.
-        /// </summary>
-        ExternalLinkSquareAlt = 0xF360,
-
-        /// <summary>
-        /// The Font Awesome "eye" icon unicode character.
-        /// </summary>
-        Eye = 0xF06E,
-
-        /// <summary>
-        /// The Font Awesome "eye-dropper" icon unicode character.
-        /// </summary>
-        EyeDropper = 0xF1FB,
-
-        /// <summary>
-        /// The Font Awesome "eye-slash" icon unicode character.
-        /// </summary>
-        EyeSlash = 0xF070,
-
-        /// <summary>
-        /// The Font Awesome "facebook" icon unicode character.
-        /// </summary>
-        Facebook = 0xF09A,
-
-        /// <summary>
-        /// The Font Awesome "facebook-f" icon unicode character.
-        /// </summary>
-        FacebookF = 0xF39E,
-
-        /// <summary>
-        /// The Font Awesome "facebook-messenger" icon unicode character.
-        /// </summary>
-        FacebookMessenger = 0xF39F,
-
-        /// <summary>
-        /// The Font Awesome "facebook-square" icon unicode character.
-        /// </summary>
-        FacebookSquare = 0xF082,
-
-        /// <summary>
-        /// The Font Awesome "fan" icon unicode character.
-        /// </summary>
-        Fan = 0xF863,
-
-        /// <summary>
-        /// The Font Awesome "fantasy-flight-games" icon unicode character.
-        /// </summary>
-        FantasyFlightGames = 0xF6DC,
-
-        /// <summary>
-        /// The Font Awesome "fast-backward" icon unicode character.
-        /// </summary>
-        FastBackward = 0xF049,
-
-        /// <summary>
-        /// The Font Awesome "fast-forward" icon unicode character.
-        /// </summary>
-        FastForward = 0xF050,
-
-        /// <summary>
-        /// The Font Awesome "fax" icon unicode character.
-        /// </summary>
-        Fax = 0xF1AC,
-
-        /// <summary>
-        /// The Font Awesome "feather" icon unicode character.
-        /// </summary>
-        Feather = 0xF52D,
-
-        /// <summary>
-        /// The Font Awesome "feather-alt" icon unicode character.
-        /// </summary>
-        FeatherAlt = 0xF56B,
-
-        /// <summary>
-        /// The Font Awesome "fedex" icon unicode character.
-        /// </summary>
-        Fedex = 0xF797,
-
-        /// <summary>
-        /// The Font Awesome "fedora" icon unicode character.
-        /// </summary>
-        Fedora = 0xF798,
-
-        /// <summary>
-        /// The Font Awesome "female" icon unicode character.
-        /// </summary>
-        Female = 0xF182,
-
-        /// <summary>
-        /// The Font Awesome "fighter-jet" icon unicode character.
-        /// </summary>
-        FighterJet = 0xF0FB,
-
-        /// <summary>
-        /// The Font Awesome "figma" icon unicode character.
-        /// </summary>
-        Figma = 0xF799,
-
-        /// <summary>
-        /// The Font Awesome "file" icon unicode character.
-        /// </summary>
-        File = 0xF15B,
-
-        /// <summary>
-        /// The Font Awesome "file-alt" icon unicode character.
-        /// </summary>
-        FileAlt = 0xF15C,
-
-        /// <summary>
-        /// The Font Awesome "file-archive" icon unicode character.
-        /// </summary>
-        FileArchive = 0xF1C6,
-
-        /// <summary>
-        /// The Font Awesome "file-audio" icon unicode character.
-        /// </summary>
-        FileAudio = 0xF1C7,
-
-        /// <summary>
-        /// The Font Awesome "file-code" icon unicode character.
-        /// </summary>
-        FileCode = 0xF1C9,
-
-        /// <summary>
-        /// The Font Awesome "file-contract" icon unicode character.
-        /// </summary>
-        FileContract = 0xF56C,
-
-        /// <summary>
-        /// The Font Awesome "file-csv" icon unicode character.
-        /// </summary>
-        FileCsv = 0xF6DD,
-
-        /// <summary>
-        /// The Font Awesome "file-download" icon unicode character.
-        /// </summary>
-        FileDownload = 0xF56D,
-
-        /// <summary>
-        /// The Font Awesome "file-excel" icon unicode character.
-        /// </summary>
-        FileExcel = 0xF1C3,
-
-        /// <summary>
-        /// The Font Awesome "file-export" icon unicode character.
-        /// </summary>
-        FileExport = 0xF56E,
-
-        /// <summary>
-        /// The Font Awesome "file-image" icon unicode character.
-        /// </summary>
-        FileImage = 0xF1C5,
-
-        /// <summary>
-        /// The Font Awesome "file-import" icon unicode character.
-        /// </summary>
-        FileImport = 0xF56F,
-
-        /// <summary>
-        /// The Font Awesome "file-invoice" icon unicode character.
-        /// </summary>
-        FileInvoice = 0xF570,
-
-        /// <summary>
-        /// The Font Awesome "file-invoice-dollar" icon unicode character.
-        /// </summary>
-        FileInvoiceDollar = 0xF571,
-
-        /// <summary>
-        /// The Font Awesome "file-medical" icon unicode character.
-        /// </summary>
-        FileMedical = 0xF477,
-
-        /// <summary>
-        /// The Font Awesome "file-medical-alt" icon unicode character.
-        /// </summary>
-        FileMedicalAlt = 0xF478,
-
-        /// <summary>
-        /// The Font Awesome "file-pdf" icon unicode character.
-        /// </summary>
-        FilePdf = 0xF1C1,
-
-        /// <summary>
-        /// The Font Awesome "file-powerpoint" icon unicode character.
-        /// </summary>
-        FilePowerpoint = 0xF1C4,
-
-        /// <summary>
-        /// The Font Awesome "file-prescription" icon unicode character.
-        /// </summary>
-        FilePrescription = 0xF572,
-
-        /// <summary>
-        /// The Font Awesome "file-signature" icon unicode character.
-        /// </summary>
-        FileSignature = 0xF573,
-
-        /// <summary>
-        /// The Font Awesome "file-upload" icon unicode character.
-        /// </summary>
-        FileUpload = 0xF574,
-
-        /// <summary>
-        /// The Font Awesome "file-video" icon unicode character.
-        /// </summary>
-        FileVideo = 0xF1C8,
-
-        /// <summary>
-        /// The Font Awesome "file-word" icon unicode character.
-        /// </summary>
-        FileWord = 0xF1C2,
-
-        /// <summary>
-        /// The Font Awesome "fill" icon unicode character.
-        /// </summary>
-        Fill = 0xF575,
-
-        /// <summary>
-        /// The Font Awesome "fill-drip" icon unicode character.
-        /// </summary>
-        FillDrip = 0xF576,
-
-        /// <summary>
-        /// The Font Awesome "film" icon unicode character.
-        /// </summary>
-        Film = 0xF008,
-
-        /// <summary>
-        /// The Font Awesome "filter" icon unicode character.
-        /// </summary>
-        Filter = 0xF0B0,
-
-        /// <summary>
-        /// The Font Awesome "fingerprint" icon unicode character.
-        /// </summary>
-        Fingerprint = 0xF577,
-
-        /// <summary>
-        /// The Font Awesome "fire" icon unicode character.
-        /// </summary>
-        Fire = 0xF06D,
-
-        /// <summary>
-        /// The Font Awesome "fire-alt" icon unicode character.
-        /// </summary>
-        FireAlt = 0xF7E4,
-
-        /// <summary>
-        /// The Font Awesome "fire-extinguisher" icon unicode character.
-        /// </summary>
-        FireExtinguisher = 0xF134,
-
-        /// <summary>
-        /// The Font Awesome "firefox" icon unicode character.
-        /// </summary>
-        Firefox = 0xF269,
-
-        /// <summary>
-        /// The Font Awesome "firefox-browser" icon unicode character.
-        /// </summary>
-        FirefoxBrowser = 0xF907,
-
-        /// <summary>
-        /// The Font Awesome "first-aid" icon unicode character.
-        /// </summary>
-        FirstAid = 0xF479,
-
-        /// <summary>
-        /// The Font Awesome "firstdraft" icon unicode character.
-        /// </summary>
-        Firstdraft = 0xF3A1,
-
-        /// <summary>
-        /// The Font Awesome "first-order" icon unicode character.
-        /// </summary>
-        FirstOrder = 0xF2B0,
-
-        /// <summary>
-        /// The Font Awesome "first-order-alt" icon unicode character.
-        /// </summary>
-        FirstOrderAlt = 0xF50A,
-
-        /// <summary>
-        /// The Font Awesome "fish" icon unicode character.
-        /// </summary>
-        Fish = 0xF578,
-
-        /// <summary>
-        /// The Font Awesome "fist-raised" icon unicode character.
-        /// </summary>
-        FistRaised = 0xF6DE,
-
-        /// <summary>
-        /// The Font Awesome "flag" icon unicode character.
-        /// </summary>
-        Flag = 0xF024,
-
-        /// <summary>
-        /// The Font Awesome "flag-checkered" icon unicode character.
-        /// </summary>
-        FlagCheckered = 0xF11E,
-
-        /// <summary>
-        /// The Font Awesome "flag-usa" icon unicode character.
-        /// </summary>
-        FlagUsa = 0xF74D,
-
-        /// <summary>
-        /// The Font Awesome "flask" icon unicode character.
-        /// </summary>
-        Flask = 0xF0C3,
-
-        /// <summary>
-        /// The Font Awesome "flickr" icon unicode character.
-        /// </summary>
-        Flickr = 0xF16E,
-
-        /// <summary>
-        /// The Font Awesome "flipboard" icon unicode character.
-        /// </summary>
-        Flipboard = 0xF44D,
-
-        /// <summary>
-        /// The Font Awesome "flushed" icon unicode character.
-        /// </summary>
-        Flushed = 0xF579,
-
-        /// <summary>
-        /// The Font Awesome "fly" icon unicode character.
-        /// </summary>
-        Fly = 0xF417,
-
-        /// <summary>
-        /// The Font Awesome "folder" icon unicode character.
-        /// </summary>
-        Folder = 0xF07B,
-
-        /// <summary>
-        /// The Font Awesome "folder-minus" icon unicode character.
-        /// </summary>
-        FolderMinus = 0xF65D,
-
-        /// <summary>
-        /// The Font Awesome "folder-open" icon unicode character.
-        /// </summary>
-        FolderOpen = 0xF07C,
-
-        /// <summary>
-        /// The Font Awesome "folder-plus" icon unicode character.
-        /// </summary>
-        FolderPlus = 0xF65E,
-
-        /// <summary>
-        /// The Font Awesome "font" icon unicode character.
-        /// </summary>
-        Font = 0xF031,
-
-        /// <summary>
-        /// The Font Awesome "font-awesome" icon unicode character.
-        /// </summary>
-        FontAwesome = 0xF2B4,
-
-        /// <summary>
-        /// The Font Awesome "font-awesome-alt" icon unicode character.
-        /// </summary>
-        FontAwesomeAlt = 0xF35C,
-
-        /// <summary>
-        /// The Font Awesome "font-awesome-flag" icon unicode character.
-        /// </summary>
-        FontAwesomeFlag = 0xF425,
-
-        /// <summary>
-        /// The Font Awesome "font-awesome-logo-full" icon unicode character.
-        /// </summary>
-        FontAwesomeLogoFull = 0xF4E6,
-
-        /// <summary>
-        /// The Font Awesome "fonticons" icon unicode character.
-        /// </summary>
-        Fonticons = 0xF280,
-
-        /// <summary>
-        /// The Font Awesome "fonticons-fi" icon unicode character.
-        /// </summary>
-        FonticonsFi = 0xF3A2,
-
-        /// <summary>
-        /// The Font Awesome "football-ball" icon unicode character.
-        /// </summary>
-        FootballBall = 0xF44E,
-
-        /// <summary>
-        /// The Font Awesome "fort-awesome" icon unicode character.
-        /// </summary>
-        FortAwesome = 0xF286,
-
-        /// <summary>
-        /// The Font Awesome "fort-awesome-alt" icon unicode character.
-        /// </summary>
-        FortAwesomeAlt = 0xF3A3,
-
-        /// <summary>
-        /// The Font Awesome "forumbee" icon unicode character.
-        /// </summary>
-        Forumbee = 0xF211,
-
-        /// <summary>
-        /// The Font Awesome "forward" icon unicode character.
-        /// </summary>
-        Forward = 0xF04E,
-
-        /// <summary>
-        /// The Font Awesome "foursquare" icon unicode character.
-        /// </summary>
-        Foursquare = 0xF180,
-
-        /// <summary>
-        /// The Font Awesome "freebsd" icon unicode character.
-        /// </summary>
-        Freebsd = 0xF3A4,
-
-        /// <summary>
-        /// The Font Awesome "free-code-camp" icon unicode character.
-        /// </summary>
-        FreeCodeCamp = 0xF2C5,
-
-        /// <summary>
-        /// The Font Awesome "frog" icon unicode character.
-        /// </summary>
-        Frog = 0xF52E,
-
-        /// <summary>
-        /// The Font Awesome "frown" icon unicode character.
-        /// </summary>
-        Frown = 0xF119,
-
-        /// <summary>
-        /// The Font Awesome "frown-open" icon unicode character.
-        /// </summary>
-        FrownOpen = 0xF57A,
-
-        /// <summary>
-        /// The Font Awesome "fulcrum" icon unicode character.
-        /// </summary>
-        Fulcrum = 0xF50B,
-
-        /// <summary>
-        /// The Font Awesome "funnel-dollar" icon unicode character.
-        /// </summary>
-        FunnelDollar = 0xF662,
-
-        /// <summary>
-        /// The Font Awesome "futbol" icon unicode character.
-        /// </summary>
-        Futbol = 0xF1E3,
-
-        /// <summary>
-        /// The Font Awesome "galactic-republic" icon unicode character.
-        /// </summary>
-        GalacticRepublic = 0xF50C,
-
-        /// <summary>
-        /// The Font Awesome "galactic-senate" icon unicode character.
-        /// </summary>
-        GalacticSenate = 0xF50D,
-
-        /// <summary>
-        /// The Font Awesome "gamepad" icon unicode character.
-        /// </summary>
-        Gamepad = 0xF11B,
-
-        /// <summary>
-        /// The Font Awesome "gas-pump" icon unicode character.
-        /// </summary>
-        GasPump = 0xF52F,
-
-        /// <summary>
-        /// The Font Awesome "gavel" icon unicode character.
-        /// </summary>
-        Gavel = 0xF0E3,
-
-        /// <summary>
-        /// The Font Awesome "gem" icon unicode character.
-        /// </summary>
-        Gem = 0xF3A5,
-
-        /// <summary>
-        /// The Font Awesome "genderless" icon unicode character.
-        /// </summary>
-        Genderless = 0xF22D,
-
-        /// <summary>
-        /// The Font Awesome "get-pocket" icon unicode character.
-        /// </summary>
-        GetPocket = 0xF265,
-
-        /// <summary>
-        /// The Font Awesome "gg" icon unicode character.
-        /// </summary>
-        Gg = 0xF260,
-
-        /// <summary>
-        /// The Font Awesome "gg-circle" icon unicode character.
-        /// </summary>
-        GgCircle = 0xF261,
-
-        /// <summary>
-        /// The Font Awesome "ghost" icon unicode character.
-        /// </summary>
-        Ghost = 0xF6E2,
-
-        /// <summary>
-        /// The Font Awesome "gift" icon unicode character.
-        /// </summary>
-        Gift = 0xF06B,
-
-        /// <summary>
-        /// The Font Awesome "gifts" icon unicode character.
-        /// </summary>
-        Gifts = 0xF79C,
-
-        /// <summary>
-        /// The Font Awesome "git" icon unicode character.
-        /// </summary>
-        Git = 0xF1D3,
-
-        /// <summary>
-        /// The Font Awesome "git-alt" icon unicode character.
-        /// </summary>
-        GitAlt = 0xF841,
-
-        /// <summary>
-        /// The Font Awesome "github" icon unicode character.
-        /// </summary>
-        Github = 0xF09B,
-
-        /// <summary>
-        /// The Font Awesome "github-alt" icon unicode character.
-        /// </summary>
-        GithubAlt = 0xF113,
-
-        /// <summary>
-        /// The Font Awesome "github-square" icon unicode character.
-        /// </summary>
-        GithubSquare = 0xF092,
-
-        /// <summary>
-        /// The Font Awesome "gitkraken" icon unicode character.
-        /// </summary>
-        Gitkraken = 0xF3A6,
-
-        /// <summary>
-        /// The Font Awesome "gitlab" icon unicode character.
-        /// </summary>
-        Gitlab = 0xF296,
-
-        /// <summary>
-        /// The Font Awesome "git-square" icon unicode character.
-        /// </summary>
-        GitSquare = 0xF1D2,
-
-        /// <summary>
-        /// The Font Awesome "gitter" icon unicode character.
-        /// </summary>
-        Gitter = 0xF426,
-
-        /// <summary>
-        /// The Font Awesome "glass-cheers" icon unicode character.
-        /// </summary>
-        GlassCheers = 0xF79F,
-
-        /// <summary>
-        /// The Font Awesome "glasses" icon unicode character.
-        /// </summary>
-        Glasses = 0xF530,
-
-        /// <summary>
-        /// The Font Awesome "glass-martini" icon unicode character.
-        /// </summary>
-        GlassMartini = 0xF000,
-
-        /// <summary>
-        /// The Font Awesome "glass-martini-alt" icon unicode character.
-        /// </summary>
-        GlassMartiniAlt = 0xF57B,
-
-        /// <summary>
-        /// The Font Awesome "glass-whiskey" icon unicode character.
-        /// </summary>
-        GlassWhiskey = 0xF7A0,
-
-        /// <summary>
-        /// The Font Awesome "glide" icon unicode character.
-        /// </summary>
-        Glide = 0xF2A5,
-
-        /// <summary>
-        /// The Font Awesome "glide-g" icon unicode character.
-        /// </summary>
-        GlideG = 0xF2A6,
-
-        /// <summary>
-        /// The Font Awesome "globe" icon unicode character.
-        /// </summary>
-        Globe = 0xF0AC,
-
-        /// <summary>
-        /// The Font Awesome "globe-africa" icon unicode character.
-        /// </summary>
-        GlobeAfrica = 0xF57C,
-
-        /// <summary>
-        /// The Font Awesome "globe-americas" icon unicode character.
-        /// </summary>
-        GlobeAmericas = 0xF57D,
-
-        /// <summary>
-        /// The Font Awesome "globe-asia" icon unicode character.
-        /// </summary>
-        GlobeAsia = 0xF57E,
-
-        /// <summary>
-        /// The Font Awesome "globe-europe" icon unicode character.
-        /// </summary>
-        GlobeEurope = 0xF7A2,
-
-        /// <summary>
-        /// The Font Awesome "gofore" icon unicode character.
-        /// </summary>
-        Gofore = 0xF3A7,
-
-        /// <summary>
-        /// The Font Awesome "golf-ball" icon unicode character.
-        /// </summary>
-        GolfBall = 0xF450,
-
-        /// <summary>
-        /// The Font Awesome "goodreads" icon unicode character.
-        /// </summary>
-        Goodreads = 0xF3A8,
-
-        /// <summary>
-        /// The Font Awesome "goodreads-g" icon unicode character.
-        /// </summary>
-        GoodreadsG = 0xF3A9,
-
-        /// <summary>
-        /// The Font Awesome "google" icon unicode character.
-        /// </summary>
-        Google = 0xF1A0,
-
-        /// <summary>
-        /// The Font Awesome "google-drive" icon unicode character.
-        /// </summary>
-        GoogleDrive = 0xF3AA,
-
-        /// <summary>
-        /// The Font Awesome "google-play" icon unicode character.
-        /// </summary>
-        GooglePlay = 0xF3AB,
-
-        /// <summary>
-        /// The Font Awesome "google-plus" icon unicode character.
-        /// </summary>
-        GooglePlus = 0xF2B3,
-
-        /// <summary>
-        /// The Font Awesome "google-plus-g" icon unicode character.
-        /// </summary>
-        GooglePlusG = 0xF0D5,
-
-        /// <summary>
-        /// The Font Awesome "google-plus-square" icon unicode character.
-        /// </summary>
-        GooglePlusSquare = 0xF0D4,
-
-        /// <summary>
-        /// The Font Awesome "google-wallet" icon unicode character.
-        /// </summary>
-        GoogleWallet = 0xF1EE,
-
-        /// <summary>
-        /// The Font Awesome "gopuram" icon unicode character.
-        /// </summary>
-        Gopuram = 0xF664,
-
-        /// <summary>
-        /// The Font Awesome "graduation-cap" icon unicode character.
-        /// </summary>
-        GraduationCap = 0xF19D,
-
-        /// <summary>
-        /// The Font Awesome "gratipay" icon unicode character.
-        /// </summary>
-        Gratipay = 0xF184,
-
-        /// <summary>
-        /// The Font Awesome "grav" icon unicode character.
-        /// </summary>
-        Grav = 0xF2D6,
-
-        /// <summary>
-        /// The Font Awesome "greater-than" icon unicode character.
-        /// </summary>
-        GreaterThan = 0xF531,
-
-        /// <summary>
-        /// The Font Awesome "greater-than-equal" icon unicode character.
-        /// </summary>
-        GreaterThanEqual = 0xF532,
-
-        /// <summary>
-        /// The Font Awesome "grimace" icon unicode character.
-        /// </summary>
-        Grimace = 0xF57F,
-
-        /// <summary>
-        /// The Font Awesome "grin" icon unicode character.
-        /// </summary>
-        Grin = 0xF580,
-
-        /// <summary>
-        /// The Font Awesome "grin-alt" icon unicode character.
-        /// </summary>
-        GrinAlt = 0xF581,
-
-        /// <summary>
-        /// The Font Awesome "grin-beam" icon unicode character.
-        /// </summary>
-        GrinBeam = 0xF582,
-
-        /// <summary>
-        /// The Font Awesome "grin-beam-sweat" icon unicode character.
-        /// </summary>
-        GrinBeamSweat = 0xF583,
-
-        /// <summary>
-        /// The Font Awesome "grin-hearts" icon unicode character.
-        /// </summary>
-        GrinHearts = 0xF584,
-
-        /// <summary>
-        /// The Font Awesome "grin-squint" icon unicode character.
-        /// </summary>
-        GrinSquint = 0xF585,
-
-        /// <summary>
-        /// The Font Awesome "grin-squint-tears" icon unicode character.
-        /// </summary>
-        GrinSquintTears = 0xF586,
-
-        /// <summary>
-        /// The Font Awesome "grin-stars" icon unicode character.
-        /// </summary>
-        GrinStars = 0xF587,
-
-        /// <summary>
-        /// The Font Awesome "grin-tears" icon unicode character.
-        /// </summary>
-        GrinTears = 0xF588,
-
-        /// <summary>
-        /// The Font Awesome "grin-tongue" icon unicode character.
-        /// </summary>
-        GrinTongue = 0xF589,
-
-        /// <summary>
-        /// The Font Awesome "grin-tongue-squint" icon unicode character.
-        /// </summary>
-        GrinTongueSquint = 0xF58A,
-
-        /// <summary>
-        /// The Font Awesome "grin-tongue-wink" icon unicode character.
-        /// </summary>
-        GrinTongueWink = 0xF58B,
-
-        /// <summary>
-        /// The Font Awesome "grin-wink" icon unicode character.
-        /// </summary>
-        GrinWink = 0xF58C,
-
-        /// <summary>
-        /// The Font Awesome "gripfire" icon unicode character.
-        /// </summary>
-        Gripfire = 0xF3AC,
-
-        /// <summary>
-        /// The Font Awesome "grip-horizontal" icon unicode character.
-        /// </summary>
-        GripHorizontal = 0xF58D,
-
-        /// <summary>
-        /// The Font Awesome "grip-lines" icon unicode character.
-        /// </summary>
-        GripLines = 0xF7A4,
-
-        /// <summary>
-        /// The Font Awesome "grip-lines-vertical" icon unicode character.
-        /// </summary>
-        GripLinesVertical = 0xF7A5,
-
-        /// <summary>
-        /// The Font Awesome "grip-vertical" icon unicode character.
-        /// </summary>
-        GripVertical = 0xF58E,
-
-        /// <summary>
-        /// The Font Awesome "grunt" icon unicode character.
-        /// </summary>
-        Grunt = 0xF3AD,
-
-        /// <summary>
-        /// The Font Awesome "guitar" icon unicode character.
-        /// </summary>
-        Guitar = 0xF7A6,
-
-        /// <summary>
-        /// The Font Awesome "gulp" icon unicode character.
-        /// </summary>
-        Gulp = 0xF3AE,
-
-        /// <summary>
-        /// The Font Awesome "hacker-news" icon unicode character.
-        /// </summary>
-        HackerNews = 0xF1D4,
-
-        /// <summary>
-        /// The Font Awesome "hacker-news-square" icon unicode character.
-        /// </summary>
-        HackerNewsSquare = 0xF3AF,
-
-        /// <summary>
-        /// The Font Awesome "hackerrank" icon unicode character.
-        /// </summary>
-        Hackerrank = 0xF5F7,
-
-        /// <summary>
-        /// The Font Awesome "hamburger" icon unicode character.
-        /// </summary>
-        Hamburger = 0xF805,
-
-        /// <summary>
-        /// The Font Awesome "hammer" icon unicode character.
-        /// </summary>
-        Hammer = 0xF6E3,
-
-        /// <summary>
-        /// The Font Awesome "hamsa" icon unicode character.
-        /// </summary>
-        Hamsa = 0xF665,
-
-        /// <summary>
-        /// The Font Awesome "hand-holding" icon unicode character.
-        /// </summary>
-        HandHolding = 0xF4BD,
-
-        /// <summary>
-        /// The Font Awesome "hand-holding-heart" icon unicode character.
-        /// </summary>
-        HandHoldingHeart = 0xF4BE,
-
-        /// <summary>
-        /// The Font Awesome "hand-holding-usd" icon unicode character.
-        /// </summary>
-        HandHoldingUsd = 0xF4C0,
-
-        /// <summary>
-        /// The Font Awesome "hand-lizard" icon unicode character.
-        /// </summary>
-        HandLizard = 0xF258,
-
-        /// <summary>
-        /// The Font Awesome "hand-middle-finger" icon unicode character.
-        /// </summary>
-        HandMiddleFinger = 0xF806,
-
-        /// <summary>
-        /// The Font Awesome "hand-paper" icon unicode character.
-        /// </summary>
-        HandPaper = 0xF256,
-
-        /// <summary>
-        /// The Font Awesome "hand-peace" icon unicode character.
-        /// </summary>
-        HandPeace = 0xF25B,
-
-        /// <summary>
-        /// The Font Awesome "hand-point-down" icon unicode character.
-        /// </summary>
-        HandPointDown = 0xF0A7,
-
-        /// <summary>
-        /// The Font Awesome "hand-pointer" icon unicode character.
-        /// </summary>
-        HandPointer = 0xF25A,
-
-        /// <summary>
-        /// The Font Awesome "hand-point-left" icon unicode character.
-        /// </summary>
-        HandPointLeft = 0xF0A5,
-
-        /// <summary>
-        /// The Font Awesome "hand-point-right" icon unicode character.
-        /// </summary>
-        HandPointRight = 0xF0A4,
-
-        /// <summary>
-        /// The Font Awesome "hand-point-up" icon unicode character.
-        /// </summary>
-        HandPointUp = 0xF0A6,
-
-        /// <summary>
-        /// The Font Awesome "hand-rock" icon unicode character.
-        /// </summary>
-        HandRock = 0xF255,
-
-        /// <summary>
-        /// The Font Awesome "hands" icon unicode character.
-        /// </summary>
-        Hands = 0xF4C2,
-
-        /// <summary>
-        /// The Font Awesome "hand-scissors" icon unicode character.
-        /// </summary>
-        HandScissors = 0xF257,
-
-        /// <summary>
-        /// The Font Awesome "handshake" icon unicode character.
-        /// </summary>
-        Handshake = 0xF2B5,
-
-        /// <summary>
-        /// The Font Awesome "hands-helping" icon unicode character.
-        /// </summary>
-        HandsHelping = 0xF4C4,
-
-        /// <summary>
-        /// The Font Awesome "hand-spock" icon unicode character.
-        /// </summary>
-        HandSpock = 0xF259,
-
-        /// <summary>
-        /// The Font Awesome "hanukiah" icon unicode character.
-        /// </summary>
-        Hanukiah = 0xF6E6,
-
-        /// <summary>
-        /// The Font Awesome "hard-hat" icon unicode character.
-        /// </summary>
-        HardHat = 0xF807,
-
-        /// <summary>
-        /// The Font Awesome "hashtag" icon unicode character.
-        /// </summary>
-        Hashtag = 0xF292,
-
-        /// <summary>
-        /// The Font Awesome "hat-cowboy" icon unicode character.
-        /// </summary>
-        HatCowboy = 0xF8C0,
-
-        /// <summary>
-        /// The Font Awesome "hat-cowboy-side" icon unicode character.
-        /// </summary>
-        HatCowboySide = 0xF8C1,
-
-        /// <summary>
-        /// The Font Awesome "hat-wizard" icon unicode character.
-        /// </summary>
-        HatWizard = 0xF6E8,
-
-        /// <summary>
-        /// The Font Awesome "hdd" icon unicode character.
-        /// </summary>
-        Hdd = 0xF0A0,
-
-        /// <summary>
-        /// The Font Awesome "heading" icon unicode character.
-        /// </summary>
-        Heading = 0xF1DC,
-
-        /// <summary>
-        /// The Font Awesome "headphones" icon unicode character.
-        /// </summary>
-        Headphones = 0xF025,
-
-        /// <summary>
-        /// The Font Awesome "headphones-alt" icon unicode character.
-        /// </summary>
-        HeadphonesAlt = 0xF58F,
-
-        /// <summary>
-        /// The Font Awesome "headset" icon unicode character.
-        /// </summary>
-        Headset = 0xF590,
-
-        /// <summary>
-        /// The Font Awesome "heart" icon unicode character.
-        /// </summary>
-        Heart = 0xF004,
-
-        /// <summary>
-        /// The Font Awesome "heartbeat" icon unicode character.
-        /// </summary>
-        Heartbeat = 0xF21E,
-
-        /// <summary>
-        /// The Font Awesome "heart-broken" icon unicode character.
-        /// </summary>
-        HeartBroken = 0xF7A9,
-
-        /// <summary>
-        /// The Font Awesome "helicopter" icon unicode character.
-        /// </summary>
-        Helicopter = 0xF533,
-
-        /// <summary>
-        /// The Font Awesome "highlighter" icon unicode character.
-        /// </summary>
-        Highlighter = 0xF591,
-
-        /// <summary>
-        /// The Font Awesome "hiking" icon unicode character.
-        /// </summary>
-        Hiking = 0xF6EC,
-
-        /// <summary>
-        /// The Font Awesome "hippo" icon unicode character.
-        /// </summary>
-        Hippo = 0xF6ED,
-
-        /// <summary>
-        /// The Font Awesome "hips" icon unicode character.
-        /// </summary>
-        Hips = 0xF452,
-
-        /// <summary>
-        /// The Font Awesome "hire-a-helper" icon unicode character.
-        /// </summary>
-        HireAHelper = 0xF3B0,
-
-        /// <summary>
-        /// The Font Awesome "history" icon unicode character.
-        /// </summary>
-        History = 0xF1DA,
-
-        /// <summary>
-        /// The Font Awesome "hockey-puck" icon unicode character.
-        /// </summary>
-        HockeyPuck = 0xF453,
-
-        /// <summary>
-        /// The Font Awesome "holly-berry" icon unicode character.
-        /// </summary>
-        HollyBerry = 0xF7AA,
-
-        /// <summary>
-        /// The Font Awesome "home" icon unicode character.
-        /// </summary>
-        Home = 0xF015,
-
-        /// <summary>
-        /// The Font Awesome "hooli" icon unicode character.
-        /// </summary>
-        Hooli = 0xF427,
-
-        /// <summary>
-        /// The Font Awesome "hornbill" icon unicode character.
-        /// </summary>
-        Hornbill = 0xF592,
-
-        /// <summary>
-        /// The Font Awesome "horse" icon unicode character.
-        /// </summary>
-        Horse = 0xF6F0,
-
-        /// <summary>
-        /// The Font Awesome "horse-head" icon unicode character.
-        /// </summary>
-        HorseHead = 0xF7AB,
-
-        /// <summary>
-        /// The Font Awesome "hospital" icon unicode character.
-        /// </summary>
-        Hospital = 0xF0F8,
-
-        /// <summary>
-        /// The Font Awesome "hospital-alt" icon unicode character.
-        /// </summary>
-        HospitalAlt = 0xF47D,
-
-        /// <summary>
-        /// The Font Awesome "hospital-symbol" icon unicode character.
-        /// </summary>
-        HospitalSymbol = 0xF47E,
-
-        /// <summary>
-        /// The Font Awesome "hotdog" icon unicode character.
-        /// </summary>
-        Hotdog = 0xF80F,
-
-        /// <summary>
-        /// The Font Awesome "hotel" icon unicode character.
-        /// </summary>
-        Hotel = 0xF594,
-
-        /// <summary>
-        /// The Font Awesome "hotjar" icon unicode character.
-        /// </summary>
-        Hotjar = 0xF3B1,
-
-        /// <summary>
-        /// The Font Awesome "hot-tub" icon unicode character.
-        /// </summary>
-        HotTub = 0xF593,
-
-        /// <summary>
-        /// The Font Awesome "hourglass" icon unicode character.
-        /// </summary>
-        Hourglass = 0xF254,
-
-        /// <summary>
-        /// The Font Awesome "hourglass-end" icon unicode character.
-        /// </summary>
-        HourglassEnd = 0xF253,
-
-        /// <summary>
-        /// The Font Awesome "hourglass-half" icon unicode character.
-        /// </summary>
-        HourglassHalf = 0xF252,
-
-        /// <summary>
-        /// The Font Awesome "hourglass-start" icon unicode character.
-        /// </summary>
-        HourglassStart = 0xF251,
-
-        /// <summary>
-        /// The Font Awesome "house-damage" icon unicode character.
-        /// </summary>
-        HouseDamage = 0xF6F1,
-
-        /// <summary>
-        /// The Font Awesome "houzz" icon unicode character.
-        /// </summary>
-        Houzz = 0xF27C,
-
-        /// <summary>
-        /// The Font Awesome "hryvnia" icon unicode character.
-        /// </summary>
-        Hryvnia = 0xF6F2,
-
-        /// <summary>
-        /// The Font Awesome "h-square" icon unicode character.
-        /// </summary>
-        HSquare = 0xF0FD,
-
-        /// <summary>
-        /// The Font Awesome "html5" icon unicode character.
-        /// </summary>
-        Html5 = 0xF13B,
-
-        /// <summary>
-        /// The Font Awesome "hubspot" icon unicode character.
-        /// </summary>
-        Hubspot = 0xF3B2,
-
-        /// <summary>
-        /// The Font Awesome "ice-cream" icon unicode character.
-        /// </summary>
-        IceCream = 0xF810,
-
-        /// <summary>
-        /// The Font Awesome "icicles" icon unicode character.
-        /// </summary>
-        Icicles = 0xF7AD,
-
-        /// <summary>
-        /// The Font Awesome "icons" icon unicode character.
-        /// </summary>
-        Icons = 0xF86D,
-
-        /// <summary>
-        /// The Font Awesome "i-cursor" icon unicode character.
-        /// </summary>
-        ICursor = 0xF246,
-
-        /// <summary>
-        /// The Font Awesome "id-badge" icon unicode character.
-        /// </summary>
-        IdBadge = 0xF2C1,
-
-        /// <summary>
-        /// The Font Awesome "id-card" icon unicode character.
-        /// </summary>
-        IdCard = 0xF2C2,
-
-        /// <summary>
-        /// The Font Awesome "id-card-alt" icon unicode character.
-        /// </summary>
-        IdCardAlt = 0xF47F,
-
-        /// <summary>
-        /// The Font Awesome "ideal" icon unicode character.
-        /// </summary>
-        Ideal = 0xF913,
-
-        /// <summary>
-        /// The Font Awesome "igloo" icon unicode character.
-        /// </summary>
-        Igloo = 0xF7AE,
-
-        /// <summary>
-        /// The Font Awesome "image" icon unicode character.
-        /// </summary>
-        Image = 0xF03E,
-
-        /// <summary>
-        /// The Font Awesome "images" icon unicode character.
-        /// </summary>
-        Images = 0xF302,
-
-        /// <summary>
-        /// The Font Awesome "imdb" icon unicode character.
-        /// </summary>
-        Imdb = 0xF2D8,
-
-        /// <summary>
-        /// The Font Awesome "inbox" icon unicode character.
-        /// </summary>
-        Inbox = 0xF01C,
-
-        /// <summary>
-        /// The Font Awesome "indent" icon unicode character.
-        /// </summary>
-        Indent = 0xF03C,
-
-        /// <summary>
-        /// The Font Awesome "industry" icon unicode character.
-        /// </summary>
-        Industry = 0xF275,
-
-        /// <summary>
-        /// The Font Awesome "infinity" icon unicode character.
-        /// </summary>
-        Infinity = 0xF534,
-
-        /// <summary>
-        /// The Font Awesome "info" icon unicode character.
-        /// </summary>
-        Info = 0xF129,
-
-        /// <summary>
-        /// The Font Awesome "info-circle" icon unicode character.
-        /// </summary>
-        InfoCircle = 0xF05A,
-
-        /// <summary>
-        /// The Font Awesome "instagram" icon unicode character.
-        /// </summary>
-        Instagram = 0xF16D,
-
-        /// <summary>
-        /// The Font Awesome "instagram-square" icon unicode character.
-        /// </summary>
-        InstagramSquare = 0xF955,
-
-        /// <summary>
-        /// The Font Awesome "intercom" icon unicode character.
-        /// </summary>
-        Intercom = 0xF7AF,
-
-        /// <summary>
-        /// The Font Awesome "internet-explorer" icon unicode character.
-        /// </summary>
-        InternetExplorer = 0xF26B,
-
-        /// <summary>
-        /// The Font Awesome "invision" icon unicode character.
-        /// </summary>
-        Invision = 0xF7B0,
-
-        /// <summary>
-        /// The Font Awesome "ioxhost" icon unicode character.
-        /// </summary>
-        Ioxhost = 0xF208,
-
-        /// <summary>
-        /// The Font Awesome "italic" icon unicode character.
-        /// </summary>
-        Italic = 0xF033,
-
-        /// <summary>
-        /// The Font Awesome "itch-io" icon unicode character.
-        /// </summary>
-        ItchIo = 0xF83A,
-
-        /// <summary>
-        /// The Font Awesome "itunes" icon unicode character.
-        /// </summary>
-        Itunes = 0xF3B4,
-
-        /// <summary>
-        /// The Font Awesome "itunes-note" icon unicode character.
-        /// </summary>
-        ItunesNote = 0xF3B5,
-
-        /// <summary>
-        /// The Font Awesome "java" icon unicode character.
-        /// </summary>
-        Java = 0xF4E4,
-
-        /// <summary>
-        /// The Font Awesome "jedi" icon unicode character.
-        /// </summary>
-        Jedi = 0xF669,
-
-        /// <summary>
-        /// The Font Awesome "jedi-order" icon unicode character.
-        /// </summary>
-        JediOrder = 0xF50E,
-
-        /// <summary>
-        /// The Font Awesome "jenkins" icon unicode character.
-        /// </summary>
-        Jenkins = 0xF3B6,
-
-        /// <summary>
-        /// The Font Awesome "jira" icon unicode character.
-        /// </summary>
-        Jira = 0xF7B1,
-
-        /// <summary>
-        /// The Font Awesome "joget" icon unicode character.
-        /// </summary>
-        Joget = 0xF3B7,
-
-        /// <summary>
-        /// The Font Awesome "joint" icon unicode character.
-        /// </summary>
-        Joint = 0xF595,
-
-        /// <summary>
-        /// The Font Awesome "joomla" icon unicode character.
-        /// </summary>
-        Joomla = 0xF1AA,
-
-        /// <summary>
-        /// The Font Awesome "journal-whills" icon unicode character.
-        /// </summary>
-        JournalWhills = 0xF66A,
-
-        /// <summary>
-        /// The Font Awesome "js" icon unicode character.
-        /// </summary>
-        Js = 0xF3B8,
-
-        /// <summary>
-        /// The Font Awesome "jsfiddle" icon unicode character.
-        /// </summary>
-        Jsfiddle = 0xF1CC,
-
-        /// <summary>
-        /// The Font Awesome "js-square" icon unicode character.
-        /// </summary>
-        JsSquare = 0xF3B9,
-
-        /// <summary>
-        /// The Font Awesome "kaaba" icon unicode character.
-        /// </summary>
-        Kaaba = 0xF66B,
-
-        /// <summary>
-        /// The Font Awesome "kaggle" icon unicode character.
-        /// </summary>
-        Kaggle = 0xF5FA,
-
-        /// <summary>
-        /// The Font Awesome "key" icon unicode character.
-        /// </summary>
-        Key = 0xF084,
-
-        /// <summary>
-        /// The Font Awesome "keybase" icon unicode character.
-        /// </summary>
-        Keybase = 0xF4F5,
-
-        /// <summary>
-        /// The Font Awesome "keyboard" icon unicode character.
-        /// </summary>
-        Keyboard = 0xF11C,
-
-        /// <summary>
-        /// The Font Awesome "keycdn" icon unicode character.
-        /// </summary>
-        Keycdn = 0xF3BA,
-
-        /// <summary>
-        /// The Font Awesome "khanda" icon unicode character.
-        /// </summary>
-        Khanda = 0xF66D,
-
-        /// <summary>
-        /// The Font Awesome "kickstarter" icon unicode character.
-        /// </summary>
-        Kickstarter = 0xF3BB,
-
-        /// <summary>
-        /// The Font Awesome "kickstarter-k" icon unicode character.
-        /// </summary>
-        KickstarterK = 0xF3BC,
-
-        /// <summary>
-        /// The Font Awesome "kiss" icon unicode character.
-        /// </summary>
-        Kiss = 0xF596,
-
-        /// <summary>
-        /// The Font Awesome "kiss-beam" icon unicode character.
-        /// </summary>
-        KissBeam = 0xF597,
-
-        /// <summary>
-        /// The Font Awesome "kiss-wink-heart" icon unicode character.
-        /// </summary>
-        KissWinkHeart = 0xF598,
-
-        /// <summary>
-        /// The Font Awesome "kiwi-bird" icon unicode character.
-        /// </summary>
-        KiwiBird = 0xF535,
-
-        /// <summary>
-        /// The Font Awesome "korvue" icon unicode character.
-        /// </summary>
-        Korvue = 0xF42F,
-
-        /// <summary>
-        /// The Font Awesome "landmark" icon unicode character.
-        /// </summary>
-        Landmark = 0xF66F,
-
-        /// <summary>
-        /// The Font Awesome "language" icon unicode character.
-        /// </summary>
-        Language = 0xF1AB,
-
-        /// <summary>
-        /// The Font Awesome "laptop" icon unicode character.
-        /// </summary>
-        Laptop = 0xF109,
-
-        /// <summary>
-        /// The Font Awesome "laptop-code" icon unicode character.
-        /// </summary>
-        LaptopCode = 0xF5FC,
-
-        /// <summary>
-        /// The Font Awesome "laptop-medical" icon unicode character.
-        /// </summary>
-        LaptopMedical = 0xF812,
-
-        /// <summary>
-        /// The Font Awesome "laravel" icon unicode character.
-        /// </summary>
-        Laravel = 0xF3BD,
-
-        /// <summary>
-        /// The Font Awesome "lastfm" icon unicode character.
-        /// </summary>
-        Lastfm = 0xF202,
-
-        /// <summary>
-        /// The Font Awesome "lastfm-square" icon unicode character.
-        /// </summary>
-        LastfmSquare = 0xF203,
-
-        /// <summary>
-        /// The Font Awesome "laugh" icon unicode character.
-        /// </summary>
-        Laugh = 0xF599,
-
-        /// <summary>
-        /// The Font Awesome "laugh-beam" icon unicode character.
-        /// </summary>
-        LaughBeam = 0xF59A,
-
-        /// <summary>
-        /// The Font Awesome "laugh-squint" icon unicode character.
-        /// </summary>
-        LaughSquint = 0xF59B,
-
-        /// <summary>
-        /// The Font Awesome "laugh-wink" icon unicode character.
-        /// </summary>
-        LaughWink = 0xF59C,
-
-        /// <summary>
-        /// The Font Awesome "layer-group" icon unicode character.
-        /// </summary>
-        LayerGroup = 0xF5FD,
-
-        /// <summary>
-        /// The Font Awesome "leaf" icon unicode character.
-        /// </summary>
-        Leaf = 0xF06C,
-
-        /// <summary>
-        /// The Font Awesome "leanpub" icon unicode character.
-        /// </summary>
-        Leanpub = 0xF212,
-
-        /// <summary>
-        /// The Font Awesome "lemon" icon unicode character.
-        /// </summary>
-        Lemon = 0xF094,
-
-        /// <summary>
-        /// The Font Awesome "less" icon unicode character.
-        /// </summary>
-        Less = 0xF41D,
-
-        /// <summary>
-        /// The Font Awesome "less-than" icon unicode character.
-        /// </summary>
-        LessThan = 0xF536,
-
-        /// <summary>
-        /// The Font Awesome "less-than-equal" icon unicode character.
-        /// </summary>
-        LessThanEqual = 0xF537,
-
-        /// <summary>
-        /// The Font Awesome "level-down-alt" icon unicode character.
-        /// </summary>
-        LevelDownAlt = 0xF3BE,
-
-        /// <summary>
-        /// The Font Awesome "level-up-alt" icon unicode character.
-        /// </summary>
-        LevelUpAlt = 0xF3BF,
-
-        /// <summary>
-        /// The Font Awesome "life-ring" icon unicode character.
-        /// </summary>
-        LifeRing = 0xF1CD,
-
-        /// <summary>
-        /// The Font Awesome "lightbulb" icon unicode character.
-        /// </summary>
-        Lightbulb = 0xF0EB,
-
-        /// <summary>
-        /// The Font Awesome "line" icon unicode character.
-        /// </summary>
-        Line = 0xF3C0,
-
-        /// <summary>
-        /// The Font Awesome "link" icon unicode character.
-        /// </summary>
-        Link = 0xF0C1,
-
-        /// <summary>
-        /// The Font Awesome "linkedin" icon unicode character.
-        /// </summary>
-        Linkedin = 0xF08C,
-
-        /// <summary>
-        /// The Font Awesome "linkedin-in" icon unicode character.
-        /// </summary>
-        LinkedinIn = 0xF0E1,
-
-        /// <summary>
-        /// The Font Awesome "linode" icon unicode character.
-        /// </summary>
-        Linode = 0xF2B8,
-
-        /// <summary>
-        /// The Font Awesome "linux" icon unicode character.
-        /// </summary>
-        Linux = 0xF17C,
-
-        /// <summary>
-        /// The Font Awesome "lira-sign" icon unicode character.
-        /// </summary>
-        LiraSign = 0xF195,
-
-        /// <summary>
-        /// The Font Awesome "list" icon unicode character.
-        /// </summary>
-        List = 0xF03A,
-
-        /// <summary>
-        /// The Font Awesome "list-alt" icon unicode character.
-        /// </summary>
-        ListAlt = 0xF022,
-
-        /// <summary>
-        /// The Font Awesome "list-ol" icon unicode character.
-        /// </summary>
-        ListOl = 0xF0CB,
-
-        /// <summary>
-        /// The Font Awesome "list-ul" icon unicode character.
-        /// </summary>
-        ListUl = 0xF0CA,
-
-        /// <summary>
-        /// The Font Awesome "location-arrow" icon unicode character.
-        /// </summary>
-        LocationArrow = 0xF124,
-
-        /// <summary>
-        /// The Font Awesome "lock" icon unicode character.
-        /// </summary>
-        Lock = 0xF023,
-
-        /// <summary>
-        /// The Font Awesome "lock-open" icon unicode character.
-        /// </summary>
-        LockOpen = 0xF3C1,
-
-        /// <summary>
-        /// The Font Awesome "long-arrow-alt-down" icon unicode character.
-        /// </summary>
-        LongArrowAltDown = 0xF309,
-
-        /// <summary>
-        /// The Font Awesome "long-arrow-alt-left" icon unicode character.
-        /// </summary>
-        LongArrowAltLeft = 0xF30A,
-
-        /// <summary>
-        /// The Font Awesome "long-arrow-alt-right" icon unicode character.
-        /// </summary>
-        LongArrowAltRight = 0xF30B,
-
-        /// <summary>
-        /// The Font Awesome "long-arrow-alt-up" icon unicode character.
-        /// </summary>
-        LongArrowAltUp = 0xF30C,
-
-        /// <summary>
-        /// The Font Awesome "low-vision" icon unicode character.
-        /// </summary>
-        LowVision = 0xF2A8,
-
-        /// <summary>
-        /// The Font Awesome "luggage-cart" icon unicode character.
-        /// </summary>
-        LuggageCart = 0xF59D,
-
-        /// <summary>
-        /// The Font Awesome "lyft" icon unicode character.
-        /// </summary>
-        Lyft = 0xF3C3,
-
-        /// <summary>
-        /// The Font Awesome "magento" icon unicode character.
-        /// </summary>
-        Magento = 0xF3C4,
-
-        /// <summary>
-        /// The Font Awesome "magic" icon unicode character.
-        /// </summary>
-        Magic = 0xF0D0,
-
-        /// <summary>
-        /// The Font Awesome "magnet" icon unicode character.
-        /// </summary>
-        Magnet = 0xF076,
-
-        /// <summary>
-        /// The Font Awesome "mail-bulk" icon unicode character.
-        /// </summary>
-        MailBulk = 0xF674,
-
-        /// <summary>
-        /// The Font Awesome "mailchimp" icon unicode character.
-        /// </summary>
-        Mailchimp = 0xF59E,
-
-        /// <summary>
-        /// The Font Awesome "male" icon unicode character.
-        /// </summary>
-        Male = 0xF183,
-
-        /// <summary>
-        /// The Font Awesome "mandalorian" icon unicode character.
-        /// </summary>
-        Mandalorian = 0xF50F,
-
-        /// <summary>
-        /// The Font Awesome "map" icon unicode character.
-        /// </summary>
-        Map = 0xF279,
-
-        /// <summary>
-        /// The Font Awesome "map-marked" icon unicode character.
-        /// </summary>
-        MapMarked = 0xF59F,
-
-        /// <summary>
-        /// The Font Awesome "map-marked-alt" icon unicode character.
-        /// </summary>
-        MapMarkedAlt = 0xF5A0,
-
-        /// <summary>
-        /// The Font Awesome "map-marker" icon unicode character.
-        /// </summary>
-        MapMarker = 0xF041,
-
-        /// <summary>
-        /// The Font Awesome "map-marker-alt" icon unicode character.
-        /// </summary>
-        MapMarkerAlt = 0xF3C5,
-
-        /// <summary>
-        /// The Font Awesome "map-pin" icon unicode character.
-        /// </summary>
-        MapPin = 0xF276,
-
-        /// <summary>
-        /// The Font Awesome "map-signs" icon unicode character.
-        /// </summary>
-        MapSigns = 0xF277,
-
-        /// <summary>
-        /// The Font Awesome "markdown" icon unicode character.
-        /// </summary>
-        Markdown = 0xF60F,
-
-        /// <summary>
-        /// The Font Awesome "marker" icon unicode character.
-        /// </summary>
-        Marker = 0xF5A1,
-
-        /// <summary>
-        /// The Font Awesome "mars" icon unicode character.
-        /// </summary>
-        Mars = 0xF222,
-
-        /// <summary>
-        /// The Font Awesome "mars-double" icon unicode character.
-        /// </summary>
-        MarsDouble = 0xF227,
-
-        /// <summary>
-        /// The Font Awesome "mars-stroke" icon unicode character.
-        /// </summary>
-        MarsStroke = 0xF229,
-
-        /// <summary>
-        /// The Font Awesome "mars-stroke-h" icon unicode character.
-        /// </summary>
-        MarsStrokeH = 0xF22B,
-
-        /// <summary>
-        /// The Font Awesome "mars-stroke-v" icon unicode character.
-        /// </summary>
-        MarsStrokeV = 0xF22A,
-
-        /// <summary>
-        /// The Font Awesome "mask" icon unicode character.
-        /// </summary>
-        Mask = 0xF6FA,
-
-        /// <summary>
-        /// The Font Awesome "mastodon" icon unicode character.
-        /// </summary>
-        Mastodon = 0xF4F6,
-
-        /// <summary>
-        /// The Font Awesome "maxcdn" icon unicode character.
-        /// </summary>
-        Maxcdn = 0xF136,
-
-        /// <summary>
-        /// The Font Awesome "mdb" icon unicode character.
-        /// </summary>
-        Mdb = 0xF8CA,
-
-        /// <summary>
-        /// The Font Awesome "medal" icon unicode character.
-        /// </summary>
-        Medal = 0xF5A2,
-
-        /// <summary>
-        /// The Font Awesome "medapps" icon unicode character.
-        /// </summary>
-        Medapps = 0xF3C6,
-
-        /// <summary>
-        /// The Font Awesome "medium" icon unicode character.
-        /// </summary>
-        Medium = 0xF23A,
-
-        /// <summary>
-        /// The Font Awesome "medium-m" icon unicode character.
-        /// </summary>
-        MediumM = 0xF3C7,
-
-        /// <summary>
-        /// The Font Awesome "medkit" icon unicode character.
-        /// </summary>
-        Medkit = 0xF0FA,
-
-        /// <summary>
-        /// The Font Awesome "medrt" icon unicode character.
-        /// </summary>
-        Medrt = 0xF3C8,
-
-        /// <summary>
-        /// The Font Awesome "meetup" icon unicode character.
-        /// </summary>
-        Meetup = 0xF2E0,
-
-        /// <summary>
-        /// The Font Awesome "megaport" icon unicode character.
-        /// </summary>
-        Megaport = 0xF5A3,
-
-        /// <summary>
-        /// The Font Awesome "meh" icon unicode character.
-        /// </summary>
-        Meh = 0xF11A,
-
-        /// <summary>
-        /// The Font Awesome "meh-blank" icon unicode character.
-        /// </summary>
-        MehBlank = 0xF5A4,
-
-        /// <summary>
-        /// The Font Awesome "meh-rolling-eyes" icon unicode character.
-        /// </summary>
-        MehRollingEyes = 0xF5A5,
-
-        /// <summary>
-        /// The Font Awesome "memory" icon unicode character.
-        /// </summary>
-        Memory = 0xF538,
-
-        /// <summary>
-        /// The Font Awesome "mendeley" icon unicode character.
-        /// </summary>
-        Mendeley = 0xF7B3,
-
-        /// <summary>
-        /// The Font Awesome "menorah" icon unicode character.
-        /// </summary>
-        Menorah = 0xF676,
-
-        /// <summary>
-        /// The Font Awesome "mercury" icon unicode character.
-        /// </summary>
-        Mercury = 0xF223,
-
-        /// <summary>
-        /// The Font Awesome "meteor" icon unicode character.
-        /// </summary>
-        Meteor = 0xF753,
-
-        /// <summary>
-        /// The Font Awesome "microblog" icon unicode character.
-        /// </summary>
-        Microblog = 0xF91A,
-
-        /// <summary>
-        /// The Font Awesome "microchip" icon unicode character.
-        /// </summary>
-        Microchip = 0xF2DB,
-
-        /// <summary>
-        /// The Font Awesome "microphone" icon unicode character.
-        /// </summary>
-        Microphone = 0xF130,
-
-        /// <summary>
-        /// The Font Awesome "microphone-alt" icon unicode character.
-        /// </summary>
-        MicrophoneAlt = 0xF3C9,
-
-        /// <summary>
-        /// The Font Awesome "microphone-alt-slash" icon unicode character.
-        /// </summary>
-        MicrophoneAltSlash = 0xF539,
-
-        /// <summary>
-        /// The Font Awesome "microphone-slash" icon unicode character.
-        /// </summary>
-        MicrophoneSlash = 0xF131,
-
-        /// <summary>
-        /// The Font Awesome "microscope" icon unicode character.
-        /// </summary>
-        Microscope = 0xF610,
-
-        /// <summary>
-        /// The Font Awesome "microsoft" icon unicode character.
-        /// </summary>
-        Microsoft = 0xF3CA,
-
-        /// <summary>
-        /// The Font Awesome "minus" icon unicode character.
-        /// </summary>
-        Minus = 0xF068,
-
-        /// <summary>
-        /// The Font Awesome "minus-circle" icon unicode character.
-        /// </summary>
-        MinusCircle = 0xF056,
-
-        /// <summary>
-        /// The Font Awesome "minus-square" icon unicode character.
-        /// </summary>
-        MinusSquare = 0xF146,
-
-        /// <summary>
-        /// The Font Awesome "mitten" icon unicode character.
-        /// </summary>
-        Mitten = 0xF7B5,
-
-        /// <summary>
-        /// The Font Awesome "mix" icon unicode character.
-        /// </summary>
-        Mix = 0xF3CB,
-
-        /// <summary>
-        /// The Font Awesome "mixcloud" icon unicode character.
-        /// </summary>
-        Mixcloud = 0xF289,
-
-        /// <summary>
-        /// The Font Awesome "mixer" icon unicode character.
-        /// </summary>
-        Mixer = 0xF956,
-
-        /// <summary>
-        /// The Font Awesome "mizuni" icon unicode character.
-        /// </summary>
-        Mizuni = 0xF3CC,
-
-        /// <summary>
-        /// The Font Awesome "mobile" icon unicode character.
-        /// </summary>
-        Mobile = 0xF10B,
-
-        /// <summary>
-        /// The Font Awesome "mobile-alt" icon unicode character.
-        /// </summary>
-        MobileAlt = 0xF3CD,
-
-        /// <summary>
-        /// The Font Awesome "modx" icon unicode character.
-        /// </summary>
-        Modx = 0xF285,
-
-        /// <summary>
-        /// The Font Awesome "monero" icon unicode character.
-        /// </summary>
-        Monero = 0xF3D0,
-
-        /// <summary>
-        /// The Font Awesome "money-bill" icon unicode character.
-        /// </summary>
-        MoneyBill = 0xF0D6,
-
-        /// <summary>
-        /// The Font Awesome "money-bill-alt" icon unicode character.
-        /// </summary>
-        MoneyBillAlt = 0xF3D1,
-
-        /// <summary>
-        /// The Font Awesome "money-bill-wave" icon unicode character.
-        /// </summary>
-        MoneyBillWave = 0xF53A,
-
-        /// <summary>
-        /// The Font Awesome "money-bill-wave-alt" icon unicode character.
-        /// </summary>
-        MoneyBillWaveAlt = 0xF53B,
-
-        /// <summary>
-        /// The Font Awesome "money-check" icon unicode character.
-        /// </summary>
-        MoneyCheck = 0xF53C,
-
-        /// <summary>
-        /// The Font Awesome "money-check-alt" icon unicode character.
-        /// </summary>
-        MoneyCheckAlt = 0xF53D,
-
-        /// <summary>
-        /// The Font Awesome "monument" icon unicode character.
-        /// </summary>
-        Monument = 0xF5A6,
-
-        /// <summary>
-        /// The Font Awesome "moon" icon unicode character.
-        /// </summary>
-        Moon = 0xF186,
-
-        /// <summary>
-        /// The Font Awesome "mortar-pestle" icon unicode character.
-        /// </summary>
-        MortarPestle = 0xF5A7,
-
-        /// <summary>
-        /// The Font Awesome "mosque" icon unicode character.
-        /// </summary>
-        Mosque = 0xF678,
-
-        /// <summary>
-        /// The Font Awesome "motorcycle" icon unicode character.
-        /// </summary>
-        Motorcycle = 0xF21C,
-
-        /// <summary>
-        /// The Font Awesome "mountain" icon unicode character.
-        /// </summary>
-        Mountain = 0xF6FC,
-
-        /// <summary>
-        /// The Font Awesome "mouse" icon unicode character.
-        /// </summary>
-        Mouse = 0xF8CC,
-
-        /// <summary>
-        /// The Font Awesome "mouse-pointer" icon unicode character.
-        /// </summary>
-        MousePointer = 0xF245,
-
-        /// <summary>
-        /// The Font Awesome "mug-hot" icon unicode character.
-        /// </summary>
-        MugHot = 0xF7B6,
-
-        /// <summary>
-        /// The Font Awesome "music" icon unicode character.
-        /// </summary>
-        Music = 0xF001,
-
-        /// <summary>
-        /// The Font Awesome "napster" icon unicode character.
-        /// </summary>
-        Napster = 0xF3D2,
-
-        /// <summary>
-        /// The Font Awesome "neos" icon unicode character.
-        /// </summary>
-        Neos = 0xF612,
-
-        /// <summary>
-        /// The Font Awesome "network-wired" icon unicode character.
-        /// </summary>
-        NetworkWired = 0xF6FF,
-
-        /// <summary>
-        /// The Font Awesome "neuter" icon unicode character.
-        /// </summary>
-        Neuter = 0xF22C,
-
-        /// <summary>
-        /// The Font Awesome "newspaper" icon unicode character.
-        /// </summary>
-        Newspaper = 0xF1EA,
-
-        /// <summary>
-        /// The Font Awesome "nimblr" icon unicode character.
-        /// </summary>
-        Nimblr = 0xF5A8,
-
-        /// <summary>
-        /// The Font Awesome "node" icon unicode character.
-        /// </summary>
-        Node = 0xF419,
-
-        /// <summary>
-        /// The Font Awesome "node-js" icon unicode character.
-        /// </summary>
-        NodeJs = 0xF3D3,
-
-        /// <summary>
-        /// The Font Awesome "not-equal" icon unicode character.
-        /// </summary>
-        NotEqual = 0xF53E,
-
-        /// <summary>
-        /// The Font Awesome "notes-medical" icon unicode character.
-        /// </summary>
-        NotesMedical = 0xF481,
-
-        /// <summary>
-        /// The Font Awesome "npm" icon unicode character.
-        /// </summary>
-        Npm = 0xF3D4,
-
-        /// <summary>
-        /// The Font Awesome "ns8" icon unicode character.
-        /// </summary>
-        Ns8 = 0xF3D5,
-
-        /// <summary>
-        /// The Font Awesome "nutritionix" icon unicode character.
-        /// </summary>
-        Nutritionix = 0xF3D6,
-
-        /// <summary>
-        /// The Font Awesome "object-group" icon unicode character.
-        /// </summary>
-        ObjectGroup = 0xF247,
-
-        /// <summary>
-        /// The Font Awesome "object-ungroup" icon unicode character.
-        /// </summary>
-        ObjectUngroup = 0xF248,
-
-        /// <summary>
-        /// The Font Awesome "odnoklassniki" icon unicode character.
-        /// </summary>
-        Odnoklassniki = 0xF263,
-
-        /// <summary>
-        /// The Font Awesome "odnoklassniki-square" icon unicode character.
-        /// </summary>
-        OdnoklassnikiSquare = 0xF264,
-
-        /// <summary>
-        /// The Font Awesome "oil-can" icon unicode character.
-        /// </summary>
-        OilCan = 0xF613,
-
-        /// <summary>
-        /// The Font Awesome "old-republic" icon unicode character.
-        /// </summary>
-        OldRepublic = 0xF510,
-
-        /// <summary>
-        /// The Font Awesome "om" icon unicode character.
-        /// </summary>
-        Om = 0xF679,
-
-        /// <summary>
-        /// The Font Awesome "opencart" icon unicode character.
-        /// </summary>
-        Opencart = 0xF23D,
-
-        /// <summary>
-        /// The Font Awesome "openid" icon unicode character.
-        /// </summary>
-        Openid = 0xF19B,
-
-        /// <summary>
-        /// The Font Awesome "opera" icon unicode character.
-        /// </summary>
-        Opera = 0xF26A,
-
-        /// <summary>
-        /// The Font Awesome "optin-monster" icon unicode character.
-        /// </summary>
-        OptinMonster = 0xF23C,
-
-        /// <summary>
-        /// The Font Awesome "orcid" icon unicode character.
-        /// </summary>
-        Orcid = 0xF8D2,
-
-        /// <summary>
-        /// The Font Awesome "osi" icon unicode character.
-        /// </summary>
-        Osi = 0xF41A,
-
-        /// <summary>
-        /// The Font Awesome "otter" icon unicode character.
-        /// </summary>
-        Otter = 0xF700,
-
-        /// <summary>
-        /// The Font Awesome "outdent" icon unicode character.
-        /// </summary>
-        Outdent = 0xF03B,
-
-        /// <summary>
-        /// The Font Awesome "page4" icon unicode character.
-        /// </summary>
-        Page4 = 0xF3D7,
-
-        /// <summary>
-        /// The Font Awesome "pagelines" icon unicode character.
-        /// </summary>
-        Pagelines = 0xF18C,
-
-        /// <summary>
-        /// The Font Awesome "pager" icon unicode character.
-        /// </summary>
-        Pager = 0xF815,
-
-        /// <summary>
-        /// The Font Awesome "paint-brush" icon unicode character.
-        /// </summary>
-        PaintBrush = 0xF1FC,
-
-        /// <summary>
-        /// The Font Awesome "paint-roller" icon unicode character.
-        /// </summary>
-        PaintRoller = 0xF5AA,
-
-        /// <summary>
-        /// The Font Awesome "palette" icon unicode character.
-        /// </summary>
-        Palette = 0xF53F,
-
-        /// <summary>
-        /// The Font Awesome "palfed" icon unicode character.
-        /// </summary>
-        Palfed = 0xF3D8,
-
-        /// <summary>
-        /// The Font Awesome "pallet" icon unicode character.
-        /// </summary>
-        Pallet = 0xF482,
-
-        /// <summary>
-        /// The Font Awesome "paperclip" icon unicode character.
-        /// </summary>
-        Paperclip = 0xF0C6,
-
-        /// <summary>
-        /// The Font Awesome "paper-plane" icon unicode character.
-        /// </summary>
-        PaperPlane = 0xF1D8,
-
-        /// <summary>
-        /// The Font Awesome "parachute-box" icon unicode character.
-        /// </summary>
-        ParachuteBox = 0xF4CD,
-
-        /// <summary>
-        /// The Font Awesome "paragraph" icon unicode character.
-        /// </summary>
-        Paragraph = 0xF1DD,
-
-        /// <summary>
-        /// The Font Awesome "parking" icon unicode character.
-        /// </summary>
-        Parking = 0xF540,
-
-        /// <summary>
-        /// The Font Awesome "passport" icon unicode character.
-        /// </summary>
-        Passport = 0xF5AB,
-
-        /// <summary>
-        /// The Font Awesome "pastafarianism" icon unicode character.
-        /// </summary>
-        Pastafarianism = 0xF67B,
-
-        /// <summary>
-        /// The Font Awesome "paste" icon unicode character.
-        /// </summary>
-        Paste = 0xF0EA,
-
-        /// <summary>
-        /// The Font Awesome "patreon" icon unicode character.
-        /// </summary>
-        Patreon = 0xF3D9,
-
-        /// <summary>
-        /// The Font Awesome "pause" icon unicode character.
-        /// </summary>
-        Pause = 0xF04C,
-
-        /// <summary>
-        /// The Font Awesome "pause-circle" icon unicode character.
-        /// </summary>
-        PauseCircle = 0xF28B,
-
-        /// <summary>
-        /// The Font Awesome "paw" icon unicode character.
-        /// </summary>
-        Paw = 0xF1B0,
-
-        /// <summary>
-        /// The Font Awesome "paypal" icon unicode character.
-        /// </summary>
-        Paypal = 0xF1ED,
-
-        /// <summary>
-        /// The Font Awesome "peace" icon unicode character.
-        /// </summary>
-        Peace = 0xF67C,
-
-        /// <summary>
-        /// The Font Awesome "pen" icon unicode character.
-        /// </summary>
-        Pen = 0xF304,
-
-        /// <summary>
-        /// The Font Awesome "pen-alt" icon unicode character.
-        /// </summary>
-        PenAlt = 0xF305,
-
-        /// <summary>
-        /// The Font Awesome "pencil-alt" icon unicode character.
-        /// </summary>
-        PencilAlt = 0xF303,
-
-        /// <summary>
-        /// The Font Awesome "pencil-ruler" icon unicode character.
-        /// </summary>
-        PencilRuler = 0xF5AE,
-
-        /// <summary>
-        /// The Font Awesome "pen-fancy" icon unicode character.
-        /// </summary>
-        PenFancy = 0xF5AC,
-
-        /// <summary>
-        /// The Font Awesome "pen-nib" icon unicode character.
-        /// </summary>
-        PenNib = 0xF5AD,
-
-        /// <summary>
-        /// The Font Awesome "penny-arcade" icon unicode character.
-        /// </summary>
-        PennyArcade = 0xF704,
-
-        /// <summary>
-        /// The Font Awesome "pen-square" icon unicode character.
-        /// </summary>
-        PenSquare = 0xF14B,
-
-        /// <summary>
-        /// The Font Awesome "people-carry" icon unicode character.
-        /// </summary>
-        PeopleCarry = 0xF4CE,
-
-        /// <summary>
-        /// The Font Awesome "pepper-hot" icon unicode character.
-        /// </summary>
-        PepperHot = 0xF816,
-
-        /// <summary>
-        /// The Font Awesome "percent" icon unicode character.
-        /// </summary>
-        Percent = 0xF295,
-
-        /// <summary>
-        /// The Font Awesome "percentage" icon unicode character.
-        /// </summary>
-        Percentage = 0xF541,
-
-        /// <summary>
-        /// The Font Awesome "periscope" icon unicode character.
-        /// </summary>
-        Periscope = 0xF3DA,
-
-        /// <summary>
-        /// The Font Awesome "person-booth" icon unicode character.
-        /// </summary>
-        PersonBooth = 0xF756,
-
-        /// <summary>
-        /// The Font Awesome "phabricator" icon unicode character.
-        /// </summary>
-        Phabricator = 0xF3DB,
-
-        /// <summary>
-        /// The Font Awesome "phoenix-framework" icon unicode character.
-        /// </summary>
-        PhoenixFramework = 0xF3DC,
-
-        /// <summary>
-        /// The Font Awesome "phoenix-squadron" icon unicode character.
-        /// </summary>
-        PhoenixSquadron = 0xF511,
-
-        /// <summary>
-        /// The Font Awesome "phone" icon unicode character.
-        /// </summary>
-        Phone = 0xF095,
-
-        /// <summary>
-        /// The Font Awesome "phone-alt" icon unicode character.
-        /// </summary>
-        PhoneAlt = 0xF879,
-
-        /// <summary>
-        /// The Font Awesome "phone-slash" icon unicode character.
-        /// </summary>
-        PhoneSlash = 0xF3DD,
-
-        /// <summary>
-        /// The Font Awesome "phone-square" icon unicode character.
-        /// </summary>
-        PhoneSquare = 0xF098,
-
-        /// <summary>
-        /// The Font Awesome "phone-square-alt" icon unicode character.
-        /// </summary>
-        PhoneSquareAlt = 0xF87B,
-
-        /// <summary>
-        /// The Font Awesome "phone-volume" icon unicode character.
-        /// </summary>
-        PhoneVolume = 0xF2A0,
-
-        /// <summary>
-        /// The Font Awesome "photo-video" icon unicode character.
-        /// </summary>
-        PhotoVideo = 0xF87C,
-
-        /// <summary>
-        /// The Font Awesome "php" icon unicode character.
-        /// </summary>
-        Php = 0xF457,
-
-        /// <summary>
-        /// The Font Awesome "pied-piper" icon unicode character.
-        /// </summary>
-        PiedPiper = 0xF2AE,
-
-        /// <summary>
-        /// The Font Awesome "pied-piper-alt" icon unicode character.
-        /// </summary>
-        PiedPiperAlt = 0xF1A8,
-
-        /// <summary>
-        /// The Font Awesome "pied-piper-hat" icon unicode character.
-        /// </summary>
-        PiedPiperHat = 0xF4E5,
-
-        /// <summary>
-        /// The Font Awesome "pied-piper-pp" icon unicode character.
-        /// </summary>
-        PiedPiperPp = 0xF1A7,
-
-        /// <summary>
-        /// The Font Awesome "pied-piper-square" icon unicode character.
-        /// </summary>
-        PiedPiperSquare = 0xF91E,
-
-        /// <summary>
-        /// The Font Awesome "piggy-bank" icon unicode character.
-        /// </summary>
-        PiggyBank = 0xF4D3,
-
-        /// <summary>
-        /// The Font Awesome "pills" icon unicode character.
-        /// </summary>
-        Pills = 0xF484,
-
-        /// <summary>
-        /// The Font Awesome "pinterest" icon unicode character.
-        /// </summary>
-        Pinterest = 0xF0D2,
-
-        /// <summary>
-        /// The Font Awesome "pinterest-p" icon unicode character.
-        /// </summary>
-        PinterestP = 0xF231,
-
-        /// <summary>
-        /// The Font Awesome "pinterest-square" icon unicode character.
-        /// </summary>
-        PinterestSquare = 0xF0D3,
-
-        /// <summary>
-        /// The Font Awesome "pizza-slice" icon unicode character.
-        /// </summary>
-        PizzaSlice = 0xF818,
-
-        /// <summary>
-        /// The Font Awesome "place-of-worship" icon unicode character.
-        /// </summary>
-        PlaceOfWorship = 0xF67F,
-
-        /// <summary>
-        /// The Font Awesome "plane" icon unicode character.
-        /// </summary>
-        Plane = 0xF072,
-
-        /// <summary>
-        /// The Font Awesome "plane-arrival" icon unicode character.
-        /// </summary>
-        PlaneArrival = 0xF5AF,
-
-        /// <summary>
-        /// The Font Awesome "plane-departure" icon unicode character.
-        /// </summary>
-        PlaneDeparture = 0xF5B0,
-
-        /// <summary>
-        /// The Font Awesome "play" icon unicode character.
-        /// </summary>
-        Play = 0xF04B,
-
-        /// <summary>
-        /// The Font Awesome "play-circle" icon unicode character.
-        /// </summary>
-        PlayCircle = 0xF144,
-
-        /// <summary>
-        /// The Font Awesome "playstation" icon unicode character.
-        /// </summary>
-        Playstation = 0xF3DF,
-
-        /// <summary>
-        /// The Font Awesome "plug" icon unicode character.
-        /// </summary>
-        Plug = 0xF1E6,
-
-        /// <summary>
-        /// The Font Awesome "plus" icon unicode character.
-        /// </summary>
-        Plus = 0xF067,
-
-        /// <summary>
-        /// The Font Awesome "plus-circle" icon unicode character.
-        /// </summary>
-        PlusCircle = 0xF055,
-
-        /// <summary>
-        /// The Font Awesome "plus-square" icon unicode character.
-        /// </summary>
-        PlusSquare = 0xF0FE,
-
-        /// <summary>
-        /// The Font Awesome "podcast" icon unicode character.
-        /// </summary>
-        Podcast = 0xF2CE,
-
-        /// <summary>
-        /// The Font Awesome "poll" icon unicode character.
-        /// </summary>
-        Poll = 0xF681,
-
-        /// <summary>
-        /// The Font Awesome "poll-h" icon unicode character.
-        /// </summary>
-        PollH = 0xF682,
-
-        /// <summary>
-        /// The Font Awesome "poo" icon unicode character.
-        /// </summary>
-        Poo = 0xF2FE,
-
-        /// <summary>
-        /// The Font Awesome "poop" icon unicode character.
-        /// </summary>
-        Poop = 0xF619,
-
-        /// <summary>
-        /// The Font Awesome "poo-storm" icon unicode character.
-        /// </summary>
-        PooStorm = 0xF75A,
-
-        /// <summary>
-        /// The Font Awesome "portrait" icon unicode character.
-        /// </summary>
-        Portrait = 0xF3E0,
-
-        /// <summary>
-        /// The Font Awesome "pound-sign" icon unicode character.
-        /// </summary>
-        PoundSign = 0xF154,
-
-        /// <summary>
-        /// The Font Awesome "power-off" icon unicode character.
-        /// </summary>
-        PowerOff = 0xF011,
-
-        /// <summary>
-        /// The Font Awesome "pray" icon unicode character.
-        /// </summary>
-        Pray = 0xF683,
-
-        /// <summary>
-        /// The Font Awesome "praying-hands" icon unicode character.
-        /// </summary>
-        PrayingHands = 0xF684,
-
-        /// <summary>
-        /// The Font Awesome "prescription" icon unicode character.
-        /// </summary>
-        Prescription = 0xF5B1,
-
-        /// <summary>
-        /// The Font Awesome "prescription-bottle" icon unicode character.
-        /// </summary>
-        PrescriptionBottle = 0xF485,
-
-        /// <summary>
-        /// The Font Awesome "prescription-bottle-alt" icon unicode character.
-        /// </summary>
-        PrescriptionBottleAlt = 0xF486,
-
-        /// <summary>
-        /// The Font Awesome "print" icon unicode character.
-        /// </summary>
-        Print = 0xF02F,
-
-        /// <summary>
-        /// The Font Awesome "procedures" icon unicode character.
-        /// </summary>
-        Procedures = 0xF487,
-
-        /// <summary>
-        /// The Font Awesome "product-hunt" icon unicode character.
-        /// </summary>
-        ProductHunt = 0xF288,
-
-        /// <summary>
-        /// The Font Awesome "project-diagram" icon unicode character.
-        /// </summary>
-        ProjectDiagram = 0xF542,
-
-        /// <summary>
-        /// The Font Awesome "pushed" icon unicode character.
-        /// </summary>
-        Pushed = 0xF3E1,
-
-        /// <summary>
-        /// The Font Awesome "puzzle-piece" icon unicode character.
-        /// </summary>
-        PuzzlePiece = 0xF12E,
-
-        /// <summary>
-        /// The Font Awesome "python" icon unicode character.
-        /// </summary>
-        Python = 0xF3E2,
-
-        /// <summary>
-        /// The Font Awesome "qq" icon unicode character.
-        /// </summary>
-        Qq = 0xF1D6,
-
-        /// <summary>
-        /// The Font Awesome "qrcode" icon unicode character.
-        /// </summary>
-        Qrcode = 0xF029,
-
-        /// <summary>
-        /// The Font Awesome "question" icon unicode character.
-        /// </summary>
-        Question = 0xF128,
-
-        /// <summary>
-        /// The Font Awesome "question-circle" icon unicode character.
-        /// </summary>
-        QuestionCircle = 0xF059,
-
-        /// <summary>
-        /// The Font Awesome "quidditch" icon unicode character.
-        /// </summary>
-        Quidditch = 0xF458,
-
-        /// <summary>
-        /// The Font Awesome "quinscape" icon unicode character.
-        /// </summary>
-        Quinscape = 0xF459,
-
-        /// <summary>
-        /// The Font Awesome "quora" icon unicode character.
-        /// </summary>
-        Quora = 0xF2C4,
-
-        /// <summary>
-        /// The Font Awesome "quote-left" icon unicode character.
-        /// </summary>
-        QuoteLeft = 0xF10D,
-
-        /// <summary>
-        /// The Font Awesome "quote-right" icon unicode character.
-        /// </summary>
-        QuoteRight = 0xF10E,
-
-        /// <summary>
-        /// The Font Awesome "quran" icon unicode character.
-        /// </summary>
-        Quran = 0xF687,
-
-        /// <summary>
-        /// The Font Awesome "radiation" icon unicode character.
-        /// </summary>
-        Radiation = 0xF7B9,
-
-        /// <summary>
-        /// The Font Awesome "radiation-alt" icon unicode character.
-        /// </summary>
-        RadiationAlt = 0xF7BA,
-
-        /// <summary>
-        /// The Font Awesome "rainbow" icon unicode character.
-        /// </summary>
-        Rainbow = 0xF75B,
-
-        /// <summary>
-        /// The Font Awesome "random" icon unicode character.
-        /// </summary>
-        Random = 0xF074,
-
-        /// <summary>
-        /// The Font Awesome "raspberry-pi" icon unicode character.
-        /// </summary>
-        RaspberryPi = 0xF7BB,
-
-        /// <summary>
-        /// The Font Awesome "ravelry" icon unicode character.
-        /// </summary>
-        Ravelry = 0xF2D9,
-
-        /// <summary>
-        /// The Font Awesome "react" icon unicode character.
-        /// </summary>
-        React = 0xF41B,
-
-        /// <summary>
-        /// The Font Awesome "reacteurope" icon unicode character.
-        /// </summary>
-        Reacteurope = 0xF75D,
-
-        /// <summary>
-        /// The Font Awesome "readme" icon unicode character.
-        /// </summary>
-        Readme = 0xF4D5,
-
-        /// <summary>
-        /// The Font Awesome "rebel" icon unicode character.
-        /// </summary>
-        Rebel = 0xF1D0,
-
-        /// <summary>
-        /// The Font Awesome "receipt" icon unicode character.
-        /// </summary>
-        Receipt = 0xF543,
-
-        /// <summary>
-        /// The Font Awesome "record-vinyl" icon unicode character.
-        /// </summary>
-        RecordVinyl = 0xF8D9,
-
-        /// <summary>
-        /// The Font Awesome "recycle" icon unicode character.
-        /// </summary>
-        Recycle = 0xF1B8,
-
-        /// <summary>
-        /// The Font Awesome "reddit" icon unicode character.
-        /// </summary>
-        Reddit = 0xF1A1,
-
-        /// <summary>
-        /// The Font Awesome "reddit-alien" icon unicode character.
-        /// </summary>
-        RedditAlien = 0xF281,
-
-        /// <summary>
-        /// The Font Awesome "reddit-square" icon unicode character.
-        /// </summary>
-        RedditSquare = 0xF1A2,
-
-        /// <summary>
-        /// The Font Awesome "redhat" icon unicode character.
-        /// </summary>
-        Redhat = 0xF7BC,
-
-        /// <summary>
-        /// The Font Awesome "redo" icon unicode character.
-        /// </summary>
-        Redo = 0xF01E,
-
-        /// <summary>
-        /// The Font Awesome "redo-alt" icon unicode character.
-        /// </summary>
-        RedoAlt = 0xF2F9,
-
-        /// <summary>
-        /// The Font Awesome "red-river" icon unicode character.
-        /// </summary>
-        RedRiver = 0xF3E3,
-
-        /// <summary>
-        /// The Font Awesome "registered" icon unicode character.
-        /// </summary>
-        Registered = 0xF25D,
-
-        /// <summary>
-        /// The Font Awesome "remove-format" icon unicode character.
-        /// </summary>
-        RemoveFormat = 0xF87D,
-
-        /// <summary>
-        /// The Font Awesome "renren" icon unicode character.
-        /// </summary>
-        Renren = 0xF18B,
-
-        /// <summary>
-        /// The Font Awesome "reply" icon unicode character.
-        /// </summary>
-        Reply = 0xF3E5,
-
-        /// <summary>
-        /// The Font Awesome "reply-all" icon unicode character.
-        /// </summary>
-        ReplyAll = 0xF122,
-
-        /// <summary>
-        /// The Font Awesome "replyd" icon unicode character.
-        /// </summary>
-        Replyd = 0xF3E6,
-
-        /// <summary>
-        /// The Font Awesome "republican" icon unicode character.
-        /// </summary>
-        Republican = 0xF75E,
-
-        /// <summary>
-        /// The Font Awesome "researchgate" icon unicode character.
-        /// </summary>
-        Researchgate = 0xF4F8,
-
-        /// <summary>
-        /// The Font Awesome "resolving" icon unicode character.
-        /// </summary>
-        Resolving = 0xF3E7,
-
-        /// <summary>
-        /// The Font Awesome "restroom" icon unicode character.
-        /// </summary>
-        Restroom = 0xF7BD,
-
-        /// <summary>
-        /// The Font Awesome "retweet" icon unicode character.
-        /// </summary>
-        Retweet = 0xF079,
-
-        /// <summary>
-        /// The Font Awesome "rev" icon unicode character.
-        /// </summary>
-        Rev = 0xF5B2,
-
-        /// <summary>
-        /// The Font Awesome "ribbon" icon unicode character.
-        /// </summary>
-        Ribbon = 0xF4D6,
-
-        /// <summary>
-        /// The Font Awesome "ring" icon unicode character.
-        /// </summary>
-        Ring = 0xF70B,
-
-        /// <summary>
-        /// The Font Awesome "road" icon unicode character.
-        /// </summary>
-        Road = 0xF018,
-
-        /// <summary>
-        /// The Font Awesome "robot" icon unicode character.
-        /// </summary>
-        Robot = 0xF544,
-
-        /// <summary>
-        /// The Font Awesome "rocket" icon unicode character.
-        /// </summary>
-        Rocket = 0xF135,
-
-        /// <summary>
-        /// The Font Awesome "rocketchat" icon unicode character.
-        /// </summary>
-        Rocketchat = 0xF3E8,
-
-        /// <summary>
-        /// The Font Awesome "rockrms" icon unicode character.
-        /// </summary>
-        Rockrms = 0xF3E9,
-
-        /// <summary>
-        /// The Font Awesome "route" icon unicode character.
-        /// </summary>
-        Route = 0xF4D7,
-
-        /// <summary>
-        /// The Font Awesome "r-project" icon unicode character.
-        /// </summary>
-        RProject = 0xF4F7,
-
-        /// <summary>
-        /// The Font Awesome "rss" icon unicode character.
-        /// </summary>
-        Rss = 0xF09E,
-
-        /// <summary>
-        /// The Font Awesome "rss-square" icon unicode character.
-        /// </summary>
-        RssSquare = 0xF143,
-
-        /// <summary>
-        /// The Font Awesome "ruble-sign" icon unicode character.
-        /// </summary>
-        RubleSign = 0xF158,
-
-        /// <summary>
-        /// The Font Awesome "ruler" icon unicode character.
-        /// </summary>
-        Ruler = 0xF545,
-
-        /// <summary>
-        /// The Font Awesome "ruler-combined" icon unicode character.
-        /// </summary>
-        RulerCombined = 0xF546,
-
-        /// <summary>
-        /// The Font Awesome "ruler-horizontal" icon unicode character.
-        /// </summary>
-        RulerHorizontal = 0xF547,
-
-        /// <summary>
-        /// The Font Awesome "ruler-vertical" icon unicode character.
-        /// </summary>
-        RulerVertical = 0xF548,
-
-        /// <summary>
-        /// The Font Awesome "running" icon unicode character.
-        /// </summary>
-        Running = 0xF70C,
-
-        /// <summary>
-        /// The Font Awesome "rupee-sign" icon unicode character.
-        /// </summary>
-        RupeeSign = 0xF156,
-
-        /// <summary>
-        /// The Font Awesome "sad-cry" icon unicode character.
-        /// </summary>
-        SadCry = 0xF5B3,
-
-        /// <summary>
-        /// The Font Awesome "sad-tear" icon unicode character.
-        /// </summary>
-        SadTear = 0xF5B4,
-
-        /// <summary>
-        /// The Font Awesome "safari" icon unicode character.
-        /// </summary>
-        Safari = 0xF267,
-
-        /// <summary>
-        /// The Font Awesome "salesforce" icon unicode character.
-        /// </summary>
-        Salesforce = 0xF83B,
-
-        /// <summary>
-        /// The Font Awesome "sass" icon unicode character.
-        /// </summary>
-        Sass = 0xF41E,
-
-        /// <summary>
-        /// The Font Awesome "satellite" icon unicode character.
-        /// </summary>
-        Satellite = 0xF7BF,
-
-        /// <summary>
-        /// The Font Awesome "satellite-dish" icon unicode character.
-        /// </summary>
-        SatelliteDish = 0xF7C0,
-
-        /// <summary>
-        /// The Font Awesome "save" icon unicode character.
-        /// </summary>
-        Save = 0xF0C7,
-
-        /// <summary>
-        /// The Font Awesome "schlix" icon unicode character.
-        /// </summary>
-        Schlix = 0xF3EA,
-
-        /// <summary>
-        /// The Font Awesome "school" icon unicode character.
-        /// </summary>
-        School = 0xF549,
-
-        /// <summary>
-        /// The Font Awesome "screwdriver" icon unicode character.
-        /// </summary>
-        Screwdriver = 0xF54A,
-
-        /// <summary>
-        /// The Font Awesome "scribd" icon unicode character.
-        /// </summary>
-        Scribd = 0xF28A,
-
-        /// <summary>
-        /// The Font Awesome "scroll" icon unicode character.
-        /// </summary>
-        Scroll = 0xF70E,
-
-        /// <summary>
-        /// The Font Awesome "sd-card" icon unicode character.
-        /// </summary>
-        SdCard = 0xF7C2,
-
-        /// <summary>
-        /// The Font Awesome "search" icon unicode character.
-        /// </summary>
-        Search = 0xF002,
-
-        /// <summary>
-        /// The Font Awesome "search-dollar" icon unicode character.
-        /// </summary>
-        SearchDollar = 0xF688,
-
-        /// <summary>
-        /// The Font Awesome "searchengin" icon unicode character.
-        /// </summary>
-        Searchengin = 0xF3EB,
-
-        /// <summary>
-        /// The Font Awesome "search-location" icon unicode character.
-        /// </summary>
-        SearchLocation = 0xF689,
-
-        /// <summary>
-        /// The Font Awesome "search-minus" icon unicode character.
-        /// </summary>
-        SearchMinus = 0xF010,
-
-        /// <summary>
-        /// The Font Awesome "search-plus" icon unicode character.
-        /// </summary>
-        SearchPlus = 0xF00E,
-
-        /// <summary>
-        /// The Font Awesome "seedling" icon unicode character.
-        /// </summary>
-        Seedling = 0xF4D8,
-
-        /// <summary>
-        /// The Font Awesome "sellcast" icon unicode character.
-        /// </summary>
-        Sellcast = 0xF2DA,
-
-        /// <summary>
-        /// The Font Awesome "sellsy" icon unicode character.
-        /// </summary>
-        Sellsy = 0xF213,
-
-        /// <summary>
-        /// The Font Awesome "server" icon unicode character.
-        /// </summary>
-        Server = 0xF233,
-
-        /// <summary>
-        /// The Font Awesome "servicestack" icon unicode character.
-        /// </summary>
-        Servicestack = 0xF3EC,
-
-        /// <summary>
-        /// The Font Awesome "shapes" icon unicode character.
-        /// </summary>
-        Shapes = 0xF61F,
-
-        /// <summary>
-        /// The Font Awesome "share" icon unicode character.
-        /// </summary>
-        Share = 0xF064,
-
-        /// <summary>
-        /// The Font Awesome "share-alt" icon unicode character.
-        /// </summary>
-        ShareAlt = 0xF1E0,
-
-        /// <summary>
-        /// The Font Awesome "share-alt-square" icon unicode character.
-        /// </summary>
-        ShareAltSquare = 0xF1E1,
-
-        /// <summary>
-        /// The Font Awesome "share-square" icon unicode character.
-        /// </summary>
-        ShareSquare = 0xF14D,
-
-        /// <summary>
-        /// The Font Awesome "shekel-sign" icon unicode character.
-        /// </summary>
-        ShekelSign = 0xF20B,
-
-        /// <summary>
-        /// The Font Awesome "shield-alt" icon unicode character.
-        /// </summary>
-        ShieldAlt = 0xF3ED,
-
-        /// <summary>
-        /// The Font Awesome "ship" icon unicode character.
-        /// </summary>
-        Ship = 0xF21A,
-
-        /// <summary>
-        /// The Font Awesome "shipping-fast" icon unicode character.
-        /// </summary>
-        ShippingFast = 0xF48B,
-
-        /// <summary>
-        /// The Font Awesome "shirtsinbulk" icon unicode character.
-        /// </summary>
-        Shirtsinbulk = 0xF214,
-
-        /// <summary>
-        /// The Font Awesome "shoe-prints" icon unicode character.
-        /// </summary>
-        ShoePrints = 0xF54B,
-
-        /// <summary>
-        /// The Font Awesome "shopify" icon unicode character.
-        /// </summary>
-        Shopify = 0xF957,
-
-        /// <summary>
-        /// The Font Awesome "shopping-bag" icon unicode character.
-        /// </summary>
-        ShoppingBag = 0xF290,
-
-        /// <summary>
-        /// The Font Awesome "shopping-basket" icon unicode character.
-        /// </summary>
-        ShoppingBasket = 0xF291,
-
-        /// <summary>
-        /// The Font Awesome "shopping-cart" icon unicode character.
-        /// </summary>
-        ShoppingCart = 0xF07A,
-
-        /// <summary>
-        /// The Font Awesome "shopware" icon unicode character.
-        /// </summary>
-        Shopware = 0xF5B5,
-
-        /// <summary>
-        /// The Font Awesome "shower" icon unicode character.
-        /// </summary>
-        Shower = 0xF2CC,
-
-        /// <summary>
-        /// The Font Awesome "shuttle-van" icon unicode character.
-        /// </summary>
-        ShuttleVan = 0xF5B6,
-
-        /// <summary>
-        /// The Font Awesome "sign" icon unicode character.
-        /// </summary>
-        Sign = 0xF4D9,
-
-        /// <summary>
-        /// The Font Awesome "signal" icon unicode character.
-        /// </summary>
-        Signal = 0xF012,
-
-        /// <summary>
-        /// The Font Awesome "signature" icon unicode character.
-        /// </summary>
-        Signature = 0xF5B7,
-
-        /// <summary>
-        /// The Font Awesome "sign-in-alt" icon unicode character.
-        /// </summary>
-        SignInAlt = 0xF2F6,
-
-        /// <summary>
-        /// The Font Awesome "sign-language" icon unicode character.
-        /// </summary>
-        SignLanguage = 0xF2A7,
-
-        /// <summary>
-        /// The Font Awesome "sign-out-alt" icon unicode character.
-        /// </summary>
-        SignOutAlt = 0xF2F5,
-
-        /// <summary>
-        /// The Font Awesome "sim-card" icon unicode character.
-        /// </summary>
-        SimCard = 0xF7C4,
-
-        /// <summary>
-        /// The Font Awesome "simplybuilt" icon unicode character.
-        /// </summary>
-        Simplybuilt = 0xF215,
-
-        /// <summary>
-        /// The Font Awesome "sistrix" icon unicode character.
-        /// </summary>
-        Sistrix = 0xF3EE,
-
-        /// <summary>
-        /// The Font Awesome "sitemap" icon unicode character.
-        /// </summary>
-        Sitemap = 0xF0E8,
-
-        /// <summary>
-        /// The Font Awesome "sith" icon unicode character.
-        /// </summary>
-        Sith = 0xF512,
-
-        /// <summary>
-        /// The Font Awesome "skating" icon unicode character.
-        /// </summary>
-        Skating = 0xF7C5,
-
-        /// <summary>
-        /// The Font Awesome "sketch" icon unicode character.
-        /// </summary>
-        Sketch = 0xF7C6,
-
-        /// <summary>
-        /// The Font Awesome "skiing" icon unicode character.
-        /// </summary>
-        Skiing = 0xF7C9,
-
-        /// <summary>
-        /// The Font Awesome "skiing-nordic" icon unicode character.
-        /// </summary>
-        SkiingNordic = 0xF7CA,
-
-        /// <summary>
-        /// The Font Awesome "skull" icon unicode character.
-        /// </summary>
-        Skull = 0xF54C,
-
-        /// <summary>
-        /// The Font Awesome "skull-crossbones" icon unicode character.
-        /// </summary>
-        SkullCrossbones = 0xF714,
-
-        /// <summary>
-        /// The Font Awesome "skyatlas" icon unicode character.
-        /// </summary>
-        Skyatlas = 0xF216,
-
-        /// <summary>
-        /// The Font Awesome "skype" icon unicode character.
-        /// </summary>
-        Skype = 0xF17E,
-
-        /// <summary>
-        /// The Font Awesome "slack" icon unicode character.
-        /// </summary>
-        Slack = 0xF198,
-
-        /// <summary>
-        /// The Font Awesome "slack-hash" icon unicode character.
-        /// </summary>
-        SlackHash = 0xF3EF,
-
-        /// <summary>
-        /// The Font Awesome "slash" icon unicode character.
-        /// </summary>
-        Slash = 0xF715,
-
-        /// <summary>
-        /// The Font Awesome "sleigh" icon unicode character.
-        /// </summary>
-        Sleigh = 0xF7CC,
-
-        /// <summary>
-        /// The Font Awesome "sliders-h" icon unicode character.
-        /// </summary>
-        SlidersH = 0xF1DE,
-
-        /// <summary>
-        /// The Font Awesome "slideshare" icon unicode character.
-        /// </summary>
-        Slideshare = 0xF1E7,
-
-        /// <summary>
-        /// The Font Awesome "smile" icon unicode character.
-        /// </summary>
-        Smile = 0xF118,
-
-        /// <summary>
-        /// The Font Awesome "smile-beam" icon unicode character.
-        /// </summary>
-        SmileBeam = 0xF5B8,
-
-        /// <summary>
-        /// The Font Awesome "smile-wink" icon unicode character.
-        /// </summary>
-        SmileWink = 0xF4DA,
-
-        /// <summary>
-        /// The Font Awesome "smog" icon unicode character.
-        /// </summary>
-        Smog = 0xF75F,
-
-        /// <summary>
-        /// The Font Awesome "smoking" icon unicode character.
-        /// </summary>
-        Smoking = 0xF48D,
-
-        /// <summary>
-        /// The Font Awesome "smoking-ban" icon unicode character.
-        /// </summary>
-        SmokingBan = 0xF54D,
-
-        /// <summary>
-        /// The Font Awesome "sms" icon unicode character.
-        /// </summary>
-        Sms = 0xF7CD,
-
-        /// <summary>
-        /// The Font Awesome "snapchat" icon unicode character.
-        /// </summary>
-        Snapchat = 0xF2AB,
-
-        /// <summary>
-        /// The Font Awesome "snapchat-ghost" icon unicode character.
-        /// </summary>
-        SnapchatGhost = 0xF2AC,
-
-        /// <summary>
-        /// The Font Awesome "snapchat-square" icon unicode character.
-        /// </summary>
-        SnapchatSquare = 0xF2AD,
-
-        /// <summary>
-        /// The Font Awesome "snowboarding" icon unicode character.
-        /// </summary>
-        Snowboarding = 0xF7CE,
-
-        /// <summary>
-        /// The Font Awesome "snowflake" icon unicode character.
-        /// </summary>
-        Snowflake = 0xF2DC,
-
-        /// <summary>
-        /// The Font Awesome "snowman" icon unicode character.
-        /// </summary>
-        Snowman = 0xF7D0,
-
-        /// <summary>
-        /// The Font Awesome "snowplow" icon unicode character.
-        /// </summary>
-        Snowplow = 0xF7D2,
-
-        /// <summary>
-        /// The Font Awesome "socks" icon unicode character.
-        /// </summary>
-        Socks = 0xF696,
-
-        /// <summary>
-        /// The Font Awesome "solar-panel" icon unicode character.
-        /// </summary>
-        SolarPanel = 0xF5BA,
-
-        /// <summary>
-        /// The Font Awesome "sort" icon unicode character.
-        /// </summary>
-        Sort = 0xF0DC,
-
-        /// <summary>
-        /// The Font Awesome "sort-alpha-down" icon unicode character.
-        /// </summary>
-        SortAlphaDown = 0xF15D,
-
-        /// <summary>
-        /// The Font Awesome "sort-alpha-down-alt" icon unicode character.
-        /// </summary>
-        SortAlphaDownAlt = 0xF881,
-
-        /// <summary>
-        /// The Font Awesome "sort-alpha-up" icon unicode character.
-        /// </summary>
-        SortAlphaUp = 0xF15E,
-
-        /// <summary>
-        /// The Font Awesome "sort-alpha-up-alt" icon unicode character.
-        /// </summary>
-        SortAlphaUpAlt = 0xF882,
-
-        /// <summary>
-        /// The Font Awesome "sort-amount-down" icon unicode character.
-        /// </summary>
-        SortAmountDown = 0xF160,
-
-        /// <summary>
-        /// The Font Awesome "sort-amount-down-alt" icon unicode character.
-        /// </summary>
-        SortAmountDownAlt = 0xF884,
-
-        /// <summary>
-        /// The Font Awesome "sort-amount-up" icon unicode character.
-        /// </summary>
-        SortAmountUp = 0xF161,
-
-        /// <summary>
-        /// The Font Awesome "sort-amount-up-alt" icon unicode character.
-        /// </summary>
-        SortAmountUpAlt = 0xF885,
-
-        /// <summary>
-        /// The Font Awesome "sort-down" icon unicode character.
-        /// </summary>
-        SortDown = 0xF0DD,
-
-        /// <summary>
-        /// The Font Awesome "sort-numeric-down" icon unicode character.
-        /// </summary>
-        SortNumericDown = 0xF162,
-
-        /// <summary>
-        /// The Font Awesome "sort-numeric-down-alt" icon unicode character.
-        /// </summary>
-        SortNumericDownAlt = 0xF886,
-
-        /// <summary>
-        /// The Font Awesome "sort-numeric-up" icon unicode character.
-        /// </summary>
-        SortNumericUp = 0xF163,
-
-        /// <summary>
-        /// The Font Awesome "sort-numeric-up-alt" icon unicode character.
-        /// </summary>
-        SortNumericUpAlt = 0xF887,
-
-        /// <summary>
-        /// The Font Awesome "sort-up" icon unicode character.
-        /// </summary>
-        SortUp = 0xF0DE,
-
-        /// <summary>
-        /// The Font Awesome "soundcloud" icon unicode character.
-        /// </summary>
-        Soundcloud = 0xF1BE,
-
-        /// <summary>
-        /// The Font Awesome "sourcetree" icon unicode character.
-        /// </summary>
-        Sourcetree = 0xF7D3,
-
-        /// <summary>
-        /// The Font Awesome "spa" icon unicode character.
-        /// </summary>
-        Spa = 0xF5BB,
-
-        /// <summary>
-        /// The Font Awesome "space-shuttle" icon unicode character.
-        /// </summary>
-        SpaceShuttle = 0xF197,
-
-        /// <summary>
-        /// The Font Awesome "speakap" icon unicode character.
-        /// </summary>
-        Speakap = 0xF3F3,
-
-        /// <summary>
-        /// The Font Awesome "speaker-deck" icon unicode character.
-        /// </summary>
-        SpeakerDeck = 0xF83C,
-
-        /// <summary>
-        /// The Font Awesome "spell-check" icon unicode character.
-        /// </summary>
-        SpellCheck = 0xF891,
-
-        /// <summary>
-        /// The Font Awesome "spider" icon unicode character.
-        /// </summary>
-        Spider = 0xF717,
-
-        /// <summary>
-        /// The Font Awesome "spinner" icon unicode character.
-        /// </summary>
-        Spinner = 0xF110,
-
-        /// <summary>
-        /// The Font Awesome "splotch" icon unicode character.
-        /// </summary>
-        Splotch = 0xF5BC,
-
-        /// <summary>
-        /// The Font Awesome "spotify" icon unicode character.
-        /// </summary>
-        Spotify = 0xF1BC,
-
-        /// <summary>
-        /// The Font Awesome "spray-can" icon unicode character.
-        /// </summary>
-        SprayCan = 0xF5BD,
-
-        /// <summary>
-        /// The Font Awesome "square" icon unicode character.
-        /// </summary>
-        Square = 0xF0C8,
-
-        /// <summary>
-        /// The Font Awesome "square-full" icon unicode character.
-        /// </summary>
-        SquareFull = 0xF45C,
-
-        /// <summary>
-        /// The Font Awesome "square-root-alt" icon unicode character.
-        /// </summary>
-        SquareRootAlt = 0xF698,
-
-        /// <summary>
-        /// The Font Awesome "squarespace" icon unicode character.
-        /// </summary>
-        Squarespace = 0xF5BE,
-
-        /// <summary>
-        /// The Font Awesome "stack-exchange" icon unicode character.
-        /// </summary>
-        StackExchange = 0xF18D,
-
-        /// <summary>
-        /// The Font Awesome "stack-overflow" icon unicode character.
-        /// </summary>
-        StackOverflow = 0xF16C,
-
-        /// <summary>
-        /// The Font Awesome "stackpath" icon unicode character.
-        /// </summary>
-        Stackpath = 0xF842,
-
-        /// <summary>
-        /// The Font Awesome "stamp" icon unicode character.
-        /// </summary>
-        Stamp = 0xF5BF,
-
-        /// <summary>
-        /// The Font Awesome "star" icon unicode character.
-        /// </summary>
-        Star = 0xF005,
-
-        /// <summary>
-        /// The Font Awesome "star-and-crescent" icon unicode character.
-        /// </summary>
-        StarAndCrescent = 0xF699,
-
-        /// <summary>
-        /// The Font Awesome "star-half" icon unicode character.
-        /// </summary>
-        StarHalf = 0xF089,
-
-        /// <summary>
-        /// The Font Awesome "star-half-alt" icon unicode character.
-        /// </summary>
-        StarHalfAlt = 0xF5C0,
-
-        /// <summary>
-        /// The Font Awesome "star-of-david" icon unicode character.
-        /// </summary>
-        StarOfDavid = 0xF69A,
-
-        /// <summary>
-        /// The Font Awesome "star-of-life" icon unicode character.
-        /// </summary>
-        StarOfLife = 0xF621,
-
-        /// <summary>
-        /// The Font Awesome "staylinked" icon unicode character.
-        /// </summary>
-        Staylinked = 0xF3F5,
-
-        /// <summary>
-        /// The Font Awesome "steam" icon unicode character.
-        /// </summary>
-        Steam = 0xF1B6,
-
-        /// <summary>
-        /// The Font Awesome "steam-square" icon unicode character.
-        /// </summary>
-        SteamSquare = 0xF1B7,
-
-        /// <summary>
-        /// The Font Awesome "steam-symbol" icon unicode character.
-        /// </summary>
-        SteamSymbol = 0xF3F6,
-
-        /// <summary>
-        /// The Font Awesome "step-backward" icon unicode character.
-        /// </summary>
-        StepBackward = 0xF048,
-
-        /// <summary>
-        /// The Font Awesome "step-forward" icon unicode character.
-        /// </summary>
-        StepForward = 0xF051,
-
-        /// <summary>
-        /// The Font Awesome "stethoscope" icon unicode character.
-        /// </summary>
-        Stethoscope = 0xF0F1,
-
-        /// <summary>
-        /// The Font Awesome "sticker-mule" icon unicode character.
-        /// </summary>
-        StickerMule = 0xF3F7,
-
-        /// <summary>
-        /// The Font Awesome "sticky-note" icon unicode character.
-        /// </summary>
-        StickyNote = 0xF249,
-
-        /// <summary>
-        /// The Font Awesome "stop" icon unicode character.
-        /// </summary>
-        Stop = 0xF04D,
-
-        /// <summary>
-        /// The Font Awesome "stop-circle" icon unicode character.
-        /// </summary>
-        StopCircle = 0xF28D,
-
-        /// <summary>
-        /// The Font Awesome "stopwatch" icon unicode character.
-        /// </summary>
-        Stopwatch = 0xF2F2,
-
-        /// <summary>
-        /// The Font Awesome "store" icon unicode character.
-        /// </summary>
-        Store = 0xF54E,
-
-        /// <summary>
-        /// The Font Awesome "store-alt" icon unicode character.
-        /// </summary>
-        StoreAlt = 0xF54F,
-
-        /// <summary>
-        /// The Font Awesome "strava" icon unicode character.
-        /// </summary>
-        Strava = 0xF428,
-
-        /// <summary>
-        /// The Font Awesome "stream" icon unicode character.
-        /// </summary>
-        Stream = 0xF550,
-
-        /// <summary>
-        /// The Font Awesome "street-view" icon unicode character.
-        /// </summary>
-        StreetView = 0xF21D,
-
-        /// <summary>
-        /// The Font Awesome "strikethrough" icon unicode character.
-        /// </summary>
-        Strikethrough = 0xF0CC,
-
-        /// <summary>
-        /// The Font Awesome "stripe" icon unicode character.
-        /// </summary>
-        Stripe = 0xF429,
-
-        /// <summary>
-        /// The Font Awesome "stripe-s" icon unicode character.
-        /// </summary>
-        StripeS = 0xF42A,
-
-        /// <summary>
-        /// The Font Awesome "stroopwafel" icon unicode character.
-        /// </summary>
-        Stroopwafel = 0xF551,
-
-        /// <summary>
-        /// The Font Awesome "studiovinari" icon unicode character.
-        /// </summary>
-        Studiovinari = 0xF3F8,
-
-        /// <summary>
-        /// The Font Awesome "stumbleupon" icon unicode character.
-        /// </summary>
-        Stumbleupon = 0xF1A4,
-
-        /// <summary>
-        /// The Font Awesome "stumbleupon-circle" icon unicode character.
-        /// </summary>
-        StumbleuponCircle = 0xF1A3,
-
-        /// <summary>
-        /// The Font Awesome "subscript" icon unicode character.
-        /// </summary>
-        Subscript = 0xF12C,
-
-        /// <summary>
-        /// The Font Awesome "subway" icon unicode character.
-        /// </summary>
-        Subway = 0xF239,
-
-        /// <summary>
-        /// The Font Awesome "suitcase" icon unicode character.
-        /// </summary>
-        Suitcase = 0xF0F2,
-
-        /// <summary>
-        /// The Font Awesome "suitcase-rolling" icon unicode character.
-        /// </summary>
-        SuitcaseRolling = 0xF5C1,
-
-        /// <summary>
-        /// The Font Awesome "sun" icon unicode character.
-        /// </summary>
-        Sun = 0xF185,
-
-        /// <summary>
-        /// The Font Awesome "superpowers" icon unicode character.
-        /// </summary>
-        Superpowers = 0xF2DD,
-
-        /// <summary>
-        /// The Font Awesome "superscript" icon unicode character.
-        /// </summary>
-        Superscript = 0xF12B,
-
-        /// <summary>
-        /// The Font Awesome "supple" icon unicode character.
-        /// </summary>
-        Supple = 0xF3F9,
-
-        /// <summary>
-        /// The Font Awesome "surprise" icon unicode character.
-        /// </summary>
-        Surprise = 0xF5C2,
-
-        /// <summary>
-        /// The Font Awesome "suse" icon unicode character.
-        /// </summary>
-        Suse = 0xF7D6,
-
-        /// <summary>
-        /// The Font Awesome "swatchbook" icon unicode character.
-        /// </summary>
-        Swatchbook = 0xF5C3,
-
-        /// <summary>
-        /// The Font Awesome "swift" icon unicode character.
-        /// </summary>
-        Swift = 0xF8E1,
-
-        /// <summary>
-        /// The Font Awesome "swimmer" icon unicode character.
-        /// </summary>
-        Swimmer = 0xF5C4,
-
-        /// <summary>
-        /// The Font Awesome "swimming-pool" icon unicode character.
-        /// </summary>
-        SwimmingPool = 0xF5C5,
-
-        /// <summary>
-        /// The Font Awesome "symfony" icon unicode character.
-        /// </summary>
-        Symfony = 0xF83D,
-
-        /// <summary>
-        /// The Font Awesome "synagogue" icon unicode character.
-        /// </summary>
-        Synagogue = 0xF69B,
-
-        /// <summary>
-        /// The Font Awesome "sync" icon unicode character.
-        /// </summary>
-        Sync = 0xF021,
-
-        /// <summary>
-        /// The Font Awesome "sync-alt" icon unicode character.
-        /// </summary>
-        SyncAlt = 0xF2F1,
-
-        /// <summary>
-        /// The Font Awesome "syringe" icon unicode character.
-        /// </summary>
-        Syringe = 0xF48E,
-
-        /// <summary>
-        /// The Font Awesome "table" icon unicode character.
-        /// </summary>
-        Table = 0xF0CE,
-
-        /// <summary>
-        /// The Font Awesome "tablet" icon unicode character.
-        /// </summary>
-        Tablet = 0xF10A,
-
-        /// <summary>
-        /// The Font Awesome "tablet-alt" icon unicode character.
-        /// </summary>
-        TabletAlt = 0xF3FA,
-
-        /// <summary>
-        /// The Font Awesome "table-tennis" icon unicode character.
-        /// </summary>
-        TableTennis = 0xF45D,
-
-        /// <summary>
-        /// The Font Awesome "tablets" icon unicode character.
-        /// </summary>
-        Tablets = 0xF490,
-
-        /// <summary>
-        /// The Font Awesome "tachometer-alt" icon unicode character.
-        /// </summary>
-        TachometerAlt = 0xF3FD,
-
-        /// <summary>
-        /// The Font Awesome "tag" icon unicode character.
-        /// </summary>
-        Tag = 0xF02B,
-
-        /// <summary>
-        /// The Font Awesome "tags" icon unicode character.
-        /// </summary>
-        Tags = 0xF02C,
-
-        /// <summary>
-        /// The Font Awesome "tape" icon unicode character.
-        /// </summary>
-        Tape = 0xF4DB,
-
-        /// <summary>
-        /// The Font Awesome "tasks" icon unicode character.
-        /// </summary>
-        Tasks = 0xF0AE,
-
-        /// <summary>
-        /// The Font Awesome "taxi" icon unicode character.
-        /// </summary>
-        Taxi = 0xF1BA,
-
-        /// <summary>
-        /// The Font Awesome "teamspeak" icon unicode character.
-        /// </summary>
-        Teamspeak = 0xF4F9,
-
-        /// <summary>
-        /// The Font Awesome "teeth" icon unicode character.
-        /// </summary>
-        Teeth = 0xF62E,
-
-        /// <summary>
-        /// The Font Awesome "teeth-open" icon unicode character.
-        /// </summary>
-        TeethOpen = 0xF62F,
-
-        /// <summary>
-        /// The Font Awesome "telegram" icon unicode character.
-        /// </summary>
-        Telegram = 0xF2C6,
-
-        /// <summary>
-        /// The Font Awesome "telegram-plane" icon unicode character.
-        /// </summary>
-        TelegramPlane = 0xF3FE,
-
-        /// <summary>
-        /// The Font Awesome "temperature-high" icon unicode character.
-        /// </summary>
-        TemperatureHigh = 0xF769,
-
-        /// <summary>
-        /// The Font Awesome "temperature-low" icon unicode character.
-        /// </summary>
-        TemperatureLow = 0xF76B,
-
-        /// <summary>
-        /// The Font Awesome "tencent-weibo" icon unicode character.
-        /// </summary>
-        TencentWeibo = 0xF1D5,
-
-        /// <summary>
-        /// The Font Awesome "tenge" icon unicode character.
-        /// </summary>
-        Tenge = 0xF7D7,
-
-        /// <summary>
-        /// The Font Awesome "terminal" icon unicode character.
-        /// </summary>
-        Terminal = 0xF120,
-
-        /// <summary>
-        /// The Font Awesome "text-height" icon unicode character.
-        /// </summary>
-        TextHeight = 0xF034,
-
-        /// <summary>
-        /// The Font Awesome "text-width" icon unicode character.
-        /// </summary>
-        TextWidth = 0xF035,
-
-        /// <summary>
-        /// The Font Awesome "th" icon unicode character.
-        /// </summary>
-        Th = 0xF00A,
-
-        /// <summary>
-        /// The Font Awesome "theater-masks" icon unicode character.
-        /// </summary>
-        TheaterMasks = 0xF630,
-
-        /// <summary>
-        /// The Font Awesome "themeco" icon unicode character.
-        /// </summary>
-        Themeco = 0xF5C6,
-
-        /// <summary>
-        /// The Font Awesome "themeisle" icon unicode character.
-        /// </summary>
-        Themeisle = 0xF2B2,
-
-        /// <summary>
-        /// The Font Awesome "the-red-yeti" icon unicode character.
-        /// </summary>
-        TheRedYeti = 0xF69D,
-
-        /// <summary>
-        /// The Font Awesome "thermometer" icon unicode character.
-        /// </summary>
-        Thermometer = 0xF491,
-
-        /// <summary>
-        /// The Font Awesome "thermometer-empty" icon unicode character.
-        /// </summary>
-        ThermometerEmpty = 0xF2CB,
-
-        /// <summary>
-        /// The Font Awesome "thermometer-full" icon unicode character.
-        /// </summary>
-        ThermometerFull = 0xF2C7,
-
-        /// <summary>
-        /// The Font Awesome "thermometer-half" icon unicode character.
-        /// </summary>
-        ThermometerHalf = 0xF2C9,
-
-        /// <summary>
-        /// The Font Awesome "thermometer-quarter" icon unicode character.
-        /// </summary>
-        ThermometerQuarter = 0xF2CA,
-
-        /// <summary>
-        /// The Font Awesome "thermometer-three-quarters" icon unicode character.
-        /// </summary>
-        ThermometerThreeQuarters = 0xF2C8,
-
-        /// <summary>
-        /// The Font Awesome "think-peaks" icon unicode character.
-        /// </summary>
-        ThinkPeaks = 0xF731,
-
-        /// <summary>
-        /// The Font Awesome "th-large" icon unicode character.
-        /// </summary>
-        ThLarge = 0xF009,
-
-        /// <summary>
-        /// The Font Awesome "th-list" icon unicode character.
-        /// </summary>
-        ThList = 0xF00B,
-
-        /// <summary>
-        /// The Font Awesome "thumbs-down" icon unicode character.
-        /// </summary>
-        ThumbsDown = 0xF165,
-
-        /// <summary>
-        /// The Font Awesome "thumbs-up" icon unicode character.
-        /// </summary>
-        ThumbsUp = 0xF164,
-
-        /// <summary>
-        /// The Font Awesome "thumbtack" icon unicode character.
-        /// </summary>
-        Thumbtack = 0xF08D,
-
-        /// <summary>
-        /// The Font Awesome "ticket-alt" icon unicode character.
-        /// </summary>
-        TicketAlt = 0xF3FF,
-
-        /// <summary>
-        /// The Font Awesome "times" icon unicode character.
-        /// </summary>
-        Times = 0xF00D,
-
-        /// <summary>
-        /// The Font Awesome "times-circle" icon unicode character.
-        /// </summary>
-        TimesCircle = 0xF057,
-
-        /// <summary>
-        /// The Font Awesome "tint" icon unicode character.
-        /// </summary>
-        Tint = 0xF043,
-
-        /// <summary>
-        /// The Font Awesome "tint-slash" icon unicode character.
-        /// </summary>
-        TintSlash = 0xF5C7,
-
-        /// <summary>
-        /// The Font Awesome "tired" icon unicode character.
-        /// </summary>
-        Tired = 0xF5C8,
-
-        /// <summary>
-        /// The Font Awesome "toggle-off" icon unicode character.
-        /// </summary>
-        ToggleOff = 0xF204,
-
-        /// <summary>
-        /// The Font Awesome "toggle-on" icon unicode character.
-        /// </summary>
-        ToggleOn = 0xF205,
-
-        /// <summary>
-        /// The Font Awesome "toilet" icon unicode character.
-        /// </summary>
-        Toilet = 0xF7D8,
-
-        /// <summary>
-        /// The Font Awesome "toilet-paper" icon unicode character.
-        /// </summary>
-        ToiletPaper = 0xF71E,
-
-        /// <summary>
-        /// The Font Awesome "toolbox" icon unicode character.
-        /// </summary>
-        Toolbox = 0xF552,
-
-        /// <summary>
-        /// The Font Awesome "tools" icon unicode character.
-        /// </summary>
-        Tools = 0xF7D9,
-
-        /// <summary>
-        /// The Font Awesome "tooth" icon unicode character.
-        /// </summary>
-        Tooth = 0xF5C9,
-
-        /// <summary>
-        /// The Font Awesome "torah" icon unicode character.
-        /// </summary>
-        Torah = 0xF6A0,
-
-        /// <summary>
-        /// The Font Awesome "torii-gate" icon unicode character.
-        /// </summary>
-        ToriiGate = 0xF6A1,
-
-        /// <summary>
-        /// The Font Awesome "tractor" icon unicode character.
-        /// </summary>
-        Tractor = 0xF722,
-
-        /// <summary>
-        /// The Font Awesome "trade-federation" icon unicode character.
-        /// </summary>
-        TradeFederation = 0xF513,
-
-        /// <summary>
-        /// The Font Awesome "trademark" icon unicode character.
-        /// </summary>
-        Trademark = 0xF25C,
-
-        /// <summary>
-        /// The Font Awesome "traffic-light" icon unicode character.
-        /// </summary>
-        TrafficLight = 0xF637,
-
-        /// <summary>
-        /// The Font Awesome "trailer" icon unicode character.
-        /// </summary>
-        Trailer = 0xF941,
-
-        /// <summary>
-        /// The Font Awesome "train" icon unicode character.
-        /// </summary>
-        Train = 0xF238,
-
-        /// <summary>
-        /// The Font Awesome "tram" icon unicode character.
-        /// </summary>
-        Tram = 0xF7DA,
-
-        /// <summary>
-        /// The Font Awesome "transgender" icon unicode character.
-        /// </summary>
-        Transgender = 0xF224,
-
-        /// <summary>
-        /// The Font Awesome "transgender-alt" icon unicode character.
-        /// </summary>
-        TransgenderAlt = 0xF225,
-
-        /// <summary>
-        /// The Font Awesome "trash" icon unicode character.
-        /// </summary>
-        Trash = 0xF1F8,
-
-        /// <summary>
-        /// The Font Awesome "trash-alt" icon unicode character.
-        /// </summary>
-        TrashAlt = 0xF2ED,
-
-        /// <summary>
-        /// The Font Awesome "trash-restore" icon unicode character.
-        /// </summary>
-        TrashRestore = 0xF829,
-
-        /// <summary>
-        /// The Font Awesome "trash-restore-alt" icon unicode character.
-        /// </summary>
-        TrashRestoreAlt = 0xF82A,
-
-        /// <summary>
-        /// The Font Awesome "tree" icon unicode character.
-        /// </summary>
-        Tree = 0xF1BB,
-
-        /// <summary>
-        /// The Font Awesome "trello" icon unicode character.
-        /// </summary>
-        Trello = 0xF181,
-
-        /// <summary>
-        /// The Font Awesome "tripadvisor" icon unicode character.
-        /// </summary>
-        Tripadvisor = 0xF262,
-
-        /// <summary>
-        /// The Font Awesome "trophy" icon unicode character.
-        /// </summary>
-        Trophy = 0xF091,
-
-        /// <summary>
-        /// The Font Awesome "truck" icon unicode character.
-        /// </summary>
-        Truck = 0xF0D1,
-
-        /// <summary>
-        /// The Font Awesome "truck-loading" icon unicode character.
-        /// </summary>
-        TruckLoading = 0xF4DE,
-
-        /// <summary>
-        /// The Font Awesome "truck-monster" icon unicode character.
-        /// </summary>
-        TruckMonster = 0xF63B,
-
-        /// <summary>
-        /// The Font Awesome "truck-moving" icon unicode character.
-        /// </summary>
-        TruckMoving = 0xF4DF,
-
-        /// <summary>
-        /// The Font Awesome "truck-pickup" icon unicode character.
-        /// </summary>
-        TruckPickup = 0xF63C,
-
-        /// <summary>
-        /// The Font Awesome "tshirt" icon unicode character.
-        /// </summary>
-        Tshirt = 0xF553,
-
-        /// <summary>
-        /// The Font Awesome "tty" icon unicode character.
-        /// </summary>
-        Tty = 0xF1E4,
-
-        /// <summary>
-        /// The Font Awesome "tumblr" icon unicode character.
-        /// </summary>
-        Tumblr = 0xF173,
-
-        /// <summary>
-        /// The Font Awesome "tumblr-square" icon unicode character.
-        /// </summary>
-        TumblrSquare = 0xF174,
-
-        /// <summary>
-        /// The Font Awesome "tv" icon unicode character.
-        /// </summary>
-        Tv = 0xF26C,
-
-        /// <summary>
-        /// The Font Awesome "twitch" icon unicode character.
-        /// </summary>
-        Twitch = 0xF1E8,
-
-        /// <summary>
-        /// The Font Awesome "twitter" icon unicode character.
-        /// </summary>
-        Twitter = 0xF099,
-
-        /// <summary>
-        /// The Font Awesome "twitter-square" icon unicode character.
-        /// </summary>
-        TwitterSquare = 0xF081,
-
-        /// <summary>
-        /// The Font Awesome "typo3" icon unicode character.
-        /// </summary>
-        Typo3 = 0xF42B,
-
-        /// <summary>
-        /// The Font Awesome "uber" icon unicode character.
-        /// </summary>
-        Uber = 0xF402,
-
-        /// <summary>
-        /// The Font Awesome "ubuntu" icon unicode character.
-        /// </summary>
-        Ubuntu = 0xF7DF,
-
-        /// <summary>
-        /// The Font Awesome "uikit" icon unicode character.
-        /// </summary>
-        Uikit = 0xF403,
-
-        /// <summary>
-        /// The Font Awesome "umbraco" icon unicode character.
-        /// </summary>
-        Umbraco = 0xF8E8,
-
-        /// <summary>
-        /// The Font Awesome "umbrella" icon unicode character.
-        /// </summary>
-        Umbrella = 0xF0E9,
-
-        /// <summary>
-        /// The Font Awesome "umbrella-beach" icon unicode character.
-        /// </summary>
-        UmbrellaBeach = 0xF5CA,
-
-        /// <summary>
-        /// The Font Awesome "underline" icon unicode character.
-        /// </summary>
-        Underline = 0xF0CD,
-
-        /// <summary>
-        /// The Font Awesome "undo" icon unicode character.
-        /// </summary>
-        Undo = 0xF0E2,
-
-        /// <summary>
-        /// The Font Awesome "undo-alt" icon unicode character.
-        /// </summary>
-        UndoAlt = 0xF2EA,
-
-        /// <summary>
-        /// The Font Awesome "uniregistry" icon unicode character.
-        /// </summary>
-        Uniregistry = 0xF404,
-
-        /// <summary>
-        /// The Font Awesome "unity" icon unicode character.
-        /// </summary>
-        Unity = 0xF949,
-
-        /// <summary>
-        /// The Font Awesome "universal-access" icon unicode character.
-        /// </summary>
-        UniversalAccess = 0xF29A,
-
-        /// <summary>
-        /// The Font Awesome "university" icon unicode character.
-        /// </summary>
-        University = 0xF19C,
-
-        /// <summary>
-        /// The Font Awesome "unlink" icon unicode character.
-        /// </summary>
-        Unlink = 0xF127,
-
-        /// <summary>
-        /// The Font Awesome "unlock" icon unicode character.
-        /// </summary>
-        Unlock = 0xF09C,
-
-        /// <summary>
-        /// The Font Awesome "unlock-alt" icon unicode character.
-        /// </summary>
-        UnlockAlt = 0xF13E,
-
-        /// <summary>
-        /// The Font Awesome "untappd" icon unicode character.
-        /// </summary>
-        Untappd = 0xF405,
-
-        /// <summary>
-        /// The Font Awesome "upload" icon unicode character.
-        /// </summary>
-        Upload = 0xF093,
-
-        /// <summary>
-        /// The Font Awesome "ups" icon unicode character.
-        /// </summary>
-        Ups = 0xF7E0,
-
-        /// <summary>
-        /// The Font Awesome "usb" icon unicode character.
-        /// </summary>
-        Usb = 0xF287,
-
-        /// <summary>
-        /// The Font Awesome "user" icon unicode character.
-        /// </summary>
-        User = 0xF007,
-
-        /// <summary>
-        /// The Font Awesome "user-alt" icon unicode character.
-        /// </summary>
-        UserAlt = 0xF406,
-
-        /// <summary>
-        /// The Font Awesome "user-alt-slash" icon unicode character.
-        /// </summary>
-        UserAltSlash = 0xF4FA,
-
-        /// <summary>
-        /// The Font Awesome "user-astronaut" icon unicode character.
-        /// </summary>
-        UserAstronaut = 0xF4FB,
-
-        /// <summary>
-        /// The Font Awesome "user-check" icon unicode character.
-        /// </summary>
-        UserCheck = 0xF4FC,
-
-        /// <summary>
-        /// The Font Awesome "user-circle" icon unicode character.
-        /// </summary>
-        UserCircle = 0xF2BD,
-
-        /// <summary>
-        /// The Font Awesome "user-clock" icon unicode character.
-        /// </summary>
-        UserClock = 0xF4FD,
-
-        /// <summary>
-        /// The Font Awesome "user-cog" icon unicode character.
-        /// </summary>
-        UserCog = 0xF4FE,
-
-        /// <summary>
-        /// The Font Awesome "user-edit" icon unicode character.
-        /// </summary>
-        UserEdit = 0xF4FF,
-
-        /// <summary>
-        /// The Font Awesome "user-friends" icon unicode character.
-        /// </summary>
-        UserFriends = 0xF500,
-
-        /// <summary>
-        /// The Font Awesome "user-graduate" icon unicode character.
-        /// </summary>
-        UserGraduate = 0xF501,
-
-        /// <summary>
-        /// The Font Awesome "user-injured" icon unicode character.
-        /// </summary>
-        UserInjured = 0xF728,
-
-        /// <summary>
-        /// The Font Awesome "user-lock" icon unicode character.
-        /// </summary>
-        UserLock = 0xF502,
-
-        /// <summary>
-        /// The Font Awesome "user-md" icon unicode character.
-        /// </summary>
-        UserMd = 0xF0F0,
-
-        /// <summary>
-        /// The Font Awesome "user-minus" icon unicode character.
-        /// </summary>
-        UserMinus = 0xF503,
-
-        /// <summary>
-        /// The Font Awesome "user-ninja" icon unicode character.
-        /// </summary>
-        UserNinja = 0xF504,
-
-        /// <summary>
-        /// The Font Awesome "user-nurse" icon unicode character.
-        /// </summary>
-        UserNurse = 0xF82F,
-
-        /// <summary>
-        /// The Font Awesome "user-plus" icon unicode character.
-        /// </summary>
-        UserPlus = 0xF234,
-
-        /// <summary>
-        /// The Font Awesome "users" icon unicode character.
-        /// </summary>
-        Users = 0xF0C0,
-
-        /// <summary>
-        /// The Font Awesome "users-cog" icon unicode character.
-        /// </summary>
-        UsersCog = 0xF509,
-
-        /// <summary>
-        /// The Font Awesome "user-secret" icon unicode character.
-        /// </summary>
-        UserSecret = 0xF21B,
-
-        /// <summary>
-        /// The Font Awesome "user-shield" icon unicode character.
-        /// </summary>
-        UserShield = 0xF505,
-
-        /// <summary>
-        /// The Font Awesome "user-slash" icon unicode character.
-        /// </summary>
-        UserSlash = 0xF506,
-
-        /// <summary>
-        /// The Font Awesome "user-tag" icon unicode character.
-        /// </summary>
-        UserTag = 0xF507,
-
-        /// <summary>
-        /// The Font Awesome "user-tie" icon unicode character.
-        /// </summary>
-        UserTie = 0xF508,
-
-        /// <summary>
-        /// The Font Awesome "user-times" icon unicode character.
-        /// </summary>
-        UserTimes = 0xF235,
-
-        /// <summary>
-        /// The Font Awesome "usps" icon unicode character.
-        /// </summary>
-        Usps = 0xF7E1,
-
-        /// <summary>
-        /// The Font Awesome "ussunnah" icon unicode character.
-        /// </summary>
-        Ussunnah = 0xF407,
-
-        /// <summary>
-        /// The Font Awesome "utensils" icon unicode character.
-        /// </summary>
-        Utensils = 0xF2E7,
-
-        /// <summary>
-        /// The Font Awesome "utensil-spoon" icon unicode character.
-        /// </summary>
-        UtensilSpoon = 0xF2E5,
-
-        /// <summary>
-        /// The Font Awesome "vaadin" icon unicode character.
-        /// </summary>
-        Vaadin = 0xF408,
-
-        /// <summary>
-        /// The Font Awesome "vector-square" icon unicode character.
-        /// </summary>
-        VectorSquare = 0xF5CB,
-
-        /// <summary>
-        /// The Font Awesome "venus" icon unicode character.
-        /// </summary>
-        Venus = 0xF221,
-
-        /// <summary>
-        /// The Font Awesome "venus-double" icon unicode character.
-        /// </summary>
-        VenusDouble = 0xF226,
-
-        /// <summary>
-        /// The Font Awesome "venus-mars" icon unicode character.
-        /// </summary>
-        VenusMars = 0xF228,
-
-        /// <summary>
-        /// The Font Awesome "viacoin" icon unicode character.
-        /// </summary>
-        Viacoin = 0xF237,
-
-        /// <summary>
-        /// The Font Awesome "viadeo" icon unicode character.
-        /// </summary>
-        Viadeo = 0xF2A9,
-
-        /// <summary>
-        /// The Font Awesome "viadeo-square" icon unicode character.
-        /// </summary>
-        ViadeoSquare = 0xF2AA,
-
-        /// <summary>
-        /// The Font Awesome "vial" icon unicode character.
-        /// </summary>
-        Vial = 0xF492,
-
-        /// <summary>
-        /// The Font Awesome "vials" icon unicode character.
-        /// </summary>
-        Vials = 0xF493,
-
-        /// <summary>
-        /// The Font Awesome "viber" icon unicode character.
-        /// </summary>
-        Viber = 0xF409,
-
-        /// <summary>
-        /// The Font Awesome "video" icon unicode character.
-        /// </summary>
-        Video = 0xF03D,
-
-        /// <summary>
-        /// The Font Awesome "video-slash" icon unicode character.
-        /// </summary>
-        VideoSlash = 0xF4E2,
-
-        /// <summary>
-        /// The Font Awesome "vihara" icon unicode character.
-        /// </summary>
-        Vihara = 0xF6A7,
-
-        /// <summary>
-        /// The Font Awesome "vimeo" icon unicode character.
-        /// </summary>
-        Vimeo = 0xF40A,
-
-        /// <summary>
-        /// The Font Awesome "vimeo-square" icon unicode character.
-        /// </summary>
-        VimeoSquare = 0xF194,
-
-        /// <summary>
-        /// The Font Awesome "vimeo-v" icon unicode character.
-        /// </summary>
-        VimeoV = 0xF27D,
-
-        /// <summary>
-        /// The Font Awesome "vine" icon unicode character.
-        /// </summary>
-        Vine = 0xF1CA,
-
-        /// <summary>
-        /// The Font Awesome "vk" icon unicode character.
-        /// </summary>
-        Vk = 0xF189,
-
-        /// <summary>
-        /// The Font Awesome "vnv" icon unicode character.
-        /// </summary>
-        Vnv = 0xF40B,
-
-        /// <summary>
-        /// The Font Awesome "voicemail" icon unicode character.
-        /// </summary>
-        Voicemail = 0xF897,
-
-        /// <summary>
-        /// The Font Awesome "volleyball-ball" icon unicode character.
-        /// </summary>
-        VolleyballBall = 0xF45F,
-
-        /// <summary>
-        /// The Font Awesome "volume-down" icon unicode character.
-        /// </summary>
-        VolumeDown = 0xF027,
-
-        /// <summary>
-        /// The Font Awesome "volume-mute" icon unicode character.
-        /// </summary>
-        VolumeMute = 0xF6A9,
-
-        /// <summary>
-        /// The Font Awesome "volume-off" icon unicode character.
-        /// </summary>
-        VolumeOff = 0xF026,
-
-        /// <summary>
-        /// The Font Awesome "volume-up" icon unicode character.
-        /// </summary>
-        VolumeUp = 0xF028,
-
-        /// <summary>
-        /// The Font Awesome "vote-yea" icon unicode character.
-        /// </summary>
-        VoteYea = 0xF772,
-
-        /// <summary>
-        /// The Font Awesome "vr-cardboard" icon unicode character.
-        /// </summary>
-        VrCardboard = 0xF729,
-
-        /// <summary>
-        /// The Font Awesome "vuejs" icon unicode character.
-        /// </summary>
-        Vuejs = 0xF41F,
-
-        /// <summary>
-        /// The Font Awesome "walking" icon unicode character.
-        /// </summary>
-        Walking = 0xF554,
-
-        /// <summary>
-        /// The Font Awesome "wallet" icon unicode character.
-        /// </summary>
-        Wallet = 0xF555,
-
-        /// <summary>
-        /// The Font Awesome "warehouse" icon unicode character.
-        /// </summary>
-        Warehouse = 0xF494,
-
-        /// <summary>
-        /// The Font Awesome "water" icon unicode character.
-        /// </summary>
-        Water = 0xF773,
-
-        /// <summary>
-        /// The Font Awesome "wave-square" icon unicode character.
-        /// </summary>
-        WaveSquare = 0xF83E,
-
-        /// <summary>
-        /// The Font Awesome "waze" icon unicode character.
-        /// </summary>
-        Waze = 0xF83F,
-
-        /// <summary>
-        /// The Font Awesome "weebly" icon unicode character.
-        /// </summary>
-        Weebly = 0xF5CC,
-
-        /// <summary>
-        /// The Font Awesome "weibo" icon unicode character.
-        /// </summary>
-        Weibo = 0xF18A,
-
-        /// <summary>
-        /// The Font Awesome "weight" icon unicode character.
-        /// </summary>
-        Weight = 0xF496,
-
-        /// <summary>
-        /// The Font Awesome "weight-hanging" icon unicode character.
-        /// </summary>
-        WeightHanging = 0xF5CD,
-
-        /// <summary>
-        /// The Font Awesome "weixin" icon unicode character.
-        /// </summary>
-        Weixin = 0xF1D7,
-
-        /// <summary>
-        /// The Font Awesome "whatsapp" icon unicode character.
-        /// </summary>
-        Whatsapp = 0xF232,
-
-        /// <summary>
-        /// The Font Awesome "whatsapp-square" icon unicode character.
-        /// </summary>
-        WhatsappSquare = 0xF40C,
-
-        /// <summary>
-        /// The Font Awesome "wheelchair" icon unicode character.
-        /// </summary>
-        Wheelchair = 0xF193,
-
-        /// <summary>
-        /// The Font Awesome "whmcs" icon unicode character.
-        /// </summary>
-        Whmcs = 0xF40D,
-
-        /// <summary>
-        /// The Font Awesome "wifi" icon unicode character.
-        /// </summary>
-        Wifi = 0xF1EB,
-
-        /// <summary>
-        /// The Font Awesome "wikipedia-w" icon unicode character.
-        /// </summary>
-        WikipediaW = 0xF266,
-
-        /// <summary>
-        /// The Font Awesome "wind" icon unicode character.
-        /// </summary>
-        Wind = 0xF72E,
-
-        /// <summary>
-        /// The Font Awesome "window-close" icon unicode character.
-        /// </summary>
-        WindowClose = 0xF410,
-
-        /// <summary>
-        /// The Font Awesome "window-maximize" icon unicode character.
-        /// </summary>
-        WindowMaximize = 0xF2D0,
-
-        /// <summary>
-        /// The Font Awesome "window-minimize" icon unicode character.
-        /// </summary>
-        WindowMinimize = 0xF2D1,
-
-        /// <summary>
-        /// The Font Awesome "window-restore" icon unicode character.
-        /// </summary>
-        WindowRestore = 0xF2D2,
-
-        /// <summary>
-        /// The Font Awesome "windows" icon unicode character.
-        /// </summary>
-        Windows = 0xF17A,
-
-        /// <summary>
-        /// The Font Awesome "wine-bottle" icon unicode character.
-        /// </summary>
-        WineBottle = 0xF72F,
-
-        /// <summary>
-        /// The Font Awesome "wine-glass" icon unicode character.
-        /// </summary>
-        WineGlass = 0xF4E3,
-
-        /// <summary>
-        /// The Font Awesome "wine-glass-alt" icon unicode character.
-        /// </summary>
-        WineGlassAlt = 0xF5CE,
-
-        /// <summary>
-        /// The Font Awesome "wix" icon unicode character.
-        /// </summary>
-        Wix = 0xF5CF,
-
-        /// <summary>
-        /// The Font Awesome "wizards-of-the-coast" icon unicode character.
-        /// </summary>
-        WizardsOfTheCoast = 0xF730,
-
-        /// <summary>
-        /// The Font Awesome "wolf-pack-battalion" icon unicode character.
-        /// </summary>
-        WolfPackBattalion = 0xF514,
-
-        /// <summary>
-        /// The Font Awesome "won-sign" icon unicode character.
-        /// </summary>
-        WonSign = 0xF159,
-
-        /// <summary>
-        /// The Font Awesome "wordpress" icon unicode character.
-        /// </summary>
-        Wordpress = 0xF19A,
-
-        /// <summary>
-        /// The Font Awesome "wordpress-simple" icon unicode character.
-        /// </summary>
-        WordpressSimple = 0xF411,
-
-        /// <summary>
-        /// The Font Awesome "wpbeginner" icon unicode character.
-        /// </summary>
-        Wpbeginner = 0xF297,
-
-        /// <summary>
-        /// The Font Awesome "wpexplorer" icon unicode character.
-        /// </summary>
-        Wpexplorer = 0xF2DE,
-
-        /// <summary>
-        /// The Font Awesome "wpforms" icon unicode character.
-        /// </summary>
-        Wpforms = 0xF298,
-
-        /// <summary>
-        /// The Font Awesome "wpressr" icon unicode character.
-        /// </summary>
-        Wpressr = 0xF3E4,
-
-        /// <summary>
-        /// The Font Awesome "wrench" icon unicode character.
-        /// </summary>
-        Wrench = 0xF0AD,
-
-        /// <summary>
-        /// The Font Awesome "xbox" icon unicode character.
-        /// </summary>
-        Xbox = 0xF412,
-
-        /// <summary>
-        /// The Font Awesome "xing" icon unicode character.
-        /// </summary>
-        Xing = 0xF168,
-
-        /// <summary>
-        /// The Font Awesome "xing-square" icon unicode character.
-        /// </summary>
-        XingSquare = 0xF169,
-
-        /// <summary>
-        /// The Font Awesome "x-ray" icon unicode character.
-        /// </summary>
-        XRay = 0xF497,
-
-        /// <summary>
-        /// The Font Awesome "yahoo" icon unicode character.
-        /// </summary>
-        Yahoo = 0xF19E,
-
-        /// <summary>
-        /// The Font Awesome "yammer" icon unicode character.
-        /// </summary>
-        Yammer = 0xF840,
-
-        /// <summary>
-        /// The Font Awesome "yandex" icon unicode character.
-        /// </summary>
-        Yandex = 0xF413,
-
-        /// <summary>
-        /// The Font Awesome "yandex-international" icon unicode character.
-        /// </summary>
-        YandexInternational = 0xF414,
-
-        /// <summary>
-        /// The Font Awesome "yarn" icon unicode character.
-        /// </summary>
-        Yarn = 0xF7E3,
-
-        /// <summary>
-        /// The Font Awesome "y-combinator" icon unicode character.
-        /// </summary>
-        YCombinator = 0xF23B,
-
-        /// <summary>
-        /// The Font Awesome "yelp" icon unicode character.
-        /// </summary>
-        Yelp = 0xF1E9,
-
-        /// <summary>
-        /// The Font Awesome "yen-sign" icon unicode character.
-        /// </summary>
-        YenSign = 0xF157,
-
-        /// <summary>
-        /// The Font Awesome "yin-yang" icon unicode character.
-        /// </summary>
-        YinYang = 0xF6AD,
-
-        /// <summary>
-        /// The Font Awesome "yoast" icon unicode character.
-        /// </summary>
-        Yoast = 0xF2B1,
-
-        /// <summary>
-        /// The Font Awesome "youtube" icon unicode character.
-        /// </summary>
-        Youtube = 0xF167,
-
-        /// <summary>
-        /// The Font Awesome "youtube-square" icon unicode character.
-        /// </summary>
-        YoutubeSquare = 0xF431,
-
-        /// <summary>
-        /// The Font Awesome "zhihu" icon unicode character.
-        /// </summary>
-        Zhihu = 0xF63F,
-    }
+    None = 0,
+
+    /// <summary>
+    /// The Font Awesome "500px" icon unicode character.
+    /// </summary>
+    _500Px = 0xF26E,
+
+    /// <summary>
+    /// The Font Awesome "accessible-icon" icon unicode character.
+    /// </summary>
+    AccessibleIcon = 0xF368,
+
+    /// <summary>
+    /// The Font Awesome "accusoft" icon unicode character.
+    /// </summary>
+    Accusoft = 0xF369,
+
+    /// <summary>
+    /// The Font Awesome "acquisitions-incorporated" icon unicode character.
+    /// </summary>
+    AcquisitionsIncorporated = 0xF6AF,
+
+    /// <summary>
+    /// The Font Awesome "ad" icon unicode character.
+    /// </summary>
+    Ad = 0xF641,
+
+    /// <summary>
+    /// The Font Awesome "address-book" icon unicode character.
+    /// </summary>
+    AddressBook = 0xF2B9,
+
+    /// <summary>
+    /// The Font Awesome "address-card" icon unicode character.
+    /// </summary>
+    AddressCard = 0xF2BB,
+
+    /// <summary>
+    /// The Font Awesome "adjust" icon unicode character.
+    /// </summary>
+    Adjust = 0xF042,
+
+    /// <summary>
+    /// The Font Awesome "adn" icon unicode character.
+    /// </summary>
+    Adn = 0xF170,
+
+    /// <summary>
+    /// The Font Awesome "adobe" icon unicode character.
+    /// </summary>
+    Adobe = 0xF778,
+
+    /// <summary>
+    /// The Font Awesome "adversal" icon unicode character.
+    /// </summary>
+    Adversal = 0xF36A,
+
+    /// <summary>
+    /// The Font Awesome "affiliatetheme" icon unicode character.
+    /// </summary>
+    Affiliatetheme = 0xF36B,
+
+    /// <summary>
+    /// The Font Awesome "airbnb" icon unicode character.
+    /// </summary>
+    Airbnb = 0xF834,
+
+    /// <summary>
+    /// The Font Awesome "air-freshener" icon unicode character.
+    /// </summary>
+    AirFreshener = 0xF5D0,
+
+    /// <summary>
+    /// The Font Awesome "algolia" icon unicode character.
+    /// </summary>
+    Algolia = 0xF36C,
+
+    /// <summary>
+    /// The Font Awesome "align-center" icon unicode character.
+    /// </summary>
+    AlignCenter = 0xF037,
+
+    /// <summary>
+    /// The Font Awesome "align-justify" icon unicode character.
+    /// </summary>
+    AlignJustify = 0xF039,
+
+    /// <summary>
+    /// The Font Awesome "align-left" icon unicode character.
+    /// </summary>
+    AlignLeft = 0xF036,
+
+    /// <summary>
+    /// The Font Awesome "align-right" icon unicode character.
+    /// </summary>
+    AlignRight = 0xF038,
+
+    /// <summary>
+    /// The Font Awesome "alipay" icon unicode character.
+    /// </summary>
+    Alipay = 0xF642,
+
+    /// <summary>
+    /// The Font Awesome "allergies" icon unicode character.
+    /// </summary>
+    Allergies = 0xF461,
+
+    /// <summary>
+    /// The Font Awesome "amazon" icon unicode character.
+    /// </summary>
+    Amazon = 0xF270,
+
+    /// <summary>
+    /// The Font Awesome "amazon-pay" icon unicode character.
+    /// </summary>
+    AmazonPay = 0xF42C,
+
+    /// <summary>
+    /// The Font Awesome "ambulance" icon unicode character.
+    /// </summary>
+    Ambulance = 0xF0F9,
+
+    /// <summary>
+    /// The Font Awesome "american-sign-language-interpreting" icon unicode character.
+    /// </summary>
+    AmericanSignLanguageInterpreting = 0xF2A3,
+
+    /// <summary>
+    /// The Font Awesome "amilia" icon unicode character.
+    /// </summary>
+    Amilia = 0xF36D,
+
+    /// <summary>
+    /// The Font Awesome "anchor" icon unicode character.
+    /// </summary>
+    Anchor = 0xF13D,
+
+    /// <summary>
+    /// The Font Awesome "android" icon unicode character.
+    /// </summary>
+    Android = 0xF17B,
+
+    /// <summary>
+    /// The Font Awesome "angellist" icon unicode character.
+    /// </summary>
+    Angellist = 0xF209,
+
+    /// <summary>
+    /// The Font Awesome "angle-double-down" icon unicode character.
+    /// </summary>
+    AngleDoubleDown = 0xF103,
+
+    /// <summary>
+    /// The Font Awesome "angle-double-left" icon unicode character.
+    /// </summary>
+    AngleDoubleLeft = 0xF100,
+
+    /// <summary>
+    /// The Font Awesome "angle-double-right" icon unicode character.
+    /// </summary>
+    AngleDoubleRight = 0xF101,
+
+    /// <summary>
+    /// The Font Awesome "angle-double-up" icon unicode character.
+    /// </summary>
+    AngleDoubleUp = 0xF102,
+
+    /// <summary>
+    /// The Font Awesome "angle-down" icon unicode character.
+    /// </summary>
+    AngleDown = 0xF107,
+
+    /// <summary>
+    /// The Font Awesome "angle-left" icon unicode character.
+    /// </summary>
+    AngleLeft = 0xF104,
+
+    /// <summary>
+    /// The Font Awesome "angle-right" icon unicode character.
+    /// </summary>
+    AngleRight = 0xF105,
+
+    /// <summary>
+    /// The Font Awesome "angle-up" icon unicode character.
+    /// </summary>
+    AngleUp = 0xF106,
+
+    /// <summary>
+    /// The Font Awesome "angry" icon unicode character.
+    /// </summary>
+    Angry = 0xF556,
+
+    /// <summary>
+    /// The Font Awesome "angrycreative" icon unicode character.
+    /// </summary>
+    Angrycreative = 0xF36E,
+
+    /// <summary>
+    /// The Font Awesome "angular" icon unicode character.
+    /// </summary>
+    Angular = 0xF420,
+
+    /// <summary>
+    /// The Font Awesome "ankh" icon unicode character.
+    /// </summary>
+    Ankh = 0xF644,
+
+    /// <summary>
+    /// The Font Awesome "apper" icon unicode character.
+    /// </summary>
+    Apper = 0xF371,
+
+    /// <summary>
+    /// The Font Awesome "apple" icon unicode character.
+    /// </summary>
+    Apple = 0xF179,
+
+    /// <summary>
+    /// The Font Awesome "apple-alt" icon unicode character.
+    /// </summary>
+    AppleAlt = 0xF5D1,
+
+    /// <summary>
+    /// The Font Awesome "apple-pay" icon unicode character.
+    /// </summary>
+    ApplePay = 0xF415,
+
+    /// <summary>
+    /// The Font Awesome "app-store" icon unicode character.
+    /// </summary>
+    AppStore = 0xF36F,
+
+    /// <summary>
+    /// The Font Awesome "app-store-ios" icon unicode character.
+    /// </summary>
+    AppStoreIos = 0xF370,
+
+    /// <summary>
+    /// The Font Awesome "archive" icon unicode character.
+    /// </summary>
+    Archive = 0xF187,
+
+    /// <summary>
+    /// The Font Awesome "archway" icon unicode character.
+    /// </summary>
+    Archway = 0xF557,
+
+    /// <summary>
+    /// The Font Awesome "arrow-alt-circle-down" icon unicode character.
+    /// </summary>
+    ArrowAltCircleDown = 0xF358,
+
+    /// <summary>
+    /// The Font Awesome "arrow-alt-circle-left" icon unicode character.
+    /// </summary>
+    ArrowAltCircleLeft = 0xF359,
+
+    /// <summary>
+    /// The Font Awesome "arrow-alt-circle-right" icon unicode character.
+    /// </summary>
+    ArrowAltCircleRight = 0xF35A,
+
+    /// <summary>
+    /// The Font Awesome "arrow-alt-circle-up" icon unicode character.
+    /// </summary>
+    ArrowAltCircleUp = 0xF35B,
+
+    /// <summary>
+    /// The Font Awesome "arrow-circle-down" icon unicode character.
+    /// </summary>
+    ArrowCircleDown = 0xF0AB,
+
+    /// <summary>
+    /// The Font Awesome "arrow-circle-left" icon unicode character.
+    /// </summary>
+    ArrowCircleLeft = 0xF0A8,
+
+    /// <summary>
+    /// The Font Awesome "arrow-circle-right" icon unicode character.
+    /// </summary>
+    ArrowCircleRight = 0xF0A9,
+
+    /// <summary>
+    /// The Font Awesome "arrow-circle-up" icon unicode character.
+    /// </summary>
+    ArrowCircleUp = 0xF0AA,
+
+    /// <summary>
+    /// The Font Awesome "arrow-down" icon unicode character.
+    /// </summary>
+    ArrowDown = 0xF063,
+
+    /// <summary>
+    /// The Font Awesome "arrow-left" icon unicode character.
+    /// </summary>
+    ArrowLeft = 0xF060,
+
+    /// <summary>
+    /// The Font Awesome "arrow-right" icon unicode character.
+    /// </summary>
+    ArrowRight = 0xF061,
+
+    /// <summary>
+    /// The Font Awesome "arrows-alt" icon unicode character.
+    /// </summary>
+    ArrowsAlt = 0xF0B2,
+
+    /// <summary>
+    /// The Font Awesome "arrows-alt-h" icon unicode character.
+    /// </summary>
+    ArrowsAltH = 0xF337,
+
+    /// <summary>
+    /// The Font Awesome "arrows-alt-v" icon unicode character.
+    /// </summary>
+    ArrowsAltV = 0xF338,
+
+    /// <summary>
+    /// The Font Awesome "arrow-up" icon unicode character.
+    /// </summary>
+    ArrowUp = 0xF062,
+
+    /// <summary>
+    /// The Font Awesome "artstation" icon unicode character.
+    /// </summary>
+    Artstation = 0xF77A,
+
+    /// <summary>
+    /// The Font Awesome "assistive-listening-systems" icon unicode character.
+    /// </summary>
+    AssistiveListeningSystems = 0xF2A2,
+
+    /// <summary>
+    /// The Font Awesome "asterisk" icon unicode character.
+    /// </summary>
+    Asterisk = 0xF069,
+
+    /// <summary>
+    /// The Font Awesome "asymmetrik" icon unicode character.
+    /// </summary>
+    Asymmetrik = 0xF372,
+
+    /// <summary>
+    /// The Font Awesome "at" icon unicode character.
+    /// </summary>
+    At = 0xF1FA,
+
+    /// <summary>
+    /// The Font Awesome "atlas" icon unicode character.
+    /// </summary>
+    Atlas = 0xF558,
+
+    /// <summary>
+    /// The Font Awesome "atlassian" icon unicode character.
+    /// </summary>
+    Atlassian = 0xF77B,
+
+    /// <summary>
+    /// The Font Awesome "atom" icon unicode character.
+    /// </summary>
+    Atom = 0xF5D2,
+
+    /// <summary>
+    /// The Font Awesome "audible" icon unicode character.
+    /// </summary>
+    Audible = 0xF373,
+
+    /// <summary>
+    /// The Font Awesome "audio-description" icon unicode character.
+    /// </summary>
+    AudioDescription = 0xF29E,
+
+    /// <summary>
+    /// The Font Awesome "autoprefixer" icon unicode character.
+    /// </summary>
+    Autoprefixer = 0xF41C,
+
+    /// <summary>
+    /// The Font Awesome "avianex" icon unicode character.
+    /// </summary>
+    Avianex = 0xF374,
+
+    /// <summary>
+    /// The Font Awesome "aviato" icon unicode character.
+    /// </summary>
+    Aviato = 0xF421,
+
+    /// <summary>
+    /// The Font Awesome "award" icon unicode character.
+    /// </summary>
+    Award = 0xF559,
+
+    /// <summary>
+    /// The Font Awesome "aws" icon unicode character.
+    /// </summary>
+    Aws = 0xF375,
+
+    /// <summary>
+    /// The Font Awesome "baby" icon unicode character.
+    /// </summary>
+    Baby = 0xF77C,
+
+    /// <summary>
+    /// The Font Awesome "baby-carriage" icon unicode character.
+    /// </summary>
+    BabyCarriage = 0xF77D,
+
+    /// <summary>
+    /// The Font Awesome "backspace" icon unicode character.
+    /// </summary>
+    Backspace = 0xF55A,
+
+    /// <summary>
+    /// The Font Awesome "backward" icon unicode character.
+    /// </summary>
+    Backward = 0xF04A,
+
+    /// <summary>
+    /// The Font Awesome "bacon" icon unicode character.
+    /// </summary>
+    Bacon = 0xF7E5,
+
+    /// <summary>
+    /// The Font Awesome "bahai" icon unicode character.
+    /// </summary>
+    Bahai = 0xF666,
+
+    /// <summary>
+    /// The Font Awesome "balance-scale" icon unicode character.
+    /// </summary>
+    BalanceScale = 0xF24E,
+
+    /// <summary>
+    /// The Font Awesome "balance-scale-left" icon unicode character.
+    /// </summary>
+    BalanceScaleLeft = 0xF515,
+
+    /// <summary>
+    /// The Font Awesome "balance-scale-right" icon unicode character.
+    /// </summary>
+    BalanceScaleRight = 0xF516,
+
+    /// <summary>
+    /// The Font Awesome "ban" icon unicode character.
+    /// </summary>
+    Ban = 0xF05E,
+
+    /// <summary>
+    /// The Font Awesome "band-aid" icon unicode character.
+    /// </summary>
+    BandAid = 0xF462,
+
+    /// <summary>
+    /// The Font Awesome "bandcamp" icon unicode character.
+    /// </summary>
+    Bandcamp = 0xF2D5,
+
+    /// <summary>
+    /// The Font Awesome "barcode" icon unicode character.
+    /// </summary>
+    Barcode = 0xF02A,
+
+    /// <summary>
+    /// The Font Awesome "bars" icon unicode character.
+    /// </summary>
+    Bars = 0xF0C9,
+
+    /// <summary>
+    /// The Font Awesome "baseball-ball" icon unicode character.
+    /// </summary>
+    BaseballBall = 0xF433,
+
+    /// <summary>
+    /// The Font Awesome "basketball-ball" icon unicode character.
+    /// </summary>
+    BasketballBall = 0xF434,
+
+    /// <summary>
+    /// The Font Awesome "bath" icon unicode character.
+    /// </summary>
+    Bath = 0xF2CD,
+
+    /// <summary>
+    /// The Font Awesome "battery-empty" icon unicode character.
+    /// </summary>
+    BatteryEmpty = 0xF244,
+
+    /// <summary>
+    /// The Font Awesome "battery-full" icon unicode character.
+    /// </summary>
+    BatteryFull = 0xF240,
+
+    /// <summary>
+    /// The Font Awesome "battery-half" icon unicode character.
+    /// </summary>
+    BatteryHalf = 0xF242,
+
+    /// <summary>
+    /// The Font Awesome "battery-quarter" icon unicode character.
+    /// </summary>
+    BatteryQuarter = 0xF243,
+
+    /// <summary>
+    /// The Font Awesome "battery-three-quarters" icon unicode character.
+    /// </summary>
+    BatteryThreeQuarters = 0xF241,
+
+    /// <summary>
+    /// The Font Awesome "battle-net" icon unicode character.
+    /// </summary>
+    BattleNet = 0xF835,
+
+    /// <summary>
+    /// The Font Awesome "bed" icon unicode character.
+    /// </summary>
+    Bed = 0xF236,
+
+    /// <summary>
+    /// The Font Awesome "beer" icon unicode character.
+    /// </summary>
+    Beer = 0xF0FC,
+
+    /// <summary>
+    /// The Font Awesome "behance" icon unicode character.
+    /// </summary>
+    Behance = 0xF1B4,
+
+    /// <summary>
+    /// The Font Awesome "behance-square" icon unicode character.
+    /// </summary>
+    BehanceSquare = 0xF1B5,
+
+    /// <summary>
+    /// The Font Awesome "bell" icon unicode character.
+    /// </summary>
+    Bell = 0xF0F3,
+
+    /// <summary>
+    /// The Font Awesome "bell-slash" icon unicode character.
+    /// </summary>
+    BellSlash = 0xF1F6,
+
+    /// <summary>
+    /// The Font Awesome "bezier-curve" icon unicode character.
+    /// </summary>
+    BezierCurve = 0xF55B,
+
+    /// <summary>
+    /// The Font Awesome "bible" icon unicode character.
+    /// </summary>
+    Bible = 0xF647,
+
+    /// <summary>
+    /// The Font Awesome "bicycle" icon unicode character.
+    /// </summary>
+    Bicycle = 0xF206,
+
+    /// <summary>
+    /// The Font Awesome "biking" icon unicode character.
+    /// </summary>
+    Biking = 0xF84A,
+
+    /// <summary>
+    /// The Font Awesome "bimobject" icon unicode character.
+    /// </summary>
+    Bimobject = 0xF378,
+
+    /// <summary>
+    /// The Font Awesome "binoculars" icon unicode character.
+    /// </summary>
+    Binoculars = 0xF1E5,
+
+    /// <summary>
+    /// The Font Awesome "biohazard" icon unicode character.
+    /// </summary>
+    Biohazard = 0xF780,
+
+    /// <summary>
+    /// The Font Awesome "birthday-cake" icon unicode character.
+    /// </summary>
+    BirthdayCake = 0xF1FD,
+
+    /// <summary>
+    /// The Font Awesome "bitbucket" icon unicode character.
+    /// </summary>
+    Bitbucket = 0xF171,
+
+    /// <summary>
+    /// The Font Awesome "bitcoin" icon unicode character.
+    /// </summary>
+    Bitcoin = 0xF379,
+
+    /// <summary>
+    /// The Font Awesome "bity" icon unicode character.
+    /// </summary>
+    Bity = 0xF37A,
+
+    /// <summary>
+    /// The Font Awesome "blackberry" icon unicode character.
+    /// </summary>
+    Blackberry = 0xF37B,
+
+    /// <summary>
+    /// The Font Awesome "black-tie" icon unicode character.
+    /// </summary>
+    BlackTie = 0xF27E,
+
+    /// <summary>
+    /// The Font Awesome "blender" icon unicode character.
+    /// </summary>
+    Blender = 0xF517,
+
+    /// <summary>
+    /// The Font Awesome "blender-phone" icon unicode character.
+    /// </summary>
+    BlenderPhone = 0xF6B6,
+
+    /// <summary>
+    /// The Font Awesome "blind" icon unicode character.
+    /// </summary>
+    Blind = 0xF29D,
+
+    /// <summary>
+    /// The Font Awesome "blog" icon unicode character.
+    /// </summary>
+    Blog = 0xF781,
+
+    /// <summary>
+    /// The Font Awesome "blogger" icon unicode character.
+    /// </summary>
+    Blogger = 0xF37C,
+
+    /// <summary>
+    /// The Font Awesome "blogger-b" icon unicode character.
+    /// </summary>
+    BloggerB = 0xF37D,
+
+    /// <summary>
+    /// The Font Awesome "bluetooth" icon unicode character.
+    /// </summary>
+    Bluetooth = 0xF293,
+
+    /// <summary>
+    /// The Font Awesome "bluetooth-b" icon unicode character.
+    /// </summary>
+    BluetoothB = 0xF294,
+
+    /// <summary>
+    /// The Font Awesome "bold" icon unicode character.
+    /// </summary>
+    Bold = 0xF032,
+
+    /// <summary>
+    /// The Font Awesome "bolt" icon unicode character.
+    /// </summary>
+    Bolt = 0xF0E7,
+
+    /// <summary>
+    /// The Font Awesome "bomb" icon unicode character.
+    /// </summary>
+    Bomb = 0xF1E2,
+
+    /// <summary>
+    /// The Font Awesome "bone" icon unicode character.
+    /// </summary>
+    Bone = 0xF5D7,
+
+    /// <summary>
+    /// The Font Awesome "bong" icon unicode character.
+    /// </summary>
+    Bong = 0xF55C,
+
+    /// <summary>
+    /// The Font Awesome "book" icon unicode character.
+    /// </summary>
+    Book = 0xF02D,
+
+    /// <summary>
+    /// The Font Awesome "book-dead" icon unicode character.
+    /// </summary>
+    BookDead = 0xF6B7,
+
+    /// <summary>
+    /// The Font Awesome "bookmark" icon unicode character.
+    /// </summary>
+    Bookmark = 0xF02E,
+
+    /// <summary>
+    /// The Font Awesome "book-medical" icon unicode character.
+    /// </summary>
+    BookMedical = 0xF7E6,
+
+    /// <summary>
+    /// The Font Awesome "book-open" icon unicode character.
+    /// </summary>
+    BookOpen = 0xF518,
+
+    /// <summary>
+    /// The Font Awesome "book-reader" icon unicode character.
+    /// </summary>
+    BookReader = 0xF5DA,
+
+    /// <summary>
+    /// The Font Awesome "bootstrap" icon unicode character.
+    /// </summary>
+    Bootstrap = 0xF836,
+
+    /// <summary>
+    /// The Font Awesome "border-all" icon unicode character.
+    /// </summary>
+    BorderAll = 0xF84C,
+
+    /// <summary>
+    /// The Font Awesome "border-none" icon unicode character.
+    /// </summary>
+    BorderNone = 0xF850,
+
+    /// <summary>
+    /// The Font Awesome "border-style" icon unicode character.
+    /// </summary>
+    BorderStyle = 0xF853,
+
+    /// <summary>
+    /// The Font Awesome "bowling-ball" icon unicode character.
+    /// </summary>
+    BowlingBall = 0xF436,
+
+    /// <summary>
+    /// The Font Awesome "box" icon unicode character.
+    /// </summary>
+    Box = 0xF466,
+
+    /// <summary>
+    /// The Font Awesome "boxes" icon unicode character.
+    /// </summary>
+    Boxes = 0xF468,
+
+    /// <summary>
+    /// The Font Awesome "box-open" icon unicode character.
+    /// </summary>
+    BoxOpen = 0xF49E,
+
+    /// <summary>
+    /// The Font Awesome "braille" icon unicode character.
+    /// </summary>
+    Braille = 0xF2A1,
+
+    /// <summary>
+    /// The Font Awesome "brain" icon unicode character.
+    /// </summary>
+    Brain = 0xF5DC,
+
+    /// <summary>
+    /// The Font Awesome "bread-slice" icon unicode character.
+    /// </summary>
+    BreadSlice = 0xF7EC,
+
+    /// <summary>
+    /// The Font Awesome "briefcase" icon unicode character.
+    /// </summary>
+    Briefcase = 0xF0B1,
+
+    /// <summary>
+    /// The Font Awesome "briefcase-medical" icon unicode character.
+    /// </summary>
+    BriefcaseMedical = 0xF469,
+
+    /// <summary>
+    /// The Font Awesome "broadcast-tower" icon unicode character.
+    /// </summary>
+    BroadcastTower = 0xF519,
+
+    /// <summary>
+    /// The Font Awesome "broom" icon unicode character.
+    /// </summary>
+    Broom = 0xF51A,
+
+    /// <summary>
+    /// The Font Awesome "brush" icon unicode character.
+    /// </summary>
+    Brush = 0xF55D,
+
+    /// <summary>
+    /// The Font Awesome "btc" icon unicode character.
+    /// </summary>
+    Btc = 0xF15A,
+
+    /// <summary>
+    /// The Font Awesome "buffer" icon unicode character.
+    /// </summary>
+    Buffer = 0xF837,
+
+    /// <summary>
+    /// The Font Awesome "bug" icon unicode character.
+    /// </summary>
+    Bug = 0xF188,
+
+    /// <summary>
+    /// The Font Awesome "building" icon unicode character.
+    /// </summary>
+    Building = 0xF1AD,
+
+    /// <summary>
+    /// The Font Awesome "bullhorn" icon unicode character.
+    /// </summary>
+    Bullhorn = 0xF0A1,
+
+    /// <summary>
+    /// The Font Awesome "bullseye" icon unicode character.
+    /// </summary>
+    Bullseye = 0xF140,
+
+    /// <summary>
+    /// The Font Awesome "burn" icon unicode character.
+    /// </summary>
+    Burn = 0xF46A,
+
+    /// <summary>
+    /// The Font Awesome "buromobelexperte" icon unicode character.
+    /// </summary>
+    Buromobelexperte = 0xF37F,
+
+    /// <summary>
+    /// The Font Awesome "bus" icon unicode character.
+    /// </summary>
+    Bus = 0xF207,
+
+    /// <summary>
+    /// The Font Awesome "bus-alt" icon unicode character.
+    /// </summary>
+    BusAlt = 0xF55E,
+
+    /// <summary>
+    /// The Font Awesome "business-time" icon unicode character.
+    /// </summary>
+    BusinessTime = 0xF64A,
+
+    /// <summary>
+    /// The Font Awesome "buy-n-large" icon unicode character.
+    /// </summary>
+    BuyNLarge = 0xF8A6,
+
+    /// <summary>
+    /// The Font Awesome "buysellads" icon unicode character.
+    /// </summary>
+    Buysellads = 0xF20D,
+
+    /// <summary>
+    /// The Font Awesome "calculator" icon unicode character.
+    /// </summary>
+    Calculator = 0xF1EC,
+
+    /// <summary>
+    /// The Font Awesome "calendar" icon unicode character.
+    /// </summary>
+    Calendar = 0xF133,
+
+    /// <summary>
+    /// The Font Awesome "calendar-alt" icon unicode character.
+    /// </summary>
+    CalendarAlt = 0xF073,
+
+    /// <summary>
+    /// The Font Awesome "calendar-check" icon unicode character.
+    /// </summary>
+    CalendarCheck = 0xF274,
+
+    /// <summary>
+    /// The Font Awesome "calendar-day" icon unicode character.
+    /// </summary>
+    CalendarDay = 0xF783,
+
+    /// <summary>
+    /// The Font Awesome "calendar-minus" icon unicode character.
+    /// </summary>
+    CalendarMinus = 0xF272,
+
+    /// <summary>
+    /// The Font Awesome "calendar-plus" icon unicode character.
+    /// </summary>
+    CalendarPlus = 0xF271,
+
+    /// <summary>
+    /// The Font Awesome "calendar-times" icon unicode character.
+    /// </summary>
+    CalendarTimes = 0xF273,
+
+    /// <summary>
+    /// The Font Awesome "calendar-week" icon unicode character.
+    /// </summary>
+    CalendarWeek = 0xF784,
+
+    /// <summary>
+    /// The Font Awesome "camera" icon unicode character.
+    /// </summary>
+    Camera = 0xF030,
+
+    /// <summary>
+    /// The Font Awesome "camera-retro" icon unicode character.
+    /// </summary>
+    CameraRetro = 0xF083,
+
+    /// <summary>
+    /// The Font Awesome "campground" icon unicode character.
+    /// </summary>
+    Campground = 0xF6BB,
+
+    /// <summary>
+    /// The Font Awesome "canadian-maple-leaf" icon unicode character.
+    /// </summary>
+    CanadianMapleLeaf = 0xF785,
+
+    /// <summary>
+    /// The Font Awesome "candy-cane" icon unicode character.
+    /// </summary>
+    CandyCane = 0xF786,
+
+    /// <summary>
+    /// The Font Awesome "cannabis" icon unicode character.
+    /// </summary>
+    Cannabis = 0xF55F,
+
+    /// <summary>
+    /// The Font Awesome "capsules" icon unicode character.
+    /// </summary>
+    Capsules = 0xF46B,
+
+    /// <summary>
+    /// The Font Awesome "car" icon unicode character.
+    /// </summary>
+    Car = 0xF1B9,
+
+    /// <summary>
+    /// The Font Awesome "car-alt" icon unicode character.
+    /// </summary>
+    CarAlt = 0xF5DE,
+
+    /// <summary>
+    /// The Font Awesome "caravan" icon unicode character.
+    /// </summary>
+    Caravan = 0xF8FF,
+
+    /// <summary>
+    /// The Font Awesome "car-battery" icon unicode character.
+    /// </summary>
+    CarBattery = 0xF5DF,
+
+    /// <summary>
+    /// The Font Awesome "car-crash" icon unicode character.
+    /// </summary>
+    CarCrash = 0xF5E1,
+
+    /// <summary>
+    /// The Font Awesome "caret-down" icon unicode character.
+    /// </summary>
+    CaretDown = 0xF0D7,
+
+    /// <summary>
+    /// The Font Awesome "caret-left" icon unicode character.
+    /// </summary>
+    CaretLeft = 0xF0D9,
+
+    /// <summary>
+    /// The Font Awesome "caret-right" icon unicode character.
+    /// </summary>
+    CaretRight = 0xF0DA,
+
+    /// <summary>
+    /// The Font Awesome "caret-square-down" icon unicode character.
+    /// </summary>
+    CaretSquareDown = 0xF150,
+
+    /// <summary>
+    /// The Font Awesome "caret-square-left" icon unicode character.
+    /// </summary>
+    CaretSquareLeft = 0xF191,
+
+    /// <summary>
+    /// The Font Awesome "caret-square-right" icon unicode character.
+    /// </summary>
+    CaretSquareRight = 0xF152,
+
+    /// <summary>
+    /// The Font Awesome "caret-square-up" icon unicode character.
+    /// </summary>
+    CaretSquareUp = 0xF151,
+
+    /// <summary>
+    /// The Font Awesome "caret-up" icon unicode character.
+    /// </summary>
+    CaretUp = 0xF0D8,
+
+    /// <summary>
+    /// The Font Awesome "carrot" icon unicode character.
+    /// </summary>
+    Carrot = 0xF787,
+
+    /// <summary>
+    /// The Font Awesome "car-side" icon unicode character.
+    /// </summary>
+    CarSide = 0xF5E4,
+
+    /// <summary>
+    /// The Font Awesome "cart-arrow-down" icon unicode character.
+    /// </summary>
+    CartArrowDown = 0xF218,
+
+    /// <summary>
+    /// The Font Awesome "cart-plus" icon unicode character.
+    /// </summary>
+    CartPlus = 0xF217,
+
+    /// <summary>
+    /// The Font Awesome "cash-register" icon unicode character.
+    /// </summary>
+    CashRegister = 0xF788,
+
+    /// <summary>
+    /// The Font Awesome "cat" icon unicode character.
+    /// </summary>
+    Cat = 0xF6BE,
+
+    /// <summary>
+    /// The Font Awesome "cc-amazon-pay" icon unicode character.
+    /// </summary>
+    CcAmazonPay = 0xF42D,
+
+    /// <summary>
+    /// The Font Awesome "cc-amex" icon unicode character.
+    /// </summary>
+    CcAmex = 0xF1F3,
+
+    /// <summary>
+    /// The Font Awesome "cc-apple-pay" icon unicode character.
+    /// </summary>
+    CcApplePay = 0xF416,
+
+    /// <summary>
+    /// The Font Awesome "cc-diners-club" icon unicode character.
+    /// </summary>
+    CcDinersClub = 0xF24C,
+
+    /// <summary>
+    /// The Font Awesome "cc-discover" icon unicode character.
+    /// </summary>
+    CcDiscover = 0xF1F2,
+
+    /// <summary>
+    /// The Font Awesome "cc-jcb" icon unicode character.
+    /// </summary>
+    CcJcb = 0xF24B,
+
+    /// <summary>
+    /// The Font Awesome "cc-mastercard" icon unicode character.
+    /// </summary>
+    CcMastercard = 0xF1F1,
+
+    /// <summary>
+    /// The Font Awesome "cc-paypal" icon unicode character.
+    /// </summary>
+    CcPaypal = 0xF1F4,
+
+    /// <summary>
+    /// The Font Awesome "cc-stripe" icon unicode character.
+    /// </summary>
+    CcStripe = 0xF1F5,
+
+    /// <summary>
+    /// The Font Awesome "cc-visa" icon unicode character.
+    /// </summary>
+    CcVisa = 0xF1F0,
+
+    /// <summary>
+    /// The Font Awesome "centercode" icon unicode character.
+    /// </summary>
+    Centercode = 0xF380,
+
+    /// <summary>
+    /// The Font Awesome "centos" icon unicode character.
+    /// </summary>
+    Centos = 0xF789,
+
+    /// <summary>
+    /// The Font Awesome "certificate" icon unicode character.
+    /// </summary>
+    Certificate = 0xF0A3,
+
+    /// <summary>
+    /// The Font Awesome "chair" icon unicode character.
+    /// </summary>
+    Chair = 0xF6C0,
+
+    /// <summary>
+    /// The Font Awesome "chalkboard" icon unicode character.
+    /// </summary>
+    Chalkboard = 0xF51B,
+
+    /// <summary>
+    /// The Font Awesome "chalkboard-teacher" icon unicode character.
+    /// </summary>
+    ChalkboardTeacher = 0xF51C,
+
+    /// <summary>
+    /// The Font Awesome "charging-station" icon unicode character.
+    /// </summary>
+    ChargingStation = 0xF5E7,
+
+    /// <summary>
+    /// The Font Awesome "chart-area" icon unicode character.
+    /// </summary>
+    ChartArea = 0xF1FE,
+
+    /// <summary>
+    /// The Font Awesome "chart-bar" icon unicode character.
+    /// </summary>
+    ChartBar = 0xF080,
+
+    /// <summary>
+    /// The Font Awesome "chart-line" icon unicode character.
+    /// </summary>
+    ChartLine = 0xF201,
+
+    /// <summary>
+    /// The Font Awesome "chart-pie" icon unicode character.
+    /// </summary>
+    ChartPie = 0xF200,
+
+    /// <summary>
+    /// The Font Awesome "check" icon unicode character.
+    /// </summary>
+    Check = 0xF00C,
+
+    /// <summary>
+    /// The Font Awesome "check-circle" icon unicode character.
+    /// </summary>
+    CheckCircle = 0xF058,
+
+    /// <summary>
+    /// The Font Awesome "check-double" icon unicode character.
+    /// </summary>
+    CheckDouble = 0xF560,
+
+    /// <summary>
+    /// The Font Awesome "check-square" icon unicode character.
+    /// </summary>
+    CheckSquare = 0xF14A,
+
+    /// <summary>
+    /// The Font Awesome "cheese" icon unicode character.
+    /// </summary>
+    Cheese = 0xF7EF,
+
+    /// <summary>
+    /// The Font Awesome "chess" icon unicode character.
+    /// </summary>
+    Chess = 0xF439,
+
+    /// <summary>
+    /// The Font Awesome "chess-bishop" icon unicode character.
+    /// </summary>
+    ChessBishop = 0xF43A,
+
+    /// <summary>
+    /// The Font Awesome "chess-board" icon unicode character.
+    /// </summary>
+    ChessBoard = 0xF43C,
+
+    /// <summary>
+    /// The Font Awesome "chess-king" icon unicode character.
+    /// </summary>
+    ChessKing = 0xF43F,
+
+    /// <summary>
+    /// The Font Awesome "chess-knight" icon unicode character.
+    /// </summary>
+    ChessKnight = 0xF441,
+
+    /// <summary>
+    /// The Font Awesome "chess-pawn" icon unicode character.
+    /// </summary>
+    ChessPawn = 0xF443,
+
+    /// <summary>
+    /// The Font Awesome "chess-queen" icon unicode character.
+    /// </summary>
+    ChessQueen = 0xF445,
+
+    /// <summary>
+    /// The Font Awesome "chess-rook" icon unicode character.
+    /// </summary>
+    ChessRook = 0xF447,
+
+    /// <summary>
+    /// The Font Awesome "chevron-circle-down" icon unicode character.
+    /// </summary>
+    ChevronCircleDown = 0xF13A,
+
+    /// <summary>
+    /// The Font Awesome "chevron-circle-left" icon unicode character.
+    /// </summary>
+    ChevronCircleLeft = 0xF137,
+
+    /// <summary>
+    /// The Font Awesome "chevron-circle-right" icon unicode character.
+    /// </summary>
+    ChevronCircleRight = 0xF138,
+
+    /// <summary>
+    /// The Font Awesome "chevron-circle-up" icon unicode character.
+    /// </summary>
+    ChevronCircleUp = 0xF139,
+
+    /// <summary>
+    /// The Font Awesome "chevron-down" icon unicode character.
+    /// </summary>
+    ChevronDown = 0xF078,
+
+    /// <summary>
+    /// The Font Awesome "chevron-left" icon unicode character.
+    /// </summary>
+    ChevronLeft = 0xF053,
+
+    /// <summary>
+    /// The Font Awesome "chevron-right" icon unicode character.
+    /// </summary>
+    ChevronRight = 0xF054,
+
+    /// <summary>
+    /// The Font Awesome "chevron-up" icon unicode character.
+    /// </summary>
+    ChevronUp = 0xF077,
+
+    /// <summary>
+    /// The Font Awesome "child" icon unicode character.
+    /// </summary>
+    Child = 0xF1AE,
+
+    /// <summary>
+    /// The Font Awesome "chrome" icon unicode character.
+    /// </summary>
+    Chrome = 0xF268,
+
+    /// <summary>
+    /// The Font Awesome "chromecast" icon unicode character.
+    /// </summary>
+    Chromecast = 0xF838,
+
+    /// <summary>
+    /// The Font Awesome "church" icon unicode character.
+    /// </summary>
+    Church = 0xF51D,
+
+    /// <summary>
+    /// The Font Awesome "circle" icon unicode character.
+    /// </summary>
+    Circle = 0xF111,
+
+    /// <summary>
+    /// The Font Awesome "circle-notch" icon unicode character.
+    /// </summary>
+    CircleNotch = 0xF1CE,
+
+    /// <summary>
+    /// The Font Awesome "city" icon unicode character.
+    /// </summary>
+    City = 0xF64F,
+
+    /// <summary>
+    /// The Font Awesome "clinic-medical" icon unicode character.
+    /// </summary>
+    ClinicMedical = 0xF7F2,
+
+    /// <summary>
+    /// The Font Awesome "clipboard" icon unicode character.
+    /// </summary>
+    Clipboard = 0xF328,
+
+    /// <summary>
+    /// The Font Awesome "clipboard-check" icon unicode character.
+    /// </summary>
+    ClipboardCheck = 0xF46C,
+
+    /// <summary>
+    /// The Font Awesome "clipboard-list" icon unicode character.
+    /// </summary>
+    ClipboardList = 0xF46D,
+
+    /// <summary>
+    /// The Font Awesome "clock" icon unicode character.
+    /// </summary>
+    Clock = 0xF017,
+
+    /// <summary>
+    /// The Font Awesome "clone" icon unicode character.
+    /// </summary>
+    Clone = 0xF24D,
+
+    /// <summary>
+    /// The Font Awesome "closed-captioning" icon unicode character.
+    /// </summary>
+    ClosedCaptioning = 0xF20A,
+
+    /// <summary>
+    /// The Font Awesome "cloud" icon unicode character.
+    /// </summary>
+    Cloud = 0xF0C2,
+
+    /// <summary>
+    /// The Font Awesome "cloud-download-alt" icon unicode character.
+    /// </summary>
+    CloudDownloadAlt = 0xF381,
+
+    /// <summary>
+    /// The Font Awesome "cloud-meatball" icon unicode character.
+    /// </summary>
+    CloudMeatball = 0xF73B,
+
+    /// <summary>
+    /// The Font Awesome "cloud-moon" icon unicode character.
+    /// </summary>
+    CloudMoon = 0xF6C3,
+
+    /// <summary>
+    /// The Font Awesome "cloud-moon-rain" icon unicode character.
+    /// </summary>
+    CloudMoonRain = 0xF73C,
+
+    /// <summary>
+    /// The Font Awesome "cloud-rain" icon unicode character.
+    /// </summary>
+    CloudRain = 0xF73D,
+
+    /// <summary>
+    /// The Font Awesome "cloudscale" icon unicode character.
+    /// </summary>
+    Cloudscale = 0xF383,
+
+    /// <summary>
+    /// The Font Awesome "cloud-showers-heavy" icon unicode character.
+    /// </summary>
+    CloudShowersHeavy = 0xF740,
+
+    /// <summary>
+    /// The Font Awesome "cloudsmith" icon unicode character.
+    /// </summary>
+    Cloudsmith = 0xF384,
+
+    /// <summary>
+    /// The Font Awesome "cloud-sun" icon unicode character.
+    /// </summary>
+    CloudSun = 0xF6C4,
+
+    /// <summary>
+    /// The Font Awesome "cloud-sun-rain" icon unicode character.
+    /// </summary>
+    CloudSunRain = 0xF743,
+
+    /// <summary>
+    /// The Font Awesome "cloud-upload-alt" icon unicode character.
+    /// </summary>
+    CloudUploadAlt = 0xF382,
+
+    /// <summary>
+    /// The Font Awesome "cloudversify" icon unicode character.
+    /// </summary>
+    Cloudversify = 0xF385,
+
+    /// <summary>
+    /// The Font Awesome "cocktail" icon unicode character.
+    /// </summary>
+    Cocktail = 0xF561,
+
+    /// <summary>
+    /// The Font Awesome "code" icon unicode character.
+    /// </summary>
+    Code = 0xF121,
+
+    /// <summary>
+    /// The Font Awesome "code-branch" icon unicode character.
+    /// </summary>
+    CodeBranch = 0xF126,
+
+    /// <summary>
+    /// The Font Awesome "codepen" icon unicode character.
+    /// </summary>
+    Codepen = 0xF1CB,
+
+    /// <summary>
+    /// The Font Awesome "codiepie" icon unicode character.
+    /// </summary>
+    Codiepie = 0xF284,
+
+    /// <summary>
+    /// The Font Awesome "coffee" icon unicode character.
+    /// </summary>
+    Coffee = 0xF0F4,
+
+    /// <summary>
+    /// The Font Awesome "cog" icon unicode character.
+    /// </summary>
+    Cog = 0xF013,
+
+    /// <summary>
+    /// The Font Awesome "cogs" icon unicode character.
+    /// </summary>
+    Cogs = 0xF085,
+
+    /// <summary>
+    /// The Font Awesome "coins" icon unicode character.
+    /// </summary>
+    Coins = 0xF51E,
+
+    /// <summary>
+    /// The Font Awesome "columns" icon unicode character.
+    /// </summary>
+    Columns = 0xF0DB,
+
+    /// <summary>
+    /// The Font Awesome "comment" icon unicode character.
+    /// </summary>
+    Comment = 0xF075,
+
+    /// <summary>
+    /// The Font Awesome "comment-alt" icon unicode character.
+    /// </summary>
+    CommentAlt = 0xF27A,
+
+    /// <summary>
+    /// The Font Awesome "comment-dollar" icon unicode character.
+    /// </summary>
+    CommentDollar = 0xF651,
+
+    /// <summary>
+    /// The Font Awesome "comment-dots" icon unicode character.
+    /// </summary>
+    CommentDots = 0xF4AD,
+
+    /// <summary>
+    /// The Font Awesome "comment-medical" icon unicode character.
+    /// </summary>
+    CommentMedical = 0xF7F5,
+
+    /// <summary>
+    /// The Font Awesome "comments" icon unicode character.
+    /// </summary>
+    Comments = 0xF086,
+
+    /// <summary>
+    /// The Font Awesome "comments-dollar" icon unicode character.
+    /// </summary>
+    CommentsDollar = 0xF653,
+
+    /// <summary>
+    /// The Font Awesome "comment-slash" icon unicode character.
+    /// </summary>
+    CommentSlash = 0xF4B3,
+
+    /// <summary>
+    /// The Font Awesome "compact-disc" icon unicode character.
+    /// </summary>
+    CompactDisc = 0xF51F,
+
+    /// <summary>
+    /// The Font Awesome "compass" icon unicode character.
+    /// </summary>
+    Compass = 0xF14E,
+
+    /// <summary>
+    /// The Font Awesome "compress" icon unicode character.
+    /// </summary>
+    Compress = 0xF066,
+
+    /// <summary>
+    /// The Font Awesome "compress-alt" icon unicode character.
+    /// </summary>
+    CompressAlt = 0xF422,
+
+    /// <summary>
+    /// The Font Awesome "compress-arrows-alt" icon unicode character.
+    /// </summary>
+    CompressArrowsAlt = 0xF78C,
+
+    /// <summary>
+    /// The Font Awesome "concierge-bell" icon unicode character.
+    /// </summary>
+    ConciergeBell = 0xF562,
+
+    /// <summary>
+    /// The Font Awesome "confluence" icon unicode character.
+    /// </summary>
+    Confluence = 0xF78D,
+
+    /// <summary>
+    /// The Font Awesome "connectdevelop" icon unicode character.
+    /// </summary>
+    Connectdevelop = 0xF20E,
+
+    /// <summary>
+    /// The Font Awesome "contao" icon unicode character.
+    /// </summary>
+    Contao = 0xF26D,
+
+    /// <summary>
+    /// The Font Awesome "cookie" icon unicode character.
+    /// </summary>
+    Cookie = 0xF563,
+
+    /// <summary>
+    /// The Font Awesome "cookie-bite" icon unicode character.
+    /// </summary>
+    CookieBite = 0xF564,
+
+    /// <summary>
+    /// The Font Awesome "copy" icon unicode character.
+    /// </summary>
+    Copy = 0xF0C5,
+
+    /// <summary>
+    /// The Font Awesome "copyright" icon unicode character.
+    /// </summary>
+    Copyright = 0xF1F9,
+
+    /// <summary>
+    /// The Font Awesome "cotton-bureau" icon unicode character.
+    /// </summary>
+    CottonBureau = 0xF89E,
+
+    /// <summary>
+    /// The Font Awesome "couch" icon unicode character.
+    /// </summary>
+    Couch = 0xF4B8,
+
+    /// <summary>
+    /// The Font Awesome "cpanel" icon unicode character.
+    /// </summary>
+    Cpanel = 0xF388,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons" icon unicode character.
+    /// </summary>
+    CreativeCommons = 0xF25E,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-by" icon unicode character.
+    /// </summary>
+    CreativeCommonsBy = 0xF4E7,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-nc" icon unicode character.
+    /// </summary>
+    CreativeCommonsNc = 0xF4E8,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-nc-eu" icon unicode character.
+    /// </summary>
+    CreativeCommonsNcEu = 0xF4E9,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-nc-jp" icon unicode character.
+    /// </summary>
+    CreativeCommonsNcJp = 0xF4EA,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-nd" icon unicode character.
+    /// </summary>
+    CreativeCommonsNd = 0xF4EB,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-pd" icon unicode character.
+    /// </summary>
+    CreativeCommonsPd = 0xF4EC,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-pd-alt" icon unicode character.
+    /// </summary>
+    CreativeCommonsPdAlt = 0xF4ED,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-remix" icon unicode character.
+    /// </summary>
+    CreativeCommonsRemix = 0xF4EE,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-sa" icon unicode character.
+    /// </summary>
+    CreativeCommonsSa = 0xF4EF,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-sampling" icon unicode character.
+    /// </summary>
+    CreativeCommonsSampling = 0xF4F0,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-sampling-plus" icon unicode character.
+    /// </summary>
+    CreativeCommonsSamplingPlus = 0xF4F1,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-share" icon unicode character.
+    /// </summary>
+    CreativeCommonsShare = 0xF4F2,
+
+    /// <summary>
+    /// The Font Awesome "creative-commons-zero" icon unicode character.
+    /// </summary>
+    CreativeCommonsZero = 0xF4F3,
+
+    /// <summary>
+    /// The Font Awesome "credit-card" icon unicode character.
+    /// </summary>
+    CreditCard = 0xF09D,
+
+    /// <summary>
+    /// The Font Awesome "critical-role" icon unicode character.
+    /// </summary>
+    CriticalRole = 0xF6C9,
+
+    /// <summary>
+    /// The Font Awesome "crop" icon unicode character.
+    /// </summary>
+    Crop = 0xF125,
+
+    /// <summary>
+    /// The Font Awesome "crop-alt" icon unicode character.
+    /// </summary>
+    CropAlt = 0xF565,
+
+    /// <summary>
+    /// The Font Awesome "cross" icon unicode character.
+    /// </summary>
+    Cross = 0xF654,
+
+    /// <summary>
+    /// The Font Awesome "crosshairs" icon unicode character.
+    /// </summary>
+    Crosshairs = 0xF05B,
+
+    /// <summary>
+    /// The Font Awesome "crow" icon unicode character.
+    /// </summary>
+    Crow = 0xF520,
+
+    /// <summary>
+    /// The Font Awesome "crown" icon unicode character.
+    /// </summary>
+    Crown = 0xF521,
+
+    /// <summary>
+    /// The Font Awesome "crutch" icon unicode character.
+    /// </summary>
+    Crutch = 0xF7F7,
+
+    /// <summary>
+    /// The Font Awesome "css3" icon unicode character.
+    /// </summary>
+    Css3 = 0xF13C,
+
+    /// <summary>
+    /// The Font Awesome "css3-alt" icon unicode character.
+    /// </summary>
+    Css3Alt = 0xF38B,
+
+    /// <summary>
+    /// The Font Awesome "cube" icon unicode character.
+    /// </summary>
+    Cube = 0xF1B2,
+
+    /// <summary>
+    /// The Font Awesome "cubes" icon unicode character.
+    /// </summary>
+    Cubes = 0xF1B3,
+
+    /// <summary>
+    /// The Font Awesome "cut" icon unicode character.
+    /// </summary>
+    Cut = 0xF0C4,
+
+    /// <summary>
+    /// The Font Awesome "cuttlefish" icon unicode character.
+    /// </summary>
+    Cuttlefish = 0xF38C,
+
+    /// <summary>
+    /// The Font Awesome "dailymotion" icon unicode character.
+    /// </summary>
+    Dailymotion = 0xF952,
+
+    /// <summary>
+    /// The Font Awesome "d-and-d" icon unicode character.
+    /// </summary>
+    DAndD = 0xF38D,
+
+    /// <summary>
+    /// The Font Awesome "d-and-d-beyond" icon unicode character.
+    /// </summary>
+    DAndDBeyond = 0xF6CA,
+
+    /// <summary>
+    /// The Font Awesome "dashcube" icon unicode character.
+    /// </summary>
+    Dashcube = 0xF210,
+
+    /// <summary>
+    /// The Font Awesome "database" icon unicode character.
+    /// </summary>
+    Database = 0xF1C0,
+
+    /// <summary>
+    /// The Font Awesome "deaf" icon unicode character.
+    /// </summary>
+    Deaf = 0xF2A4,
+
+    /// <summary>
+    /// The Font Awesome "delicious" icon unicode character.
+    /// </summary>
+    Delicious = 0xF1A5,
+
+    /// <summary>
+    /// The Font Awesome "democrat" icon unicode character.
+    /// </summary>
+    Democrat = 0xF747,
+
+    /// <summary>
+    /// The Font Awesome "deploydog" icon unicode character.
+    /// </summary>
+    Deploydog = 0xF38E,
+
+    /// <summary>
+    /// The Font Awesome "deskpro" icon unicode character.
+    /// </summary>
+    Deskpro = 0xF38F,
+
+    /// <summary>
+    /// The Font Awesome "desktop" icon unicode character.
+    /// </summary>
+    Desktop = 0xF108,
+
+    /// <summary>
+    /// The Font Awesome "dev" icon unicode character.
+    /// </summary>
+    Dev = 0xF6CC,
+
+    /// <summary>
+    /// The Font Awesome "deviantart" icon unicode character.
+    /// </summary>
+    Deviantart = 0xF1BD,
+
+    /// <summary>
+    /// The Font Awesome "dharmachakra" icon unicode character.
+    /// </summary>
+    Dharmachakra = 0xF655,
+
+    /// <summary>
+    /// The Font Awesome "dhl" icon unicode character.
+    /// </summary>
+    Dhl = 0xF790,
+
+    /// <summary>
+    /// The Font Awesome "diagnoses" icon unicode character.
+    /// </summary>
+    Diagnoses = 0xF470,
+
+    /// <summary>
+    /// The Font Awesome "diaspora" icon unicode character.
+    /// </summary>
+    Diaspora = 0xF791,
+
+    /// <summary>
+    /// The Font Awesome "dice" icon unicode character.
+    /// </summary>
+    Dice = 0xF522,
+
+    /// <summary>
+    /// The Font Awesome "dice-d20" icon unicode character.
+    /// </summary>
+    DiceD20 = 0xF6CF,
+
+    /// <summary>
+    /// The Font Awesome "dice-d6" icon unicode character.
+    /// </summary>
+    DiceD6 = 0xF6D1,
+
+    /// <summary>
+    /// The Font Awesome "dice-five" icon unicode character.
+    /// </summary>
+    DiceFive = 0xF523,
+
+    /// <summary>
+    /// The Font Awesome "dice-four" icon unicode character.
+    /// </summary>
+    DiceFour = 0xF524,
+
+    /// <summary>
+    /// The Font Awesome "dice-one" icon unicode character.
+    /// </summary>
+    DiceOne = 0xF525,
+
+    /// <summary>
+    /// The Font Awesome "dice-six" icon unicode character.
+    /// </summary>
+    DiceSix = 0xF526,
+
+    /// <summary>
+    /// The Font Awesome "dice-three" icon unicode character.
+    /// </summary>
+    DiceThree = 0xF527,
+
+    /// <summary>
+    /// The Font Awesome "dice-two" icon unicode character.
+    /// </summary>
+    DiceTwo = 0xF528,
+
+    /// <summary>
+    /// The Font Awesome "digg" icon unicode character.
+    /// </summary>
+    Digg = 0xF1A6,
+
+    /// <summary>
+    /// The Font Awesome "digital-ocean" icon unicode character.
+    /// </summary>
+    DigitalOcean = 0xF391,
+
+    /// <summary>
+    /// The Font Awesome "digital-tachograph" icon unicode character.
+    /// </summary>
+    DigitalTachograph = 0xF566,
+
+    /// <summary>
+    /// The Font Awesome "directions" icon unicode character.
+    /// </summary>
+    Directions = 0xF5EB,
+
+    /// <summary>
+    /// The Font Awesome "discord" icon unicode character.
+    /// </summary>
+    Discord = 0xF392,
+
+    /// <summary>
+    /// The Font Awesome "discourse" icon unicode character.
+    /// </summary>
+    Discourse = 0xF393,
+
+    /// <summary>
+    /// The Font Awesome "divide" icon unicode character.
+    /// </summary>
+    Divide = 0xF529,
+
+    /// <summary>
+    /// The Font Awesome "dizzy" icon unicode character.
+    /// </summary>
+    Dizzy = 0xF567,
+
+    /// <summary>
+    /// The Font Awesome "dna" icon unicode character.
+    /// </summary>
+    Dna = 0xF471,
+
+    /// <summary>
+    /// The Font Awesome "dochub" icon unicode character.
+    /// </summary>
+    Dochub = 0xF394,
+
+    /// <summary>
+    /// The Font Awesome "docker" icon unicode character.
+    /// </summary>
+    Docker = 0xF395,
+
+    /// <summary>
+    /// The Font Awesome "dog" icon unicode character.
+    /// </summary>
+    Dog = 0xF6D3,
+
+    /// <summary>
+    /// The Font Awesome "dollar-sign" icon unicode character.
+    /// </summary>
+    DollarSign = 0xF155,
+
+    /// <summary>
+    /// The Font Awesome "dolly" icon unicode character.
+    /// </summary>
+    Dolly = 0xF472,
+
+    /// <summary>
+    /// The Font Awesome "dolly-flatbed" icon unicode character.
+    /// </summary>
+    DollyFlatbed = 0xF474,
+
+    /// <summary>
+    /// The Font Awesome "donate" icon unicode character.
+    /// </summary>
+    Donate = 0xF4B9,
+
+    /// <summary>
+    /// The Font Awesome "door-closed" icon unicode character.
+    /// </summary>
+    DoorClosed = 0xF52A,
+
+    /// <summary>
+    /// The Font Awesome "door-open" icon unicode character.
+    /// </summary>
+    DoorOpen = 0xF52B,
+
+    /// <summary>
+    /// The Font Awesome "dot-circle" icon unicode character.
+    /// </summary>
+    DotCircle = 0xF192,
+
+    /// <summary>
+    /// The Font Awesome "dove" icon unicode character.
+    /// </summary>
+    Dove = 0xF4BA,
+
+    /// <summary>
+    /// The Font Awesome "download" icon unicode character.
+    /// </summary>
+    Download = 0xF019,
+
+    /// <summary>
+    /// The Font Awesome "draft2digital" icon unicode character.
+    /// </summary>
+    Draft2digital = 0xF396,
+
+    /// <summary>
+    /// The Font Awesome "drafting-compass" icon unicode character.
+    /// </summary>
+    DraftingCompass = 0xF568,
+
+    /// <summary>
+    /// The Font Awesome "dragon" icon unicode character.
+    /// </summary>
+    Dragon = 0xF6D5,
+
+    /// <summary>
+    /// The Font Awesome "draw-polygon" icon unicode character.
+    /// </summary>
+    DrawPolygon = 0xF5EE,
+
+    /// <summary>
+    /// The Font Awesome "dribbble" icon unicode character.
+    /// </summary>
+    Dribbble = 0xF17D,
+
+    /// <summary>
+    /// The Font Awesome "dribbble-square" icon unicode character.
+    /// </summary>
+    DribbbleSquare = 0xF397,
+
+    /// <summary>
+    /// The Font Awesome "dropbox" icon unicode character.
+    /// </summary>
+    Dropbox = 0xF16B,
+
+    /// <summary>
+    /// The Font Awesome "drum" icon unicode character.
+    /// </summary>
+    Drum = 0xF569,
+
+    /// <summary>
+    /// The Font Awesome "drum-steelpan" icon unicode character.
+    /// </summary>
+    DrumSteelpan = 0xF56A,
+
+    /// <summary>
+    /// The Font Awesome "drumstick-bite" icon unicode character.
+    /// </summary>
+    DrumstickBite = 0xF6D7,
+
+    /// <summary>
+    /// The Font Awesome "drupal" icon unicode character.
+    /// </summary>
+    Drupal = 0xF1A9,
+
+    /// <summary>
+    /// The Font Awesome "dumbbell" icon unicode character.
+    /// </summary>
+    Dumbbell = 0xF44B,
+
+    /// <summary>
+    /// The Font Awesome "dumpster" icon unicode character.
+    /// </summary>
+    Dumpster = 0xF793,
+
+    /// <summary>
+    /// The Font Awesome "dumpster-fire" icon unicode character.
+    /// </summary>
+    DumpsterFire = 0xF794,
+
+    /// <summary>
+    /// The Font Awesome "dungeon" icon unicode character.
+    /// </summary>
+    Dungeon = 0xF6D9,
+
+    /// <summary>
+    /// The Font Awesome "dyalog" icon unicode character.
+    /// </summary>
+    Dyalog = 0xF399,
+
+    /// <summary>
+    /// The Font Awesome "earlybirds" icon unicode character.
+    /// </summary>
+    Earlybirds = 0xF39A,
+
+    /// <summary>
+    /// The Font Awesome "ebay" icon unicode character.
+    /// </summary>
+    Ebay = 0xF4F4,
+
+    /// <summary>
+    /// The Font Awesome "edge" icon unicode character.
+    /// </summary>
+    Edge = 0xF282,
+
+    /// <summary>
+    /// The Font Awesome "edit" icon unicode character.
+    /// </summary>
+    Edit = 0xF044,
+
+    /// <summary>
+    /// The Font Awesome "egg" icon unicode character.
+    /// </summary>
+    Egg = 0xF7FB,
+
+    /// <summary>
+    /// The Font Awesome "eject" icon unicode character.
+    /// </summary>
+    Eject = 0xF052,
+
+    /// <summary>
+    /// The Font Awesome "elementor" icon unicode character.
+    /// </summary>
+    Elementor = 0xF430,
+
+    /// <summary>
+    /// The Font Awesome "ellipsis-h" icon unicode character.
+    /// </summary>
+    EllipsisH = 0xF141,
+
+    /// <summary>
+    /// The Font Awesome "ellipsis-v" icon unicode character.
+    /// </summary>
+    EllipsisV = 0xF142,
+
+    /// <summary>
+    /// The Font Awesome "ello" icon unicode character.
+    /// </summary>
+    Ello = 0xF5F1,
+
+    /// <summary>
+    /// The Font Awesome "ember" icon unicode character.
+    /// </summary>
+    Ember = 0xF423,
+
+    /// <summary>
+    /// The Font Awesome "empire" icon unicode character.
+    /// </summary>
+    Empire = 0xF1D1,
+
+    /// <summary>
+    /// The Font Awesome "envelope" icon unicode character.
+    /// </summary>
+    Envelope = 0xF0E0,
+
+    /// <summary>
+    /// The Font Awesome "envelope-open" icon unicode character.
+    /// </summary>
+    EnvelopeOpen = 0xF2B6,
+
+    /// <summary>
+    /// The Font Awesome "envelope-open-text" icon unicode character.
+    /// </summary>
+    EnvelopeOpenText = 0xF658,
+
+    /// <summary>
+    /// The Font Awesome "envelope-square" icon unicode character.
+    /// </summary>
+    EnvelopeSquare = 0xF199,
+
+    /// <summary>
+    /// The Font Awesome "envira" icon unicode character.
+    /// </summary>
+    Envira = 0xF299,
+
+    /// <summary>
+    /// The Font Awesome "equals" icon unicode character.
+    /// </summary>
+    Equals = 0xF52C,
+
+    /// <summary>
+    /// The Font Awesome "eraser" icon unicode character.
+    /// </summary>
+    Eraser = 0xF12D,
+
+    /// <summary>
+    /// The Font Awesome "erlang" icon unicode character.
+    /// </summary>
+    Erlang = 0xF39D,
+
+    /// <summary>
+    /// The Font Awesome "ethereum" icon unicode character.
+    /// </summary>
+    Ethereum = 0xF42E,
+
+    /// <summary>
+    /// The Font Awesome "ethernet" icon unicode character.
+    /// </summary>
+    Ethernet = 0xF796,
+
+    /// <summary>
+    /// The Font Awesome "etsy" icon unicode character.
+    /// </summary>
+    Etsy = 0xF2D7,
+
+    /// <summary>
+    /// The Font Awesome "euro-sign" icon unicode character.
+    /// </summary>
+    EuroSign = 0xF153,
+
+    /// <summary>
+    /// The Font Awesome "evernote" icon unicode character.
+    /// </summary>
+    Evernote = 0xF839,
+
+    /// <summary>
+    /// The Font Awesome "exchange-alt" icon unicode character.
+    /// </summary>
+    ExchangeAlt = 0xF362,
+
+    /// <summary>
+    /// The Font Awesome "exclamation" icon unicode character.
+    /// </summary>
+    Exclamation = 0xF12A,
+
+    /// <summary>
+    /// The Font Awesome "exclamation-circle" icon unicode character.
+    /// </summary>
+    ExclamationCircle = 0xF06A,
+
+    /// <summary>
+    /// The Font Awesome "exclamation-triangle" icon unicode character.
+    /// </summary>
+    ExclamationTriangle = 0xF071,
+
+    /// <summary>
+    /// The Font Awesome "expand" icon unicode character.
+    /// </summary>
+    Expand = 0xF065,
+
+    /// <summary>
+    /// The Font Awesome "expand-alt" icon unicode character.
+    /// </summary>
+    ExpandAlt = 0xF424,
+
+    /// <summary>
+    /// The Font Awesome "expand-arrows-alt" icon unicode character.
+    /// </summary>
+    ExpandArrowsAlt = 0xF31E,
+
+    /// <summary>
+    /// The Font Awesome "expeditedssl" icon unicode character.
+    /// </summary>
+    Expeditedssl = 0xF23E,
+
+    /// <summary>
+    /// The Font Awesome "external-link-alt" icon unicode character.
+    /// </summary>
+    ExternalLinkAlt = 0xF35D,
+
+    /// <summary>
+    /// The Font Awesome "external-link-square-alt" icon unicode character.
+    /// </summary>
+    ExternalLinkSquareAlt = 0xF360,
+
+    /// <summary>
+    /// The Font Awesome "eye" icon unicode character.
+    /// </summary>
+    Eye = 0xF06E,
+
+    /// <summary>
+    /// The Font Awesome "eye-dropper" icon unicode character.
+    /// </summary>
+    EyeDropper = 0xF1FB,
+
+    /// <summary>
+    /// The Font Awesome "eye-slash" icon unicode character.
+    /// </summary>
+    EyeSlash = 0xF070,
+
+    /// <summary>
+    /// The Font Awesome "facebook" icon unicode character.
+    /// </summary>
+    Facebook = 0xF09A,
+
+    /// <summary>
+    /// The Font Awesome "facebook-f" icon unicode character.
+    /// </summary>
+    FacebookF = 0xF39E,
+
+    /// <summary>
+    /// The Font Awesome "facebook-messenger" icon unicode character.
+    /// </summary>
+    FacebookMessenger = 0xF39F,
+
+    /// <summary>
+    /// The Font Awesome "facebook-square" icon unicode character.
+    /// </summary>
+    FacebookSquare = 0xF082,
+
+    /// <summary>
+    /// The Font Awesome "fan" icon unicode character.
+    /// </summary>
+    Fan = 0xF863,
+
+    /// <summary>
+    /// The Font Awesome "fantasy-flight-games" icon unicode character.
+    /// </summary>
+    FantasyFlightGames = 0xF6DC,
+
+    /// <summary>
+    /// The Font Awesome "fast-backward" icon unicode character.
+    /// </summary>
+    FastBackward = 0xF049,
+
+    /// <summary>
+    /// The Font Awesome "fast-forward" icon unicode character.
+    /// </summary>
+    FastForward = 0xF050,
+
+    /// <summary>
+    /// The Font Awesome "fax" icon unicode character.
+    /// </summary>
+    Fax = 0xF1AC,
+
+    /// <summary>
+    /// The Font Awesome "feather" icon unicode character.
+    /// </summary>
+    Feather = 0xF52D,
+
+    /// <summary>
+    /// The Font Awesome "feather-alt" icon unicode character.
+    /// </summary>
+    FeatherAlt = 0xF56B,
+
+    /// <summary>
+    /// The Font Awesome "fedex" icon unicode character.
+    /// </summary>
+    Fedex = 0xF797,
+
+    /// <summary>
+    /// The Font Awesome "fedora" icon unicode character.
+    /// </summary>
+    Fedora = 0xF798,
+
+    /// <summary>
+    /// The Font Awesome "female" icon unicode character.
+    /// </summary>
+    Female = 0xF182,
+
+    /// <summary>
+    /// The Font Awesome "fighter-jet" icon unicode character.
+    /// </summary>
+    FighterJet = 0xF0FB,
+
+    /// <summary>
+    /// The Font Awesome "figma" icon unicode character.
+    /// </summary>
+    Figma = 0xF799,
+
+    /// <summary>
+    /// The Font Awesome "file" icon unicode character.
+    /// </summary>
+    File = 0xF15B,
+
+    /// <summary>
+    /// The Font Awesome "file-alt" icon unicode character.
+    /// </summary>
+    FileAlt = 0xF15C,
+
+    /// <summary>
+    /// The Font Awesome "file-archive" icon unicode character.
+    /// </summary>
+    FileArchive = 0xF1C6,
+
+    /// <summary>
+    /// The Font Awesome "file-audio" icon unicode character.
+    /// </summary>
+    FileAudio = 0xF1C7,
+
+    /// <summary>
+    /// The Font Awesome "file-code" icon unicode character.
+    /// </summary>
+    FileCode = 0xF1C9,
+
+    /// <summary>
+    /// The Font Awesome "file-contract" icon unicode character.
+    /// </summary>
+    FileContract = 0xF56C,
+
+    /// <summary>
+    /// The Font Awesome "file-csv" icon unicode character.
+    /// </summary>
+    FileCsv = 0xF6DD,
+
+    /// <summary>
+    /// The Font Awesome "file-download" icon unicode character.
+    /// </summary>
+    FileDownload = 0xF56D,
+
+    /// <summary>
+    /// The Font Awesome "file-excel" icon unicode character.
+    /// </summary>
+    FileExcel = 0xF1C3,
+
+    /// <summary>
+    /// The Font Awesome "file-export" icon unicode character.
+    /// </summary>
+    FileExport = 0xF56E,
+
+    /// <summary>
+    /// The Font Awesome "file-image" icon unicode character.
+    /// </summary>
+    FileImage = 0xF1C5,
+
+    /// <summary>
+    /// The Font Awesome "file-import" icon unicode character.
+    /// </summary>
+    FileImport = 0xF56F,
+
+    /// <summary>
+    /// The Font Awesome "file-invoice" icon unicode character.
+    /// </summary>
+    FileInvoice = 0xF570,
+
+    /// <summary>
+    /// The Font Awesome "file-invoice-dollar" icon unicode character.
+    /// </summary>
+    FileInvoiceDollar = 0xF571,
+
+    /// <summary>
+    /// The Font Awesome "file-medical" icon unicode character.
+    /// </summary>
+    FileMedical = 0xF477,
+
+    /// <summary>
+    /// The Font Awesome "file-medical-alt" icon unicode character.
+    /// </summary>
+    FileMedicalAlt = 0xF478,
+
+    /// <summary>
+    /// The Font Awesome "file-pdf" icon unicode character.
+    /// </summary>
+    FilePdf = 0xF1C1,
+
+    /// <summary>
+    /// The Font Awesome "file-powerpoint" icon unicode character.
+    /// </summary>
+    FilePowerpoint = 0xF1C4,
+
+    /// <summary>
+    /// The Font Awesome "file-prescription" icon unicode character.
+    /// </summary>
+    FilePrescription = 0xF572,
+
+    /// <summary>
+    /// The Font Awesome "file-signature" icon unicode character.
+    /// </summary>
+    FileSignature = 0xF573,
+
+    /// <summary>
+    /// The Font Awesome "file-upload" icon unicode character.
+    /// </summary>
+    FileUpload = 0xF574,
+
+    /// <summary>
+    /// The Font Awesome "file-video" icon unicode character.
+    /// </summary>
+    FileVideo = 0xF1C8,
+
+    /// <summary>
+    /// The Font Awesome "file-word" icon unicode character.
+    /// </summary>
+    FileWord = 0xF1C2,
+
+    /// <summary>
+    /// The Font Awesome "fill" icon unicode character.
+    /// </summary>
+    Fill = 0xF575,
+
+    /// <summary>
+    /// The Font Awesome "fill-drip" icon unicode character.
+    /// </summary>
+    FillDrip = 0xF576,
+
+    /// <summary>
+    /// The Font Awesome "film" icon unicode character.
+    /// </summary>
+    Film = 0xF008,
+
+    /// <summary>
+    /// The Font Awesome "filter" icon unicode character.
+    /// </summary>
+    Filter = 0xF0B0,
+
+    /// <summary>
+    /// The Font Awesome "fingerprint" icon unicode character.
+    /// </summary>
+    Fingerprint = 0xF577,
+
+    /// <summary>
+    /// The Font Awesome "fire" icon unicode character.
+    /// </summary>
+    Fire = 0xF06D,
+
+    /// <summary>
+    /// The Font Awesome "fire-alt" icon unicode character.
+    /// </summary>
+    FireAlt = 0xF7E4,
+
+    /// <summary>
+    /// The Font Awesome "fire-extinguisher" icon unicode character.
+    /// </summary>
+    FireExtinguisher = 0xF134,
+
+    /// <summary>
+    /// The Font Awesome "firefox" icon unicode character.
+    /// </summary>
+    Firefox = 0xF269,
+
+    /// <summary>
+    /// The Font Awesome "firefox-browser" icon unicode character.
+    /// </summary>
+    FirefoxBrowser = 0xF907,
+
+    /// <summary>
+    /// The Font Awesome "first-aid" icon unicode character.
+    /// </summary>
+    FirstAid = 0xF479,
+
+    /// <summary>
+    /// The Font Awesome "firstdraft" icon unicode character.
+    /// </summary>
+    Firstdraft = 0xF3A1,
+
+    /// <summary>
+    /// The Font Awesome "first-order" icon unicode character.
+    /// </summary>
+    FirstOrder = 0xF2B0,
+
+    /// <summary>
+    /// The Font Awesome "first-order-alt" icon unicode character.
+    /// </summary>
+    FirstOrderAlt = 0xF50A,
+
+    /// <summary>
+    /// The Font Awesome "fish" icon unicode character.
+    /// </summary>
+    Fish = 0xF578,
+
+    /// <summary>
+    /// The Font Awesome "fist-raised" icon unicode character.
+    /// </summary>
+    FistRaised = 0xF6DE,
+
+    /// <summary>
+    /// The Font Awesome "flag" icon unicode character.
+    /// </summary>
+    Flag = 0xF024,
+
+    /// <summary>
+    /// The Font Awesome "flag-checkered" icon unicode character.
+    /// </summary>
+    FlagCheckered = 0xF11E,
+
+    /// <summary>
+    /// The Font Awesome "flag-usa" icon unicode character.
+    /// </summary>
+    FlagUsa = 0xF74D,
+
+    /// <summary>
+    /// The Font Awesome "flask" icon unicode character.
+    /// </summary>
+    Flask = 0xF0C3,
+
+    /// <summary>
+    /// The Font Awesome "flickr" icon unicode character.
+    /// </summary>
+    Flickr = 0xF16E,
+
+    /// <summary>
+    /// The Font Awesome "flipboard" icon unicode character.
+    /// </summary>
+    Flipboard = 0xF44D,
+
+    /// <summary>
+    /// The Font Awesome "flushed" icon unicode character.
+    /// </summary>
+    Flushed = 0xF579,
+
+    /// <summary>
+    /// The Font Awesome "fly" icon unicode character.
+    /// </summary>
+    Fly = 0xF417,
+
+    /// <summary>
+    /// The Font Awesome "folder" icon unicode character.
+    /// </summary>
+    Folder = 0xF07B,
+
+    /// <summary>
+    /// The Font Awesome "folder-minus" icon unicode character.
+    /// </summary>
+    FolderMinus = 0xF65D,
+
+    /// <summary>
+    /// The Font Awesome "folder-open" icon unicode character.
+    /// </summary>
+    FolderOpen = 0xF07C,
+
+    /// <summary>
+    /// The Font Awesome "folder-plus" icon unicode character.
+    /// </summary>
+    FolderPlus = 0xF65E,
+
+    /// <summary>
+    /// The Font Awesome "font" icon unicode character.
+    /// </summary>
+    Font = 0xF031,
+
+    /// <summary>
+    /// The Font Awesome "font-awesome" icon unicode character.
+    /// </summary>
+    FontAwesome = 0xF2B4,
+
+    /// <summary>
+    /// The Font Awesome "font-awesome-alt" icon unicode character.
+    /// </summary>
+    FontAwesomeAlt = 0xF35C,
+
+    /// <summary>
+    /// The Font Awesome "font-awesome-flag" icon unicode character.
+    /// </summary>
+    FontAwesomeFlag = 0xF425,
+
+    /// <summary>
+    /// The Font Awesome "font-awesome-logo-full" icon unicode character.
+    /// </summary>
+    FontAwesomeLogoFull = 0xF4E6,
+
+    /// <summary>
+    /// The Font Awesome "fonticons" icon unicode character.
+    /// </summary>
+    Fonticons = 0xF280,
+
+    /// <summary>
+    /// The Font Awesome "fonticons-fi" icon unicode character.
+    /// </summary>
+    FonticonsFi = 0xF3A2,
+
+    /// <summary>
+    /// The Font Awesome "football-ball" icon unicode character.
+    /// </summary>
+    FootballBall = 0xF44E,
+
+    /// <summary>
+    /// The Font Awesome "fort-awesome" icon unicode character.
+    /// </summary>
+    FortAwesome = 0xF286,
+
+    /// <summary>
+    /// The Font Awesome "fort-awesome-alt" icon unicode character.
+    /// </summary>
+    FortAwesomeAlt = 0xF3A3,
+
+    /// <summary>
+    /// The Font Awesome "forumbee" icon unicode character.
+    /// </summary>
+    Forumbee = 0xF211,
+
+    /// <summary>
+    /// The Font Awesome "forward" icon unicode character.
+    /// </summary>
+    Forward = 0xF04E,
+
+    /// <summary>
+    /// The Font Awesome "foursquare" icon unicode character.
+    /// </summary>
+    Foursquare = 0xF180,
+
+    /// <summary>
+    /// The Font Awesome "freebsd" icon unicode character.
+    /// </summary>
+    Freebsd = 0xF3A4,
+
+    /// <summary>
+    /// The Font Awesome "free-code-camp" icon unicode character.
+    /// </summary>
+    FreeCodeCamp = 0xF2C5,
+
+    /// <summary>
+    /// The Font Awesome "frog" icon unicode character.
+    /// </summary>
+    Frog = 0xF52E,
+
+    /// <summary>
+    /// The Font Awesome "frown" icon unicode character.
+    /// </summary>
+    Frown = 0xF119,
+
+    /// <summary>
+    /// The Font Awesome "frown-open" icon unicode character.
+    /// </summary>
+    FrownOpen = 0xF57A,
+
+    /// <summary>
+    /// The Font Awesome "fulcrum" icon unicode character.
+    /// </summary>
+    Fulcrum = 0xF50B,
+
+    /// <summary>
+    /// The Font Awesome "funnel-dollar" icon unicode character.
+    /// </summary>
+    FunnelDollar = 0xF662,
+
+    /// <summary>
+    /// The Font Awesome "futbol" icon unicode character.
+    /// </summary>
+    Futbol = 0xF1E3,
+
+    /// <summary>
+    /// The Font Awesome "galactic-republic" icon unicode character.
+    /// </summary>
+    GalacticRepublic = 0xF50C,
+
+    /// <summary>
+    /// The Font Awesome "galactic-senate" icon unicode character.
+    /// </summary>
+    GalacticSenate = 0xF50D,
+
+    /// <summary>
+    /// The Font Awesome "gamepad" icon unicode character.
+    /// </summary>
+    Gamepad = 0xF11B,
+
+    /// <summary>
+    /// The Font Awesome "gas-pump" icon unicode character.
+    /// </summary>
+    GasPump = 0xF52F,
+
+    /// <summary>
+    /// The Font Awesome "gavel" icon unicode character.
+    /// </summary>
+    Gavel = 0xF0E3,
+
+    /// <summary>
+    /// The Font Awesome "gem" icon unicode character.
+    /// </summary>
+    Gem = 0xF3A5,
+
+    /// <summary>
+    /// The Font Awesome "genderless" icon unicode character.
+    /// </summary>
+    Genderless = 0xF22D,
+
+    /// <summary>
+    /// The Font Awesome "get-pocket" icon unicode character.
+    /// </summary>
+    GetPocket = 0xF265,
+
+    /// <summary>
+    /// The Font Awesome "gg" icon unicode character.
+    /// </summary>
+    Gg = 0xF260,
+
+    /// <summary>
+    /// The Font Awesome "gg-circle" icon unicode character.
+    /// </summary>
+    GgCircle = 0xF261,
+
+    /// <summary>
+    /// The Font Awesome "ghost" icon unicode character.
+    /// </summary>
+    Ghost = 0xF6E2,
+
+    /// <summary>
+    /// The Font Awesome "gift" icon unicode character.
+    /// </summary>
+    Gift = 0xF06B,
+
+    /// <summary>
+    /// The Font Awesome "gifts" icon unicode character.
+    /// </summary>
+    Gifts = 0xF79C,
+
+    /// <summary>
+    /// The Font Awesome "git" icon unicode character.
+    /// </summary>
+    Git = 0xF1D3,
+
+    /// <summary>
+    /// The Font Awesome "git-alt" icon unicode character.
+    /// </summary>
+    GitAlt = 0xF841,
+
+    /// <summary>
+    /// The Font Awesome "github" icon unicode character.
+    /// </summary>
+    Github = 0xF09B,
+
+    /// <summary>
+    /// The Font Awesome "github-alt" icon unicode character.
+    /// </summary>
+    GithubAlt = 0xF113,
+
+    /// <summary>
+    /// The Font Awesome "github-square" icon unicode character.
+    /// </summary>
+    GithubSquare = 0xF092,
+
+    /// <summary>
+    /// The Font Awesome "gitkraken" icon unicode character.
+    /// </summary>
+    Gitkraken = 0xF3A6,
+
+    /// <summary>
+    /// The Font Awesome "gitlab" icon unicode character.
+    /// </summary>
+    Gitlab = 0xF296,
+
+    /// <summary>
+    /// The Font Awesome "git-square" icon unicode character.
+    /// </summary>
+    GitSquare = 0xF1D2,
+
+    /// <summary>
+    /// The Font Awesome "gitter" icon unicode character.
+    /// </summary>
+    Gitter = 0xF426,
+
+    /// <summary>
+    /// The Font Awesome "glass-cheers" icon unicode character.
+    /// </summary>
+    GlassCheers = 0xF79F,
+
+    /// <summary>
+    /// The Font Awesome "glasses" icon unicode character.
+    /// </summary>
+    Glasses = 0xF530,
+
+    /// <summary>
+    /// The Font Awesome "glass-martini" icon unicode character.
+    /// </summary>
+    GlassMartini = 0xF000,
+
+    /// <summary>
+    /// The Font Awesome "glass-martini-alt" icon unicode character.
+    /// </summary>
+    GlassMartiniAlt = 0xF57B,
+
+    /// <summary>
+    /// The Font Awesome "glass-whiskey" icon unicode character.
+    /// </summary>
+    GlassWhiskey = 0xF7A0,
+
+    /// <summary>
+    /// The Font Awesome "glide" icon unicode character.
+    /// </summary>
+    Glide = 0xF2A5,
+
+    /// <summary>
+    /// The Font Awesome "glide-g" icon unicode character.
+    /// </summary>
+    GlideG = 0xF2A6,
+
+    /// <summary>
+    /// The Font Awesome "globe" icon unicode character.
+    /// </summary>
+    Globe = 0xF0AC,
+
+    /// <summary>
+    /// The Font Awesome "globe-africa" icon unicode character.
+    /// </summary>
+    GlobeAfrica = 0xF57C,
+
+    /// <summary>
+    /// The Font Awesome "globe-americas" icon unicode character.
+    /// </summary>
+    GlobeAmericas = 0xF57D,
+
+    /// <summary>
+    /// The Font Awesome "globe-asia" icon unicode character.
+    /// </summary>
+    GlobeAsia = 0xF57E,
+
+    /// <summary>
+    /// The Font Awesome "globe-europe" icon unicode character.
+    /// </summary>
+    GlobeEurope = 0xF7A2,
+
+    /// <summary>
+    /// The Font Awesome "gofore" icon unicode character.
+    /// </summary>
+    Gofore = 0xF3A7,
+
+    /// <summary>
+    /// The Font Awesome "golf-ball" icon unicode character.
+    /// </summary>
+    GolfBall = 0xF450,
+
+    /// <summary>
+    /// The Font Awesome "goodreads" icon unicode character.
+    /// </summary>
+    Goodreads = 0xF3A8,
+
+    /// <summary>
+    /// The Font Awesome "goodreads-g" icon unicode character.
+    /// </summary>
+    GoodreadsG = 0xF3A9,
+
+    /// <summary>
+    /// The Font Awesome "google" icon unicode character.
+    /// </summary>
+    Google = 0xF1A0,
+
+    /// <summary>
+    /// The Font Awesome "google-drive" icon unicode character.
+    /// </summary>
+    GoogleDrive = 0xF3AA,
+
+    /// <summary>
+    /// The Font Awesome "google-play" icon unicode character.
+    /// </summary>
+    GooglePlay = 0xF3AB,
+
+    /// <summary>
+    /// The Font Awesome "google-plus" icon unicode character.
+    /// </summary>
+    GooglePlus = 0xF2B3,
+
+    /// <summary>
+    /// The Font Awesome "google-plus-g" icon unicode character.
+    /// </summary>
+    GooglePlusG = 0xF0D5,
+
+    /// <summary>
+    /// The Font Awesome "google-plus-square" icon unicode character.
+    /// </summary>
+    GooglePlusSquare = 0xF0D4,
+
+    /// <summary>
+    /// The Font Awesome "google-wallet" icon unicode character.
+    /// </summary>
+    GoogleWallet = 0xF1EE,
+
+    /// <summary>
+    /// The Font Awesome "gopuram" icon unicode character.
+    /// </summary>
+    Gopuram = 0xF664,
+
+    /// <summary>
+    /// The Font Awesome "graduation-cap" icon unicode character.
+    /// </summary>
+    GraduationCap = 0xF19D,
+
+    /// <summary>
+    /// The Font Awesome "gratipay" icon unicode character.
+    /// </summary>
+    Gratipay = 0xF184,
+
+    /// <summary>
+    /// The Font Awesome "grav" icon unicode character.
+    /// </summary>
+    Grav = 0xF2D6,
+
+    /// <summary>
+    /// The Font Awesome "greater-than" icon unicode character.
+    /// </summary>
+    GreaterThan = 0xF531,
+
+    /// <summary>
+    /// The Font Awesome "greater-than-equal" icon unicode character.
+    /// </summary>
+    GreaterThanEqual = 0xF532,
+
+    /// <summary>
+    /// The Font Awesome "grimace" icon unicode character.
+    /// </summary>
+    Grimace = 0xF57F,
+
+    /// <summary>
+    /// The Font Awesome "grin" icon unicode character.
+    /// </summary>
+    Grin = 0xF580,
+
+    /// <summary>
+    /// The Font Awesome "grin-alt" icon unicode character.
+    /// </summary>
+    GrinAlt = 0xF581,
+
+    /// <summary>
+    /// The Font Awesome "grin-beam" icon unicode character.
+    /// </summary>
+    GrinBeam = 0xF582,
+
+    /// <summary>
+    /// The Font Awesome "grin-beam-sweat" icon unicode character.
+    /// </summary>
+    GrinBeamSweat = 0xF583,
+
+    /// <summary>
+    /// The Font Awesome "grin-hearts" icon unicode character.
+    /// </summary>
+    GrinHearts = 0xF584,
+
+    /// <summary>
+    /// The Font Awesome "grin-squint" icon unicode character.
+    /// </summary>
+    GrinSquint = 0xF585,
+
+    /// <summary>
+    /// The Font Awesome "grin-squint-tears" icon unicode character.
+    /// </summary>
+    GrinSquintTears = 0xF586,
+
+    /// <summary>
+    /// The Font Awesome "grin-stars" icon unicode character.
+    /// </summary>
+    GrinStars = 0xF587,
+
+    /// <summary>
+    /// The Font Awesome "grin-tears" icon unicode character.
+    /// </summary>
+    GrinTears = 0xF588,
+
+    /// <summary>
+    /// The Font Awesome "grin-tongue" icon unicode character.
+    /// </summary>
+    GrinTongue = 0xF589,
+
+    /// <summary>
+    /// The Font Awesome "grin-tongue-squint" icon unicode character.
+    /// </summary>
+    GrinTongueSquint = 0xF58A,
+
+    /// <summary>
+    /// The Font Awesome "grin-tongue-wink" icon unicode character.
+    /// </summary>
+    GrinTongueWink = 0xF58B,
+
+    /// <summary>
+    /// The Font Awesome "grin-wink" icon unicode character.
+    /// </summary>
+    GrinWink = 0xF58C,
+
+    /// <summary>
+    /// The Font Awesome "gripfire" icon unicode character.
+    /// </summary>
+    Gripfire = 0xF3AC,
+
+    /// <summary>
+    /// The Font Awesome "grip-horizontal" icon unicode character.
+    /// </summary>
+    GripHorizontal = 0xF58D,
+
+    /// <summary>
+    /// The Font Awesome "grip-lines" icon unicode character.
+    /// </summary>
+    GripLines = 0xF7A4,
+
+    /// <summary>
+    /// The Font Awesome "grip-lines-vertical" icon unicode character.
+    /// </summary>
+    GripLinesVertical = 0xF7A5,
+
+    /// <summary>
+    /// The Font Awesome "grip-vertical" icon unicode character.
+    /// </summary>
+    GripVertical = 0xF58E,
+
+    /// <summary>
+    /// The Font Awesome "grunt" icon unicode character.
+    /// </summary>
+    Grunt = 0xF3AD,
+
+    /// <summary>
+    /// The Font Awesome "guitar" icon unicode character.
+    /// </summary>
+    Guitar = 0xF7A6,
+
+    /// <summary>
+    /// The Font Awesome "gulp" icon unicode character.
+    /// </summary>
+    Gulp = 0xF3AE,
+
+    /// <summary>
+    /// The Font Awesome "hacker-news" icon unicode character.
+    /// </summary>
+    HackerNews = 0xF1D4,
+
+    /// <summary>
+    /// The Font Awesome "hacker-news-square" icon unicode character.
+    /// </summary>
+    HackerNewsSquare = 0xF3AF,
+
+    /// <summary>
+    /// The Font Awesome "hackerrank" icon unicode character.
+    /// </summary>
+    Hackerrank = 0xF5F7,
+
+    /// <summary>
+    /// The Font Awesome "hamburger" icon unicode character.
+    /// </summary>
+    Hamburger = 0xF805,
+
+    /// <summary>
+    /// The Font Awesome "hammer" icon unicode character.
+    /// </summary>
+    Hammer = 0xF6E3,
+
+    /// <summary>
+    /// The Font Awesome "hamsa" icon unicode character.
+    /// </summary>
+    Hamsa = 0xF665,
+
+    /// <summary>
+    /// The Font Awesome "hand-holding" icon unicode character.
+    /// </summary>
+    HandHolding = 0xF4BD,
+
+    /// <summary>
+    /// The Font Awesome "hand-holding-heart" icon unicode character.
+    /// </summary>
+    HandHoldingHeart = 0xF4BE,
+
+    /// <summary>
+    /// The Font Awesome "hand-holding-usd" icon unicode character.
+    /// </summary>
+    HandHoldingUsd = 0xF4C0,
+
+    /// <summary>
+    /// The Font Awesome "hand-lizard" icon unicode character.
+    /// </summary>
+    HandLizard = 0xF258,
+
+    /// <summary>
+    /// The Font Awesome "hand-middle-finger" icon unicode character.
+    /// </summary>
+    HandMiddleFinger = 0xF806,
+
+    /// <summary>
+    /// The Font Awesome "hand-paper" icon unicode character.
+    /// </summary>
+    HandPaper = 0xF256,
+
+    /// <summary>
+    /// The Font Awesome "hand-peace" icon unicode character.
+    /// </summary>
+    HandPeace = 0xF25B,
+
+    /// <summary>
+    /// The Font Awesome "hand-point-down" icon unicode character.
+    /// </summary>
+    HandPointDown = 0xF0A7,
+
+    /// <summary>
+    /// The Font Awesome "hand-pointer" icon unicode character.
+    /// </summary>
+    HandPointer = 0xF25A,
+
+    /// <summary>
+    /// The Font Awesome "hand-point-left" icon unicode character.
+    /// </summary>
+    HandPointLeft = 0xF0A5,
+
+    /// <summary>
+    /// The Font Awesome "hand-point-right" icon unicode character.
+    /// </summary>
+    HandPointRight = 0xF0A4,
+
+    /// <summary>
+    /// The Font Awesome "hand-point-up" icon unicode character.
+    /// </summary>
+    HandPointUp = 0xF0A6,
+
+    /// <summary>
+    /// The Font Awesome "hand-rock" icon unicode character.
+    /// </summary>
+    HandRock = 0xF255,
+
+    /// <summary>
+    /// The Font Awesome "hands" icon unicode character.
+    /// </summary>
+    Hands = 0xF4C2,
+
+    /// <summary>
+    /// The Font Awesome "hand-scissors" icon unicode character.
+    /// </summary>
+    HandScissors = 0xF257,
+
+    /// <summary>
+    /// The Font Awesome "handshake" icon unicode character.
+    /// </summary>
+    Handshake = 0xF2B5,
+
+    /// <summary>
+    /// The Font Awesome "hands-helping" icon unicode character.
+    /// </summary>
+    HandsHelping = 0xF4C4,
+
+    /// <summary>
+    /// The Font Awesome "hand-spock" icon unicode character.
+    /// </summary>
+    HandSpock = 0xF259,
+
+    /// <summary>
+    /// The Font Awesome "hanukiah" icon unicode character.
+    /// </summary>
+    Hanukiah = 0xF6E6,
+
+    /// <summary>
+    /// The Font Awesome "hard-hat" icon unicode character.
+    /// </summary>
+    HardHat = 0xF807,
+
+    /// <summary>
+    /// The Font Awesome "hashtag" icon unicode character.
+    /// </summary>
+    Hashtag = 0xF292,
+
+    /// <summary>
+    /// The Font Awesome "hat-cowboy" icon unicode character.
+    /// </summary>
+    HatCowboy = 0xF8C0,
+
+    /// <summary>
+    /// The Font Awesome "hat-cowboy-side" icon unicode character.
+    /// </summary>
+    HatCowboySide = 0xF8C1,
+
+    /// <summary>
+    /// The Font Awesome "hat-wizard" icon unicode character.
+    /// </summary>
+    HatWizard = 0xF6E8,
+
+    /// <summary>
+    /// The Font Awesome "hdd" icon unicode character.
+    /// </summary>
+    Hdd = 0xF0A0,
+
+    /// <summary>
+    /// The Font Awesome "heading" icon unicode character.
+    /// </summary>
+    Heading = 0xF1DC,
+
+    /// <summary>
+    /// The Font Awesome "headphones" icon unicode character.
+    /// </summary>
+    Headphones = 0xF025,
+
+    /// <summary>
+    /// The Font Awesome "headphones-alt" icon unicode character.
+    /// </summary>
+    HeadphonesAlt = 0xF58F,
+
+    /// <summary>
+    /// The Font Awesome "headset" icon unicode character.
+    /// </summary>
+    Headset = 0xF590,
+
+    /// <summary>
+    /// The Font Awesome "heart" icon unicode character.
+    /// </summary>
+    Heart = 0xF004,
+
+    /// <summary>
+    /// The Font Awesome "heartbeat" icon unicode character.
+    /// </summary>
+    Heartbeat = 0xF21E,
+
+    /// <summary>
+    /// The Font Awesome "heart-broken" icon unicode character.
+    /// </summary>
+    HeartBroken = 0xF7A9,
+
+    /// <summary>
+    /// The Font Awesome "helicopter" icon unicode character.
+    /// </summary>
+    Helicopter = 0xF533,
+
+    /// <summary>
+    /// The Font Awesome "highlighter" icon unicode character.
+    /// </summary>
+    Highlighter = 0xF591,
+
+    /// <summary>
+    /// The Font Awesome "hiking" icon unicode character.
+    /// </summary>
+    Hiking = 0xF6EC,
+
+    /// <summary>
+    /// The Font Awesome "hippo" icon unicode character.
+    /// </summary>
+    Hippo = 0xF6ED,
+
+    /// <summary>
+    /// The Font Awesome "hips" icon unicode character.
+    /// </summary>
+    Hips = 0xF452,
+
+    /// <summary>
+    /// The Font Awesome "hire-a-helper" icon unicode character.
+    /// </summary>
+    HireAHelper = 0xF3B0,
+
+    /// <summary>
+    /// The Font Awesome "history" icon unicode character.
+    /// </summary>
+    History = 0xF1DA,
+
+    /// <summary>
+    /// The Font Awesome "hockey-puck" icon unicode character.
+    /// </summary>
+    HockeyPuck = 0xF453,
+
+    /// <summary>
+    /// The Font Awesome "holly-berry" icon unicode character.
+    /// </summary>
+    HollyBerry = 0xF7AA,
+
+    /// <summary>
+    /// The Font Awesome "home" icon unicode character.
+    /// </summary>
+    Home = 0xF015,
+
+    /// <summary>
+    /// The Font Awesome "hooli" icon unicode character.
+    /// </summary>
+    Hooli = 0xF427,
+
+    /// <summary>
+    /// The Font Awesome "hornbill" icon unicode character.
+    /// </summary>
+    Hornbill = 0xF592,
+
+    /// <summary>
+    /// The Font Awesome "horse" icon unicode character.
+    /// </summary>
+    Horse = 0xF6F0,
+
+    /// <summary>
+    /// The Font Awesome "horse-head" icon unicode character.
+    /// </summary>
+    HorseHead = 0xF7AB,
+
+    /// <summary>
+    /// The Font Awesome "hospital" icon unicode character.
+    /// </summary>
+    Hospital = 0xF0F8,
+
+    /// <summary>
+    /// The Font Awesome "hospital-alt" icon unicode character.
+    /// </summary>
+    HospitalAlt = 0xF47D,
+
+    /// <summary>
+    /// The Font Awesome "hospital-symbol" icon unicode character.
+    /// </summary>
+    HospitalSymbol = 0xF47E,
+
+    /// <summary>
+    /// The Font Awesome "hotdog" icon unicode character.
+    /// </summary>
+    Hotdog = 0xF80F,
+
+    /// <summary>
+    /// The Font Awesome "hotel" icon unicode character.
+    /// </summary>
+    Hotel = 0xF594,
+
+    /// <summary>
+    /// The Font Awesome "hotjar" icon unicode character.
+    /// </summary>
+    Hotjar = 0xF3B1,
+
+    /// <summary>
+    /// The Font Awesome "hot-tub" icon unicode character.
+    /// </summary>
+    HotTub = 0xF593,
+
+    /// <summary>
+    /// The Font Awesome "hourglass" icon unicode character.
+    /// </summary>
+    Hourglass = 0xF254,
+
+    /// <summary>
+    /// The Font Awesome "hourglass-end" icon unicode character.
+    /// </summary>
+    HourglassEnd = 0xF253,
+
+    /// <summary>
+    /// The Font Awesome "hourglass-half" icon unicode character.
+    /// </summary>
+    HourglassHalf = 0xF252,
+
+    /// <summary>
+    /// The Font Awesome "hourglass-start" icon unicode character.
+    /// </summary>
+    HourglassStart = 0xF251,
+
+    /// <summary>
+    /// The Font Awesome "house-damage" icon unicode character.
+    /// </summary>
+    HouseDamage = 0xF6F1,
+
+    /// <summary>
+    /// The Font Awesome "houzz" icon unicode character.
+    /// </summary>
+    Houzz = 0xF27C,
+
+    /// <summary>
+    /// The Font Awesome "hryvnia" icon unicode character.
+    /// </summary>
+    Hryvnia = 0xF6F2,
+
+    /// <summary>
+    /// The Font Awesome "h-square" icon unicode character.
+    /// </summary>
+    HSquare = 0xF0FD,
+
+    /// <summary>
+    /// The Font Awesome "html5" icon unicode character.
+    /// </summary>
+    Html5 = 0xF13B,
+
+    /// <summary>
+    /// The Font Awesome "hubspot" icon unicode character.
+    /// </summary>
+    Hubspot = 0xF3B2,
+
+    /// <summary>
+    /// The Font Awesome "ice-cream" icon unicode character.
+    /// </summary>
+    IceCream = 0xF810,
+
+    /// <summary>
+    /// The Font Awesome "icicles" icon unicode character.
+    /// </summary>
+    Icicles = 0xF7AD,
+
+    /// <summary>
+    /// The Font Awesome "icons" icon unicode character.
+    /// </summary>
+    Icons = 0xF86D,
+
+    /// <summary>
+    /// The Font Awesome "i-cursor" icon unicode character.
+    /// </summary>
+    ICursor = 0xF246,
+
+    /// <summary>
+    /// The Font Awesome "id-badge" icon unicode character.
+    /// </summary>
+    IdBadge = 0xF2C1,
+
+    /// <summary>
+    /// The Font Awesome "id-card" icon unicode character.
+    /// </summary>
+    IdCard = 0xF2C2,
+
+    /// <summary>
+    /// The Font Awesome "id-card-alt" icon unicode character.
+    /// </summary>
+    IdCardAlt = 0xF47F,
+
+    /// <summary>
+    /// The Font Awesome "ideal" icon unicode character.
+    /// </summary>
+    Ideal = 0xF913,
+
+    /// <summary>
+    /// The Font Awesome "igloo" icon unicode character.
+    /// </summary>
+    Igloo = 0xF7AE,
+
+    /// <summary>
+    /// The Font Awesome "image" icon unicode character.
+    /// </summary>
+    Image = 0xF03E,
+
+    /// <summary>
+    /// The Font Awesome "images" icon unicode character.
+    /// </summary>
+    Images = 0xF302,
+
+    /// <summary>
+    /// The Font Awesome "imdb" icon unicode character.
+    /// </summary>
+    Imdb = 0xF2D8,
+
+    /// <summary>
+    /// The Font Awesome "inbox" icon unicode character.
+    /// </summary>
+    Inbox = 0xF01C,
+
+    /// <summary>
+    /// The Font Awesome "indent" icon unicode character.
+    /// </summary>
+    Indent = 0xF03C,
+
+    /// <summary>
+    /// The Font Awesome "industry" icon unicode character.
+    /// </summary>
+    Industry = 0xF275,
+
+    /// <summary>
+    /// The Font Awesome "infinity" icon unicode character.
+    /// </summary>
+    Infinity = 0xF534,
+
+    /// <summary>
+    /// The Font Awesome "info" icon unicode character.
+    /// </summary>
+    Info = 0xF129,
+
+    /// <summary>
+    /// The Font Awesome "info-circle" icon unicode character.
+    /// </summary>
+    InfoCircle = 0xF05A,
+
+    /// <summary>
+    /// The Font Awesome "instagram" icon unicode character.
+    /// </summary>
+    Instagram = 0xF16D,
+
+    /// <summary>
+    /// The Font Awesome "instagram-square" icon unicode character.
+    /// </summary>
+    InstagramSquare = 0xF955,
+
+    /// <summary>
+    /// The Font Awesome "intercom" icon unicode character.
+    /// </summary>
+    Intercom = 0xF7AF,
+
+    /// <summary>
+    /// The Font Awesome "internet-explorer" icon unicode character.
+    /// </summary>
+    InternetExplorer = 0xF26B,
+
+    /// <summary>
+    /// The Font Awesome "invision" icon unicode character.
+    /// </summary>
+    Invision = 0xF7B0,
+
+    /// <summary>
+    /// The Font Awesome "ioxhost" icon unicode character.
+    /// </summary>
+    Ioxhost = 0xF208,
+
+    /// <summary>
+    /// The Font Awesome "italic" icon unicode character.
+    /// </summary>
+    Italic = 0xF033,
+
+    /// <summary>
+    /// The Font Awesome "itch-io" icon unicode character.
+    /// </summary>
+    ItchIo = 0xF83A,
+
+    /// <summary>
+    /// The Font Awesome "itunes" icon unicode character.
+    /// </summary>
+    Itunes = 0xF3B4,
+
+    /// <summary>
+    /// The Font Awesome "itunes-note" icon unicode character.
+    /// </summary>
+    ItunesNote = 0xF3B5,
+
+    /// <summary>
+    /// The Font Awesome "java" icon unicode character.
+    /// </summary>
+    Java = 0xF4E4,
+
+    /// <summary>
+    /// The Font Awesome "jedi" icon unicode character.
+    /// </summary>
+    Jedi = 0xF669,
+
+    /// <summary>
+    /// The Font Awesome "jedi-order" icon unicode character.
+    /// </summary>
+    JediOrder = 0xF50E,
+
+    /// <summary>
+    /// The Font Awesome "jenkins" icon unicode character.
+    /// </summary>
+    Jenkins = 0xF3B6,
+
+    /// <summary>
+    /// The Font Awesome "jira" icon unicode character.
+    /// </summary>
+    Jira = 0xF7B1,
+
+    /// <summary>
+    /// The Font Awesome "joget" icon unicode character.
+    /// </summary>
+    Joget = 0xF3B7,
+
+    /// <summary>
+    /// The Font Awesome "joint" icon unicode character.
+    /// </summary>
+    Joint = 0xF595,
+
+    /// <summary>
+    /// The Font Awesome "joomla" icon unicode character.
+    /// </summary>
+    Joomla = 0xF1AA,
+
+    /// <summary>
+    /// The Font Awesome "journal-whills" icon unicode character.
+    /// </summary>
+    JournalWhills = 0xF66A,
+
+    /// <summary>
+    /// The Font Awesome "js" icon unicode character.
+    /// </summary>
+    Js = 0xF3B8,
+
+    /// <summary>
+    /// The Font Awesome "jsfiddle" icon unicode character.
+    /// </summary>
+    Jsfiddle = 0xF1CC,
+
+    /// <summary>
+    /// The Font Awesome "js-square" icon unicode character.
+    /// </summary>
+    JsSquare = 0xF3B9,
+
+    /// <summary>
+    /// The Font Awesome "kaaba" icon unicode character.
+    /// </summary>
+    Kaaba = 0xF66B,
+
+    /// <summary>
+    /// The Font Awesome "kaggle" icon unicode character.
+    /// </summary>
+    Kaggle = 0xF5FA,
+
+    /// <summary>
+    /// The Font Awesome "key" icon unicode character.
+    /// </summary>
+    Key = 0xF084,
+
+    /// <summary>
+    /// The Font Awesome "keybase" icon unicode character.
+    /// </summary>
+    Keybase = 0xF4F5,
+
+    /// <summary>
+    /// The Font Awesome "keyboard" icon unicode character.
+    /// </summary>
+    Keyboard = 0xF11C,
+
+    /// <summary>
+    /// The Font Awesome "keycdn" icon unicode character.
+    /// </summary>
+    Keycdn = 0xF3BA,
+
+    /// <summary>
+    /// The Font Awesome "khanda" icon unicode character.
+    /// </summary>
+    Khanda = 0xF66D,
+
+    /// <summary>
+    /// The Font Awesome "kickstarter" icon unicode character.
+    /// </summary>
+    Kickstarter = 0xF3BB,
+
+    /// <summary>
+    /// The Font Awesome "kickstarter-k" icon unicode character.
+    /// </summary>
+    KickstarterK = 0xF3BC,
+
+    /// <summary>
+    /// The Font Awesome "kiss" icon unicode character.
+    /// </summary>
+    Kiss = 0xF596,
+
+    /// <summary>
+    /// The Font Awesome "kiss-beam" icon unicode character.
+    /// </summary>
+    KissBeam = 0xF597,
+
+    /// <summary>
+    /// The Font Awesome "kiss-wink-heart" icon unicode character.
+    /// </summary>
+    KissWinkHeart = 0xF598,
+
+    /// <summary>
+    /// The Font Awesome "kiwi-bird" icon unicode character.
+    /// </summary>
+    KiwiBird = 0xF535,
+
+    /// <summary>
+    /// The Font Awesome "korvue" icon unicode character.
+    /// </summary>
+    Korvue = 0xF42F,
+
+    /// <summary>
+    /// The Font Awesome "landmark" icon unicode character.
+    /// </summary>
+    Landmark = 0xF66F,
+
+    /// <summary>
+    /// The Font Awesome "language" icon unicode character.
+    /// </summary>
+    Language = 0xF1AB,
+
+    /// <summary>
+    /// The Font Awesome "laptop" icon unicode character.
+    /// </summary>
+    Laptop = 0xF109,
+
+    /// <summary>
+    /// The Font Awesome "laptop-code" icon unicode character.
+    /// </summary>
+    LaptopCode = 0xF5FC,
+
+    /// <summary>
+    /// The Font Awesome "laptop-medical" icon unicode character.
+    /// </summary>
+    LaptopMedical = 0xF812,
+
+    /// <summary>
+    /// The Font Awesome "laravel" icon unicode character.
+    /// </summary>
+    Laravel = 0xF3BD,
+
+    /// <summary>
+    /// The Font Awesome "lastfm" icon unicode character.
+    /// </summary>
+    Lastfm = 0xF202,
+
+    /// <summary>
+    /// The Font Awesome "lastfm-square" icon unicode character.
+    /// </summary>
+    LastfmSquare = 0xF203,
+
+    /// <summary>
+    /// The Font Awesome "laugh" icon unicode character.
+    /// </summary>
+    Laugh = 0xF599,
+
+    /// <summary>
+    /// The Font Awesome "laugh-beam" icon unicode character.
+    /// </summary>
+    LaughBeam = 0xF59A,
+
+    /// <summary>
+    /// The Font Awesome "laugh-squint" icon unicode character.
+    /// </summary>
+    LaughSquint = 0xF59B,
+
+    /// <summary>
+    /// The Font Awesome "laugh-wink" icon unicode character.
+    /// </summary>
+    LaughWink = 0xF59C,
+
+    /// <summary>
+    /// The Font Awesome "layer-group" icon unicode character.
+    /// </summary>
+    LayerGroup = 0xF5FD,
+
+    /// <summary>
+    /// The Font Awesome "leaf" icon unicode character.
+    /// </summary>
+    Leaf = 0xF06C,
+
+    /// <summary>
+    /// The Font Awesome "leanpub" icon unicode character.
+    /// </summary>
+    Leanpub = 0xF212,
+
+    /// <summary>
+    /// The Font Awesome "lemon" icon unicode character.
+    /// </summary>
+    Lemon = 0xF094,
+
+    /// <summary>
+    /// The Font Awesome "less" icon unicode character.
+    /// </summary>
+    Less = 0xF41D,
+
+    /// <summary>
+    /// The Font Awesome "less-than" icon unicode character.
+    /// </summary>
+    LessThan = 0xF536,
+
+    /// <summary>
+    /// The Font Awesome "less-than-equal" icon unicode character.
+    /// </summary>
+    LessThanEqual = 0xF537,
+
+    /// <summary>
+    /// The Font Awesome "level-down-alt" icon unicode character.
+    /// </summary>
+    LevelDownAlt = 0xF3BE,
+
+    /// <summary>
+    /// The Font Awesome "level-up-alt" icon unicode character.
+    /// </summary>
+    LevelUpAlt = 0xF3BF,
+
+    /// <summary>
+    /// The Font Awesome "life-ring" icon unicode character.
+    /// </summary>
+    LifeRing = 0xF1CD,
+
+    /// <summary>
+    /// The Font Awesome "lightbulb" icon unicode character.
+    /// </summary>
+    Lightbulb = 0xF0EB,
+
+    /// <summary>
+    /// The Font Awesome "line" icon unicode character.
+    /// </summary>
+    Line = 0xF3C0,
+
+    /// <summary>
+    /// The Font Awesome "link" icon unicode character.
+    /// </summary>
+    Link = 0xF0C1,
+
+    /// <summary>
+    /// The Font Awesome "linkedin" icon unicode character.
+    /// </summary>
+    Linkedin = 0xF08C,
+
+    /// <summary>
+    /// The Font Awesome "linkedin-in" icon unicode character.
+    /// </summary>
+    LinkedinIn = 0xF0E1,
+
+    /// <summary>
+    /// The Font Awesome "linode" icon unicode character.
+    /// </summary>
+    Linode = 0xF2B8,
+
+    /// <summary>
+    /// The Font Awesome "linux" icon unicode character.
+    /// </summary>
+    Linux = 0xF17C,
+
+    /// <summary>
+    /// The Font Awesome "lira-sign" icon unicode character.
+    /// </summary>
+    LiraSign = 0xF195,
+
+    /// <summary>
+    /// The Font Awesome "list" icon unicode character.
+    /// </summary>
+    List = 0xF03A,
+
+    /// <summary>
+    /// The Font Awesome "list-alt" icon unicode character.
+    /// </summary>
+    ListAlt = 0xF022,
+
+    /// <summary>
+    /// The Font Awesome "list-ol" icon unicode character.
+    /// </summary>
+    ListOl = 0xF0CB,
+
+    /// <summary>
+    /// The Font Awesome "list-ul" icon unicode character.
+    /// </summary>
+    ListUl = 0xF0CA,
+
+    /// <summary>
+    /// The Font Awesome "location-arrow" icon unicode character.
+    /// </summary>
+    LocationArrow = 0xF124,
+
+    /// <summary>
+    /// The Font Awesome "lock" icon unicode character.
+    /// </summary>
+    Lock = 0xF023,
+
+    /// <summary>
+    /// The Font Awesome "lock-open" icon unicode character.
+    /// </summary>
+    LockOpen = 0xF3C1,
+
+    /// <summary>
+    /// The Font Awesome "long-arrow-alt-down" icon unicode character.
+    /// </summary>
+    LongArrowAltDown = 0xF309,
+
+    /// <summary>
+    /// The Font Awesome "long-arrow-alt-left" icon unicode character.
+    /// </summary>
+    LongArrowAltLeft = 0xF30A,
+
+    /// <summary>
+    /// The Font Awesome "long-arrow-alt-right" icon unicode character.
+    /// </summary>
+    LongArrowAltRight = 0xF30B,
+
+    /// <summary>
+    /// The Font Awesome "long-arrow-alt-up" icon unicode character.
+    /// </summary>
+    LongArrowAltUp = 0xF30C,
+
+    /// <summary>
+    /// The Font Awesome "low-vision" icon unicode character.
+    /// </summary>
+    LowVision = 0xF2A8,
+
+    /// <summary>
+    /// The Font Awesome "luggage-cart" icon unicode character.
+    /// </summary>
+    LuggageCart = 0xF59D,
+
+    /// <summary>
+    /// The Font Awesome "lyft" icon unicode character.
+    /// </summary>
+    Lyft = 0xF3C3,
+
+    /// <summary>
+    /// The Font Awesome "magento" icon unicode character.
+    /// </summary>
+    Magento = 0xF3C4,
+
+    /// <summary>
+    /// The Font Awesome "magic" icon unicode character.
+    /// </summary>
+    Magic = 0xF0D0,
+
+    /// <summary>
+    /// The Font Awesome "magnet" icon unicode character.
+    /// </summary>
+    Magnet = 0xF076,
+
+    /// <summary>
+    /// The Font Awesome "mail-bulk" icon unicode character.
+    /// </summary>
+    MailBulk = 0xF674,
+
+    /// <summary>
+    /// The Font Awesome "mailchimp" icon unicode character.
+    /// </summary>
+    Mailchimp = 0xF59E,
+
+    /// <summary>
+    /// The Font Awesome "male" icon unicode character.
+    /// </summary>
+    Male = 0xF183,
+
+    /// <summary>
+    /// The Font Awesome "mandalorian" icon unicode character.
+    /// </summary>
+    Mandalorian = 0xF50F,
+
+    /// <summary>
+    /// The Font Awesome "map" icon unicode character.
+    /// </summary>
+    Map = 0xF279,
+
+    /// <summary>
+    /// The Font Awesome "map-marked" icon unicode character.
+    /// </summary>
+    MapMarked = 0xF59F,
+
+    /// <summary>
+    /// The Font Awesome "map-marked-alt" icon unicode character.
+    /// </summary>
+    MapMarkedAlt = 0xF5A0,
+
+    /// <summary>
+    /// The Font Awesome "map-marker" icon unicode character.
+    /// </summary>
+    MapMarker = 0xF041,
+
+    /// <summary>
+    /// The Font Awesome "map-marker-alt" icon unicode character.
+    /// </summary>
+    MapMarkerAlt = 0xF3C5,
+
+    /// <summary>
+    /// The Font Awesome "map-pin" icon unicode character.
+    /// </summary>
+    MapPin = 0xF276,
+
+    /// <summary>
+    /// The Font Awesome "map-signs" icon unicode character.
+    /// </summary>
+    MapSigns = 0xF277,
+
+    /// <summary>
+    /// The Font Awesome "markdown" icon unicode character.
+    /// </summary>
+    Markdown = 0xF60F,
+
+    /// <summary>
+    /// The Font Awesome "marker" icon unicode character.
+    /// </summary>
+    Marker = 0xF5A1,
+
+    /// <summary>
+    /// The Font Awesome "mars" icon unicode character.
+    /// </summary>
+    Mars = 0xF222,
+
+    /// <summary>
+    /// The Font Awesome "mars-double" icon unicode character.
+    /// </summary>
+    MarsDouble = 0xF227,
+
+    /// <summary>
+    /// The Font Awesome "mars-stroke" icon unicode character.
+    /// </summary>
+    MarsStroke = 0xF229,
+
+    /// <summary>
+    /// The Font Awesome "mars-stroke-h" icon unicode character.
+    /// </summary>
+    MarsStrokeH = 0xF22B,
+
+    /// <summary>
+    /// The Font Awesome "mars-stroke-v" icon unicode character.
+    /// </summary>
+    MarsStrokeV = 0xF22A,
+
+    /// <summary>
+    /// The Font Awesome "mask" icon unicode character.
+    /// </summary>
+    Mask = 0xF6FA,
+
+    /// <summary>
+    /// The Font Awesome "mastodon" icon unicode character.
+    /// </summary>
+    Mastodon = 0xF4F6,
+
+    /// <summary>
+    /// The Font Awesome "maxcdn" icon unicode character.
+    /// </summary>
+    Maxcdn = 0xF136,
+
+    /// <summary>
+    /// The Font Awesome "mdb" icon unicode character.
+    /// </summary>
+    Mdb = 0xF8CA,
+
+    /// <summary>
+    /// The Font Awesome "medal" icon unicode character.
+    /// </summary>
+    Medal = 0xF5A2,
+
+    /// <summary>
+    /// The Font Awesome "medapps" icon unicode character.
+    /// </summary>
+    Medapps = 0xF3C6,
+
+    /// <summary>
+    /// The Font Awesome "medium" icon unicode character.
+    /// </summary>
+    Medium = 0xF23A,
+
+    /// <summary>
+    /// The Font Awesome "medium-m" icon unicode character.
+    /// </summary>
+    MediumM = 0xF3C7,
+
+    /// <summary>
+    /// The Font Awesome "medkit" icon unicode character.
+    /// </summary>
+    Medkit = 0xF0FA,
+
+    /// <summary>
+    /// The Font Awesome "medrt" icon unicode character.
+    /// </summary>
+    Medrt = 0xF3C8,
+
+    /// <summary>
+    /// The Font Awesome "meetup" icon unicode character.
+    /// </summary>
+    Meetup = 0xF2E0,
+
+    /// <summary>
+    /// The Font Awesome "megaport" icon unicode character.
+    /// </summary>
+    Megaport = 0xF5A3,
+
+    /// <summary>
+    /// The Font Awesome "meh" icon unicode character.
+    /// </summary>
+    Meh = 0xF11A,
+
+    /// <summary>
+    /// The Font Awesome "meh-blank" icon unicode character.
+    /// </summary>
+    MehBlank = 0xF5A4,
+
+    /// <summary>
+    /// The Font Awesome "meh-rolling-eyes" icon unicode character.
+    /// </summary>
+    MehRollingEyes = 0xF5A5,
+
+    /// <summary>
+    /// The Font Awesome "memory" icon unicode character.
+    /// </summary>
+    Memory = 0xF538,
+
+    /// <summary>
+    /// The Font Awesome "mendeley" icon unicode character.
+    /// </summary>
+    Mendeley = 0xF7B3,
+
+    /// <summary>
+    /// The Font Awesome "menorah" icon unicode character.
+    /// </summary>
+    Menorah = 0xF676,
+
+    /// <summary>
+    /// The Font Awesome "mercury" icon unicode character.
+    /// </summary>
+    Mercury = 0xF223,
+
+    /// <summary>
+    /// The Font Awesome "meteor" icon unicode character.
+    /// </summary>
+    Meteor = 0xF753,
+
+    /// <summary>
+    /// The Font Awesome "microblog" icon unicode character.
+    /// </summary>
+    Microblog = 0xF91A,
+
+    /// <summary>
+    /// The Font Awesome "microchip" icon unicode character.
+    /// </summary>
+    Microchip = 0xF2DB,
+
+    /// <summary>
+    /// The Font Awesome "microphone" icon unicode character.
+    /// </summary>
+    Microphone = 0xF130,
+
+    /// <summary>
+    /// The Font Awesome "microphone-alt" icon unicode character.
+    /// </summary>
+    MicrophoneAlt = 0xF3C9,
+
+    /// <summary>
+    /// The Font Awesome "microphone-alt-slash" icon unicode character.
+    /// </summary>
+    MicrophoneAltSlash = 0xF539,
+
+    /// <summary>
+    /// The Font Awesome "microphone-slash" icon unicode character.
+    /// </summary>
+    MicrophoneSlash = 0xF131,
+
+    /// <summary>
+    /// The Font Awesome "microscope" icon unicode character.
+    /// </summary>
+    Microscope = 0xF610,
+
+    /// <summary>
+    /// The Font Awesome "microsoft" icon unicode character.
+    /// </summary>
+    Microsoft = 0xF3CA,
+
+    /// <summary>
+    /// The Font Awesome "minus" icon unicode character.
+    /// </summary>
+    Minus = 0xF068,
+
+    /// <summary>
+    /// The Font Awesome "minus-circle" icon unicode character.
+    /// </summary>
+    MinusCircle = 0xF056,
+
+    /// <summary>
+    /// The Font Awesome "minus-square" icon unicode character.
+    /// </summary>
+    MinusSquare = 0xF146,
+
+    /// <summary>
+    /// The Font Awesome "mitten" icon unicode character.
+    /// </summary>
+    Mitten = 0xF7B5,
+
+    /// <summary>
+    /// The Font Awesome "mix" icon unicode character.
+    /// </summary>
+    Mix = 0xF3CB,
+
+    /// <summary>
+    /// The Font Awesome "mixcloud" icon unicode character.
+    /// </summary>
+    Mixcloud = 0xF289,
+
+    /// <summary>
+    /// The Font Awesome "mixer" icon unicode character.
+    /// </summary>
+    Mixer = 0xF956,
+
+    /// <summary>
+    /// The Font Awesome "mizuni" icon unicode character.
+    /// </summary>
+    Mizuni = 0xF3CC,
+
+    /// <summary>
+    /// The Font Awesome "mobile" icon unicode character.
+    /// </summary>
+    Mobile = 0xF10B,
+
+    /// <summary>
+    /// The Font Awesome "mobile-alt" icon unicode character.
+    /// </summary>
+    MobileAlt = 0xF3CD,
+
+    /// <summary>
+    /// The Font Awesome "modx" icon unicode character.
+    /// </summary>
+    Modx = 0xF285,
+
+    /// <summary>
+    /// The Font Awesome "monero" icon unicode character.
+    /// </summary>
+    Monero = 0xF3D0,
+
+    /// <summary>
+    /// The Font Awesome "money-bill" icon unicode character.
+    /// </summary>
+    MoneyBill = 0xF0D6,
+
+    /// <summary>
+    /// The Font Awesome "money-bill-alt" icon unicode character.
+    /// </summary>
+    MoneyBillAlt = 0xF3D1,
+
+    /// <summary>
+    /// The Font Awesome "money-bill-wave" icon unicode character.
+    /// </summary>
+    MoneyBillWave = 0xF53A,
+
+    /// <summary>
+    /// The Font Awesome "money-bill-wave-alt" icon unicode character.
+    /// </summary>
+    MoneyBillWaveAlt = 0xF53B,
+
+    /// <summary>
+    /// The Font Awesome "money-check" icon unicode character.
+    /// </summary>
+    MoneyCheck = 0xF53C,
+
+    /// <summary>
+    /// The Font Awesome "money-check-alt" icon unicode character.
+    /// </summary>
+    MoneyCheckAlt = 0xF53D,
+
+    /// <summary>
+    /// The Font Awesome "monument" icon unicode character.
+    /// </summary>
+    Monument = 0xF5A6,
+
+    /// <summary>
+    /// The Font Awesome "moon" icon unicode character.
+    /// </summary>
+    Moon = 0xF186,
+
+    /// <summary>
+    /// The Font Awesome "mortar-pestle" icon unicode character.
+    /// </summary>
+    MortarPestle = 0xF5A7,
+
+    /// <summary>
+    /// The Font Awesome "mosque" icon unicode character.
+    /// </summary>
+    Mosque = 0xF678,
+
+    /// <summary>
+    /// The Font Awesome "motorcycle" icon unicode character.
+    /// </summary>
+    Motorcycle = 0xF21C,
+
+    /// <summary>
+    /// The Font Awesome "mountain" icon unicode character.
+    /// </summary>
+    Mountain = 0xF6FC,
+
+    /// <summary>
+    /// The Font Awesome "mouse" icon unicode character.
+    /// </summary>
+    Mouse = 0xF8CC,
+
+    /// <summary>
+    /// The Font Awesome "mouse-pointer" icon unicode character.
+    /// </summary>
+    MousePointer = 0xF245,
+
+    /// <summary>
+    /// The Font Awesome "mug-hot" icon unicode character.
+    /// </summary>
+    MugHot = 0xF7B6,
+
+    /// <summary>
+    /// The Font Awesome "music" icon unicode character.
+    /// </summary>
+    Music = 0xF001,
+
+    /// <summary>
+    /// The Font Awesome "napster" icon unicode character.
+    /// </summary>
+    Napster = 0xF3D2,
+
+    /// <summary>
+    /// The Font Awesome "neos" icon unicode character.
+    /// </summary>
+    Neos = 0xF612,
+
+    /// <summary>
+    /// The Font Awesome "network-wired" icon unicode character.
+    /// </summary>
+    NetworkWired = 0xF6FF,
+
+    /// <summary>
+    /// The Font Awesome "neuter" icon unicode character.
+    /// </summary>
+    Neuter = 0xF22C,
+
+    /// <summary>
+    /// The Font Awesome "newspaper" icon unicode character.
+    /// </summary>
+    Newspaper = 0xF1EA,
+
+    /// <summary>
+    /// The Font Awesome "nimblr" icon unicode character.
+    /// </summary>
+    Nimblr = 0xF5A8,
+
+    /// <summary>
+    /// The Font Awesome "node" icon unicode character.
+    /// </summary>
+    Node = 0xF419,
+
+    /// <summary>
+    /// The Font Awesome "node-js" icon unicode character.
+    /// </summary>
+    NodeJs = 0xF3D3,
+
+    /// <summary>
+    /// The Font Awesome "not-equal" icon unicode character.
+    /// </summary>
+    NotEqual = 0xF53E,
+
+    /// <summary>
+    /// The Font Awesome "notes-medical" icon unicode character.
+    /// </summary>
+    NotesMedical = 0xF481,
+
+    /// <summary>
+    /// The Font Awesome "npm" icon unicode character.
+    /// </summary>
+    Npm = 0xF3D4,
+
+    /// <summary>
+    /// The Font Awesome "ns8" icon unicode character.
+    /// </summary>
+    Ns8 = 0xF3D5,
+
+    /// <summary>
+    /// The Font Awesome "nutritionix" icon unicode character.
+    /// </summary>
+    Nutritionix = 0xF3D6,
+
+    /// <summary>
+    /// The Font Awesome "object-group" icon unicode character.
+    /// </summary>
+    ObjectGroup = 0xF247,
+
+    /// <summary>
+    /// The Font Awesome "object-ungroup" icon unicode character.
+    /// </summary>
+    ObjectUngroup = 0xF248,
+
+    /// <summary>
+    /// The Font Awesome "odnoklassniki" icon unicode character.
+    /// </summary>
+    Odnoklassniki = 0xF263,
+
+    /// <summary>
+    /// The Font Awesome "odnoklassniki-square" icon unicode character.
+    /// </summary>
+    OdnoklassnikiSquare = 0xF264,
+
+    /// <summary>
+    /// The Font Awesome "oil-can" icon unicode character.
+    /// </summary>
+    OilCan = 0xF613,
+
+    /// <summary>
+    /// The Font Awesome "old-republic" icon unicode character.
+    /// </summary>
+    OldRepublic = 0xF510,
+
+    /// <summary>
+    /// The Font Awesome "om" icon unicode character.
+    /// </summary>
+    Om = 0xF679,
+
+    /// <summary>
+    /// The Font Awesome "opencart" icon unicode character.
+    /// </summary>
+    Opencart = 0xF23D,
+
+    /// <summary>
+    /// The Font Awesome "openid" icon unicode character.
+    /// </summary>
+    Openid = 0xF19B,
+
+    /// <summary>
+    /// The Font Awesome "opera" icon unicode character.
+    /// </summary>
+    Opera = 0xF26A,
+
+    /// <summary>
+    /// The Font Awesome "optin-monster" icon unicode character.
+    /// </summary>
+    OptinMonster = 0xF23C,
+
+    /// <summary>
+    /// The Font Awesome "orcid" icon unicode character.
+    /// </summary>
+    Orcid = 0xF8D2,
+
+    /// <summary>
+    /// The Font Awesome "osi" icon unicode character.
+    /// </summary>
+    Osi = 0xF41A,
+
+    /// <summary>
+    /// The Font Awesome "otter" icon unicode character.
+    /// </summary>
+    Otter = 0xF700,
+
+    /// <summary>
+    /// The Font Awesome "outdent" icon unicode character.
+    /// </summary>
+    Outdent = 0xF03B,
+
+    /// <summary>
+    /// The Font Awesome "page4" icon unicode character.
+    /// </summary>
+    Page4 = 0xF3D7,
+
+    /// <summary>
+    /// The Font Awesome "pagelines" icon unicode character.
+    /// </summary>
+    Pagelines = 0xF18C,
+
+    /// <summary>
+    /// The Font Awesome "pager" icon unicode character.
+    /// </summary>
+    Pager = 0xF815,
+
+    /// <summary>
+    /// The Font Awesome "paint-brush" icon unicode character.
+    /// </summary>
+    PaintBrush = 0xF1FC,
+
+    /// <summary>
+    /// The Font Awesome "paint-roller" icon unicode character.
+    /// </summary>
+    PaintRoller = 0xF5AA,
+
+    /// <summary>
+    /// The Font Awesome "palette" icon unicode character.
+    /// </summary>
+    Palette = 0xF53F,
+
+    /// <summary>
+    /// The Font Awesome "palfed" icon unicode character.
+    /// </summary>
+    Palfed = 0xF3D8,
+
+    /// <summary>
+    /// The Font Awesome "pallet" icon unicode character.
+    /// </summary>
+    Pallet = 0xF482,
+
+    /// <summary>
+    /// The Font Awesome "paperclip" icon unicode character.
+    /// </summary>
+    Paperclip = 0xF0C6,
+
+    /// <summary>
+    /// The Font Awesome "paper-plane" icon unicode character.
+    /// </summary>
+    PaperPlane = 0xF1D8,
+
+    /// <summary>
+    /// The Font Awesome "parachute-box" icon unicode character.
+    /// </summary>
+    ParachuteBox = 0xF4CD,
+
+    /// <summary>
+    /// The Font Awesome "paragraph" icon unicode character.
+    /// </summary>
+    Paragraph = 0xF1DD,
+
+    /// <summary>
+    /// The Font Awesome "parking" icon unicode character.
+    /// </summary>
+    Parking = 0xF540,
+
+    /// <summary>
+    /// The Font Awesome "passport" icon unicode character.
+    /// </summary>
+    Passport = 0xF5AB,
+
+    /// <summary>
+    /// The Font Awesome "pastafarianism" icon unicode character.
+    /// </summary>
+    Pastafarianism = 0xF67B,
+
+    /// <summary>
+    /// The Font Awesome "paste" icon unicode character.
+    /// </summary>
+    Paste = 0xF0EA,
+
+    /// <summary>
+    /// The Font Awesome "patreon" icon unicode character.
+    /// </summary>
+    Patreon = 0xF3D9,
+
+    /// <summary>
+    /// The Font Awesome "pause" icon unicode character.
+    /// </summary>
+    Pause = 0xF04C,
+
+    /// <summary>
+    /// The Font Awesome "pause-circle" icon unicode character.
+    /// </summary>
+    PauseCircle = 0xF28B,
+
+    /// <summary>
+    /// The Font Awesome "paw" icon unicode character.
+    /// </summary>
+    Paw = 0xF1B0,
+
+    /// <summary>
+    /// The Font Awesome "paypal" icon unicode character.
+    /// </summary>
+    Paypal = 0xF1ED,
+
+    /// <summary>
+    /// The Font Awesome "peace" icon unicode character.
+    /// </summary>
+    Peace = 0xF67C,
+
+    /// <summary>
+    /// The Font Awesome "pen" icon unicode character.
+    /// </summary>
+    Pen = 0xF304,
+
+    /// <summary>
+    /// The Font Awesome "pen-alt" icon unicode character.
+    /// </summary>
+    PenAlt = 0xF305,
+
+    /// <summary>
+    /// The Font Awesome "pencil-alt" icon unicode character.
+    /// </summary>
+    PencilAlt = 0xF303,
+
+    /// <summary>
+    /// The Font Awesome "pencil-ruler" icon unicode character.
+    /// </summary>
+    PencilRuler = 0xF5AE,
+
+    /// <summary>
+    /// The Font Awesome "pen-fancy" icon unicode character.
+    /// </summary>
+    PenFancy = 0xF5AC,
+
+    /// <summary>
+    /// The Font Awesome "pen-nib" icon unicode character.
+    /// </summary>
+    PenNib = 0xF5AD,
+
+    /// <summary>
+    /// The Font Awesome "penny-arcade" icon unicode character.
+    /// </summary>
+    PennyArcade = 0xF704,
+
+    /// <summary>
+    /// The Font Awesome "pen-square" icon unicode character.
+    /// </summary>
+    PenSquare = 0xF14B,
+
+    /// <summary>
+    /// The Font Awesome "people-carry" icon unicode character.
+    /// </summary>
+    PeopleCarry = 0xF4CE,
+
+    /// <summary>
+    /// The Font Awesome "pepper-hot" icon unicode character.
+    /// </summary>
+    PepperHot = 0xF816,
+
+    /// <summary>
+    /// The Font Awesome "percent" icon unicode character.
+    /// </summary>
+    Percent = 0xF295,
+
+    /// <summary>
+    /// The Font Awesome "percentage" icon unicode character.
+    /// </summary>
+    Percentage = 0xF541,
+
+    /// <summary>
+    /// The Font Awesome "periscope" icon unicode character.
+    /// </summary>
+    Periscope = 0xF3DA,
+
+    /// <summary>
+    /// The Font Awesome "person-booth" icon unicode character.
+    /// </summary>
+    PersonBooth = 0xF756,
+
+    /// <summary>
+    /// The Font Awesome "phabricator" icon unicode character.
+    /// </summary>
+    Phabricator = 0xF3DB,
+
+    /// <summary>
+    /// The Font Awesome "phoenix-framework" icon unicode character.
+    /// </summary>
+    PhoenixFramework = 0xF3DC,
+
+    /// <summary>
+    /// The Font Awesome "phoenix-squadron" icon unicode character.
+    /// </summary>
+    PhoenixSquadron = 0xF511,
+
+    /// <summary>
+    /// The Font Awesome "phone" icon unicode character.
+    /// </summary>
+    Phone = 0xF095,
+
+    /// <summary>
+    /// The Font Awesome "phone-alt" icon unicode character.
+    /// </summary>
+    PhoneAlt = 0xF879,
+
+    /// <summary>
+    /// The Font Awesome "phone-slash" icon unicode character.
+    /// </summary>
+    PhoneSlash = 0xF3DD,
+
+    /// <summary>
+    /// The Font Awesome "phone-square" icon unicode character.
+    /// </summary>
+    PhoneSquare = 0xF098,
+
+    /// <summary>
+    /// The Font Awesome "phone-square-alt" icon unicode character.
+    /// </summary>
+    PhoneSquareAlt = 0xF87B,
+
+    /// <summary>
+    /// The Font Awesome "phone-volume" icon unicode character.
+    /// </summary>
+    PhoneVolume = 0xF2A0,
+
+    /// <summary>
+    /// The Font Awesome "photo-video" icon unicode character.
+    /// </summary>
+    PhotoVideo = 0xF87C,
+
+    /// <summary>
+    /// The Font Awesome "php" icon unicode character.
+    /// </summary>
+    Php = 0xF457,
+
+    /// <summary>
+    /// The Font Awesome "pied-piper" icon unicode character.
+    /// </summary>
+    PiedPiper = 0xF2AE,
+
+    /// <summary>
+    /// The Font Awesome "pied-piper-alt" icon unicode character.
+    /// </summary>
+    PiedPiperAlt = 0xF1A8,
+
+    /// <summary>
+    /// The Font Awesome "pied-piper-hat" icon unicode character.
+    /// </summary>
+    PiedPiperHat = 0xF4E5,
+
+    /// <summary>
+    /// The Font Awesome "pied-piper-pp" icon unicode character.
+    /// </summary>
+    PiedPiperPp = 0xF1A7,
+
+    /// <summary>
+    /// The Font Awesome "pied-piper-square" icon unicode character.
+    /// </summary>
+    PiedPiperSquare = 0xF91E,
+
+    /// <summary>
+    /// The Font Awesome "piggy-bank" icon unicode character.
+    /// </summary>
+    PiggyBank = 0xF4D3,
+
+    /// <summary>
+    /// The Font Awesome "pills" icon unicode character.
+    /// </summary>
+    Pills = 0xF484,
+
+    /// <summary>
+    /// The Font Awesome "pinterest" icon unicode character.
+    /// </summary>
+    Pinterest = 0xF0D2,
+
+    /// <summary>
+    /// The Font Awesome "pinterest-p" icon unicode character.
+    /// </summary>
+    PinterestP = 0xF231,
+
+    /// <summary>
+    /// The Font Awesome "pinterest-square" icon unicode character.
+    /// </summary>
+    PinterestSquare = 0xF0D3,
+
+    /// <summary>
+    /// The Font Awesome "pizza-slice" icon unicode character.
+    /// </summary>
+    PizzaSlice = 0xF818,
+
+    /// <summary>
+    /// The Font Awesome "place-of-worship" icon unicode character.
+    /// </summary>
+    PlaceOfWorship = 0xF67F,
+
+    /// <summary>
+    /// The Font Awesome "plane" icon unicode character.
+    /// </summary>
+    Plane = 0xF072,
+
+    /// <summary>
+    /// The Font Awesome "plane-arrival" icon unicode character.
+    /// </summary>
+    PlaneArrival = 0xF5AF,
+
+    /// <summary>
+    /// The Font Awesome "plane-departure" icon unicode character.
+    /// </summary>
+    PlaneDeparture = 0xF5B0,
+
+    /// <summary>
+    /// The Font Awesome "play" icon unicode character.
+    /// </summary>
+    Play = 0xF04B,
+
+    /// <summary>
+    /// The Font Awesome "play-circle" icon unicode character.
+    /// </summary>
+    PlayCircle = 0xF144,
+
+    /// <summary>
+    /// The Font Awesome "playstation" icon unicode character.
+    /// </summary>
+    Playstation = 0xF3DF,
+
+    /// <summary>
+    /// The Font Awesome "plug" icon unicode character.
+    /// </summary>
+    Plug = 0xF1E6,
+
+    /// <summary>
+    /// The Font Awesome "plus" icon unicode character.
+    /// </summary>
+    Plus = 0xF067,
+
+    /// <summary>
+    /// The Font Awesome "plus-circle" icon unicode character.
+    /// </summary>
+    PlusCircle = 0xF055,
+
+    /// <summary>
+    /// The Font Awesome "plus-square" icon unicode character.
+    /// </summary>
+    PlusSquare = 0xF0FE,
+
+    /// <summary>
+    /// The Font Awesome "podcast" icon unicode character.
+    /// </summary>
+    Podcast = 0xF2CE,
+
+    /// <summary>
+    /// The Font Awesome "poll" icon unicode character.
+    /// </summary>
+    Poll = 0xF681,
+
+    /// <summary>
+    /// The Font Awesome "poll-h" icon unicode character.
+    /// </summary>
+    PollH = 0xF682,
+
+    /// <summary>
+    /// The Font Awesome "poo" icon unicode character.
+    /// </summary>
+    Poo = 0xF2FE,
+
+    /// <summary>
+    /// The Font Awesome "poop" icon unicode character.
+    /// </summary>
+    Poop = 0xF619,
+
+    /// <summary>
+    /// The Font Awesome "poo-storm" icon unicode character.
+    /// </summary>
+    PooStorm = 0xF75A,
+
+    /// <summary>
+    /// The Font Awesome "portrait" icon unicode character.
+    /// </summary>
+    Portrait = 0xF3E0,
+
+    /// <summary>
+    /// The Font Awesome "pound-sign" icon unicode character.
+    /// </summary>
+    PoundSign = 0xF154,
+
+    /// <summary>
+    /// The Font Awesome "power-off" icon unicode character.
+    /// </summary>
+    PowerOff = 0xF011,
+
+    /// <summary>
+    /// The Font Awesome "pray" icon unicode character.
+    /// </summary>
+    Pray = 0xF683,
+
+    /// <summary>
+    /// The Font Awesome "praying-hands" icon unicode character.
+    /// </summary>
+    PrayingHands = 0xF684,
+
+    /// <summary>
+    /// The Font Awesome "prescription" icon unicode character.
+    /// </summary>
+    Prescription = 0xF5B1,
+
+    /// <summary>
+    /// The Font Awesome "prescription-bottle" icon unicode character.
+    /// </summary>
+    PrescriptionBottle = 0xF485,
+
+    /// <summary>
+    /// The Font Awesome "prescription-bottle-alt" icon unicode character.
+    /// </summary>
+    PrescriptionBottleAlt = 0xF486,
+
+    /// <summary>
+    /// The Font Awesome "print" icon unicode character.
+    /// </summary>
+    Print = 0xF02F,
+
+    /// <summary>
+    /// The Font Awesome "procedures" icon unicode character.
+    /// </summary>
+    Procedures = 0xF487,
+
+    /// <summary>
+    /// The Font Awesome "product-hunt" icon unicode character.
+    /// </summary>
+    ProductHunt = 0xF288,
+
+    /// <summary>
+    /// The Font Awesome "project-diagram" icon unicode character.
+    /// </summary>
+    ProjectDiagram = 0xF542,
+
+    /// <summary>
+    /// The Font Awesome "pushed" icon unicode character.
+    /// </summary>
+    Pushed = 0xF3E1,
+
+    /// <summary>
+    /// The Font Awesome "puzzle-piece" icon unicode character.
+    /// </summary>
+    PuzzlePiece = 0xF12E,
+
+    /// <summary>
+    /// The Font Awesome "python" icon unicode character.
+    /// </summary>
+    Python = 0xF3E2,
+
+    /// <summary>
+    /// The Font Awesome "qq" icon unicode character.
+    /// </summary>
+    Qq = 0xF1D6,
+
+    /// <summary>
+    /// The Font Awesome "qrcode" icon unicode character.
+    /// </summary>
+    Qrcode = 0xF029,
+
+    /// <summary>
+    /// The Font Awesome "question" icon unicode character.
+    /// </summary>
+    Question = 0xF128,
+
+    /// <summary>
+    /// The Font Awesome "question-circle" icon unicode character.
+    /// </summary>
+    QuestionCircle = 0xF059,
+
+    /// <summary>
+    /// The Font Awesome "quidditch" icon unicode character.
+    /// </summary>
+    Quidditch = 0xF458,
+
+    /// <summary>
+    /// The Font Awesome "quinscape" icon unicode character.
+    /// </summary>
+    Quinscape = 0xF459,
+
+    /// <summary>
+    /// The Font Awesome "quora" icon unicode character.
+    /// </summary>
+    Quora = 0xF2C4,
+
+    /// <summary>
+    /// The Font Awesome "quote-left" icon unicode character.
+    /// </summary>
+    QuoteLeft = 0xF10D,
+
+    /// <summary>
+    /// The Font Awesome "quote-right" icon unicode character.
+    /// </summary>
+    QuoteRight = 0xF10E,
+
+    /// <summary>
+    /// The Font Awesome "quran" icon unicode character.
+    /// </summary>
+    Quran = 0xF687,
+
+    /// <summary>
+    /// The Font Awesome "radiation" icon unicode character.
+    /// </summary>
+    Radiation = 0xF7B9,
+
+    /// <summary>
+    /// The Font Awesome "radiation-alt" icon unicode character.
+    /// </summary>
+    RadiationAlt = 0xF7BA,
+
+    /// <summary>
+    /// The Font Awesome "rainbow" icon unicode character.
+    /// </summary>
+    Rainbow = 0xF75B,
+
+    /// <summary>
+    /// The Font Awesome "random" icon unicode character.
+    /// </summary>
+    Random = 0xF074,
+
+    /// <summary>
+    /// The Font Awesome "raspberry-pi" icon unicode character.
+    /// </summary>
+    RaspberryPi = 0xF7BB,
+
+    /// <summary>
+    /// The Font Awesome "ravelry" icon unicode character.
+    /// </summary>
+    Ravelry = 0xF2D9,
+
+    /// <summary>
+    /// The Font Awesome "react" icon unicode character.
+    /// </summary>
+    React = 0xF41B,
+
+    /// <summary>
+    /// The Font Awesome "reacteurope" icon unicode character.
+    /// </summary>
+    Reacteurope = 0xF75D,
+
+    /// <summary>
+    /// The Font Awesome "readme" icon unicode character.
+    /// </summary>
+    Readme = 0xF4D5,
+
+    /// <summary>
+    /// The Font Awesome "rebel" icon unicode character.
+    /// </summary>
+    Rebel = 0xF1D0,
+
+    /// <summary>
+    /// The Font Awesome "receipt" icon unicode character.
+    /// </summary>
+    Receipt = 0xF543,
+
+    /// <summary>
+    /// The Font Awesome "record-vinyl" icon unicode character.
+    /// </summary>
+    RecordVinyl = 0xF8D9,
+
+    /// <summary>
+    /// The Font Awesome "recycle" icon unicode character.
+    /// </summary>
+    Recycle = 0xF1B8,
+
+    /// <summary>
+    /// The Font Awesome "reddit" icon unicode character.
+    /// </summary>
+    Reddit = 0xF1A1,
+
+    /// <summary>
+    /// The Font Awesome "reddit-alien" icon unicode character.
+    /// </summary>
+    RedditAlien = 0xF281,
+
+    /// <summary>
+    /// The Font Awesome "reddit-square" icon unicode character.
+    /// </summary>
+    RedditSquare = 0xF1A2,
+
+    /// <summary>
+    /// The Font Awesome "redhat" icon unicode character.
+    /// </summary>
+    Redhat = 0xF7BC,
+
+    /// <summary>
+    /// The Font Awesome "redo" icon unicode character.
+    /// </summary>
+    Redo = 0xF01E,
+
+    /// <summary>
+    /// The Font Awesome "redo-alt" icon unicode character.
+    /// </summary>
+    RedoAlt = 0xF2F9,
+
+    /// <summary>
+    /// The Font Awesome "red-river" icon unicode character.
+    /// </summary>
+    RedRiver = 0xF3E3,
+
+    /// <summary>
+    /// The Font Awesome "registered" icon unicode character.
+    /// </summary>
+    Registered = 0xF25D,
+
+    /// <summary>
+    /// The Font Awesome "remove-format" icon unicode character.
+    /// </summary>
+    RemoveFormat = 0xF87D,
+
+    /// <summary>
+    /// The Font Awesome "renren" icon unicode character.
+    /// </summary>
+    Renren = 0xF18B,
+
+    /// <summary>
+    /// The Font Awesome "reply" icon unicode character.
+    /// </summary>
+    Reply = 0xF3E5,
+
+    /// <summary>
+    /// The Font Awesome "reply-all" icon unicode character.
+    /// </summary>
+    ReplyAll = 0xF122,
+
+    /// <summary>
+    /// The Font Awesome "replyd" icon unicode character.
+    /// </summary>
+    Replyd = 0xF3E6,
+
+    /// <summary>
+    /// The Font Awesome "republican" icon unicode character.
+    /// </summary>
+    Republican = 0xF75E,
+
+    /// <summary>
+    /// The Font Awesome "researchgate" icon unicode character.
+    /// </summary>
+    Researchgate = 0xF4F8,
+
+    /// <summary>
+    /// The Font Awesome "resolving" icon unicode character.
+    /// </summary>
+    Resolving = 0xF3E7,
+
+    /// <summary>
+    /// The Font Awesome "restroom" icon unicode character.
+    /// </summary>
+    Restroom = 0xF7BD,
+
+    /// <summary>
+    /// The Font Awesome "retweet" icon unicode character.
+    /// </summary>
+    Retweet = 0xF079,
+
+    /// <summary>
+    /// The Font Awesome "rev" icon unicode character.
+    /// </summary>
+    Rev = 0xF5B2,
+
+    /// <summary>
+    /// The Font Awesome "ribbon" icon unicode character.
+    /// </summary>
+    Ribbon = 0xF4D6,
+
+    /// <summary>
+    /// The Font Awesome "ring" icon unicode character.
+    /// </summary>
+    Ring = 0xF70B,
+
+    /// <summary>
+    /// The Font Awesome "road" icon unicode character.
+    /// </summary>
+    Road = 0xF018,
+
+    /// <summary>
+    /// The Font Awesome "robot" icon unicode character.
+    /// </summary>
+    Robot = 0xF544,
+
+    /// <summary>
+    /// The Font Awesome "rocket" icon unicode character.
+    /// </summary>
+    Rocket = 0xF135,
+
+    /// <summary>
+    /// The Font Awesome "rocketchat" icon unicode character.
+    /// </summary>
+    Rocketchat = 0xF3E8,
+
+    /// <summary>
+    /// The Font Awesome "rockrms" icon unicode character.
+    /// </summary>
+    Rockrms = 0xF3E9,
+
+    /// <summary>
+    /// The Font Awesome "route" icon unicode character.
+    /// </summary>
+    Route = 0xF4D7,
+
+    /// <summary>
+    /// The Font Awesome "r-project" icon unicode character.
+    /// </summary>
+    RProject = 0xF4F7,
+
+    /// <summary>
+    /// The Font Awesome "rss" icon unicode character.
+    /// </summary>
+    Rss = 0xF09E,
+
+    /// <summary>
+    /// The Font Awesome "rss-square" icon unicode character.
+    /// </summary>
+    RssSquare = 0xF143,
+
+    /// <summary>
+    /// The Font Awesome "ruble-sign" icon unicode character.
+    /// </summary>
+    RubleSign = 0xF158,
+
+    /// <summary>
+    /// The Font Awesome "ruler" icon unicode character.
+    /// </summary>
+    Ruler = 0xF545,
+
+    /// <summary>
+    /// The Font Awesome "ruler-combined" icon unicode character.
+    /// </summary>
+    RulerCombined = 0xF546,
+
+    /// <summary>
+    /// The Font Awesome "ruler-horizontal" icon unicode character.
+    /// </summary>
+    RulerHorizontal = 0xF547,
+
+    /// <summary>
+    /// The Font Awesome "ruler-vertical" icon unicode character.
+    /// </summary>
+    RulerVertical = 0xF548,
+
+    /// <summary>
+    /// The Font Awesome "running" icon unicode character.
+    /// </summary>
+    Running = 0xF70C,
+
+    /// <summary>
+    /// The Font Awesome "rupee-sign" icon unicode character.
+    /// </summary>
+    RupeeSign = 0xF156,
+
+    /// <summary>
+    /// The Font Awesome "sad-cry" icon unicode character.
+    /// </summary>
+    SadCry = 0xF5B3,
+
+    /// <summary>
+    /// The Font Awesome "sad-tear" icon unicode character.
+    /// </summary>
+    SadTear = 0xF5B4,
+
+    /// <summary>
+    /// The Font Awesome "safari" icon unicode character.
+    /// </summary>
+    Safari = 0xF267,
+
+    /// <summary>
+    /// The Font Awesome "salesforce" icon unicode character.
+    /// </summary>
+    Salesforce = 0xF83B,
+
+    /// <summary>
+    /// The Font Awesome "sass" icon unicode character.
+    /// </summary>
+    Sass = 0xF41E,
+
+    /// <summary>
+    /// The Font Awesome "satellite" icon unicode character.
+    /// </summary>
+    Satellite = 0xF7BF,
+
+    /// <summary>
+    /// The Font Awesome "satellite-dish" icon unicode character.
+    /// </summary>
+    SatelliteDish = 0xF7C0,
+
+    /// <summary>
+    /// The Font Awesome "save" icon unicode character.
+    /// </summary>
+    Save = 0xF0C7,
+
+    /// <summary>
+    /// The Font Awesome "schlix" icon unicode character.
+    /// </summary>
+    Schlix = 0xF3EA,
+
+    /// <summary>
+    /// The Font Awesome "school" icon unicode character.
+    /// </summary>
+    School = 0xF549,
+
+    /// <summary>
+    /// The Font Awesome "screwdriver" icon unicode character.
+    /// </summary>
+    Screwdriver = 0xF54A,
+
+    /// <summary>
+    /// The Font Awesome "scribd" icon unicode character.
+    /// </summary>
+    Scribd = 0xF28A,
+
+    /// <summary>
+    /// The Font Awesome "scroll" icon unicode character.
+    /// </summary>
+    Scroll = 0xF70E,
+
+    /// <summary>
+    /// The Font Awesome "sd-card" icon unicode character.
+    /// </summary>
+    SdCard = 0xF7C2,
+
+    /// <summary>
+    /// The Font Awesome "search" icon unicode character.
+    /// </summary>
+    Search = 0xF002,
+
+    /// <summary>
+    /// The Font Awesome "search-dollar" icon unicode character.
+    /// </summary>
+    SearchDollar = 0xF688,
+
+    /// <summary>
+    /// The Font Awesome "searchengin" icon unicode character.
+    /// </summary>
+    Searchengin = 0xF3EB,
+
+    /// <summary>
+    /// The Font Awesome "search-location" icon unicode character.
+    /// </summary>
+    SearchLocation = 0xF689,
+
+    /// <summary>
+    /// The Font Awesome "search-minus" icon unicode character.
+    /// </summary>
+    SearchMinus = 0xF010,
+
+    /// <summary>
+    /// The Font Awesome "search-plus" icon unicode character.
+    /// </summary>
+    SearchPlus = 0xF00E,
+
+    /// <summary>
+    /// The Font Awesome "seedling" icon unicode character.
+    /// </summary>
+    Seedling = 0xF4D8,
+
+    /// <summary>
+    /// The Font Awesome "sellcast" icon unicode character.
+    /// </summary>
+    Sellcast = 0xF2DA,
+
+    /// <summary>
+    /// The Font Awesome "sellsy" icon unicode character.
+    /// </summary>
+    Sellsy = 0xF213,
+
+    /// <summary>
+    /// The Font Awesome "server" icon unicode character.
+    /// </summary>
+    Server = 0xF233,
+
+    /// <summary>
+    /// The Font Awesome "servicestack" icon unicode character.
+    /// </summary>
+    Servicestack = 0xF3EC,
+
+    /// <summary>
+    /// The Font Awesome "shapes" icon unicode character.
+    /// </summary>
+    Shapes = 0xF61F,
+
+    /// <summary>
+    /// The Font Awesome "share" icon unicode character.
+    /// </summary>
+    Share = 0xF064,
+
+    /// <summary>
+    /// The Font Awesome "share-alt" icon unicode character.
+    /// </summary>
+    ShareAlt = 0xF1E0,
+
+    /// <summary>
+    /// The Font Awesome "share-alt-square" icon unicode character.
+    /// </summary>
+    ShareAltSquare = 0xF1E1,
+
+    /// <summary>
+    /// The Font Awesome "share-square" icon unicode character.
+    /// </summary>
+    ShareSquare = 0xF14D,
+
+    /// <summary>
+    /// The Font Awesome "shekel-sign" icon unicode character.
+    /// </summary>
+    ShekelSign = 0xF20B,
+
+    /// <summary>
+    /// The Font Awesome "shield-alt" icon unicode character.
+    /// </summary>
+    ShieldAlt = 0xF3ED,
+
+    /// <summary>
+    /// The Font Awesome "ship" icon unicode character.
+    /// </summary>
+    Ship = 0xF21A,
+
+    /// <summary>
+    /// The Font Awesome "shipping-fast" icon unicode character.
+    /// </summary>
+    ShippingFast = 0xF48B,
+
+    /// <summary>
+    /// The Font Awesome "shirtsinbulk" icon unicode character.
+    /// </summary>
+    Shirtsinbulk = 0xF214,
+
+    /// <summary>
+    /// The Font Awesome "shoe-prints" icon unicode character.
+    /// </summary>
+    ShoePrints = 0xF54B,
+
+    /// <summary>
+    /// The Font Awesome "shopify" icon unicode character.
+    /// </summary>
+    Shopify = 0xF957,
+
+    /// <summary>
+    /// The Font Awesome "shopping-bag" icon unicode character.
+    /// </summary>
+    ShoppingBag = 0xF290,
+
+    /// <summary>
+    /// The Font Awesome "shopping-basket" icon unicode character.
+    /// </summary>
+    ShoppingBasket = 0xF291,
+
+    /// <summary>
+    /// The Font Awesome "shopping-cart" icon unicode character.
+    /// </summary>
+    ShoppingCart = 0xF07A,
+
+    /// <summary>
+    /// The Font Awesome "shopware" icon unicode character.
+    /// </summary>
+    Shopware = 0xF5B5,
+
+    /// <summary>
+    /// The Font Awesome "shower" icon unicode character.
+    /// </summary>
+    Shower = 0xF2CC,
+
+    /// <summary>
+    /// The Font Awesome "shuttle-van" icon unicode character.
+    /// </summary>
+    ShuttleVan = 0xF5B6,
+
+    /// <summary>
+    /// The Font Awesome "sign" icon unicode character.
+    /// </summary>
+    Sign = 0xF4D9,
+
+    /// <summary>
+    /// The Font Awesome "signal" icon unicode character.
+    /// </summary>
+    Signal = 0xF012,
+
+    /// <summary>
+    /// The Font Awesome "signature" icon unicode character.
+    /// </summary>
+    Signature = 0xF5B7,
+
+    /// <summary>
+    /// The Font Awesome "sign-in-alt" icon unicode character.
+    /// </summary>
+    SignInAlt = 0xF2F6,
+
+    /// <summary>
+    /// The Font Awesome "sign-language" icon unicode character.
+    /// </summary>
+    SignLanguage = 0xF2A7,
+
+    /// <summary>
+    /// The Font Awesome "sign-out-alt" icon unicode character.
+    /// </summary>
+    SignOutAlt = 0xF2F5,
+
+    /// <summary>
+    /// The Font Awesome "sim-card" icon unicode character.
+    /// </summary>
+    SimCard = 0xF7C4,
+
+    /// <summary>
+    /// The Font Awesome "simplybuilt" icon unicode character.
+    /// </summary>
+    Simplybuilt = 0xF215,
+
+    /// <summary>
+    /// The Font Awesome "sistrix" icon unicode character.
+    /// </summary>
+    Sistrix = 0xF3EE,
+
+    /// <summary>
+    /// The Font Awesome "sitemap" icon unicode character.
+    /// </summary>
+    Sitemap = 0xF0E8,
+
+    /// <summary>
+    /// The Font Awesome "sith" icon unicode character.
+    /// </summary>
+    Sith = 0xF512,
+
+    /// <summary>
+    /// The Font Awesome "skating" icon unicode character.
+    /// </summary>
+    Skating = 0xF7C5,
+
+    /// <summary>
+    /// The Font Awesome "sketch" icon unicode character.
+    /// </summary>
+    Sketch = 0xF7C6,
+
+    /// <summary>
+    /// The Font Awesome "skiing" icon unicode character.
+    /// </summary>
+    Skiing = 0xF7C9,
+
+    /// <summary>
+    /// The Font Awesome "skiing-nordic" icon unicode character.
+    /// </summary>
+    SkiingNordic = 0xF7CA,
+
+    /// <summary>
+    /// The Font Awesome "skull" icon unicode character.
+    /// </summary>
+    Skull = 0xF54C,
+
+    /// <summary>
+    /// The Font Awesome "skull-crossbones" icon unicode character.
+    /// </summary>
+    SkullCrossbones = 0xF714,
+
+    /// <summary>
+    /// The Font Awesome "skyatlas" icon unicode character.
+    /// </summary>
+    Skyatlas = 0xF216,
+
+    /// <summary>
+    /// The Font Awesome "skype" icon unicode character.
+    /// </summary>
+    Skype = 0xF17E,
+
+    /// <summary>
+    /// The Font Awesome "slack" icon unicode character.
+    /// </summary>
+    Slack = 0xF198,
+
+    /// <summary>
+    /// The Font Awesome "slack-hash" icon unicode character.
+    /// </summary>
+    SlackHash = 0xF3EF,
+
+    /// <summary>
+    /// The Font Awesome "slash" icon unicode character.
+    /// </summary>
+    Slash = 0xF715,
+
+    /// <summary>
+    /// The Font Awesome "sleigh" icon unicode character.
+    /// </summary>
+    Sleigh = 0xF7CC,
+
+    /// <summary>
+    /// The Font Awesome "sliders-h" icon unicode character.
+    /// </summary>
+    SlidersH = 0xF1DE,
+
+    /// <summary>
+    /// The Font Awesome "slideshare" icon unicode character.
+    /// </summary>
+    Slideshare = 0xF1E7,
+
+    /// <summary>
+    /// The Font Awesome "smile" icon unicode character.
+    /// </summary>
+    Smile = 0xF118,
+
+    /// <summary>
+    /// The Font Awesome "smile-beam" icon unicode character.
+    /// </summary>
+    SmileBeam = 0xF5B8,
+
+    /// <summary>
+    /// The Font Awesome "smile-wink" icon unicode character.
+    /// </summary>
+    SmileWink = 0xF4DA,
+
+    /// <summary>
+    /// The Font Awesome "smog" icon unicode character.
+    /// </summary>
+    Smog = 0xF75F,
+
+    /// <summary>
+    /// The Font Awesome "smoking" icon unicode character.
+    /// </summary>
+    Smoking = 0xF48D,
+
+    /// <summary>
+    /// The Font Awesome "smoking-ban" icon unicode character.
+    /// </summary>
+    SmokingBan = 0xF54D,
+
+    /// <summary>
+    /// The Font Awesome "sms" icon unicode character.
+    /// </summary>
+    Sms = 0xF7CD,
+
+    /// <summary>
+    /// The Font Awesome "snapchat" icon unicode character.
+    /// </summary>
+    Snapchat = 0xF2AB,
+
+    /// <summary>
+    /// The Font Awesome "snapchat-ghost" icon unicode character.
+    /// </summary>
+    SnapchatGhost = 0xF2AC,
+
+    /// <summary>
+    /// The Font Awesome "snapchat-square" icon unicode character.
+    /// </summary>
+    SnapchatSquare = 0xF2AD,
+
+    /// <summary>
+    /// The Font Awesome "snowboarding" icon unicode character.
+    /// </summary>
+    Snowboarding = 0xF7CE,
+
+    /// <summary>
+    /// The Font Awesome "snowflake" icon unicode character.
+    /// </summary>
+    Snowflake = 0xF2DC,
+
+    /// <summary>
+    /// The Font Awesome "snowman" icon unicode character.
+    /// </summary>
+    Snowman = 0xF7D0,
+
+    /// <summary>
+    /// The Font Awesome "snowplow" icon unicode character.
+    /// </summary>
+    Snowplow = 0xF7D2,
+
+    /// <summary>
+    /// The Font Awesome "socks" icon unicode character.
+    /// </summary>
+    Socks = 0xF696,
+
+    /// <summary>
+    /// The Font Awesome "solar-panel" icon unicode character.
+    /// </summary>
+    SolarPanel = 0xF5BA,
+
+    /// <summary>
+    /// The Font Awesome "sort" icon unicode character.
+    /// </summary>
+    Sort = 0xF0DC,
+
+    /// <summary>
+    /// The Font Awesome "sort-alpha-down" icon unicode character.
+    /// </summary>
+    SortAlphaDown = 0xF15D,
+
+    /// <summary>
+    /// The Font Awesome "sort-alpha-down-alt" icon unicode character.
+    /// </summary>
+    SortAlphaDownAlt = 0xF881,
+
+    /// <summary>
+    /// The Font Awesome "sort-alpha-up" icon unicode character.
+    /// </summary>
+    SortAlphaUp = 0xF15E,
+
+    /// <summary>
+    /// The Font Awesome "sort-alpha-up-alt" icon unicode character.
+    /// </summary>
+    SortAlphaUpAlt = 0xF882,
+
+    /// <summary>
+    /// The Font Awesome "sort-amount-down" icon unicode character.
+    /// </summary>
+    SortAmountDown = 0xF160,
+
+    /// <summary>
+    /// The Font Awesome "sort-amount-down-alt" icon unicode character.
+    /// </summary>
+    SortAmountDownAlt = 0xF884,
+
+    /// <summary>
+    /// The Font Awesome "sort-amount-up" icon unicode character.
+    /// </summary>
+    SortAmountUp = 0xF161,
+
+    /// <summary>
+    /// The Font Awesome "sort-amount-up-alt" icon unicode character.
+    /// </summary>
+    SortAmountUpAlt = 0xF885,
+
+    /// <summary>
+    /// The Font Awesome "sort-down" icon unicode character.
+    /// </summary>
+    SortDown = 0xF0DD,
+
+    /// <summary>
+    /// The Font Awesome "sort-numeric-down" icon unicode character.
+    /// </summary>
+    SortNumericDown = 0xF162,
+
+    /// <summary>
+    /// The Font Awesome "sort-numeric-down-alt" icon unicode character.
+    /// </summary>
+    SortNumericDownAlt = 0xF886,
+
+    /// <summary>
+    /// The Font Awesome "sort-numeric-up" icon unicode character.
+    /// </summary>
+    SortNumericUp = 0xF163,
+
+    /// <summary>
+    /// The Font Awesome "sort-numeric-up-alt" icon unicode character.
+    /// </summary>
+    SortNumericUpAlt = 0xF887,
+
+    /// <summary>
+    /// The Font Awesome "sort-up" icon unicode character.
+    /// </summary>
+    SortUp = 0xF0DE,
+
+    /// <summary>
+    /// The Font Awesome "soundcloud" icon unicode character.
+    /// </summary>
+    Soundcloud = 0xF1BE,
+
+    /// <summary>
+    /// The Font Awesome "sourcetree" icon unicode character.
+    /// </summary>
+    Sourcetree = 0xF7D3,
+
+    /// <summary>
+    /// The Font Awesome "spa" icon unicode character.
+    /// </summary>
+    Spa = 0xF5BB,
+
+    /// <summary>
+    /// The Font Awesome "space-shuttle" icon unicode character.
+    /// </summary>
+    SpaceShuttle = 0xF197,
+
+    /// <summary>
+    /// The Font Awesome "speakap" icon unicode character.
+    /// </summary>
+    Speakap = 0xF3F3,
+
+    /// <summary>
+    /// The Font Awesome "speaker-deck" icon unicode character.
+    /// </summary>
+    SpeakerDeck = 0xF83C,
+
+    /// <summary>
+    /// The Font Awesome "spell-check" icon unicode character.
+    /// </summary>
+    SpellCheck = 0xF891,
+
+    /// <summary>
+    /// The Font Awesome "spider" icon unicode character.
+    /// </summary>
+    Spider = 0xF717,
+
+    /// <summary>
+    /// The Font Awesome "spinner" icon unicode character.
+    /// </summary>
+    Spinner = 0xF110,
+
+    /// <summary>
+    /// The Font Awesome "splotch" icon unicode character.
+    /// </summary>
+    Splotch = 0xF5BC,
+
+    /// <summary>
+    /// The Font Awesome "spotify" icon unicode character.
+    /// </summary>
+    Spotify = 0xF1BC,
+
+    /// <summary>
+    /// The Font Awesome "spray-can" icon unicode character.
+    /// </summary>
+    SprayCan = 0xF5BD,
+
+    /// <summary>
+    /// The Font Awesome "square" icon unicode character.
+    /// </summary>
+    Square = 0xF0C8,
+
+    /// <summary>
+    /// The Font Awesome "square-full" icon unicode character.
+    /// </summary>
+    SquareFull = 0xF45C,
+
+    /// <summary>
+    /// The Font Awesome "square-root-alt" icon unicode character.
+    /// </summary>
+    SquareRootAlt = 0xF698,
+
+    /// <summary>
+    /// The Font Awesome "squarespace" icon unicode character.
+    /// </summary>
+    Squarespace = 0xF5BE,
+
+    /// <summary>
+    /// The Font Awesome "stack-exchange" icon unicode character.
+    /// </summary>
+    StackExchange = 0xF18D,
+
+    /// <summary>
+    /// The Font Awesome "stack-overflow" icon unicode character.
+    /// </summary>
+    StackOverflow = 0xF16C,
+
+    /// <summary>
+    /// The Font Awesome "stackpath" icon unicode character.
+    /// </summary>
+    Stackpath = 0xF842,
+
+    /// <summary>
+    /// The Font Awesome "stamp" icon unicode character.
+    /// </summary>
+    Stamp = 0xF5BF,
+
+    /// <summary>
+    /// The Font Awesome "star" icon unicode character.
+    /// </summary>
+    Star = 0xF005,
+
+    /// <summary>
+    /// The Font Awesome "star-and-crescent" icon unicode character.
+    /// </summary>
+    StarAndCrescent = 0xF699,
+
+    /// <summary>
+    /// The Font Awesome "star-half" icon unicode character.
+    /// </summary>
+    StarHalf = 0xF089,
+
+    /// <summary>
+    /// The Font Awesome "star-half-alt" icon unicode character.
+    /// </summary>
+    StarHalfAlt = 0xF5C0,
+
+    /// <summary>
+    /// The Font Awesome "star-of-david" icon unicode character.
+    /// </summary>
+    StarOfDavid = 0xF69A,
+
+    /// <summary>
+    /// The Font Awesome "star-of-life" icon unicode character.
+    /// </summary>
+    StarOfLife = 0xF621,
+
+    /// <summary>
+    /// The Font Awesome "staylinked" icon unicode character.
+    /// </summary>
+    Staylinked = 0xF3F5,
+
+    /// <summary>
+    /// The Font Awesome "steam" icon unicode character.
+    /// </summary>
+    Steam = 0xF1B6,
+
+    /// <summary>
+    /// The Font Awesome "steam-square" icon unicode character.
+    /// </summary>
+    SteamSquare = 0xF1B7,
+
+    /// <summary>
+    /// The Font Awesome "steam-symbol" icon unicode character.
+    /// </summary>
+    SteamSymbol = 0xF3F6,
+
+    /// <summary>
+    /// The Font Awesome "step-backward" icon unicode character.
+    /// </summary>
+    StepBackward = 0xF048,
+
+    /// <summary>
+    /// The Font Awesome "step-forward" icon unicode character.
+    /// </summary>
+    StepForward = 0xF051,
+
+    /// <summary>
+    /// The Font Awesome "stethoscope" icon unicode character.
+    /// </summary>
+    Stethoscope = 0xF0F1,
+
+    /// <summary>
+    /// The Font Awesome "sticker-mule" icon unicode character.
+    /// </summary>
+    StickerMule = 0xF3F7,
+
+    /// <summary>
+    /// The Font Awesome "sticky-note" icon unicode character.
+    /// </summary>
+    StickyNote = 0xF249,
+
+    /// <summary>
+    /// The Font Awesome "stop" icon unicode character.
+    /// </summary>
+    Stop = 0xF04D,
+
+    /// <summary>
+    /// The Font Awesome "stop-circle" icon unicode character.
+    /// </summary>
+    StopCircle = 0xF28D,
+
+    /// <summary>
+    /// The Font Awesome "stopwatch" icon unicode character.
+    /// </summary>
+    Stopwatch = 0xF2F2,
+
+    /// <summary>
+    /// The Font Awesome "store" icon unicode character.
+    /// </summary>
+    Store = 0xF54E,
+
+    /// <summary>
+    /// The Font Awesome "store-alt" icon unicode character.
+    /// </summary>
+    StoreAlt = 0xF54F,
+
+    /// <summary>
+    /// The Font Awesome "strava" icon unicode character.
+    /// </summary>
+    Strava = 0xF428,
+
+    /// <summary>
+    /// The Font Awesome "stream" icon unicode character.
+    /// </summary>
+    Stream = 0xF550,
+
+    /// <summary>
+    /// The Font Awesome "street-view" icon unicode character.
+    /// </summary>
+    StreetView = 0xF21D,
+
+    /// <summary>
+    /// The Font Awesome "strikethrough" icon unicode character.
+    /// </summary>
+    Strikethrough = 0xF0CC,
+
+    /// <summary>
+    /// The Font Awesome "stripe" icon unicode character.
+    /// </summary>
+    Stripe = 0xF429,
+
+    /// <summary>
+    /// The Font Awesome "stripe-s" icon unicode character.
+    /// </summary>
+    StripeS = 0xF42A,
+
+    /// <summary>
+    /// The Font Awesome "stroopwafel" icon unicode character.
+    /// </summary>
+    Stroopwafel = 0xF551,
+
+    /// <summary>
+    /// The Font Awesome "studiovinari" icon unicode character.
+    /// </summary>
+    Studiovinari = 0xF3F8,
+
+    /// <summary>
+    /// The Font Awesome "stumbleupon" icon unicode character.
+    /// </summary>
+    Stumbleupon = 0xF1A4,
+
+    /// <summary>
+    /// The Font Awesome "stumbleupon-circle" icon unicode character.
+    /// </summary>
+    StumbleuponCircle = 0xF1A3,
+
+    /// <summary>
+    /// The Font Awesome "subscript" icon unicode character.
+    /// </summary>
+    Subscript = 0xF12C,
+
+    /// <summary>
+    /// The Font Awesome "subway" icon unicode character.
+    /// </summary>
+    Subway = 0xF239,
+
+    /// <summary>
+    /// The Font Awesome "suitcase" icon unicode character.
+    /// </summary>
+    Suitcase = 0xF0F2,
+
+    /// <summary>
+    /// The Font Awesome "suitcase-rolling" icon unicode character.
+    /// </summary>
+    SuitcaseRolling = 0xF5C1,
+
+    /// <summary>
+    /// The Font Awesome "sun" icon unicode character.
+    /// </summary>
+    Sun = 0xF185,
+
+    /// <summary>
+    /// The Font Awesome "superpowers" icon unicode character.
+    /// </summary>
+    Superpowers = 0xF2DD,
+
+    /// <summary>
+    /// The Font Awesome "superscript" icon unicode character.
+    /// </summary>
+    Superscript = 0xF12B,
+
+    /// <summary>
+    /// The Font Awesome "supple" icon unicode character.
+    /// </summary>
+    Supple = 0xF3F9,
+
+    /// <summary>
+    /// The Font Awesome "surprise" icon unicode character.
+    /// </summary>
+    Surprise = 0xF5C2,
+
+    /// <summary>
+    /// The Font Awesome "suse" icon unicode character.
+    /// </summary>
+    Suse = 0xF7D6,
+
+    /// <summary>
+    /// The Font Awesome "swatchbook" icon unicode character.
+    /// </summary>
+    Swatchbook = 0xF5C3,
+
+    /// <summary>
+    /// The Font Awesome "swift" icon unicode character.
+    /// </summary>
+    Swift = 0xF8E1,
+
+    /// <summary>
+    /// The Font Awesome "swimmer" icon unicode character.
+    /// </summary>
+    Swimmer = 0xF5C4,
+
+    /// <summary>
+    /// The Font Awesome "swimming-pool" icon unicode character.
+    /// </summary>
+    SwimmingPool = 0xF5C5,
+
+    /// <summary>
+    /// The Font Awesome "symfony" icon unicode character.
+    /// </summary>
+    Symfony = 0xF83D,
+
+    /// <summary>
+    /// The Font Awesome "synagogue" icon unicode character.
+    /// </summary>
+    Synagogue = 0xF69B,
+
+    /// <summary>
+    /// The Font Awesome "sync" icon unicode character.
+    /// </summary>
+    Sync = 0xF021,
+
+    /// <summary>
+    /// The Font Awesome "sync-alt" icon unicode character.
+    /// </summary>
+    SyncAlt = 0xF2F1,
+
+    /// <summary>
+    /// The Font Awesome "syringe" icon unicode character.
+    /// </summary>
+    Syringe = 0xF48E,
+
+    /// <summary>
+    /// The Font Awesome "table" icon unicode character.
+    /// </summary>
+    Table = 0xF0CE,
+
+    /// <summary>
+    /// The Font Awesome "tablet" icon unicode character.
+    /// </summary>
+    Tablet = 0xF10A,
+
+    /// <summary>
+    /// The Font Awesome "tablet-alt" icon unicode character.
+    /// </summary>
+    TabletAlt = 0xF3FA,
+
+    /// <summary>
+    /// The Font Awesome "table-tennis" icon unicode character.
+    /// </summary>
+    TableTennis = 0xF45D,
+
+    /// <summary>
+    /// The Font Awesome "tablets" icon unicode character.
+    /// </summary>
+    Tablets = 0xF490,
+
+    /// <summary>
+    /// The Font Awesome "tachometer-alt" icon unicode character.
+    /// </summary>
+    TachometerAlt = 0xF3FD,
+
+    /// <summary>
+    /// The Font Awesome "tag" icon unicode character.
+    /// </summary>
+    Tag = 0xF02B,
+
+    /// <summary>
+    /// The Font Awesome "tags" icon unicode character.
+    /// </summary>
+    Tags = 0xF02C,
+
+    /// <summary>
+    /// The Font Awesome "tape" icon unicode character.
+    /// </summary>
+    Tape = 0xF4DB,
+
+    /// <summary>
+    /// The Font Awesome "tasks" icon unicode character.
+    /// </summary>
+    Tasks = 0xF0AE,
+
+    /// <summary>
+    /// The Font Awesome "taxi" icon unicode character.
+    /// </summary>
+    Taxi = 0xF1BA,
+
+    /// <summary>
+    /// The Font Awesome "teamspeak" icon unicode character.
+    /// </summary>
+    Teamspeak = 0xF4F9,
+
+    /// <summary>
+    /// The Font Awesome "teeth" icon unicode character.
+    /// </summary>
+    Teeth = 0xF62E,
+
+    /// <summary>
+    /// The Font Awesome "teeth-open" icon unicode character.
+    /// </summary>
+    TeethOpen = 0xF62F,
+
+    /// <summary>
+    /// The Font Awesome "telegram" icon unicode character.
+    /// </summary>
+    Telegram = 0xF2C6,
+
+    /// <summary>
+    /// The Font Awesome "telegram-plane" icon unicode character.
+    /// </summary>
+    TelegramPlane = 0xF3FE,
+
+    /// <summary>
+    /// The Font Awesome "temperature-high" icon unicode character.
+    /// </summary>
+    TemperatureHigh = 0xF769,
+
+    /// <summary>
+    /// The Font Awesome "temperature-low" icon unicode character.
+    /// </summary>
+    TemperatureLow = 0xF76B,
+
+    /// <summary>
+    /// The Font Awesome "tencent-weibo" icon unicode character.
+    /// </summary>
+    TencentWeibo = 0xF1D5,
+
+    /// <summary>
+    /// The Font Awesome "tenge" icon unicode character.
+    /// </summary>
+    Tenge = 0xF7D7,
+
+    /// <summary>
+    /// The Font Awesome "terminal" icon unicode character.
+    /// </summary>
+    Terminal = 0xF120,
+
+    /// <summary>
+    /// The Font Awesome "text-height" icon unicode character.
+    /// </summary>
+    TextHeight = 0xF034,
+
+    /// <summary>
+    /// The Font Awesome "text-width" icon unicode character.
+    /// </summary>
+    TextWidth = 0xF035,
+
+    /// <summary>
+    /// The Font Awesome "th" icon unicode character.
+    /// </summary>
+    Th = 0xF00A,
+
+    /// <summary>
+    /// The Font Awesome "theater-masks" icon unicode character.
+    /// </summary>
+    TheaterMasks = 0xF630,
+
+    /// <summary>
+    /// The Font Awesome "themeco" icon unicode character.
+    /// </summary>
+    Themeco = 0xF5C6,
+
+    /// <summary>
+    /// The Font Awesome "themeisle" icon unicode character.
+    /// </summary>
+    Themeisle = 0xF2B2,
+
+    /// <summary>
+    /// The Font Awesome "the-red-yeti" icon unicode character.
+    /// </summary>
+    TheRedYeti = 0xF69D,
+
+    /// <summary>
+    /// The Font Awesome "thermometer" icon unicode character.
+    /// </summary>
+    Thermometer = 0xF491,
+
+    /// <summary>
+    /// The Font Awesome "thermometer-empty" icon unicode character.
+    /// </summary>
+    ThermometerEmpty = 0xF2CB,
+
+    /// <summary>
+    /// The Font Awesome "thermometer-full" icon unicode character.
+    /// </summary>
+    ThermometerFull = 0xF2C7,
+
+    /// <summary>
+    /// The Font Awesome "thermometer-half" icon unicode character.
+    /// </summary>
+    ThermometerHalf = 0xF2C9,
+
+    /// <summary>
+    /// The Font Awesome "thermometer-quarter" icon unicode character.
+    /// </summary>
+    ThermometerQuarter = 0xF2CA,
+
+    /// <summary>
+    /// The Font Awesome "thermometer-three-quarters" icon unicode character.
+    /// </summary>
+    ThermometerThreeQuarters = 0xF2C8,
+
+    /// <summary>
+    /// The Font Awesome "think-peaks" icon unicode character.
+    /// </summary>
+    ThinkPeaks = 0xF731,
+
+    /// <summary>
+    /// The Font Awesome "th-large" icon unicode character.
+    /// </summary>
+    ThLarge = 0xF009,
+
+    /// <summary>
+    /// The Font Awesome "th-list" icon unicode character.
+    /// </summary>
+    ThList = 0xF00B,
+
+    /// <summary>
+    /// The Font Awesome "thumbs-down" icon unicode character.
+    /// </summary>
+    ThumbsDown = 0xF165,
+
+    /// <summary>
+    /// The Font Awesome "thumbs-up" icon unicode character.
+    /// </summary>
+    ThumbsUp = 0xF164,
+
+    /// <summary>
+    /// The Font Awesome "thumbtack" icon unicode character.
+    /// </summary>
+    Thumbtack = 0xF08D,
+
+    /// <summary>
+    /// The Font Awesome "ticket-alt" icon unicode character.
+    /// </summary>
+    TicketAlt = 0xF3FF,
+
+    /// <summary>
+    /// The Font Awesome "times" icon unicode character.
+    /// </summary>
+    Times = 0xF00D,
+
+    /// <summary>
+    /// The Font Awesome "times-circle" icon unicode character.
+    /// </summary>
+    TimesCircle = 0xF057,
+
+    /// <summary>
+    /// The Font Awesome "tint" icon unicode character.
+    /// </summary>
+    Tint = 0xF043,
+
+    /// <summary>
+    /// The Font Awesome "tint-slash" icon unicode character.
+    /// </summary>
+    TintSlash = 0xF5C7,
+
+    /// <summary>
+    /// The Font Awesome "tired" icon unicode character.
+    /// </summary>
+    Tired = 0xF5C8,
+
+    /// <summary>
+    /// The Font Awesome "toggle-off" icon unicode character.
+    /// </summary>
+    ToggleOff = 0xF204,
+
+    /// <summary>
+    /// The Font Awesome "toggle-on" icon unicode character.
+    /// </summary>
+    ToggleOn = 0xF205,
+
+    /// <summary>
+    /// The Font Awesome "toilet" icon unicode character.
+    /// </summary>
+    Toilet = 0xF7D8,
+
+    /// <summary>
+    /// The Font Awesome "toilet-paper" icon unicode character.
+    /// </summary>
+    ToiletPaper = 0xF71E,
+
+    /// <summary>
+    /// The Font Awesome "toolbox" icon unicode character.
+    /// </summary>
+    Toolbox = 0xF552,
+
+    /// <summary>
+    /// The Font Awesome "tools" icon unicode character.
+    /// </summary>
+    Tools = 0xF7D9,
+
+    /// <summary>
+    /// The Font Awesome "tooth" icon unicode character.
+    /// </summary>
+    Tooth = 0xF5C9,
+
+    /// <summary>
+    /// The Font Awesome "torah" icon unicode character.
+    /// </summary>
+    Torah = 0xF6A0,
+
+    /// <summary>
+    /// The Font Awesome "torii-gate" icon unicode character.
+    /// </summary>
+    ToriiGate = 0xF6A1,
+
+    /// <summary>
+    /// The Font Awesome "tractor" icon unicode character.
+    /// </summary>
+    Tractor = 0xF722,
+
+    /// <summary>
+    /// The Font Awesome "trade-federation" icon unicode character.
+    /// </summary>
+    TradeFederation = 0xF513,
+
+    /// <summary>
+    /// The Font Awesome "trademark" icon unicode character.
+    /// </summary>
+    Trademark = 0xF25C,
+
+    /// <summary>
+    /// The Font Awesome "traffic-light" icon unicode character.
+    /// </summary>
+    TrafficLight = 0xF637,
+
+    /// <summary>
+    /// The Font Awesome "trailer" icon unicode character.
+    /// </summary>
+    Trailer = 0xF941,
+
+    /// <summary>
+    /// The Font Awesome "train" icon unicode character.
+    /// </summary>
+    Train = 0xF238,
+
+    /// <summary>
+    /// The Font Awesome "tram" icon unicode character.
+    /// </summary>
+    Tram = 0xF7DA,
+
+    /// <summary>
+    /// The Font Awesome "transgender" icon unicode character.
+    /// </summary>
+    Transgender = 0xF224,
+
+    /// <summary>
+    /// The Font Awesome "transgender-alt" icon unicode character.
+    /// </summary>
+    TransgenderAlt = 0xF225,
+
+    /// <summary>
+    /// The Font Awesome "trash" icon unicode character.
+    /// </summary>
+    Trash = 0xF1F8,
+
+    /// <summary>
+    /// The Font Awesome "trash-alt" icon unicode character.
+    /// </summary>
+    TrashAlt = 0xF2ED,
+
+    /// <summary>
+    /// The Font Awesome "trash-restore" icon unicode character.
+    /// </summary>
+    TrashRestore = 0xF829,
+
+    /// <summary>
+    /// The Font Awesome "trash-restore-alt" icon unicode character.
+    /// </summary>
+    TrashRestoreAlt = 0xF82A,
+
+    /// <summary>
+    /// The Font Awesome "tree" icon unicode character.
+    /// </summary>
+    Tree = 0xF1BB,
+
+    /// <summary>
+    /// The Font Awesome "trello" icon unicode character.
+    /// </summary>
+    Trello = 0xF181,
+
+    /// <summary>
+    /// The Font Awesome "tripadvisor" icon unicode character.
+    /// </summary>
+    Tripadvisor = 0xF262,
+
+    /// <summary>
+    /// The Font Awesome "trophy" icon unicode character.
+    /// </summary>
+    Trophy = 0xF091,
+
+    /// <summary>
+    /// The Font Awesome "truck" icon unicode character.
+    /// </summary>
+    Truck = 0xF0D1,
+
+    /// <summary>
+    /// The Font Awesome "truck-loading" icon unicode character.
+    /// </summary>
+    TruckLoading = 0xF4DE,
+
+    /// <summary>
+    /// The Font Awesome "truck-monster" icon unicode character.
+    /// </summary>
+    TruckMonster = 0xF63B,
+
+    /// <summary>
+    /// The Font Awesome "truck-moving" icon unicode character.
+    /// </summary>
+    TruckMoving = 0xF4DF,
+
+    /// <summary>
+    /// The Font Awesome "truck-pickup" icon unicode character.
+    /// </summary>
+    TruckPickup = 0xF63C,
+
+    /// <summary>
+    /// The Font Awesome "tshirt" icon unicode character.
+    /// </summary>
+    Tshirt = 0xF553,
+
+    /// <summary>
+    /// The Font Awesome "tty" icon unicode character.
+    /// </summary>
+    Tty = 0xF1E4,
+
+    /// <summary>
+    /// The Font Awesome "tumblr" icon unicode character.
+    /// </summary>
+    Tumblr = 0xF173,
+
+    /// <summary>
+    /// The Font Awesome "tumblr-square" icon unicode character.
+    /// </summary>
+    TumblrSquare = 0xF174,
+
+    /// <summary>
+    /// The Font Awesome "tv" icon unicode character.
+    /// </summary>
+    Tv = 0xF26C,
+
+    /// <summary>
+    /// The Font Awesome "twitch" icon unicode character.
+    /// </summary>
+    Twitch = 0xF1E8,
+
+    /// <summary>
+    /// The Font Awesome "twitter" icon unicode character.
+    /// </summary>
+    Twitter = 0xF099,
+
+    /// <summary>
+    /// The Font Awesome "twitter-square" icon unicode character.
+    /// </summary>
+    TwitterSquare = 0xF081,
+
+    /// <summary>
+    /// The Font Awesome "typo3" icon unicode character.
+    /// </summary>
+    Typo3 = 0xF42B,
+
+    /// <summary>
+    /// The Font Awesome "uber" icon unicode character.
+    /// </summary>
+    Uber = 0xF402,
+
+    /// <summary>
+    /// The Font Awesome "ubuntu" icon unicode character.
+    /// </summary>
+    Ubuntu = 0xF7DF,
+
+    /// <summary>
+    /// The Font Awesome "uikit" icon unicode character.
+    /// </summary>
+    Uikit = 0xF403,
+
+    /// <summary>
+    /// The Font Awesome "umbraco" icon unicode character.
+    /// </summary>
+    Umbraco = 0xF8E8,
+
+    /// <summary>
+    /// The Font Awesome "umbrella" icon unicode character.
+    /// </summary>
+    Umbrella = 0xF0E9,
+
+    /// <summary>
+    /// The Font Awesome "umbrella-beach" icon unicode character.
+    /// </summary>
+    UmbrellaBeach = 0xF5CA,
+
+    /// <summary>
+    /// The Font Awesome "underline" icon unicode character.
+    /// </summary>
+    Underline = 0xF0CD,
+
+    /// <summary>
+    /// The Font Awesome "undo" icon unicode character.
+    /// </summary>
+    Undo = 0xF0E2,
+
+    /// <summary>
+    /// The Font Awesome "undo-alt" icon unicode character.
+    /// </summary>
+    UndoAlt = 0xF2EA,
+
+    /// <summary>
+    /// The Font Awesome "uniregistry" icon unicode character.
+    /// </summary>
+    Uniregistry = 0xF404,
+
+    /// <summary>
+    /// The Font Awesome "unity" icon unicode character.
+    /// </summary>
+    Unity = 0xF949,
+
+    /// <summary>
+    /// The Font Awesome "universal-access" icon unicode character.
+    /// </summary>
+    UniversalAccess = 0xF29A,
+
+    /// <summary>
+    /// The Font Awesome "university" icon unicode character.
+    /// </summary>
+    University = 0xF19C,
+
+    /// <summary>
+    /// The Font Awesome "unlink" icon unicode character.
+    /// </summary>
+    Unlink = 0xF127,
+
+    /// <summary>
+    /// The Font Awesome "unlock" icon unicode character.
+    /// </summary>
+    Unlock = 0xF09C,
+
+    /// <summary>
+    /// The Font Awesome "unlock-alt" icon unicode character.
+    /// </summary>
+    UnlockAlt = 0xF13E,
+
+    /// <summary>
+    /// The Font Awesome "untappd" icon unicode character.
+    /// </summary>
+    Untappd = 0xF405,
+
+    /// <summary>
+    /// The Font Awesome "upload" icon unicode character.
+    /// </summary>
+    Upload = 0xF093,
+
+    /// <summary>
+    /// The Font Awesome "ups" icon unicode character.
+    /// </summary>
+    Ups = 0xF7E0,
+
+    /// <summary>
+    /// The Font Awesome "usb" icon unicode character.
+    /// </summary>
+    Usb = 0xF287,
+
+    /// <summary>
+    /// The Font Awesome "user" icon unicode character.
+    /// </summary>
+    User = 0xF007,
+
+    /// <summary>
+    /// The Font Awesome "user-alt" icon unicode character.
+    /// </summary>
+    UserAlt = 0xF406,
+
+    /// <summary>
+    /// The Font Awesome "user-alt-slash" icon unicode character.
+    /// </summary>
+    UserAltSlash = 0xF4FA,
+
+    /// <summary>
+    /// The Font Awesome "user-astronaut" icon unicode character.
+    /// </summary>
+    UserAstronaut = 0xF4FB,
+
+    /// <summary>
+    /// The Font Awesome "user-check" icon unicode character.
+    /// </summary>
+    UserCheck = 0xF4FC,
+
+    /// <summary>
+    /// The Font Awesome "user-circle" icon unicode character.
+    /// </summary>
+    UserCircle = 0xF2BD,
+
+    /// <summary>
+    /// The Font Awesome "user-clock" icon unicode character.
+    /// </summary>
+    UserClock = 0xF4FD,
+
+    /// <summary>
+    /// The Font Awesome "user-cog" icon unicode character.
+    /// </summary>
+    UserCog = 0xF4FE,
+
+    /// <summary>
+    /// The Font Awesome "user-edit" icon unicode character.
+    /// </summary>
+    UserEdit = 0xF4FF,
+
+    /// <summary>
+    /// The Font Awesome "user-friends" icon unicode character.
+    /// </summary>
+    UserFriends = 0xF500,
+
+    /// <summary>
+    /// The Font Awesome "user-graduate" icon unicode character.
+    /// </summary>
+    UserGraduate = 0xF501,
+
+    /// <summary>
+    /// The Font Awesome "user-injured" icon unicode character.
+    /// </summary>
+    UserInjured = 0xF728,
+
+    /// <summary>
+    /// The Font Awesome "user-lock" icon unicode character.
+    /// </summary>
+    UserLock = 0xF502,
+
+    /// <summary>
+    /// The Font Awesome "user-md" icon unicode character.
+    /// </summary>
+    UserMd = 0xF0F0,
+
+    /// <summary>
+    /// The Font Awesome "user-minus" icon unicode character.
+    /// </summary>
+    UserMinus = 0xF503,
+
+    /// <summary>
+    /// The Font Awesome "user-ninja" icon unicode character.
+    /// </summary>
+    UserNinja = 0xF504,
+
+    /// <summary>
+    /// The Font Awesome "user-nurse" icon unicode character.
+    /// </summary>
+    UserNurse = 0xF82F,
+
+    /// <summary>
+    /// The Font Awesome "user-plus" icon unicode character.
+    /// </summary>
+    UserPlus = 0xF234,
+
+    /// <summary>
+    /// The Font Awesome "users" icon unicode character.
+    /// </summary>
+    Users = 0xF0C0,
+
+    /// <summary>
+    /// The Font Awesome "users-cog" icon unicode character.
+    /// </summary>
+    UsersCog = 0xF509,
+
+    /// <summary>
+    /// The Font Awesome "user-secret" icon unicode character.
+    /// </summary>
+    UserSecret = 0xF21B,
+
+    /// <summary>
+    /// The Font Awesome "user-shield" icon unicode character.
+    /// </summary>
+    UserShield = 0xF505,
+
+    /// <summary>
+    /// The Font Awesome "user-slash" icon unicode character.
+    /// </summary>
+    UserSlash = 0xF506,
+
+    /// <summary>
+    /// The Font Awesome "user-tag" icon unicode character.
+    /// </summary>
+    UserTag = 0xF507,
+
+    /// <summary>
+    /// The Font Awesome "user-tie" icon unicode character.
+    /// </summary>
+    UserTie = 0xF508,
+
+    /// <summary>
+    /// The Font Awesome "user-times" icon unicode character.
+    /// </summary>
+    UserTimes = 0xF235,
+
+    /// <summary>
+    /// The Font Awesome "usps" icon unicode character.
+    /// </summary>
+    Usps = 0xF7E1,
+
+    /// <summary>
+    /// The Font Awesome "ussunnah" icon unicode character.
+    /// </summary>
+    Ussunnah = 0xF407,
+
+    /// <summary>
+    /// The Font Awesome "utensils" icon unicode character.
+    /// </summary>
+    Utensils = 0xF2E7,
+
+    /// <summary>
+    /// The Font Awesome "utensil-spoon" icon unicode character.
+    /// </summary>
+    UtensilSpoon = 0xF2E5,
+
+    /// <summary>
+    /// The Font Awesome "vaadin" icon unicode character.
+    /// </summary>
+    Vaadin = 0xF408,
+
+    /// <summary>
+    /// The Font Awesome "vector-square" icon unicode character.
+    /// </summary>
+    VectorSquare = 0xF5CB,
+
+    /// <summary>
+    /// The Font Awesome "venus" icon unicode character.
+    /// </summary>
+    Venus = 0xF221,
+
+    /// <summary>
+    /// The Font Awesome "venus-double" icon unicode character.
+    /// </summary>
+    VenusDouble = 0xF226,
+
+    /// <summary>
+    /// The Font Awesome "venus-mars" icon unicode character.
+    /// </summary>
+    VenusMars = 0xF228,
+
+    /// <summary>
+    /// The Font Awesome "viacoin" icon unicode character.
+    /// </summary>
+    Viacoin = 0xF237,
+
+    /// <summary>
+    /// The Font Awesome "viadeo" icon unicode character.
+    /// </summary>
+    Viadeo = 0xF2A9,
+
+    /// <summary>
+    /// The Font Awesome "viadeo-square" icon unicode character.
+    /// </summary>
+    ViadeoSquare = 0xF2AA,
+
+    /// <summary>
+    /// The Font Awesome "vial" icon unicode character.
+    /// </summary>
+    Vial = 0xF492,
+
+    /// <summary>
+    /// The Font Awesome "vials" icon unicode character.
+    /// </summary>
+    Vials = 0xF493,
+
+    /// <summary>
+    /// The Font Awesome "viber" icon unicode character.
+    /// </summary>
+    Viber = 0xF409,
+
+    /// <summary>
+    /// The Font Awesome "video" icon unicode character.
+    /// </summary>
+    Video = 0xF03D,
+
+    /// <summary>
+    /// The Font Awesome "video-slash" icon unicode character.
+    /// </summary>
+    VideoSlash = 0xF4E2,
+
+    /// <summary>
+    /// The Font Awesome "vihara" icon unicode character.
+    /// </summary>
+    Vihara = 0xF6A7,
+
+    /// <summary>
+    /// The Font Awesome "vimeo" icon unicode character.
+    /// </summary>
+    Vimeo = 0xF40A,
+
+    /// <summary>
+    /// The Font Awesome "vimeo-square" icon unicode character.
+    /// </summary>
+    VimeoSquare = 0xF194,
+
+    /// <summary>
+    /// The Font Awesome "vimeo-v" icon unicode character.
+    /// </summary>
+    VimeoV = 0xF27D,
+
+    /// <summary>
+    /// The Font Awesome "vine" icon unicode character.
+    /// </summary>
+    Vine = 0xF1CA,
+
+    /// <summary>
+    /// The Font Awesome "vk" icon unicode character.
+    /// </summary>
+    Vk = 0xF189,
+
+    /// <summary>
+    /// The Font Awesome "vnv" icon unicode character.
+    /// </summary>
+    Vnv = 0xF40B,
+
+    /// <summary>
+    /// The Font Awesome "voicemail" icon unicode character.
+    /// </summary>
+    Voicemail = 0xF897,
+
+    /// <summary>
+    /// The Font Awesome "volleyball-ball" icon unicode character.
+    /// </summary>
+    VolleyballBall = 0xF45F,
+
+    /// <summary>
+    /// The Font Awesome "volume-down" icon unicode character.
+    /// </summary>
+    VolumeDown = 0xF027,
+
+    /// <summary>
+    /// The Font Awesome "volume-mute" icon unicode character.
+    /// </summary>
+    VolumeMute = 0xF6A9,
+
+    /// <summary>
+    /// The Font Awesome "volume-off" icon unicode character.
+    /// </summary>
+    VolumeOff = 0xF026,
+
+    /// <summary>
+    /// The Font Awesome "volume-up" icon unicode character.
+    /// </summary>
+    VolumeUp = 0xF028,
+
+    /// <summary>
+    /// The Font Awesome "vote-yea" icon unicode character.
+    /// </summary>
+    VoteYea = 0xF772,
+
+    /// <summary>
+    /// The Font Awesome "vr-cardboard" icon unicode character.
+    /// </summary>
+    VrCardboard = 0xF729,
+
+    /// <summary>
+    /// The Font Awesome "vuejs" icon unicode character.
+    /// </summary>
+    Vuejs = 0xF41F,
+
+    /// <summary>
+    /// The Font Awesome "walking" icon unicode character.
+    /// </summary>
+    Walking = 0xF554,
+
+    /// <summary>
+    /// The Font Awesome "wallet" icon unicode character.
+    /// </summary>
+    Wallet = 0xF555,
+
+    /// <summary>
+    /// The Font Awesome "warehouse" icon unicode character.
+    /// </summary>
+    Warehouse = 0xF494,
+
+    /// <summary>
+    /// The Font Awesome "water" icon unicode character.
+    /// </summary>
+    Water = 0xF773,
+
+    /// <summary>
+    /// The Font Awesome "wave-square" icon unicode character.
+    /// </summary>
+    WaveSquare = 0xF83E,
+
+    /// <summary>
+    /// The Font Awesome "waze" icon unicode character.
+    /// </summary>
+    Waze = 0xF83F,
+
+    /// <summary>
+    /// The Font Awesome "weebly" icon unicode character.
+    /// </summary>
+    Weebly = 0xF5CC,
+
+    /// <summary>
+    /// The Font Awesome "weibo" icon unicode character.
+    /// </summary>
+    Weibo = 0xF18A,
+
+    /// <summary>
+    /// The Font Awesome "weight" icon unicode character.
+    /// </summary>
+    Weight = 0xF496,
+
+    /// <summary>
+    /// The Font Awesome "weight-hanging" icon unicode character.
+    /// </summary>
+    WeightHanging = 0xF5CD,
+
+    /// <summary>
+    /// The Font Awesome "weixin" icon unicode character.
+    /// </summary>
+    Weixin = 0xF1D7,
+
+    /// <summary>
+    /// The Font Awesome "whatsapp" icon unicode character.
+    /// </summary>
+    Whatsapp = 0xF232,
+
+    /// <summary>
+    /// The Font Awesome "whatsapp-square" icon unicode character.
+    /// </summary>
+    WhatsappSquare = 0xF40C,
+
+    /// <summary>
+    /// The Font Awesome "wheelchair" icon unicode character.
+    /// </summary>
+    Wheelchair = 0xF193,
+
+    /// <summary>
+    /// The Font Awesome "whmcs" icon unicode character.
+    /// </summary>
+    Whmcs = 0xF40D,
+
+    /// <summary>
+    /// The Font Awesome "wifi" icon unicode character.
+    /// </summary>
+    Wifi = 0xF1EB,
+
+    /// <summary>
+    /// The Font Awesome "wikipedia-w" icon unicode character.
+    /// </summary>
+    WikipediaW = 0xF266,
+
+    /// <summary>
+    /// The Font Awesome "wind" icon unicode character.
+    /// </summary>
+    Wind = 0xF72E,
+
+    /// <summary>
+    /// The Font Awesome "window-close" icon unicode character.
+    /// </summary>
+    WindowClose = 0xF410,
+
+    /// <summary>
+    /// The Font Awesome "window-maximize" icon unicode character.
+    /// </summary>
+    WindowMaximize = 0xF2D0,
+
+    /// <summary>
+    /// The Font Awesome "window-minimize" icon unicode character.
+    /// </summary>
+    WindowMinimize = 0xF2D1,
+
+    /// <summary>
+    /// The Font Awesome "window-restore" icon unicode character.
+    /// </summary>
+    WindowRestore = 0xF2D2,
+
+    /// <summary>
+    /// The Font Awesome "windows" icon unicode character.
+    /// </summary>
+    Windows = 0xF17A,
+
+    /// <summary>
+    /// The Font Awesome "wine-bottle" icon unicode character.
+    /// </summary>
+    WineBottle = 0xF72F,
+
+    /// <summary>
+    /// The Font Awesome "wine-glass" icon unicode character.
+    /// </summary>
+    WineGlass = 0xF4E3,
+
+    /// <summary>
+    /// The Font Awesome "wine-glass-alt" icon unicode character.
+    /// </summary>
+    WineGlassAlt = 0xF5CE,
+
+    /// <summary>
+    /// The Font Awesome "wix" icon unicode character.
+    /// </summary>
+    Wix = 0xF5CF,
+
+    /// <summary>
+    /// The Font Awesome "wizards-of-the-coast" icon unicode character.
+    /// </summary>
+    WizardsOfTheCoast = 0xF730,
+
+    /// <summary>
+    /// The Font Awesome "wolf-pack-battalion" icon unicode character.
+    /// </summary>
+    WolfPackBattalion = 0xF514,
+
+    /// <summary>
+    /// The Font Awesome "won-sign" icon unicode character.
+    /// </summary>
+    WonSign = 0xF159,
+
+    /// <summary>
+    /// The Font Awesome "wordpress" icon unicode character.
+    /// </summary>
+    Wordpress = 0xF19A,
+
+    /// <summary>
+    /// The Font Awesome "wordpress-simple" icon unicode character.
+    /// </summary>
+    WordpressSimple = 0xF411,
+
+    /// <summary>
+    /// The Font Awesome "wpbeginner" icon unicode character.
+    /// </summary>
+    Wpbeginner = 0xF297,
+
+    /// <summary>
+    /// The Font Awesome "wpexplorer" icon unicode character.
+    /// </summary>
+    Wpexplorer = 0xF2DE,
+
+    /// <summary>
+    /// The Font Awesome "wpforms" icon unicode character.
+    /// </summary>
+    Wpforms = 0xF298,
+
+    /// <summary>
+    /// The Font Awesome "wpressr" icon unicode character.
+    /// </summary>
+    Wpressr = 0xF3E4,
+
+    /// <summary>
+    /// The Font Awesome "wrench" icon unicode character.
+    /// </summary>
+    Wrench = 0xF0AD,
+
+    /// <summary>
+    /// The Font Awesome "xbox" icon unicode character.
+    /// </summary>
+    Xbox = 0xF412,
+
+    /// <summary>
+    /// The Font Awesome "xing" icon unicode character.
+    /// </summary>
+    Xing = 0xF168,
+
+    /// <summary>
+    /// The Font Awesome "xing-square" icon unicode character.
+    /// </summary>
+    XingSquare = 0xF169,
+
+    /// <summary>
+    /// The Font Awesome "x-ray" icon unicode character.
+    /// </summary>
+    XRay = 0xF497,
+
+    /// <summary>
+    /// The Font Awesome "yahoo" icon unicode character.
+    /// </summary>
+    Yahoo = 0xF19E,
+
+    /// <summary>
+    /// The Font Awesome "yammer" icon unicode character.
+    /// </summary>
+    Yammer = 0xF840,
+
+    /// <summary>
+    /// The Font Awesome "yandex" icon unicode character.
+    /// </summary>
+    Yandex = 0xF413,
+
+    /// <summary>
+    /// The Font Awesome "yandex-international" icon unicode character.
+    /// </summary>
+    YandexInternational = 0xF414,
+
+    /// <summary>
+    /// The Font Awesome "yarn" icon unicode character.
+    /// </summary>
+    Yarn = 0xF7E3,
+
+    /// <summary>
+    /// The Font Awesome "y-combinator" icon unicode character.
+    /// </summary>
+    YCombinator = 0xF23B,
+
+    /// <summary>
+    /// The Font Awesome "yelp" icon unicode character.
+    /// </summary>
+    Yelp = 0xF1E9,
+
+    /// <summary>
+    /// The Font Awesome "yen-sign" icon unicode character.
+    /// </summary>
+    YenSign = 0xF157,
+
+    /// <summary>
+    /// The Font Awesome "yin-yang" icon unicode character.
+    /// </summary>
+    YinYang = 0xF6AD,
+
+    /// <summary>
+    /// The Font Awesome "yoast" icon unicode character.
+    /// </summary>
+    Yoast = 0xF2B1,
+
+    /// <summary>
+    /// The Font Awesome "youtube" icon unicode character.
+    /// </summary>
+    Youtube = 0xF167,
+
+    /// <summary>
+    /// The Font Awesome "youtube-square" icon unicode character.
+    /// </summary>
+    YoutubeSquare = 0xF431,
+
+    /// <summary>
+    /// The Font Awesome "zhihu" icon unicode character.
+    /// </summary>
+    Zhihu = 0xF63F,
 }
diff --git a/Dalamud/Interface/GameFonts/FdtReader.cs b/Dalamud/Interface/GameFonts/FdtReader.cs
index 167cacf2d..a68caba94 100644
--- a/Dalamud/Interface/GameFonts/FdtReader.cs
+++ b/Dalamud/Interface/GameFonts/FdtReader.cs
@@ -2,426 +2,425 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace Dalamud.Interface.GameFonts
+namespace Dalamud.Interface.GameFonts;
+
+/// <summary>
+/// Parses a game font file.
+/// </summary>
+public class FdtReader
 {
     /// <summary>
-    /// Parses a game font file.
+    /// Initializes a new instance of the <see cref="FdtReader"/> class.
     /// </summary>
-    public class FdtReader
+    /// <param name="data">Content of a FDT file.</param>
+    public FdtReader(byte[] data)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FdtReader"/> class.
-        /// </summary>
-        /// <param name="data">Content of a FDT file.</param>
-        public FdtReader(byte[] data)
-        {
-            this.FileHeader = StructureFromByteArray<FdtHeader>(data, 0);
-            this.FontHeader = StructureFromByteArray<FontTableHeader>(data, this.FileHeader.FontTableHeaderOffset);
-            this.KerningHeader = StructureFromByteArray<KerningTableHeader>(data, this.FileHeader.KerningTableHeaderOffset);
+        this.FileHeader = StructureFromByteArray<FdtHeader>(data, 0);
+        this.FontHeader = StructureFromByteArray<FontTableHeader>(data, this.FileHeader.FontTableHeaderOffset);
+        this.KerningHeader = StructureFromByteArray<KerningTableHeader>(data, this.FileHeader.KerningTableHeaderOffset);
 
-            for (var i = 0; i < this.FontHeader.FontTableEntryCount; i++)
-                this.Glyphs.Add(StructureFromByteArray<FontTableEntry>(data, this.FileHeader.FontTableHeaderOffset + Marshal.SizeOf<FontTableHeader>() + (Marshal.SizeOf<FontTableEntry>() * i)));
+        for (var i = 0; i < this.FontHeader.FontTableEntryCount; i++)
+            this.Glyphs.Add(StructureFromByteArray<FontTableEntry>(data, this.FileHeader.FontTableHeaderOffset + Marshal.SizeOf<FontTableHeader>() + (Marshal.SizeOf<FontTableEntry>() * i)));
 
-            for (int i = 0, i_ = Math.Min(this.FontHeader.KerningTableEntryCount, this.KerningHeader.Count); i < i_; i++)
-                this.Distances.Add(StructureFromByteArray<KerningTableEntry>(data, this.FileHeader.KerningTableHeaderOffset + Marshal.SizeOf<KerningTableHeader>() + (Marshal.SizeOf<KerningTableEntry>() * i)));
-        }
+        for (int i = 0, i_ = Math.Min(this.FontHeader.KerningTableEntryCount, this.KerningHeader.Count); i < i_; i++)
+            this.Distances.Add(StructureFromByteArray<KerningTableEntry>(data, this.FileHeader.KerningTableHeaderOffset + Marshal.SizeOf<KerningTableHeader>() + (Marshal.SizeOf<KerningTableEntry>() * i)));
+    }
 
-        /// <summary>
-        /// Gets the header of this file.
-        /// </summary>
-        public FdtHeader FileHeader { get; init; }
+    /// <summary>
+    /// Gets the header of this file.
+    /// </summary>
+    public FdtHeader FileHeader { get; init; }
 
-        /// <summary>
-        /// Gets the font header of this file.
-        /// </summary>
-        public FontTableHeader FontHeader { get; init; }
+    /// <summary>
+    /// Gets the font header of this file.
+    /// </summary>
+    public FontTableHeader FontHeader { get; init; }
 
-        /// <summary>
-        /// Gets the kerning table header of this file.
-        /// </summary>
-        public KerningTableHeader KerningHeader { get; init; }
+    /// <summary>
+    /// Gets the kerning table header of this file.
+    /// </summary>
+    public KerningTableHeader KerningHeader { get; init; }
 
-        /// <summary>
-        /// Gets all the glyphs defined in this file.
-        /// </summary>
-        public List<FontTableEntry> Glyphs { get; init; } = new();
+    /// <summary>
+    /// Gets all the glyphs defined in this file.
+    /// </summary>
+    public List<FontTableEntry> Glyphs { get; init; } = new();
 
-        /// <summary>
-        /// Gets all the kerning entries defined in this file.
-        /// </summary>
-        public List<KerningTableEntry> Distances { get; init; } = new();
+    /// <summary>
+    /// Gets all the kerning entries defined in this file.
+    /// </summary>
+    public List<KerningTableEntry> Distances { get; init; } = new();
 
-        /// <summary>
-        /// Finds glyph definition for corresponding codepoint.
-        /// </summary>
-        /// <param name="codepoint">Unicode codepoint (UTF-32 value).</param>
-        /// <returns>Corresponding FontTableEntry, or null if not found.</returns>
-        public FontTableEntry? FindGlyph(int codepoint)
-        {
-            var i = this.Glyphs.BinarySearch(new FontTableEntry { CharUtf8 = CodePointToUtf8Int32(codepoint) });
-            if (i < 0 || i == this.Glyphs.Count)
-                return null;
-            return this.Glyphs[i];
-        }
+    /// <summary>
+    /// Finds glyph definition for corresponding codepoint.
+    /// </summary>
+    /// <param name="codepoint">Unicode codepoint (UTF-32 value).</param>
+    /// <returns>Corresponding FontTableEntry, or null if not found.</returns>
+    public FontTableEntry? FindGlyph(int codepoint)
+    {
+        var i = this.Glyphs.BinarySearch(new FontTableEntry { CharUtf8 = CodePointToUtf8Int32(codepoint) });
+        if (i < 0 || i == this.Glyphs.Count)
+            return null;
+        return this.Glyphs[i];
+    }
 
-        /// <summary>
-        /// Returns glyph definition for corresponding codepoint.
-        /// </summary>
-        /// <param name="codepoint">Unicode codepoint (UTF-32 value).</param>
-        /// <returns>Corresponding FontTableEntry, or that of a fallback character.</returns>
-        public FontTableEntry GetGlyph(int codepoint)
-        {
-            return (this.FindGlyph(codepoint)
+    /// <summary>
+    /// Returns glyph definition for corresponding codepoint.
+    /// </summary>
+    /// <param name="codepoint">Unicode codepoint (UTF-32 value).</param>
+    /// <returns>Corresponding FontTableEntry, or that of a fallback character.</returns>
+    public FontTableEntry GetGlyph(int codepoint)
+    {
+        return (this.FindGlyph(codepoint)
                 ?? this.FindGlyph('〓')
                 ?? this.FindGlyph('?')
                 ?? this.FindGlyph('='))!.Value;
+    }
+
+    /// <summary>
+    /// Returns distance adjustment between two adjacent characters.
+    /// </summary>
+    /// <param name="codepoint1">Left character.</param>
+    /// <param name="codepoint2">Right character.</param>
+    /// <returns>Supposed distance adjustment between given characters.</returns>
+    public int GetDistance(int codepoint1, int codepoint2)
+    {
+        var i = this.Distances.BinarySearch(new KerningTableEntry { LeftUtf8 = CodePointToUtf8Int32(codepoint1), RightUtf8 = CodePointToUtf8Int32(codepoint2) });
+        if (i < 0 || i == this.Distances.Count)
+            return 0;
+        return this.Distances[i].RightOffset;
+    }
+
+    private static unsafe T StructureFromByteArray<T>(byte[] data, int offset)
+    {
+        var len = Marshal.SizeOf<T>();
+        if (offset + len > data.Length)
+            throw new Exception("Data too short");
+
+        fixed (byte* ptr = data)
+            return Marshal.PtrToStructure<T>(new(ptr + offset));
+    }
+
+    private static int CodePointToUtf8Int32(int codepoint)
+    {
+        if (codepoint <= 0x7F)
+        {
+            return codepoint;
         }
+        else if (codepoint <= 0x7FF)
+        {
+            return ((0xC0 | (codepoint >> 6)) << 8)
+                   | ((0x80 | ((codepoint >> 0) & 0x3F)) << 0);
+        }
+        else if (codepoint <= 0xFFFF)
+        {
+            return ((0xE0 | (codepoint >> 12)) << 16)
+                   | ((0x80 | ((codepoint >> 6) & 0x3F)) << 8)
+                   | ((0x80 | ((codepoint >> 0) & 0x3F)) << 0);
+        }
+        else if (codepoint <= 0x10FFFF)
+        {
+            return ((0xF0 | (codepoint >> 18)) << 24)
+                   | ((0x80 | ((codepoint >> 12) & 0x3F)) << 16)
+                   | ((0x80 | ((codepoint >> 6) & 0x3F)) << 8)
+                   | ((0x80 | ((codepoint >> 0) & 0x3F)) << 0);
+        }
+        else
+        {
+            return 0xFFFE;
+        }
+    }
+
+    private static int Utf8Uint32ToCodePoint(int n)
+    {
+        if ((n & 0xFFFFFF80) == 0)
+        {
+            return n & 0x7F;
+        }
+        else if ((n & 0xFFFFE0C0) == 0xC080)
+        {
+            return
+                (((n >> 0x08) & 0x1F) << 6) |
+                (((n >> 0x00) & 0x3F) << 0);
+        }
+        else if ((n & 0xF0C0C0) == 0xE08080)
+        {
+            return
+                (((n >> 0x10) & 0x0F) << 12) |
+                (((n >> 0x08) & 0x3F) << 6) |
+                (((n >> 0x00) & 0x3F) << 0);
+        }
+        else if ((n & 0xF8C0C0C0) == 0xF0808080)
+        {
+            return
+                (((n >> 0x18) & 0x07) << 18) |
+                (((n >> 0x10) & 0x3F) << 12) |
+                (((n >> 0x08) & 0x3F) << 6) |
+                (((n >> 0x00) & 0x3F) << 0);
+        }
+        else
+        {
+            return 0xFFFF; // Guaranteed non-unicode
+        }
+    }
+
+    /// <summary>
+    /// Header of game font file format.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct FdtHeader
+    {
+        /// <summary>
+        /// Signature: "fcsv".
+        /// </summary>
+        public fixed byte Signature[8];
 
         /// <summary>
-        /// Returns distance adjustment between two adjacent characters.
+        /// Offset to FontTableHeader.
         /// </summary>
-        /// <param name="codepoint1">Left character.</param>
-        /// <param name="codepoint2">Right character.</param>
-        /// <returns>Supposed distance adjustment between given characters.</returns>
-        public int GetDistance(int codepoint1, int codepoint2)
+        public int FontTableHeaderOffset;
+
+        /// <summary>
+        /// Offset to KerningTableHeader.
+        /// </summary>
+        public int KerningTableHeaderOffset;
+
+        /// <summary>
+        /// Unused/unknown.
+        /// </summary>
+        public fixed byte Padding[0x10];
+    }
+
+    /// <summary>
+    /// Header of glyph table.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct FontTableHeader
+    {
+        /// <summary>
+        /// Signature: "fthd".
+        /// </summary>
+        public fixed byte Signature[4];
+
+        /// <summary>
+        /// Number of glyphs defined in this file.
+        /// </summary>
+        public int FontTableEntryCount;
+
+        /// <summary>
+        /// Number of kerning informations defined in this file.
+        /// </summary>
+        public int KerningTableEntryCount;
+
+        /// <summary>
+        /// Unused/unknown.
+        /// </summary>
+        public fixed byte Padding[0x04];
+
+        /// <summary>
+        /// Width of backing texture.
+        /// </summary>
+        public ushort TextureWidth;
+
+        /// <summary>
+        /// Height of backing texture.
+        /// </summary>
+        public ushort TextureHeight;
+
+        /// <summary>
+        /// Size of the font defined from this file, in points unit.
+        /// </summary>
+        public float Size;
+
+        /// <summary>
+        /// Line height of the font defined forom this file, in pixels unit.
+        /// </summary>
+        public int LineHeight;
+
+        /// <summary>
+        /// Ascent of the font defined from this file, in pixels unit.
+        /// </summary>
+        public int Ascent;
+
+        /// <summary>
+        /// Gets descent of the font defined from this file, in pixels unit.
+        /// </summary>
+        public int Descent => this.LineHeight - this.Ascent;
+    }
+
+    /// <summary>
+    /// Glyph table entry.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct FontTableEntry : IComparable<FontTableEntry>
+    {
+        /// <summary>
+        /// Mapping of texture channel index to byte index.
+        /// </summary>
+        public static readonly int[] TextureChannelOrder = { 2, 1, 0, 3 };
+
+        /// <summary>
+        /// Integer representation of a Unicode character in UTF-8 in reverse order, read in little endian.
+        /// </summary>
+        public int CharUtf8;
+
+        /// <summary>
+        /// Integer representation of a Shift_JIS character in reverse order, read in little endian.
+        /// </summary>
+        public ushort CharSjis;
+
+        /// <summary>
+        /// Index of backing texture.
+        /// </summary>
+        public ushort TextureIndex;
+
+        /// <summary>
+        /// Horizontal offset of glyph image in the backing texture.
+        /// </summary>
+        public ushort TextureOffsetX;
+
+        /// <summary>
+        /// Vertical offset of glyph image in the backing texture.
+        /// </summary>
+        public ushort TextureOffsetY;
+
+        /// <summary>
+        /// Bounding width of this glyph.
+        /// </summary>
+        public byte BoundingWidth;
+
+        /// <summary>
+        /// Bounding height of this glyph.
+        /// </summary>
+        public byte BoundingHeight;
+
+        /// <summary>
+        /// Distance adjustment for drawing next character.
+        /// </summary>
+        public sbyte NextOffsetX;
+
+        /// <summary>
+        /// Distance adjustment for drawing current character.
+        /// </summary>
+        public sbyte CurrentOffsetY;
+
+        /// <summary>
+        /// Gets the index of the file among all the backing texture files.
+        /// </summary>
+        public int TextureFileIndex => this.TextureIndex / 4;
+
+        /// <summary>
+        /// Gets the channel index in the backing texture file.
+        /// </summary>
+        public int TextureChannelIndex => this.TextureIndex % 4;
+
+        /// <summary>
+        /// Gets the byte index in a multichannel pixel corresponding to the channel.
+        /// </summary>
+        public int TextureChannelByteIndex => TextureChannelOrder[this.TextureChannelIndex];
+
+        /// <summary>
+        /// Gets the advance width of this character.
+        /// </summary>
+        public int AdvanceWidth => this.BoundingWidth + this.NextOffsetX;
+
+        /// <summary>
+        /// Gets the Unicode codepoint of the character for this entry in int type.
+        /// </summary>
+        public int CharInt => Utf8Uint32ToCodePoint(this.CharUtf8);
+
+        /// <summary>
+        /// Gets the Unicode codepoint of the character for this entry in char type.
+        /// </summary>
+        public char Char => (char)Utf8Uint32ToCodePoint(this.CharUtf8);
+
+        /// <inheritdoc/>
+        public int CompareTo(FontTableEntry other)
         {
-            var i = this.Distances.BinarySearch(new KerningTableEntry { LeftUtf8 = CodePointToUtf8Int32(codepoint1), RightUtf8 = CodePointToUtf8Int32(codepoint2) });
-            if (i < 0 || i == this.Distances.Count)
-                return 0;
-            return this.Distances[i].RightOffset;
+            return this.CharUtf8 - other.CharUtf8;
         }
+    }
 
-        private static unsafe T StructureFromByteArray<T>(byte[] data, int offset)
+    /// <summary>
+    /// Header of kerning table.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct KerningTableHeader
+    {
+        /// <summary>
+        /// Signature: "knhd".
+        /// </summary>
+        public fixed byte Signature[4];
+
+        /// <summary>
+        /// Number of kerning entries in this table.
+        /// </summary>
+        public int Count;
+
+        /// <summary>
+        /// Unused/unknown.
+        /// </summary>
+        public fixed byte Padding[0x08];
+    }
+
+    /// <summary>
+    /// Kerning table entry.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct KerningTableEntry : IComparable<KerningTableEntry>
+    {
+        /// <summary>
+        /// Integer representation of a Unicode character in UTF-8 in reverse order, read in little endian, for the left character.
+        /// </summary>
+        public int LeftUtf8;
+
+        /// <summary>
+        /// Integer representation of a Unicode character in UTF-8 in reverse order, read in little endian, for the right character.
+        /// </summary>
+        public int RightUtf8;
+
+        /// <summary>
+        /// Integer representation of a Shift_JIS character in reverse order, read in little endian, for the left character.
+        /// </summary>
+        public ushort LeftSjis;
+
+        /// <summary>
+        /// Integer representation of a Shift_JIS character in reverse order, read in little endian, for the right character.
+        /// </summary>
+        public ushort RightSjis;
+
+        /// <summary>
+        /// Horizontal offset adjustment for the right character.
+        /// </summary>
+        public int RightOffset;
+
+        /// <summary>
+        /// Gets the Unicode codepoint of the character for this entry in int type.
+        /// </summary>
+        public int LeftInt => Utf8Uint32ToCodePoint(this.LeftUtf8);
+
+        /// <summary>
+        /// Gets the Unicode codepoint of the character for this entry in char type.
+        /// </summary>
+        public char Left => (char)Utf8Uint32ToCodePoint(this.LeftUtf8);
+
+        /// <summary>
+        /// Gets the Unicode codepoint of the character for this entry in int type.
+        /// </summary>
+        public int RightInt => Utf8Uint32ToCodePoint(this.RightUtf8);
+
+        /// <summary>
+        /// Gets the Unicode codepoint of the character for this entry in char type.
+        /// </summary>
+        public char Right => (char)Utf8Uint32ToCodePoint(this.RightUtf8);
+
+        /// <inheritdoc/>
+        public int CompareTo(KerningTableEntry other)
         {
-            var len = Marshal.SizeOf<T>();
-            if (offset + len > data.Length)
-                throw new Exception("Data too short");
-
-            fixed (byte* ptr = data)
-                return Marshal.PtrToStructure<T>(new(ptr + offset));
-        }
-
-        private static int CodePointToUtf8Int32(int codepoint)
-        {
-            if (codepoint <= 0x7F)
-            {
-                return codepoint;
-            }
-            else if (codepoint <= 0x7FF)
-            {
-                return ((0xC0 | (codepoint >> 6)) << 8)
-                    | ((0x80 | ((codepoint >> 0) & 0x3F)) << 0);
-            }
-            else if (codepoint <= 0xFFFF)
-            {
-                return ((0xE0 | (codepoint >> 12)) << 16)
-                    | ((0x80 | ((codepoint >> 6) & 0x3F)) << 8)
-                    | ((0x80 | ((codepoint >> 0) & 0x3F)) << 0);
-            }
-            else if (codepoint <= 0x10FFFF)
-            {
-                return ((0xF0 | (codepoint >> 18)) << 24)
-                    | ((0x80 | ((codepoint >> 12) & 0x3F)) << 16)
-                    | ((0x80 | ((codepoint >> 6) & 0x3F)) << 8)
-                    | ((0x80 | ((codepoint >> 0) & 0x3F)) << 0);
-            }
+            if (this.LeftUtf8 == other.LeftUtf8)
+                return this.RightUtf8 - other.RightUtf8;
             else
-            {
-                return 0xFFFE;
-            }
-        }
-
-        private static int Utf8Uint32ToCodePoint(int n)
-        {
-            if ((n & 0xFFFFFF80) == 0)
-            {
-                return n & 0x7F;
-            }
-            else if ((n & 0xFFFFE0C0) == 0xC080)
-            {
-                return
-                    (((n >> 0x08) & 0x1F) << 6) |
-                    (((n >> 0x00) & 0x3F) << 0);
-            }
-            else if ((n & 0xF0C0C0) == 0xE08080)
-            {
-                return
-                    (((n >> 0x10) & 0x0F) << 12) |
-                    (((n >> 0x08) & 0x3F) << 6) |
-                    (((n >> 0x00) & 0x3F) << 0);
-            }
-            else if ((n & 0xF8C0C0C0) == 0xF0808080)
-            {
-                return
-                    (((n >> 0x18) & 0x07) << 18) |
-                    (((n >> 0x10) & 0x3F) << 12) |
-                    (((n >> 0x08) & 0x3F) << 6) |
-                    (((n >> 0x00) & 0x3F) << 0);
-            }
-            else
-            {
-                return 0xFFFF;  // Guaranteed non-unicode
-            }
-        }
-
-        /// <summary>
-        /// Header of game font file format.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public unsafe struct FdtHeader
-        {
-            /// <summary>
-            /// Signature: "fcsv".
-            /// </summary>
-            public fixed byte Signature[8];
-
-            /// <summary>
-            /// Offset to FontTableHeader.
-            /// </summary>
-            public int FontTableHeaderOffset;
-
-            /// <summary>
-            /// Offset to KerningTableHeader.
-            /// </summary>
-            public int KerningTableHeaderOffset;
-
-            /// <summary>
-            /// Unused/unknown.
-            /// </summary>
-            public fixed byte Padding[0x10];
-        }
-
-        /// <summary>
-        /// Header of glyph table.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public unsafe struct FontTableHeader
-        {
-            /// <summary>
-            /// Signature: "fthd".
-            /// </summary>
-            public fixed byte Signature[4];
-
-            /// <summary>
-            /// Number of glyphs defined in this file.
-            /// </summary>
-            public int FontTableEntryCount;
-
-            /// <summary>
-            /// Number of kerning informations defined in this file.
-            /// </summary>
-            public int KerningTableEntryCount;
-
-            /// <summary>
-            /// Unused/unknown.
-            /// </summary>
-            public fixed byte Padding[0x04];
-
-            /// <summary>
-            /// Width of backing texture.
-            /// </summary>
-            public ushort TextureWidth;
-
-            /// <summary>
-            /// Height of backing texture.
-            /// </summary>
-            public ushort TextureHeight;
-
-            /// <summary>
-            /// Size of the font defined from this file, in points unit.
-            /// </summary>
-            public float Size;
-
-            /// <summary>
-            /// Line height of the font defined forom this file, in pixels unit.
-            /// </summary>
-            public int LineHeight;
-
-            /// <summary>
-            /// Ascent of the font defined from this file, in pixels unit.
-            /// </summary>
-            public int Ascent;
-
-            /// <summary>
-            /// Gets descent of the font defined from this file, in pixels unit.
-            /// </summary>
-            public int Descent => this.LineHeight - this.Ascent;
-        }
-
-        /// <summary>
-        /// Glyph table entry.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public unsafe struct FontTableEntry : IComparable<FontTableEntry>
-        {
-            /// <summary>
-            /// Mapping of texture channel index to byte index.
-            /// </summary>
-            public static readonly int[] TextureChannelOrder = { 2, 1, 0, 3 };
-
-            /// <summary>
-            /// Integer representation of a Unicode character in UTF-8 in reverse order, read in little endian.
-            /// </summary>
-            public int CharUtf8;
-
-            /// <summary>
-            /// Integer representation of a Shift_JIS character in reverse order, read in little endian.
-            /// </summary>
-            public ushort CharSjis;
-
-            /// <summary>
-            /// Index of backing texture.
-            /// </summary>
-            public ushort TextureIndex;
-
-            /// <summary>
-            /// Horizontal offset of glyph image in the backing texture.
-            /// </summary>
-            public ushort TextureOffsetX;
-
-            /// <summary>
-            /// Vertical offset of glyph image in the backing texture.
-            /// </summary>
-            public ushort TextureOffsetY;
-
-            /// <summary>
-            /// Bounding width of this glyph.
-            /// </summary>
-            public byte BoundingWidth;
-
-            /// <summary>
-            /// Bounding height of this glyph.
-            /// </summary>
-            public byte BoundingHeight;
-
-            /// <summary>
-            /// Distance adjustment for drawing next character.
-            /// </summary>
-            public sbyte NextOffsetX;
-
-            /// <summary>
-            /// Distance adjustment for drawing current character.
-            /// </summary>
-            public sbyte CurrentOffsetY;
-
-            /// <summary>
-            /// Gets the index of the file among all the backing texture files.
-            /// </summary>
-            public int TextureFileIndex => this.TextureIndex / 4;
-
-            /// <summary>
-            /// Gets the channel index in the backing texture file.
-            /// </summary>
-            public int TextureChannelIndex => this.TextureIndex % 4;
-
-            /// <summary>
-            /// Gets the byte index in a multichannel pixel corresponding to the channel.
-            /// </summary>
-            public int TextureChannelByteIndex => TextureChannelOrder[this.TextureChannelIndex];
-
-            /// <summary>
-            /// Gets the advance width of this character.
-            /// </summary>
-            public int AdvanceWidth => this.BoundingWidth + this.NextOffsetX;
-
-            /// <summary>
-            /// Gets the Unicode codepoint of the character for this entry in int type.
-            /// </summary>
-            public int CharInt => Utf8Uint32ToCodePoint(this.CharUtf8);
-
-            /// <summary>
-            /// Gets the Unicode codepoint of the character for this entry in char type.
-            /// </summary>
-            public char Char => (char)Utf8Uint32ToCodePoint(this.CharUtf8);
-
-            /// <inheritdoc/>
-            public int CompareTo(FontTableEntry other)
-            {
-                return this.CharUtf8 - other.CharUtf8;
-            }
-        }
-
-        /// <summary>
-        /// Header of kerning table.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public unsafe struct KerningTableHeader
-        {
-            /// <summary>
-            /// Signature: "knhd".
-            /// </summary>
-            public fixed byte Signature[4];
-
-            /// <summary>
-            /// Number of kerning entries in this table.
-            /// </summary>
-            public int Count;
-
-            /// <summary>
-            /// Unused/unknown.
-            /// </summary>
-            public fixed byte Padding[0x08];
-        }
-
-        /// <summary>
-        /// Kerning table entry.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public unsafe struct KerningTableEntry : IComparable<KerningTableEntry>
-        {
-            /// <summary>
-            /// Integer representation of a Unicode character in UTF-8 in reverse order, read in little endian, for the left character.
-            /// </summary>
-            public int LeftUtf8;
-
-            /// <summary>
-            /// Integer representation of a Unicode character in UTF-8 in reverse order, read in little endian, for the right character.
-            /// </summary>
-            public int RightUtf8;
-
-            /// <summary>
-            /// Integer representation of a Shift_JIS character in reverse order, read in little endian, for the left character.
-            /// </summary>
-            public ushort LeftSjis;
-
-            /// <summary>
-            /// Integer representation of a Shift_JIS character in reverse order, read in little endian, for the right character.
-            /// </summary>
-            public ushort RightSjis;
-
-            /// <summary>
-            /// Horizontal offset adjustment for the right character.
-            /// </summary>
-            public int RightOffset;
-
-            /// <summary>
-            /// Gets the Unicode codepoint of the character for this entry in int type.
-            /// </summary>
-            public int LeftInt => Utf8Uint32ToCodePoint(this.LeftUtf8);
-
-            /// <summary>
-            /// Gets the Unicode codepoint of the character for this entry in char type.
-            /// </summary>
-            public char Left => (char)Utf8Uint32ToCodePoint(this.LeftUtf8);
-
-            /// <summary>
-            /// Gets the Unicode codepoint of the character for this entry in int type.
-            /// </summary>
-            public int RightInt => Utf8Uint32ToCodePoint(this.RightUtf8);
-
-            /// <summary>
-            /// Gets the Unicode codepoint of the character for this entry in char type.
-            /// </summary>
-            public char Right => (char)Utf8Uint32ToCodePoint(this.RightUtf8);
-
-            /// <inheritdoc/>
-            public int CompareTo(KerningTableEntry other)
-            {
-                if (this.LeftUtf8 == other.LeftUtf8)
-                    return this.RightUtf8 - other.RightUtf8;
-                else
-                    return this.LeftUtf8 - other.LeftUtf8;
-            }
+                return this.LeftUtf8 - other.LeftUtf8;
         }
     }
 }
diff --git a/Dalamud/Interface/GameFonts/GameFontFamily.cs b/Dalamud/Interface/GameFonts/GameFontFamily.cs
index cb3e84a59..7f5f9a2cc 100644
--- a/Dalamud/Interface/GameFonts/GameFontFamily.cs
+++ b/Dalamud/Interface/GameFonts/GameFontFamily.cs
@@ -1,43 +1,42 @@
-namespace Dalamud.Interface.GameFonts
+namespace Dalamud.Interface.GameFonts;
+
+/// <summary>
+/// Enum of available game font families.
+/// </summary>
+public enum GameFontFamily
 {
     /// <summary>
-    /// Enum of available game font families.
+    /// Placeholder meaning unused.
     /// </summary>
-    public enum GameFontFamily
-    {
-        /// <summary>
-        /// Placeholder meaning unused.
-        /// </summary>
-        Undefined,
+    Undefined,
 
-        /// <summary>
-        /// Sans-serif fonts used for the whole UI. Contains Japanese characters in addition to Latin characters.
-        /// </summary>
-        Axis,
+    /// <summary>
+    /// Sans-serif fonts used for the whole UI. Contains Japanese characters in addition to Latin characters.
+    /// </summary>
+    Axis,
 
-        /// <summary>
-        /// Serif fonts used for job names. Contains Latin characters.
-        /// </summary>
-        Jupiter,
+    /// <summary>
+    /// Serif fonts used for job names. Contains Latin characters.
+    /// </summary>
+    Jupiter,
 
-        /// <summary>
-        /// Digit-only serif fonts used for flying texts. Contains numbers.
-        /// </summary>
-        JupiterNumeric,
+    /// <summary>
+    /// Digit-only serif fonts used for flying texts. Contains numbers.
+    /// </summary>
+    JupiterNumeric,
 
-        /// <summary>
-        /// Digit-only sans-serif horizontally wide fonts used for HP/MP/IL numbers.
-        /// </summary>
-        Meidinger,
+    /// <summary>
+    /// Digit-only sans-serif horizontally wide fonts used for HP/MP/IL numbers.
+    /// </summary>
+    Meidinger,
 
-        /// <summary>
-        /// Sans-serif horizontally wide font used for names of gauges. Contains Latin characters.
-        /// </summary>
-        MiedingerMid,
+    /// <summary>
+    /// Sans-serif horizontally wide font used for names of gauges. Contains Latin characters.
+    /// </summary>
+    MiedingerMid,
 
-        /// <summary>
-        /// Sans-serif horizontally narrow font used for addon titles. Contains Latin characters.
-        /// </summary>
-        TrumpGothic,
-    }
+    /// <summary>
+    /// Sans-serif horizontally narrow font used for addon titles. Contains Latin characters.
+    /// </summary>
+    TrumpGothic,
 }
diff --git a/Dalamud/Interface/GameFonts/GameFontFamilyAndSize.cs b/Dalamud/Interface/GameFonts/GameFontFamilyAndSize.cs
index 1cbdf210f..dd78baf87 100644
--- a/Dalamud/Interface/GameFonts/GameFontFamilyAndSize.cs
+++ b/Dalamud/Interface/GameFonts/GameFontFamilyAndSize.cs
@@ -1,174 +1,173 @@
-namespace Dalamud.Interface.GameFonts
+namespace Dalamud.Interface.GameFonts;
+
+/// <summary>
+/// Enum of available game fonts in specific sizes.
+/// </summary>
+public enum GameFontFamilyAndSize : int
 {
     /// <summary>
-    /// Enum of available game fonts in specific sizes.
+    /// Placeholder meaning unused.
     /// </summary>
-    public enum GameFontFamilyAndSize : int
-    {
-        /// <summary>
-        /// Placeholder meaning unused.
-        /// </summary>
-        Undefined,
+    Undefined,
 
-        /// <summary>
-        /// AXIS (9.6pt)
-        ///
-        /// Contains Japanese characters in addition to Latin characters. Used in game for the whole UI.
-        /// </summary>
-        Axis96,
+    /// <summary>
+    /// AXIS (9.6pt)
+    ///
+    /// Contains Japanese characters in addition to Latin characters. Used in game for the whole UI.
+    /// </summary>
+    Axis96,
 
-        /// <summary>
-        /// AXIS (12pt)
-        ///
-        /// Contains Japanese characters in addition to Latin characters. Used in game for the whole UI.
-        /// </summary>
-        Axis12,
+    /// <summary>
+    /// AXIS (12pt)
+    ///
+    /// Contains Japanese characters in addition to Latin characters. Used in game for the whole UI.
+    /// </summary>
+    Axis12,
 
-        /// <summary>
-        /// AXIS (14pt)
-        ///
-        /// Contains Japanese characters in addition to Latin characters. Used in game for the whole UI.
-        /// </summary>
-        Axis14,
+    /// <summary>
+    /// AXIS (14pt)
+    ///
+    /// Contains Japanese characters in addition to Latin characters. Used in game for the whole UI.
+    /// </summary>
+    Axis14,
 
-        /// <summary>
-        /// AXIS (18pt)
-        ///
-        /// Contains Japanese characters in addition to Latin characters. Used in game for the whole UI.
-        /// </summary>
-        Axis18,
+    /// <summary>
+    /// AXIS (18pt)
+    ///
+    /// Contains Japanese characters in addition to Latin characters. Used in game for the whole UI.
+    /// </summary>
+    Axis18,
 
-        /// <summary>
-        /// AXIS (36pt)
-        ///
-        /// Contains Japanese characters in addition to Latin characters. Used in game for the whole UI.
-        /// </summary>
-        Axis36,
+    /// <summary>
+    /// AXIS (36pt)
+    ///
+    /// Contains Japanese characters in addition to Latin characters. Used in game for the whole UI.
+    /// </summary>
+    Axis36,
 
-        /// <summary>
-        /// Jupiter (16pt)
-        ///
-        /// Serif font. Contains mostly ASCII range. Used in game for job names.
-        /// </summary>
-        Jupiter16,
+    /// <summary>
+    /// Jupiter (16pt)
+    ///
+    /// Serif font. Contains mostly ASCII range. Used in game for job names.
+    /// </summary>
+    Jupiter16,
 
-        /// <summary>
-        /// Jupiter (20pt)
-        ///
-        /// Serif font. Contains mostly ASCII range. Used in game for job names.
-        /// </summary>
-        Jupiter20,
+    /// <summary>
+    /// Jupiter (20pt)
+    ///
+    /// Serif font. Contains mostly ASCII range. Used in game for job names.
+    /// </summary>
+    Jupiter20,
 
-        /// <summary>
-        /// Jupiter (23pt)
-        ///
-        /// Serif font. Contains mostly ASCII range. Used in game for job names.
-        /// </summary>
-        Jupiter23,
+    /// <summary>
+    /// Jupiter (23pt)
+    ///
+    /// Serif font. Contains mostly ASCII range. Used in game for job names.
+    /// </summary>
+    Jupiter23,
 
-        /// <summary>
-        /// Jupiter (45pt)
-        ///
-        /// Serif font. Contains mostly numbers. Used in game for flying texts.
-        /// </summary>
-        Jupiter45,
+    /// <summary>
+    /// Jupiter (45pt)
+    ///
+    /// Serif font. Contains mostly numbers. Used in game for flying texts.
+    /// </summary>
+    Jupiter45,
 
-        /// <summary>
-        /// Jupiter (46pt)
-        ///
-        /// Serif font. Contains mostly ASCII range. Used in game for job names.
-        /// </summary>
-        Jupiter46,
+    /// <summary>
+    /// Jupiter (46pt)
+    ///
+    /// Serif font. Contains mostly ASCII range. Used in game for job names.
+    /// </summary>
+    Jupiter46,
 
-        /// <summary>
-        /// Jupiter (90pt)
-        ///
-        /// Serif font. Contains mostly numbers. Used in game for flying texts.
-        /// </summary>
-        Jupiter90,
+    /// <summary>
+    /// Jupiter (90pt)
+    ///
+    /// Serif font. Contains mostly numbers. Used in game for flying texts.
+    /// </summary>
+    Jupiter90,
 
-        /// <summary>
-        /// Meidinger (16pt)
-        ///
-        /// Horizontally wide. Contains mostly numbers. Used in game for HP/MP/IL stuff.
-        /// </summary>
-        Meidinger16,
+    /// <summary>
+    /// Meidinger (16pt)
+    ///
+    /// Horizontally wide. Contains mostly numbers. Used in game for HP/MP/IL stuff.
+    /// </summary>
+    Meidinger16,
 
-        /// <summary>
-        /// Meidinger (20pt)
-        ///
-        /// Horizontally wide. Contains mostly numbers. Used in game for HP/MP/IL stuff.
-        /// </summary>
-        Meidinger20,
+    /// <summary>
+    /// Meidinger (20pt)
+    ///
+    /// Horizontally wide. Contains mostly numbers. Used in game for HP/MP/IL stuff.
+    /// </summary>
+    Meidinger20,
 
-        /// <summary>
-        /// Meidinger (40pt)
-        ///
-        /// Horizontally wide. Contains mostly numbers. Used in game for HP/MP/IL stuff.
-        /// </summary>
-        Meidinger40,
+    /// <summary>
+    /// Meidinger (40pt)
+    ///
+    /// Horizontally wide. Contains mostly numbers. Used in game for HP/MP/IL stuff.
+    /// </summary>
+    Meidinger40,
 
-        /// <summary>
-        /// MiedingerMid (10pt)
-        ///
-        /// Horizontally wide. Contains mostly ASCII range.
-        /// </summary>
-        MiedingerMid10,
+    /// <summary>
+    /// MiedingerMid (10pt)
+    ///
+    /// Horizontally wide. Contains mostly ASCII range.
+    /// </summary>
+    MiedingerMid10,
 
-        /// <summary>
-        /// MiedingerMid (12pt)
-        ///
-        /// Horizontally wide. Contains mostly ASCII range.
-        /// </summary>
-        MiedingerMid12,
+    /// <summary>
+    /// MiedingerMid (12pt)
+    ///
+    /// Horizontally wide. Contains mostly ASCII range.
+    /// </summary>
+    MiedingerMid12,
 
-        /// <summary>
-        /// MiedingerMid (14pt)
-        ///
-        /// Horizontally wide. Contains mostly ASCII range.
-        /// </summary>
-        MiedingerMid14,
+    /// <summary>
+    /// MiedingerMid (14pt)
+    ///
+    /// Horizontally wide. Contains mostly ASCII range.
+    /// </summary>
+    MiedingerMid14,
 
-        /// <summary>
-        /// MiedingerMid (18pt)
-        ///
-        /// Horizontally wide. Contains mostly ASCII range.
-        /// </summary>
-        MiedingerMid18,
+    /// <summary>
+    /// MiedingerMid (18pt)
+    ///
+    /// Horizontally wide. Contains mostly ASCII range.
+    /// </summary>
+    MiedingerMid18,
 
-        /// <summary>
-        /// MiedingerMid (36pt)
-        ///
-        /// Horizontally wide. Contains mostly ASCII range.
-        /// </summary>
-        MiedingerMid36,
+    /// <summary>
+    /// MiedingerMid (36pt)
+    ///
+    /// Horizontally wide. Contains mostly ASCII range.
+    /// </summary>
+    MiedingerMid36,
 
-        /// <summary>
-        /// TrumpGothic (18.4pt)
-        ///
-        /// Horizontally narrow. Contains mostly ASCII range. Used for addon titles.
-        /// </summary>
-        TrumpGothic184,
+    /// <summary>
+    /// TrumpGothic (18.4pt)
+    ///
+    /// Horizontally narrow. Contains mostly ASCII range. Used for addon titles.
+    /// </summary>
+    TrumpGothic184,
 
-        /// <summary>
-        /// TrumpGothic (23pt)
-        ///
-        /// Horizontally narrow. Contains mostly ASCII range. Used for addon titles.
-        /// </summary>
-        TrumpGothic23,
+    /// <summary>
+    /// TrumpGothic (23pt)
+    ///
+    /// Horizontally narrow. Contains mostly ASCII range. Used for addon titles.
+    /// </summary>
+    TrumpGothic23,
 
-        /// <summary>
-        /// TrumpGothic (34pt)
-        ///
-        /// Horizontally narrow. Contains mostly ASCII range. Used for addon titles.
-        /// </summary>
-        TrumpGothic34,
+    /// <summary>
+    /// TrumpGothic (34pt)
+    ///
+    /// Horizontally narrow. Contains mostly ASCII range. Used for addon titles.
+    /// </summary>
+    TrumpGothic34,
 
-        /// <summary>
-        /// TrumpGothic (688pt)
-        ///
-        /// Horizontally narrow. Contains mostly ASCII range. Used for addon titles.
-        /// </summary>
-        TrumpGothic68,
-    }
+    /// <summary>
+    /// TrumpGothic (688pt)
+    ///
+    /// Horizontally narrow. Contains mostly ASCII range. Used for addon titles.
+    /// </summary>
+    TrumpGothic68,
 }
diff --git a/Dalamud/Interface/GameFonts/GameFontHandle.cs b/Dalamud/Interface/GameFonts/GameFontHandle.cs
index e2fa1d941..d71e725c5 100644
--- a/Dalamud/Interface/GameFonts/GameFontHandle.cs
+++ b/Dalamud/Interface/GameFonts/GameFontHandle.cs
@@ -3,113 +3,112 @@ using System.Numerics;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.GameFonts
+namespace Dalamud.Interface.GameFonts;
+
+/// <summary>
+/// Prepare and keep game font loaded for use in OnDraw.
+/// </summary>
+public class GameFontHandle : IDisposable
 {
+    private readonly GameFontManager manager;
+    private readonly GameFontStyle fontStyle;
+
     /// <summary>
-    /// Prepare and keep game font loaded for use in OnDraw.
+    /// Initializes a new instance of the <see cref="GameFontHandle"/> class.
     /// </summary>
-    public class GameFontHandle : IDisposable
+    /// <param name="manager">GameFontManager instance.</param>
+    /// <param name="font">Font to use.</param>
+    internal GameFontHandle(GameFontManager manager, GameFontStyle font)
     {
-        private readonly GameFontManager manager;
-        private readonly GameFontStyle fontStyle;
+        this.manager = manager;
+        this.fontStyle = font;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameFontHandle"/> class.
-        /// </summary>
-        /// <param name="manager">GameFontManager instance.</param>
-        /// <param name="font">Font to use.</param>
-        internal GameFontHandle(GameFontManager manager, GameFontStyle font)
-        {
-            this.manager = manager;
-            this.fontStyle = font;
-        }
+    /// <summary>
+    /// Gets the font style.
+    /// </summary>
+    public GameFontStyle Style => this.fontStyle;
 
-        /// <summary>
-        /// Gets the font style.
-        /// </summary>
-        public GameFontStyle Style => this.fontStyle;
-
-        /// <summary>
-        /// Gets a value indicating whether this font is ready for use.
-        /// </summary>
-        public bool Available
-        {
-            get
-            {
-                unsafe
-                {
-                    return this.manager.GetFont(this.fontStyle).GetValueOrDefault(null).NativePtr != null;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the font.
-        /// </summary>
-        public ImFontPtr ImFont => this.manager.GetFont(this.fontStyle).Value;
-
-        /// <summary>
-        /// Gets the FdtReader.
-        /// </summary>
-        public FdtReader FdtReader => this.manager.GetFdtReader(this.fontStyle.FamilyAndSize);
-
-        /// <summary>
-        /// Creates a new GameFontLayoutPlan.Builder.
-        /// </summary>
-        /// <param name="text">Text.</param>
-        /// <returns>A new builder for GameFontLayoutPlan.</returns>
-        public GameFontLayoutPlan.Builder LayoutBuilder(string text)
-        {
-            return new GameFontLayoutPlan.Builder(this.ImFont, this.FdtReader, text);
-        }
-
-        /// <inheritdoc/>
-        public void Dispose() => this.manager.DecreaseFontRef(this.fontStyle);
-
-        /// <summary>
-        /// Draws text.
-        /// </summary>
-        /// <param name="text">Text to draw.</param>
-        public void Text(string text)
-        {
-            if (!this.Available)
-            {
-                ImGui.TextUnformatted(text);
-            }
-            else
-            {
-                var pos = ImGui.GetWindowPos() + ImGui.GetCursorPos();
-                pos.X -= ImGui.GetScrollX();
-                pos.Y -= ImGui.GetScrollY();
-
-                var layout = this.LayoutBuilder(text).Build();
-                layout.Draw(ImGui.GetWindowDrawList(), pos, ImGui.GetColorU32(ImGuiCol.Text));
-                ImGui.Dummy(new Vector2(layout.Width, layout.Height));
-            }
-        }
-
-        /// <summary>
-        /// Draws text in given color.
-        /// </summary>
-        /// <param name="col">Color.</param>
-        /// <param name="text">Text to draw.</param>
-        public void TextColored(Vector4 col, string text)
-        {
-            ImGui.PushStyleColor(ImGuiCol.Text, col);
-            this.Text(text);
-            ImGui.PopStyleColor();
-        }
-
-        /// <summary>
-        /// Draws disabled text.
-        /// </summary>
-        /// <param name="text">Text to draw.</param>
-        public void TextDisabled(string text)
+    /// <summary>
+    /// Gets a value indicating whether this font is ready for use.
+    /// </summary>
+    public bool Available
+    {
+        get
         {
             unsafe
             {
-                this.TextColored(*ImGui.GetStyleColorVec4(ImGuiCol.TextDisabled), text);
+                return this.manager.GetFont(this.fontStyle).GetValueOrDefault(null).NativePtr != null;
             }
         }
     }
+
+    /// <summary>
+    /// Gets the font.
+    /// </summary>
+    public ImFontPtr ImFont => this.manager.GetFont(this.fontStyle).Value;
+
+    /// <summary>
+    /// Gets the FdtReader.
+    /// </summary>
+    public FdtReader FdtReader => this.manager.GetFdtReader(this.fontStyle.FamilyAndSize);
+
+    /// <summary>
+    /// Creates a new GameFontLayoutPlan.Builder.
+    /// </summary>
+    /// <param name="text">Text.</param>
+    /// <returns>A new builder for GameFontLayoutPlan.</returns>
+    public GameFontLayoutPlan.Builder LayoutBuilder(string text)
+    {
+        return new GameFontLayoutPlan.Builder(this.ImFont, this.FdtReader, text);
+    }
+
+    /// <inheritdoc/>
+    public void Dispose() => this.manager.DecreaseFontRef(this.fontStyle);
+
+    /// <summary>
+    /// Draws text.
+    /// </summary>
+    /// <param name="text">Text to draw.</param>
+    public void Text(string text)
+    {
+        if (!this.Available)
+        {
+            ImGui.TextUnformatted(text);
+        }
+        else
+        {
+            var pos = ImGui.GetWindowPos() + ImGui.GetCursorPos();
+            pos.X -= ImGui.GetScrollX();
+            pos.Y -= ImGui.GetScrollY();
+
+            var layout = this.LayoutBuilder(text).Build();
+            layout.Draw(ImGui.GetWindowDrawList(), pos, ImGui.GetColorU32(ImGuiCol.Text));
+            ImGui.Dummy(new Vector2(layout.Width, layout.Height));
+        }
+    }
+
+    /// <summary>
+    /// Draws text in given color.
+    /// </summary>
+    /// <param name="col">Color.</param>
+    /// <param name="text">Text to draw.</param>
+    public void TextColored(Vector4 col, string text)
+    {
+        ImGui.PushStyleColor(ImGuiCol.Text, col);
+        this.Text(text);
+        ImGui.PopStyleColor();
+    }
+
+    /// <summary>
+    /// Draws disabled text.
+    /// </summary>
+    /// <param name="text">Text to draw.</param>
+    public void TextDisabled(string text)
+    {
+        unsafe
+        {
+            this.TextColored(*ImGui.GetStyleColorVec4(ImGuiCol.TextDisabled), text);
+        }
+    }
 }
diff --git a/Dalamud/Interface/GameFonts/GameFontLayoutPlan.cs b/Dalamud/Interface/GameFonts/GameFontLayoutPlan.cs
index 93fe5ab87..587c0dbe3 100644
--- a/Dalamud/Interface/GameFonts/GameFontLayoutPlan.cs
+++ b/Dalamud/Interface/GameFonts/GameFontLayoutPlan.cs
@@ -4,407 +4,406 @@ using System.Numerics;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.GameFonts
+namespace Dalamud.Interface.GameFonts;
+
+/// <summary>
+/// Plan on how glyphs will be rendered.
+/// </summary>
+public class GameFontLayoutPlan
 {
     /// <summary>
-    /// Plan on how glyphs will be rendered.
+    /// Horizontal alignment.
     /// </summary>
-    public class GameFontLayoutPlan
+    public enum HorizontalAlignment
     {
         /// <summary>
-        /// Horizontal alignment.
+        /// Align to left.
         /// </summary>
-        public enum HorizontalAlignment
+        Left,
+
+        /// <summary>
+        /// Align to center.
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// Align to right.
+        /// </summary>
+        Right,
+    }
+
+    /// <summary>
+    /// Gets the associated ImFontPtr.
+    /// </summary>
+    public ImFontPtr ImFontPtr { get; internal set; }
+
+    /// <summary>
+    /// Gets the size in points of the text.
+    /// </summary>
+    public float Size { get; internal set; }
+
+    /// <summary>
+    /// Gets the x offset of the leftmost glyph.
+    /// </summary>
+    public float X { get; internal set; }
+
+    /// <summary>
+    /// Gets the width of the text.
+    /// </summary>
+    public float Width { get; internal set; }
+
+    /// <summary>
+    /// Gets the height of the text.
+    /// </summary>
+    public float Height { get; internal set; }
+
+    /// <summary>
+    /// Gets the list of plannen elements.
+    /// </summary>
+    public IList<Element> Elements { get; internal set; }
+
+    /// <summary>
+    /// Draws font to ImGui.
+    /// </summary>
+    /// <param name="drawListPtr">Target ImDrawList.</param>
+    /// <param name="pos">Position.</param>
+    /// <param name="col">Color.</param>
+    public void Draw(ImDrawListPtr drawListPtr, Vector2 pos, uint col)
+    {
+        foreach (var element in this.Elements)
         {
-            /// <summary>
-            /// Align to left.
-            /// </summary>
-            Left,
+            if (element.IsControl)
+                continue;
 
-            /// <summary>
-            /// Align to center.
-            /// </summary>
-            Center,
-
-            /// <summary>
-            /// Align to right.
-            /// </summary>
-            Right,
+            this.ImFontPtr.RenderChar(
+                drawListPtr,
+                this.Size,
+                new Vector2(
+                    this.X + pos.X + element.X,
+                    pos.Y + element.Y),
+                col,
+                element.Glyph.Char);
         }
+    }
 
+    /// <summary>
+    /// Plan on how each glyph will be rendered.
+    /// </summary>
+    public class Element
+    {
         /// <summary>
-        /// Gets the associated ImFontPtr.
+        /// Gets the original codepoint.
         /// </summary>
-        public ImFontPtr ImFontPtr { get; internal set; }
+        public int Codepoint { get; init; }
 
         /// <summary>
-        /// Gets the size in points of the text.
+        /// Gets the corresponding or fallback glyph.
         /// </summary>
-        public float Size { get; internal set; }
+        public FdtReader.FontTableEntry Glyph { get; init; }
 
         /// <summary>
-        /// Gets the x offset of the leftmost glyph.
+        /// Gets the X offset of this glyph.
         /// </summary>
         public float X { get; internal set; }
 
         /// <summary>
-        /// Gets the width of the text.
+        /// Gets the Y offset of this glyph.
         /// </summary>
-        public float Width { get; internal set; }
+        public float Y { get; internal set; }
 
         /// <summary>
-        /// Gets the height of the text.
+        /// Gets a value indicating whether whether this codepoint is a control character.
         /// </summary>
-        public float Height { get; internal set; }
-
-        /// <summary>
-        /// Gets the list of plannen elements.
-        /// </summary>
-        public IList<Element> Elements { get; internal set; }
-
-        /// <summary>
-        /// Draws font to ImGui.
-        /// </summary>
-        /// <param name="drawListPtr">Target ImDrawList.</param>
-        /// <param name="pos">Position.</param>
-        /// <param name="col">Color.</param>
-        public void Draw(ImDrawListPtr drawListPtr, Vector2 pos, uint col)
+        public bool IsControl
         {
-            foreach (var element in this.Elements)
+            get
             {
-                if (element.IsControl)
-                    continue;
-
-                this.ImFontPtr.RenderChar(
-                    drawListPtr,
-                    this.Size,
-                    new Vector2(
-                        this.X + pos.X + element.X,
-                        pos.Y + element.Y),
-                    col,
-                    element.Glyph.Char);
+                return this.Codepoint < 0x10000 && char.IsControl((char)this.Codepoint);
             }
         }
 
         /// <summary>
-        /// Plan on how each glyph will be rendered.
+        /// Gets a value indicating whether whether this codepoint is a space.
         /// </summary>
-        public class Element
+        public bool IsSpace
         {
-            /// <summary>
-            /// Gets the original codepoint.
-            /// </summary>
-            public int Codepoint { get; init; }
-
-            /// <summary>
-            /// Gets the corresponding or fallback glyph.
-            /// </summary>
-            public FdtReader.FontTableEntry Glyph { get; init; }
-
-            /// <summary>
-            /// Gets the X offset of this glyph.
-            /// </summary>
-            public float X { get; internal set; }
-
-            /// <summary>
-            /// Gets the Y offset of this glyph.
-            /// </summary>
-            public float Y { get; internal set; }
-
-            /// <summary>
-            /// Gets a value indicating whether whether this codepoint is a control character.
-            /// </summary>
-            public bool IsControl
+            get
             {
-                get
-                {
-                    return this.Codepoint < 0x10000 && char.IsControl((char)this.Codepoint);
-                }
-            }
-
-            /// <summary>
-            /// Gets a value indicating whether whether this codepoint is a space.
-            /// </summary>
-            public bool IsSpace
-            {
-                get
-                {
-                    return this.Codepoint < 0x10000 && char.IsWhiteSpace((char)this.Codepoint);
-                }
-            }
-
-            /// <summary>
-            /// Gets a value indicating whether whether this codepoint is a line break character.
-            /// </summary>
-            public bool IsLineBreak
-            {
-                get
-                {
-                    return this.Codepoint == '\n' || this.Codepoint == '\r';
-                }
-            }
-
-            /// <summary>
-            /// Gets a value indicating whether whether this codepoint is a chinese character.
-            /// </summary>
-            public bool IsChineseCharacter
-            {
-                get
-                {
-                    // CJK Symbols and Punctuation(〇)
-                    if (this.Codepoint >= 0x3007 && this.Codepoint <= 0x3007)
-                        return true;
-
-                    // CJK Unified Ideographs Extension A
-                    if (this.Codepoint >= 0x3400 && this.Codepoint <= 0x4DBF)
-                        return true;
-
-                    // CJK Unified Ideographs
-                    if (this.Codepoint >= 0x4E00 && this.Codepoint <= 0x9FFF)
-                        return true;
-
-                    // CJK Unified Ideographs Extension B
-                    if (this.Codepoint >= 0x20000 && this.Codepoint <= 0x2A6DF)
-                        return true;
-
-                    // CJK Unified Ideographs Extension C
-                    if (this.Codepoint >= 0x2A700 && this.Codepoint <= 0x2B73F)
-                        return true;
-
-                    // CJK Unified Ideographs Extension D
-                    if (this.Codepoint >= 0x2B740 && this.Codepoint <= 0x2B81F)
-                        return true;
-
-                    // CJK Unified Ideographs Extension E
-                    if (this.Codepoint >= 0x2B820 && this.Codepoint <= 0x2CEAF)
-                        return true;
-
-                    // CJK Unified Ideographs Extension F
-                    if (this.Codepoint >= 0x2CEB0 && this.Codepoint <= 0x2EBEF)
-                        return true;
-
-                    return false;
-                }
-            }
-
-            /// <summary>
-            /// Gets a value indicating whether whether this codepoint is a good position to break word after.
-            /// </summary>
-            public bool IsWordBreakPoint
-            {
-                get
-                {
-                    if (this.IsChineseCharacter)
-                        return true;
-
-                    if (this.Codepoint >= 0x10000)
-                        return false;
-
-                    // TODO: Whatever
-                    switch (char.GetUnicodeCategory((char)this.Codepoint))
-                    {
-                        case System.Globalization.UnicodeCategory.SpaceSeparator:
-                        case System.Globalization.UnicodeCategory.LineSeparator:
-                        case System.Globalization.UnicodeCategory.ParagraphSeparator:
-                        case System.Globalization.UnicodeCategory.Control:
-                        case System.Globalization.UnicodeCategory.Format:
-                        case System.Globalization.UnicodeCategory.Surrogate:
-                        case System.Globalization.UnicodeCategory.PrivateUse:
-                        case System.Globalization.UnicodeCategory.ConnectorPunctuation:
-                        case System.Globalization.UnicodeCategory.DashPunctuation:
-                        case System.Globalization.UnicodeCategory.OpenPunctuation:
-                        case System.Globalization.UnicodeCategory.ClosePunctuation:
-                        case System.Globalization.UnicodeCategory.InitialQuotePunctuation:
-                        case System.Globalization.UnicodeCategory.FinalQuotePunctuation:
-                        case System.Globalization.UnicodeCategory.OtherPunctuation:
-                        case System.Globalization.UnicodeCategory.MathSymbol:
-                        case System.Globalization.UnicodeCategory.ModifierSymbol:
-                        case System.Globalization.UnicodeCategory.OtherSymbol:
-                        case System.Globalization.UnicodeCategory.OtherNotAssigned:
-                            return true;
-                    }
-
-                    return false;
-                }
+                return this.Codepoint < 0x10000 && char.IsWhiteSpace((char)this.Codepoint);
             }
         }
 
         /// <summary>
-        /// Build a GameFontLayoutPlan.
+        /// Gets a value indicating whether whether this codepoint is a line break character.
         /// </summary>
-        public class Builder
+        public bool IsLineBreak
         {
-            private readonly ImFontPtr fontPtr;
-            private readonly FdtReader fdt;
-            private readonly string text;
-            private int maxWidth = int.MaxValue;
-            private float size;
-            private HorizontalAlignment horizontalAlignment = HorizontalAlignment.Left;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Builder"/> class.
-            /// </summary>
-            /// <param name="fontPtr">Corresponding ImFontPtr.</param>
-            /// <param name="fdt">FDT file to base on.</param>
-            /// <param name="text">Text.</param>
-            public Builder(ImFontPtr fontPtr, FdtReader fdt, string text)
+            get
             {
-                this.fontPtr = fontPtr;
-                this.fdt = fdt;
-                this.text = text;
-                this.size = fdt.FontHeader.LineHeight;
+                return this.Codepoint == '\n' || this.Codepoint == '\r';
             }
+        }
 
-            /// <summary>
-            /// Sets the size of resulting text.
-            /// </summary>
-            /// <param name="size">Size in pixels.</param>
-            /// <returns>This.</returns>
-            public Builder WithSize(float size)
+        /// <summary>
+        /// Gets a value indicating whether whether this codepoint is a chinese character.
+        /// </summary>
+        public bool IsChineseCharacter
+        {
+            get
             {
-                this.size = size;
-                return this;
+                // CJK Symbols and Punctuation(〇)
+                if (this.Codepoint >= 0x3007 && this.Codepoint <= 0x3007)
+                    return true;
+
+                // CJK Unified Ideographs Extension A
+                if (this.Codepoint >= 0x3400 && this.Codepoint <= 0x4DBF)
+                    return true;
+
+                // CJK Unified Ideographs
+                if (this.Codepoint >= 0x4E00 && this.Codepoint <= 0x9FFF)
+                    return true;
+
+                // CJK Unified Ideographs Extension B
+                if (this.Codepoint >= 0x20000 && this.Codepoint <= 0x2A6DF)
+                    return true;
+
+                // CJK Unified Ideographs Extension C
+                if (this.Codepoint >= 0x2A700 && this.Codepoint <= 0x2B73F)
+                    return true;
+
+                // CJK Unified Ideographs Extension D
+                if (this.Codepoint >= 0x2B740 && this.Codepoint <= 0x2B81F)
+                    return true;
+
+                // CJK Unified Ideographs Extension E
+                if (this.Codepoint >= 0x2B820 && this.Codepoint <= 0x2CEAF)
+                    return true;
+
+                // CJK Unified Ideographs Extension F
+                if (this.Codepoint >= 0x2CEB0 && this.Codepoint <= 0x2EBEF)
+                    return true;
+
+                return false;
             }
+        }
 
-            /// <summary>
-            /// Sets the maximum width of the text.
-            /// </summary>
-            /// <param name="maxWidth">Maximum width in pixels.</param>
-            /// <returns>This.</returns>
-            public Builder WithMaxWidth(int maxWidth)
+        /// <summary>
+        /// Gets a value indicating whether whether this codepoint is a good position to break word after.
+        /// </summary>
+        public bool IsWordBreakPoint
+        {
+            get
             {
-                this.maxWidth = maxWidth;
-                return this;
-            }
+                if (this.IsChineseCharacter)
+                    return true;
 
-            /// <summary>
-            /// Sets the horizontal alignment of the text.
-            /// </summary>
-            /// <param name="horizontalAlignment">Horizontal alignment.</param>
-            /// <returns>This.</returns>
-            public Builder WithHorizontalAlignment(HorizontalAlignment horizontalAlignment)
-            {
-                this.horizontalAlignment = horizontalAlignment;
-                return this;
-            }
+                if (this.Codepoint >= 0x10000)
+                    return false;
 
-            /// <summary>
-            /// Builds the layout plan.
-            /// </summary>
-            /// <returns>Newly created layout plan.</returns>
-            public GameFontLayoutPlan Build()
-            {
-                var scale = this.size / this.fdt.FontHeader.LineHeight;
-                var unscaledMaxWidth = (float)Math.Ceiling(this.maxWidth / scale);
-                var elements = new List<Element>();
-                foreach (var c in this.text)
-                    elements.Add(new() { Codepoint = c, Glyph = this.fdt.GetGlyph(c), });
-
-                var lastBreakIndex = 0;
-                List<int> lineBreakIndices = new() { 0 };
-                for (var i = 1; i < elements.Count; i++)
+                // TODO: Whatever
+                switch (char.GetUnicodeCategory((char)this.Codepoint))
                 {
-                    var prev = elements[i - 1];
-                    var curr = elements[i];
+                    case System.Globalization.UnicodeCategory.SpaceSeparator:
+                    case System.Globalization.UnicodeCategory.LineSeparator:
+                    case System.Globalization.UnicodeCategory.ParagraphSeparator:
+                    case System.Globalization.UnicodeCategory.Control:
+                    case System.Globalization.UnicodeCategory.Format:
+                    case System.Globalization.UnicodeCategory.Surrogate:
+                    case System.Globalization.UnicodeCategory.PrivateUse:
+                    case System.Globalization.UnicodeCategory.ConnectorPunctuation:
+                    case System.Globalization.UnicodeCategory.DashPunctuation:
+                    case System.Globalization.UnicodeCategory.OpenPunctuation:
+                    case System.Globalization.UnicodeCategory.ClosePunctuation:
+                    case System.Globalization.UnicodeCategory.InitialQuotePunctuation:
+                    case System.Globalization.UnicodeCategory.FinalQuotePunctuation:
+                    case System.Globalization.UnicodeCategory.OtherPunctuation:
+                    case System.Globalization.UnicodeCategory.MathSymbol:
+                    case System.Globalization.UnicodeCategory.ModifierSymbol:
+                    case System.Globalization.UnicodeCategory.OtherSymbol:
+                    case System.Globalization.UnicodeCategory.OtherNotAssigned:
+                        return true;
+                }
 
-                    if (prev.IsLineBreak)
-                    {
-                        curr.X = 0;
-                        curr.Y = prev.Y + this.fdt.FontHeader.LineHeight;
-                        lineBreakIndices.Add(i);
-                    }
-                    else
-                    {
-                        curr.X = prev.X + prev.Glyph.NextOffsetX + prev.Glyph.BoundingWidth + this.fdt.GetDistance(prev.Codepoint, curr.Codepoint);
-                        curr.Y = prev.Y;
-                    }
+                return false;
+            }
+        }
+    }
 
-                    if (prev.IsWordBreakPoint)
-                        lastBreakIndex = i;
+    /// <summary>
+    /// Build a GameFontLayoutPlan.
+    /// </summary>
+    public class Builder
+    {
+        private readonly ImFontPtr fontPtr;
+        private readonly FdtReader fdt;
+        private readonly string text;
+        private int maxWidth = int.MaxValue;
+        private float size;
+        private HorizontalAlignment horizontalAlignment = HorizontalAlignment.Left;
 
-                    if (curr.IsSpace)
-                        continue;
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Builder"/> class.
+        /// </summary>
+        /// <param name="fontPtr">Corresponding ImFontPtr.</param>
+        /// <param name="fdt">FDT file to base on.</param>
+        /// <param name="text">Text.</param>
+        public Builder(ImFontPtr fontPtr, FdtReader fdt, string text)
+        {
+            this.fontPtr = fontPtr;
+            this.fdt = fdt;
+            this.text = text;
+            this.size = fdt.FontHeader.LineHeight;
+        }
 
-                    if (curr.X + curr.Glyph.BoundingWidth < unscaledMaxWidth)
-                        continue;
+        /// <summary>
+        /// Sets the size of resulting text.
+        /// </summary>
+        /// <param name="size">Size in pixels.</param>
+        /// <returns>This.</returns>
+        public Builder WithSize(float size)
+        {
+            this.size = size;
+            return this;
+        }
 
-                    if (!prev.IsSpace && elements[lastBreakIndex].X > 0)
-                    {
-                        prev = elements[lastBreakIndex - 1];
-                        curr = elements[lastBreakIndex];
-                        i = lastBreakIndex;
-                    }
-                    else
-                    {
-                        lastBreakIndex = i;
-                    }
+        /// <summary>
+        /// Sets the maximum width of the text.
+        /// </summary>
+        /// <param name="maxWidth">Maximum width in pixels.</param>
+        /// <returns>This.</returns>
+        public Builder WithMaxWidth(int maxWidth)
+        {
+            this.maxWidth = maxWidth;
+            return this;
+        }
 
+        /// <summary>
+        /// Sets the horizontal alignment of the text.
+        /// </summary>
+        /// <param name="horizontalAlignment">Horizontal alignment.</param>
+        /// <returns>This.</returns>
+        public Builder WithHorizontalAlignment(HorizontalAlignment horizontalAlignment)
+        {
+            this.horizontalAlignment = horizontalAlignment;
+            return this;
+        }
+
+        /// <summary>
+        /// Builds the layout plan.
+        /// </summary>
+        /// <returns>Newly created layout plan.</returns>
+        public GameFontLayoutPlan Build()
+        {
+            var scale = this.size / this.fdt.FontHeader.LineHeight;
+            var unscaledMaxWidth = (float)Math.Ceiling(this.maxWidth / scale);
+            var elements = new List<Element>();
+            foreach (var c in this.text)
+                elements.Add(new() { Codepoint = c, Glyph = this.fdt.GetGlyph(c), });
+
+            var lastBreakIndex = 0;
+            List<int> lineBreakIndices = new() { 0 };
+            for (var i = 1; i < elements.Count; i++)
+            {
+                var prev = elements[i - 1];
+                var curr = elements[i];
+
+                if (prev.IsLineBreak)
+                {
                     curr.X = 0;
                     curr.Y = prev.Y + this.fdt.FontHeader.LineHeight;
                     lineBreakIndices.Add(i);
                 }
-
-                lineBreakIndices.Add(elements.Count);
-
-                var targetX = 0f;
-                var targetWidth = 0f;
-                var targetHeight = 0f;
-                for (var i = 1; i < lineBreakIndices.Count; i++)
+                else
                 {
-                    var from = lineBreakIndices[i - 1];
-                    var to = lineBreakIndices[i];
-                    while (to > from && elements[to - 1].IsSpace)
-                    {
-                        to--;
-                    }
-
-                    if (from >= to)
-                        continue;
-
-                    var right = 0f;
-                    for (var j = from; j < to; j++)
-                    {
-                        var e = elements[j];
-                        right = Math.Max(right, e.X + Math.Max(e.Glyph.BoundingWidth, e.Glyph.AdvanceWidth));
-                        targetHeight = Math.Max(targetHeight, e.Y + e.Glyph.BoundingHeight);
-                    }
-
-                    targetWidth = Math.Max(targetWidth, right - elements[from].X);
-                    float offsetX;
-                    if (this.horizontalAlignment == HorizontalAlignment.Center)
-                        offsetX = (unscaledMaxWidth - right) / 2;
-                    else if (this.horizontalAlignment == HorizontalAlignment.Right)
-                        offsetX = unscaledMaxWidth - right;
-                    else if (this.horizontalAlignment == HorizontalAlignment.Left)
-                        offsetX = 0;
-                    else
-                        throw new ArgumentException("Invalid horizontal alignment");
-                    for (var j = from; j < to; j++)
-                        elements[j].X += offsetX;
-                    targetX = i == 1 ? elements[from].X : Math.Min(targetX, elements[from].X);
+                    curr.X = prev.X + prev.Glyph.NextOffsetX + prev.Glyph.BoundingWidth + this.fdt.GetDistance(prev.Codepoint, curr.Codepoint);
+                    curr.Y = prev.Y;
                 }
 
-                targetHeight = Math.Max(targetHeight, this.fdt.FontHeader.LineHeight * (lineBreakIndices.Count - 1));
+                if (prev.IsWordBreakPoint)
+                    lastBreakIndex = i;
 
-                targetWidth *= scale;
-                targetHeight *= scale;
-                targetX *= scale;
-                foreach (var e in elements)
+                if (curr.IsSpace)
+                    continue;
+
+                if (curr.X + curr.Glyph.BoundingWidth < unscaledMaxWidth)
+                    continue;
+
+                if (!prev.IsSpace && elements[lastBreakIndex].X > 0)
                 {
-                    e.X *= scale;
-                    e.Y *= scale;
+                    prev = elements[lastBreakIndex - 1];
+                    curr = elements[lastBreakIndex];
+                    i = lastBreakIndex;
+                }
+                else
+                {
+                    lastBreakIndex = i;
                 }
 
-                return new GameFontLayoutPlan()
-                {
-                    ImFontPtr = this.fontPtr,
-                    Size = this.size,
-                    X = targetX,
-                    Width = targetWidth,
-                    Height = targetHeight,
-                    Elements = elements,
-                };
+                curr.X = 0;
+                curr.Y = prev.Y + this.fdt.FontHeader.LineHeight;
+                lineBreakIndices.Add(i);
             }
+
+            lineBreakIndices.Add(elements.Count);
+
+            var targetX = 0f;
+            var targetWidth = 0f;
+            var targetHeight = 0f;
+            for (var i = 1; i < lineBreakIndices.Count; i++)
+            {
+                var from = lineBreakIndices[i - 1];
+                var to = lineBreakIndices[i];
+                while (to > from && elements[to - 1].IsSpace)
+                {
+                    to--;
+                }
+
+                if (from >= to)
+                    continue;
+
+                var right = 0f;
+                for (var j = from; j < to; j++)
+                {
+                    var e = elements[j];
+                    right = Math.Max(right, e.X + Math.Max(e.Glyph.BoundingWidth, e.Glyph.AdvanceWidth));
+                    targetHeight = Math.Max(targetHeight, e.Y + e.Glyph.BoundingHeight);
+                }
+
+                targetWidth = Math.Max(targetWidth, right - elements[from].X);
+                float offsetX;
+                if (this.horizontalAlignment == HorizontalAlignment.Center)
+                    offsetX = (unscaledMaxWidth - right) / 2;
+                else if (this.horizontalAlignment == HorizontalAlignment.Right)
+                    offsetX = unscaledMaxWidth - right;
+                else if (this.horizontalAlignment == HorizontalAlignment.Left)
+                    offsetX = 0;
+                else
+                    throw new ArgumentException("Invalid horizontal alignment");
+                for (var j = from; j < to; j++)
+                    elements[j].X += offsetX;
+                targetX = i == 1 ? elements[from].X : Math.Min(targetX, elements[from].X);
+            }
+
+            targetHeight = Math.Max(targetHeight, this.fdt.FontHeader.LineHeight * (lineBreakIndices.Count - 1));
+
+            targetWidth *= scale;
+            targetHeight *= scale;
+            targetX *= scale;
+            foreach (var e in elements)
+            {
+                e.X *= scale;
+                e.Y *= scale;
+            }
+
+            return new GameFontLayoutPlan()
+            {
+                ImFontPtr = this.fontPtr,
+                Size = this.size,
+                X = targetX,
+                Width = targetWidth,
+                Height = targetHeight,
+                Elements = elements,
+            };
         }
     }
 }
diff --git a/Dalamud/Interface/GameFonts/GameFontManager.cs b/Dalamud/Interface/GameFonts/GameFontManager.cs
index bd6e9bc99..ad0e47273 100644
--- a/Dalamud/Interface/GameFonts/GameFontManager.cs
+++ b/Dalamud/Interface/GameFonts/GameFontManager.cs
@@ -16,456 +16,455 @@ using Serilog;
 
 using static Dalamud.Interface.ImGuiHelpers;
 
-namespace Dalamud.Interface.GameFonts
+namespace Dalamud.Interface.GameFonts;
+
+/// <summary>
+/// Loads game font for use in ImGui.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class GameFontManager : IServiceType
 {
-    /// <summary>
-    /// Loads game font for use in ImGui.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal class GameFontManager : IServiceType
+    private static readonly string?[] FontNames =
     {
-        private static readonly string?[] FontNames =
-        {
-            null,
-            "AXIS_96", "AXIS_12", "AXIS_14", "AXIS_18", "AXIS_36",
-            "Jupiter_16", "Jupiter_20", "Jupiter_23", "Jupiter_45", "Jupiter_46", "Jupiter_90",
-            "Meidinger_16", "Meidinger_20", "Meidinger_40",
-            "MiedingerMid_10", "MiedingerMid_12", "MiedingerMid_14", "MiedingerMid_18", "MiedingerMid_36",
-            "TrumpGothic_184", "TrumpGothic_23", "TrumpGothic_34", "TrumpGothic_68",
-        };
+        null,
+        "AXIS_96", "AXIS_12", "AXIS_14", "AXIS_18", "AXIS_36",
+        "Jupiter_16", "Jupiter_20", "Jupiter_23", "Jupiter_45", "Jupiter_46", "Jupiter_90",
+        "Meidinger_16", "Meidinger_20", "Meidinger_40",
+        "MiedingerMid_10", "MiedingerMid_12", "MiedingerMid_14", "MiedingerMid_18", "MiedingerMid_36",
+        "TrumpGothic_184", "TrumpGothic_23", "TrumpGothic_34", "TrumpGothic_68",
+    };
 
-        private readonly object syncRoot = new();
+    private readonly object syncRoot = new();
 
-        private readonly FdtReader?[] fdts;
-        private readonly List<byte[]> texturePixels;
-        private readonly Dictionary<GameFontStyle, ImFontPtr> fonts = new();
-        private readonly Dictionary<GameFontStyle, int> fontUseCounter = new();
-        private readonly Dictionary<GameFontStyle, Dictionary<char, Tuple<int, FdtReader.FontTableEntry>>> glyphRectIds = new();
+    private readonly FdtReader?[] fdts;
+    private readonly List<byte[]> texturePixels;
+    private readonly Dictionary<GameFontStyle, ImFontPtr> fonts = new();
+    private readonly Dictionary<GameFontStyle, int> fontUseCounter = new();
+    private readonly Dictionary<GameFontStyle, Dictionary<char, Tuple<int, FdtReader.FontTableEntry>>> glyphRectIds = new();
 
 #pragma warning disable CS0414
-        private bool isBetweenBuildFontsAndRightAfterImGuiIoFontsBuild = false;
+    private bool isBetweenBuildFontsAndRightAfterImGuiIoFontsBuild = false;
 #pragma warning restore CS0414
 
-        [ServiceManager.ServiceConstructor]
-        private GameFontManager(DataManager dataManager)
+    [ServiceManager.ServiceConstructor]
+    private GameFontManager(DataManager dataManager)
+    {
+        using (Timings.Start("Getting fdt data"))
         {
-            using (Timings.Start("Getting fdt data"))
-            {
-                this.fdts = FontNames.Select(fontName => fontName == null ? null : new FdtReader(dataManager.GetFile($"common/font/{fontName}.fdt")!.Data)).ToArray();
-            }
-
-            using (Timings.Start("Getting texture data"))
-            {
-                var texTasks = Enumerable
-                               .Range(1, 1 + this.fdts
-                                                 .Where(x => x != null)
-                                                 .Select(x => x.Glyphs.Select(y => y.TextureFileIndex).Max())
-                                                 .Max())
-                               .Select(x => dataManager.GetFile<TexFile>($"common/font/font{x}.tex")!)
-                               .Select(x => new Task<byte[]>(Timings.AttachTimingHandle(() => x.ImageData!)))
-                               .ToArray();
-                foreach (var task in texTasks)
-                    task.Start();
-                this.texturePixels = texTasks.Select(x => x.GetAwaiter().GetResult()).ToList();
-            }
+            this.fdts = FontNames.Select(fontName => fontName == null ? null : new FdtReader(dataManager.GetFile($"common/font/{fontName}.fdt")!.Data)).ToArray();
         }
 
-        /// <summary>
-        /// Describe font into a string.
-        /// </summary>
-        /// <param name="font">Font to describe.</param>
-        /// <returns>A string in a form of "FontName (NNNpt)".</returns>
-        public static string DescribeFont(GameFontFamilyAndSize font)
+        using (Timings.Start("Getting texture data"))
         {
-            return font switch
-            {
-                GameFontFamilyAndSize.Undefined => "-",
-                GameFontFamilyAndSize.Axis96 => "AXIS (9.6pt)",
-                GameFontFamilyAndSize.Axis12 => "AXIS (12pt)",
-                GameFontFamilyAndSize.Axis14 => "AXIS (14pt)",
-                GameFontFamilyAndSize.Axis18 => "AXIS (18pt)",
-                GameFontFamilyAndSize.Axis36 => "AXIS (36pt)",
-                GameFontFamilyAndSize.Jupiter16 => "Jupiter (16pt)",
-                GameFontFamilyAndSize.Jupiter20 => "Jupiter (20pt)",
-                GameFontFamilyAndSize.Jupiter23 => "Jupiter (23pt)",
-                GameFontFamilyAndSize.Jupiter45 => "Jupiter Numeric (45pt)",
-                GameFontFamilyAndSize.Jupiter46 => "Jupiter (46pt)",
-                GameFontFamilyAndSize.Jupiter90 => "Jupiter Numeric (90pt)",
-                GameFontFamilyAndSize.Meidinger16 => "Meidinger Numeric (16pt)",
-                GameFontFamilyAndSize.Meidinger20 => "Meidinger Numeric (20pt)",
-                GameFontFamilyAndSize.Meidinger40 => "Meidinger Numeric (40pt)",
-                GameFontFamilyAndSize.MiedingerMid10 => "MiedingerMid (10pt)",
-                GameFontFamilyAndSize.MiedingerMid12 => "MiedingerMid (12pt)",
-                GameFontFamilyAndSize.MiedingerMid14 => "MiedingerMid (14pt)",
-                GameFontFamilyAndSize.MiedingerMid18 => "MiedingerMid (18pt)",
-                GameFontFamilyAndSize.MiedingerMid36 => "MiedingerMid (36pt)",
-                GameFontFamilyAndSize.TrumpGothic184 => "Trump Gothic (18.4pt)",
-                GameFontFamilyAndSize.TrumpGothic23 => "Trump Gothic (23pt)",
-                GameFontFamilyAndSize.TrumpGothic34 => "Trump Gothic (34pt)",
-                GameFontFamilyAndSize.TrumpGothic68 => "Trump Gothic (68pt)",
-                _ => throw new ArgumentOutOfRangeException(nameof(font), font, "Invalid argument"),
-            };
-        }
-
-        /// <summary>
-        /// Determines whether a font should be able to display most of stuff.
-        /// </summary>
-        /// <param name="font">Font to check.</param>
-        /// <returns>True if it can.</returns>
-        public static bool IsGenericPurposeFont(GameFontFamilyAndSize font)
-        {
-            return font switch
-            {
-                GameFontFamilyAndSize.Axis96 => true,
-                GameFontFamilyAndSize.Axis12 => true,
-                GameFontFamilyAndSize.Axis14 => true,
-                GameFontFamilyAndSize.Axis18 => true,
-                GameFontFamilyAndSize.Axis36 => true,
-                _ => false,
-            };
-        }
-
-        /// <summary>
-        /// Unscales fonts after they have been rendered onto atlas.
-        /// </summary>
-        /// <param name="fontPtr">Font to unscale.</param>
-        /// <param name="fontScale">Scale factor.</param>
-        /// <param name="rebuildLookupTable">Whether to call target.BuildLookupTable().</param>
-        public static void UnscaleFont(ImFontPtr fontPtr, float fontScale, bool rebuildLookupTable = true)
-        {
-            if (fontScale == 1)
-                return;
-
-            unsafe
-            {
-                var font = fontPtr.NativePtr;
-                for (int i = 0, i_ = font->IndexedHotData.Size; i < i_; ++i)
-                {
-                    font->IndexedHotData.Ref<ImFontGlyphHotDataReal>(i).AdvanceX /= fontScale;
-                    font->IndexedHotData.Ref<ImFontGlyphHotDataReal>(i).OccupiedWidth /= fontScale;
-                }
-
-                font->FontSize /= fontScale;
-                font->Ascent /= fontScale;
-                font->Descent /= fontScale;
-                if (font->ConfigData != null)
-                    font->ConfigData->SizePixels /= fontScale;
-                var glyphs = (ImFontGlyphReal*)font->Glyphs.Data;
-                for (int i = 0, i_ = font->Glyphs.Size; i < i_; i++)
-                {
-                    var glyph = &glyphs[i];
-                    glyph->X0 /= fontScale;
-                    glyph->X1 /= fontScale;
-                    glyph->Y0 /= fontScale;
-                    glyph->Y1 /= fontScale;
-                    glyph->AdvanceX /= fontScale;
-                }
-
-                for (int i = 0, i_ = font->KerningPairs.Size; i < i_; i++)
-                    font->KerningPairs.Ref<ImFontKerningPair>(i).AdvanceXAdjustment /= fontScale;
-                for (int i = 0, i_ = font->FrequentKerningPairs.Size; i < i_; i++)
-                    font->FrequentKerningPairs.Ref<float>(i) /= fontScale;
-            }
-
-            if (rebuildLookupTable && fontPtr.Glyphs.Size > 0)
-                fontPtr.BuildLookupTable();
-        }
-
-        /// <summary>
-        /// Creates a new GameFontHandle, and increases internal font reference counter, and if it's first time use, then the font will be loaded on next font building process.
-        /// </summary>
-        /// <param name="style">Font to use.</param>
-        /// <returns>Handle to game font that may or may not be ready yet.</returns>
-        public GameFontHandle NewFontRef(GameFontStyle style)
-        {
-            var interfaceManager = Service<InterfaceManager>.Get();
-            var needRebuild = false;
-
-            lock (this.syncRoot)
-            {
-                this.fontUseCounter[style] = this.fontUseCounter.GetValueOrDefault(style, 0) + 1;
-            }
-
-            needRebuild = !this.fonts.ContainsKey(style);
-            if (needRebuild)
-            {
-                Log.Information("[GameFontManager] NewFontRef: Queueing RebuildFonts because {0} has been requested.", style.ToString());
-                Service<Framework>.GetAsync()
-                                  .ContinueWith(task => task.Result.RunOnTick(() => interfaceManager.RebuildFonts()));
-            }
-
-            return new(this, style);
-        }
-
-        /// <summary>
-        /// Gets the font.
-        /// </summary>
-        /// <param name="style">Font to get.</param>
-        /// <returns>Corresponding font or null.</returns>
-        public ImFontPtr? GetFont(GameFontStyle style) => this.fonts.GetValueOrDefault(style, null);
-
-        /// <summary>
-        /// Gets the corresponding FdtReader.
-        /// </summary>
-        /// <param name="family">Font to get.</param>
-        /// <returns>Corresponding FdtReader or null.</returns>
-        public FdtReader? GetFdtReader(GameFontFamilyAndSize family) => this.fdts[(int)family];
-
-        /// <summary>
-        /// Fills missing glyphs in target font from source font, if both are not null.
-        /// </summary>
-        /// <param name="source">Source font.</param>
-        /// <param name="target">Target font.</param>
-        /// <param name="missingOnly">Whether to copy missing glyphs only.</param>
-        /// <param name="rebuildLookupTable">Whether to call target.BuildLookupTable().</param>
-        public void CopyGlyphsAcrossFonts(ImFontPtr? source, GameFontStyle target, bool missingOnly, bool rebuildLookupTable)
-        {
-            ImGuiHelpers.CopyGlyphsAcrossFonts(source, this.fonts[target], missingOnly, rebuildLookupTable);
-        }
-
-        /// <summary>
-        /// Fills missing glyphs in target font from source font, if both are not null.
-        /// </summary>
-        /// <param name="source">Source font.</param>
-        /// <param name="target">Target font.</param>
-        /// <param name="missingOnly">Whether to copy missing glyphs only.</param>
-        /// <param name="rebuildLookupTable">Whether to call target.BuildLookupTable().</param>
-        public void CopyGlyphsAcrossFonts(GameFontStyle source, ImFontPtr? target, bool missingOnly, bool rebuildLookupTable)
-        {
-            ImGuiHelpers.CopyGlyphsAcrossFonts(this.fonts[source], target, missingOnly, rebuildLookupTable);
-        }
-
-        /// <summary>
-        /// Fills missing glyphs in target font from source font, if both are not null.
-        /// </summary>
-        /// <param name="source">Source font.</param>
-        /// <param name="target">Target font.</param>
-        /// <param name="missingOnly">Whether to copy missing glyphs only.</param>
-        /// <param name="rebuildLookupTable">Whether to call target.BuildLookupTable().</param>
-        public void CopyGlyphsAcrossFonts(GameFontStyle source, GameFontStyle target, bool missingOnly, bool rebuildLookupTable)
-        {
-            ImGuiHelpers.CopyGlyphsAcrossFonts(this.fonts[source], this.fonts[target], missingOnly, rebuildLookupTable);
-        }
-
-        /// <summary>
-        /// Build fonts before plugins do something more. To be called from InterfaceManager.
-        /// </summary>
-        public void BuildFonts()
-        {
-            this.isBetweenBuildFontsAndRightAfterImGuiIoFontsBuild = true;
-
-            this.glyphRectIds.Clear();
-            this.fonts.Clear();
-
-            lock (this.syncRoot)
-            {
-                foreach (var style in this.fontUseCounter.Keys)
-                    this.EnsureFont(style);
-            }
-        }
-
-        /// <summary>
-        /// Record that ImGui.GetIO().Fonts.Build() has been called.
-        /// </summary>
-        public void AfterIoFontsBuild()
-        {
-            this.isBetweenBuildFontsAndRightAfterImGuiIoFontsBuild = false;
-        }
-
-        /// <summary>
-        /// Checks whether GameFontMamager owns an ImFont.
-        /// </summary>
-        /// <param name="fontPtr">ImFontPtr to check.</param>
-        /// <returns>Whether it owns.</returns>
-        public bool OwnsFont(ImFontPtr fontPtr) => this.fonts.ContainsValue(fontPtr);
-
-        /// <summary>
-        /// Post-build fonts before plugins do something more. To be called from InterfaceManager.
-        /// </summary>
-        public unsafe void AfterBuildFonts()
-        {
-            var interfaceManager = Service<InterfaceManager>.Get();
-            var ioFonts = ImGui.GetIO().Fonts;
-            var fontGamma = interfaceManager.FontGamma;
-
-            var pixels8s = new byte*[ioFonts.Textures.Size];
-            var pixels32s = new uint*[ioFonts.Textures.Size];
-            var widths = new int[ioFonts.Textures.Size];
-            var heights = new int[ioFonts.Textures.Size];
-            for (var i = 0; i < pixels8s.Length; i++)
-            {
-                ioFonts.GetTexDataAsRGBA32(i, out pixels8s[i], out widths[i], out heights[i]);
-                pixels32s[i] = (uint*)pixels8s[i];
-            }
-
-            foreach (var (style, font) in this.fonts)
-            {
-                var fdt = this.fdts[(int)style.FamilyAndSize];
-                var scale = style.SizePt / fdt.FontHeader.Size;
-                var fontPtr = font.NativePtr;
-
-                Log.Verbose("[GameFontManager] AfterBuildFonts: Scaling {0} from {1}pt to {2}pt (scale: {3})", style.ToString(), fdt.FontHeader.Size, style.SizePt, scale);
-
-                fontPtr->FontSize = fdt.FontHeader.Size * 4 / 3;
-                if (fontPtr->ConfigData != null)
-                    fontPtr->ConfigData->SizePixels = fontPtr->FontSize;
-                fontPtr->Ascent = fdt.FontHeader.Ascent;
-                fontPtr->Descent = fdt.FontHeader.Descent;
-                fontPtr->EllipsisChar = '…';
-                foreach (var fallbackCharCandidate in "〓?!")
-                {
-                    var glyph = font.FindGlyphNoFallback(fallbackCharCandidate);
-                    if ((IntPtr)glyph.NativePtr != IntPtr.Zero)
-                    {
-                        var ptr = font.NativePtr;
-                        ptr->FallbackChar = fallbackCharCandidate;
-                        ptr->FallbackGlyph = glyph.NativePtr;
-                        ptr->FallbackHotData = (ImFontGlyphHotData*)ptr->IndexedHotData.Address<ImFontGlyphHotDataReal>(fallbackCharCandidate);
-                        break;
-                    }
-                }
-
-                // I have no idea what's causing NPE, so just to be safe
-                try
-                {
-                    if (font.NativePtr != null && font.NativePtr->ConfigData != null)
-                    {
-                        var nameBytes = Encoding.UTF8.GetBytes(style.ToString() + "\0");
-                        Marshal.Copy(nameBytes, 0, (IntPtr)font.ConfigData.Name.Data, Math.Min(nameBytes.Length, font.ConfigData.Name.Count));
-                    }
-                }
-                catch (NullReferenceException)
-                {
-                    // do nothing
-                }
-
-                foreach (var (c, (rectId, glyph)) in this.glyphRectIds[style])
-                {
-                    var rc = (ImFontAtlasCustomRectReal*)ioFonts.GetCustomRectByIndex(rectId).NativePtr;
-                    var pixels8 = pixels8s[rc->TextureIndex];
-                    var pixels32 = pixels32s[rc->TextureIndex];
-                    var width = widths[rc->TextureIndex];
-                    var height = heights[rc->TextureIndex];
-                    var sourceBuffer = this.texturePixels[glyph.TextureFileIndex];
-                    var sourceBufferDelta = glyph.TextureChannelByteIndex;
-                    var widthAdjustment = style.CalculateBaseWidthAdjustment(fdt, glyph);
-                    if (widthAdjustment == 0)
-                    {
-                        for (var y = 0; y < glyph.BoundingHeight; y++)
-                        {
-                            for (var x = 0; x < glyph.BoundingWidth; x++)
-                            {
-                                var a = sourceBuffer[sourceBufferDelta + (4 * (((glyph.TextureOffsetY + y) * fdt.FontHeader.TextureWidth) + glyph.TextureOffsetX + x))];
-                                pixels32[((rc->Y + y) * width) + rc->X + x] = (uint)(a << 24) | 0xFFFFFFu;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        for (var y = 0; y < glyph.BoundingHeight; y++)
-                        {
-                            for (var x = 0; x < glyph.BoundingWidth + widthAdjustment; x++)
-                                pixels32[((rc->Y + y) * width) + rc->X + x] = 0xFFFFFFu;
-                        }
-
-                        for (int xbold = 0, xbold_ = Math.Max(1, (int)Math.Ceiling(style.Weight + 1)); xbold < xbold_; xbold++)
-                        {
-                            var boldStrength = Math.Min(1f, style.Weight + 1 - xbold);
-                            for (var y = 0; y < glyph.BoundingHeight; y++)
-                            {
-                                float xDelta = xbold;
-                                if (style.BaseSkewStrength > 0)
-                                    xDelta += style.BaseSkewStrength * (fdt.FontHeader.LineHeight - glyph.CurrentOffsetY - y) / fdt.FontHeader.LineHeight;
-                                else if (style.BaseSkewStrength < 0)
-                                    xDelta -= style.BaseSkewStrength * (glyph.CurrentOffsetY + y) / fdt.FontHeader.LineHeight;
-                                var xDeltaInt = (int)Math.Floor(xDelta);
-                                var xness = xDelta - xDeltaInt;
-                                for (var x = 0; x < glyph.BoundingWidth; x++)
-                                {
-                                    var sourcePixelIndex = ((glyph.TextureOffsetY + y) * fdt.FontHeader.TextureWidth) + glyph.TextureOffsetX + x;
-                                    var a1 = sourceBuffer[sourceBufferDelta + (4 * sourcePixelIndex)];
-                                    var a2 = x == glyph.BoundingWidth - 1 ? 0 : sourceBuffer[sourceBufferDelta + (4 * (sourcePixelIndex + 1))];
-                                    var n = (a1 * xness) + (a2 * (1 - xness));
-                                    var targetOffset = ((rc->Y + y) * width) + rc->X + x + xDeltaInt;
-                                    pixels8[(targetOffset * 4) + 3] = Math.Max(pixels8[(targetOffset * 4) + 3], (byte)(boldStrength * n));
-                                }
-                            }
-                        }
-                    }
-
-                    if (Math.Abs(fontGamma - 1.4f) >= 0.001)
-                    {
-                        // Gamma correction (stbtt/FreeType would output in linear space whereas most real world usages will apply 1.4 or 1.8 gamma; Windows/XIV prebaked uses 1.4)
-                        for (int y = rc->Y, y_ = rc->Y + rc->Height; y < y_; y++)
-                        {
-                            for (int x = rc->X, x_ = rc->X + rc->Width; x < x_; x++)
-                            {
-                                var i = (((y * width) + x) * 4) + 3;
-                                pixels8[i] = (byte)(Math.Pow(pixels8[i] / 255.0f, 1.4f / fontGamma) * 255.0f);
-                            }
-                        }
-                    }
-                }
-
-                UnscaleFont(font, 1 / scale, false);
-            }
-        }
-
-        /// <summary>
-        /// Decrease font reference counter.
-        /// </summary>
-        /// <param name="style">Font to release.</param>
-        internal void DecreaseFontRef(GameFontStyle style)
-        {
-            lock (this.syncRoot)
-            {
-                if (!this.fontUseCounter.ContainsKey(style))
-                    return;
-
-                if ((this.fontUseCounter[style] -= 1) == 0)
-                    this.fontUseCounter.Remove(style);
-            }
-        }
-
-        private unsafe void EnsureFont(GameFontStyle style)
-        {
-            var rectIds = this.glyphRectIds[style] = new();
-
-            var fdt = this.fdts[(int)style.FamilyAndSize];
-            if (fdt == null)
-                return;
-
-            ImFontConfigPtr fontConfig = ImGuiNative.ImFontConfig_ImFontConfig();
-            fontConfig.OversampleH = 1;
-            fontConfig.OversampleV = 1;
-            fontConfig.PixelSnapH = false;
-
-            var io = ImGui.GetIO();
-            var font = io.Fonts.AddFontDefault(fontConfig);
-
-            fontConfig.Destroy();
-
-            this.fonts[style] = font;
-            foreach (var glyph in fdt.Glyphs)
-            {
-                var c = glyph.Char;
-                if (c < 32 || c >= 0xFFFF)
-                    continue;
-
-                var widthAdjustment = style.CalculateBaseWidthAdjustment(fdt, glyph);
-                rectIds[c] = Tuple.Create(
-                    io.Fonts.AddCustomRectFontGlyph(
-                        font,
-                        c,
-                        glyph.BoundingWidth + widthAdjustment,
-                        glyph.BoundingHeight,
-                        glyph.AdvanceWidth,
-                        new Vector2(0, glyph.CurrentOffsetY)),
-                    glyph);
-            }
-
-            foreach (var kernPair in fdt.Distances)
-                font.AddKerningPair(kernPair.Left, kernPair.Right, kernPair.RightOffset);
+            var texTasks = Enumerable
+                           .Range(1, 1 + this.fdts
+                                             .Where(x => x != null)
+                                             .Select(x => x.Glyphs.Select(y => y.TextureFileIndex).Max())
+                                             .Max())
+                           .Select(x => dataManager.GetFile<TexFile>($"common/font/font{x}.tex")!)
+                           .Select(x => new Task<byte[]>(Timings.AttachTimingHandle(() => x.ImageData!)))
+                           .ToArray();
+            foreach (var task in texTasks)
+                task.Start();
+            this.texturePixels = texTasks.Select(x => x.GetAwaiter().GetResult()).ToList();
         }
     }
+
+    /// <summary>
+    /// Describe font into a string.
+    /// </summary>
+    /// <param name="font">Font to describe.</param>
+    /// <returns>A string in a form of "FontName (NNNpt)".</returns>
+    public static string DescribeFont(GameFontFamilyAndSize font)
+    {
+        return font switch
+        {
+            GameFontFamilyAndSize.Undefined => "-",
+            GameFontFamilyAndSize.Axis96 => "AXIS (9.6pt)",
+            GameFontFamilyAndSize.Axis12 => "AXIS (12pt)",
+            GameFontFamilyAndSize.Axis14 => "AXIS (14pt)",
+            GameFontFamilyAndSize.Axis18 => "AXIS (18pt)",
+            GameFontFamilyAndSize.Axis36 => "AXIS (36pt)",
+            GameFontFamilyAndSize.Jupiter16 => "Jupiter (16pt)",
+            GameFontFamilyAndSize.Jupiter20 => "Jupiter (20pt)",
+            GameFontFamilyAndSize.Jupiter23 => "Jupiter (23pt)",
+            GameFontFamilyAndSize.Jupiter45 => "Jupiter Numeric (45pt)",
+            GameFontFamilyAndSize.Jupiter46 => "Jupiter (46pt)",
+            GameFontFamilyAndSize.Jupiter90 => "Jupiter Numeric (90pt)",
+            GameFontFamilyAndSize.Meidinger16 => "Meidinger Numeric (16pt)",
+            GameFontFamilyAndSize.Meidinger20 => "Meidinger Numeric (20pt)",
+            GameFontFamilyAndSize.Meidinger40 => "Meidinger Numeric (40pt)",
+            GameFontFamilyAndSize.MiedingerMid10 => "MiedingerMid (10pt)",
+            GameFontFamilyAndSize.MiedingerMid12 => "MiedingerMid (12pt)",
+            GameFontFamilyAndSize.MiedingerMid14 => "MiedingerMid (14pt)",
+            GameFontFamilyAndSize.MiedingerMid18 => "MiedingerMid (18pt)",
+            GameFontFamilyAndSize.MiedingerMid36 => "MiedingerMid (36pt)",
+            GameFontFamilyAndSize.TrumpGothic184 => "Trump Gothic (18.4pt)",
+            GameFontFamilyAndSize.TrumpGothic23 => "Trump Gothic (23pt)",
+            GameFontFamilyAndSize.TrumpGothic34 => "Trump Gothic (34pt)",
+            GameFontFamilyAndSize.TrumpGothic68 => "Trump Gothic (68pt)",
+            _ => throw new ArgumentOutOfRangeException(nameof(font), font, "Invalid argument"),
+        };
+    }
+
+    /// <summary>
+    /// Determines whether a font should be able to display most of stuff.
+    /// </summary>
+    /// <param name="font">Font to check.</param>
+    /// <returns>True if it can.</returns>
+    public static bool IsGenericPurposeFont(GameFontFamilyAndSize font)
+    {
+        return font switch
+        {
+            GameFontFamilyAndSize.Axis96 => true,
+            GameFontFamilyAndSize.Axis12 => true,
+            GameFontFamilyAndSize.Axis14 => true,
+            GameFontFamilyAndSize.Axis18 => true,
+            GameFontFamilyAndSize.Axis36 => true,
+            _ => false,
+        };
+    }
+
+    /// <summary>
+    /// Unscales fonts after they have been rendered onto atlas.
+    /// </summary>
+    /// <param name="fontPtr">Font to unscale.</param>
+    /// <param name="fontScale">Scale factor.</param>
+    /// <param name="rebuildLookupTable">Whether to call target.BuildLookupTable().</param>
+    public static void UnscaleFont(ImFontPtr fontPtr, float fontScale, bool rebuildLookupTable = true)
+    {
+        if (fontScale == 1)
+            return;
+
+        unsafe
+        {
+            var font = fontPtr.NativePtr;
+            for (int i = 0, i_ = font->IndexedHotData.Size; i < i_; ++i)
+            {
+                font->IndexedHotData.Ref<ImFontGlyphHotDataReal>(i).AdvanceX /= fontScale;
+                font->IndexedHotData.Ref<ImFontGlyphHotDataReal>(i).OccupiedWidth /= fontScale;
+            }
+
+            font->FontSize /= fontScale;
+            font->Ascent /= fontScale;
+            font->Descent /= fontScale;
+            if (font->ConfigData != null)
+                font->ConfigData->SizePixels /= fontScale;
+            var glyphs = (ImFontGlyphReal*)font->Glyphs.Data;
+            for (int i = 0, i_ = font->Glyphs.Size; i < i_; i++)
+            {
+                var glyph = &glyphs[i];
+                glyph->X0 /= fontScale;
+                glyph->X1 /= fontScale;
+                glyph->Y0 /= fontScale;
+                glyph->Y1 /= fontScale;
+                glyph->AdvanceX /= fontScale;
+            }
+
+            for (int i = 0, i_ = font->KerningPairs.Size; i < i_; i++)
+                font->KerningPairs.Ref<ImFontKerningPair>(i).AdvanceXAdjustment /= fontScale;
+            for (int i = 0, i_ = font->FrequentKerningPairs.Size; i < i_; i++)
+                font->FrequentKerningPairs.Ref<float>(i) /= fontScale;
+        }
+
+        if (rebuildLookupTable && fontPtr.Glyphs.Size > 0)
+            fontPtr.BuildLookupTable();
+    }
+
+    /// <summary>
+    /// Creates a new GameFontHandle, and increases internal font reference counter, and if it's first time use, then the font will be loaded on next font building process.
+    /// </summary>
+    /// <param name="style">Font to use.</param>
+    /// <returns>Handle to game font that may or may not be ready yet.</returns>
+    public GameFontHandle NewFontRef(GameFontStyle style)
+    {
+        var interfaceManager = Service<InterfaceManager>.Get();
+        var needRebuild = false;
+
+        lock (this.syncRoot)
+        {
+            this.fontUseCounter[style] = this.fontUseCounter.GetValueOrDefault(style, 0) + 1;
+        }
+
+        needRebuild = !this.fonts.ContainsKey(style);
+        if (needRebuild)
+        {
+            Log.Information("[GameFontManager] NewFontRef: Queueing RebuildFonts because {0} has been requested.", style.ToString());
+            Service<Framework>.GetAsync()
+                              .ContinueWith(task => task.Result.RunOnTick(() => interfaceManager.RebuildFonts()));
+        }
+
+        return new(this, style);
+    }
+
+    /// <summary>
+    /// Gets the font.
+    /// </summary>
+    /// <param name="style">Font to get.</param>
+    /// <returns>Corresponding font or null.</returns>
+    public ImFontPtr? GetFont(GameFontStyle style) => this.fonts.GetValueOrDefault(style, null);
+
+    /// <summary>
+    /// Gets the corresponding FdtReader.
+    /// </summary>
+    /// <param name="family">Font to get.</param>
+    /// <returns>Corresponding FdtReader or null.</returns>
+    public FdtReader? GetFdtReader(GameFontFamilyAndSize family) => this.fdts[(int)family];
+
+    /// <summary>
+    /// Fills missing glyphs in target font from source font, if both are not null.
+    /// </summary>
+    /// <param name="source">Source font.</param>
+    /// <param name="target">Target font.</param>
+    /// <param name="missingOnly">Whether to copy missing glyphs only.</param>
+    /// <param name="rebuildLookupTable">Whether to call target.BuildLookupTable().</param>
+    public void CopyGlyphsAcrossFonts(ImFontPtr? source, GameFontStyle target, bool missingOnly, bool rebuildLookupTable)
+    {
+        ImGuiHelpers.CopyGlyphsAcrossFonts(source, this.fonts[target], missingOnly, rebuildLookupTable);
+    }
+
+    /// <summary>
+    /// Fills missing glyphs in target font from source font, if both are not null.
+    /// </summary>
+    /// <param name="source">Source font.</param>
+    /// <param name="target">Target font.</param>
+    /// <param name="missingOnly">Whether to copy missing glyphs only.</param>
+    /// <param name="rebuildLookupTable">Whether to call target.BuildLookupTable().</param>
+    public void CopyGlyphsAcrossFonts(GameFontStyle source, ImFontPtr? target, bool missingOnly, bool rebuildLookupTable)
+    {
+        ImGuiHelpers.CopyGlyphsAcrossFonts(this.fonts[source], target, missingOnly, rebuildLookupTable);
+    }
+
+    /// <summary>
+    /// Fills missing glyphs in target font from source font, if both are not null.
+    /// </summary>
+    /// <param name="source">Source font.</param>
+    /// <param name="target">Target font.</param>
+    /// <param name="missingOnly">Whether to copy missing glyphs only.</param>
+    /// <param name="rebuildLookupTable">Whether to call target.BuildLookupTable().</param>
+    public void CopyGlyphsAcrossFonts(GameFontStyle source, GameFontStyle target, bool missingOnly, bool rebuildLookupTable)
+    {
+        ImGuiHelpers.CopyGlyphsAcrossFonts(this.fonts[source], this.fonts[target], missingOnly, rebuildLookupTable);
+    }
+
+    /// <summary>
+    /// Build fonts before plugins do something more. To be called from InterfaceManager.
+    /// </summary>
+    public void BuildFonts()
+    {
+        this.isBetweenBuildFontsAndRightAfterImGuiIoFontsBuild = true;
+
+        this.glyphRectIds.Clear();
+        this.fonts.Clear();
+
+        lock (this.syncRoot)
+        {
+            foreach (var style in this.fontUseCounter.Keys)
+                this.EnsureFont(style);
+        }
+    }
+
+    /// <summary>
+    /// Record that ImGui.GetIO().Fonts.Build() has been called.
+    /// </summary>
+    public void AfterIoFontsBuild()
+    {
+        this.isBetweenBuildFontsAndRightAfterImGuiIoFontsBuild = false;
+    }
+
+    /// <summary>
+    /// Checks whether GameFontMamager owns an ImFont.
+    /// </summary>
+    /// <param name="fontPtr">ImFontPtr to check.</param>
+    /// <returns>Whether it owns.</returns>
+    public bool OwnsFont(ImFontPtr fontPtr) => this.fonts.ContainsValue(fontPtr);
+
+    /// <summary>
+    /// Post-build fonts before plugins do something more. To be called from InterfaceManager.
+    /// </summary>
+    public unsafe void AfterBuildFonts()
+    {
+        var interfaceManager = Service<InterfaceManager>.Get();
+        var ioFonts = ImGui.GetIO().Fonts;
+        var fontGamma = interfaceManager.FontGamma;
+
+        var pixels8s = new byte*[ioFonts.Textures.Size];
+        var pixels32s = new uint*[ioFonts.Textures.Size];
+        var widths = new int[ioFonts.Textures.Size];
+        var heights = new int[ioFonts.Textures.Size];
+        for (var i = 0; i < pixels8s.Length; i++)
+        {
+            ioFonts.GetTexDataAsRGBA32(i, out pixels8s[i], out widths[i], out heights[i]);
+            pixels32s[i] = (uint*)pixels8s[i];
+        }
+
+        foreach (var (style, font) in this.fonts)
+        {
+            var fdt = this.fdts[(int)style.FamilyAndSize];
+            var scale = style.SizePt / fdt.FontHeader.Size;
+            var fontPtr = font.NativePtr;
+
+            Log.Verbose("[GameFontManager] AfterBuildFonts: Scaling {0} from {1}pt to {2}pt (scale: {3})", style.ToString(), fdt.FontHeader.Size, style.SizePt, scale);
+
+            fontPtr->FontSize = fdt.FontHeader.Size * 4 / 3;
+            if (fontPtr->ConfigData != null)
+                fontPtr->ConfigData->SizePixels = fontPtr->FontSize;
+            fontPtr->Ascent = fdt.FontHeader.Ascent;
+            fontPtr->Descent = fdt.FontHeader.Descent;
+            fontPtr->EllipsisChar = '…';
+            foreach (var fallbackCharCandidate in "〓?!")
+            {
+                var glyph = font.FindGlyphNoFallback(fallbackCharCandidate);
+                if ((IntPtr)glyph.NativePtr != IntPtr.Zero)
+                {
+                    var ptr = font.NativePtr;
+                    ptr->FallbackChar = fallbackCharCandidate;
+                    ptr->FallbackGlyph = glyph.NativePtr;
+                    ptr->FallbackHotData = (ImFontGlyphHotData*)ptr->IndexedHotData.Address<ImFontGlyphHotDataReal>(fallbackCharCandidate);
+                    break;
+                }
+            }
+
+            // I have no idea what's causing NPE, so just to be safe
+            try
+            {
+                if (font.NativePtr != null && font.NativePtr->ConfigData != null)
+                {
+                    var nameBytes = Encoding.UTF8.GetBytes(style.ToString() + "\0");
+                    Marshal.Copy(nameBytes, 0, (IntPtr)font.ConfigData.Name.Data, Math.Min(nameBytes.Length, font.ConfigData.Name.Count));
+                }
+            }
+            catch (NullReferenceException)
+            {
+                // do nothing
+            }
+
+            foreach (var (c, (rectId, glyph)) in this.glyphRectIds[style])
+            {
+                var rc = (ImFontAtlasCustomRectReal*)ioFonts.GetCustomRectByIndex(rectId).NativePtr;
+                var pixels8 = pixels8s[rc->TextureIndex];
+                var pixels32 = pixels32s[rc->TextureIndex];
+                var width = widths[rc->TextureIndex];
+                var height = heights[rc->TextureIndex];
+                var sourceBuffer = this.texturePixels[glyph.TextureFileIndex];
+                var sourceBufferDelta = glyph.TextureChannelByteIndex;
+                var widthAdjustment = style.CalculateBaseWidthAdjustment(fdt, glyph);
+                if (widthAdjustment == 0)
+                {
+                    for (var y = 0; y < glyph.BoundingHeight; y++)
+                    {
+                        for (var x = 0; x < glyph.BoundingWidth; x++)
+                        {
+                            var a = sourceBuffer[sourceBufferDelta + (4 * (((glyph.TextureOffsetY + y) * fdt.FontHeader.TextureWidth) + glyph.TextureOffsetX + x))];
+                            pixels32[((rc->Y + y) * width) + rc->X + x] = (uint)(a << 24) | 0xFFFFFFu;
+                        }
+                    }
+                }
+                else
+                {
+                    for (var y = 0; y < glyph.BoundingHeight; y++)
+                    {
+                        for (var x = 0; x < glyph.BoundingWidth + widthAdjustment; x++)
+                            pixels32[((rc->Y + y) * width) + rc->X + x] = 0xFFFFFFu;
+                    }
+
+                    for (int xbold = 0, xbold_ = Math.Max(1, (int)Math.Ceiling(style.Weight + 1)); xbold < xbold_; xbold++)
+                    {
+                        var boldStrength = Math.Min(1f, style.Weight + 1 - xbold);
+                        for (var y = 0; y < glyph.BoundingHeight; y++)
+                        {
+                            float xDelta = xbold;
+                            if (style.BaseSkewStrength > 0)
+                                xDelta += style.BaseSkewStrength * (fdt.FontHeader.LineHeight - glyph.CurrentOffsetY - y) / fdt.FontHeader.LineHeight;
+                            else if (style.BaseSkewStrength < 0)
+                                xDelta -= style.BaseSkewStrength * (glyph.CurrentOffsetY + y) / fdt.FontHeader.LineHeight;
+                            var xDeltaInt = (int)Math.Floor(xDelta);
+                            var xness = xDelta - xDeltaInt;
+                            for (var x = 0; x < glyph.BoundingWidth; x++)
+                            {
+                                var sourcePixelIndex = ((glyph.TextureOffsetY + y) * fdt.FontHeader.TextureWidth) + glyph.TextureOffsetX + x;
+                                var a1 = sourceBuffer[sourceBufferDelta + (4 * sourcePixelIndex)];
+                                var a2 = x == glyph.BoundingWidth - 1 ? 0 : sourceBuffer[sourceBufferDelta + (4 * (sourcePixelIndex + 1))];
+                                var n = (a1 * xness) + (a2 * (1 - xness));
+                                var targetOffset = ((rc->Y + y) * width) + rc->X + x + xDeltaInt;
+                                pixels8[(targetOffset * 4) + 3] = Math.Max(pixels8[(targetOffset * 4) + 3], (byte)(boldStrength * n));
+                            }
+                        }
+                    }
+                }
+
+                if (Math.Abs(fontGamma - 1.4f) >= 0.001)
+                {
+                    // Gamma correction (stbtt/FreeType would output in linear space whereas most real world usages will apply 1.4 or 1.8 gamma; Windows/XIV prebaked uses 1.4)
+                    for (int y = rc->Y, y_ = rc->Y + rc->Height; y < y_; y++)
+                    {
+                        for (int x = rc->X, x_ = rc->X + rc->Width; x < x_; x++)
+                        {
+                            var i = (((y * width) + x) * 4) + 3;
+                            pixels8[i] = (byte)(Math.Pow(pixels8[i] / 255.0f, 1.4f / fontGamma) * 255.0f);
+                        }
+                    }
+                }
+            }
+
+            UnscaleFont(font, 1 / scale, false);
+        }
+    }
+
+    /// <summary>
+    /// Decrease font reference counter.
+    /// </summary>
+    /// <param name="style">Font to release.</param>
+    internal void DecreaseFontRef(GameFontStyle style)
+    {
+        lock (this.syncRoot)
+        {
+            if (!this.fontUseCounter.ContainsKey(style))
+                return;
+
+            if ((this.fontUseCounter[style] -= 1) == 0)
+                this.fontUseCounter.Remove(style);
+        }
+    }
+
+    private unsafe void EnsureFont(GameFontStyle style)
+    {
+        var rectIds = this.glyphRectIds[style] = new();
+
+        var fdt = this.fdts[(int)style.FamilyAndSize];
+        if (fdt == null)
+            return;
+
+        ImFontConfigPtr fontConfig = ImGuiNative.ImFontConfig_ImFontConfig();
+        fontConfig.OversampleH = 1;
+        fontConfig.OversampleV = 1;
+        fontConfig.PixelSnapH = false;
+
+        var io = ImGui.GetIO();
+        var font = io.Fonts.AddFontDefault(fontConfig);
+
+        fontConfig.Destroy();
+
+        this.fonts[style] = font;
+        foreach (var glyph in fdt.Glyphs)
+        {
+            var c = glyph.Char;
+            if (c < 32 || c >= 0xFFFF)
+                continue;
+
+            var widthAdjustment = style.CalculateBaseWidthAdjustment(fdt, glyph);
+            rectIds[c] = Tuple.Create(
+                io.Fonts.AddCustomRectFontGlyph(
+                    font,
+                    c,
+                    glyph.BoundingWidth + widthAdjustment,
+                    glyph.BoundingHeight,
+                    glyph.AdvanceWidth,
+                    new Vector2(0, glyph.CurrentOffsetY)),
+                glyph);
+        }
+
+        foreach (var kernPair in fdt.Distances)
+            font.AddKerningPair(kernPair.Left, kernPair.Right, kernPair.RightOffset);
+    }
 }
diff --git a/Dalamud/Interface/GameFonts/GameFontStyle.cs b/Dalamud/Interface/GameFonts/GameFontStyle.cs
index 6ec078d69..40b810161 100644
--- a/Dalamud/Interface/GameFonts/GameFontStyle.cs
+++ b/Dalamud/Interface/GameFonts/GameFontStyle.cs
@@ -1,285 +1,284 @@
 using System;
 
-namespace Dalamud.Interface.GameFonts
+namespace Dalamud.Interface.GameFonts;
+
+/// <summary>
+/// Describes a font based on game resource file.
+/// </summary>
+public struct GameFontStyle
 {
     /// <summary>
-    /// Describes a font based on game resource file.
+    /// Font family of the font.
     /// </summary>
-    public struct GameFontStyle
+    public GameFontFamilyAndSize FamilyAndSize;
+
+    /// <summary>
+    /// Size of the font in pixels unit.
+    /// </summary>
+    public float SizePx;
+
+    /// <summary>
+    /// Weight of the font.
+    ///
+    /// 0 is unaltered.
+    /// Any value greater than 0 will make it bolder.
+    /// </summary>
+    public float Weight;
+
+    /// <summary>
+    /// Skewedness of the font.
+    ///
+    /// 0 is unaltered.
+    /// Greater than 1 will make upper part go rightwards.
+    /// Less than 1 will make lower part go rightwards.
+    /// </summary>
+    public float SkewStrength;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GameFontStyle"/> struct.
+    /// </summary>
+    /// <param name="family">Font family.</param>
+    /// <param name="sizePx">Size in pixels.</param>
+    public GameFontStyle(GameFontFamily family, float sizePx)
     {
-        /// <summary>
-        /// Font family of the font.
-        /// </summary>
-        public GameFontFamilyAndSize FamilyAndSize;
+        this.FamilyAndSize = GetRecommendedFamilyAndSize(family, sizePx * 3 / 4);
+        this.Weight = this.SkewStrength = 0f;
+        this.SizePx = sizePx;
+    }
 
-        /// <summary>
-        /// Size of the font in pixels unit.
-        /// </summary>
-        public float SizePx;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GameFontStyle"/> struct.
+    /// </summary>
+    /// <param name="familyAndSize">Font family and size.</param>
+    public GameFontStyle(GameFontFamilyAndSize familyAndSize)
+    {
+        this.FamilyAndSize = familyAndSize;
+        this.Weight = this.SkewStrength = 0f;
 
-        /// <summary>
-        /// Weight of the font.
-        ///
-        /// 0 is unaltered.
-        /// Any value greater than 0 will make it bolder.
-        /// </summary>
-        public float Weight;
+        // Dummy assignment to satisfy requirements
+        this.SizePx = 0;
 
-        /// <summary>
-        /// Skewedness of the font.
-        ///
-        /// 0 is unaltered.
-        /// Greater than 1 will make upper part go rightwards.
-        /// Less than 1 will make lower part go rightwards.
-        /// </summary>
-        public float SkewStrength;
+        this.SizePx = this.BaseSizePx;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameFontStyle"/> struct.
-        /// </summary>
-        /// <param name="family">Font family.</param>
-        /// <param name="sizePx">Size in pixels.</param>
-        public GameFontStyle(GameFontFamily family, float sizePx)
+    /// <summary>
+    /// Gets or sets the size of the font in points unit.
+    /// </summary>
+    public float SizePt
+    {
+        get => this.SizePx * 3 / 4;
+        set => this.SizePx = value * 4 / 3;
+    }
+
+    /// <summary>
+    /// Gets or sets the base skew strength.
+    /// </summary>
+    public float BaseSkewStrength
+    {
+        get => this.SkewStrength * this.BaseSizePx / this.SizePx;
+        set => this.SkewStrength = value * this.SizePx / this.BaseSizePx;
+    }
+
+    /// <summary>
+    /// Gets the font family.
+    /// </summary>
+    public GameFontFamily Family => this.FamilyAndSize switch
+    {
+        GameFontFamilyAndSize.Undefined => GameFontFamily.Undefined,
+        GameFontFamilyAndSize.Axis96 => GameFontFamily.Axis,
+        GameFontFamilyAndSize.Axis12 => GameFontFamily.Axis,
+        GameFontFamilyAndSize.Axis14 => GameFontFamily.Axis,
+        GameFontFamilyAndSize.Axis18 => GameFontFamily.Axis,
+        GameFontFamilyAndSize.Axis36 => GameFontFamily.Axis,
+        GameFontFamilyAndSize.Jupiter16 => GameFontFamily.Jupiter,
+        GameFontFamilyAndSize.Jupiter20 => GameFontFamily.Jupiter,
+        GameFontFamilyAndSize.Jupiter23 => GameFontFamily.Jupiter,
+        GameFontFamilyAndSize.Jupiter45 => GameFontFamily.JupiterNumeric,
+        GameFontFamilyAndSize.Jupiter46 => GameFontFamily.Jupiter,
+        GameFontFamilyAndSize.Jupiter90 => GameFontFamily.JupiterNumeric,
+        GameFontFamilyAndSize.Meidinger16 => GameFontFamily.Meidinger,
+        GameFontFamilyAndSize.Meidinger20 => GameFontFamily.Meidinger,
+        GameFontFamilyAndSize.Meidinger40 => GameFontFamily.Meidinger,
+        GameFontFamilyAndSize.MiedingerMid10 => GameFontFamily.MiedingerMid,
+        GameFontFamilyAndSize.MiedingerMid12 => GameFontFamily.MiedingerMid,
+        GameFontFamilyAndSize.MiedingerMid14 => GameFontFamily.MiedingerMid,
+        GameFontFamilyAndSize.MiedingerMid18 => GameFontFamily.MiedingerMid,
+        GameFontFamilyAndSize.MiedingerMid36 => GameFontFamily.MiedingerMid,
+        GameFontFamilyAndSize.TrumpGothic184 => GameFontFamily.TrumpGothic,
+        GameFontFamilyAndSize.TrumpGothic23 => GameFontFamily.TrumpGothic,
+        GameFontFamilyAndSize.TrumpGothic34 => GameFontFamily.TrumpGothic,
+        GameFontFamilyAndSize.TrumpGothic68 => GameFontFamily.TrumpGothic,
+        _ => throw new InvalidOperationException(),
+    };
+
+    /// <summary>
+    /// Gets the corresponding GameFontFamilyAndSize but with minimum possible font sizes.
+    /// </summary>
+    public GameFontFamilyAndSize FamilyWithMinimumSize => this.Family switch
+    {
+        GameFontFamily.Axis => GameFontFamilyAndSize.Axis96,
+        GameFontFamily.Jupiter => GameFontFamilyAndSize.Jupiter16,
+        GameFontFamily.JupiterNumeric => GameFontFamilyAndSize.Jupiter45,
+        GameFontFamily.Meidinger => GameFontFamilyAndSize.Meidinger16,
+        GameFontFamily.MiedingerMid => GameFontFamilyAndSize.MiedingerMid10,
+        GameFontFamily.TrumpGothic => GameFontFamilyAndSize.TrumpGothic184,
+        _ => GameFontFamilyAndSize.Undefined,
+    };
+
+    /// <summary>
+    /// Gets the base font size in point unit.
+    /// </summary>
+    public float BaseSizePt => this.FamilyAndSize switch
+    {
+        GameFontFamilyAndSize.Undefined => 0,
+        GameFontFamilyAndSize.Axis96 => 9.6f,
+        GameFontFamilyAndSize.Axis12 => 12,
+        GameFontFamilyAndSize.Axis14 => 14,
+        GameFontFamilyAndSize.Axis18 => 18,
+        GameFontFamilyAndSize.Axis36 => 36,
+        GameFontFamilyAndSize.Jupiter16 => 16,
+        GameFontFamilyAndSize.Jupiter20 => 20,
+        GameFontFamilyAndSize.Jupiter23 => 23,
+        GameFontFamilyAndSize.Jupiter45 => 45,
+        GameFontFamilyAndSize.Jupiter46 => 46,
+        GameFontFamilyAndSize.Jupiter90 => 90,
+        GameFontFamilyAndSize.Meidinger16 => 16,
+        GameFontFamilyAndSize.Meidinger20 => 20,
+        GameFontFamilyAndSize.Meidinger40 => 40,
+        GameFontFamilyAndSize.MiedingerMid10 => 10,
+        GameFontFamilyAndSize.MiedingerMid12 => 12,
+        GameFontFamilyAndSize.MiedingerMid14 => 14,
+        GameFontFamilyAndSize.MiedingerMid18 => 18,
+        GameFontFamilyAndSize.MiedingerMid36 => 36,
+        GameFontFamilyAndSize.TrumpGothic184 => 18.4f,
+        GameFontFamilyAndSize.TrumpGothic23 => 23,
+        GameFontFamilyAndSize.TrumpGothic34 => 34,
+        GameFontFamilyAndSize.TrumpGothic68 => 8,
+        _ => throw new InvalidOperationException(),
+    };
+
+    /// <summary>
+    /// Gets the base font size in pixel unit.
+    /// </summary>
+    public float BaseSizePx => this.BaseSizePt * 4 / 3;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this font is bold.
+    /// </summary>
+    public bool Bold
+    {
+        get => this.Weight > 0f;
+        set => this.Weight = value ? 1f : 0f;
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this font is italic.
+    /// </summary>
+    public bool Italic
+    {
+        get => this.SkewStrength != 0;
+        set => this.SkewStrength = value ? this.SizePx / 7 : 0;
+    }
+
+    /// <summary>
+    /// Gets the recommend GameFontFamilyAndSize given family and size.
+    /// </summary>
+    /// <param name="family">Font family.</param>
+    /// <param name="size">Font size in points.</param>
+    /// <returns>Recommended GameFontFamilyAndSize.</returns>
+    public static GameFontFamilyAndSize GetRecommendedFamilyAndSize(GameFontFamily family, float size)
+    {
+        if (size <= 0)
+            return GameFontFamilyAndSize.Undefined;
+
+        switch (family)
         {
-            this.FamilyAndSize = GetRecommendedFamilyAndSize(family, sizePx * 3 / 4);
-            this.Weight = this.SkewStrength = 0f;
-            this.SizePx = sizePx;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameFontStyle"/> struct.
-        /// </summary>
-        /// <param name="familyAndSize">Font family and size.</param>
-        public GameFontStyle(GameFontFamilyAndSize familyAndSize)
-        {
-            this.FamilyAndSize = familyAndSize;
-            this.Weight = this.SkewStrength = 0f;
-
-            // Dummy assignment to satisfy requirements
-            this.SizePx = 0;
-
-            this.SizePx = this.BaseSizePx;
-        }
-
-        /// <summary>
-        /// Gets or sets the size of the font in points unit.
-        /// </summary>
-        public float SizePt
-        {
-            get => this.SizePx * 3 / 4;
-            set => this.SizePx = value * 4 / 3;
-        }
-
-        /// <summary>
-        /// Gets or sets the base skew strength.
-        /// </summary>
-        public float BaseSkewStrength
-        {
-            get => this.SkewStrength * this.BaseSizePx / this.SizePx;
-            set => this.SkewStrength = value * this.SizePx / this.BaseSizePx;
-        }
-
-        /// <summary>
-        /// Gets the font family.
-        /// </summary>
-        public GameFontFamily Family => this.FamilyAndSize switch
-        {
-            GameFontFamilyAndSize.Undefined => GameFontFamily.Undefined,
-            GameFontFamilyAndSize.Axis96 => GameFontFamily.Axis,
-            GameFontFamilyAndSize.Axis12 => GameFontFamily.Axis,
-            GameFontFamilyAndSize.Axis14 => GameFontFamily.Axis,
-            GameFontFamilyAndSize.Axis18 => GameFontFamily.Axis,
-            GameFontFamilyAndSize.Axis36 => GameFontFamily.Axis,
-            GameFontFamilyAndSize.Jupiter16 => GameFontFamily.Jupiter,
-            GameFontFamilyAndSize.Jupiter20 => GameFontFamily.Jupiter,
-            GameFontFamilyAndSize.Jupiter23 => GameFontFamily.Jupiter,
-            GameFontFamilyAndSize.Jupiter45 => GameFontFamily.JupiterNumeric,
-            GameFontFamilyAndSize.Jupiter46 => GameFontFamily.Jupiter,
-            GameFontFamilyAndSize.Jupiter90 => GameFontFamily.JupiterNumeric,
-            GameFontFamilyAndSize.Meidinger16 => GameFontFamily.Meidinger,
-            GameFontFamilyAndSize.Meidinger20 => GameFontFamily.Meidinger,
-            GameFontFamilyAndSize.Meidinger40 => GameFontFamily.Meidinger,
-            GameFontFamilyAndSize.MiedingerMid10 => GameFontFamily.MiedingerMid,
-            GameFontFamilyAndSize.MiedingerMid12 => GameFontFamily.MiedingerMid,
-            GameFontFamilyAndSize.MiedingerMid14 => GameFontFamily.MiedingerMid,
-            GameFontFamilyAndSize.MiedingerMid18 => GameFontFamily.MiedingerMid,
-            GameFontFamilyAndSize.MiedingerMid36 => GameFontFamily.MiedingerMid,
-            GameFontFamilyAndSize.TrumpGothic184 => GameFontFamily.TrumpGothic,
-            GameFontFamilyAndSize.TrumpGothic23 => GameFontFamily.TrumpGothic,
-            GameFontFamilyAndSize.TrumpGothic34 => GameFontFamily.TrumpGothic,
-            GameFontFamilyAndSize.TrumpGothic68 => GameFontFamily.TrumpGothic,
-            _ => throw new InvalidOperationException(),
-        };
-
-        /// <summary>
-        /// Gets the corresponding GameFontFamilyAndSize but with minimum possible font sizes.
-        /// </summary>
-        public GameFontFamilyAndSize FamilyWithMinimumSize => this.Family switch
-        {
-            GameFontFamily.Axis => GameFontFamilyAndSize.Axis96,
-            GameFontFamily.Jupiter => GameFontFamilyAndSize.Jupiter16,
-            GameFontFamily.JupiterNumeric => GameFontFamilyAndSize.Jupiter45,
-            GameFontFamily.Meidinger => GameFontFamilyAndSize.Meidinger16,
-            GameFontFamily.MiedingerMid => GameFontFamilyAndSize.MiedingerMid10,
-            GameFontFamily.TrumpGothic => GameFontFamilyAndSize.TrumpGothic184,
-            _ => GameFontFamilyAndSize.Undefined,
-        };
-
-        /// <summary>
-        /// Gets the base font size in point unit.
-        /// </summary>
-        public float BaseSizePt => this.FamilyAndSize switch
-        {
-            GameFontFamilyAndSize.Undefined => 0,
-            GameFontFamilyAndSize.Axis96 => 9.6f,
-            GameFontFamilyAndSize.Axis12 => 12,
-            GameFontFamilyAndSize.Axis14 => 14,
-            GameFontFamilyAndSize.Axis18 => 18,
-            GameFontFamilyAndSize.Axis36 => 36,
-            GameFontFamilyAndSize.Jupiter16 => 16,
-            GameFontFamilyAndSize.Jupiter20 => 20,
-            GameFontFamilyAndSize.Jupiter23 => 23,
-            GameFontFamilyAndSize.Jupiter45 => 45,
-            GameFontFamilyAndSize.Jupiter46 => 46,
-            GameFontFamilyAndSize.Jupiter90 => 90,
-            GameFontFamilyAndSize.Meidinger16 => 16,
-            GameFontFamilyAndSize.Meidinger20 => 20,
-            GameFontFamilyAndSize.Meidinger40 => 40,
-            GameFontFamilyAndSize.MiedingerMid10 => 10,
-            GameFontFamilyAndSize.MiedingerMid12 => 12,
-            GameFontFamilyAndSize.MiedingerMid14 => 14,
-            GameFontFamilyAndSize.MiedingerMid18 => 18,
-            GameFontFamilyAndSize.MiedingerMid36 => 36,
-            GameFontFamilyAndSize.TrumpGothic184 => 18.4f,
-            GameFontFamilyAndSize.TrumpGothic23 => 23,
-            GameFontFamilyAndSize.TrumpGothic34 => 34,
-            GameFontFamilyAndSize.TrumpGothic68 => 8,
-            _ => throw new InvalidOperationException(),
-        };
-
-        /// <summary>
-        /// Gets the base font size in pixel unit.
-        /// </summary>
-        public float BaseSizePx => this.BaseSizePt * 4 / 3;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this font is bold.
-        /// </summary>
-        public bool Bold
-        {
-            get => this.Weight > 0f;
-            set => this.Weight = value ? 1f : 0f;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this font is italic.
-        /// </summary>
-        public bool Italic
-        {
-            get => this.SkewStrength != 0;
-            set => this.SkewStrength = value ? this.SizePx / 7 : 0;
-        }
-
-        /// <summary>
-        /// Gets the recommend GameFontFamilyAndSize given family and size.
-        /// </summary>
-        /// <param name="family">Font family.</param>
-        /// <param name="size">Font size in points.</param>
-        /// <returns>Recommended GameFontFamilyAndSize.</returns>
-        public static GameFontFamilyAndSize GetRecommendedFamilyAndSize(GameFontFamily family, float size)
-        {
-            if (size <= 0)
+            case GameFontFamily.Undefined:
                 return GameFontFamilyAndSize.Undefined;
 
-            switch (family)
-            {
-                case GameFontFamily.Undefined:
-                    return GameFontFamilyAndSize.Undefined;
+            case GameFontFamily.Axis:
+                if (size <= 9.601)
+                    return GameFontFamilyAndSize.Axis96;
+                else if (size <= 12.001)
+                    return GameFontFamilyAndSize.Axis12;
+                else if (size <= 14.001)
+                    return GameFontFamilyAndSize.Axis14;
+                else if (size <= 18.001)
+                    return GameFontFamilyAndSize.Axis18;
+                else
+                    return GameFontFamilyAndSize.Axis36;
 
-                case GameFontFamily.Axis:
-                    if (size <= 9.601)
-                        return GameFontFamilyAndSize.Axis96;
-                    else if (size <= 12.001)
-                        return GameFontFamilyAndSize.Axis12;
-                    else if (size <= 14.001)
-                        return GameFontFamilyAndSize.Axis14;
-                    else if (size <= 18.001)
-                        return GameFontFamilyAndSize.Axis18;
-                    else
-                        return GameFontFamilyAndSize.Axis36;
+            case GameFontFamily.Jupiter:
+                if (size <= 16.001)
+                    return GameFontFamilyAndSize.Jupiter16;
+                else if (size <= 20.001)
+                    return GameFontFamilyAndSize.Jupiter20;
+                else if (size <= 23.001)
+                    return GameFontFamilyAndSize.Jupiter23;
+                else
+                    return GameFontFamilyAndSize.Jupiter46;
 
-                case GameFontFamily.Jupiter:
-                    if (size <= 16.001)
-                        return GameFontFamilyAndSize.Jupiter16;
-                    else if (size <= 20.001)
-                        return GameFontFamilyAndSize.Jupiter20;
-                    else if (size <= 23.001)
-                        return GameFontFamilyAndSize.Jupiter23;
-                    else
-                        return GameFontFamilyAndSize.Jupiter46;
+            case GameFontFamily.JupiterNumeric:
+                if (size <= 45.001)
+                    return GameFontFamilyAndSize.Jupiter45;
+                else
+                    return GameFontFamilyAndSize.Jupiter90;
 
-                case GameFontFamily.JupiterNumeric:
-                    if (size <= 45.001)
-                        return GameFontFamilyAndSize.Jupiter45;
-                    else
-                        return GameFontFamilyAndSize.Jupiter90;
+            case GameFontFamily.Meidinger:
+                if (size <= 16.001)
+                    return GameFontFamilyAndSize.Meidinger16;
+                else if (size <= 20.001)
+                    return GameFontFamilyAndSize.Meidinger20;
+                else
+                    return GameFontFamilyAndSize.Meidinger40;
 
-                case GameFontFamily.Meidinger:
-                    if (size <= 16.001)
-                        return GameFontFamilyAndSize.Meidinger16;
-                    else if (size <= 20.001)
-                        return GameFontFamilyAndSize.Meidinger20;
-                    else
-                        return GameFontFamilyAndSize.Meidinger40;
+            case GameFontFamily.MiedingerMid:
+                if (size <= 10.001)
+                    return GameFontFamilyAndSize.MiedingerMid10;
+                else if (size <= 12.001)
+                    return GameFontFamilyAndSize.MiedingerMid12;
+                else if (size <= 14.001)
+                    return GameFontFamilyAndSize.MiedingerMid14;
+                else if (size <= 18.001)
+                    return GameFontFamilyAndSize.MiedingerMid18;
+                else
+                    return GameFontFamilyAndSize.MiedingerMid36;
 
-                case GameFontFamily.MiedingerMid:
-                    if (size <= 10.001)
-                        return GameFontFamilyAndSize.MiedingerMid10;
-                    else if (size <= 12.001)
-                        return GameFontFamilyAndSize.MiedingerMid12;
-                    else if (size <= 14.001)
-                        return GameFontFamilyAndSize.MiedingerMid14;
-                    else if (size <= 18.001)
-                        return GameFontFamilyAndSize.MiedingerMid18;
-                    else
-                        return GameFontFamilyAndSize.MiedingerMid36;
+            case GameFontFamily.TrumpGothic:
+                if (size <= 18.401)
+                    return GameFontFamilyAndSize.TrumpGothic184;
+                else if (size <= 23.001)
+                    return GameFontFamilyAndSize.TrumpGothic23;
+                else if (size <= 34.001)
+                    return GameFontFamilyAndSize.TrumpGothic34;
+                else
+                    return GameFontFamilyAndSize.TrumpGothic68;
 
-                case GameFontFamily.TrumpGothic:
-                    if (size <= 18.401)
-                        return GameFontFamilyAndSize.TrumpGothic184;
-                    else if (size <= 23.001)
-                        return GameFontFamilyAndSize.TrumpGothic23;
-                    else if (size <= 34.001)
-                        return GameFontFamilyAndSize.TrumpGothic34;
-                    else
-                        return GameFontFamilyAndSize.TrumpGothic68;
-
-                default:
-                    return GameFontFamilyAndSize.Undefined;
-            }
-        }
-
-        /// <summary>
-        /// Calculates the adjustment to width resulting fron Weight and SkewStrength.
-        /// </summary>
-        /// <param name="reader">Font information.</param>
-        /// <param name="glyph">Glyph.</param>
-        /// <returns>Width adjustment in pixel unit.</returns>
-        public int CalculateBaseWidthAdjustment(FdtReader reader, FdtReader.FontTableEntry glyph)
-        {
-            var widthDelta = this.Weight;
-            if (this.BaseSkewStrength > 0)
-                widthDelta += 1f * this.BaseSkewStrength * (reader.FontHeader.LineHeight - glyph.CurrentOffsetY) / reader.FontHeader.LineHeight;
-            else if (this.BaseSkewStrength < 0)
-                widthDelta -= 1f * this.BaseSkewStrength * (glyph.CurrentOffsetY + glyph.BoundingHeight) / reader.FontHeader.LineHeight;
-
-            return (int)Math.Ceiling(widthDelta);
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"GameFontStyle({this.FamilyAndSize}, {this.SizePt}pt, skew={this.SkewStrength}, weight={this.Weight})";
+            default:
+                return GameFontFamilyAndSize.Undefined;
         }
     }
+
+    /// <summary>
+    /// Calculates the adjustment to width resulting fron Weight and SkewStrength.
+    /// </summary>
+    /// <param name="reader">Font information.</param>
+    /// <param name="glyph">Glyph.</param>
+    /// <returns>Width adjustment in pixel unit.</returns>
+    public int CalculateBaseWidthAdjustment(FdtReader reader, FdtReader.FontTableEntry glyph)
+    {
+        var widthDelta = this.Weight;
+        if (this.BaseSkewStrength > 0)
+            widthDelta += 1f * this.BaseSkewStrength * (reader.FontHeader.LineHeight - glyph.CurrentOffsetY) / reader.FontHeader.LineHeight;
+        else if (this.BaseSkewStrength < 0)
+            widthDelta -= 1f * this.BaseSkewStrength * (glyph.CurrentOffsetY + glyph.BoundingHeight) / reader.FontHeader.LineHeight;
+
+        return (int)Math.Ceiling(widthDelta);
+    }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"GameFontStyle({this.FamilyAndSize}, {this.SizePt}pt, skew={this.SkewStrength}, weight={this.Weight})";
+    }
 }
diff --git a/Dalamud/Interface/GlyphRangesJapanese.cs b/Dalamud/Interface/GlyphRangesJapanese.cs
index 3c44492ff..2773b9db5 100644
--- a/Dalamud/Interface/GlyphRangesJapanese.cs
+++ b/Dalamud/Interface/GlyphRangesJapanese.cs
@@ -1,529 +1,528 @@
-namespace Dalamud.Interface
+namespace Dalamud.Interface;
+
+/// <summary>
+/// Unicode glyph ranges for the Japanese language.
+/// </summary>
+public static class GlyphRangesJapanese
 {
     /// <summary>
-    /// Unicode glyph ranges for the Japanese language.
+    /// Gets the unicode glyph ranges for the Japanese language.
     /// </summary>
-    public static class GlyphRangesJapanese
+    public static ushort[] GlyphRanges => new ushort[]
     {
-        /// <summary>
-        /// Gets the unicode glyph ranges for the Japanese language.
-        /// </summary>
-        public static ushort[] GlyphRanges => new ushort[]
-        {
-            0x0020, 0x00FF, 0x0391, 0x03A1, 0x03A3, 0x03A9, 0x03B1, 0x03C1, 0x03C3, 0x03C9, 0x0401, 0x0401, 0x0410, 0x044F, 0x0451, 0x0451,
-            0x2000, 0x206F, 0x2103, 0x2103, 0x212B, 0x212B, 0x2190, 0x2193, 0x21D2, 0x21D2, 0x21D4, 0x21D4, 0x2200, 0x2200, 0x2202, 0x2203,
-            0x2207, 0x2208, 0x220B, 0x220B, 0x2212, 0x2212, 0x221A, 0x221A, 0x221D, 0x221E, 0x2220, 0x2220, 0x2227, 0x222C, 0x2234, 0x2235,
-            0x223D, 0x223D, 0x2252, 0x2252, 0x2260, 0x2261, 0x2266, 0x2267, 0x226A, 0x226B, 0x2282, 0x2283, 0x2286, 0x2287, 0x22A5, 0x22A5,
-            0x2312, 0x2312, 0x2500, 0x2503, 0x250C, 0x250C, 0x250F, 0x2510, 0x2513, 0x2514, 0x2517, 0x2518, 0x251B, 0x251D, 0x2520, 0x2520,
-            0x2523, 0x2525, 0x2528, 0x2528, 0x252B, 0x252C, 0x252F, 0x2530, 0x2533, 0x2534, 0x2537, 0x2538, 0x253B, 0x253C, 0x253F, 0x253F,
-            0x2542, 0x2542, 0x254B, 0x254B, 0x25A0, 0x25A1, 0x25B2, 0x25B3, 0x25BC, 0x25BD, 0x25C6, 0x25C7, 0x25CB, 0x25CB, 0x25CE, 0x25CF,
-            0x25EF, 0x25EF, 0x2605, 0x2606, 0x2640, 0x2640, 0x2642, 0x2642, 0x266A, 0x266A, 0x266D, 0x266D, 0x266F, 0x266F, 0x3000, 0x30FF,
-            0x31F0, 0x31FF, 0x4E00, 0x4E01, 0x4E03, 0x4E03,
-            0x4E07, 0x4E0B, 0x4E0D, 0x4E0E, 0x4E10, 0x4E11, 0x4E14, 0x4E19, 0x4E1E, 0x4E1E, 0x4E21, 0x4E21, 0x4E26, 0x4E26, 0x4E2A, 0x4E2A,
-            0x4E2D, 0x4E2D, 0x4E31, 0x4E32, 0x4E36, 0x4E36, 0x4E38, 0x4E39, 0x4E3B, 0x4E3C, 0x4E3F, 0x4E3F, 0x4E42, 0x4E43, 0x4E45, 0x4E45,
-            0x4E4B, 0x4E4B, 0x4E4D, 0x4E4F, 0x4E55, 0x4E59, 0x4E5D, 0x4E5F, 0x4E62, 0x4E62, 0x4E71, 0x4E71, 0x4E73, 0x4E73, 0x4E7E, 0x4E7E,
-            0x4E80, 0x4E80, 0x4E82, 0x4E82, 0x4E85, 0x4E86, 0x4E88, 0x4E8C, 0x4E8E, 0x4E8E, 0x4E91, 0x4E92, 0x4E94, 0x4E95, 0x4E98, 0x4E99,
-            0x4E9B, 0x4E9C, 0x4E9E, 0x4EA2, 0x4EA4, 0x4EA6, 0x4EA8, 0x4EA8, 0x4EAB, 0x4EAE, 0x4EB0, 0x4EB0, 0x4EB3, 0x4EB3, 0x4EB6, 0x4EB6,
-            0x4EBA, 0x4EBA, 0x4EC0, 0x4EC2, 0x4EC4, 0x4EC4, 0x4EC6, 0x4EC7, 0x4ECA, 0x4ECB, 0x4ECD, 0x4ECF, 0x4ED4, 0x4ED9, 0x4EDD, 0x4EDF,
-            0x4EE3, 0x4EE5, 0x4EED, 0x4EEE, 0x4EF0, 0x4EF0, 0x4EF2, 0x4EF2, 0x4EF6, 0x4EF7, 0x4EFB, 0x4EFB, 0x4F01, 0x4F01, 0x4F09, 0x4F0A,
-            0x4F0D, 0x4F11, 0x4F1A, 0x4F1A, 0x4F1C, 0x4F1D, 0x4F2F, 0x4F30, 0x4F34, 0x4F34, 0x4F36, 0x4F36, 0x4F38, 0x4F38, 0x4F3A, 0x4F3A,
-            0x4F3C, 0x4F3D, 0x4F43, 0x4F43, 0x4F46, 0x4F47, 0x4F4D, 0x4F51, 0x4F53, 0x4F53, 0x4F55, 0x4F55, 0x4F57, 0x4F57, 0x4F59, 0x4F5E,
-            0x4F69, 0x4F69, 0x4F6F, 0x4F70, 0x4F73, 0x4F73, 0x4F75, 0x4F76, 0x4F7B, 0x4F7C, 0x4F7F, 0x4F7F, 0x4F83, 0x4F83, 0x4F86, 0x4F86,
-            0x4F88, 0x4F88, 0x4F8B, 0x4F8B, 0x4F8D, 0x4F8D, 0x4F8F, 0x4F8F, 0x4F91, 0x4F91, 0x4F96, 0x4F96, 0x4F98, 0x4F98, 0x4F9B, 0x4F9B,
-            0x4F9D, 0x4F9D, 0x4FA0, 0x4FA1, 0x4FAB, 0x4FAB, 0x4FAD, 0x4FAF, 0x4FB5, 0x4FB6, 0x4FBF, 0x4FBF, 0x4FC2, 0x4FC4, 0x4FCA, 0x4FCA,
-            0x4FCE, 0x4FCE, 0x4FD0, 0x4FD1, 0x4FD4, 0x4FD4, 0x4FD7, 0x4FD8, 0x4FDA, 0x4FDB, 0x4FDD, 0x4FDD, 0x4FDF, 0x4FDF, 0x4FE1, 0x4FE1,
-            0x4FE3, 0x4FE5, 0x4FEE, 0x4FEF, 0x4FF3, 0x4FF3, 0x4FF5, 0x4FF6, 0x4FF8, 0x4FF8, 0x4FFA, 0x4FFA, 0x4FFE, 0x4FFE, 0x5005, 0x5006,
-            0x5009, 0x5009, 0x500B, 0x500B, 0x500D, 0x500D, 0x500F, 0x500F, 0x5011, 0x5012, 0x5014, 0x5014, 0x5016, 0x5016, 0x5019, 0x501A,
-            0x501F, 0x501F, 0x5021, 0x5021, 0x5023, 0x5026, 0x5028, 0x502D, 0x5036, 0x5036, 0x5039, 0x5039, 0x5043, 0x5043, 0x5047, 0x5049,
-            0x504F, 0x5050, 0x5055, 0x5056, 0x505A, 0x505A, 0x505C, 0x505C, 0x5065, 0x5065, 0x506C, 0x506C, 0x5072, 0x5072, 0x5074, 0x5076,
-            0x5078, 0x5078, 0x507D, 0x507D, 0x5080, 0x5080, 0x5085, 0x5085, 0x508D, 0x508D, 0x5091, 0x5091, 0x5098, 0x509A, 0x50AC, 0x50AD,
-            0x50B2, 0x50B5, 0x50B7, 0x50B7, 0x50BE, 0x50BE, 0x50C2, 0x50C2, 0x50C5, 0x50C5, 0x50C9, 0x50CA, 0x50CD, 0x50CD, 0x50CF, 0x50CF,
-            0x50D1, 0x50D1, 0x50D5, 0x50D6, 0x50DA, 0x50DA, 0x50DE, 0x50DE, 0x50E3, 0x50E3, 0x50E5, 0x50E5, 0x50E7, 0x50E7, 0x50ED, 0x50EE,
-            0x50F5, 0x50F5, 0x50F9, 0x50F9, 0x50FB, 0x50FB, 0x5100, 0x5102, 0x5104, 0x5104, 0x5109, 0x5109, 0x5112, 0x5112, 0x5114, 0x5116,
-            0x5118, 0x5118, 0x511A, 0x511A, 0x511F, 0x511F, 0x5121, 0x5121, 0x512A, 0x512A, 0x5132, 0x5132, 0x5137, 0x5137, 0x513A, 0x513C,
-            0x513F, 0x5141, 0x5143, 0x5149, 0x514B, 0x514E, 0x5150, 0x5150, 0x5152, 0x5152, 0x5154, 0x5154, 0x515A, 0x515A, 0x515C, 0x515C,
-            0x5162, 0x5162, 0x5165, 0x5165, 0x5168, 0x516E, 0x5171, 0x5171, 0x5175, 0x5178, 0x517C, 0x517C, 0x5180, 0x5180, 0x5182, 0x5182,
-            0x5185, 0x5186, 0x5189, 0x518A, 0x518C, 0x518D, 0x518F, 0x5193, 0x5195, 0x5197, 0x5199, 0x5199, 0x51A0, 0x51A0, 0x51A2, 0x51A2,
-            0x51A4, 0x51A6, 0x51A8, 0x51AC, 0x51B0, 0x51B7, 0x51BD, 0x51BD, 0x51C4, 0x51C6, 0x51C9, 0x51C9, 0x51CB, 0x51CD, 0x51D6, 0x51D6,
-            0x51DB, 0x51DD, 0x51E0, 0x51E1, 0x51E6, 0x51E7, 0x51E9, 0x51EA, 0x51ED, 0x51ED, 0x51F0, 0x51F1, 0x51F5, 0x51F6, 0x51F8, 0x51FA,
-            0x51FD, 0x51FE, 0x5200, 0x5200, 0x5203, 0x5204, 0x5206, 0x5208, 0x520A, 0x520B, 0x520E, 0x520E, 0x5211, 0x5211, 0x5214, 0x5214,
-            0x5217, 0x5217, 0x521D, 0x521D, 0x5224, 0x5225, 0x5227, 0x5227, 0x5229, 0x522A, 0x522E, 0x522E, 0x5230, 0x5230, 0x5233, 0x5233,
-            0x5236, 0x523B, 0x5243, 0x5244, 0x5247, 0x5247, 0x524A, 0x524D, 0x524F, 0x524F, 0x5254, 0x5254, 0x5256, 0x5256, 0x525B, 0x525B,
-            0x525E, 0x525E, 0x5263, 0x5265, 0x5269, 0x526A, 0x526F, 0x5275, 0x527D, 0x527D, 0x527F, 0x527F, 0x5283, 0x5283, 0x5287, 0x5289,
-            0x528D, 0x528D, 0x5291, 0x5292, 0x5294, 0x5294, 0x529B, 0x529B, 0x529F, 0x52A0, 0x52A3, 0x52A3, 0x52A9, 0x52AD, 0x52B1, 0x52B1,
-            0x52B4, 0x52B5, 0x52B9, 0x52B9, 0x52BC, 0x52BC, 0x52BE, 0x52BE, 0x52C1, 0x52C1, 0x52C3, 0x52C3, 0x52C5, 0x52C5, 0x52C7, 0x52C7,
-            0x52C9, 0x52C9, 0x52CD, 0x52CD, 0x52D2, 0x52D2, 0x52D5, 0x52D5, 0x52D7, 0x52D9, 0x52DD, 0x52E0, 0x52E2, 0x52E4, 0x52E6, 0x52E7,
-            0x52F2, 0x52F3, 0x52F5, 0x52F5, 0x52F8, 0x52FA, 0x52FE, 0x52FF, 0x5301, 0x5302, 0x5305, 0x5306, 0x5308, 0x5308, 0x530D, 0x530D,
-            0x530F, 0x5310, 0x5315, 0x5317, 0x5319, 0x531A, 0x531D, 0x531D, 0x5320, 0x5321, 0x5323, 0x5323, 0x532A, 0x532A, 0x532F, 0x532F,
-            0x5331, 0x5331, 0x5333, 0x5333, 0x5338, 0x533B, 0x533F, 0x5341, 0x5343, 0x5343, 0x5345, 0x534A, 0x534D, 0x534D, 0x5351, 0x5354,
-            0x5357, 0x5358, 0x535A, 0x535A, 0x535C, 0x535C, 0x535E, 0x535E, 0x5360, 0x5360, 0x5366, 0x5366, 0x5369, 0x5369, 0x536E, 0x5371,
-            0x5373, 0x5375, 0x5377, 0x5378, 0x537B, 0x537B, 0x537F, 0x537F, 0x5382, 0x5382, 0x5384, 0x5384, 0x5396, 0x5396, 0x5398, 0x5398,
-            0x539A, 0x539A, 0x539F, 0x53A0, 0x53A5, 0x53A6, 0x53A8, 0x53A9, 0x53AD, 0x53AE, 0x53B0, 0x53B0, 0x53B3, 0x53B3, 0x53B6, 0x53B6,
-            0x53BB, 0x53BB, 0x53C2, 0x53C3, 0x53C8, 0x53CE, 0x53D4, 0x53D4, 0x53D6, 0x53D7, 0x53D9, 0x53D9, 0x53DB, 0x53DB, 0x53DF, 0x53DF,
-            0x53E1, 0x53E5, 0x53E8, 0x53F3, 0x53F6, 0x53F8, 0x53FA, 0x53FA, 0x5401, 0x5401, 0x5403, 0x5404, 0x5408, 0x5411, 0x541B, 0x541B,
-            0x541D, 0x541D, 0x541F, 0x5420, 0x5426, 0x5426, 0x5429, 0x5429, 0x542B, 0x542E, 0x5436, 0x5436, 0x5438, 0x5439, 0x543B, 0x543E,
-            0x5440, 0x5440, 0x5442, 0x5442, 0x5446, 0x5446, 0x5448, 0x544A, 0x544E, 0x544E, 0x5451, 0x5451, 0x545F, 0x545F, 0x5468, 0x5468,
-            0x546A, 0x546A, 0x5470, 0x5471, 0x5473, 0x5473, 0x5475, 0x5477, 0x547B, 0x547D, 0x5480, 0x5480, 0x5484, 0x5484, 0x5486, 0x5486,
-            0x548B, 0x548C, 0x548E, 0x5490, 0x5492, 0x5492, 0x54A2, 0x54A2, 0x54A4, 0x54A5, 0x54A8, 0x54A8, 0x54AB, 0x54AC, 0x54AF, 0x54AF,
-            0x54B2, 0x54B3, 0x54B8, 0x54B8, 0x54BC, 0x54BE, 0x54C0, 0x54C2, 0x54C4, 0x54C4, 0x54C7, 0x54C9, 0x54D8, 0x54D8, 0x54E1, 0x54E2,
-            0x54E5, 0x54E6, 0x54E8, 0x54E9, 0x54ED, 0x54EE, 0x54F2, 0x54F2, 0x54FA, 0x54FA, 0x54FD, 0x54FD, 0x5504, 0x5504, 0x5506, 0x5507,
-            0x550F, 0x5510, 0x5514, 0x5514, 0x5516, 0x5516, 0x552E, 0x552F, 0x5531, 0x5531, 0x5533, 0x5533, 0x5538, 0x5539, 0x553E, 0x553E,
-            0x5540, 0x5540, 0x5544, 0x5546, 0x554C, 0x554C, 0x554F, 0x554F, 0x5553, 0x5553, 0x5556, 0x5557, 0x555C, 0x555D, 0x5563, 0x5563,
-            0x557B, 0x557C, 0x557E, 0x557E, 0x5580, 0x5580, 0x5583, 0x5584, 0x5587, 0x5587, 0x5589, 0x558B, 0x5598, 0x559A, 0x559C, 0x559F,
-            0x55A7, 0x55AC, 0x55AE, 0x55AE, 0x55B0, 0x55B0, 0x55B6, 0x55B6, 0x55C4, 0x55C5, 0x55C7, 0x55C7, 0x55D4, 0x55D4, 0x55DA, 0x55DA,
-            0x55DC, 0x55DC, 0x55DF, 0x55DF, 0x55E3, 0x55E4, 0x55F7, 0x55F7, 0x55F9, 0x55F9, 0x55FD, 0x55FE, 0x5606, 0x5606, 0x5609, 0x5609,
-            0x5614, 0x5614, 0x5616, 0x5618, 0x561B, 0x561B, 0x5629, 0x5629, 0x562F, 0x562F, 0x5631, 0x5632, 0x5634, 0x5634, 0x5636, 0x5636,
-            0x5638, 0x5638, 0x5642, 0x5642, 0x564C, 0x564C, 0x564E, 0x564E, 0x5650, 0x5650, 0x565B, 0x565B, 0x5664, 0x5664, 0x5668, 0x5668,
-            0x566A, 0x566C, 0x5674, 0x5674, 0x5678, 0x5678, 0x567A, 0x567A, 0x5680, 0x5680, 0x5686, 0x5687, 0x568A, 0x568A, 0x568F, 0x568F,
-            0x5694, 0x5694, 0x56A0, 0x56A0, 0x56A2, 0x56A2, 0x56A5, 0x56A5, 0x56AE, 0x56AE, 0x56B4, 0x56B4, 0x56B6, 0x56B6, 0x56BC, 0x56BC,
-            0x56C0, 0x56C3, 0x56C8, 0x56C8, 0x56CE, 0x56CE, 0x56D1, 0x56D1, 0x56D3, 0x56D3, 0x56D7, 0x56D8, 0x56DA, 0x56DB, 0x56DE, 0x56DE,
-            0x56E0, 0x56E0, 0x56E3, 0x56E3, 0x56EE, 0x56EE, 0x56F0, 0x56F0, 0x56F2, 0x56F3, 0x56F9, 0x56FA, 0x56FD, 0x56FD, 0x56FF, 0x5700,
-            0x5703, 0x5704, 0x5708, 0x5709, 0x570B, 0x570B, 0x570D, 0x570D, 0x570F, 0x570F, 0x5712, 0x5713, 0x5716, 0x5716, 0x5718, 0x5718,
-            0x571C, 0x571C, 0x571F, 0x571F, 0x5726, 0x5728, 0x572D, 0x572D, 0x5730, 0x5730, 0x5737, 0x5738, 0x573B, 0x573B, 0x5740, 0x5740,
-            0x5742, 0x5742, 0x5747, 0x5747, 0x574A, 0x574A, 0x574E, 0x5751, 0x5761, 0x5761, 0x5764, 0x5764, 0x5766, 0x5766, 0x5769, 0x576A,
-            0x577F, 0x577F, 0x5782, 0x5782, 0x5788, 0x5789, 0x578B, 0x578B, 0x5793, 0x5793, 0x57A0, 0x57A0, 0x57A2, 0x57A4, 0x57AA, 0x57AA,
-            0x57B0, 0x57B0, 0x57B3, 0x57B3, 0x57C0, 0x57C0, 0x57C3, 0x57C3, 0x57C6, 0x57C6, 0x57CB, 0x57CB, 0x57CE, 0x57CE, 0x57D2, 0x57D4,
-            0x57D6, 0x57D6, 0x57DC, 0x57DC, 0x57DF, 0x57E0, 0x57E3, 0x57E3, 0x57F4, 0x57F4, 0x57F7, 0x57F7, 0x57F9, 0x57FA, 0x57FC, 0x57FC,
-            0x5800, 0x5800, 0x5802, 0x5802, 0x5805, 0x5806, 0x580A, 0x580B, 0x5815, 0x5815, 0x5819, 0x5819, 0x581D, 0x581D, 0x5821, 0x5821,
-            0x5824, 0x5824, 0x582A, 0x582A, 0x582F, 0x5831, 0x5834, 0x5835, 0x583A, 0x583A, 0x583D, 0x583D, 0x5840, 0x5841, 0x584A, 0x584B,
-            0x5851, 0x5852, 0x5854, 0x5854, 0x5857, 0x585A, 0x585E, 0x585E, 0x5862, 0x5862, 0x5869, 0x5869, 0x586B, 0x586B, 0x5870, 0x5870,
-            0x5872, 0x5872, 0x5875, 0x5875, 0x5879, 0x5879, 0x587E, 0x587E, 0x5883, 0x5883, 0x5885, 0x5885, 0x5893, 0x5893, 0x5897, 0x5897,
-            0x589C, 0x589C, 0x589F, 0x589F, 0x58A8, 0x58A8, 0x58AB, 0x58AB, 0x58AE, 0x58AE, 0x58B3, 0x58B3, 0x58B8, 0x58BB, 0x58BE, 0x58BE,
-            0x58C1, 0x58C1, 0x58C5, 0x58C5, 0x58C7, 0x58C7, 0x58CA, 0x58CA, 0x58CC, 0x58CC, 0x58D1, 0x58D1, 0x58D3, 0x58D3, 0x58D5, 0x58D5,
-            0x58D7, 0x58D9, 0x58DC, 0x58DC, 0x58DE, 0x58DF, 0x58E4, 0x58E5, 0x58EB, 0x58EC, 0x58EE, 0x58F2, 0x58F7, 0x58F7, 0x58F9, 0x58FD,
-            0x5902, 0x5902, 0x5909, 0x590A, 0x590F, 0x5910, 0x5915, 0x5916, 0x5918, 0x591C, 0x5922, 0x5922, 0x5925, 0x5925, 0x5927, 0x5927,
-            0x5929, 0x592E, 0x5931, 0x5932, 0x5937, 0x5938, 0x593E, 0x593E, 0x5944, 0x5944, 0x5947, 0x5949, 0x594E, 0x5951, 0x5954, 0x5955,
-            0x5957, 0x5958, 0x595A, 0x595A, 0x5960, 0x5960, 0x5962, 0x5962, 0x5965, 0x5965, 0x5967, 0x596A, 0x596C, 0x596C, 0x596E, 0x596E,
-            0x5973, 0x5974, 0x5978, 0x5978, 0x597D, 0x597D, 0x5981, 0x5984, 0x598A, 0x598A, 0x598D, 0x598D, 0x5993, 0x5993, 0x5996, 0x5996,
-            0x5999, 0x5999, 0x599B, 0x599B, 0x599D, 0x599D, 0x59A3, 0x59A3, 0x59A5, 0x59A5, 0x59A8, 0x59A8, 0x59AC, 0x59AC, 0x59B2, 0x59B2,
-            0x59B9, 0x59B9, 0x59BB, 0x59BB, 0x59BE, 0x59BE, 0x59C6, 0x59C6, 0x59C9, 0x59C9, 0x59CB, 0x59CB, 0x59D0, 0x59D1, 0x59D3, 0x59D4,
-            0x59D9, 0x59DA, 0x59DC, 0x59DC, 0x59E5, 0x59E6, 0x59E8, 0x59E8, 0x59EA, 0x59EB, 0x59F6, 0x59F6, 0x59FB, 0x59FB, 0x59FF, 0x59FF,
-            0x5A01, 0x5A01, 0x5A03, 0x5A03, 0x5A09, 0x5A09, 0x5A11, 0x5A11, 0x5A18, 0x5A18, 0x5A1A, 0x5A1A, 0x5A1C, 0x5A1C, 0x5A1F, 0x5A20,
-            0x5A25, 0x5A25, 0x5A29, 0x5A29, 0x5A2F, 0x5A2F, 0x5A35, 0x5A36, 0x5A3C, 0x5A3C, 0x5A40, 0x5A41, 0x5A46, 0x5A46, 0x5A49, 0x5A49,
-            0x5A5A, 0x5A5A, 0x5A62, 0x5A62, 0x5A66, 0x5A66, 0x5A6A, 0x5A6A, 0x5A6C, 0x5A6C, 0x5A7F, 0x5A7F, 0x5A92, 0x5A92, 0x5A9A, 0x5A9B,
-            0x5ABC, 0x5ABE, 0x5AC1, 0x5AC2, 0x5AC9, 0x5AC9, 0x5ACB, 0x5ACC, 0x5AD0, 0x5AD0, 0x5AD6, 0x5AD7, 0x5AE1, 0x5AE1, 0x5AE3, 0x5AE3,
-            0x5AE6, 0x5AE6, 0x5AE9, 0x5AE9, 0x5AFA, 0x5AFB, 0x5B09, 0x5B09, 0x5B0B, 0x5B0C, 0x5B16, 0x5B16, 0x5B22, 0x5B22, 0x5B2A, 0x5B2A,
-            0x5B2C, 0x5B2C, 0x5B30, 0x5B30, 0x5B32, 0x5B32, 0x5B36, 0x5B36, 0x5B3E, 0x5B3E, 0x5B40, 0x5B40, 0x5B43, 0x5B43, 0x5B45, 0x5B45,
-            0x5B50, 0x5B51, 0x5B54, 0x5B55, 0x5B57, 0x5B58, 0x5B5A, 0x5B5D, 0x5B5F, 0x5B5F, 0x5B63, 0x5B66, 0x5B69, 0x5B69, 0x5B6B, 0x5B6B,
-            0x5B70, 0x5B71, 0x5B73, 0x5B73, 0x5B75, 0x5B75, 0x5B78, 0x5B78, 0x5B7A, 0x5B7A, 0x5B80, 0x5B80, 0x5B83, 0x5B83, 0x5B85, 0x5B85,
-            0x5B87, 0x5B89, 0x5B8B, 0x5B8D, 0x5B8F, 0x5B8F, 0x5B95, 0x5B95, 0x5B97, 0x5B9D, 0x5B9F, 0x5B9F, 0x5BA2, 0x5BA6, 0x5BAE, 0x5BAE,
-            0x5BB0, 0x5BB0, 0x5BB3, 0x5BB6, 0x5BB8, 0x5BB9, 0x5BBF, 0x5BBF, 0x5BC2, 0x5BC7, 0x5BC9, 0x5BC9, 0x5BCC, 0x5BCC, 0x5BD0, 0x5BD0,
-            0x5BD2, 0x5BD4, 0x5BDB, 0x5BDB, 0x5BDD, 0x5BDF, 0x5BE1, 0x5BE2, 0x5BE4, 0x5BE9, 0x5BEB, 0x5BEB, 0x5BEE, 0x5BEE, 0x5BF0, 0x5BF0,
-            0x5BF3, 0x5BF3, 0x5BF5, 0x5BF6, 0x5BF8, 0x5BF8, 0x5BFA, 0x5BFA, 0x5BFE, 0x5BFF, 0x5C01, 0x5C02, 0x5C04, 0x5C0B, 0x5C0D, 0x5C0F,
-            0x5C11, 0x5C11, 0x5C13, 0x5C13, 0x5C16, 0x5C16, 0x5C1A, 0x5C1A, 0x5C20, 0x5C20, 0x5C22, 0x5C22, 0x5C24, 0x5C24, 0x5C28, 0x5C28,
-            0x5C2D, 0x5C2D, 0x5C31, 0x5C31, 0x5C38, 0x5C41, 0x5C45, 0x5C46, 0x5C48, 0x5C48, 0x5C4A, 0x5C4B, 0x5C4D, 0x5C51, 0x5C53, 0x5C53,
-            0x5C55, 0x5C55, 0x5C5E, 0x5C5E, 0x5C60, 0x5C61, 0x5C64, 0x5C65, 0x5C6C, 0x5C6C, 0x5C6E, 0x5C6F, 0x5C71, 0x5C71, 0x5C76, 0x5C76,
-            0x5C79, 0x5C79, 0x5C8C, 0x5C8C, 0x5C90, 0x5C91, 0x5C94, 0x5C94, 0x5CA1, 0x5CA1, 0x5CA8, 0x5CA9, 0x5CAB, 0x5CAC, 0x5CB1, 0x5CB1,
-            0x5CB3, 0x5CB3, 0x5CB6, 0x5CB8, 0x5CBB, 0x5CBC, 0x5CBE, 0x5CBE, 0x5CC5, 0x5CC5, 0x5CC7, 0x5CC7, 0x5CD9, 0x5CD9, 0x5CE0, 0x5CE1,
-            0x5CE8, 0x5CEA, 0x5CED, 0x5CED, 0x5CEF, 0x5CF0, 0x5CF6, 0x5CF6, 0x5CFA, 0x5CFB, 0x5CFD, 0x5CFD, 0x5D07, 0x5D07, 0x5D0B, 0x5D0B,
-            0x5D0E, 0x5D0E, 0x5D11, 0x5D11, 0x5D14, 0x5D1B, 0x5D1F, 0x5D1F, 0x5D22, 0x5D22, 0x5D29, 0x5D29, 0x5D4B, 0x5D4C, 0x5D4E, 0x5D4E,
-            0x5D50, 0x5D50, 0x5D52, 0x5D52, 0x5D5C, 0x5D5C, 0x5D69, 0x5D69, 0x5D6C, 0x5D6C, 0x5D6F, 0x5D6F, 0x5D73, 0x5D73, 0x5D76, 0x5D76,
-            0x5D82, 0x5D82, 0x5D84, 0x5D84, 0x5D87, 0x5D87, 0x5D8B, 0x5D8C, 0x5D90, 0x5D90, 0x5D9D, 0x5D9D, 0x5DA2, 0x5DA2, 0x5DAC, 0x5DAC,
-            0x5DAE, 0x5DAE, 0x5DB7, 0x5DB7, 0x5DBA, 0x5DBA, 0x5DBC, 0x5DBD, 0x5DC9, 0x5DC9, 0x5DCC, 0x5DCD, 0x5DD2, 0x5DD3, 0x5DD6, 0x5DD6,
-            0x5DDB, 0x5DDB, 0x5DDD, 0x5DDE, 0x5DE1, 0x5DE1, 0x5DE3, 0x5DE3, 0x5DE5, 0x5DE8, 0x5DEB, 0x5DEB, 0x5DEE, 0x5DEE, 0x5DF1, 0x5DF5,
-            0x5DF7, 0x5DF7, 0x5DFB, 0x5DFB, 0x5DFD, 0x5DFE, 0x5E02, 0x5E03, 0x5E06, 0x5E06, 0x5E0B, 0x5E0C, 0x5E11, 0x5E11, 0x5E16, 0x5E16,
-            0x5E19, 0x5E1B, 0x5E1D, 0x5E1D, 0x5E25, 0x5E25, 0x5E2B, 0x5E2B, 0x5E2D, 0x5E2D, 0x5E2F, 0x5E30, 0x5E33, 0x5E33, 0x5E36, 0x5E38,
-            0x5E3D, 0x5E3D, 0x5E40, 0x5E40, 0x5E43, 0x5E45, 0x5E47, 0x5E47, 0x5E4C, 0x5E4C, 0x5E4E, 0x5E4E, 0x5E54, 0x5E55, 0x5E57, 0x5E57,
-            0x5E5F, 0x5E5F, 0x5E61, 0x5E64, 0x5E72, 0x5E76, 0x5E78, 0x5E7F, 0x5E81, 0x5E81, 0x5E83, 0x5E84, 0x5E87, 0x5E87, 0x5E8A, 0x5E8A,
-            0x5E8F, 0x5E8F, 0x5E95, 0x5E97, 0x5E9A, 0x5E9A, 0x5E9C, 0x5E9C, 0x5EA0, 0x5EA0, 0x5EA6, 0x5EA7, 0x5EAB, 0x5EAB, 0x5EAD, 0x5EAD,
-            0x5EB5, 0x5EB8, 0x5EC1, 0x5EC3, 0x5EC8, 0x5ECA, 0x5ECF, 0x5ED0, 0x5ED3, 0x5ED3, 0x5ED6, 0x5ED6, 0x5EDA, 0x5EDB, 0x5EDD, 0x5EDD,
-            0x5EDF, 0x5EE3, 0x5EE8, 0x5EE9, 0x5EEC, 0x5EEC, 0x5EF0, 0x5EF1, 0x5EF3, 0x5EF4, 0x5EF6, 0x5EF8, 0x5EFA, 0x5EFC, 0x5EFE, 0x5EFF,
-            0x5F01, 0x5F01, 0x5F03, 0x5F04, 0x5F09, 0x5F0D, 0x5F0F, 0x5F11, 0x5F13, 0x5F18, 0x5F1B, 0x5F1B, 0x5F1F, 0x5F1F, 0x5F25, 0x5F27,
-            0x5F29, 0x5F29, 0x5F2D, 0x5F2D, 0x5F2F, 0x5F2F, 0x5F31, 0x5F31, 0x5F35, 0x5F35, 0x5F37, 0x5F38, 0x5F3C, 0x5F3C, 0x5F3E, 0x5F3E,
-            0x5F41, 0x5F41, 0x5F48, 0x5F48, 0x5F4A, 0x5F4A, 0x5F4C, 0x5F4C, 0x5F4E, 0x5F4E, 0x5F51, 0x5F51, 0x5F53, 0x5F53, 0x5F56, 0x5F57,
-            0x5F59, 0x5F59, 0x5F5C, 0x5F5D, 0x5F61, 0x5F62, 0x5F66, 0x5F66, 0x5F69, 0x5F6D, 0x5F70, 0x5F71, 0x5F73, 0x5F73, 0x5F77, 0x5F77,
-            0x5F79, 0x5F79, 0x5F7C, 0x5F7C, 0x5F7F, 0x5F85, 0x5F87, 0x5F88, 0x5F8A, 0x5F8C, 0x5F90, 0x5F93, 0x5F97, 0x5F99, 0x5F9E, 0x5F9E,
-            0x5FA0, 0x5FA1, 0x5FA8, 0x5FAA, 0x5FAD, 0x5FAE, 0x5FB3, 0x5FB4, 0x5FB9, 0x5FB9, 0x5FBC, 0x5FBD, 0x5FC3, 0x5FC3, 0x5FC5, 0x5FC5,
-            0x5FCC, 0x5FCD, 0x5FD6, 0x5FD9, 0x5FDC, 0x5FDD, 0x5FE0, 0x5FE0, 0x5FE4, 0x5FE4, 0x5FEB, 0x5FEB, 0x5FF0, 0x5FF1, 0x5FF5, 0x5FF5,
-            0x5FF8, 0x5FF8, 0x5FFB, 0x5FFB, 0x5FFD, 0x5FFD, 0x5FFF, 0x5FFF, 0x600E, 0x6010, 0x6012, 0x6012, 0x6015, 0x6016, 0x6019, 0x6019,
-            0x601B, 0x601D, 0x6020, 0x6021, 0x6025, 0x602B, 0x602F, 0x602F, 0x6031, 0x6031, 0x603A, 0x603A, 0x6041, 0x6043, 0x6046, 0x6046,
-            0x604A, 0x604B, 0x604D, 0x604D, 0x6050, 0x6050, 0x6052, 0x6052, 0x6055, 0x6055, 0x6059, 0x605A, 0x605F, 0x6060, 0x6062, 0x6065,
-            0x6068, 0x606D, 0x606F, 0x6070, 0x6075, 0x6075, 0x6077, 0x6077, 0x6081, 0x6081, 0x6083, 0x6084, 0x6089, 0x6089, 0x608B, 0x608D,
-            0x6092, 0x6092, 0x6094, 0x6094, 0x6096, 0x6097, 0x609A, 0x609B, 0x609F, 0x60A0, 0x60A3, 0x60A3, 0x60A6, 0x60A7, 0x60A9, 0x60AA,
-            0x60B2, 0x60B6, 0x60B8, 0x60B8, 0x60BC, 0x60BD, 0x60C5, 0x60C7, 0x60D1, 0x60D1, 0x60D3, 0x60D3, 0x60D8, 0x60D8, 0x60DA, 0x60DA,
-            0x60DC, 0x60DC, 0x60DF, 0x60E1, 0x60E3, 0x60E3, 0x60E7, 0x60E8, 0x60F0, 0x60F1, 0x60F3, 0x60F4, 0x60F6, 0x60F7, 0x60F9, 0x60FB,
-            0x6100, 0x6101, 0x6103, 0x6103, 0x6106, 0x6106, 0x6108, 0x6109, 0x610D, 0x610F, 0x6115, 0x6115, 0x611A, 0x611B, 0x611F, 0x611F,
-            0x6121, 0x6121, 0x6127, 0x6128, 0x612C, 0x612C, 0x6134, 0x6134, 0x613C, 0x613F, 0x6142, 0x6142, 0x6144, 0x6144, 0x6147, 0x6148,
-            0x614A, 0x614E, 0x6153, 0x6153, 0x6155, 0x6155, 0x6158, 0x615A, 0x615D, 0x615D, 0x615F, 0x615F, 0x6162, 0x6163, 0x6165, 0x6165,
-            0x6167, 0x6168, 0x616B, 0x616B, 0x616E, 0x6171, 0x6173, 0x6177, 0x617E, 0x617E, 0x6182, 0x6182, 0x6187, 0x6187, 0x618A, 0x618A,
-            0x618E, 0x618E, 0x6190, 0x6191, 0x6194, 0x6194, 0x6196, 0x6196, 0x6199, 0x619A, 0x61A4, 0x61A4, 0x61A7, 0x61A7, 0x61A9, 0x61A9,
-            0x61AB, 0x61AC, 0x61AE, 0x61AE, 0x61B2, 0x61B2, 0x61B6, 0x61B6, 0x61BA, 0x61BA, 0x61BE, 0x61BE, 0x61C3, 0x61C3, 0x61C6, 0x61CD,
-            0x61D0, 0x61D0, 0x61E3, 0x61E3, 0x61E6, 0x61E6, 0x61F2, 0x61F2, 0x61F4, 0x61F4, 0x61F6, 0x61F8, 0x61FA, 0x61FA, 0x61FC, 0x6200,
-            0x6208, 0x620A, 0x620C, 0x620E, 0x6210, 0x6212, 0x6214, 0x6214, 0x6216, 0x6216, 0x621A, 0x621B, 0x621D, 0x621F, 0x6221, 0x6221,
-            0x6226, 0x6226, 0x622A, 0x622A, 0x622E, 0x6230, 0x6232, 0x6234, 0x6238, 0x6238, 0x623B, 0x623B, 0x623F, 0x6241, 0x6247, 0x6249,
-            0x624B, 0x624B, 0x624D, 0x624E, 0x6253, 0x6253, 0x6255, 0x6255, 0x6258, 0x6258, 0x625B, 0x625B, 0x625E, 0x625E, 0x6260, 0x6260,
-            0x6263, 0x6263, 0x6268, 0x6268, 0x626E, 0x626E, 0x6271, 0x6271, 0x6276, 0x6276, 0x6279, 0x6279, 0x627C, 0x627C, 0x627E, 0x6280,
-            0x6282, 0x6284, 0x6289, 0x628A, 0x6291, 0x6298, 0x629B, 0x629C, 0x629E, 0x629E, 0x62AB, 0x62AC, 0x62B1, 0x62B1, 0x62B5, 0x62B5,
-            0x62B9, 0x62B9, 0x62BB, 0x62BD, 0x62C2, 0x62C2, 0x62C5, 0x62CA, 0x62CC, 0x62CD, 0x62CF, 0x62D4, 0x62D7, 0x62D9, 0x62DB, 0x62DD,
-            0x62E0, 0x62E1, 0x62EC, 0x62EF, 0x62F1, 0x62F1, 0x62F3, 0x62F3, 0x62F5, 0x62F7, 0x62FE, 0x62FF, 0x6301, 0x6302, 0x6307, 0x6309,
-            0x630C, 0x630C, 0x6311, 0x6311, 0x6319, 0x6319, 0x631F, 0x631F, 0x6327, 0x6328, 0x632B, 0x632B, 0x632F, 0x632F, 0x633A, 0x633A,
-            0x633D, 0x633F, 0x6349, 0x6349, 0x634C, 0x634D, 0x634F, 0x6350, 0x6355, 0x6355, 0x6357, 0x6357, 0x635C, 0x635C, 0x6367, 0x6369,
-            0x636B, 0x636B, 0x636E, 0x636E, 0x6372, 0x6372, 0x6376, 0x6377, 0x637A, 0x637B, 0x6380, 0x6380, 0x6383, 0x6383, 0x6388, 0x6389,
-            0x638C, 0x638C, 0x638E, 0x638F, 0x6392, 0x6392, 0x6396, 0x6396, 0x6398, 0x6398, 0x639B, 0x639B, 0x639F, 0x63A3, 0x63A5, 0x63A5,
-            0x63A7, 0x63AC, 0x63B2, 0x63B2, 0x63B4, 0x63B5, 0x63BB, 0x63BB, 0x63BE, 0x63BE, 0x63C0, 0x63C0, 0x63C3, 0x63C4, 0x63C6, 0x63C6,
-            0x63C9, 0x63C9, 0x63CF, 0x63D0, 0x63D2, 0x63D2, 0x63D6, 0x63D6, 0x63DA, 0x63DB, 0x63E1, 0x63E1, 0x63E3, 0x63E3, 0x63E9, 0x63E9,
-            0x63EE, 0x63EE, 0x63F4, 0x63F4, 0x63F6, 0x63F6, 0x63FA, 0x63FA, 0x6406, 0x6406, 0x640D, 0x640D, 0x640F, 0x640F, 0x6413, 0x6413,
-            0x6416, 0x6417, 0x641C, 0x641C, 0x6426, 0x6426, 0x6428, 0x6428, 0x642C, 0x642D, 0x6434, 0x6434, 0x6436, 0x6436, 0x643A, 0x643A,
-            0x643E, 0x643E, 0x6442, 0x6442, 0x644E, 0x644E, 0x6458, 0x6458, 0x6467, 0x6467, 0x6469, 0x6469, 0x646F, 0x646F, 0x6476, 0x6476,
-            0x6478, 0x6478, 0x647A, 0x647A, 0x6483, 0x6483, 0x6488, 0x6488, 0x6492, 0x6493, 0x6495, 0x6495, 0x649A, 0x649A, 0x649E, 0x649E,
-            0x64A4, 0x64A5, 0x64A9, 0x64A9, 0x64AB, 0x64AB, 0x64AD, 0x64AE, 0x64B0, 0x64B0, 0x64B2, 0x64B2, 0x64B9, 0x64B9, 0x64BB, 0x64BC,
-            0x64C1, 0x64C2, 0x64C5, 0x64C5, 0x64C7, 0x64C7, 0x64CD, 0x64CD, 0x64D2, 0x64D2, 0x64D4, 0x64D4, 0x64D8, 0x64D8, 0x64DA, 0x64DA,
-            0x64E0, 0x64E3, 0x64E6, 0x64E7, 0x64EC, 0x64EC, 0x64EF, 0x64EF, 0x64F1, 0x64F2, 0x64F4, 0x64F4, 0x64F6, 0x64F6, 0x64FA, 0x64FA,
-            0x64FD, 0x64FE, 0x6500, 0x6500, 0x6505, 0x6505, 0x6518, 0x6518, 0x651C, 0x651D, 0x6523, 0x6524, 0x652A, 0x652C, 0x652F, 0x652F,
-            0x6534, 0x6539, 0x653B, 0x653B, 0x653E, 0x653F, 0x6545, 0x6545, 0x6548, 0x6548, 0x654D, 0x654D, 0x654F, 0x654F, 0x6551, 0x6551,
-            0x6555, 0x6559, 0x655D, 0x655E, 0x6562, 0x6563, 0x6566, 0x6566, 0x656C, 0x656C, 0x6570, 0x6570, 0x6572, 0x6572, 0x6574, 0x6575,
-            0x6577, 0x6578, 0x6582, 0x6583, 0x6587, 0x6589, 0x658C, 0x658C, 0x658E, 0x658E, 0x6590, 0x6591, 0x6597, 0x6597, 0x6599, 0x6599,
-            0x659B, 0x659C, 0x659F, 0x659F, 0x65A1, 0x65A1, 0x65A4, 0x65A5, 0x65A7, 0x65A7, 0x65AB, 0x65AD, 0x65AF, 0x65B0, 0x65B7, 0x65B7,
-            0x65B9, 0x65B9, 0x65BC, 0x65BD, 0x65C1, 0x65C1, 0x65C3, 0x65C6, 0x65CB, 0x65CC, 0x65CF, 0x65CF, 0x65D2, 0x65D2, 0x65D7, 0x65D7,
-            0x65D9, 0x65D9, 0x65DB, 0x65DB, 0x65E0, 0x65E2, 0x65E5, 0x65E9, 0x65EC, 0x65ED, 0x65F1, 0x65F1, 0x65FA, 0x65FB, 0x6602, 0x6603,
-            0x6606, 0x6607, 0x660A, 0x660A, 0x660C, 0x660C, 0x660E, 0x660F, 0x6613, 0x6614, 0x661C, 0x661C, 0x661F, 0x6620, 0x6625, 0x6625,
-            0x6627, 0x6628, 0x662D, 0x662D, 0x662F, 0x662F, 0x6634, 0x6636, 0x663C, 0x663C, 0x663F, 0x663F, 0x6641, 0x6644, 0x6649, 0x6649,
-            0x664B, 0x664B, 0x664F, 0x664F, 0x6652, 0x6652, 0x665D, 0x665F, 0x6662, 0x6662, 0x6664, 0x6664, 0x6666, 0x6669, 0x666E, 0x6670,
-            0x6674, 0x6674, 0x6676, 0x6676, 0x667A, 0x667A, 0x6681, 0x6681, 0x6683, 0x6684, 0x6687, 0x6689, 0x668E, 0x668E, 0x6691, 0x6691,
-            0x6696, 0x6698, 0x669D, 0x669D, 0x66A2, 0x66A2, 0x66A6, 0x66A6, 0x66AB, 0x66AB, 0x66AE, 0x66AE, 0x66B4, 0x66B4, 0x66B8, 0x66B9,
-            0x66BC, 0x66BC, 0x66BE, 0x66BE, 0x66C1, 0x66C1, 0x66C4, 0x66C4, 0x66C7, 0x66C7, 0x66C9, 0x66C9, 0x66D6, 0x66D6, 0x66D9, 0x66DA,
-            0x66DC, 0x66DD, 0x66E0, 0x66E0, 0x66E6, 0x66E6, 0x66E9, 0x66E9, 0x66F0, 0x66F0, 0x66F2, 0x66F5, 0x66F7, 0x66F9, 0x66FC, 0x6700,
-            0x6703, 0x6703, 0x6708, 0x6709, 0x670B, 0x670B, 0x670D, 0x670D, 0x670F, 0x670F, 0x6714, 0x6717, 0x671B, 0x671B, 0x671D, 0x671F,
-            0x6726, 0x6728, 0x672A, 0x672E, 0x6731, 0x6731, 0x6734, 0x6734, 0x6736, 0x6738, 0x673A, 0x673A, 0x673D, 0x673D, 0x673F, 0x673F,
-            0x6741, 0x6741, 0x6746, 0x6746, 0x6749, 0x6749, 0x674E, 0x6751, 0x6753, 0x6753, 0x6756, 0x6756, 0x6759, 0x6759, 0x675C, 0x675C,
-            0x675E, 0x6765, 0x676A, 0x676A, 0x676D, 0x676D, 0x676F, 0x6773, 0x6775, 0x6775, 0x6777, 0x6777, 0x677C, 0x677C, 0x677E, 0x677F,
-            0x6785, 0x6785, 0x6787, 0x6787, 0x6789, 0x6789, 0x678B, 0x678C, 0x6790, 0x6790, 0x6795, 0x6795, 0x6797, 0x6797, 0x679A, 0x679A,
-            0x679C, 0x679D, 0x67A0, 0x67A2, 0x67A6, 0x67A6, 0x67A9, 0x67A9, 0x67AF, 0x67AF, 0x67B3, 0x67B4, 0x67B6, 0x67B9, 0x67C1, 0x67C1,
-            0x67C4, 0x67C4, 0x67C6, 0x67C6, 0x67CA, 0x67CA, 0x67CE, 0x67D1, 0x67D3, 0x67D4, 0x67D8, 0x67D8, 0x67DA, 0x67DA, 0x67DD, 0x67DE,
-            0x67E2, 0x67E2, 0x67E4, 0x67E4, 0x67E7, 0x67E7, 0x67E9, 0x67E9, 0x67EC, 0x67EC, 0x67EE, 0x67EF, 0x67F1, 0x67F1, 0x67F3, 0x67F5,
-            0x67FB, 0x67FB, 0x67FE, 0x67FF, 0x6802, 0x6804, 0x6813, 0x6813, 0x6816, 0x6817, 0x681E, 0x681E, 0x6821, 0x6822, 0x6829, 0x682B,
-            0x6832, 0x6832, 0x6834, 0x6834, 0x6838, 0x6839, 0x683C, 0x683D, 0x6840, 0x6843, 0x6846, 0x6846, 0x6848, 0x6848, 0x684D, 0x684E,
-            0x6850, 0x6851, 0x6853, 0x6854, 0x6859, 0x6859, 0x685C, 0x685D, 0x685F, 0x685F, 0x6863, 0x6863, 0x6867, 0x6867, 0x6874, 0x6874,
-            0x6876, 0x6877, 0x687E, 0x687F, 0x6881, 0x6881, 0x6883, 0x6883, 0x6885, 0x6885, 0x688D, 0x688D, 0x688F, 0x688F, 0x6893, 0x6894,
-            0x6897, 0x6897, 0x689B, 0x689B, 0x689D, 0x689D, 0x689F, 0x68A0, 0x68A2, 0x68A2, 0x68A6, 0x68A8, 0x68AD, 0x68AD, 0x68AF, 0x68B1,
-            0x68B3, 0x68B3, 0x68B5, 0x68B6, 0x68B9, 0x68BA, 0x68BC, 0x68BC, 0x68C4, 0x68C4, 0x68C6, 0x68C6, 0x68C9, 0x68CB, 0x68CD, 0x68CD,
-            0x68D2, 0x68D2, 0x68D4, 0x68D5, 0x68D7, 0x68D8, 0x68DA, 0x68DA, 0x68DF, 0x68E1, 0x68E3, 0x68E3, 0x68E7, 0x68E7, 0x68EE, 0x68EF,
-            0x68F2, 0x68F2, 0x68F9, 0x68FA, 0x6900, 0x6901, 0x6904, 0x6905, 0x6908, 0x6908, 0x690B, 0x690F, 0x6912, 0x6912, 0x6919, 0x691C,
-            0x6921, 0x6923, 0x6925, 0x6926, 0x6928, 0x6928, 0x692A, 0x692A, 0x6930, 0x6930, 0x6934, 0x6934, 0x6936, 0x6936, 0x6939, 0x6939,
-            0x693D, 0x693D, 0x693F, 0x693F, 0x694A, 0x694A, 0x6953, 0x6955, 0x6959, 0x695A, 0x695C, 0x695E, 0x6960, 0x6962, 0x696A, 0x696B,
-            0x696D, 0x696F, 0x6973, 0x6975, 0x6977, 0x6979, 0x697C, 0x697E, 0x6981, 0x6982, 0x698A, 0x698A, 0x698E, 0x698E, 0x6991, 0x6991,
-            0x6994, 0x6995, 0x699B, 0x699C, 0x69A0, 0x69A0, 0x69A7, 0x69A7, 0x69AE, 0x69AE, 0x69B1, 0x69B2, 0x69B4, 0x69B4, 0x69BB, 0x69BB,
-            0x69BE, 0x69BF, 0x69C1, 0x69C1, 0x69C3, 0x69C3, 0x69C7, 0x69C7, 0x69CA, 0x69CE, 0x69D0, 0x69D0, 0x69D3, 0x69D3, 0x69D8, 0x69D9,
-            0x69DD, 0x69DE, 0x69E7, 0x69E8, 0x69EB, 0x69EB, 0x69ED, 0x69ED, 0x69F2, 0x69F2, 0x69F9, 0x69F9, 0x69FB, 0x69FB, 0x69FD, 0x69FD,
-            0x69FF, 0x69FF, 0x6A02, 0x6A02, 0x6A05, 0x6A05, 0x6A0A, 0x6A0C, 0x6A12, 0x6A14, 0x6A17, 0x6A17, 0x6A19, 0x6A19, 0x6A1B, 0x6A1B,
-            0x6A1E, 0x6A1F, 0x6A21, 0x6A23, 0x6A29, 0x6A2B, 0x6A2E, 0x6A2E, 0x6A35, 0x6A36, 0x6A38, 0x6A3A, 0x6A3D, 0x6A3D, 0x6A44, 0x6A44,
-            0x6A47, 0x6A48, 0x6A4B, 0x6A4B, 0x6A58, 0x6A59, 0x6A5F, 0x6A5F, 0x6A61, 0x6A62, 0x6A66, 0x6A66, 0x6A72, 0x6A72, 0x6A78, 0x6A78,
-            0x6A7F, 0x6A80, 0x6A84, 0x6A84, 0x6A8D, 0x6A8E, 0x6A90, 0x6A90, 0x6A97, 0x6A97, 0x6A9C, 0x6A9C, 0x6AA0, 0x6AA0, 0x6AA2, 0x6AA3,
-            0x6AAA, 0x6AAA, 0x6AAC, 0x6AAC, 0x6AAE, 0x6AAE, 0x6AB3, 0x6AB3, 0x6AB8, 0x6AB8, 0x6ABB, 0x6ABB, 0x6AC1, 0x6AC3, 0x6AD1, 0x6AD1,
-            0x6AD3, 0x6AD3, 0x6ADA, 0x6ADB, 0x6ADE, 0x6ADF, 0x6AE8, 0x6AE8, 0x6AEA, 0x6AEA, 0x6AFA, 0x6AFB, 0x6B04, 0x6B05, 0x6B0A, 0x6B0A,
-            0x6B12, 0x6B12, 0x6B16, 0x6B16, 0x6B1D, 0x6B1D, 0x6B1F, 0x6B21, 0x6B23, 0x6B23, 0x6B27, 0x6B27, 0x6B32, 0x6B32, 0x6B37, 0x6B3A,
-            0x6B3D, 0x6B3E, 0x6B43, 0x6B43, 0x6B47, 0x6B47, 0x6B49, 0x6B49, 0x6B4C, 0x6B4C, 0x6B4E, 0x6B4E, 0x6B50, 0x6B50, 0x6B53, 0x6B54,
-            0x6B59, 0x6B59, 0x6B5B, 0x6B5B, 0x6B5F, 0x6B5F, 0x6B61, 0x6B64, 0x6B66, 0x6B66, 0x6B69, 0x6B6A, 0x6B6F, 0x6B6F, 0x6B73, 0x6B74,
-            0x6B78, 0x6B79, 0x6B7B, 0x6B7B, 0x6B7F, 0x6B80, 0x6B83, 0x6B84, 0x6B86, 0x6B86, 0x6B89, 0x6B8B, 0x6B8D, 0x6B8D, 0x6B95, 0x6B96,
-            0x6B98, 0x6B98, 0x6B9E, 0x6B9E, 0x6BA4, 0x6BA4, 0x6BAA, 0x6BAB, 0x6BAF, 0x6BAF, 0x6BB1, 0x6BB5, 0x6BB7, 0x6BB7, 0x6BBA, 0x6BBC,
-            0x6BBF, 0x6BC0, 0x6BC5, 0x6BC6, 0x6BCB, 0x6BCB, 0x6BCD, 0x6BCE, 0x6BD2, 0x6BD4, 0x6BD8, 0x6BD8, 0x6BDB, 0x6BDB, 0x6BDF, 0x6BDF,
-            0x6BEB, 0x6BEC, 0x6BEF, 0x6BEF, 0x6BF3, 0x6BF3, 0x6C08, 0x6C08, 0x6C0F, 0x6C0F, 0x6C11, 0x6C11, 0x6C13, 0x6C14, 0x6C17, 0x6C17,
-            0x6C1B, 0x6C1B, 0x6C23, 0x6C24, 0x6C34, 0x6C34, 0x6C37, 0x6C38, 0x6C3E, 0x6C3E, 0x6C40, 0x6C42, 0x6C4E, 0x6C4E, 0x6C50, 0x6C50,
-            0x6C55, 0x6C55, 0x6C57, 0x6C57, 0x6C5A, 0x6C5A, 0x6C5D, 0x6C60, 0x6C62, 0x6C62, 0x6C68, 0x6C68, 0x6C6A, 0x6C6A, 0x6C70, 0x6C70,
-            0x6C72, 0x6C73, 0x6C7A, 0x6C7A, 0x6C7D, 0x6C7E, 0x6C81, 0x6C83, 0x6C88, 0x6C88, 0x6C8C, 0x6C8D, 0x6C90, 0x6C90, 0x6C92, 0x6C93,
-            0x6C96, 0x6C96, 0x6C99, 0x6C9B, 0x6CA1, 0x6CA2, 0x6CAB, 0x6CAB, 0x6CAE, 0x6CAE, 0x6CB1, 0x6CB1, 0x6CB3, 0x6CB3, 0x6CB8, 0x6CBF,
-            0x6CC1, 0x6CC1, 0x6CC4, 0x6CC5, 0x6CC9, 0x6CCA, 0x6CCC, 0x6CCC, 0x6CD3, 0x6CD3, 0x6CD5, 0x6CD5, 0x6CD7, 0x6CD7, 0x6CD9, 0x6CD9,
-            0x6CDB, 0x6CDB, 0x6CDD, 0x6CDD, 0x6CE1, 0x6CE3, 0x6CE5, 0x6CE5, 0x6CE8, 0x6CE8, 0x6CEA, 0x6CEA, 0x6CEF, 0x6CF1, 0x6CF3, 0x6CF3,
-            0x6D0B, 0x6D0C, 0x6D12, 0x6D12, 0x6D17, 0x6D17, 0x6D19, 0x6D19, 0x6D1B, 0x6D1B, 0x6D1E, 0x6D1F, 0x6D25, 0x6D25, 0x6D29, 0x6D2B,
-            0x6D32, 0x6D33, 0x6D35, 0x6D36, 0x6D38, 0x6D38, 0x6D3B, 0x6D3B, 0x6D3D, 0x6D3E, 0x6D41, 0x6D41, 0x6D44, 0x6D45, 0x6D59, 0x6D5A,
-            0x6D5C, 0x6D5C, 0x6D63, 0x6D64, 0x6D66, 0x6D66, 0x6D69, 0x6D6A, 0x6D6C, 0x6D6C, 0x6D6E, 0x6D6E, 0x6D74, 0x6D74, 0x6D77, 0x6D79,
-            0x6D85, 0x6D85, 0x6D88, 0x6D88, 0x6D8C, 0x6D8C, 0x6D8E, 0x6D8E, 0x6D93, 0x6D93, 0x6D95, 0x6D95, 0x6D99, 0x6D99, 0x6D9B, 0x6D9C,
-            0x6DAF, 0x6DAF, 0x6DB2, 0x6DB2, 0x6DB5, 0x6DB5, 0x6DB8, 0x6DB8, 0x6DBC, 0x6DBC, 0x6DC0, 0x6DC0, 0x6DC5, 0x6DC7, 0x6DCB, 0x6DCC,
-            0x6DD1, 0x6DD2, 0x6DD5, 0x6DD5, 0x6DD8, 0x6DD9, 0x6DDE, 0x6DDE, 0x6DE1, 0x6DE1, 0x6DE4, 0x6DE4, 0x6DE6, 0x6DE6, 0x6DE8, 0x6DE8,
-            0x6DEA, 0x6DEC, 0x6DEE, 0x6DEE, 0x6DF1, 0x6DF1, 0x6DF3, 0x6DF3, 0x6DF5, 0x6DF5, 0x6DF7, 0x6DF7, 0x6DF9, 0x6DFB, 0x6E05, 0x6E05,
-            0x6E07, 0x6E0B, 0x6E13, 0x6E13, 0x6E15, 0x6E15, 0x6E19, 0x6E1B, 0x6E1D, 0x6E1D, 0x6E1F, 0x6E21, 0x6E23, 0x6E26, 0x6E29, 0x6E29,
-            0x6E2B, 0x6E2F, 0x6E38, 0x6E38, 0x6E3A, 0x6E3A, 0x6E3E, 0x6E3E, 0x6E43, 0x6E43, 0x6E4A, 0x6E4A, 0x6E4D, 0x6E4E, 0x6E56, 0x6E56,
-            0x6E58, 0x6E58, 0x6E5B, 0x6E5B, 0x6E5F, 0x6E5F, 0x6E67, 0x6E67, 0x6E6B, 0x6E6B, 0x6E6E, 0x6E6F, 0x6E72, 0x6E72, 0x6E76, 0x6E76,
-            0x6E7E, 0x6E80, 0x6E82, 0x6E82, 0x6E8C, 0x6E8C, 0x6E8F, 0x6E90, 0x6E96, 0x6E96, 0x6E98, 0x6E98, 0x6E9C, 0x6E9D, 0x6E9F, 0x6E9F,
-            0x6EA2, 0x6EA2, 0x6EA5, 0x6EA5, 0x6EAA, 0x6EAA, 0x6EAF, 0x6EAF, 0x6EB2, 0x6EB2, 0x6EB6, 0x6EB7, 0x6EBA, 0x6EBA, 0x6EBD, 0x6EBD,
-            0x6EC2, 0x6EC2, 0x6EC4, 0x6EC5, 0x6EC9, 0x6EC9, 0x6ECB, 0x6ECC, 0x6ED1, 0x6ED1, 0x6ED3, 0x6ED5, 0x6EDD, 0x6EDE, 0x6EEC, 0x6EEC,
-            0x6EEF, 0x6EEF, 0x6EF2, 0x6EF2, 0x6EF4, 0x6EF4, 0x6EF7, 0x6EF8, 0x6EFE, 0x6EFF, 0x6F01, 0x6F02, 0x6F06, 0x6F06, 0x6F09, 0x6F09,
-            0x6F0F, 0x6F0F, 0x6F11, 0x6F11, 0x6F13, 0x6F15, 0x6F20, 0x6F20, 0x6F22, 0x6F23, 0x6F2B, 0x6F2C, 0x6F31, 0x6F32, 0x6F38, 0x6F38,
-            0x6F3E, 0x6F3F, 0x6F41, 0x6F41, 0x6F45, 0x6F45, 0x6F54, 0x6F54, 0x6F58, 0x6F58, 0x6F5B, 0x6F5C, 0x6F5F, 0x6F5F, 0x6F64, 0x6F64,
-            0x6F66, 0x6F66, 0x6F6D, 0x6F70, 0x6F74, 0x6F74, 0x6F78, 0x6F78, 0x6F7A, 0x6F7A, 0x6F7C, 0x6F7C, 0x6F80, 0x6F82, 0x6F84, 0x6F84,
-            0x6F86, 0x6F86, 0x6F8E, 0x6F8E, 0x6F91, 0x6F91, 0x6F97, 0x6F97, 0x6FA1, 0x6FA1, 0x6FA3, 0x6FA4, 0x6FAA, 0x6FAA, 0x6FB1, 0x6FB1,
-            0x6FB3, 0x6FB3, 0x6FB9, 0x6FB9, 0x6FC0, 0x6FC3, 0x6FC6, 0x6FC6, 0x6FD4, 0x6FD5, 0x6FD8, 0x6FD8, 0x6FDB, 0x6FDB, 0x6FDF, 0x6FE1,
-            0x6FE4, 0x6FE4, 0x6FEB, 0x6FEC, 0x6FEE, 0x6FEF, 0x6FF1, 0x6FF1, 0x6FF3, 0x6FF3, 0x6FF6, 0x6FF6, 0x6FFA, 0x6FFA, 0x6FFE, 0x6FFE,
-            0x7001, 0x7001, 0x7009, 0x7009, 0x700B, 0x700B, 0x700F, 0x700F, 0x7011, 0x7011, 0x7015, 0x7015, 0x7018, 0x7018, 0x701A, 0x701B,
-            0x701D, 0x701F, 0x7026, 0x7027, 0x702C, 0x702C, 0x7030, 0x7030, 0x7032, 0x7032, 0x703E, 0x703E, 0x704C, 0x704C, 0x7051, 0x7051,
-            0x7058, 0x7058, 0x7063, 0x7063, 0x706B, 0x706B, 0x706F, 0x7070, 0x7078, 0x7078, 0x707C, 0x707D, 0x7089, 0x708A, 0x708E, 0x708E,
-            0x7092, 0x7092, 0x7099, 0x7099, 0x70AC, 0x70AF, 0x70B3, 0x70B3, 0x70B8, 0x70BA, 0x70C8, 0x70C8, 0x70CB, 0x70CB, 0x70CF, 0x70CF,
-            0x70D9, 0x70D9, 0x70DD, 0x70DD, 0x70DF, 0x70DF, 0x70F1, 0x70F1, 0x70F9, 0x70F9, 0x70FD, 0x70FD, 0x7109, 0x7109, 0x7114, 0x7114,
-            0x7119, 0x711A, 0x711C, 0x711C, 0x7121, 0x7121, 0x7126, 0x7126, 0x7136, 0x7136, 0x713C, 0x713C, 0x7149, 0x7149, 0x714C, 0x714C,
-            0x714E, 0x714E, 0x7155, 0x7156, 0x7159, 0x7159, 0x7162, 0x7162, 0x7164, 0x7167, 0x7169, 0x7169, 0x716C, 0x716C, 0x716E, 0x716E,
-            0x717D, 0x717D, 0x7184, 0x7184, 0x7188, 0x7188, 0x718A, 0x718A, 0x718F, 0x718F, 0x7194, 0x7195, 0x7199, 0x7199, 0x719F, 0x719F,
-            0x71A8, 0x71A8, 0x71AC, 0x71AC, 0x71B1, 0x71B1, 0x71B9, 0x71B9, 0x71BE, 0x71BE, 0x71C3, 0x71C3, 0x71C8, 0x71C9, 0x71CE, 0x71CE,
-            0x71D0, 0x71D0, 0x71D2, 0x71D2, 0x71D4, 0x71D5, 0x71D7, 0x71D7, 0x71DF, 0x71E0, 0x71E5, 0x71E7, 0x71EC, 0x71EE, 0x71F5, 0x71F5,
-            0x71F9, 0x71F9, 0x71FB, 0x71FC, 0x71FF, 0x71FF, 0x7206, 0x7206, 0x720D, 0x720D, 0x7210, 0x7210, 0x721B, 0x721B, 0x7228, 0x7228,
-            0x722A, 0x722A, 0x722C, 0x722D, 0x7230, 0x7230, 0x7232, 0x7232, 0x7235, 0x7236, 0x723A, 0x7240, 0x7246, 0x7248, 0x724B, 0x724C,
-            0x7252, 0x7252, 0x7258, 0x7259, 0x725B, 0x725B, 0x725D, 0x725D, 0x725F, 0x725F, 0x7261, 0x7262, 0x7267, 0x7267, 0x7269, 0x7269,
-            0x7272, 0x7272, 0x7274, 0x7274, 0x7279, 0x7279, 0x727D, 0x727E, 0x7280, 0x7282, 0x7287, 0x7287, 0x7292, 0x7292, 0x7296, 0x7296,
-            0x72A0, 0x72A0, 0x72A2, 0x72A2, 0x72A7, 0x72A7, 0x72AC, 0x72AC, 0x72AF, 0x72AF, 0x72B2, 0x72B2, 0x72B6, 0x72B6, 0x72B9, 0x72B9,
-            0x72C2, 0x72C4, 0x72C6, 0x72C6, 0x72CE, 0x72CE, 0x72D0, 0x72D0, 0x72D2, 0x72D2, 0x72D7, 0x72D7, 0x72D9, 0x72D9, 0x72DB, 0x72DB,
-            0x72E0, 0x72E2, 0x72E9, 0x72E9, 0x72EC, 0x72ED, 0x72F7, 0x72F9, 0x72FC, 0x72FD, 0x730A, 0x730A, 0x7316, 0x7317, 0x731B, 0x731D,
-            0x731F, 0x731F, 0x7325, 0x7325, 0x7329, 0x732B, 0x732E, 0x732F, 0x7334, 0x7334, 0x7336, 0x7337, 0x733E, 0x733F, 0x7344, 0x7345,
-            0x734E, 0x734F, 0x7357, 0x7357, 0x7363, 0x7363, 0x7368, 0x7368, 0x736A, 0x736A, 0x7370, 0x7370, 0x7372, 0x7372, 0x7375, 0x7375,
-            0x7378, 0x7378, 0x737A, 0x737B, 0x7384, 0x7384, 0x7387, 0x7387, 0x7389, 0x7389, 0x738B, 0x738B, 0x7396, 0x7396, 0x73A9, 0x73A9,
-            0x73B2, 0x73B3, 0x73BB, 0x73BB, 0x73C0, 0x73C0, 0x73C2, 0x73C2, 0x73C8, 0x73C8, 0x73CA, 0x73CA, 0x73CD, 0x73CE, 0x73DE, 0x73DE,
-            0x73E0, 0x73E0, 0x73E5, 0x73E5, 0x73EA, 0x73EA, 0x73ED, 0x73EE, 0x73F1, 0x73F1, 0x73F8, 0x73F8, 0x73FE, 0x73FE, 0x7403, 0x7403,
-            0x7405, 0x7406, 0x7409, 0x7409, 0x7422, 0x7422, 0x7425, 0x7425, 0x7432, 0x7436, 0x743A, 0x743A, 0x743F, 0x743F, 0x7441, 0x7441,
-            0x7455, 0x7455, 0x7459, 0x745C, 0x745E, 0x7460, 0x7463, 0x7464, 0x7469, 0x746A, 0x746F, 0x7470, 0x7473, 0x7473, 0x7476, 0x7476,
-            0x747E, 0x747E, 0x7483, 0x7483, 0x748B, 0x748B, 0x749E, 0x749E, 0x74A2, 0x74A2, 0x74A7, 0x74A7, 0x74B0, 0x74B0, 0x74BD, 0x74BD,
-            0x74CA, 0x74CA, 0x74CF, 0x74CF, 0x74D4, 0x74D4, 0x74DC, 0x74DC, 0x74E0, 0x74E0, 0x74E2, 0x74E3, 0x74E6, 0x74E7, 0x74E9, 0x74E9,
-            0x74EE, 0x74EE, 0x74F0, 0x74F2, 0x74F6, 0x74F8, 0x7503, 0x7505, 0x750C, 0x750E, 0x7511, 0x7511, 0x7513, 0x7513, 0x7515, 0x7515,
-            0x7518, 0x7518, 0x751A, 0x751A, 0x751C, 0x751C, 0x751E, 0x751F, 0x7523, 0x7523, 0x7525, 0x7526, 0x7528, 0x7528, 0x752B, 0x752C,
-            0x7530, 0x7533, 0x7537, 0x7538, 0x753A, 0x753C, 0x7544, 0x7544, 0x7546, 0x7546, 0x7549, 0x754D, 0x754F, 0x754F, 0x7551, 0x7551,
-            0x7554, 0x7554, 0x7559, 0x755D, 0x7560, 0x7560, 0x7562, 0x7562, 0x7564, 0x7567, 0x7569, 0x756B, 0x756D, 0x756D, 0x7570, 0x7570,
-            0x7573, 0x7574, 0x7576, 0x7578, 0x757F, 0x757F, 0x7582, 0x7582, 0x7586, 0x7587, 0x7589, 0x758B, 0x758E, 0x758F, 0x7591, 0x7591,
-            0x7594, 0x7594, 0x759A, 0x759A, 0x759D, 0x759D, 0x75A3, 0x75A3, 0x75A5, 0x75A5, 0x75AB, 0x75AB, 0x75B1, 0x75B3, 0x75B5, 0x75B5,
-            0x75B8, 0x75B9, 0x75BC, 0x75BE, 0x75C2, 0x75C3, 0x75C5, 0x75C5, 0x75C7, 0x75C7, 0x75CA, 0x75CA, 0x75CD, 0x75CD, 0x75D2, 0x75D2,
-            0x75D4, 0x75D5, 0x75D8, 0x75D9, 0x75DB, 0x75DB, 0x75DE, 0x75DE, 0x75E2, 0x75E3, 0x75E9, 0x75E9, 0x75F0, 0x75F0, 0x75F2, 0x75F4,
-            0x75FA, 0x75FA, 0x75FC, 0x75FC, 0x75FE, 0x75FF, 0x7601, 0x7601, 0x7609, 0x7609, 0x760B, 0x760B, 0x760D, 0x760D, 0x761F, 0x7622,
-            0x7624, 0x7624, 0x7627, 0x7627, 0x7630, 0x7630, 0x7634, 0x7634, 0x763B, 0x763B, 0x7642, 0x7642, 0x7646, 0x7648, 0x764C, 0x764C,
-            0x7652, 0x7652, 0x7656, 0x7656, 0x7658, 0x7658, 0x765C, 0x765C, 0x7661, 0x7662, 0x7667, 0x766A, 0x766C, 0x766C, 0x7670, 0x7670,
-            0x7672, 0x7672, 0x7676, 0x7676, 0x7678, 0x7678, 0x767A, 0x767E, 0x7680, 0x7680, 0x7683, 0x7684, 0x7686, 0x7688, 0x768B, 0x768B,
-            0x768E, 0x768E, 0x7690, 0x7690, 0x7693, 0x7693, 0x7696, 0x7696, 0x7699, 0x769A, 0x76AE, 0x76AE, 0x76B0, 0x76B0, 0x76B4, 0x76B4,
-            0x76B7, 0x76BA, 0x76BF, 0x76BF, 0x76C2, 0x76C3, 0x76C6, 0x76C6, 0x76C8, 0x76C8, 0x76CA, 0x76CA, 0x76CD, 0x76CD, 0x76D2, 0x76D2,
-            0x76D6, 0x76D7, 0x76DB, 0x76DC, 0x76DE, 0x76DF, 0x76E1, 0x76E1, 0x76E3, 0x76E5, 0x76E7, 0x76E7, 0x76EA, 0x76EA, 0x76EE, 0x76EE,
-            0x76F2, 0x76F2, 0x76F4, 0x76F4, 0x76F8, 0x76F8, 0x76FB, 0x76FB, 0x76FE, 0x76FE, 0x7701, 0x7701, 0x7704, 0x7704, 0x7707, 0x7709,
-            0x770B, 0x770C, 0x771B, 0x771B, 0x771E, 0x7720, 0x7724, 0x7726, 0x7729, 0x7729, 0x7737, 0x7738, 0x773A, 0x773A, 0x773C, 0x773C,
-            0x7740, 0x7740, 0x7747, 0x7747, 0x775A, 0x775B, 0x7761, 0x7761, 0x7763, 0x7763, 0x7765, 0x7766, 0x7768, 0x7768, 0x776B, 0x776B,
-            0x7779, 0x7779, 0x777E, 0x777F, 0x778B, 0x778B, 0x778E, 0x778E, 0x7791, 0x7791, 0x779E, 0x779E, 0x77A0, 0x77A0, 0x77A5, 0x77A5,
-            0x77AC, 0x77AD, 0x77B0, 0x77B0, 0x77B3, 0x77B3, 0x77B6, 0x77B6, 0x77B9, 0x77B9, 0x77BB, 0x77BD, 0x77BF, 0x77BF, 0x77C7, 0x77C7,
-            0x77CD, 0x77CD, 0x77D7, 0x77D7, 0x77DA, 0x77DC, 0x77E2, 0x77E3, 0x77E5, 0x77E5, 0x77E7, 0x77E7, 0x77E9, 0x77E9, 0x77ED, 0x77EF,
-            0x77F3, 0x77F3, 0x77FC, 0x77FC, 0x7802, 0x7802, 0x780C, 0x780C, 0x7812, 0x7812, 0x7814, 0x7815, 0x7820, 0x7820, 0x7825, 0x7827,
-            0x7832, 0x7832, 0x7834, 0x7834, 0x783A, 0x783A, 0x783F, 0x783F, 0x7845, 0x7845, 0x785D, 0x785D, 0x786B, 0x786C, 0x786F, 0x786F,
-            0x7872, 0x7872, 0x7874, 0x7874, 0x787C, 0x787C, 0x7881, 0x7881, 0x7886, 0x7887, 0x788C, 0x788E, 0x7891, 0x7891, 0x7893, 0x7893,
-            0x7895, 0x7895, 0x7897, 0x7897, 0x789A, 0x789A, 0x78A3, 0x78A3, 0x78A7, 0x78A7, 0x78A9, 0x78AA, 0x78AF, 0x78AF, 0x78B5, 0x78B5,
-            0x78BA, 0x78BA, 0x78BC, 0x78BC, 0x78BE, 0x78BE, 0x78C1, 0x78C1, 0x78C5, 0x78C6, 0x78CA, 0x78CB, 0x78D0, 0x78D1, 0x78D4, 0x78D4,
-            0x78DA, 0x78DA, 0x78E7, 0x78E8, 0x78EC, 0x78EC, 0x78EF, 0x78EF, 0x78F4, 0x78F4, 0x78FD, 0x78FD, 0x7901, 0x7901, 0x7907, 0x7907,
-            0x790E, 0x790E, 0x7911, 0x7912, 0x7919, 0x7919, 0x7926, 0x7926, 0x792A, 0x792C, 0x793A, 0x793A, 0x793C, 0x793C, 0x793E, 0x793E,
-            0x7940, 0x7941, 0x7947, 0x7949, 0x7950, 0x7950, 0x7953, 0x7953, 0x7955, 0x7957, 0x795A, 0x795A, 0x795D, 0x7960, 0x7962, 0x7962,
-            0x7965, 0x7965, 0x7968, 0x7968, 0x796D, 0x796D, 0x7977, 0x7977, 0x797A, 0x797A, 0x797F, 0x7981, 0x7984, 0x7985, 0x798A, 0x798A,
-            0x798D, 0x798F, 0x799D, 0x799D, 0x79A6, 0x79A7, 0x79AA, 0x79AA, 0x79AE, 0x79AE, 0x79B0, 0x79B0, 0x79B3, 0x79B3, 0x79B9, 0x79BA,
-            0x79BD, 0x79C1, 0x79C9, 0x79C9, 0x79CB, 0x79CB, 0x79D1, 0x79D2, 0x79D5, 0x79D5, 0x79D8, 0x79D8, 0x79DF, 0x79DF, 0x79E1, 0x79E1,
-            0x79E3, 0x79E4, 0x79E6, 0x79E7, 0x79E9, 0x79E9, 0x79EC, 0x79EC, 0x79F0, 0x79F0, 0x79FB, 0x79FB, 0x7A00, 0x7A00, 0x7A08, 0x7A08,
-            0x7A0B, 0x7A0B, 0x7A0D, 0x7A0E, 0x7A14, 0x7A14, 0x7A17, 0x7A1A, 0x7A1C, 0x7A1C, 0x7A1F, 0x7A20, 0x7A2E, 0x7A2E, 0x7A31, 0x7A32,
-            0x7A37, 0x7A37, 0x7A3B, 0x7A40, 0x7A42, 0x7A43, 0x7A46, 0x7A46, 0x7A49, 0x7A49, 0x7A4D, 0x7A50, 0x7A57, 0x7A57, 0x7A61, 0x7A63,
-            0x7A69, 0x7A69, 0x7A6B, 0x7A6B, 0x7A70, 0x7A70, 0x7A74, 0x7A74, 0x7A76, 0x7A76, 0x7A79, 0x7A7A, 0x7A7D, 0x7A7D, 0x7A7F, 0x7A7F,
-            0x7A81, 0x7A81, 0x7A83, 0x7A84, 0x7A88, 0x7A88, 0x7A92, 0x7A93, 0x7A95, 0x7A98, 0x7A9F, 0x7A9F, 0x7AA9, 0x7AAA, 0x7AAE, 0x7AB0,
-            0x7AB6, 0x7AB6, 0x7ABA, 0x7ABA, 0x7ABF, 0x7ABF, 0x7AC3, 0x7AC5, 0x7AC7, 0x7AC8, 0x7ACA, 0x7ACB, 0x7ACD, 0x7ACD, 0x7ACF, 0x7ACF,
-            0x7AD2, 0x7AD3, 0x7AD5, 0x7AD5, 0x7AD9, 0x7ADA, 0x7ADC, 0x7ADD, 0x7ADF, 0x7AE3, 0x7AE5, 0x7AE6, 0x7AEA, 0x7AEA, 0x7AED, 0x7AED,
-            0x7AEF, 0x7AF0, 0x7AF6, 0x7AF6, 0x7AF8, 0x7AFA, 0x7AFF, 0x7AFF, 0x7B02, 0x7B02, 0x7B04, 0x7B04, 0x7B06, 0x7B06, 0x7B08, 0x7B08,
-            0x7B0A, 0x7B0B, 0x7B0F, 0x7B0F, 0x7B11, 0x7B11, 0x7B18, 0x7B19, 0x7B1B, 0x7B1B, 0x7B1E, 0x7B1E, 0x7B20, 0x7B20, 0x7B25, 0x7B26,
-            0x7B28, 0x7B28, 0x7B2C, 0x7B2C, 0x7B33, 0x7B33, 0x7B35, 0x7B36, 0x7B39, 0x7B39, 0x7B45, 0x7B46, 0x7B48, 0x7B49, 0x7B4B, 0x7B4D,
-            0x7B4F, 0x7B52, 0x7B54, 0x7B54, 0x7B56, 0x7B56, 0x7B5D, 0x7B5D, 0x7B65, 0x7B65, 0x7B67, 0x7B67, 0x7B6C, 0x7B6C, 0x7B6E, 0x7B6E,
-            0x7B70, 0x7B71, 0x7B74, 0x7B75, 0x7B7A, 0x7B7A, 0x7B86, 0x7B87, 0x7B8B, 0x7B8B, 0x7B8D, 0x7B8D, 0x7B8F, 0x7B8F, 0x7B92, 0x7B92,
-            0x7B94, 0x7B95, 0x7B97, 0x7B9A, 0x7B9C, 0x7B9D, 0x7B9F, 0x7B9F, 0x7BA1, 0x7BA1, 0x7BAA, 0x7BAA, 0x7BAD, 0x7BAD, 0x7BB1, 0x7BB1,
-            0x7BB4, 0x7BB4, 0x7BB8, 0x7BB8, 0x7BC0, 0x7BC1, 0x7BC4, 0x7BC4, 0x7BC6, 0x7BC7, 0x7BC9, 0x7BC9, 0x7BCB, 0x7BCC, 0x7BCF, 0x7BCF,
-            0x7BDD, 0x7BDD, 0x7BE0, 0x7BE0, 0x7BE4, 0x7BE6, 0x7BE9, 0x7BE9, 0x7BED, 0x7BED, 0x7BF3, 0x7BF3, 0x7BF6, 0x7BF7, 0x7C00, 0x7C00,
-            0x7C07, 0x7C07, 0x7C0D, 0x7C0D, 0x7C11, 0x7C14, 0x7C17, 0x7C17, 0x7C1F, 0x7C1F, 0x7C21, 0x7C21, 0x7C23, 0x7C23, 0x7C27, 0x7C27,
-            0x7C2A, 0x7C2B, 0x7C37, 0x7C38, 0x7C3D, 0x7C40, 0x7C43, 0x7C43, 0x7C4C, 0x7C4D, 0x7C4F, 0x7C50, 0x7C54, 0x7C54, 0x7C56, 0x7C56,
-            0x7C58, 0x7C58, 0x7C5F, 0x7C60, 0x7C64, 0x7C65, 0x7C6C, 0x7C6C, 0x7C73, 0x7C73, 0x7C75, 0x7C75, 0x7C7E, 0x7C7E, 0x7C81, 0x7C83,
-            0x7C89, 0x7C89, 0x7C8B, 0x7C8B, 0x7C8D, 0x7C8D, 0x7C90, 0x7C90, 0x7C92, 0x7C92, 0x7C95, 0x7C95, 0x7C97, 0x7C98, 0x7C9B, 0x7C9B,
-            0x7C9F, 0x7C9F, 0x7CA1, 0x7CA2, 0x7CA4, 0x7CA5, 0x7CA7, 0x7CA8, 0x7CAB, 0x7CAB, 0x7CAD, 0x7CAE, 0x7CB1, 0x7CB3, 0x7CB9, 0x7CB9,
-            0x7CBD, 0x7CBE, 0x7CC0, 0x7CC0, 0x7CC2, 0x7CC2, 0x7CC5, 0x7CC5, 0x7CCA, 0x7CCA, 0x7CCE, 0x7CCE, 0x7CD2, 0x7CD2, 0x7CD6, 0x7CD6,
-            0x7CD8, 0x7CD8, 0x7CDC, 0x7CDC, 0x7CDE, 0x7CE0, 0x7CE2, 0x7CE2, 0x7CE7, 0x7CE7, 0x7CEF, 0x7CEF, 0x7CF2, 0x7CF2, 0x7CF4, 0x7CF4,
-            0x7CF6, 0x7CF6, 0x7CF8, 0x7CF8, 0x7CFA, 0x7CFB, 0x7CFE, 0x7CFE, 0x7D00, 0x7D00, 0x7D02, 0x7D02, 0x7D04, 0x7D06, 0x7D0A, 0x7D0B,
-            0x7D0D, 0x7D0D, 0x7D10, 0x7D10, 0x7D14, 0x7D15, 0x7D17, 0x7D1C, 0x7D20, 0x7D22, 0x7D2B, 0x7D2C, 0x7D2E, 0x7D30, 0x7D32, 0x7D33,
-            0x7D35, 0x7D35, 0x7D39, 0x7D3A, 0x7D3F, 0x7D3F, 0x7D42, 0x7D46, 0x7D4B, 0x7D4C, 0x7D4E, 0x7D50, 0x7D56, 0x7D56, 0x7D5B, 0x7D5B,
-            0x7D5E, 0x7D5E, 0x7D61, 0x7D63, 0x7D66, 0x7D66, 0x7D68, 0x7D68, 0x7D6E, 0x7D6E, 0x7D71, 0x7D73, 0x7D75, 0x7D76, 0x7D79, 0x7D79,
-            0x7D7D, 0x7D7D, 0x7D89, 0x7D89, 0x7D8F, 0x7D8F, 0x7D93, 0x7D93, 0x7D99, 0x7D9C, 0x7D9F, 0x7D9F, 0x7DA2, 0x7DA3, 0x7DAB, 0x7DB2,
-            0x7DB4, 0x7DB5, 0x7DB8, 0x7DB8, 0x7DBA, 0x7DBB, 0x7DBD, 0x7DBF, 0x7DC7, 0x7DC7, 0x7DCA, 0x7DCB, 0x7DCF, 0x7DCF, 0x7DD1, 0x7DD2,
-            0x7DD5, 0x7DD5, 0x7DD8, 0x7DD8, 0x7DDA, 0x7DDA, 0x7DDC, 0x7DDE, 0x7DE0, 0x7DE1, 0x7DE4, 0x7DE4, 0x7DE8, 0x7DE9, 0x7DEC, 0x7DEC,
-            0x7DEF, 0x7DEF, 0x7DF2, 0x7DF2, 0x7DF4, 0x7DF4, 0x7DFB, 0x7DFB, 0x7E01, 0x7E01, 0x7E04, 0x7E05, 0x7E09, 0x7E0B, 0x7E12, 0x7E12,
-            0x7E1B, 0x7E1B, 0x7E1E, 0x7E1F, 0x7E21, 0x7E23, 0x7E26, 0x7E26, 0x7E2B, 0x7E2B, 0x7E2E, 0x7E2E, 0x7E31, 0x7E32, 0x7E35, 0x7E35,
-            0x7E37, 0x7E37, 0x7E39, 0x7E3B, 0x7E3D, 0x7E3E, 0x7E41, 0x7E41, 0x7E43, 0x7E43, 0x7E46, 0x7E46, 0x7E4A, 0x7E4B, 0x7E4D, 0x7E4D,
-            0x7E54, 0x7E56, 0x7E59, 0x7E5A, 0x7E5D, 0x7E5E, 0x7E66, 0x7E67, 0x7E69, 0x7E6A, 0x7E6D, 0x7E6D, 0x7E70, 0x7E70, 0x7E79, 0x7E79,
-            0x7E7B, 0x7E7D, 0x7E7F, 0x7E7F, 0x7E82, 0x7E83, 0x7E88, 0x7E89, 0x7E8C, 0x7E8C, 0x7E8E, 0x7E90, 0x7E92, 0x7E94, 0x7E96, 0x7E96,
-            0x7E9B, 0x7E9C, 0x7F36, 0x7F36, 0x7F38, 0x7F38, 0x7F3A, 0x7F3A, 0x7F45, 0x7F45, 0x7F4C, 0x7F4E, 0x7F50, 0x7F51, 0x7F54, 0x7F55,
-            0x7F58, 0x7F58, 0x7F5F, 0x7F60, 0x7F67, 0x7F6B, 0x7F6E, 0x7F6E, 0x7F70, 0x7F70, 0x7F72, 0x7F72, 0x7F75, 0x7F75, 0x7F77, 0x7F79,
-            0x7F82, 0x7F83, 0x7F85, 0x7F88, 0x7F8A, 0x7F8A, 0x7F8C, 0x7F8C, 0x7F8E, 0x7F8E, 0x7F94, 0x7F94, 0x7F9A, 0x7F9A, 0x7F9D, 0x7F9E,
-            0x7FA3, 0x7FA4, 0x7FA8, 0x7FA9, 0x7FAE, 0x7FAF, 0x7FB2, 0x7FB2, 0x7FB6, 0x7FB6, 0x7FB8, 0x7FB9, 0x7FBD, 0x7FBD, 0x7FC1, 0x7FC1,
-            0x7FC5, 0x7FC6, 0x7FCA, 0x7FCA, 0x7FCC, 0x7FCC, 0x7FD2, 0x7FD2, 0x7FD4, 0x7FD5, 0x7FE0, 0x7FE1, 0x7FE6, 0x7FE6, 0x7FE9, 0x7FE9,
-            0x7FEB, 0x7FEB, 0x7FF0, 0x7FF0, 0x7FF3, 0x7FF3, 0x7FF9, 0x7FF9, 0x7FFB, 0x7FFC, 0x8000, 0x8001, 0x8003, 0x8006, 0x800B, 0x800C,
-            0x8010, 0x8010, 0x8012, 0x8012, 0x8015, 0x8015, 0x8017, 0x8019, 0x801C, 0x801C, 0x8021, 0x8021, 0x8028, 0x8028, 0x8033, 0x8033,
-            0x8036, 0x8036, 0x803B, 0x803B, 0x803D, 0x803D, 0x803F, 0x803F, 0x8046, 0x8046, 0x804A, 0x804A, 0x8052, 0x8052, 0x8056, 0x8056,
-            0x8058, 0x8058, 0x805A, 0x805A, 0x805E, 0x805F, 0x8061, 0x8062, 0x8068, 0x8068, 0x806F, 0x8070, 0x8072, 0x8074, 0x8076, 0x8077,
-            0x8079, 0x8079, 0x807D, 0x807F, 0x8084, 0x8087, 0x8089, 0x8089, 0x808B, 0x808C, 0x8093, 0x8093, 0x8096, 0x8096, 0x8098, 0x8098,
-            0x809A, 0x809B, 0x809D, 0x809D, 0x80A1, 0x80A2, 0x80A5, 0x80A5, 0x80A9, 0x80AA, 0x80AC, 0x80AD, 0x80AF, 0x80AF, 0x80B1, 0x80B2,
-            0x80B4, 0x80B4, 0x80BA, 0x80BA, 0x80C3, 0x80C4, 0x80C6, 0x80C6, 0x80CC, 0x80CC, 0x80CE, 0x80CE, 0x80D6, 0x80D6, 0x80D9, 0x80DB,
-            0x80DD, 0x80DE, 0x80E1, 0x80E1, 0x80E4, 0x80E5, 0x80EF, 0x80EF, 0x80F1, 0x80F1, 0x80F4, 0x80F4, 0x80F8, 0x80F8, 0x80FC, 0x80FD,
-            0x8102, 0x8102, 0x8105, 0x810A, 0x811A, 0x811B, 0x8123, 0x8123, 0x8129, 0x8129, 0x812F, 0x812F, 0x8131, 0x8131, 0x8133, 0x8133,
-            0x8139, 0x8139, 0x813E, 0x813E, 0x8146, 0x8146, 0x814B, 0x814B, 0x814E, 0x814E, 0x8150, 0x8151, 0x8153, 0x8155, 0x815F, 0x815F,
-            0x8165, 0x8166, 0x816B, 0x816B, 0x816E, 0x816E, 0x8170, 0x8171, 0x8174, 0x8174, 0x8178, 0x817A, 0x817F, 0x8180, 0x8182, 0x8183,
-            0x8188, 0x8188, 0x818A, 0x818A, 0x818F, 0x818F, 0x8193, 0x8193, 0x8195, 0x8195, 0x819A, 0x819A, 0x819C, 0x819D, 0x81A0, 0x81A0,
-            0x81A3, 0x81A4, 0x81A8, 0x81A9, 0x81B0, 0x81B0, 0x81B3, 0x81B3, 0x81B5, 0x81B5, 0x81B8, 0x81B8, 0x81BA, 0x81BA, 0x81BD, 0x81C0,
-            0x81C2, 0x81C2, 0x81C6, 0x81C6, 0x81C8, 0x81C9, 0x81CD, 0x81CD, 0x81D1, 0x81D1, 0x81D3, 0x81D3, 0x81D8, 0x81DA, 0x81DF, 0x81E0,
-            0x81E3, 0x81E3, 0x81E5, 0x81E5, 0x81E7, 0x81E8, 0x81EA, 0x81EA, 0x81ED, 0x81ED, 0x81F3, 0x81F4, 0x81FA, 0x81FC, 0x81FE, 0x81FE,
-            0x8201, 0x8202, 0x8205, 0x8205, 0x8207, 0x820A, 0x820C, 0x820E, 0x8210, 0x8210, 0x8212, 0x8212, 0x8216, 0x8218, 0x821B, 0x821C,
-            0x821E, 0x821F, 0x8229, 0x822C, 0x822E, 0x822E, 0x8233, 0x8233, 0x8235, 0x8239, 0x8240, 0x8240, 0x8247, 0x8247, 0x8258, 0x825A,
-            0x825D, 0x825D, 0x825F, 0x825F, 0x8262, 0x8262, 0x8264, 0x8264, 0x8266, 0x8266, 0x8268, 0x8268, 0x826A, 0x826B, 0x826E, 0x826F,
-            0x8271, 0x8272, 0x8276, 0x8278, 0x827E, 0x827E, 0x828B, 0x828B, 0x828D, 0x828D, 0x8292, 0x8292, 0x8299, 0x8299, 0x829D, 0x829D,
-            0x829F, 0x829F, 0x82A5, 0x82A6, 0x82AB, 0x82AD, 0x82AF, 0x82AF, 0x82B1, 0x82B1, 0x82B3, 0x82B3, 0x82B8, 0x82B9, 0x82BB, 0x82BB,
-            0x82BD, 0x82BD, 0x82C5, 0x82C5, 0x82D1, 0x82D4, 0x82D7, 0x82D7, 0x82D9, 0x82D9, 0x82DB, 0x82DC, 0x82DE, 0x82DF, 0x82E1, 0x82E1,
-            0x82E3, 0x82E3, 0x82E5, 0x82E7, 0x82EB, 0x82EB, 0x82F1, 0x82F1, 0x82F3, 0x82F4, 0x82F9, 0x82FB, 0x8302, 0x8306, 0x8309, 0x8309,
-            0x830E, 0x830E, 0x8316, 0x8318, 0x831C, 0x831C, 0x8323, 0x8323, 0x8328, 0x8328, 0x832B, 0x832B, 0x832F, 0x832F, 0x8331, 0x8332,
-            0x8334, 0x8336, 0x8338, 0x8339, 0x8340, 0x8340, 0x8345, 0x8345, 0x8349, 0x834A, 0x834F, 0x8350, 0x8352, 0x8352, 0x8358, 0x8358,
-            0x8373, 0x8373, 0x8375, 0x8375, 0x8377, 0x8377, 0x837B, 0x837C, 0x8385, 0x8385, 0x8387, 0x8387, 0x8389, 0x838A, 0x838E, 0x838E,
-            0x8393, 0x8393, 0x8396, 0x8396, 0x839A, 0x839A, 0x839E, 0x83A0, 0x83A2, 0x83A2, 0x83A8, 0x83A8, 0x83AA, 0x83AB, 0x83B1, 0x83B1,
-            0x83B5, 0x83B5, 0x83BD, 0x83BD, 0x83C1, 0x83C1, 0x83C5, 0x83C5, 0x83CA, 0x83CA, 0x83CC, 0x83CC, 0x83CE, 0x83CE, 0x83D3, 0x83D3,
-            0x83D6, 0x83D6, 0x83D8, 0x83D8, 0x83DC, 0x83DC, 0x83DF, 0x83E0, 0x83E9, 0x83E9, 0x83EB, 0x83EB, 0x83EF, 0x83F2, 0x83F4, 0x83F4,
-            0x83F7, 0x83F7, 0x83FB, 0x83FB, 0x83FD, 0x83FD, 0x8403, 0x8404, 0x8407, 0x8407, 0x840B, 0x840E, 0x8413, 0x8413, 0x8420, 0x8420,
-            0x8422, 0x8422, 0x8429, 0x842A, 0x842C, 0x842C, 0x8431, 0x8431, 0x8435, 0x8435, 0x8438, 0x8438, 0x843C, 0x843D, 0x8446, 0x8446,
-            0x8449, 0x8449, 0x844E, 0x844E, 0x8457, 0x8457, 0x845B, 0x845B, 0x8461, 0x8463, 0x8466, 0x8466, 0x8469, 0x8469, 0x846B, 0x846F,
-            0x8471, 0x8471, 0x8475, 0x8475, 0x8477, 0x8477, 0x8479, 0x847A, 0x8482, 0x8482, 0x8484, 0x8484, 0x848B, 0x848B, 0x8490, 0x8490,
-            0x8494, 0x8494, 0x8499, 0x8499, 0x849C, 0x849C, 0x849F, 0x849F, 0x84A1, 0x84A1, 0x84AD, 0x84AD, 0x84B2, 0x84B2, 0x84B8, 0x84B9,
-            0x84BB, 0x84BC, 0x84BF, 0x84BF, 0x84C1, 0x84C1, 0x84C4, 0x84C4, 0x84C6, 0x84C6, 0x84C9, 0x84CB, 0x84CD, 0x84CD, 0x84D0, 0x84D1,
-            0x84D6, 0x84D6, 0x84D9, 0x84DA, 0x84EC, 0x84EC, 0x84EE, 0x84EE, 0x84F4, 0x84F4, 0x84FC, 0x84FC, 0x84FF, 0x8500, 0x8506, 0x8506,
-            0x8511, 0x8511, 0x8513, 0x8515, 0x8517, 0x8518, 0x851A, 0x851A, 0x851F, 0x851F, 0x8521, 0x8521, 0x8526, 0x8526, 0x852C, 0x852D,
-            0x8535, 0x8535, 0x853D, 0x853D, 0x8540, 0x8541, 0x8543, 0x8543, 0x8548, 0x854B, 0x854E, 0x854E, 0x8555, 0x8555, 0x8557, 0x8558,
-            0x855A, 0x855A, 0x8563, 0x8563, 0x8568, 0x856A, 0x856D, 0x856D, 0x8577, 0x8577, 0x857E, 0x857E, 0x8580, 0x8580, 0x8584, 0x8584,
-            0x8587, 0x8588, 0x858A, 0x858A, 0x8590, 0x8591, 0x8594, 0x8594, 0x8597, 0x8597, 0x8599, 0x8599, 0x859B, 0x859C, 0x85A4, 0x85A4,
-            0x85A6, 0x85A6, 0x85A8, 0x85AC, 0x85AE, 0x85AF, 0x85B9, 0x85BA, 0x85C1, 0x85C1, 0x85C9, 0x85C9, 0x85CD, 0x85CD, 0x85CF, 0x85D0,
-            0x85D5, 0x85D5, 0x85DC, 0x85DD, 0x85E4, 0x85E5, 0x85E9, 0x85EA, 0x85F7, 0x85F7, 0x85F9, 0x85FB, 0x85FE, 0x85FE, 0x8602, 0x8602,
-            0x8606, 0x8607, 0x860A, 0x860B, 0x8613, 0x8613, 0x8616, 0x8617, 0x861A, 0x861A, 0x8622, 0x8622, 0x862D, 0x862D, 0x862F, 0x8630,
-            0x863F, 0x863F, 0x864D, 0x864E, 0x8650, 0x8650, 0x8654, 0x8655, 0x865A, 0x865A, 0x865C, 0x865C, 0x865E, 0x865F, 0x8667, 0x8667,
-            0x866B, 0x866B, 0x8671, 0x8671, 0x8679, 0x8679, 0x867B, 0x867B, 0x868A, 0x868C, 0x8693, 0x8693, 0x8695, 0x8695, 0x86A3, 0x86A4,
-            0x86A9, 0x86AB, 0x86AF, 0x86B0, 0x86B6, 0x86B6, 0x86C4, 0x86C4, 0x86C6, 0x86C7, 0x86C9, 0x86C9, 0x86CB, 0x86CB, 0x86CD, 0x86CE,
-            0x86D4, 0x86D4, 0x86D9, 0x86D9, 0x86DB, 0x86DB, 0x86DE, 0x86DF, 0x86E4, 0x86E4, 0x86E9, 0x86E9, 0x86EC, 0x86EF, 0x86F8, 0x86F9,
-            0x86FB, 0x86FB, 0x86FE, 0x86FE, 0x8700, 0x8700, 0x8702, 0x8703, 0x8706, 0x8706, 0x8708, 0x870A, 0x870D, 0x870D, 0x8711, 0x8712,
-            0x8718, 0x8718, 0x871A, 0x871A, 0x871C, 0x871C, 0x8725, 0x8725, 0x8729, 0x8729, 0x8734, 0x8734, 0x8737, 0x8737, 0x873B, 0x873B,
-            0x873F, 0x873F, 0x8749, 0x8749, 0x874B, 0x874C, 0x874E, 0x874E, 0x8753, 0x8753, 0x8755, 0x8755, 0x8757, 0x8757, 0x8759, 0x8759,
-            0x875F, 0x8760, 0x8763, 0x8763, 0x8766, 0x8766, 0x8768, 0x8768, 0x876A, 0x876A, 0x876E, 0x876E, 0x8774, 0x8774, 0x8776, 0x8776,
-            0x8778, 0x8778, 0x877F, 0x877F, 0x8782, 0x8782, 0x878D, 0x878D, 0x879F, 0x879F, 0x87A2, 0x87A2, 0x87AB, 0x87AB, 0x87AF, 0x87AF,
-            0x87B3, 0x87B3, 0x87BA, 0x87BB, 0x87BD, 0x87BD, 0x87C0, 0x87C0, 0x87C4, 0x87C4, 0x87C6, 0x87C7, 0x87CB, 0x87CB, 0x87D0, 0x87D0,
-            0x87D2, 0x87D2, 0x87E0, 0x87E0, 0x87EF, 0x87EF, 0x87F2, 0x87F2, 0x87F6, 0x87F7, 0x87F9, 0x87F9, 0x87FB, 0x87FB, 0x87FE, 0x87FE,
-            0x8805, 0x8805, 0x880D, 0x880F, 0x8811, 0x8811, 0x8815, 0x8816, 0x8821, 0x8823, 0x8827, 0x8827, 0x8831, 0x8831, 0x8836, 0x8836,
-            0x8839, 0x8839, 0x883B, 0x883B, 0x8840, 0x8840, 0x8842, 0x8842, 0x8844, 0x8844, 0x8846, 0x8846, 0x884C, 0x884D, 0x8852, 0x8853,
-            0x8857, 0x8857, 0x8859, 0x8859, 0x885B, 0x885B, 0x885D, 0x885E, 0x8861, 0x8863, 0x8868, 0x8868, 0x886B, 0x886B, 0x8870, 0x8870,
-            0x8872, 0x8872, 0x8875, 0x8875, 0x8877, 0x8877, 0x887D, 0x887F, 0x8881, 0x8882, 0x8888, 0x8888, 0x888B, 0x888B, 0x888D, 0x888D,
-            0x8892, 0x8892, 0x8896, 0x8897, 0x8899, 0x8899, 0x889E, 0x889E, 0x88A2, 0x88A2, 0x88A4, 0x88A4, 0x88AB, 0x88AB, 0x88AE, 0x88AE,
-            0x88B0, 0x88B1, 0x88B4, 0x88B5, 0x88B7, 0x88B7, 0x88BF, 0x88BF, 0x88C1, 0x88C5, 0x88CF, 0x88CF, 0x88D4, 0x88D5, 0x88D8, 0x88D9,
-            0x88DC, 0x88DD, 0x88DF, 0x88DF, 0x88E1, 0x88E1, 0x88E8, 0x88E8, 0x88F2, 0x88F4, 0x88F8, 0x88F9, 0x88FC, 0x88FE, 0x8902, 0x8902,
-            0x8904, 0x8904, 0x8907, 0x8907, 0x890A, 0x890A, 0x890C, 0x890C, 0x8910, 0x8910, 0x8912, 0x8913, 0x891D, 0x891E, 0x8925, 0x8925,
-            0x892A, 0x892B, 0x8936, 0x8936, 0x8938, 0x8938, 0x893B, 0x893B, 0x8941, 0x8941, 0x8943, 0x8944, 0x894C, 0x894D, 0x8956, 0x8956,
-            0x895E, 0x8960, 0x8964, 0x8964, 0x8966, 0x8966, 0x896A, 0x896A, 0x896D, 0x896D, 0x896F, 0x896F, 0x8972, 0x8972, 0x8974, 0x8974,
-            0x8977, 0x8977, 0x897E, 0x897F, 0x8981, 0x8981, 0x8983, 0x8983, 0x8986, 0x8988, 0x898A, 0x898B, 0x898F, 0x898F, 0x8993, 0x8993,
-            0x8996, 0x8998, 0x899A, 0x899A, 0x89A1, 0x89A1, 0x89A6, 0x89A7, 0x89A9, 0x89AA, 0x89AC, 0x89AC, 0x89AF, 0x89AF, 0x89B2, 0x89B3,
-            0x89BA, 0x89BA, 0x89BD, 0x89BD, 0x89BF, 0x89C0, 0x89D2, 0x89D2, 0x89DA, 0x89DA, 0x89DC, 0x89DD, 0x89E3, 0x89E3, 0x89E6, 0x89E7,
-            0x89F4, 0x89F4, 0x89F8, 0x89F8, 0x8A00, 0x8A00, 0x8A02, 0x8A03, 0x8A08, 0x8A08, 0x8A0A, 0x8A0A, 0x8A0C, 0x8A0C, 0x8A0E, 0x8A0E,
-            0x8A10, 0x8A10, 0x8A13, 0x8A13, 0x8A16, 0x8A18, 0x8A1B, 0x8A1B, 0x8A1D, 0x8A1D, 0x8A1F, 0x8A1F, 0x8A23, 0x8A23, 0x8A25, 0x8A25,
-            0x8A2A, 0x8A2A, 0x8A2D, 0x8A2D, 0x8A31, 0x8A31, 0x8A33, 0x8A34, 0x8A36, 0x8A36, 0x8A3A, 0x8A3C, 0x8A41, 0x8A41, 0x8A46, 0x8A46,
-            0x8A48, 0x8A48, 0x8A50, 0x8A52, 0x8A54, 0x8A55, 0x8A5B, 0x8A5B, 0x8A5E, 0x8A5E, 0x8A60, 0x8A60, 0x8A62, 0x8A63, 0x8A66, 0x8A66,
-            0x8A69, 0x8A69, 0x8A6B, 0x8A6E, 0x8A70, 0x8A73, 0x8A7C, 0x8A7C, 0x8A82, 0x8A82, 0x8A84, 0x8A85, 0x8A87, 0x8A87, 0x8A89, 0x8A89,
-            0x8A8C, 0x8A8D, 0x8A91, 0x8A91, 0x8A93, 0x8A93, 0x8A95, 0x8A95, 0x8A98, 0x8A98, 0x8A9A, 0x8A9A, 0x8A9E, 0x8A9E, 0x8AA0, 0x8AA1,
-            0x8AA3, 0x8AA6, 0x8AA8, 0x8AA8, 0x8AAC, 0x8AAD, 0x8AB0, 0x8AB0, 0x8AB2, 0x8AB2, 0x8AB9, 0x8AB9, 0x8ABC, 0x8ABC, 0x8ABF, 0x8ABF,
-            0x8AC2, 0x8AC2, 0x8AC4, 0x8AC4, 0x8AC7, 0x8AC7, 0x8ACB, 0x8ACD, 0x8ACF, 0x8ACF, 0x8AD2, 0x8AD2, 0x8AD6, 0x8AD6, 0x8ADA, 0x8ADC,
-            0x8ADE, 0x8ADE, 0x8AE0, 0x8AE2, 0x8AE4, 0x8AE4, 0x8AE6, 0x8AE7, 0x8AEB, 0x8AEB, 0x8AED, 0x8AEE, 0x8AF1, 0x8AF1, 0x8AF3, 0x8AF3,
-            0x8AF7, 0x8AF8, 0x8AFA, 0x8AFA, 0x8AFE, 0x8AFE, 0x8B00, 0x8B02, 0x8B04, 0x8B04, 0x8B07, 0x8B07, 0x8B0C, 0x8B0C, 0x8B0E, 0x8B0E,
-            0x8B10, 0x8B10, 0x8B14, 0x8B14, 0x8B16, 0x8B17, 0x8B19, 0x8B1B, 0x8B1D, 0x8B1D, 0x8B20, 0x8B21, 0x8B26, 0x8B26, 0x8B28, 0x8B28,
-            0x8B2B, 0x8B2C, 0x8B33, 0x8B33, 0x8B39, 0x8B39, 0x8B3E, 0x8B3E, 0x8B41, 0x8B41, 0x8B49, 0x8B49, 0x8B4C, 0x8B4C, 0x8B4E, 0x8B4F,
-            0x8B56, 0x8B56, 0x8B58, 0x8B58, 0x8B5A, 0x8B5C, 0x8B5F, 0x8B5F, 0x8B66, 0x8B66, 0x8B6B, 0x8B6C, 0x8B6F, 0x8B72, 0x8B74, 0x8B74,
-            0x8B77, 0x8B77, 0x8B7D, 0x8B7D, 0x8B80, 0x8B80, 0x8B83, 0x8B83, 0x8B8A, 0x8B8A, 0x8B8C, 0x8B8C, 0x8B8E, 0x8B8E, 0x8B90, 0x8B90,
-            0x8B92, 0x8B93, 0x8B96, 0x8B96, 0x8B99, 0x8B9A, 0x8C37, 0x8C37, 0x8C3A, 0x8C3A, 0x8C3F, 0x8C3F, 0x8C41, 0x8C41, 0x8C46, 0x8C46,
-            0x8C48, 0x8C48, 0x8C4A, 0x8C4A, 0x8C4C, 0x8C4C, 0x8C4E, 0x8C4E, 0x8C50, 0x8C50, 0x8C55, 0x8C55, 0x8C5A, 0x8C5A, 0x8C61, 0x8C62,
-            0x8C6A, 0x8C6C, 0x8C78, 0x8C7A, 0x8C7C, 0x8C7C, 0x8C82, 0x8C82, 0x8C85, 0x8C85, 0x8C89, 0x8C8A, 0x8C8C, 0x8C8E, 0x8C94, 0x8C94,
-            0x8C98, 0x8C98, 0x8C9D, 0x8C9E, 0x8CA0, 0x8CA2, 0x8CA7, 0x8CB0, 0x8CB2, 0x8CB4, 0x8CB6, 0x8CB8, 0x8CBB, 0x8CBD, 0x8CBF, 0x8CC4,
-            0x8CC7, 0x8CC8, 0x8CCA, 0x8CCA, 0x8CCD, 0x8CCE, 0x8CD1, 0x8CD1, 0x8CD3, 0x8CD3, 0x8CDA, 0x8CDC, 0x8CDE, 0x8CDE, 0x8CE0, 0x8CE0,
-            0x8CE2, 0x8CE4, 0x8CE6, 0x8CE6, 0x8CEA, 0x8CEA, 0x8CED, 0x8CED, 0x8CFA, 0x8CFD, 0x8D04, 0x8D05, 0x8D07, 0x8D08, 0x8D0A, 0x8D0B,
-            0x8D0D, 0x8D0D, 0x8D0F, 0x8D10, 0x8D13, 0x8D14, 0x8D16, 0x8D16, 0x8D64, 0x8D64, 0x8D66, 0x8D67, 0x8D6B, 0x8D6B, 0x8D6D, 0x8D6D,
-            0x8D70, 0x8D71, 0x8D73, 0x8D74, 0x8D77, 0x8D77, 0x8D81, 0x8D81, 0x8D85, 0x8D85, 0x8D8A, 0x8D8A, 0x8D99, 0x8D99, 0x8DA3, 0x8DA3,
-            0x8DA8, 0x8DA8, 0x8DB3, 0x8DB3, 0x8DBA, 0x8DBA, 0x8DBE, 0x8DBE, 0x8DC2, 0x8DC2, 0x8DCB, 0x8DCC, 0x8DCF, 0x8DCF, 0x8DD6, 0x8DD6,
-            0x8DDA, 0x8DDB, 0x8DDD, 0x8DDD, 0x8DDF, 0x8DDF, 0x8DE1, 0x8DE1, 0x8DE3, 0x8DE3, 0x8DE8, 0x8DE8, 0x8DEA, 0x8DEB, 0x8DEF, 0x8DEF,
-            0x8DF3, 0x8DF3, 0x8DF5, 0x8DF5, 0x8DFC, 0x8DFC, 0x8DFF, 0x8DFF, 0x8E08, 0x8E0A, 0x8E0F, 0x8E10, 0x8E1D, 0x8E1F, 0x8E2A, 0x8E2A,
-            0x8E30, 0x8E30, 0x8E34, 0x8E35, 0x8E42, 0x8E42, 0x8E44, 0x8E44, 0x8E47, 0x8E4A, 0x8E4C, 0x8E4C, 0x8E50, 0x8E50, 0x8E55, 0x8E55,
-            0x8E59, 0x8E59, 0x8E5F, 0x8E60, 0x8E63, 0x8E64, 0x8E72, 0x8E72, 0x8E74, 0x8E74, 0x8E76, 0x8E76, 0x8E7C, 0x8E7C, 0x8E81, 0x8E81,
-            0x8E84, 0x8E85, 0x8E87, 0x8E87, 0x8E8A, 0x8E8B, 0x8E8D, 0x8E8D, 0x8E91, 0x8E91, 0x8E93, 0x8E94, 0x8E99, 0x8E99, 0x8EA1, 0x8EA1,
-            0x8EAA, 0x8EAC, 0x8EAF, 0x8EB1, 0x8EBE, 0x8EBE, 0x8EC5, 0x8EC6, 0x8EC8, 0x8EC8, 0x8ECA, 0x8ECD, 0x8ED2, 0x8ED2, 0x8EDB, 0x8EDB,
-            0x8EDF, 0x8EDF, 0x8EE2, 0x8EE3, 0x8EEB, 0x8EEB, 0x8EF8, 0x8EF8, 0x8EFB, 0x8EFE, 0x8F03, 0x8F03, 0x8F05, 0x8F05, 0x8F09, 0x8F0A,
-            0x8F0C, 0x8F0C, 0x8F12, 0x8F15, 0x8F19, 0x8F19, 0x8F1B, 0x8F1D, 0x8F1F, 0x8F1F, 0x8F26, 0x8F26, 0x8F29, 0x8F2A, 0x8F2F, 0x8F2F,
-            0x8F33, 0x8F33, 0x8F38, 0x8F39, 0x8F3B, 0x8F3B, 0x8F3E, 0x8F3F, 0x8F42, 0x8F42, 0x8F44, 0x8F46, 0x8F49, 0x8F49, 0x8F4C, 0x8F4E,
-            0x8F57, 0x8F57, 0x8F5C, 0x8F5C, 0x8F5F, 0x8F5F, 0x8F61, 0x8F64, 0x8F9B, 0x8F9C, 0x8F9E, 0x8F9F, 0x8FA3, 0x8FA3, 0x8FA7, 0x8FA8,
-            0x8FAD, 0x8FB2, 0x8FB7, 0x8FB7, 0x8FBA, 0x8FBC, 0x8FBF, 0x8FBF, 0x8FC2, 0x8FC2, 0x8FC4, 0x8FC5, 0x8FCE, 0x8FCE, 0x8FD1, 0x8FD1,
-            0x8FD4, 0x8FD4, 0x8FDA, 0x8FDA, 0x8FE2, 0x8FE2, 0x8FE5, 0x8FE6, 0x8FE9, 0x8FEB, 0x8FED, 0x8FED, 0x8FEF, 0x8FF0, 0x8FF4, 0x8FF4,
-            0x8FF7, 0x8FFA, 0x8FFD, 0x8FFD, 0x9000, 0x9001, 0x9003, 0x9003, 0x9005, 0x9006, 0x900B, 0x900B, 0x900D, 0x9011, 0x9013, 0x9017,
-            0x9019, 0x901A, 0x901D, 0x9023, 0x9027, 0x9027, 0x902E, 0x902E, 0x9031, 0x9032, 0x9035, 0x9036, 0x9038, 0x9039, 0x903C, 0x903C,
-            0x903E, 0x903E, 0x9041, 0x9042, 0x9045, 0x9045, 0x9047, 0x9047, 0x9049, 0x904B, 0x904D, 0x9056, 0x9058, 0x9059, 0x905C, 0x905C,
-            0x905E, 0x905E, 0x9060, 0x9061, 0x9063, 0x9063, 0x9065, 0x9065, 0x9068, 0x9069, 0x906D, 0x906F, 0x9072, 0x9072, 0x9075, 0x9078,
-            0x907A, 0x907A, 0x907C, 0x907D, 0x907F, 0x9084, 0x9087, 0x9087, 0x9089, 0x908A, 0x908F, 0x908F, 0x9091, 0x9091, 0x90A3, 0x90A3,
-            0x90A6, 0x90A6, 0x90A8, 0x90A8, 0x90AA, 0x90AA, 0x90AF, 0x90AF, 0x90B1, 0x90B1, 0x90B5, 0x90B5, 0x90B8, 0x90B8, 0x90C1, 0x90C1,
-            0x90CA, 0x90CA, 0x90CE, 0x90CE, 0x90DB, 0x90DB, 0x90E1, 0x90E2, 0x90E4, 0x90E4, 0x90E8, 0x90E8, 0x90ED, 0x90ED, 0x90F5, 0x90F5,
-            0x90F7, 0x90F7, 0x90FD, 0x90FD, 0x9102, 0x9102, 0x9112, 0x9112, 0x9119, 0x9119, 0x912D, 0x912D, 0x9130, 0x9130, 0x9132, 0x9132,
-            0x9149, 0x914E, 0x9152, 0x9152, 0x9154, 0x9154, 0x9156, 0x9156, 0x9158, 0x9158, 0x9162, 0x9163, 0x9165, 0x9165, 0x9169, 0x916A,
-            0x916C, 0x916C, 0x9172, 0x9173, 0x9175, 0x9175, 0x9177, 0x9178, 0x9182, 0x9182, 0x9187, 0x9187, 0x9189, 0x9189, 0x918B, 0x918B,
-            0x918D, 0x918D, 0x9190, 0x9190, 0x9192, 0x9192, 0x9197, 0x9197, 0x919C, 0x919C, 0x91A2, 0x91A2, 0x91A4, 0x91A4, 0x91AA, 0x91AB,
-            0x91AF, 0x91AF, 0x91B4, 0x91B5, 0x91B8, 0x91B8, 0x91BA, 0x91BA, 0x91C0, 0x91C1, 0x91C6, 0x91C9, 0x91CB, 0x91D1, 0x91D6, 0x91D6,
-            0x91D8, 0x91D8, 0x91DB, 0x91DD, 0x91DF, 0x91DF, 0x91E1, 0x91E1, 0x91E3, 0x91E3, 0x91E6, 0x91E7, 0x91F5, 0x91F6, 0x91FC, 0x91FC,
-            0x91FF, 0x91FF, 0x920D, 0x920E, 0x9211, 0x9211, 0x9214, 0x9215, 0x921E, 0x921E, 0x9229, 0x9229, 0x922C, 0x922C, 0x9234, 0x9234,
-            0x9237, 0x9237, 0x923F, 0x923F, 0x9244, 0x9245, 0x9248, 0x9249, 0x924B, 0x924B, 0x9250, 0x9250, 0x9257, 0x9257, 0x925A, 0x925B,
-            0x925E, 0x925E, 0x9262, 0x9262, 0x9264, 0x9264, 0x9266, 0x9266, 0x9271, 0x9271, 0x927E, 0x927E, 0x9280, 0x9280, 0x9283, 0x9283,
-            0x9285, 0x9285, 0x9291, 0x9291, 0x9293, 0x9293, 0x9295, 0x9296, 0x9298, 0x9298, 0x929A, 0x929C, 0x92AD, 0x92AD, 0x92B7, 0x92B7,
-            0x92B9, 0x92B9, 0x92CF, 0x92CF, 0x92D2, 0x92D2, 0x92E4, 0x92E4, 0x92E9, 0x92EA, 0x92ED, 0x92ED, 0x92F2, 0x92F3, 0x92F8, 0x92F8,
-            0x92FA, 0x92FA, 0x92FC, 0x92FC, 0x9306, 0x9306, 0x930F, 0x9310, 0x9318, 0x931A, 0x9320, 0x9320, 0x9322, 0x9323, 0x9326, 0x9326,
-            0x9328, 0x9328, 0x932B, 0x932C, 0x932E, 0x932F, 0x9332, 0x9332, 0x9335, 0x9335, 0x933A, 0x933B, 0x9344, 0x9344, 0x934B, 0x934B,
-            0x934D, 0x934D, 0x9354, 0x9354, 0x9356, 0x9356, 0x935B, 0x935C, 0x9360, 0x9360, 0x936C, 0x936C, 0x936E, 0x936E, 0x9375, 0x9375,
-            0x937C, 0x937C, 0x937E, 0x937E, 0x938C, 0x938C, 0x9394, 0x9394, 0x9396, 0x9397, 0x939A, 0x939A, 0x93A7, 0x93A7, 0x93AC, 0x93AE,
-            0x93B0, 0x93B0, 0x93B9, 0x93B9, 0x93C3, 0x93C3, 0x93C8, 0x93C8, 0x93D0, 0x93D1, 0x93D6, 0x93D8, 0x93DD, 0x93DD, 0x93E1, 0x93E1,
-            0x93E4, 0x93E5, 0x93E8, 0x93E8, 0x9403, 0x9403, 0x9407, 0x9407, 0x9410, 0x9410, 0x9413, 0x9414, 0x9418, 0x941A, 0x9421, 0x9421,
-            0x942B, 0x942B, 0x9435, 0x9436, 0x9438, 0x9438, 0x943A, 0x943A, 0x9441, 0x9441, 0x9444, 0x9444, 0x9451, 0x9453, 0x945A, 0x945B,
-            0x945E, 0x945E, 0x9460, 0x9460, 0x9462, 0x9462, 0x946A, 0x946A, 0x9470, 0x9470, 0x9475, 0x9475, 0x9477, 0x9477, 0x947C, 0x947F,
-            0x9481, 0x9481, 0x9577, 0x9577, 0x9580, 0x9580, 0x9582, 0x9583, 0x9587, 0x9587, 0x9589, 0x958B, 0x958F, 0x958F, 0x9591, 0x9591,
-            0x9593, 0x9594, 0x9596, 0x9596, 0x9598, 0x9599, 0x95A0, 0x95A0, 0x95A2, 0x95A5, 0x95A7, 0x95A8, 0x95AD, 0x95AD, 0x95B2, 0x95B2,
-            0x95B9, 0x95B9, 0x95BB, 0x95BC, 0x95BE, 0x95BE, 0x95C3, 0x95C3, 0x95C7, 0x95C7, 0x95CA, 0x95CA, 0x95CC, 0x95CD, 0x95D4, 0x95D6,
-            0x95D8, 0x95D8, 0x95DC, 0x95DC, 0x95E1, 0x95E2, 0x95E5, 0x95E5, 0x961C, 0x961C, 0x9621, 0x9621, 0x9628, 0x9628, 0x962A, 0x962A,
-            0x962E, 0x962F, 0x9632, 0x9632, 0x963B, 0x963B, 0x963F, 0x9640, 0x9642, 0x9642, 0x9644, 0x9644, 0x964B, 0x964D, 0x964F, 0x9650,
-            0x965B, 0x965F, 0x9662, 0x9666, 0x966A, 0x966A, 0x966C, 0x966C, 0x9670, 0x9670, 0x9672, 0x9673, 0x9675, 0x9678, 0x967A, 0x967A,
-            0x967D, 0x967D, 0x9685, 0x9686, 0x9688, 0x9688, 0x968A, 0x968B, 0x968D, 0x968F, 0x9694, 0x9695, 0x9697, 0x9699, 0x969B, 0x969C,
-            0x96A0, 0x96A0, 0x96A3, 0x96A3, 0x96A7, 0x96A8, 0x96AA, 0x96AA, 0x96B0, 0x96B2, 0x96B4, 0x96B4, 0x96B6, 0x96B9, 0x96BB, 0x96BC,
-            0x96C0, 0x96C1, 0x96C4, 0x96C7, 0x96C9, 0x96C9, 0x96CB, 0x96CE, 0x96D1, 0x96D1, 0x96D5, 0x96D6, 0x96D9, 0x96D9, 0x96DB, 0x96DC,
-            0x96E2, 0x96E3, 0x96E8, 0x96E8, 0x96EA, 0x96EB, 0x96F0, 0x96F0, 0x96F2, 0x96F2, 0x96F6, 0x96F7, 0x96F9, 0x96F9, 0x96FB, 0x96FB,
-            0x9700, 0x9700, 0x9704, 0x9704, 0x9706, 0x9708, 0x970A, 0x970A, 0x970D, 0x970F, 0x9711, 0x9711, 0x9713, 0x9713, 0x9716, 0x9716,
-            0x9719, 0x9719, 0x971C, 0x971C, 0x971E, 0x971E, 0x9724, 0x9724, 0x9727, 0x9727, 0x972A, 0x972A, 0x9730, 0x9730, 0x9732, 0x9732,
-            0x9738, 0x9739, 0x973D, 0x973E, 0x9742, 0x9742, 0x9744, 0x9744, 0x9746, 0x9746, 0x9748, 0x9749, 0x9752, 0x9752, 0x9756, 0x9756,
-            0x9759, 0x9759, 0x975C, 0x975C, 0x975E, 0x975E, 0x9760, 0x9762, 0x9764, 0x9764, 0x9766, 0x9766, 0x9768, 0x9769, 0x976B, 0x976B,
-            0x976D, 0x976D, 0x9771, 0x9771, 0x9774, 0x9774, 0x9779, 0x977A, 0x977C, 0x977C, 0x9781, 0x9781, 0x9784, 0x9786, 0x978B, 0x978B,
-            0x978D, 0x978D, 0x978F, 0x9790, 0x9798, 0x9798, 0x979C, 0x979C, 0x97A0, 0x97A0, 0x97A3, 0x97A3, 0x97A6, 0x97A6, 0x97A8, 0x97A8,
-            0x97AB, 0x97AB, 0x97AD, 0x97AD, 0x97B3, 0x97B4, 0x97C3, 0x97C3, 0x97C6, 0x97C6, 0x97C8, 0x97C8, 0x97CB, 0x97CB, 0x97D3, 0x97D3,
-            0x97DC, 0x97DC, 0x97ED, 0x97EE, 0x97F2, 0x97F3, 0x97F5, 0x97F6, 0x97FB, 0x97FB, 0x97FF, 0x97FF, 0x9801, 0x9803, 0x9805, 0x9806,
-            0x9808, 0x9808, 0x980C, 0x980C, 0x980F, 0x9813, 0x9817, 0x9818, 0x981A, 0x981A, 0x9821, 0x9821, 0x9824, 0x9824, 0x982C, 0x982D,
-            0x9834, 0x9834, 0x9837, 0x9838, 0x983B, 0x983D, 0x9846, 0x9846, 0x984B, 0x984F, 0x9854, 0x9855, 0x9858, 0x9858, 0x985B, 0x985B,
-            0x985E, 0x985E, 0x9867, 0x9867, 0x986B, 0x986B, 0x986F, 0x9871, 0x9873, 0x9874, 0x98A8, 0x98A8, 0x98AA, 0x98AA, 0x98AF, 0x98AF,
-            0x98B1, 0x98B1, 0x98B6, 0x98B6, 0x98C3, 0x98C4, 0x98C6, 0x98C6, 0x98DB, 0x98DC, 0x98DF, 0x98DF, 0x98E2, 0x98E2, 0x98E9, 0x98E9,
-            0x98EB, 0x98EB, 0x98ED, 0x98EF, 0x98F2, 0x98F2, 0x98F4, 0x98F4, 0x98FC, 0x98FE, 0x9903, 0x9903, 0x9905, 0x9905, 0x9909, 0x990A,
-            0x990C, 0x990C, 0x9910, 0x9910, 0x9912, 0x9914, 0x9918, 0x9918, 0x991D, 0x991E, 0x9920, 0x9921, 0x9924, 0x9924, 0x9928, 0x9928,
-            0x992C, 0x992C, 0x992E, 0x992E, 0x993D, 0x993E, 0x9942, 0x9942, 0x9945, 0x9945, 0x9949, 0x9949, 0x994B, 0x994C, 0x9950, 0x9952,
-            0x9955, 0x9955, 0x9957, 0x9957, 0x9996, 0x9999, 0x99A5, 0x99A5, 0x99A8, 0x99A8, 0x99AC, 0x99AE, 0x99B3, 0x99B4, 0x99BC, 0x99BC,
-            0x99C1, 0x99C1, 0x99C4, 0x99C6, 0x99C8, 0x99C8, 0x99D0, 0x99D2, 0x99D5, 0x99D5, 0x99D8, 0x99D8, 0x99DB, 0x99DB, 0x99DD, 0x99DD,
-            0x99DF, 0x99DF, 0x99E2, 0x99E2, 0x99ED, 0x99EE, 0x99F1, 0x99F2, 0x99F8, 0x99F8, 0x99FB, 0x99FB, 0x99FF, 0x99FF, 0x9A01, 0x9A01,
-            0x9A05, 0x9A05, 0x9A0E, 0x9A0F, 0x9A12, 0x9A13, 0x9A19, 0x9A19, 0x9A28, 0x9A28, 0x9A2B, 0x9A2B, 0x9A30, 0x9A30, 0x9A37, 0x9A37,
-            0x9A3E, 0x9A3E, 0x9A40, 0x9A40, 0x9A42, 0x9A43, 0x9A45, 0x9A45, 0x9A4D, 0x9A4D, 0x9A55, 0x9A55, 0x9A57, 0x9A57, 0x9A5A, 0x9A5B,
-            0x9A5F, 0x9A5F, 0x9A62, 0x9A62, 0x9A64, 0x9A65, 0x9A69, 0x9A6B, 0x9AA8, 0x9AA8, 0x9AAD, 0x9AAD, 0x9AB0, 0x9AB0, 0x9AB8, 0x9AB8,
-            0x9ABC, 0x9ABC, 0x9AC0, 0x9AC0, 0x9AC4, 0x9AC4, 0x9ACF, 0x9ACF, 0x9AD1, 0x9AD1, 0x9AD3, 0x9AD4, 0x9AD8, 0x9AD8, 0x9ADE, 0x9ADF,
-            0x9AE2, 0x9AE3, 0x9AE6, 0x9AE6, 0x9AEA, 0x9AEB, 0x9AED, 0x9AEF, 0x9AF1, 0x9AF1, 0x9AF4, 0x9AF4, 0x9AF7, 0x9AF7, 0x9AFB, 0x9AFB,
-            0x9B06, 0x9B06, 0x9B18, 0x9B18, 0x9B1A, 0x9B1A, 0x9B1F, 0x9B1F, 0x9B22, 0x9B23, 0x9B25, 0x9B25, 0x9B27, 0x9B2A, 0x9B2E, 0x9B2F,
-            0x9B31, 0x9B32, 0x9B3B, 0x9B3C, 0x9B41, 0x9B45, 0x9B4D, 0x9B4F, 0x9B51, 0x9B51, 0x9B54, 0x9B54, 0x9B58, 0x9B58, 0x9B5A, 0x9B5A,
-            0x9B6F, 0x9B6F, 0x9B74, 0x9B74, 0x9B83, 0x9B83, 0x9B8E, 0x9B8E, 0x9B91, 0x9B93, 0x9B96, 0x9B97, 0x9B9F, 0x9BA0, 0x9BA8, 0x9BA8,
-            0x9BAA, 0x9BAB, 0x9BAD, 0x9BAE, 0x9BB4, 0x9BB4, 0x9BB9, 0x9BB9, 0x9BC0, 0x9BC0, 0x9BC6, 0x9BC6, 0x9BC9, 0x9BCA, 0x9BCF, 0x9BCF,
-            0x9BD1, 0x9BD2, 0x9BD4, 0x9BD4, 0x9BD6, 0x9BD6, 0x9BDB, 0x9BDB, 0x9BE1, 0x9BE4, 0x9BE8, 0x9BE8, 0x9BF0, 0x9BF2, 0x9BF5, 0x9BF5,
-            0x9C04, 0x9C04, 0x9C06, 0x9C06, 0x9C08, 0x9C0A, 0x9C0C, 0x9C0D, 0x9C10, 0x9C10, 0x9C12, 0x9C15, 0x9C1B, 0x9C1B, 0x9C21, 0x9C21,
-            0x9C24, 0x9C25, 0x9C2D, 0x9C30, 0x9C32, 0x9C32, 0x9C39, 0x9C3B, 0x9C3E, 0x9C3E, 0x9C46, 0x9C48, 0x9C52, 0x9C52, 0x9C57, 0x9C57,
-            0x9C5A, 0x9C5A, 0x9C60, 0x9C60, 0x9C67, 0x9C67, 0x9C76, 0x9C76, 0x9C78, 0x9C78, 0x9CE5, 0x9CE5, 0x9CE7, 0x9CE7, 0x9CE9, 0x9CE9,
-            0x9CEB, 0x9CEC, 0x9CF0, 0x9CF0, 0x9CF3, 0x9CF4, 0x9CF6, 0x9CF6, 0x9D03, 0x9D03, 0x9D06, 0x9D09, 0x9D0E, 0x9D0E, 0x9D12, 0x9D12,
-            0x9D15, 0x9D15, 0x9D1B, 0x9D1B, 0x9D1F, 0x9D1F, 0x9D23, 0x9D23, 0x9D26, 0x9D26, 0x9D28, 0x9D28, 0x9D2A, 0x9D2C, 0x9D3B, 0x9D3B,
-            0x9D3E, 0x9D3F, 0x9D41, 0x9D41, 0x9D44, 0x9D44, 0x9D46, 0x9D46, 0x9D48, 0x9D48, 0x9D50, 0x9D51, 0x9D59, 0x9D59, 0x9D5C, 0x9D5E,
-            0x9D60, 0x9D61, 0x9D64, 0x9D64, 0x9D6C, 0x9D6C, 0x9D6F, 0x9D6F, 0x9D72, 0x9D72, 0x9D7A, 0x9D7A, 0x9D87, 0x9D87, 0x9D89, 0x9D89,
-            0x9D8F, 0x9D8F, 0x9D9A, 0x9D9A, 0x9DA4, 0x9DA4, 0x9DA9, 0x9DA9, 0x9DAB, 0x9DAB, 0x9DAF, 0x9DAF, 0x9DB2, 0x9DB2, 0x9DB4, 0x9DB4,
-            0x9DB8, 0x9DB8, 0x9DBA, 0x9DBB, 0x9DC1, 0x9DC2, 0x9DC4, 0x9DC4, 0x9DC6, 0x9DC6, 0x9DCF, 0x9DCF, 0x9DD3, 0x9DD3, 0x9DD9, 0x9DD9,
-            0x9DE6, 0x9DE6, 0x9DED, 0x9DED, 0x9DEF, 0x9DEF, 0x9DF2, 0x9DF2, 0x9DF8, 0x9DFA, 0x9DFD, 0x9DFD, 0x9E1A, 0x9E1B, 0x9E1E, 0x9E1E,
-            0x9E75, 0x9E75, 0x9E78, 0x9E79, 0x9E7D, 0x9E7D, 0x9E7F, 0x9E7F, 0x9E81, 0x9E81, 0x9E88, 0x9E88, 0x9E8B, 0x9E8C, 0x9E91, 0x9E93,
-            0x9E95, 0x9E95, 0x9E97, 0x9E97, 0x9E9D, 0x9E9D, 0x9E9F, 0x9E9F, 0x9EA5, 0x9EA6, 0x9EA9, 0x9EAA, 0x9EAD, 0x9EAD, 0x9EB8, 0x9EBC,
-            0x9EBE, 0x9EBF, 0x9EC4, 0x9EC4, 0x9ECC, 0x9ED0, 0x9ED2, 0x9ED2, 0x9ED4, 0x9ED4, 0x9ED8, 0x9ED9, 0x9EDB, 0x9EDE, 0x9EE0, 0x9EE0,
-            0x9EE5, 0x9EE5, 0x9EE8, 0x9EE8, 0x9EEF, 0x9EEF, 0x9EF4, 0x9EF4, 0x9EF6, 0x9EF7, 0x9EF9, 0x9EF9, 0x9EFB, 0x9EFD, 0x9F07, 0x9F08,
-            0x9F0E, 0x9F0E, 0x9F13, 0x9F13, 0x9F15, 0x9F15, 0x9F20, 0x9F21, 0x9F2C, 0x9F2C, 0x9F3B, 0x9F3B, 0x9F3E, 0x9F3E, 0x9F4A, 0x9F4B,
-            0x9F4E, 0x9F4F, 0x9F52, 0x9F52, 0x9F54, 0x9F54, 0x9F5F, 0x9F63, 0x9F66, 0x9F67, 0x9F6A, 0x9F6A, 0x9F6C, 0x9F6C, 0x9F72, 0x9F72,
-            0x9F76, 0x9F77, 0x9F8D, 0x9F8D, 0x9F95, 0x9F95, 0x9F9C, 0x9F9D, 0x9FA0, 0x9FA0, 0xFF01, 0xFF01, 0xFF03, 0xFF06, 0xFF08, 0xFF0C,
-            0xFF0E, 0xFF3B, 0xFF3D, 0xFF5D, 0xFF61, 0xFF9F, 0xFFE3, 0xFFE3, 0xFFE5, 0xFFE5, 0xFFFF, 0xFFFF, 0,
-        };
-    }
+        0x0020, 0x00FF, 0x0391, 0x03A1, 0x03A3, 0x03A9, 0x03B1, 0x03C1, 0x03C3, 0x03C9, 0x0401, 0x0401, 0x0410, 0x044F, 0x0451, 0x0451,
+        0x2000, 0x206F, 0x2103, 0x2103, 0x212B, 0x212B, 0x2190, 0x2193, 0x21D2, 0x21D2, 0x21D4, 0x21D4, 0x2200, 0x2200, 0x2202, 0x2203,
+        0x2207, 0x2208, 0x220B, 0x220B, 0x2212, 0x2212, 0x221A, 0x221A, 0x221D, 0x221E, 0x2220, 0x2220, 0x2227, 0x222C, 0x2234, 0x2235,
+        0x223D, 0x223D, 0x2252, 0x2252, 0x2260, 0x2261, 0x2266, 0x2267, 0x226A, 0x226B, 0x2282, 0x2283, 0x2286, 0x2287, 0x22A5, 0x22A5,
+        0x2312, 0x2312, 0x2500, 0x2503, 0x250C, 0x250C, 0x250F, 0x2510, 0x2513, 0x2514, 0x2517, 0x2518, 0x251B, 0x251D, 0x2520, 0x2520,
+        0x2523, 0x2525, 0x2528, 0x2528, 0x252B, 0x252C, 0x252F, 0x2530, 0x2533, 0x2534, 0x2537, 0x2538, 0x253B, 0x253C, 0x253F, 0x253F,
+        0x2542, 0x2542, 0x254B, 0x254B, 0x25A0, 0x25A1, 0x25B2, 0x25B3, 0x25BC, 0x25BD, 0x25C6, 0x25C7, 0x25CB, 0x25CB, 0x25CE, 0x25CF,
+        0x25EF, 0x25EF, 0x2605, 0x2606, 0x2640, 0x2640, 0x2642, 0x2642, 0x266A, 0x266A, 0x266D, 0x266D, 0x266F, 0x266F, 0x3000, 0x30FF,
+        0x31F0, 0x31FF, 0x4E00, 0x4E01, 0x4E03, 0x4E03,
+        0x4E07, 0x4E0B, 0x4E0D, 0x4E0E, 0x4E10, 0x4E11, 0x4E14, 0x4E19, 0x4E1E, 0x4E1E, 0x4E21, 0x4E21, 0x4E26, 0x4E26, 0x4E2A, 0x4E2A,
+        0x4E2D, 0x4E2D, 0x4E31, 0x4E32, 0x4E36, 0x4E36, 0x4E38, 0x4E39, 0x4E3B, 0x4E3C, 0x4E3F, 0x4E3F, 0x4E42, 0x4E43, 0x4E45, 0x4E45,
+        0x4E4B, 0x4E4B, 0x4E4D, 0x4E4F, 0x4E55, 0x4E59, 0x4E5D, 0x4E5F, 0x4E62, 0x4E62, 0x4E71, 0x4E71, 0x4E73, 0x4E73, 0x4E7E, 0x4E7E,
+        0x4E80, 0x4E80, 0x4E82, 0x4E82, 0x4E85, 0x4E86, 0x4E88, 0x4E8C, 0x4E8E, 0x4E8E, 0x4E91, 0x4E92, 0x4E94, 0x4E95, 0x4E98, 0x4E99,
+        0x4E9B, 0x4E9C, 0x4E9E, 0x4EA2, 0x4EA4, 0x4EA6, 0x4EA8, 0x4EA8, 0x4EAB, 0x4EAE, 0x4EB0, 0x4EB0, 0x4EB3, 0x4EB3, 0x4EB6, 0x4EB6,
+        0x4EBA, 0x4EBA, 0x4EC0, 0x4EC2, 0x4EC4, 0x4EC4, 0x4EC6, 0x4EC7, 0x4ECA, 0x4ECB, 0x4ECD, 0x4ECF, 0x4ED4, 0x4ED9, 0x4EDD, 0x4EDF,
+        0x4EE3, 0x4EE5, 0x4EED, 0x4EEE, 0x4EF0, 0x4EF0, 0x4EF2, 0x4EF2, 0x4EF6, 0x4EF7, 0x4EFB, 0x4EFB, 0x4F01, 0x4F01, 0x4F09, 0x4F0A,
+        0x4F0D, 0x4F11, 0x4F1A, 0x4F1A, 0x4F1C, 0x4F1D, 0x4F2F, 0x4F30, 0x4F34, 0x4F34, 0x4F36, 0x4F36, 0x4F38, 0x4F38, 0x4F3A, 0x4F3A,
+        0x4F3C, 0x4F3D, 0x4F43, 0x4F43, 0x4F46, 0x4F47, 0x4F4D, 0x4F51, 0x4F53, 0x4F53, 0x4F55, 0x4F55, 0x4F57, 0x4F57, 0x4F59, 0x4F5E,
+        0x4F69, 0x4F69, 0x4F6F, 0x4F70, 0x4F73, 0x4F73, 0x4F75, 0x4F76, 0x4F7B, 0x4F7C, 0x4F7F, 0x4F7F, 0x4F83, 0x4F83, 0x4F86, 0x4F86,
+        0x4F88, 0x4F88, 0x4F8B, 0x4F8B, 0x4F8D, 0x4F8D, 0x4F8F, 0x4F8F, 0x4F91, 0x4F91, 0x4F96, 0x4F96, 0x4F98, 0x4F98, 0x4F9B, 0x4F9B,
+        0x4F9D, 0x4F9D, 0x4FA0, 0x4FA1, 0x4FAB, 0x4FAB, 0x4FAD, 0x4FAF, 0x4FB5, 0x4FB6, 0x4FBF, 0x4FBF, 0x4FC2, 0x4FC4, 0x4FCA, 0x4FCA,
+        0x4FCE, 0x4FCE, 0x4FD0, 0x4FD1, 0x4FD4, 0x4FD4, 0x4FD7, 0x4FD8, 0x4FDA, 0x4FDB, 0x4FDD, 0x4FDD, 0x4FDF, 0x4FDF, 0x4FE1, 0x4FE1,
+        0x4FE3, 0x4FE5, 0x4FEE, 0x4FEF, 0x4FF3, 0x4FF3, 0x4FF5, 0x4FF6, 0x4FF8, 0x4FF8, 0x4FFA, 0x4FFA, 0x4FFE, 0x4FFE, 0x5005, 0x5006,
+        0x5009, 0x5009, 0x500B, 0x500B, 0x500D, 0x500D, 0x500F, 0x500F, 0x5011, 0x5012, 0x5014, 0x5014, 0x5016, 0x5016, 0x5019, 0x501A,
+        0x501F, 0x501F, 0x5021, 0x5021, 0x5023, 0x5026, 0x5028, 0x502D, 0x5036, 0x5036, 0x5039, 0x5039, 0x5043, 0x5043, 0x5047, 0x5049,
+        0x504F, 0x5050, 0x5055, 0x5056, 0x505A, 0x505A, 0x505C, 0x505C, 0x5065, 0x5065, 0x506C, 0x506C, 0x5072, 0x5072, 0x5074, 0x5076,
+        0x5078, 0x5078, 0x507D, 0x507D, 0x5080, 0x5080, 0x5085, 0x5085, 0x508D, 0x508D, 0x5091, 0x5091, 0x5098, 0x509A, 0x50AC, 0x50AD,
+        0x50B2, 0x50B5, 0x50B7, 0x50B7, 0x50BE, 0x50BE, 0x50C2, 0x50C2, 0x50C5, 0x50C5, 0x50C9, 0x50CA, 0x50CD, 0x50CD, 0x50CF, 0x50CF,
+        0x50D1, 0x50D1, 0x50D5, 0x50D6, 0x50DA, 0x50DA, 0x50DE, 0x50DE, 0x50E3, 0x50E3, 0x50E5, 0x50E5, 0x50E7, 0x50E7, 0x50ED, 0x50EE,
+        0x50F5, 0x50F5, 0x50F9, 0x50F9, 0x50FB, 0x50FB, 0x5100, 0x5102, 0x5104, 0x5104, 0x5109, 0x5109, 0x5112, 0x5112, 0x5114, 0x5116,
+        0x5118, 0x5118, 0x511A, 0x511A, 0x511F, 0x511F, 0x5121, 0x5121, 0x512A, 0x512A, 0x5132, 0x5132, 0x5137, 0x5137, 0x513A, 0x513C,
+        0x513F, 0x5141, 0x5143, 0x5149, 0x514B, 0x514E, 0x5150, 0x5150, 0x5152, 0x5152, 0x5154, 0x5154, 0x515A, 0x515A, 0x515C, 0x515C,
+        0x5162, 0x5162, 0x5165, 0x5165, 0x5168, 0x516E, 0x5171, 0x5171, 0x5175, 0x5178, 0x517C, 0x517C, 0x5180, 0x5180, 0x5182, 0x5182,
+        0x5185, 0x5186, 0x5189, 0x518A, 0x518C, 0x518D, 0x518F, 0x5193, 0x5195, 0x5197, 0x5199, 0x5199, 0x51A0, 0x51A0, 0x51A2, 0x51A2,
+        0x51A4, 0x51A6, 0x51A8, 0x51AC, 0x51B0, 0x51B7, 0x51BD, 0x51BD, 0x51C4, 0x51C6, 0x51C9, 0x51C9, 0x51CB, 0x51CD, 0x51D6, 0x51D6,
+        0x51DB, 0x51DD, 0x51E0, 0x51E1, 0x51E6, 0x51E7, 0x51E9, 0x51EA, 0x51ED, 0x51ED, 0x51F0, 0x51F1, 0x51F5, 0x51F6, 0x51F8, 0x51FA,
+        0x51FD, 0x51FE, 0x5200, 0x5200, 0x5203, 0x5204, 0x5206, 0x5208, 0x520A, 0x520B, 0x520E, 0x520E, 0x5211, 0x5211, 0x5214, 0x5214,
+        0x5217, 0x5217, 0x521D, 0x521D, 0x5224, 0x5225, 0x5227, 0x5227, 0x5229, 0x522A, 0x522E, 0x522E, 0x5230, 0x5230, 0x5233, 0x5233,
+        0x5236, 0x523B, 0x5243, 0x5244, 0x5247, 0x5247, 0x524A, 0x524D, 0x524F, 0x524F, 0x5254, 0x5254, 0x5256, 0x5256, 0x525B, 0x525B,
+        0x525E, 0x525E, 0x5263, 0x5265, 0x5269, 0x526A, 0x526F, 0x5275, 0x527D, 0x527D, 0x527F, 0x527F, 0x5283, 0x5283, 0x5287, 0x5289,
+        0x528D, 0x528D, 0x5291, 0x5292, 0x5294, 0x5294, 0x529B, 0x529B, 0x529F, 0x52A0, 0x52A3, 0x52A3, 0x52A9, 0x52AD, 0x52B1, 0x52B1,
+        0x52B4, 0x52B5, 0x52B9, 0x52B9, 0x52BC, 0x52BC, 0x52BE, 0x52BE, 0x52C1, 0x52C1, 0x52C3, 0x52C3, 0x52C5, 0x52C5, 0x52C7, 0x52C7,
+        0x52C9, 0x52C9, 0x52CD, 0x52CD, 0x52D2, 0x52D2, 0x52D5, 0x52D5, 0x52D7, 0x52D9, 0x52DD, 0x52E0, 0x52E2, 0x52E4, 0x52E6, 0x52E7,
+        0x52F2, 0x52F3, 0x52F5, 0x52F5, 0x52F8, 0x52FA, 0x52FE, 0x52FF, 0x5301, 0x5302, 0x5305, 0x5306, 0x5308, 0x5308, 0x530D, 0x530D,
+        0x530F, 0x5310, 0x5315, 0x5317, 0x5319, 0x531A, 0x531D, 0x531D, 0x5320, 0x5321, 0x5323, 0x5323, 0x532A, 0x532A, 0x532F, 0x532F,
+        0x5331, 0x5331, 0x5333, 0x5333, 0x5338, 0x533B, 0x533F, 0x5341, 0x5343, 0x5343, 0x5345, 0x534A, 0x534D, 0x534D, 0x5351, 0x5354,
+        0x5357, 0x5358, 0x535A, 0x535A, 0x535C, 0x535C, 0x535E, 0x535E, 0x5360, 0x5360, 0x5366, 0x5366, 0x5369, 0x5369, 0x536E, 0x5371,
+        0x5373, 0x5375, 0x5377, 0x5378, 0x537B, 0x537B, 0x537F, 0x537F, 0x5382, 0x5382, 0x5384, 0x5384, 0x5396, 0x5396, 0x5398, 0x5398,
+        0x539A, 0x539A, 0x539F, 0x53A0, 0x53A5, 0x53A6, 0x53A8, 0x53A9, 0x53AD, 0x53AE, 0x53B0, 0x53B0, 0x53B3, 0x53B3, 0x53B6, 0x53B6,
+        0x53BB, 0x53BB, 0x53C2, 0x53C3, 0x53C8, 0x53CE, 0x53D4, 0x53D4, 0x53D6, 0x53D7, 0x53D9, 0x53D9, 0x53DB, 0x53DB, 0x53DF, 0x53DF,
+        0x53E1, 0x53E5, 0x53E8, 0x53F3, 0x53F6, 0x53F8, 0x53FA, 0x53FA, 0x5401, 0x5401, 0x5403, 0x5404, 0x5408, 0x5411, 0x541B, 0x541B,
+        0x541D, 0x541D, 0x541F, 0x5420, 0x5426, 0x5426, 0x5429, 0x5429, 0x542B, 0x542E, 0x5436, 0x5436, 0x5438, 0x5439, 0x543B, 0x543E,
+        0x5440, 0x5440, 0x5442, 0x5442, 0x5446, 0x5446, 0x5448, 0x544A, 0x544E, 0x544E, 0x5451, 0x5451, 0x545F, 0x545F, 0x5468, 0x5468,
+        0x546A, 0x546A, 0x5470, 0x5471, 0x5473, 0x5473, 0x5475, 0x5477, 0x547B, 0x547D, 0x5480, 0x5480, 0x5484, 0x5484, 0x5486, 0x5486,
+        0x548B, 0x548C, 0x548E, 0x5490, 0x5492, 0x5492, 0x54A2, 0x54A2, 0x54A4, 0x54A5, 0x54A8, 0x54A8, 0x54AB, 0x54AC, 0x54AF, 0x54AF,
+        0x54B2, 0x54B3, 0x54B8, 0x54B8, 0x54BC, 0x54BE, 0x54C0, 0x54C2, 0x54C4, 0x54C4, 0x54C7, 0x54C9, 0x54D8, 0x54D8, 0x54E1, 0x54E2,
+        0x54E5, 0x54E6, 0x54E8, 0x54E9, 0x54ED, 0x54EE, 0x54F2, 0x54F2, 0x54FA, 0x54FA, 0x54FD, 0x54FD, 0x5504, 0x5504, 0x5506, 0x5507,
+        0x550F, 0x5510, 0x5514, 0x5514, 0x5516, 0x5516, 0x552E, 0x552F, 0x5531, 0x5531, 0x5533, 0x5533, 0x5538, 0x5539, 0x553E, 0x553E,
+        0x5540, 0x5540, 0x5544, 0x5546, 0x554C, 0x554C, 0x554F, 0x554F, 0x5553, 0x5553, 0x5556, 0x5557, 0x555C, 0x555D, 0x5563, 0x5563,
+        0x557B, 0x557C, 0x557E, 0x557E, 0x5580, 0x5580, 0x5583, 0x5584, 0x5587, 0x5587, 0x5589, 0x558B, 0x5598, 0x559A, 0x559C, 0x559F,
+        0x55A7, 0x55AC, 0x55AE, 0x55AE, 0x55B0, 0x55B0, 0x55B6, 0x55B6, 0x55C4, 0x55C5, 0x55C7, 0x55C7, 0x55D4, 0x55D4, 0x55DA, 0x55DA,
+        0x55DC, 0x55DC, 0x55DF, 0x55DF, 0x55E3, 0x55E4, 0x55F7, 0x55F7, 0x55F9, 0x55F9, 0x55FD, 0x55FE, 0x5606, 0x5606, 0x5609, 0x5609,
+        0x5614, 0x5614, 0x5616, 0x5618, 0x561B, 0x561B, 0x5629, 0x5629, 0x562F, 0x562F, 0x5631, 0x5632, 0x5634, 0x5634, 0x5636, 0x5636,
+        0x5638, 0x5638, 0x5642, 0x5642, 0x564C, 0x564C, 0x564E, 0x564E, 0x5650, 0x5650, 0x565B, 0x565B, 0x5664, 0x5664, 0x5668, 0x5668,
+        0x566A, 0x566C, 0x5674, 0x5674, 0x5678, 0x5678, 0x567A, 0x567A, 0x5680, 0x5680, 0x5686, 0x5687, 0x568A, 0x568A, 0x568F, 0x568F,
+        0x5694, 0x5694, 0x56A0, 0x56A0, 0x56A2, 0x56A2, 0x56A5, 0x56A5, 0x56AE, 0x56AE, 0x56B4, 0x56B4, 0x56B6, 0x56B6, 0x56BC, 0x56BC,
+        0x56C0, 0x56C3, 0x56C8, 0x56C8, 0x56CE, 0x56CE, 0x56D1, 0x56D1, 0x56D3, 0x56D3, 0x56D7, 0x56D8, 0x56DA, 0x56DB, 0x56DE, 0x56DE,
+        0x56E0, 0x56E0, 0x56E3, 0x56E3, 0x56EE, 0x56EE, 0x56F0, 0x56F0, 0x56F2, 0x56F3, 0x56F9, 0x56FA, 0x56FD, 0x56FD, 0x56FF, 0x5700,
+        0x5703, 0x5704, 0x5708, 0x5709, 0x570B, 0x570B, 0x570D, 0x570D, 0x570F, 0x570F, 0x5712, 0x5713, 0x5716, 0x5716, 0x5718, 0x5718,
+        0x571C, 0x571C, 0x571F, 0x571F, 0x5726, 0x5728, 0x572D, 0x572D, 0x5730, 0x5730, 0x5737, 0x5738, 0x573B, 0x573B, 0x5740, 0x5740,
+        0x5742, 0x5742, 0x5747, 0x5747, 0x574A, 0x574A, 0x574E, 0x5751, 0x5761, 0x5761, 0x5764, 0x5764, 0x5766, 0x5766, 0x5769, 0x576A,
+        0x577F, 0x577F, 0x5782, 0x5782, 0x5788, 0x5789, 0x578B, 0x578B, 0x5793, 0x5793, 0x57A0, 0x57A0, 0x57A2, 0x57A4, 0x57AA, 0x57AA,
+        0x57B0, 0x57B0, 0x57B3, 0x57B3, 0x57C0, 0x57C0, 0x57C3, 0x57C3, 0x57C6, 0x57C6, 0x57CB, 0x57CB, 0x57CE, 0x57CE, 0x57D2, 0x57D4,
+        0x57D6, 0x57D6, 0x57DC, 0x57DC, 0x57DF, 0x57E0, 0x57E3, 0x57E3, 0x57F4, 0x57F4, 0x57F7, 0x57F7, 0x57F9, 0x57FA, 0x57FC, 0x57FC,
+        0x5800, 0x5800, 0x5802, 0x5802, 0x5805, 0x5806, 0x580A, 0x580B, 0x5815, 0x5815, 0x5819, 0x5819, 0x581D, 0x581D, 0x5821, 0x5821,
+        0x5824, 0x5824, 0x582A, 0x582A, 0x582F, 0x5831, 0x5834, 0x5835, 0x583A, 0x583A, 0x583D, 0x583D, 0x5840, 0x5841, 0x584A, 0x584B,
+        0x5851, 0x5852, 0x5854, 0x5854, 0x5857, 0x585A, 0x585E, 0x585E, 0x5862, 0x5862, 0x5869, 0x5869, 0x586B, 0x586B, 0x5870, 0x5870,
+        0x5872, 0x5872, 0x5875, 0x5875, 0x5879, 0x5879, 0x587E, 0x587E, 0x5883, 0x5883, 0x5885, 0x5885, 0x5893, 0x5893, 0x5897, 0x5897,
+        0x589C, 0x589C, 0x589F, 0x589F, 0x58A8, 0x58A8, 0x58AB, 0x58AB, 0x58AE, 0x58AE, 0x58B3, 0x58B3, 0x58B8, 0x58BB, 0x58BE, 0x58BE,
+        0x58C1, 0x58C1, 0x58C5, 0x58C5, 0x58C7, 0x58C7, 0x58CA, 0x58CA, 0x58CC, 0x58CC, 0x58D1, 0x58D1, 0x58D3, 0x58D3, 0x58D5, 0x58D5,
+        0x58D7, 0x58D9, 0x58DC, 0x58DC, 0x58DE, 0x58DF, 0x58E4, 0x58E5, 0x58EB, 0x58EC, 0x58EE, 0x58F2, 0x58F7, 0x58F7, 0x58F9, 0x58FD,
+        0x5902, 0x5902, 0x5909, 0x590A, 0x590F, 0x5910, 0x5915, 0x5916, 0x5918, 0x591C, 0x5922, 0x5922, 0x5925, 0x5925, 0x5927, 0x5927,
+        0x5929, 0x592E, 0x5931, 0x5932, 0x5937, 0x5938, 0x593E, 0x593E, 0x5944, 0x5944, 0x5947, 0x5949, 0x594E, 0x5951, 0x5954, 0x5955,
+        0x5957, 0x5958, 0x595A, 0x595A, 0x5960, 0x5960, 0x5962, 0x5962, 0x5965, 0x5965, 0x5967, 0x596A, 0x596C, 0x596C, 0x596E, 0x596E,
+        0x5973, 0x5974, 0x5978, 0x5978, 0x597D, 0x597D, 0x5981, 0x5984, 0x598A, 0x598A, 0x598D, 0x598D, 0x5993, 0x5993, 0x5996, 0x5996,
+        0x5999, 0x5999, 0x599B, 0x599B, 0x599D, 0x599D, 0x59A3, 0x59A3, 0x59A5, 0x59A5, 0x59A8, 0x59A8, 0x59AC, 0x59AC, 0x59B2, 0x59B2,
+        0x59B9, 0x59B9, 0x59BB, 0x59BB, 0x59BE, 0x59BE, 0x59C6, 0x59C6, 0x59C9, 0x59C9, 0x59CB, 0x59CB, 0x59D0, 0x59D1, 0x59D3, 0x59D4,
+        0x59D9, 0x59DA, 0x59DC, 0x59DC, 0x59E5, 0x59E6, 0x59E8, 0x59E8, 0x59EA, 0x59EB, 0x59F6, 0x59F6, 0x59FB, 0x59FB, 0x59FF, 0x59FF,
+        0x5A01, 0x5A01, 0x5A03, 0x5A03, 0x5A09, 0x5A09, 0x5A11, 0x5A11, 0x5A18, 0x5A18, 0x5A1A, 0x5A1A, 0x5A1C, 0x5A1C, 0x5A1F, 0x5A20,
+        0x5A25, 0x5A25, 0x5A29, 0x5A29, 0x5A2F, 0x5A2F, 0x5A35, 0x5A36, 0x5A3C, 0x5A3C, 0x5A40, 0x5A41, 0x5A46, 0x5A46, 0x5A49, 0x5A49,
+        0x5A5A, 0x5A5A, 0x5A62, 0x5A62, 0x5A66, 0x5A66, 0x5A6A, 0x5A6A, 0x5A6C, 0x5A6C, 0x5A7F, 0x5A7F, 0x5A92, 0x5A92, 0x5A9A, 0x5A9B,
+        0x5ABC, 0x5ABE, 0x5AC1, 0x5AC2, 0x5AC9, 0x5AC9, 0x5ACB, 0x5ACC, 0x5AD0, 0x5AD0, 0x5AD6, 0x5AD7, 0x5AE1, 0x5AE1, 0x5AE3, 0x5AE3,
+        0x5AE6, 0x5AE6, 0x5AE9, 0x5AE9, 0x5AFA, 0x5AFB, 0x5B09, 0x5B09, 0x5B0B, 0x5B0C, 0x5B16, 0x5B16, 0x5B22, 0x5B22, 0x5B2A, 0x5B2A,
+        0x5B2C, 0x5B2C, 0x5B30, 0x5B30, 0x5B32, 0x5B32, 0x5B36, 0x5B36, 0x5B3E, 0x5B3E, 0x5B40, 0x5B40, 0x5B43, 0x5B43, 0x5B45, 0x5B45,
+        0x5B50, 0x5B51, 0x5B54, 0x5B55, 0x5B57, 0x5B58, 0x5B5A, 0x5B5D, 0x5B5F, 0x5B5F, 0x5B63, 0x5B66, 0x5B69, 0x5B69, 0x5B6B, 0x5B6B,
+        0x5B70, 0x5B71, 0x5B73, 0x5B73, 0x5B75, 0x5B75, 0x5B78, 0x5B78, 0x5B7A, 0x5B7A, 0x5B80, 0x5B80, 0x5B83, 0x5B83, 0x5B85, 0x5B85,
+        0x5B87, 0x5B89, 0x5B8B, 0x5B8D, 0x5B8F, 0x5B8F, 0x5B95, 0x5B95, 0x5B97, 0x5B9D, 0x5B9F, 0x5B9F, 0x5BA2, 0x5BA6, 0x5BAE, 0x5BAE,
+        0x5BB0, 0x5BB0, 0x5BB3, 0x5BB6, 0x5BB8, 0x5BB9, 0x5BBF, 0x5BBF, 0x5BC2, 0x5BC7, 0x5BC9, 0x5BC9, 0x5BCC, 0x5BCC, 0x5BD0, 0x5BD0,
+        0x5BD2, 0x5BD4, 0x5BDB, 0x5BDB, 0x5BDD, 0x5BDF, 0x5BE1, 0x5BE2, 0x5BE4, 0x5BE9, 0x5BEB, 0x5BEB, 0x5BEE, 0x5BEE, 0x5BF0, 0x5BF0,
+        0x5BF3, 0x5BF3, 0x5BF5, 0x5BF6, 0x5BF8, 0x5BF8, 0x5BFA, 0x5BFA, 0x5BFE, 0x5BFF, 0x5C01, 0x5C02, 0x5C04, 0x5C0B, 0x5C0D, 0x5C0F,
+        0x5C11, 0x5C11, 0x5C13, 0x5C13, 0x5C16, 0x5C16, 0x5C1A, 0x5C1A, 0x5C20, 0x5C20, 0x5C22, 0x5C22, 0x5C24, 0x5C24, 0x5C28, 0x5C28,
+        0x5C2D, 0x5C2D, 0x5C31, 0x5C31, 0x5C38, 0x5C41, 0x5C45, 0x5C46, 0x5C48, 0x5C48, 0x5C4A, 0x5C4B, 0x5C4D, 0x5C51, 0x5C53, 0x5C53,
+        0x5C55, 0x5C55, 0x5C5E, 0x5C5E, 0x5C60, 0x5C61, 0x5C64, 0x5C65, 0x5C6C, 0x5C6C, 0x5C6E, 0x5C6F, 0x5C71, 0x5C71, 0x5C76, 0x5C76,
+        0x5C79, 0x5C79, 0x5C8C, 0x5C8C, 0x5C90, 0x5C91, 0x5C94, 0x5C94, 0x5CA1, 0x5CA1, 0x5CA8, 0x5CA9, 0x5CAB, 0x5CAC, 0x5CB1, 0x5CB1,
+        0x5CB3, 0x5CB3, 0x5CB6, 0x5CB8, 0x5CBB, 0x5CBC, 0x5CBE, 0x5CBE, 0x5CC5, 0x5CC5, 0x5CC7, 0x5CC7, 0x5CD9, 0x5CD9, 0x5CE0, 0x5CE1,
+        0x5CE8, 0x5CEA, 0x5CED, 0x5CED, 0x5CEF, 0x5CF0, 0x5CF6, 0x5CF6, 0x5CFA, 0x5CFB, 0x5CFD, 0x5CFD, 0x5D07, 0x5D07, 0x5D0B, 0x5D0B,
+        0x5D0E, 0x5D0E, 0x5D11, 0x5D11, 0x5D14, 0x5D1B, 0x5D1F, 0x5D1F, 0x5D22, 0x5D22, 0x5D29, 0x5D29, 0x5D4B, 0x5D4C, 0x5D4E, 0x5D4E,
+        0x5D50, 0x5D50, 0x5D52, 0x5D52, 0x5D5C, 0x5D5C, 0x5D69, 0x5D69, 0x5D6C, 0x5D6C, 0x5D6F, 0x5D6F, 0x5D73, 0x5D73, 0x5D76, 0x5D76,
+        0x5D82, 0x5D82, 0x5D84, 0x5D84, 0x5D87, 0x5D87, 0x5D8B, 0x5D8C, 0x5D90, 0x5D90, 0x5D9D, 0x5D9D, 0x5DA2, 0x5DA2, 0x5DAC, 0x5DAC,
+        0x5DAE, 0x5DAE, 0x5DB7, 0x5DB7, 0x5DBA, 0x5DBA, 0x5DBC, 0x5DBD, 0x5DC9, 0x5DC9, 0x5DCC, 0x5DCD, 0x5DD2, 0x5DD3, 0x5DD6, 0x5DD6,
+        0x5DDB, 0x5DDB, 0x5DDD, 0x5DDE, 0x5DE1, 0x5DE1, 0x5DE3, 0x5DE3, 0x5DE5, 0x5DE8, 0x5DEB, 0x5DEB, 0x5DEE, 0x5DEE, 0x5DF1, 0x5DF5,
+        0x5DF7, 0x5DF7, 0x5DFB, 0x5DFB, 0x5DFD, 0x5DFE, 0x5E02, 0x5E03, 0x5E06, 0x5E06, 0x5E0B, 0x5E0C, 0x5E11, 0x5E11, 0x5E16, 0x5E16,
+        0x5E19, 0x5E1B, 0x5E1D, 0x5E1D, 0x5E25, 0x5E25, 0x5E2B, 0x5E2B, 0x5E2D, 0x5E2D, 0x5E2F, 0x5E30, 0x5E33, 0x5E33, 0x5E36, 0x5E38,
+        0x5E3D, 0x5E3D, 0x5E40, 0x5E40, 0x5E43, 0x5E45, 0x5E47, 0x5E47, 0x5E4C, 0x5E4C, 0x5E4E, 0x5E4E, 0x5E54, 0x5E55, 0x5E57, 0x5E57,
+        0x5E5F, 0x5E5F, 0x5E61, 0x5E64, 0x5E72, 0x5E76, 0x5E78, 0x5E7F, 0x5E81, 0x5E81, 0x5E83, 0x5E84, 0x5E87, 0x5E87, 0x5E8A, 0x5E8A,
+        0x5E8F, 0x5E8F, 0x5E95, 0x5E97, 0x5E9A, 0x5E9A, 0x5E9C, 0x5E9C, 0x5EA0, 0x5EA0, 0x5EA6, 0x5EA7, 0x5EAB, 0x5EAB, 0x5EAD, 0x5EAD,
+        0x5EB5, 0x5EB8, 0x5EC1, 0x5EC3, 0x5EC8, 0x5ECA, 0x5ECF, 0x5ED0, 0x5ED3, 0x5ED3, 0x5ED6, 0x5ED6, 0x5EDA, 0x5EDB, 0x5EDD, 0x5EDD,
+        0x5EDF, 0x5EE3, 0x5EE8, 0x5EE9, 0x5EEC, 0x5EEC, 0x5EF0, 0x5EF1, 0x5EF3, 0x5EF4, 0x5EF6, 0x5EF8, 0x5EFA, 0x5EFC, 0x5EFE, 0x5EFF,
+        0x5F01, 0x5F01, 0x5F03, 0x5F04, 0x5F09, 0x5F0D, 0x5F0F, 0x5F11, 0x5F13, 0x5F18, 0x5F1B, 0x5F1B, 0x5F1F, 0x5F1F, 0x5F25, 0x5F27,
+        0x5F29, 0x5F29, 0x5F2D, 0x5F2D, 0x5F2F, 0x5F2F, 0x5F31, 0x5F31, 0x5F35, 0x5F35, 0x5F37, 0x5F38, 0x5F3C, 0x5F3C, 0x5F3E, 0x5F3E,
+        0x5F41, 0x5F41, 0x5F48, 0x5F48, 0x5F4A, 0x5F4A, 0x5F4C, 0x5F4C, 0x5F4E, 0x5F4E, 0x5F51, 0x5F51, 0x5F53, 0x5F53, 0x5F56, 0x5F57,
+        0x5F59, 0x5F59, 0x5F5C, 0x5F5D, 0x5F61, 0x5F62, 0x5F66, 0x5F66, 0x5F69, 0x5F6D, 0x5F70, 0x5F71, 0x5F73, 0x5F73, 0x5F77, 0x5F77,
+        0x5F79, 0x5F79, 0x5F7C, 0x5F7C, 0x5F7F, 0x5F85, 0x5F87, 0x5F88, 0x5F8A, 0x5F8C, 0x5F90, 0x5F93, 0x5F97, 0x5F99, 0x5F9E, 0x5F9E,
+        0x5FA0, 0x5FA1, 0x5FA8, 0x5FAA, 0x5FAD, 0x5FAE, 0x5FB3, 0x5FB4, 0x5FB9, 0x5FB9, 0x5FBC, 0x5FBD, 0x5FC3, 0x5FC3, 0x5FC5, 0x5FC5,
+        0x5FCC, 0x5FCD, 0x5FD6, 0x5FD9, 0x5FDC, 0x5FDD, 0x5FE0, 0x5FE0, 0x5FE4, 0x5FE4, 0x5FEB, 0x5FEB, 0x5FF0, 0x5FF1, 0x5FF5, 0x5FF5,
+        0x5FF8, 0x5FF8, 0x5FFB, 0x5FFB, 0x5FFD, 0x5FFD, 0x5FFF, 0x5FFF, 0x600E, 0x6010, 0x6012, 0x6012, 0x6015, 0x6016, 0x6019, 0x6019,
+        0x601B, 0x601D, 0x6020, 0x6021, 0x6025, 0x602B, 0x602F, 0x602F, 0x6031, 0x6031, 0x603A, 0x603A, 0x6041, 0x6043, 0x6046, 0x6046,
+        0x604A, 0x604B, 0x604D, 0x604D, 0x6050, 0x6050, 0x6052, 0x6052, 0x6055, 0x6055, 0x6059, 0x605A, 0x605F, 0x6060, 0x6062, 0x6065,
+        0x6068, 0x606D, 0x606F, 0x6070, 0x6075, 0x6075, 0x6077, 0x6077, 0x6081, 0x6081, 0x6083, 0x6084, 0x6089, 0x6089, 0x608B, 0x608D,
+        0x6092, 0x6092, 0x6094, 0x6094, 0x6096, 0x6097, 0x609A, 0x609B, 0x609F, 0x60A0, 0x60A3, 0x60A3, 0x60A6, 0x60A7, 0x60A9, 0x60AA,
+        0x60B2, 0x60B6, 0x60B8, 0x60B8, 0x60BC, 0x60BD, 0x60C5, 0x60C7, 0x60D1, 0x60D1, 0x60D3, 0x60D3, 0x60D8, 0x60D8, 0x60DA, 0x60DA,
+        0x60DC, 0x60DC, 0x60DF, 0x60E1, 0x60E3, 0x60E3, 0x60E7, 0x60E8, 0x60F0, 0x60F1, 0x60F3, 0x60F4, 0x60F6, 0x60F7, 0x60F9, 0x60FB,
+        0x6100, 0x6101, 0x6103, 0x6103, 0x6106, 0x6106, 0x6108, 0x6109, 0x610D, 0x610F, 0x6115, 0x6115, 0x611A, 0x611B, 0x611F, 0x611F,
+        0x6121, 0x6121, 0x6127, 0x6128, 0x612C, 0x612C, 0x6134, 0x6134, 0x613C, 0x613F, 0x6142, 0x6142, 0x6144, 0x6144, 0x6147, 0x6148,
+        0x614A, 0x614E, 0x6153, 0x6153, 0x6155, 0x6155, 0x6158, 0x615A, 0x615D, 0x615D, 0x615F, 0x615F, 0x6162, 0x6163, 0x6165, 0x6165,
+        0x6167, 0x6168, 0x616B, 0x616B, 0x616E, 0x6171, 0x6173, 0x6177, 0x617E, 0x617E, 0x6182, 0x6182, 0x6187, 0x6187, 0x618A, 0x618A,
+        0x618E, 0x618E, 0x6190, 0x6191, 0x6194, 0x6194, 0x6196, 0x6196, 0x6199, 0x619A, 0x61A4, 0x61A4, 0x61A7, 0x61A7, 0x61A9, 0x61A9,
+        0x61AB, 0x61AC, 0x61AE, 0x61AE, 0x61B2, 0x61B2, 0x61B6, 0x61B6, 0x61BA, 0x61BA, 0x61BE, 0x61BE, 0x61C3, 0x61C3, 0x61C6, 0x61CD,
+        0x61D0, 0x61D0, 0x61E3, 0x61E3, 0x61E6, 0x61E6, 0x61F2, 0x61F2, 0x61F4, 0x61F4, 0x61F6, 0x61F8, 0x61FA, 0x61FA, 0x61FC, 0x6200,
+        0x6208, 0x620A, 0x620C, 0x620E, 0x6210, 0x6212, 0x6214, 0x6214, 0x6216, 0x6216, 0x621A, 0x621B, 0x621D, 0x621F, 0x6221, 0x6221,
+        0x6226, 0x6226, 0x622A, 0x622A, 0x622E, 0x6230, 0x6232, 0x6234, 0x6238, 0x6238, 0x623B, 0x623B, 0x623F, 0x6241, 0x6247, 0x6249,
+        0x624B, 0x624B, 0x624D, 0x624E, 0x6253, 0x6253, 0x6255, 0x6255, 0x6258, 0x6258, 0x625B, 0x625B, 0x625E, 0x625E, 0x6260, 0x6260,
+        0x6263, 0x6263, 0x6268, 0x6268, 0x626E, 0x626E, 0x6271, 0x6271, 0x6276, 0x6276, 0x6279, 0x6279, 0x627C, 0x627C, 0x627E, 0x6280,
+        0x6282, 0x6284, 0x6289, 0x628A, 0x6291, 0x6298, 0x629B, 0x629C, 0x629E, 0x629E, 0x62AB, 0x62AC, 0x62B1, 0x62B1, 0x62B5, 0x62B5,
+        0x62B9, 0x62B9, 0x62BB, 0x62BD, 0x62C2, 0x62C2, 0x62C5, 0x62CA, 0x62CC, 0x62CD, 0x62CF, 0x62D4, 0x62D7, 0x62D9, 0x62DB, 0x62DD,
+        0x62E0, 0x62E1, 0x62EC, 0x62EF, 0x62F1, 0x62F1, 0x62F3, 0x62F3, 0x62F5, 0x62F7, 0x62FE, 0x62FF, 0x6301, 0x6302, 0x6307, 0x6309,
+        0x630C, 0x630C, 0x6311, 0x6311, 0x6319, 0x6319, 0x631F, 0x631F, 0x6327, 0x6328, 0x632B, 0x632B, 0x632F, 0x632F, 0x633A, 0x633A,
+        0x633D, 0x633F, 0x6349, 0x6349, 0x634C, 0x634D, 0x634F, 0x6350, 0x6355, 0x6355, 0x6357, 0x6357, 0x635C, 0x635C, 0x6367, 0x6369,
+        0x636B, 0x636B, 0x636E, 0x636E, 0x6372, 0x6372, 0x6376, 0x6377, 0x637A, 0x637B, 0x6380, 0x6380, 0x6383, 0x6383, 0x6388, 0x6389,
+        0x638C, 0x638C, 0x638E, 0x638F, 0x6392, 0x6392, 0x6396, 0x6396, 0x6398, 0x6398, 0x639B, 0x639B, 0x639F, 0x63A3, 0x63A5, 0x63A5,
+        0x63A7, 0x63AC, 0x63B2, 0x63B2, 0x63B4, 0x63B5, 0x63BB, 0x63BB, 0x63BE, 0x63BE, 0x63C0, 0x63C0, 0x63C3, 0x63C4, 0x63C6, 0x63C6,
+        0x63C9, 0x63C9, 0x63CF, 0x63D0, 0x63D2, 0x63D2, 0x63D6, 0x63D6, 0x63DA, 0x63DB, 0x63E1, 0x63E1, 0x63E3, 0x63E3, 0x63E9, 0x63E9,
+        0x63EE, 0x63EE, 0x63F4, 0x63F4, 0x63F6, 0x63F6, 0x63FA, 0x63FA, 0x6406, 0x6406, 0x640D, 0x640D, 0x640F, 0x640F, 0x6413, 0x6413,
+        0x6416, 0x6417, 0x641C, 0x641C, 0x6426, 0x6426, 0x6428, 0x6428, 0x642C, 0x642D, 0x6434, 0x6434, 0x6436, 0x6436, 0x643A, 0x643A,
+        0x643E, 0x643E, 0x6442, 0x6442, 0x644E, 0x644E, 0x6458, 0x6458, 0x6467, 0x6467, 0x6469, 0x6469, 0x646F, 0x646F, 0x6476, 0x6476,
+        0x6478, 0x6478, 0x647A, 0x647A, 0x6483, 0x6483, 0x6488, 0x6488, 0x6492, 0x6493, 0x6495, 0x6495, 0x649A, 0x649A, 0x649E, 0x649E,
+        0x64A4, 0x64A5, 0x64A9, 0x64A9, 0x64AB, 0x64AB, 0x64AD, 0x64AE, 0x64B0, 0x64B0, 0x64B2, 0x64B2, 0x64B9, 0x64B9, 0x64BB, 0x64BC,
+        0x64C1, 0x64C2, 0x64C5, 0x64C5, 0x64C7, 0x64C7, 0x64CD, 0x64CD, 0x64D2, 0x64D2, 0x64D4, 0x64D4, 0x64D8, 0x64D8, 0x64DA, 0x64DA,
+        0x64E0, 0x64E3, 0x64E6, 0x64E7, 0x64EC, 0x64EC, 0x64EF, 0x64EF, 0x64F1, 0x64F2, 0x64F4, 0x64F4, 0x64F6, 0x64F6, 0x64FA, 0x64FA,
+        0x64FD, 0x64FE, 0x6500, 0x6500, 0x6505, 0x6505, 0x6518, 0x6518, 0x651C, 0x651D, 0x6523, 0x6524, 0x652A, 0x652C, 0x652F, 0x652F,
+        0x6534, 0x6539, 0x653B, 0x653B, 0x653E, 0x653F, 0x6545, 0x6545, 0x6548, 0x6548, 0x654D, 0x654D, 0x654F, 0x654F, 0x6551, 0x6551,
+        0x6555, 0x6559, 0x655D, 0x655E, 0x6562, 0x6563, 0x6566, 0x6566, 0x656C, 0x656C, 0x6570, 0x6570, 0x6572, 0x6572, 0x6574, 0x6575,
+        0x6577, 0x6578, 0x6582, 0x6583, 0x6587, 0x6589, 0x658C, 0x658C, 0x658E, 0x658E, 0x6590, 0x6591, 0x6597, 0x6597, 0x6599, 0x6599,
+        0x659B, 0x659C, 0x659F, 0x659F, 0x65A1, 0x65A1, 0x65A4, 0x65A5, 0x65A7, 0x65A7, 0x65AB, 0x65AD, 0x65AF, 0x65B0, 0x65B7, 0x65B7,
+        0x65B9, 0x65B9, 0x65BC, 0x65BD, 0x65C1, 0x65C1, 0x65C3, 0x65C6, 0x65CB, 0x65CC, 0x65CF, 0x65CF, 0x65D2, 0x65D2, 0x65D7, 0x65D7,
+        0x65D9, 0x65D9, 0x65DB, 0x65DB, 0x65E0, 0x65E2, 0x65E5, 0x65E9, 0x65EC, 0x65ED, 0x65F1, 0x65F1, 0x65FA, 0x65FB, 0x6602, 0x6603,
+        0x6606, 0x6607, 0x660A, 0x660A, 0x660C, 0x660C, 0x660E, 0x660F, 0x6613, 0x6614, 0x661C, 0x661C, 0x661F, 0x6620, 0x6625, 0x6625,
+        0x6627, 0x6628, 0x662D, 0x662D, 0x662F, 0x662F, 0x6634, 0x6636, 0x663C, 0x663C, 0x663F, 0x663F, 0x6641, 0x6644, 0x6649, 0x6649,
+        0x664B, 0x664B, 0x664F, 0x664F, 0x6652, 0x6652, 0x665D, 0x665F, 0x6662, 0x6662, 0x6664, 0x6664, 0x6666, 0x6669, 0x666E, 0x6670,
+        0x6674, 0x6674, 0x6676, 0x6676, 0x667A, 0x667A, 0x6681, 0x6681, 0x6683, 0x6684, 0x6687, 0x6689, 0x668E, 0x668E, 0x6691, 0x6691,
+        0x6696, 0x6698, 0x669D, 0x669D, 0x66A2, 0x66A2, 0x66A6, 0x66A6, 0x66AB, 0x66AB, 0x66AE, 0x66AE, 0x66B4, 0x66B4, 0x66B8, 0x66B9,
+        0x66BC, 0x66BC, 0x66BE, 0x66BE, 0x66C1, 0x66C1, 0x66C4, 0x66C4, 0x66C7, 0x66C7, 0x66C9, 0x66C9, 0x66D6, 0x66D6, 0x66D9, 0x66DA,
+        0x66DC, 0x66DD, 0x66E0, 0x66E0, 0x66E6, 0x66E6, 0x66E9, 0x66E9, 0x66F0, 0x66F0, 0x66F2, 0x66F5, 0x66F7, 0x66F9, 0x66FC, 0x6700,
+        0x6703, 0x6703, 0x6708, 0x6709, 0x670B, 0x670B, 0x670D, 0x670D, 0x670F, 0x670F, 0x6714, 0x6717, 0x671B, 0x671B, 0x671D, 0x671F,
+        0x6726, 0x6728, 0x672A, 0x672E, 0x6731, 0x6731, 0x6734, 0x6734, 0x6736, 0x6738, 0x673A, 0x673A, 0x673D, 0x673D, 0x673F, 0x673F,
+        0x6741, 0x6741, 0x6746, 0x6746, 0x6749, 0x6749, 0x674E, 0x6751, 0x6753, 0x6753, 0x6756, 0x6756, 0x6759, 0x6759, 0x675C, 0x675C,
+        0x675E, 0x6765, 0x676A, 0x676A, 0x676D, 0x676D, 0x676F, 0x6773, 0x6775, 0x6775, 0x6777, 0x6777, 0x677C, 0x677C, 0x677E, 0x677F,
+        0x6785, 0x6785, 0x6787, 0x6787, 0x6789, 0x6789, 0x678B, 0x678C, 0x6790, 0x6790, 0x6795, 0x6795, 0x6797, 0x6797, 0x679A, 0x679A,
+        0x679C, 0x679D, 0x67A0, 0x67A2, 0x67A6, 0x67A6, 0x67A9, 0x67A9, 0x67AF, 0x67AF, 0x67B3, 0x67B4, 0x67B6, 0x67B9, 0x67C1, 0x67C1,
+        0x67C4, 0x67C4, 0x67C6, 0x67C6, 0x67CA, 0x67CA, 0x67CE, 0x67D1, 0x67D3, 0x67D4, 0x67D8, 0x67D8, 0x67DA, 0x67DA, 0x67DD, 0x67DE,
+        0x67E2, 0x67E2, 0x67E4, 0x67E4, 0x67E7, 0x67E7, 0x67E9, 0x67E9, 0x67EC, 0x67EC, 0x67EE, 0x67EF, 0x67F1, 0x67F1, 0x67F3, 0x67F5,
+        0x67FB, 0x67FB, 0x67FE, 0x67FF, 0x6802, 0x6804, 0x6813, 0x6813, 0x6816, 0x6817, 0x681E, 0x681E, 0x6821, 0x6822, 0x6829, 0x682B,
+        0x6832, 0x6832, 0x6834, 0x6834, 0x6838, 0x6839, 0x683C, 0x683D, 0x6840, 0x6843, 0x6846, 0x6846, 0x6848, 0x6848, 0x684D, 0x684E,
+        0x6850, 0x6851, 0x6853, 0x6854, 0x6859, 0x6859, 0x685C, 0x685D, 0x685F, 0x685F, 0x6863, 0x6863, 0x6867, 0x6867, 0x6874, 0x6874,
+        0x6876, 0x6877, 0x687E, 0x687F, 0x6881, 0x6881, 0x6883, 0x6883, 0x6885, 0x6885, 0x688D, 0x688D, 0x688F, 0x688F, 0x6893, 0x6894,
+        0x6897, 0x6897, 0x689B, 0x689B, 0x689D, 0x689D, 0x689F, 0x68A0, 0x68A2, 0x68A2, 0x68A6, 0x68A8, 0x68AD, 0x68AD, 0x68AF, 0x68B1,
+        0x68B3, 0x68B3, 0x68B5, 0x68B6, 0x68B9, 0x68BA, 0x68BC, 0x68BC, 0x68C4, 0x68C4, 0x68C6, 0x68C6, 0x68C9, 0x68CB, 0x68CD, 0x68CD,
+        0x68D2, 0x68D2, 0x68D4, 0x68D5, 0x68D7, 0x68D8, 0x68DA, 0x68DA, 0x68DF, 0x68E1, 0x68E3, 0x68E3, 0x68E7, 0x68E7, 0x68EE, 0x68EF,
+        0x68F2, 0x68F2, 0x68F9, 0x68FA, 0x6900, 0x6901, 0x6904, 0x6905, 0x6908, 0x6908, 0x690B, 0x690F, 0x6912, 0x6912, 0x6919, 0x691C,
+        0x6921, 0x6923, 0x6925, 0x6926, 0x6928, 0x6928, 0x692A, 0x692A, 0x6930, 0x6930, 0x6934, 0x6934, 0x6936, 0x6936, 0x6939, 0x6939,
+        0x693D, 0x693D, 0x693F, 0x693F, 0x694A, 0x694A, 0x6953, 0x6955, 0x6959, 0x695A, 0x695C, 0x695E, 0x6960, 0x6962, 0x696A, 0x696B,
+        0x696D, 0x696F, 0x6973, 0x6975, 0x6977, 0x6979, 0x697C, 0x697E, 0x6981, 0x6982, 0x698A, 0x698A, 0x698E, 0x698E, 0x6991, 0x6991,
+        0x6994, 0x6995, 0x699B, 0x699C, 0x69A0, 0x69A0, 0x69A7, 0x69A7, 0x69AE, 0x69AE, 0x69B1, 0x69B2, 0x69B4, 0x69B4, 0x69BB, 0x69BB,
+        0x69BE, 0x69BF, 0x69C1, 0x69C1, 0x69C3, 0x69C3, 0x69C7, 0x69C7, 0x69CA, 0x69CE, 0x69D0, 0x69D0, 0x69D3, 0x69D3, 0x69D8, 0x69D9,
+        0x69DD, 0x69DE, 0x69E7, 0x69E8, 0x69EB, 0x69EB, 0x69ED, 0x69ED, 0x69F2, 0x69F2, 0x69F9, 0x69F9, 0x69FB, 0x69FB, 0x69FD, 0x69FD,
+        0x69FF, 0x69FF, 0x6A02, 0x6A02, 0x6A05, 0x6A05, 0x6A0A, 0x6A0C, 0x6A12, 0x6A14, 0x6A17, 0x6A17, 0x6A19, 0x6A19, 0x6A1B, 0x6A1B,
+        0x6A1E, 0x6A1F, 0x6A21, 0x6A23, 0x6A29, 0x6A2B, 0x6A2E, 0x6A2E, 0x6A35, 0x6A36, 0x6A38, 0x6A3A, 0x6A3D, 0x6A3D, 0x6A44, 0x6A44,
+        0x6A47, 0x6A48, 0x6A4B, 0x6A4B, 0x6A58, 0x6A59, 0x6A5F, 0x6A5F, 0x6A61, 0x6A62, 0x6A66, 0x6A66, 0x6A72, 0x6A72, 0x6A78, 0x6A78,
+        0x6A7F, 0x6A80, 0x6A84, 0x6A84, 0x6A8D, 0x6A8E, 0x6A90, 0x6A90, 0x6A97, 0x6A97, 0x6A9C, 0x6A9C, 0x6AA0, 0x6AA0, 0x6AA2, 0x6AA3,
+        0x6AAA, 0x6AAA, 0x6AAC, 0x6AAC, 0x6AAE, 0x6AAE, 0x6AB3, 0x6AB3, 0x6AB8, 0x6AB8, 0x6ABB, 0x6ABB, 0x6AC1, 0x6AC3, 0x6AD1, 0x6AD1,
+        0x6AD3, 0x6AD3, 0x6ADA, 0x6ADB, 0x6ADE, 0x6ADF, 0x6AE8, 0x6AE8, 0x6AEA, 0x6AEA, 0x6AFA, 0x6AFB, 0x6B04, 0x6B05, 0x6B0A, 0x6B0A,
+        0x6B12, 0x6B12, 0x6B16, 0x6B16, 0x6B1D, 0x6B1D, 0x6B1F, 0x6B21, 0x6B23, 0x6B23, 0x6B27, 0x6B27, 0x6B32, 0x6B32, 0x6B37, 0x6B3A,
+        0x6B3D, 0x6B3E, 0x6B43, 0x6B43, 0x6B47, 0x6B47, 0x6B49, 0x6B49, 0x6B4C, 0x6B4C, 0x6B4E, 0x6B4E, 0x6B50, 0x6B50, 0x6B53, 0x6B54,
+        0x6B59, 0x6B59, 0x6B5B, 0x6B5B, 0x6B5F, 0x6B5F, 0x6B61, 0x6B64, 0x6B66, 0x6B66, 0x6B69, 0x6B6A, 0x6B6F, 0x6B6F, 0x6B73, 0x6B74,
+        0x6B78, 0x6B79, 0x6B7B, 0x6B7B, 0x6B7F, 0x6B80, 0x6B83, 0x6B84, 0x6B86, 0x6B86, 0x6B89, 0x6B8B, 0x6B8D, 0x6B8D, 0x6B95, 0x6B96,
+        0x6B98, 0x6B98, 0x6B9E, 0x6B9E, 0x6BA4, 0x6BA4, 0x6BAA, 0x6BAB, 0x6BAF, 0x6BAF, 0x6BB1, 0x6BB5, 0x6BB7, 0x6BB7, 0x6BBA, 0x6BBC,
+        0x6BBF, 0x6BC0, 0x6BC5, 0x6BC6, 0x6BCB, 0x6BCB, 0x6BCD, 0x6BCE, 0x6BD2, 0x6BD4, 0x6BD8, 0x6BD8, 0x6BDB, 0x6BDB, 0x6BDF, 0x6BDF,
+        0x6BEB, 0x6BEC, 0x6BEF, 0x6BEF, 0x6BF3, 0x6BF3, 0x6C08, 0x6C08, 0x6C0F, 0x6C0F, 0x6C11, 0x6C11, 0x6C13, 0x6C14, 0x6C17, 0x6C17,
+        0x6C1B, 0x6C1B, 0x6C23, 0x6C24, 0x6C34, 0x6C34, 0x6C37, 0x6C38, 0x6C3E, 0x6C3E, 0x6C40, 0x6C42, 0x6C4E, 0x6C4E, 0x6C50, 0x6C50,
+        0x6C55, 0x6C55, 0x6C57, 0x6C57, 0x6C5A, 0x6C5A, 0x6C5D, 0x6C60, 0x6C62, 0x6C62, 0x6C68, 0x6C68, 0x6C6A, 0x6C6A, 0x6C70, 0x6C70,
+        0x6C72, 0x6C73, 0x6C7A, 0x6C7A, 0x6C7D, 0x6C7E, 0x6C81, 0x6C83, 0x6C88, 0x6C88, 0x6C8C, 0x6C8D, 0x6C90, 0x6C90, 0x6C92, 0x6C93,
+        0x6C96, 0x6C96, 0x6C99, 0x6C9B, 0x6CA1, 0x6CA2, 0x6CAB, 0x6CAB, 0x6CAE, 0x6CAE, 0x6CB1, 0x6CB1, 0x6CB3, 0x6CB3, 0x6CB8, 0x6CBF,
+        0x6CC1, 0x6CC1, 0x6CC4, 0x6CC5, 0x6CC9, 0x6CCA, 0x6CCC, 0x6CCC, 0x6CD3, 0x6CD3, 0x6CD5, 0x6CD5, 0x6CD7, 0x6CD7, 0x6CD9, 0x6CD9,
+        0x6CDB, 0x6CDB, 0x6CDD, 0x6CDD, 0x6CE1, 0x6CE3, 0x6CE5, 0x6CE5, 0x6CE8, 0x6CE8, 0x6CEA, 0x6CEA, 0x6CEF, 0x6CF1, 0x6CF3, 0x6CF3,
+        0x6D0B, 0x6D0C, 0x6D12, 0x6D12, 0x6D17, 0x6D17, 0x6D19, 0x6D19, 0x6D1B, 0x6D1B, 0x6D1E, 0x6D1F, 0x6D25, 0x6D25, 0x6D29, 0x6D2B,
+        0x6D32, 0x6D33, 0x6D35, 0x6D36, 0x6D38, 0x6D38, 0x6D3B, 0x6D3B, 0x6D3D, 0x6D3E, 0x6D41, 0x6D41, 0x6D44, 0x6D45, 0x6D59, 0x6D5A,
+        0x6D5C, 0x6D5C, 0x6D63, 0x6D64, 0x6D66, 0x6D66, 0x6D69, 0x6D6A, 0x6D6C, 0x6D6C, 0x6D6E, 0x6D6E, 0x6D74, 0x6D74, 0x6D77, 0x6D79,
+        0x6D85, 0x6D85, 0x6D88, 0x6D88, 0x6D8C, 0x6D8C, 0x6D8E, 0x6D8E, 0x6D93, 0x6D93, 0x6D95, 0x6D95, 0x6D99, 0x6D99, 0x6D9B, 0x6D9C,
+        0x6DAF, 0x6DAF, 0x6DB2, 0x6DB2, 0x6DB5, 0x6DB5, 0x6DB8, 0x6DB8, 0x6DBC, 0x6DBC, 0x6DC0, 0x6DC0, 0x6DC5, 0x6DC7, 0x6DCB, 0x6DCC,
+        0x6DD1, 0x6DD2, 0x6DD5, 0x6DD5, 0x6DD8, 0x6DD9, 0x6DDE, 0x6DDE, 0x6DE1, 0x6DE1, 0x6DE4, 0x6DE4, 0x6DE6, 0x6DE6, 0x6DE8, 0x6DE8,
+        0x6DEA, 0x6DEC, 0x6DEE, 0x6DEE, 0x6DF1, 0x6DF1, 0x6DF3, 0x6DF3, 0x6DF5, 0x6DF5, 0x6DF7, 0x6DF7, 0x6DF9, 0x6DFB, 0x6E05, 0x6E05,
+        0x6E07, 0x6E0B, 0x6E13, 0x6E13, 0x6E15, 0x6E15, 0x6E19, 0x6E1B, 0x6E1D, 0x6E1D, 0x6E1F, 0x6E21, 0x6E23, 0x6E26, 0x6E29, 0x6E29,
+        0x6E2B, 0x6E2F, 0x6E38, 0x6E38, 0x6E3A, 0x6E3A, 0x6E3E, 0x6E3E, 0x6E43, 0x6E43, 0x6E4A, 0x6E4A, 0x6E4D, 0x6E4E, 0x6E56, 0x6E56,
+        0x6E58, 0x6E58, 0x6E5B, 0x6E5B, 0x6E5F, 0x6E5F, 0x6E67, 0x6E67, 0x6E6B, 0x6E6B, 0x6E6E, 0x6E6F, 0x6E72, 0x6E72, 0x6E76, 0x6E76,
+        0x6E7E, 0x6E80, 0x6E82, 0x6E82, 0x6E8C, 0x6E8C, 0x6E8F, 0x6E90, 0x6E96, 0x6E96, 0x6E98, 0x6E98, 0x6E9C, 0x6E9D, 0x6E9F, 0x6E9F,
+        0x6EA2, 0x6EA2, 0x6EA5, 0x6EA5, 0x6EAA, 0x6EAA, 0x6EAF, 0x6EAF, 0x6EB2, 0x6EB2, 0x6EB6, 0x6EB7, 0x6EBA, 0x6EBA, 0x6EBD, 0x6EBD,
+        0x6EC2, 0x6EC2, 0x6EC4, 0x6EC5, 0x6EC9, 0x6EC9, 0x6ECB, 0x6ECC, 0x6ED1, 0x6ED1, 0x6ED3, 0x6ED5, 0x6EDD, 0x6EDE, 0x6EEC, 0x6EEC,
+        0x6EEF, 0x6EEF, 0x6EF2, 0x6EF2, 0x6EF4, 0x6EF4, 0x6EF7, 0x6EF8, 0x6EFE, 0x6EFF, 0x6F01, 0x6F02, 0x6F06, 0x6F06, 0x6F09, 0x6F09,
+        0x6F0F, 0x6F0F, 0x6F11, 0x6F11, 0x6F13, 0x6F15, 0x6F20, 0x6F20, 0x6F22, 0x6F23, 0x6F2B, 0x6F2C, 0x6F31, 0x6F32, 0x6F38, 0x6F38,
+        0x6F3E, 0x6F3F, 0x6F41, 0x6F41, 0x6F45, 0x6F45, 0x6F54, 0x6F54, 0x6F58, 0x6F58, 0x6F5B, 0x6F5C, 0x6F5F, 0x6F5F, 0x6F64, 0x6F64,
+        0x6F66, 0x6F66, 0x6F6D, 0x6F70, 0x6F74, 0x6F74, 0x6F78, 0x6F78, 0x6F7A, 0x6F7A, 0x6F7C, 0x6F7C, 0x6F80, 0x6F82, 0x6F84, 0x6F84,
+        0x6F86, 0x6F86, 0x6F8E, 0x6F8E, 0x6F91, 0x6F91, 0x6F97, 0x6F97, 0x6FA1, 0x6FA1, 0x6FA3, 0x6FA4, 0x6FAA, 0x6FAA, 0x6FB1, 0x6FB1,
+        0x6FB3, 0x6FB3, 0x6FB9, 0x6FB9, 0x6FC0, 0x6FC3, 0x6FC6, 0x6FC6, 0x6FD4, 0x6FD5, 0x6FD8, 0x6FD8, 0x6FDB, 0x6FDB, 0x6FDF, 0x6FE1,
+        0x6FE4, 0x6FE4, 0x6FEB, 0x6FEC, 0x6FEE, 0x6FEF, 0x6FF1, 0x6FF1, 0x6FF3, 0x6FF3, 0x6FF6, 0x6FF6, 0x6FFA, 0x6FFA, 0x6FFE, 0x6FFE,
+        0x7001, 0x7001, 0x7009, 0x7009, 0x700B, 0x700B, 0x700F, 0x700F, 0x7011, 0x7011, 0x7015, 0x7015, 0x7018, 0x7018, 0x701A, 0x701B,
+        0x701D, 0x701F, 0x7026, 0x7027, 0x702C, 0x702C, 0x7030, 0x7030, 0x7032, 0x7032, 0x703E, 0x703E, 0x704C, 0x704C, 0x7051, 0x7051,
+        0x7058, 0x7058, 0x7063, 0x7063, 0x706B, 0x706B, 0x706F, 0x7070, 0x7078, 0x7078, 0x707C, 0x707D, 0x7089, 0x708A, 0x708E, 0x708E,
+        0x7092, 0x7092, 0x7099, 0x7099, 0x70AC, 0x70AF, 0x70B3, 0x70B3, 0x70B8, 0x70BA, 0x70C8, 0x70C8, 0x70CB, 0x70CB, 0x70CF, 0x70CF,
+        0x70D9, 0x70D9, 0x70DD, 0x70DD, 0x70DF, 0x70DF, 0x70F1, 0x70F1, 0x70F9, 0x70F9, 0x70FD, 0x70FD, 0x7109, 0x7109, 0x7114, 0x7114,
+        0x7119, 0x711A, 0x711C, 0x711C, 0x7121, 0x7121, 0x7126, 0x7126, 0x7136, 0x7136, 0x713C, 0x713C, 0x7149, 0x7149, 0x714C, 0x714C,
+        0x714E, 0x714E, 0x7155, 0x7156, 0x7159, 0x7159, 0x7162, 0x7162, 0x7164, 0x7167, 0x7169, 0x7169, 0x716C, 0x716C, 0x716E, 0x716E,
+        0x717D, 0x717D, 0x7184, 0x7184, 0x7188, 0x7188, 0x718A, 0x718A, 0x718F, 0x718F, 0x7194, 0x7195, 0x7199, 0x7199, 0x719F, 0x719F,
+        0x71A8, 0x71A8, 0x71AC, 0x71AC, 0x71B1, 0x71B1, 0x71B9, 0x71B9, 0x71BE, 0x71BE, 0x71C3, 0x71C3, 0x71C8, 0x71C9, 0x71CE, 0x71CE,
+        0x71D0, 0x71D0, 0x71D2, 0x71D2, 0x71D4, 0x71D5, 0x71D7, 0x71D7, 0x71DF, 0x71E0, 0x71E5, 0x71E7, 0x71EC, 0x71EE, 0x71F5, 0x71F5,
+        0x71F9, 0x71F9, 0x71FB, 0x71FC, 0x71FF, 0x71FF, 0x7206, 0x7206, 0x720D, 0x720D, 0x7210, 0x7210, 0x721B, 0x721B, 0x7228, 0x7228,
+        0x722A, 0x722A, 0x722C, 0x722D, 0x7230, 0x7230, 0x7232, 0x7232, 0x7235, 0x7236, 0x723A, 0x7240, 0x7246, 0x7248, 0x724B, 0x724C,
+        0x7252, 0x7252, 0x7258, 0x7259, 0x725B, 0x725B, 0x725D, 0x725D, 0x725F, 0x725F, 0x7261, 0x7262, 0x7267, 0x7267, 0x7269, 0x7269,
+        0x7272, 0x7272, 0x7274, 0x7274, 0x7279, 0x7279, 0x727D, 0x727E, 0x7280, 0x7282, 0x7287, 0x7287, 0x7292, 0x7292, 0x7296, 0x7296,
+        0x72A0, 0x72A0, 0x72A2, 0x72A2, 0x72A7, 0x72A7, 0x72AC, 0x72AC, 0x72AF, 0x72AF, 0x72B2, 0x72B2, 0x72B6, 0x72B6, 0x72B9, 0x72B9,
+        0x72C2, 0x72C4, 0x72C6, 0x72C6, 0x72CE, 0x72CE, 0x72D0, 0x72D0, 0x72D2, 0x72D2, 0x72D7, 0x72D7, 0x72D9, 0x72D9, 0x72DB, 0x72DB,
+        0x72E0, 0x72E2, 0x72E9, 0x72E9, 0x72EC, 0x72ED, 0x72F7, 0x72F9, 0x72FC, 0x72FD, 0x730A, 0x730A, 0x7316, 0x7317, 0x731B, 0x731D,
+        0x731F, 0x731F, 0x7325, 0x7325, 0x7329, 0x732B, 0x732E, 0x732F, 0x7334, 0x7334, 0x7336, 0x7337, 0x733E, 0x733F, 0x7344, 0x7345,
+        0x734E, 0x734F, 0x7357, 0x7357, 0x7363, 0x7363, 0x7368, 0x7368, 0x736A, 0x736A, 0x7370, 0x7370, 0x7372, 0x7372, 0x7375, 0x7375,
+        0x7378, 0x7378, 0x737A, 0x737B, 0x7384, 0x7384, 0x7387, 0x7387, 0x7389, 0x7389, 0x738B, 0x738B, 0x7396, 0x7396, 0x73A9, 0x73A9,
+        0x73B2, 0x73B3, 0x73BB, 0x73BB, 0x73C0, 0x73C0, 0x73C2, 0x73C2, 0x73C8, 0x73C8, 0x73CA, 0x73CA, 0x73CD, 0x73CE, 0x73DE, 0x73DE,
+        0x73E0, 0x73E0, 0x73E5, 0x73E5, 0x73EA, 0x73EA, 0x73ED, 0x73EE, 0x73F1, 0x73F1, 0x73F8, 0x73F8, 0x73FE, 0x73FE, 0x7403, 0x7403,
+        0x7405, 0x7406, 0x7409, 0x7409, 0x7422, 0x7422, 0x7425, 0x7425, 0x7432, 0x7436, 0x743A, 0x743A, 0x743F, 0x743F, 0x7441, 0x7441,
+        0x7455, 0x7455, 0x7459, 0x745C, 0x745E, 0x7460, 0x7463, 0x7464, 0x7469, 0x746A, 0x746F, 0x7470, 0x7473, 0x7473, 0x7476, 0x7476,
+        0x747E, 0x747E, 0x7483, 0x7483, 0x748B, 0x748B, 0x749E, 0x749E, 0x74A2, 0x74A2, 0x74A7, 0x74A7, 0x74B0, 0x74B0, 0x74BD, 0x74BD,
+        0x74CA, 0x74CA, 0x74CF, 0x74CF, 0x74D4, 0x74D4, 0x74DC, 0x74DC, 0x74E0, 0x74E0, 0x74E2, 0x74E3, 0x74E6, 0x74E7, 0x74E9, 0x74E9,
+        0x74EE, 0x74EE, 0x74F0, 0x74F2, 0x74F6, 0x74F8, 0x7503, 0x7505, 0x750C, 0x750E, 0x7511, 0x7511, 0x7513, 0x7513, 0x7515, 0x7515,
+        0x7518, 0x7518, 0x751A, 0x751A, 0x751C, 0x751C, 0x751E, 0x751F, 0x7523, 0x7523, 0x7525, 0x7526, 0x7528, 0x7528, 0x752B, 0x752C,
+        0x7530, 0x7533, 0x7537, 0x7538, 0x753A, 0x753C, 0x7544, 0x7544, 0x7546, 0x7546, 0x7549, 0x754D, 0x754F, 0x754F, 0x7551, 0x7551,
+        0x7554, 0x7554, 0x7559, 0x755D, 0x7560, 0x7560, 0x7562, 0x7562, 0x7564, 0x7567, 0x7569, 0x756B, 0x756D, 0x756D, 0x7570, 0x7570,
+        0x7573, 0x7574, 0x7576, 0x7578, 0x757F, 0x757F, 0x7582, 0x7582, 0x7586, 0x7587, 0x7589, 0x758B, 0x758E, 0x758F, 0x7591, 0x7591,
+        0x7594, 0x7594, 0x759A, 0x759A, 0x759D, 0x759D, 0x75A3, 0x75A3, 0x75A5, 0x75A5, 0x75AB, 0x75AB, 0x75B1, 0x75B3, 0x75B5, 0x75B5,
+        0x75B8, 0x75B9, 0x75BC, 0x75BE, 0x75C2, 0x75C3, 0x75C5, 0x75C5, 0x75C7, 0x75C7, 0x75CA, 0x75CA, 0x75CD, 0x75CD, 0x75D2, 0x75D2,
+        0x75D4, 0x75D5, 0x75D8, 0x75D9, 0x75DB, 0x75DB, 0x75DE, 0x75DE, 0x75E2, 0x75E3, 0x75E9, 0x75E9, 0x75F0, 0x75F0, 0x75F2, 0x75F4,
+        0x75FA, 0x75FA, 0x75FC, 0x75FC, 0x75FE, 0x75FF, 0x7601, 0x7601, 0x7609, 0x7609, 0x760B, 0x760B, 0x760D, 0x760D, 0x761F, 0x7622,
+        0x7624, 0x7624, 0x7627, 0x7627, 0x7630, 0x7630, 0x7634, 0x7634, 0x763B, 0x763B, 0x7642, 0x7642, 0x7646, 0x7648, 0x764C, 0x764C,
+        0x7652, 0x7652, 0x7656, 0x7656, 0x7658, 0x7658, 0x765C, 0x765C, 0x7661, 0x7662, 0x7667, 0x766A, 0x766C, 0x766C, 0x7670, 0x7670,
+        0x7672, 0x7672, 0x7676, 0x7676, 0x7678, 0x7678, 0x767A, 0x767E, 0x7680, 0x7680, 0x7683, 0x7684, 0x7686, 0x7688, 0x768B, 0x768B,
+        0x768E, 0x768E, 0x7690, 0x7690, 0x7693, 0x7693, 0x7696, 0x7696, 0x7699, 0x769A, 0x76AE, 0x76AE, 0x76B0, 0x76B0, 0x76B4, 0x76B4,
+        0x76B7, 0x76BA, 0x76BF, 0x76BF, 0x76C2, 0x76C3, 0x76C6, 0x76C6, 0x76C8, 0x76C8, 0x76CA, 0x76CA, 0x76CD, 0x76CD, 0x76D2, 0x76D2,
+        0x76D6, 0x76D7, 0x76DB, 0x76DC, 0x76DE, 0x76DF, 0x76E1, 0x76E1, 0x76E3, 0x76E5, 0x76E7, 0x76E7, 0x76EA, 0x76EA, 0x76EE, 0x76EE,
+        0x76F2, 0x76F2, 0x76F4, 0x76F4, 0x76F8, 0x76F8, 0x76FB, 0x76FB, 0x76FE, 0x76FE, 0x7701, 0x7701, 0x7704, 0x7704, 0x7707, 0x7709,
+        0x770B, 0x770C, 0x771B, 0x771B, 0x771E, 0x7720, 0x7724, 0x7726, 0x7729, 0x7729, 0x7737, 0x7738, 0x773A, 0x773A, 0x773C, 0x773C,
+        0x7740, 0x7740, 0x7747, 0x7747, 0x775A, 0x775B, 0x7761, 0x7761, 0x7763, 0x7763, 0x7765, 0x7766, 0x7768, 0x7768, 0x776B, 0x776B,
+        0x7779, 0x7779, 0x777E, 0x777F, 0x778B, 0x778B, 0x778E, 0x778E, 0x7791, 0x7791, 0x779E, 0x779E, 0x77A0, 0x77A0, 0x77A5, 0x77A5,
+        0x77AC, 0x77AD, 0x77B0, 0x77B0, 0x77B3, 0x77B3, 0x77B6, 0x77B6, 0x77B9, 0x77B9, 0x77BB, 0x77BD, 0x77BF, 0x77BF, 0x77C7, 0x77C7,
+        0x77CD, 0x77CD, 0x77D7, 0x77D7, 0x77DA, 0x77DC, 0x77E2, 0x77E3, 0x77E5, 0x77E5, 0x77E7, 0x77E7, 0x77E9, 0x77E9, 0x77ED, 0x77EF,
+        0x77F3, 0x77F3, 0x77FC, 0x77FC, 0x7802, 0x7802, 0x780C, 0x780C, 0x7812, 0x7812, 0x7814, 0x7815, 0x7820, 0x7820, 0x7825, 0x7827,
+        0x7832, 0x7832, 0x7834, 0x7834, 0x783A, 0x783A, 0x783F, 0x783F, 0x7845, 0x7845, 0x785D, 0x785D, 0x786B, 0x786C, 0x786F, 0x786F,
+        0x7872, 0x7872, 0x7874, 0x7874, 0x787C, 0x787C, 0x7881, 0x7881, 0x7886, 0x7887, 0x788C, 0x788E, 0x7891, 0x7891, 0x7893, 0x7893,
+        0x7895, 0x7895, 0x7897, 0x7897, 0x789A, 0x789A, 0x78A3, 0x78A3, 0x78A7, 0x78A7, 0x78A9, 0x78AA, 0x78AF, 0x78AF, 0x78B5, 0x78B5,
+        0x78BA, 0x78BA, 0x78BC, 0x78BC, 0x78BE, 0x78BE, 0x78C1, 0x78C1, 0x78C5, 0x78C6, 0x78CA, 0x78CB, 0x78D0, 0x78D1, 0x78D4, 0x78D4,
+        0x78DA, 0x78DA, 0x78E7, 0x78E8, 0x78EC, 0x78EC, 0x78EF, 0x78EF, 0x78F4, 0x78F4, 0x78FD, 0x78FD, 0x7901, 0x7901, 0x7907, 0x7907,
+        0x790E, 0x790E, 0x7911, 0x7912, 0x7919, 0x7919, 0x7926, 0x7926, 0x792A, 0x792C, 0x793A, 0x793A, 0x793C, 0x793C, 0x793E, 0x793E,
+        0x7940, 0x7941, 0x7947, 0x7949, 0x7950, 0x7950, 0x7953, 0x7953, 0x7955, 0x7957, 0x795A, 0x795A, 0x795D, 0x7960, 0x7962, 0x7962,
+        0x7965, 0x7965, 0x7968, 0x7968, 0x796D, 0x796D, 0x7977, 0x7977, 0x797A, 0x797A, 0x797F, 0x7981, 0x7984, 0x7985, 0x798A, 0x798A,
+        0x798D, 0x798F, 0x799D, 0x799D, 0x79A6, 0x79A7, 0x79AA, 0x79AA, 0x79AE, 0x79AE, 0x79B0, 0x79B0, 0x79B3, 0x79B3, 0x79B9, 0x79BA,
+        0x79BD, 0x79C1, 0x79C9, 0x79C9, 0x79CB, 0x79CB, 0x79D1, 0x79D2, 0x79D5, 0x79D5, 0x79D8, 0x79D8, 0x79DF, 0x79DF, 0x79E1, 0x79E1,
+        0x79E3, 0x79E4, 0x79E6, 0x79E7, 0x79E9, 0x79E9, 0x79EC, 0x79EC, 0x79F0, 0x79F0, 0x79FB, 0x79FB, 0x7A00, 0x7A00, 0x7A08, 0x7A08,
+        0x7A0B, 0x7A0B, 0x7A0D, 0x7A0E, 0x7A14, 0x7A14, 0x7A17, 0x7A1A, 0x7A1C, 0x7A1C, 0x7A1F, 0x7A20, 0x7A2E, 0x7A2E, 0x7A31, 0x7A32,
+        0x7A37, 0x7A37, 0x7A3B, 0x7A40, 0x7A42, 0x7A43, 0x7A46, 0x7A46, 0x7A49, 0x7A49, 0x7A4D, 0x7A50, 0x7A57, 0x7A57, 0x7A61, 0x7A63,
+        0x7A69, 0x7A69, 0x7A6B, 0x7A6B, 0x7A70, 0x7A70, 0x7A74, 0x7A74, 0x7A76, 0x7A76, 0x7A79, 0x7A7A, 0x7A7D, 0x7A7D, 0x7A7F, 0x7A7F,
+        0x7A81, 0x7A81, 0x7A83, 0x7A84, 0x7A88, 0x7A88, 0x7A92, 0x7A93, 0x7A95, 0x7A98, 0x7A9F, 0x7A9F, 0x7AA9, 0x7AAA, 0x7AAE, 0x7AB0,
+        0x7AB6, 0x7AB6, 0x7ABA, 0x7ABA, 0x7ABF, 0x7ABF, 0x7AC3, 0x7AC5, 0x7AC7, 0x7AC8, 0x7ACA, 0x7ACB, 0x7ACD, 0x7ACD, 0x7ACF, 0x7ACF,
+        0x7AD2, 0x7AD3, 0x7AD5, 0x7AD5, 0x7AD9, 0x7ADA, 0x7ADC, 0x7ADD, 0x7ADF, 0x7AE3, 0x7AE5, 0x7AE6, 0x7AEA, 0x7AEA, 0x7AED, 0x7AED,
+        0x7AEF, 0x7AF0, 0x7AF6, 0x7AF6, 0x7AF8, 0x7AFA, 0x7AFF, 0x7AFF, 0x7B02, 0x7B02, 0x7B04, 0x7B04, 0x7B06, 0x7B06, 0x7B08, 0x7B08,
+        0x7B0A, 0x7B0B, 0x7B0F, 0x7B0F, 0x7B11, 0x7B11, 0x7B18, 0x7B19, 0x7B1B, 0x7B1B, 0x7B1E, 0x7B1E, 0x7B20, 0x7B20, 0x7B25, 0x7B26,
+        0x7B28, 0x7B28, 0x7B2C, 0x7B2C, 0x7B33, 0x7B33, 0x7B35, 0x7B36, 0x7B39, 0x7B39, 0x7B45, 0x7B46, 0x7B48, 0x7B49, 0x7B4B, 0x7B4D,
+        0x7B4F, 0x7B52, 0x7B54, 0x7B54, 0x7B56, 0x7B56, 0x7B5D, 0x7B5D, 0x7B65, 0x7B65, 0x7B67, 0x7B67, 0x7B6C, 0x7B6C, 0x7B6E, 0x7B6E,
+        0x7B70, 0x7B71, 0x7B74, 0x7B75, 0x7B7A, 0x7B7A, 0x7B86, 0x7B87, 0x7B8B, 0x7B8B, 0x7B8D, 0x7B8D, 0x7B8F, 0x7B8F, 0x7B92, 0x7B92,
+        0x7B94, 0x7B95, 0x7B97, 0x7B9A, 0x7B9C, 0x7B9D, 0x7B9F, 0x7B9F, 0x7BA1, 0x7BA1, 0x7BAA, 0x7BAA, 0x7BAD, 0x7BAD, 0x7BB1, 0x7BB1,
+        0x7BB4, 0x7BB4, 0x7BB8, 0x7BB8, 0x7BC0, 0x7BC1, 0x7BC4, 0x7BC4, 0x7BC6, 0x7BC7, 0x7BC9, 0x7BC9, 0x7BCB, 0x7BCC, 0x7BCF, 0x7BCF,
+        0x7BDD, 0x7BDD, 0x7BE0, 0x7BE0, 0x7BE4, 0x7BE6, 0x7BE9, 0x7BE9, 0x7BED, 0x7BED, 0x7BF3, 0x7BF3, 0x7BF6, 0x7BF7, 0x7C00, 0x7C00,
+        0x7C07, 0x7C07, 0x7C0D, 0x7C0D, 0x7C11, 0x7C14, 0x7C17, 0x7C17, 0x7C1F, 0x7C1F, 0x7C21, 0x7C21, 0x7C23, 0x7C23, 0x7C27, 0x7C27,
+        0x7C2A, 0x7C2B, 0x7C37, 0x7C38, 0x7C3D, 0x7C40, 0x7C43, 0x7C43, 0x7C4C, 0x7C4D, 0x7C4F, 0x7C50, 0x7C54, 0x7C54, 0x7C56, 0x7C56,
+        0x7C58, 0x7C58, 0x7C5F, 0x7C60, 0x7C64, 0x7C65, 0x7C6C, 0x7C6C, 0x7C73, 0x7C73, 0x7C75, 0x7C75, 0x7C7E, 0x7C7E, 0x7C81, 0x7C83,
+        0x7C89, 0x7C89, 0x7C8B, 0x7C8B, 0x7C8D, 0x7C8D, 0x7C90, 0x7C90, 0x7C92, 0x7C92, 0x7C95, 0x7C95, 0x7C97, 0x7C98, 0x7C9B, 0x7C9B,
+        0x7C9F, 0x7C9F, 0x7CA1, 0x7CA2, 0x7CA4, 0x7CA5, 0x7CA7, 0x7CA8, 0x7CAB, 0x7CAB, 0x7CAD, 0x7CAE, 0x7CB1, 0x7CB3, 0x7CB9, 0x7CB9,
+        0x7CBD, 0x7CBE, 0x7CC0, 0x7CC0, 0x7CC2, 0x7CC2, 0x7CC5, 0x7CC5, 0x7CCA, 0x7CCA, 0x7CCE, 0x7CCE, 0x7CD2, 0x7CD2, 0x7CD6, 0x7CD6,
+        0x7CD8, 0x7CD8, 0x7CDC, 0x7CDC, 0x7CDE, 0x7CE0, 0x7CE2, 0x7CE2, 0x7CE7, 0x7CE7, 0x7CEF, 0x7CEF, 0x7CF2, 0x7CF2, 0x7CF4, 0x7CF4,
+        0x7CF6, 0x7CF6, 0x7CF8, 0x7CF8, 0x7CFA, 0x7CFB, 0x7CFE, 0x7CFE, 0x7D00, 0x7D00, 0x7D02, 0x7D02, 0x7D04, 0x7D06, 0x7D0A, 0x7D0B,
+        0x7D0D, 0x7D0D, 0x7D10, 0x7D10, 0x7D14, 0x7D15, 0x7D17, 0x7D1C, 0x7D20, 0x7D22, 0x7D2B, 0x7D2C, 0x7D2E, 0x7D30, 0x7D32, 0x7D33,
+        0x7D35, 0x7D35, 0x7D39, 0x7D3A, 0x7D3F, 0x7D3F, 0x7D42, 0x7D46, 0x7D4B, 0x7D4C, 0x7D4E, 0x7D50, 0x7D56, 0x7D56, 0x7D5B, 0x7D5B,
+        0x7D5E, 0x7D5E, 0x7D61, 0x7D63, 0x7D66, 0x7D66, 0x7D68, 0x7D68, 0x7D6E, 0x7D6E, 0x7D71, 0x7D73, 0x7D75, 0x7D76, 0x7D79, 0x7D79,
+        0x7D7D, 0x7D7D, 0x7D89, 0x7D89, 0x7D8F, 0x7D8F, 0x7D93, 0x7D93, 0x7D99, 0x7D9C, 0x7D9F, 0x7D9F, 0x7DA2, 0x7DA3, 0x7DAB, 0x7DB2,
+        0x7DB4, 0x7DB5, 0x7DB8, 0x7DB8, 0x7DBA, 0x7DBB, 0x7DBD, 0x7DBF, 0x7DC7, 0x7DC7, 0x7DCA, 0x7DCB, 0x7DCF, 0x7DCF, 0x7DD1, 0x7DD2,
+        0x7DD5, 0x7DD5, 0x7DD8, 0x7DD8, 0x7DDA, 0x7DDA, 0x7DDC, 0x7DDE, 0x7DE0, 0x7DE1, 0x7DE4, 0x7DE4, 0x7DE8, 0x7DE9, 0x7DEC, 0x7DEC,
+        0x7DEF, 0x7DEF, 0x7DF2, 0x7DF2, 0x7DF4, 0x7DF4, 0x7DFB, 0x7DFB, 0x7E01, 0x7E01, 0x7E04, 0x7E05, 0x7E09, 0x7E0B, 0x7E12, 0x7E12,
+        0x7E1B, 0x7E1B, 0x7E1E, 0x7E1F, 0x7E21, 0x7E23, 0x7E26, 0x7E26, 0x7E2B, 0x7E2B, 0x7E2E, 0x7E2E, 0x7E31, 0x7E32, 0x7E35, 0x7E35,
+        0x7E37, 0x7E37, 0x7E39, 0x7E3B, 0x7E3D, 0x7E3E, 0x7E41, 0x7E41, 0x7E43, 0x7E43, 0x7E46, 0x7E46, 0x7E4A, 0x7E4B, 0x7E4D, 0x7E4D,
+        0x7E54, 0x7E56, 0x7E59, 0x7E5A, 0x7E5D, 0x7E5E, 0x7E66, 0x7E67, 0x7E69, 0x7E6A, 0x7E6D, 0x7E6D, 0x7E70, 0x7E70, 0x7E79, 0x7E79,
+        0x7E7B, 0x7E7D, 0x7E7F, 0x7E7F, 0x7E82, 0x7E83, 0x7E88, 0x7E89, 0x7E8C, 0x7E8C, 0x7E8E, 0x7E90, 0x7E92, 0x7E94, 0x7E96, 0x7E96,
+        0x7E9B, 0x7E9C, 0x7F36, 0x7F36, 0x7F38, 0x7F38, 0x7F3A, 0x7F3A, 0x7F45, 0x7F45, 0x7F4C, 0x7F4E, 0x7F50, 0x7F51, 0x7F54, 0x7F55,
+        0x7F58, 0x7F58, 0x7F5F, 0x7F60, 0x7F67, 0x7F6B, 0x7F6E, 0x7F6E, 0x7F70, 0x7F70, 0x7F72, 0x7F72, 0x7F75, 0x7F75, 0x7F77, 0x7F79,
+        0x7F82, 0x7F83, 0x7F85, 0x7F88, 0x7F8A, 0x7F8A, 0x7F8C, 0x7F8C, 0x7F8E, 0x7F8E, 0x7F94, 0x7F94, 0x7F9A, 0x7F9A, 0x7F9D, 0x7F9E,
+        0x7FA3, 0x7FA4, 0x7FA8, 0x7FA9, 0x7FAE, 0x7FAF, 0x7FB2, 0x7FB2, 0x7FB6, 0x7FB6, 0x7FB8, 0x7FB9, 0x7FBD, 0x7FBD, 0x7FC1, 0x7FC1,
+        0x7FC5, 0x7FC6, 0x7FCA, 0x7FCA, 0x7FCC, 0x7FCC, 0x7FD2, 0x7FD2, 0x7FD4, 0x7FD5, 0x7FE0, 0x7FE1, 0x7FE6, 0x7FE6, 0x7FE9, 0x7FE9,
+        0x7FEB, 0x7FEB, 0x7FF0, 0x7FF0, 0x7FF3, 0x7FF3, 0x7FF9, 0x7FF9, 0x7FFB, 0x7FFC, 0x8000, 0x8001, 0x8003, 0x8006, 0x800B, 0x800C,
+        0x8010, 0x8010, 0x8012, 0x8012, 0x8015, 0x8015, 0x8017, 0x8019, 0x801C, 0x801C, 0x8021, 0x8021, 0x8028, 0x8028, 0x8033, 0x8033,
+        0x8036, 0x8036, 0x803B, 0x803B, 0x803D, 0x803D, 0x803F, 0x803F, 0x8046, 0x8046, 0x804A, 0x804A, 0x8052, 0x8052, 0x8056, 0x8056,
+        0x8058, 0x8058, 0x805A, 0x805A, 0x805E, 0x805F, 0x8061, 0x8062, 0x8068, 0x8068, 0x806F, 0x8070, 0x8072, 0x8074, 0x8076, 0x8077,
+        0x8079, 0x8079, 0x807D, 0x807F, 0x8084, 0x8087, 0x8089, 0x8089, 0x808B, 0x808C, 0x8093, 0x8093, 0x8096, 0x8096, 0x8098, 0x8098,
+        0x809A, 0x809B, 0x809D, 0x809D, 0x80A1, 0x80A2, 0x80A5, 0x80A5, 0x80A9, 0x80AA, 0x80AC, 0x80AD, 0x80AF, 0x80AF, 0x80B1, 0x80B2,
+        0x80B4, 0x80B4, 0x80BA, 0x80BA, 0x80C3, 0x80C4, 0x80C6, 0x80C6, 0x80CC, 0x80CC, 0x80CE, 0x80CE, 0x80D6, 0x80D6, 0x80D9, 0x80DB,
+        0x80DD, 0x80DE, 0x80E1, 0x80E1, 0x80E4, 0x80E5, 0x80EF, 0x80EF, 0x80F1, 0x80F1, 0x80F4, 0x80F4, 0x80F8, 0x80F8, 0x80FC, 0x80FD,
+        0x8102, 0x8102, 0x8105, 0x810A, 0x811A, 0x811B, 0x8123, 0x8123, 0x8129, 0x8129, 0x812F, 0x812F, 0x8131, 0x8131, 0x8133, 0x8133,
+        0x8139, 0x8139, 0x813E, 0x813E, 0x8146, 0x8146, 0x814B, 0x814B, 0x814E, 0x814E, 0x8150, 0x8151, 0x8153, 0x8155, 0x815F, 0x815F,
+        0x8165, 0x8166, 0x816B, 0x816B, 0x816E, 0x816E, 0x8170, 0x8171, 0x8174, 0x8174, 0x8178, 0x817A, 0x817F, 0x8180, 0x8182, 0x8183,
+        0x8188, 0x8188, 0x818A, 0x818A, 0x818F, 0x818F, 0x8193, 0x8193, 0x8195, 0x8195, 0x819A, 0x819A, 0x819C, 0x819D, 0x81A0, 0x81A0,
+        0x81A3, 0x81A4, 0x81A8, 0x81A9, 0x81B0, 0x81B0, 0x81B3, 0x81B3, 0x81B5, 0x81B5, 0x81B8, 0x81B8, 0x81BA, 0x81BA, 0x81BD, 0x81C0,
+        0x81C2, 0x81C2, 0x81C6, 0x81C6, 0x81C8, 0x81C9, 0x81CD, 0x81CD, 0x81D1, 0x81D1, 0x81D3, 0x81D3, 0x81D8, 0x81DA, 0x81DF, 0x81E0,
+        0x81E3, 0x81E3, 0x81E5, 0x81E5, 0x81E7, 0x81E8, 0x81EA, 0x81EA, 0x81ED, 0x81ED, 0x81F3, 0x81F4, 0x81FA, 0x81FC, 0x81FE, 0x81FE,
+        0x8201, 0x8202, 0x8205, 0x8205, 0x8207, 0x820A, 0x820C, 0x820E, 0x8210, 0x8210, 0x8212, 0x8212, 0x8216, 0x8218, 0x821B, 0x821C,
+        0x821E, 0x821F, 0x8229, 0x822C, 0x822E, 0x822E, 0x8233, 0x8233, 0x8235, 0x8239, 0x8240, 0x8240, 0x8247, 0x8247, 0x8258, 0x825A,
+        0x825D, 0x825D, 0x825F, 0x825F, 0x8262, 0x8262, 0x8264, 0x8264, 0x8266, 0x8266, 0x8268, 0x8268, 0x826A, 0x826B, 0x826E, 0x826F,
+        0x8271, 0x8272, 0x8276, 0x8278, 0x827E, 0x827E, 0x828B, 0x828B, 0x828D, 0x828D, 0x8292, 0x8292, 0x8299, 0x8299, 0x829D, 0x829D,
+        0x829F, 0x829F, 0x82A5, 0x82A6, 0x82AB, 0x82AD, 0x82AF, 0x82AF, 0x82B1, 0x82B1, 0x82B3, 0x82B3, 0x82B8, 0x82B9, 0x82BB, 0x82BB,
+        0x82BD, 0x82BD, 0x82C5, 0x82C5, 0x82D1, 0x82D4, 0x82D7, 0x82D7, 0x82D9, 0x82D9, 0x82DB, 0x82DC, 0x82DE, 0x82DF, 0x82E1, 0x82E1,
+        0x82E3, 0x82E3, 0x82E5, 0x82E7, 0x82EB, 0x82EB, 0x82F1, 0x82F1, 0x82F3, 0x82F4, 0x82F9, 0x82FB, 0x8302, 0x8306, 0x8309, 0x8309,
+        0x830E, 0x830E, 0x8316, 0x8318, 0x831C, 0x831C, 0x8323, 0x8323, 0x8328, 0x8328, 0x832B, 0x832B, 0x832F, 0x832F, 0x8331, 0x8332,
+        0x8334, 0x8336, 0x8338, 0x8339, 0x8340, 0x8340, 0x8345, 0x8345, 0x8349, 0x834A, 0x834F, 0x8350, 0x8352, 0x8352, 0x8358, 0x8358,
+        0x8373, 0x8373, 0x8375, 0x8375, 0x8377, 0x8377, 0x837B, 0x837C, 0x8385, 0x8385, 0x8387, 0x8387, 0x8389, 0x838A, 0x838E, 0x838E,
+        0x8393, 0x8393, 0x8396, 0x8396, 0x839A, 0x839A, 0x839E, 0x83A0, 0x83A2, 0x83A2, 0x83A8, 0x83A8, 0x83AA, 0x83AB, 0x83B1, 0x83B1,
+        0x83B5, 0x83B5, 0x83BD, 0x83BD, 0x83C1, 0x83C1, 0x83C5, 0x83C5, 0x83CA, 0x83CA, 0x83CC, 0x83CC, 0x83CE, 0x83CE, 0x83D3, 0x83D3,
+        0x83D6, 0x83D6, 0x83D8, 0x83D8, 0x83DC, 0x83DC, 0x83DF, 0x83E0, 0x83E9, 0x83E9, 0x83EB, 0x83EB, 0x83EF, 0x83F2, 0x83F4, 0x83F4,
+        0x83F7, 0x83F7, 0x83FB, 0x83FB, 0x83FD, 0x83FD, 0x8403, 0x8404, 0x8407, 0x8407, 0x840B, 0x840E, 0x8413, 0x8413, 0x8420, 0x8420,
+        0x8422, 0x8422, 0x8429, 0x842A, 0x842C, 0x842C, 0x8431, 0x8431, 0x8435, 0x8435, 0x8438, 0x8438, 0x843C, 0x843D, 0x8446, 0x8446,
+        0x8449, 0x8449, 0x844E, 0x844E, 0x8457, 0x8457, 0x845B, 0x845B, 0x8461, 0x8463, 0x8466, 0x8466, 0x8469, 0x8469, 0x846B, 0x846F,
+        0x8471, 0x8471, 0x8475, 0x8475, 0x8477, 0x8477, 0x8479, 0x847A, 0x8482, 0x8482, 0x8484, 0x8484, 0x848B, 0x848B, 0x8490, 0x8490,
+        0x8494, 0x8494, 0x8499, 0x8499, 0x849C, 0x849C, 0x849F, 0x849F, 0x84A1, 0x84A1, 0x84AD, 0x84AD, 0x84B2, 0x84B2, 0x84B8, 0x84B9,
+        0x84BB, 0x84BC, 0x84BF, 0x84BF, 0x84C1, 0x84C1, 0x84C4, 0x84C4, 0x84C6, 0x84C6, 0x84C9, 0x84CB, 0x84CD, 0x84CD, 0x84D0, 0x84D1,
+        0x84D6, 0x84D6, 0x84D9, 0x84DA, 0x84EC, 0x84EC, 0x84EE, 0x84EE, 0x84F4, 0x84F4, 0x84FC, 0x84FC, 0x84FF, 0x8500, 0x8506, 0x8506,
+        0x8511, 0x8511, 0x8513, 0x8515, 0x8517, 0x8518, 0x851A, 0x851A, 0x851F, 0x851F, 0x8521, 0x8521, 0x8526, 0x8526, 0x852C, 0x852D,
+        0x8535, 0x8535, 0x853D, 0x853D, 0x8540, 0x8541, 0x8543, 0x8543, 0x8548, 0x854B, 0x854E, 0x854E, 0x8555, 0x8555, 0x8557, 0x8558,
+        0x855A, 0x855A, 0x8563, 0x8563, 0x8568, 0x856A, 0x856D, 0x856D, 0x8577, 0x8577, 0x857E, 0x857E, 0x8580, 0x8580, 0x8584, 0x8584,
+        0x8587, 0x8588, 0x858A, 0x858A, 0x8590, 0x8591, 0x8594, 0x8594, 0x8597, 0x8597, 0x8599, 0x8599, 0x859B, 0x859C, 0x85A4, 0x85A4,
+        0x85A6, 0x85A6, 0x85A8, 0x85AC, 0x85AE, 0x85AF, 0x85B9, 0x85BA, 0x85C1, 0x85C1, 0x85C9, 0x85C9, 0x85CD, 0x85CD, 0x85CF, 0x85D0,
+        0x85D5, 0x85D5, 0x85DC, 0x85DD, 0x85E4, 0x85E5, 0x85E9, 0x85EA, 0x85F7, 0x85F7, 0x85F9, 0x85FB, 0x85FE, 0x85FE, 0x8602, 0x8602,
+        0x8606, 0x8607, 0x860A, 0x860B, 0x8613, 0x8613, 0x8616, 0x8617, 0x861A, 0x861A, 0x8622, 0x8622, 0x862D, 0x862D, 0x862F, 0x8630,
+        0x863F, 0x863F, 0x864D, 0x864E, 0x8650, 0x8650, 0x8654, 0x8655, 0x865A, 0x865A, 0x865C, 0x865C, 0x865E, 0x865F, 0x8667, 0x8667,
+        0x866B, 0x866B, 0x8671, 0x8671, 0x8679, 0x8679, 0x867B, 0x867B, 0x868A, 0x868C, 0x8693, 0x8693, 0x8695, 0x8695, 0x86A3, 0x86A4,
+        0x86A9, 0x86AB, 0x86AF, 0x86B0, 0x86B6, 0x86B6, 0x86C4, 0x86C4, 0x86C6, 0x86C7, 0x86C9, 0x86C9, 0x86CB, 0x86CB, 0x86CD, 0x86CE,
+        0x86D4, 0x86D4, 0x86D9, 0x86D9, 0x86DB, 0x86DB, 0x86DE, 0x86DF, 0x86E4, 0x86E4, 0x86E9, 0x86E9, 0x86EC, 0x86EF, 0x86F8, 0x86F9,
+        0x86FB, 0x86FB, 0x86FE, 0x86FE, 0x8700, 0x8700, 0x8702, 0x8703, 0x8706, 0x8706, 0x8708, 0x870A, 0x870D, 0x870D, 0x8711, 0x8712,
+        0x8718, 0x8718, 0x871A, 0x871A, 0x871C, 0x871C, 0x8725, 0x8725, 0x8729, 0x8729, 0x8734, 0x8734, 0x8737, 0x8737, 0x873B, 0x873B,
+        0x873F, 0x873F, 0x8749, 0x8749, 0x874B, 0x874C, 0x874E, 0x874E, 0x8753, 0x8753, 0x8755, 0x8755, 0x8757, 0x8757, 0x8759, 0x8759,
+        0x875F, 0x8760, 0x8763, 0x8763, 0x8766, 0x8766, 0x8768, 0x8768, 0x876A, 0x876A, 0x876E, 0x876E, 0x8774, 0x8774, 0x8776, 0x8776,
+        0x8778, 0x8778, 0x877F, 0x877F, 0x8782, 0x8782, 0x878D, 0x878D, 0x879F, 0x879F, 0x87A2, 0x87A2, 0x87AB, 0x87AB, 0x87AF, 0x87AF,
+        0x87B3, 0x87B3, 0x87BA, 0x87BB, 0x87BD, 0x87BD, 0x87C0, 0x87C0, 0x87C4, 0x87C4, 0x87C6, 0x87C7, 0x87CB, 0x87CB, 0x87D0, 0x87D0,
+        0x87D2, 0x87D2, 0x87E0, 0x87E0, 0x87EF, 0x87EF, 0x87F2, 0x87F2, 0x87F6, 0x87F7, 0x87F9, 0x87F9, 0x87FB, 0x87FB, 0x87FE, 0x87FE,
+        0x8805, 0x8805, 0x880D, 0x880F, 0x8811, 0x8811, 0x8815, 0x8816, 0x8821, 0x8823, 0x8827, 0x8827, 0x8831, 0x8831, 0x8836, 0x8836,
+        0x8839, 0x8839, 0x883B, 0x883B, 0x8840, 0x8840, 0x8842, 0x8842, 0x8844, 0x8844, 0x8846, 0x8846, 0x884C, 0x884D, 0x8852, 0x8853,
+        0x8857, 0x8857, 0x8859, 0x8859, 0x885B, 0x885B, 0x885D, 0x885E, 0x8861, 0x8863, 0x8868, 0x8868, 0x886B, 0x886B, 0x8870, 0x8870,
+        0x8872, 0x8872, 0x8875, 0x8875, 0x8877, 0x8877, 0x887D, 0x887F, 0x8881, 0x8882, 0x8888, 0x8888, 0x888B, 0x888B, 0x888D, 0x888D,
+        0x8892, 0x8892, 0x8896, 0x8897, 0x8899, 0x8899, 0x889E, 0x889E, 0x88A2, 0x88A2, 0x88A4, 0x88A4, 0x88AB, 0x88AB, 0x88AE, 0x88AE,
+        0x88B0, 0x88B1, 0x88B4, 0x88B5, 0x88B7, 0x88B7, 0x88BF, 0x88BF, 0x88C1, 0x88C5, 0x88CF, 0x88CF, 0x88D4, 0x88D5, 0x88D8, 0x88D9,
+        0x88DC, 0x88DD, 0x88DF, 0x88DF, 0x88E1, 0x88E1, 0x88E8, 0x88E8, 0x88F2, 0x88F4, 0x88F8, 0x88F9, 0x88FC, 0x88FE, 0x8902, 0x8902,
+        0x8904, 0x8904, 0x8907, 0x8907, 0x890A, 0x890A, 0x890C, 0x890C, 0x8910, 0x8910, 0x8912, 0x8913, 0x891D, 0x891E, 0x8925, 0x8925,
+        0x892A, 0x892B, 0x8936, 0x8936, 0x8938, 0x8938, 0x893B, 0x893B, 0x8941, 0x8941, 0x8943, 0x8944, 0x894C, 0x894D, 0x8956, 0x8956,
+        0x895E, 0x8960, 0x8964, 0x8964, 0x8966, 0x8966, 0x896A, 0x896A, 0x896D, 0x896D, 0x896F, 0x896F, 0x8972, 0x8972, 0x8974, 0x8974,
+        0x8977, 0x8977, 0x897E, 0x897F, 0x8981, 0x8981, 0x8983, 0x8983, 0x8986, 0x8988, 0x898A, 0x898B, 0x898F, 0x898F, 0x8993, 0x8993,
+        0x8996, 0x8998, 0x899A, 0x899A, 0x89A1, 0x89A1, 0x89A6, 0x89A7, 0x89A9, 0x89AA, 0x89AC, 0x89AC, 0x89AF, 0x89AF, 0x89B2, 0x89B3,
+        0x89BA, 0x89BA, 0x89BD, 0x89BD, 0x89BF, 0x89C0, 0x89D2, 0x89D2, 0x89DA, 0x89DA, 0x89DC, 0x89DD, 0x89E3, 0x89E3, 0x89E6, 0x89E7,
+        0x89F4, 0x89F4, 0x89F8, 0x89F8, 0x8A00, 0x8A00, 0x8A02, 0x8A03, 0x8A08, 0x8A08, 0x8A0A, 0x8A0A, 0x8A0C, 0x8A0C, 0x8A0E, 0x8A0E,
+        0x8A10, 0x8A10, 0x8A13, 0x8A13, 0x8A16, 0x8A18, 0x8A1B, 0x8A1B, 0x8A1D, 0x8A1D, 0x8A1F, 0x8A1F, 0x8A23, 0x8A23, 0x8A25, 0x8A25,
+        0x8A2A, 0x8A2A, 0x8A2D, 0x8A2D, 0x8A31, 0x8A31, 0x8A33, 0x8A34, 0x8A36, 0x8A36, 0x8A3A, 0x8A3C, 0x8A41, 0x8A41, 0x8A46, 0x8A46,
+        0x8A48, 0x8A48, 0x8A50, 0x8A52, 0x8A54, 0x8A55, 0x8A5B, 0x8A5B, 0x8A5E, 0x8A5E, 0x8A60, 0x8A60, 0x8A62, 0x8A63, 0x8A66, 0x8A66,
+        0x8A69, 0x8A69, 0x8A6B, 0x8A6E, 0x8A70, 0x8A73, 0x8A7C, 0x8A7C, 0x8A82, 0x8A82, 0x8A84, 0x8A85, 0x8A87, 0x8A87, 0x8A89, 0x8A89,
+        0x8A8C, 0x8A8D, 0x8A91, 0x8A91, 0x8A93, 0x8A93, 0x8A95, 0x8A95, 0x8A98, 0x8A98, 0x8A9A, 0x8A9A, 0x8A9E, 0x8A9E, 0x8AA0, 0x8AA1,
+        0x8AA3, 0x8AA6, 0x8AA8, 0x8AA8, 0x8AAC, 0x8AAD, 0x8AB0, 0x8AB0, 0x8AB2, 0x8AB2, 0x8AB9, 0x8AB9, 0x8ABC, 0x8ABC, 0x8ABF, 0x8ABF,
+        0x8AC2, 0x8AC2, 0x8AC4, 0x8AC4, 0x8AC7, 0x8AC7, 0x8ACB, 0x8ACD, 0x8ACF, 0x8ACF, 0x8AD2, 0x8AD2, 0x8AD6, 0x8AD6, 0x8ADA, 0x8ADC,
+        0x8ADE, 0x8ADE, 0x8AE0, 0x8AE2, 0x8AE4, 0x8AE4, 0x8AE6, 0x8AE7, 0x8AEB, 0x8AEB, 0x8AED, 0x8AEE, 0x8AF1, 0x8AF1, 0x8AF3, 0x8AF3,
+        0x8AF7, 0x8AF8, 0x8AFA, 0x8AFA, 0x8AFE, 0x8AFE, 0x8B00, 0x8B02, 0x8B04, 0x8B04, 0x8B07, 0x8B07, 0x8B0C, 0x8B0C, 0x8B0E, 0x8B0E,
+        0x8B10, 0x8B10, 0x8B14, 0x8B14, 0x8B16, 0x8B17, 0x8B19, 0x8B1B, 0x8B1D, 0x8B1D, 0x8B20, 0x8B21, 0x8B26, 0x8B26, 0x8B28, 0x8B28,
+        0x8B2B, 0x8B2C, 0x8B33, 0x8B33, 0x8B39, 0x8B39, 0x8B3E, 0x8B3E, 0x8B41, 0x8B41, 0x8B49, 0x8B49, 0x8B4C, 0x8B4C, 0x8B4E, 0x8B4F,
+        0x8B56, 0x8B56, 0x8B58, 0x8B58, 0x8B5A, 0x8B5C, 0x8B5F, 0x8B5F, 0x8B66, 0x8B66, 0x8B6B, 0x8B6C, 0x8B6F, 0x8B72, 0x8B74, 0x8B74,
+        0x8B77, 0x8B77, 0x8B7D, 0x8B7D, 0x8B80, 0x8B80, 0x8B83, 0x8B83, 0x8B8A, 0x8B8A, 0x8B8C, 0x8B8C, 0x8B8E, 0x8B8E, 0x8B90, 0x8B90,
+        0x8B92, 0x8B93, 0x8B96, 0x8B96, 0x8B99, 0x8B9A, 0x8C37, 0x8C37, 0x8C3A, 0x8C3A, 0x8C3F, 0x8C3F, 0x8C41, 0x8C41, 0x8C46, 0x8C46,
+        0x8C48, 0x8C48, 0x8C4A, 0x8C4A, 0x8C4C, 0x8C4C, 0x8C4E, 0x8C4E, 0x8C50, 0x8C50, 0x8C55, 0x8C55, 0x8C5A, 0x8C5A, 0x8C61, 0x8C62,
+        0x8C6A, 0x8C6C, 0x8C78, 0x8C7A, 0x8C7C, 0x8C7C, 0x8C82, 0x8C82, 0x8C85, 0x8C85, 0x8C89, 0x8C8A, 0x8C8C, 0x8C8E, 0x8C94, 0x8C94,
+        0x8C98, 0x8C98, 0x8C9D, 0x8C9E, 0x8CA0, 0x8CA2, 0x8CA7, 0x8CB0, 0x8CB2, 0x8CB4, 0x8CB6, 0x8CB8, 0x8CBB, 0x8CBD, 0x8CBF, 0x8CC4,
+        0x8CC7, 0x8CC8, 0x8CCA, 0x8CCA, 0x8CCD, 0x8CCE, 0x8CD1, 0x8CD1, 0x8CD3, 0x8CD3, 0x8CDA, 0x8CDC, 0x8CDE, 0x8CDE, 0x8CE0, 0x8CE0,
+        0x8CE2, 0x8CE4, 0x8CE6, 0x8CE6, 0x8CEA, 0x8CEA, 0x8CED, 0x8CED, 0x8CFA, 0x8CFD, 0x8D04, 0x8D05, 0x8D07, 0x8D08, 0x8D0A, 0x8D0B,
+        0x8D0D, 0x8D0D, 0x8D0F, 0x8D10, 0x8D13, 0x8D14, 0x8D16, 0x8D16, 0x8D64, 0x8D64, 0x8D66, 0x8D67, 0x8D6B, 0x8D6B, 0x8D6D, 0x8D6D,
+        0x8D70, 0x8D71, 0x8D73, 0x8D74, 0x8D77, 0x8D77, 0x8D81, 0x8D81, 0x8D85, 0x8D85, 0x8D8A, 0x8D8A, 0x8D99, 0x8D99, 0x8DA3, 0x8DA3,
+        0x8DA8, 0x8DA8, 0x8DB3, 0x8DB3, 0x8DBA, 0x8DBA, 0x8DBE, 0x8DBE, 0x8DC2, 0x8DC2, 0x8DCB, 0x8DCC, 0x8DCF, 0x8DCF, 0x8DD6, 0x8DD6,
+        0x8DDA, 0x8DDB, 0x8DDD, 0x8DDD, 0x8DDF, 0x8DDF, 0x8DE1, 0x8DE1, 0x8DE3, 0x8DE3, 0x8DE8, 0x8DE8, 0x8DEA, 0x8DEB, 0x8DEF, 0x8DEF,
+        0x8DF3, 0x8DF3, 0x8DF5, 0x8DF5, 0x8DFC, 0x8DFC, 0x8DFF, 0x8DFF, 0x8E08, 0x8E0A, 0x8E0F, 0x8E10, 0x8E1D, 0x8E1F, 0x8E2A, 0x8E2A,
+        0x8E30, 0x8E30, 0x8E34, 0x8E35, 0x8E42, 0x8E42, 0x8E44, 0x8E44, 0x8E47, 0x8E4A, 0x8E4C, 0x8E4C, 0x8E50, 0x8E50, 0x8E55, 0x8E55,
+        0x8E59, 0x8E59, 0x8E5F, 0x8E60, 0x8E63, 0x8E64, 0x8E72, 0x8E72, 0x8E74, 0x8E74, 0x8E76, 0x8E76, 0x8E7C, 0x8E7C, 0x8E81, 0x8E81,
+        0x8E84, 0x8E85, 0x8E87, 0x8E87, 0x8E8A, 0x8E8B, 0x8E8D, 0x8E8D, 0x8E91, 0x8E91, 0x8E93, 0x8E94, 0x8E99, 0x8E99, 0x8EA1, 0x8EA1,
+        0x8EAA, 0x8EAC, 0x8EAF, 0x8EB1, 0x8EBE, 0x8EBE, 0x8EC5, 0x8EC6, 0x8EC8, 0x8EC8, 0x8ECA, 0x8ECD, 0x8ED2, 0x8ED2, 0x8EDB, 0x8EDB,
+        0x8EDF, 0x8EDF, 0x8EE2, 0x8EE3, 0x8EEB, 0x8EEB, 0x8EF8, 0x8EF8, 0x8EFB, 0x8EFE, 0x8F03, 0x8F03, 0x8F05, 0x8F05, 0x8F09, 0x8F0A,
+        0x8F0C, 0x8F0C, 0x8F12, 0x8F15, 0x8F19, 0x8F19, 0x8F1B, 0x8F1D, 0x8F1F, 0x8F1F, 0x8F26, 0x8F26, 0x8F29, 0x8F2A, 0x8F2F, 0x8F2F,
+        0x8F33, 0x8F33, 0x8F38, 0x8F39, 0x8F3B, 0x8F3B, 0x8F3E, 0x8F3F, 0x8F42, 0x8F42, 0x8F44, 0x8F46, 0x8F49, 0x8F49, 0x8F4C, 0x8F4E,
+        0x8F57, 0x8F57, 0x8F5C, 0x8F5C, 0x8F5F, 0x8F5F, 0x8F61, 0x8F64, 0x8F9B, 0x8F9C, 0x8F9E, 0x8F9F, 0x8FA3, 0x8FA3, 0x8FA7, 0x8FA8,
+        0x8FAD, 0x8FB2, 0x8FB7, 0x8FB7, 0x8FBA, 0x8FBC, 0x8FBF, 0x8FBF, 0x8FC2, 0x8FC2, 0x8FC4, 0x8FC5, 0x8FCE, 0x8FCE, 0x8FD1, 0x8FD1,
+        0x8FD4, 0x8FD4, 0x8FDA, 0x8FDA, 0x8FE2, 0x8FE2, 0x8FE5, 0x8FE6, 0x8FE9, 0x8FEB, 0x8FED, 0x8FED, 0x8FEF, 0x8FF0, 0x8FF4, 0x8FF4,
+        0x8FF7, 0x8FFA, 0x8FFD, 0x8FFD, 0x9000, 0x9001, 0x9003, 0x9003, 0x9005, 0x9006, 0x900B, 0x900B, 0x900D, 0x9011, 0x9013, 0x9017,
+        0x9019, 0x901A, 0x901D, 0x9023, 0x9027, 0x9027, 0x902E, 0x902E, 0x9031, 0x9032, 0x9035, 0x9036, 0x9038, 0x9039, 0x903C, 0x903C,
+        0x903E, 0x903E, 0x9041, 0x9042, 0x9045, 0x9045, 0x9047, 0x9047, 0x9049, 0x904B, 0x904D, 0x9056, 0x9058, 0x9059, 0x905C, 0x905C,
+        0x905E, 0x905E, 0x9060, 0x9061, 0x9063, 0x9063, 0x9065, 0x9065, 0x9068, 0x9069, 0x906D, 0x906F, 0x9072, 0x9072, 0x9075, 0x9078,
+        0x907A, 0x907A, 0x907C, 0x907D, 0x907F, 0x9084, 0x9087, 0x9087, 0x9089, 0x908A, 0x908F, 0x908F, 0x9091, 0x9091, 0x90A3, 0x90A3,
+        0x90A6, 0x90A6, 0x90A8, 0x90A8, 0x90AA, 0x90AA, 0x90AF, 0x90AF, 0x90B1, 0x90B1, 0x90B5, 0x90B5, 0x90B8, 0x90B8, 0x90C1, 0x90C1,
+        0x90CA, 0x90CA, 0x90CE, 0x90CE, 0x90DB, 0x90DB, 0x90E1, 0x90E2, 0x90E4, 0x90E4, 0x90E8, 0x90E8, 0x90ED, 0x90ED, 0x90F5, 0x90F5,
+        0x90F7, 0x90F7, 0x90FD, 0x90FD, 0x9102, 0x9102, 0x9112, 0x9112, 0x9119, 0x9119, 0x912D, 0x912D, 0x9130, 0x9130, 0x9132, 0x9132,
+        0x9149, 0x914E, 0x9152, 0x9152, 0x9154, 0x9154, 0x9156, 0x9156, 0x9158, 0x9158, 0x9162, 0x9163, 0x9165, 0x9165, 0x9169, 0x916A,
+        0x916C, 0x916C, 0x9172, 0x9173, 0x9175, 0x9175, 0x9177, 0x9178, 0x9182, 0x9182, 0x9187, 0x9187, 0x9189, 0x9189, 0x918B, 0x918B,
+        0x918D, 0x918D, 0x9190, 0x9190, 0x9192, 0x9192, 0x9197, 0x9197, 0x919C, 0x919C, 0x91A2, 0x91A2, 0x91A4, 0x91A4, 0x91AA, 0x91AB,
+        0x91AF, 0x91AF, 0x91B4, 0x91B5, 0x91B8, 0x91B8, 0x91BA, 0x91BA, 0x91C0, 0x91C1, 0x91C6, 0x91C9, 0x91CB, 0x91D1, 0x91D6, 0x91D6,
+        0x91D8, 0x91D8, 0x91DB, 0x91DD, 0x91DF, 0x91DF, 0x91E1, 0x91E1, 0x91E3, 0x91E3, 0x91E6, 0x91E7, 0x91F5, 0x91F6, 0x91FC, 0x91FC,
+        0x91FF, 0x91FF, 0x920D, 0x920E, 0x9211, 0x9211, 0x9214, 0x9215, 0x921E, 0x921E, 0x9229, 0x9229, 0x922C, 0x922C, 0x9234, 0x9234,
+        0x9237, 0x9237, 0x923F, 0x923F, 0x9244, 0x9245, 0x9248, 0x9249, 0x924B, 0x924B, 0x9250, 0x9250, 0x9257, 0x9257, 0x925A, 0x925B,
+        0x925E, 0x925E, 0x9262, 0x9262, 0x9264, 0x9264, 0x9266, 0x9266, 0x9271, 0x9271, 0x927E, 0x927E, 0x9280, 0x9280, 0x9283, 0x9283,
+        0x9285, 0x9285, 0x9291, 0x9291, 0x9293, 0x9293, 0x9295, 0x9296, 0x9298, 0x9298, 0x929A, 0x929C, 0x92AD, 0x92AD, 0x92B7, 0x92B7,
+        0x92B9, 0x92B9, 0x92CF, 0x92CF, 0x92D2, 0x92D2, 0x92E4, 0x92E4, 0x92E9, 0x92EA, 0x92ED, 0x92ED, 0x92F2, 0x92F3, 0x92F8, 0x92F8,
+        0x92FA, 0x92FA, 0x92FC, 0x92FC, 0x9306, 0x9306, 0x930F, 0x9310, 0x9318, 0x931A, 0x9320, 0x9320, 0x9322, 0x9323, 0x9326, 0x9326,
+        0x9328, 0x9328, 0x932B, 0x932C, 0x932E, 0x932F, 0x9332, 0x9332, 0x9335, 0x9335, 0x933A, 0x933B, 0x9344, 0x9344, 0x934B, 0x934B,
+        0x934D, 0x934D, 0x9354, 0x9354, 0x9356, 0x9356, 0x935B, 0x935C, 0x9360, 0x9360, 0x936C, 0x936C, 0x936E, 0x936E, 0x9375, 0x9375,
+        0x937C, 0x937C, 0x937E, 0x937E, 0x938C, 0x938C, 0x9394, 0x9394, 0x9396, 0x9397, 0x939A, 0x939A, 0x93A7, 0x93A7, 0x93AC, 0x93AE,
+        0x93B0, 0x93B0, 0x93B9, 0x93B9, 0x93C3, 0x93C3, 0x93C8, 0x93C8, 0x93D0, 0x93D1, 0x93D6, 0x93D8, 0x93DD, 0x93DD, 0x93E1, 0x93E1,
+        0x93E4, 0x93E5, 0x93E8, 0x93E8, 0x9403, 0x9403, 0x9407, 0x9407, 0x9410, 0x9410, 0x9413, 0x9414, 0x9418, 0x941A, 0x9421, 0x9421,
+        0x942B, 0x942B, 0x9435, 0x9436, 0x9438, 0x9438, 0x943A, 0x943A, 0x9441, 0x9441, 0x9444, 0x9444, 0x9451, 0x9453, 0x945A, 0x945B,
+        0x945E, 0x945E, 0x9460, 0x9460, 0x9462, 0x9462, 0x946A, 0x946A, 0x9470, 0x9470, 0x9475, 0x9475, 0x9477, 0x9477, 0x947C, 0x947F,
+        0x9481, 0x9481, 0x9577, 0x9577, 0x9580, 0x9580, 0x9582, 0x9583, 0x9587, 0x9587, 0x9589, 0x958B, 0x958F, 0x958F, 0x9591, 0x9591,
+        0x9593, 0x9594, 0x9596, 0x9596, 0x9598, 0x9599, 0x95A0, 0x95A0, 0x95A2, 0x95A5, 0x95A7, 0x95A8, 0x95AD, 0x95AD, 0x95B2, 0x95B2,
+        0x95B9, 0x95B9, 0x95BB, 0x95BC, 0x95BE, 0x95BE, 0x95C3, 0x95C3, 0x95C7, 0x95C7, 0x95CA, 0x95CA, 0x95CC, 0x95CD, 0x95D4, 0x95D6,
+        0x95D8, 0x95D8, 0x95DC, 0x95DC, 0x95E1, 0x95E2, 0x95E5, 0x95E5, 0x961C, 0x961C, 0x9621, 0x9621, 0x9628, 0x9628, 0x962A, 0x962A,
+        0x962E, 0x962F, 0x9632, 0x9632, 0x963B, 0x963B, 0x963F, 0x9640, 0x9642, 0x9642, 0x9644, 0x9644, 0x964B, 0x964D, 0x964F, 0x9650,
+        0x965B, 0x965F, 0x9662, 0x9666, 0x966A, 0x966A, 0x966C, 0x966C, 0x9670, 0x9670, 0x9672, 0x9673, 0x9675, 0x9678, 0x967A, 0x967A,
+        0x967D, 0x967D, 0x9685, 0x9686, 0x9688, 0x9688, 0x968A, 0x968B, 0x968D, 0x968F, 0x9694, 0x9695, 0x9697, 0x9699, 0x969B, 0x969C,
+        0x96A0, 0x96A0, 0x96A3, 0x96A3, 0x96A7, 0x96A8, 0x96AA, 0x96AA, 0x96B0, 0x96B2, 0x96B4, 0x96B4, 0x96B6, 0x96B9, 0x96BB, 0x96BC,
+        0x96C0, 0x96C1, 0x96C4, 0x96C7, 0x96C9, 0x96C9, 0x96CB, 0x96CE, 0x96D1, 0x96D1, 0x96D5, 0x96D6, 0x96D9, 0x96D9, 0x96DB, 0x96DC,
+        0x96E2, 0x96E3, 0x96E8, 0x96E8, 0x96EA, 0x96EB, 0x96F0, 0x96F0, 0x96F2, 0x96F2, 0x96F6, 0x96F7, 0x96F9, 0x96F9, 0x96FB, 0x96FB,
+        0x9700, 0x9700, 0x9704, 0x9704, 0x9706, 0x9708, 0x970A, 0x970A, 0x970D, 0x970F, 0x9711, 0x9711, 0x9713, 0x9713, 0x9716, 0x9716,
+        0x9719, 0x9719, 0x971C, 0x971C, 0x971E, 0x971E, 0x9724, 0x9724, 0x9727, 0x9727, 0x972A, 0x972A, 0x9730, 0x9730, 0x9732, 0x9732,
+        0x9738, 0x9739, 0x973D, 0x973E, 0x9742, 0x9742, 0x9744, 0x9744, 0x9746, 0x9746, 0x9748, 0x9749, 0x9752, 0x9752, 0x9756, 0x9756,
+        0x9759, 0x9759, 0x975C, 0x975C, 0x975E, 0x975E, 0x9760, 0x9762, 0x9764, 0x9764, 0x9766, 0x9766, 0x9768, 0x9769, 0x976B, 0x976B,
+        0x976D, 0x976D, 0x9771, 0x9771, 0x9774, 0x9774, 0x9779, 0x977A, 0x977C, 0x977C, 0x9781, 0x9781, 0x9784, 0x9786, 0x978B, 0x978B,
+        0x978D, 0x978D, 0x978F, 0x9790, 0x9798, 0x9798, 0x979C, 0x979C, 0x97A0, 0x97A0, 0x97A3, 0x97A3, 0x97A6, 0x97A6, 0x97A8, 0x97A8,
+        0x97AB, 0x97AB, 0x97AD, 0x97AD, 0x97B3, 0x97B4, 0x97C3, 0x97C3, 0x97C6, 0x97C6, 0x97C8, 0x97C8, 0x97CB, 0x97CB, 0x97D3, 0x97D3,
+        0x97DC, 0x97DC, 0x97ED, 0x97EE, 0x97F2, 0x97F3, 0x97F5, 0x97F6, 0x97FB, 0x97FB, 0x97FF, 0x97FF, 0x9801, 0x9803, 0x9805, 0x9806,
+        0x9808, 0x9808, 0x980C, 0x980C, 0x980F, 0x9813, 0x9817, 0x9818, 0x981A, 0x981A, 0x9821, 0x9821, 0x9824, 0x9824, 0x982C, 0x982D,
+        0x9834, 0x9834, 0x9837, 0x9838, 0x983B, 0x983D, 0x9846, 0x9846, 0x984B, 0x984F, 0x9854, 0x9855, 0x9858, 0x9858, 0x985B, 0x985B,
+        0x985E, 0x985E, 0x9867, 0x9867, 0x986B, 0x986B, 0x986F, 0x9871, 0x9873, 0x9874, 0x98A8, 0x98A8, 0x98AA, 0x98AA, 0x98AF, 0x98AF,
+        0x98B1, 0x98B1, 0x98B6, 0x98B6, 0x98C3, 0x98C4, 0x98C6, 0x98C6, 0x98DB, 0x98DC, 0x98DF, 0x98DF, 0x98E2, 0x98E2, 0x98E9, 0x98E9,
+        0x98EB, 0x98EB, 0x98ED, 0x98EF, 0x98F2, 0x98F2, 0x98F4, 0x98F4, 0x98FC, 0x98FE, 0x9903, 0x9903, 0x9905, 0x9905, 0x9909, 0x990A,
+        0x990C, 0x990C, 0x9910, 0x9910, 0x9912, 0x9914, 0x9918, 0x9918, 0x991D, 0x991E, 0x9920, 0x9921, 0x9924, 0x9924, 0x9928, 0x9928,
+        0x992C, 0x992C, 0x992E, 0x992E, 0x993D, 0x993E, 0x9942, 0x9942, 0x9945, 0x9945, 0x9949, 0x9949, 0x994B, 0x994C, 0x9950, 0x9952,
+        0x9955, 0x9955, 0x9957, 0x9957, 0x9996, 0x9999, 0x99A5, 0x99A5, 0x99A8, 0x99A8, 0x99AC, 0x99AE, 0x99B3, 0x99B4, 0x99BC, 0x99BC,
+        0x99C1, 0x99C1, 0x99C4, 0x99C6, 0x99C8, 0x99C8, 0x99D0, 0x99D2, 0x99D5, 0x99D5, 0x99D8, 0x99D8, 0x99DB, 0x99DB, 0x99DD, 0x99DD,
+        0x99DF, 0x99DF, 0x99E2, 0x99E2, 0x99ED, 0x99EE, 0x99F1, 0x99F2, 0x99F8, 0x99F8, 0x99FB, 0x99FB, 0x99FF, 0x99FF, 0x9A01, 0x9A01,
+        0x9A05, 0x9A05, 0x9A0E, 0x9A0F, 0x9A12, 0x9A13, 0x9A19, 0x9A19, 0x9A28, 0x9A28, 0x9A2B, 0x9A2B, 0x9A30, 0x9A30, 0x9A37, 0x9A37,
+        0x9A3E, 0x9A3E, 0x9A40, 0x9A40, 0x9A42, 0x9A43, 0x9A45, 0x9A45, 0x9A4D, 0x9A4D, 0x9A55, 0x9A55, 0x9A57, 0x9A57, 0x9A5A, 0x9A5B,
+        0x9A5F, 0x9A5F, 0x9A62, 0x9A62, 0x9A64, 0x9A65, 0x9A69, 0x9A6B, 0x9AA8, 0x9AA8, 0x9AAD, 0x9AAD, 0x9AB0, 0x9AB0, 0x9AB8, 0x9AB8,
+        0x9ABC, 0x9ABC, 0x9AC0, 0x9AC0, 0x9AC4, 0x9AC4, 0x9ACF, 0x9ACF, 0x9AD1, 0x9AD1, 0x9AD3, 0x9AD4, 0x9AD8, 0x9AD8, 0x9ADE, 0x9ADF,
+        0x9AE2, 0x9AE3, 0x9AE6, 0x9AE6, 0x9AEA, 0x9AEB, 0x9AED, 0x9AEF, 0x9AF1, 0x9AF1, 0x9AF4, 0x9AF4, 0x9AF7, 0x9AF7, 0x9AFB, 0x9AFB,
+        0x9B06, 0x9B06, 0x9B18, 0x9B18, 0x9B1A, 0x9B1A, 0x9B1F, 0x9B1F, 0x9B22, 0x9B23, 0x9B25, 0x9B25, 0x9B27, 0x9B2A, 0x9B2E, 0x9B2F,
+        0x9B31, 0x9B32, 0x9B3B, 0x9B3C, 0x9B41, 0x9B45, 0x9B4D, 0x9B4F, 0x9B51, 0x9B51, 0x9B54, 0x9B54, 0x9B58, 0x9B58, 0x9B5A, 0x9B5A,
+        0x9B6F, 0x9B6F, 0x9B74, 0x9B74, 0x9B83, 0x9B83, 0x9B8E, 0x9B8E, 0x9B91, 0x9B93, 0x9B96, 0x9B97, 0x9B9F, 0x9BA0, 0x9BA8, 0x9BA8,
+        0x9BAA, 0x9BAB, 0x9BAD, 0x9BAE, 0x9BB4, 0x9BB4, 0x9BB9, 0x9BB9, 0x9BC0, 0x9BC0, 0x9BC6, 0x9BC6, 0x9BC9, 0x9BCA, 0x9BCF, 0x9BCF,
+        0x9BD1, 0x9BD2, 0x9BD4, 0x9BD4, 0x9BD6, 0x9BD6, 0x9BDB, 0x9BDB, 0x9BE1, 0x9BE4, 0x9BE8, 0x9BE8, 0x9BF0, 0x9BF2, 0x9BF5, 0x9BF5,
+        0x9C04, 0x9C04, 0x9C06, 0x9C06, 0x9C08, 0x9C0A, 0x9C0C, 0x9C0D, 0x9C10, 0x9C10, 0x9C12, 0x9C15, 0x9C1B, 0x9C1B, 0x9C21, 0x9C21,
+        0x9C24, 0x9C25, 0x9C2D, 0x9C30, 0x9C32, 0x9C32, 0x9C39, 0x9C3B, 0x9C3E, 0x9C3E, 0x9C46, 0x9C48, 0x9C52, 0x9C52, 0x9C57, 0x9C57,
+        0x9C5A, 0x9C5A, 0x9C60, 0x9C60, 0x9C67, 0x9C67, 0x9C76, 0x9C76, 0x9C78, 0x9C78, 0x9CE5, 0x9CE5, 0x9CE7, 0x9CE7, 0x9CE9, 0x9CE9,
+        0x9CEB, 0x9CEC, 0x9CF0, 0x9CF0, 0x9CF3, 0x9CF4, 0x9CF6, 0x9CF6, 0x9D03, 0x9D03, 0x9D06, 0x9D09, 0x9D0E, 0x9D0E, 0x9D12, 0x9D12,
+        0x9D15, 0x9D15, 0x9D1B, 0x9D1B, 0x9D1F, 0x9D1F, 0x9D23, 0x9D23, 0x9D26, 0x9D26, 0x9D28, 0x9D28, 0x9D2A, 0x9D2C, 0x9D3B, 0x9D3B,
+        0x9D3E, 0x9D3F, 0x9D41, 0x9D41, 0x9D44, 0x9D44, 0x9D46, 0x9D46, 0x9D48, 0x9D48, 0x9D50, 0x9D51, 0x9D59, 0x9D59, 0x9D5C, 0x9D5E,
+        0x9D60, 0x9D61, 0x9D64, 0x9D64, 0x9D6C, 0x9D6C, 0x9D6F, 0x9D6F, 0x9D72, 0x9D72, 0x9D7A, 0x9D7A, 0x9D87, 0x9D87, 0x9D89, 0x9D89,
+        0x9D8F, 0x9D8F, 0x9D9A, 0x9D9A, 0x9DA4, 0x9DA4, 0x9DA9, 0x9DA9, 0x9DAB, 0x9DAB, 0x9DAF, 0x9DAF, 0x9DB2, 0x9DB2, 0x9DB4, 0x9DB4,
+        0x9DB8, 0x9DB8, 0x9DBA, 0x9DBB, 0x9DC1, 0x9DC2, 0x9DC4, 0x9DC4, 0x9DC6, 0x9DC6, 0x9DCF, 0x9DCF, 0x9DD3, 0x9DD3, 0x9DD9, 0x9DD9,
+        0x9DE6, 0x9DE6, 0x9DED, 0x9DED, 0x9DEF, 0x9DEF, 0x9DF2, 0x9DF2, 0x9DF8, 0x9DFA, 0x9DFD, 0x9DFD, 0x9E1A, 0x9E1B, 0x9E1E, 0x9E1E,
+        0x9E75, 0x9E75, 0x9E78, 0x9E79, 0x9E7D, 0x9E7D, 0x9E7F, 0x9E7F, 0x9E81, 0x9E81, 0x9E88, 0x9E88, 0x9E8B, 0x9E8C, 0x9E91, 0x9E93,
+        0x9E95, 0x9E95, 0x9E97, 0x9E97, 0x9E9D, 0x9E9D, 0x9E9F, 0x9E9F, 0x9EA5, 0x9EA6, 0x9EA9, 0x9EAA, 0x9EAD, 0x9EAD, 0x9EB8, 0x9EBC,
+        0x9EBE, 0x9EBF, 0x9EC4, 0x9EC4, 0x9ECC, 0x9ED0, 0x9ED2, 0x9ED2, 0x9ED4, 0x9ED4, 0x9ED8, 0x9ED9, 0x9EDB, 0x9EDE, 0x9EE0, 0x9EE0,
+        0x9EE5, 0x9EE5, 0x9EE8, 0x9EE8, 0x9EEF, 0x9EEF, 0x9EF4, 0x9EF4, 0x9EF6, 0x9EF7, 0x9EF9, 0x9EF9, 0x9EFB, 0x9EFD, 0x9F07, 0x9F08,
+        0x9F0E, 0x9F0E, 0x9F13, 0x9F13, 0x9F15, 0x9F15, 0x9F20, 0x9F21, 0x9F2C, 0x9F2C, 0x9F3B, 0x9F3B, 0x9F3E, 0x9F3E, 0x9F4A, 0x9F4B,
+        0x9F4E, 0x9F4F, 0x9F52, 0x9F52, 0x9F54, 0x9F54, 0x9F5F, 0x9F63, 0x9F66, 0x9F67, 0x9F6A, 0x9F6A, 0x9F6C, 0x9F6C, 0x9F72, 0x9F72,
+        0x9F76, 0x9F77, 0x9F8D, 0x9F8D, 0x9F95, 0x9F95, 0x9F9C, 0x9F9D, 0x9FA0, 0x9FA0, 0xFF01, 0xFF01, 0xFF03, 0xFF06, 0xFF08, 0xFF0C,
+        0xFF0E, 0xFF3B, 0xFF3D, 0xFF5D, 0xFF61, 0xFF9F, 0xFFE3, 0xFFE3, 0xFFE5, 0xFFE5, 0xFFFF, 0xFFFF, 0,
+    };
 }
diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs
index 881ab2108..c34d047d9 100644
--- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs
+++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs
@@ -3,369 +3,368 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace Dalamud.Interface.ImGuiFileDialog
+namespace Dalamud.Interface.ImGuiFileDialog;
+
+/// <summary>
+/// A file or folder picker.
+/// </summary>
+public partial class FileDialog
 {
-    /// <summary>
-    /// A file or folder picker.
-    /// </summary>
-    public partial class FileDialog
+    private readonly object filesLock = new();
+
+    private List<FileStruct> files = new();
+    private List<FileStruct> filteredFiles = new();
+
+    private SortingField currentSortingField = SortingField.FileName;
+    private bool[] sortDescending = new[] { false, false, false, false };
+
+    private enum FileStructType
     {
-        private readonly object filesLock = new();
+        File,
+        Directory,
+    }
 
-        private List<FileStruct> files = new();
-        private List<FileStruct> filteredFiles = new();
+    private enum SortingField
+    {
+        None,
+        FileName,
+        Type,
+        Size,
+        Date,
+    }
 
-        private SortingField currentSortingField = SortingField.FileName;
-        private bool[] sortDescending = new[] { false, false, false, false };
-
-        private enum FileStructType
+    private static string ComposeNewPath(List<string> decomp)
+    {
+        if (decomp.Count == 1)
         {
-            File,
-            Directory,
-        }
-
-        private enum SortingField
-        {
-            None,
-            FileName,
-            Type,
-            Size,
-            Date,
-        }
-
-        private static string ComposeNewPath(List<string> decomp)
-        {
-            if (decomp.Count == 1)
-            {
-                var drivePath = decomp[0];
-                if (drivePath[^1] != Path.DirectorySeparatorChar)
-                { // turn C: into C:\
-                    drivePath += Path.DirectorySeparatorChar;
-                }
-
-                return drivePath;
+            var drivePath = decomp[0];
+            if (drivePath[^1] != Path.DirectorySeparatorChar)
+            { // turn C: into C:\
+                drivePath += Path.DirectorySeparatorChar;
             }
 
-            return Path.Combine(decomp.ToArray());
+            return drivePath;
         }
 
-        private static FileStruct GetFile(FileInfo file, string path)
+        return Path.Combine(decomp.ToArray());
+    }
+
+    private static FileStruct GetFile(FileInfo file, string path)
+    {
+        return new FileStruct
         {
-            return new FileStruct
-            {
-                FileName = file.Name,
-                FilePath = path,
-                FileModifiedDate = FormatModifiedDate(file.LastWriteTime),
-                FileSize = file.Length,
-                FormattedFileSize = BytesToString(file.Length),
-                Type = FileStructType.File,
-                Ext = file.Extension.Trim('.'),
-            };
+            FileName = file.Name,
+            FilePath = path,
+            FileModifiedDate = FormatModifiedDate(file.LastWriteTime),
+            FileSize = file.Length,
+            FormattedFileSize = BytesToString(file.Length),
+            Type = FileStructType.File,
+            Ext = file.Extension.Trim('.'),
+        };
+    }
+
+    private static FileStruct GetDir(DirectoryInfo dir, string path)
+    {
+        return new FileStruct
+        {
+            FileName = dir.Name,
+            FilePath = path,
+            FileModifiedDate = FormatModifiedDate(dir.LastWriteTime),
+            FileSize = 0,
+            FormattedFileSize = string.Empty,
+            Type = FileStructType.Directory,
+            Ext = string.Empty,
+        };
+    }
+
+    private static int SortByFileNameDesc(FileStruct a, FileStruct b)
+    {
+        if (a.FileName[0] == '.' && b.FileName[0] != '.')
+        {
+            return 1;
         }
 
-        private static FileStruct GetDir(DirectoryInfo dir, string path)
+        if (a.FileName[0] != '.' && b.FileName[0] == '.')
         {
-            return new FileStruct
-            {
-                FileName = dir.Name,
-                FilePath = path,
-                FileModifiedDate = FormatModifiedDate(dir.LastWriteTime),
-                FileSize = 0,
-                FormattedFileSize = string.Empty,
-                Type = FileStructType.Directory,
-                Ext = string.Empty,
-            };
+            return -1;
         }
 
-        private static int SortByFileNameDesc(FileStruct a, FileStruct b)
+        if (a.FileName[0] == '.' && b.FileName[0] == '.')
         {
-            if (a.FileName[0] == '.' && b.FileName[0] != '.')
-            {
-                return 1;
-            }
-
-            if (a.FileName[0] != '.' && b.FileName[0] == '.')
+            if (a.FileName.Length == 1)
             {
                 return -1;
             }
 
-            if (a.FileName[0] == '.' && b.FileName[0] == '.')
-            {
-                if (a.FileName.Length == 1)
-                {
-                    return -1;
-                }
-
-                if (b.FileName.Length == 1)
-                {
-                    return 1;
-                }
-
-                return -1 * string.Compare(a.FileName[1..], b.FileName[1..]);
-            }
-
-            if (a.Type != b.Type)
-            {
-                return a.Type == FileStructType.Directory ? 1 : -1;
-            }
-
-            return -1 * string.Compare(a.FileName, b.FileName);
-        }
-
-        private static int SortByFileNameAsc(FileStruct a, FileStruct b)
-        {
-            if (a.FileName[0] == '.' && b.FileName[0] != '.')
-            {
-                return -1;
-            }
-
-            if (a.FileName[0] != '.' && b.FileName[0] == '.')
+            if (b.FileName.Length == 1)
             {
                 return 1;
             }
 
-            if (a.FileName[0] == '.' && b.FileName[0] == '.')
+            return -1 * string.Compare(a.FileName[1..], b.FileName[1..]);
+        }
+
+        if (a.Type != b.Type)
+        {
+            return a.Type == FileStructType.Directory ? 1 : -1;
+        }
+
+        return -1 * string.Compare(a.FileName, b.FileName);
+    }
+
+    private static int SortByFileNameAsc(FileStruct a, FileStruct b)
+    {
+        if (a.FileName[0] == '.' && b.FileName[0] != '.')
+        {
+            return -1;
+        }
+
+        if (a.FileName[0] != '.' && b.FileName[0] == '.')
+        {
+            return 1;
+        }
+
+        if (a.FileName[0] == '.' && b.FileName[0] == '.')
+        {
+            if (a.FileName.Length == 1)
             {
-                if (a.FileName.Length == 1)
+                return 1;
+            }
+
+            if (b.FileName.Length == 1)
+            {
+                return -1;
+            }
+
+            return string.Compare(a.FileName[1..], b.FileName[1..]);
+        }
+
+        if (a.Type != b.Type)
+        {
+            return a.Type == FileStructType.Directory ? -1 : 1;
+        }
+
+        return string.Compare(a.FileName, b.FileName);
+    }
+
+    private static int SortByTypeDesc(FileStruct a, FileStruct b)
+    {
+        if (a.Type != b.Type)
+        {
+            return (a.Type == FileStructType.Directory) ? 1 : -1;
+        }
+
+        return string.Compare(a.Ext, b.Ext);
+    }
+
+    private static int SortByTypeAsc(FileStruct a, FileStruct b)
+    {
+        if (a.Type != b.Type)
+        {
+            return (a.Type == FileStructType.Directory) ? -1 : 1;
+        }
+
+        return -1 * string.Compare(a.Ext, b.Ext);
+    }
+
+    private static int SortBySizeDesc(FileStruct a, FileStruct b)
+    {
+        if (a.Type != b.Type)
+        {
+            return (a.Type == FileStructType.Directory) ? 1 : -1;
+        }
+
+        return (a.FileSize > b.FileSize) ? 1 : -1;
+    }
+
+    private static int SortBySizeAsc(FileStruct a, FileStruct b)
+    {
+        if (a.Type != b.Type)
+        {
+            return (a.Type == FileStructType.Directory) ? -1 : 1;
+        }
+
+        return (a.FileSize > b.FileSize) ? -1 : 1;
+    }
+
+    private static int SortByDateDesc(FileStruct a, FileStruct b)
+    {
+        if (a.Type != b.Type)
+        {
+            return (a.Type == FileStructType.Directory) ? 1 : -1;
+        }
+
+        return string.Compare(a.FileModifiedDate, b.FileModifiedDate);
+    }
+
+    private static int SortByDateAsc(FileStruct a, FileStruct b)
+    {
+        if (a.Type != b.Type)
+        {
+            return (a.Type == FileStructType.Directory) ? -1 : 1;
+        }
+
+        return -1 * string.Compare(a.FileModifiedDate, b.FileModifiedDate);
+    }
+
+    private bool CreateDir(string dirPath)
+    {
+        var newPath = Path.Combine(this.currentPath, dirPath);
+        if (string.IsNullOrEmpty(newPath))
+        {
+            return false;
+        }
+
+        Directory.CreateDirectory(newPath);
+        return true;
+    }
+
+    private void ScanDir(string path)
+    {
+        if (!Directory.Exists(path))
+        {
+            return;
+        }
+
+        if (this.pathDecomposition.Count == 0)
+        {
+            this.SetCurrentDir(path);
+        }
+
+        if (this.pathDecomposition.Count > 0)
+        {
+            this.files.Clear();
+
+            if (this.pathDecomposition.Count > 1)
+            {
+                this.files.Add(new FileStruct
                 {
-                    return 1;
+                    Type = FileStructType.Directory,
+                    FilePath = path,
+                    FileName = "..",
+                    FileSize = 0,
+                    FileModifiedDate = string.Empty,
+                    FormattedFileSize = string.Empty,
+                    Ext = string.Empty,
+                });
+            }
+
+            var dirInfo = new DirectoryInfo(path);
+
+            var dontShowHidden = this.flags.HasFlag(ImGuiFileDialogFlags.DontShowHiddenFiles);
+
+            foreach (var dir in dirInfo.EnumerateDirectories().OrderBy(d => d.Name))
+            {
+                if (string.IsNullOrEmpty(dir.Name))
+                {
+                    continue;
                 }
 
-                if (b.FileName.Length == 1)
+                if (dontShowHidden && dir.Name[0] == '.')
                 {
-                    return -1;
+                    continue;
                 }
 
-                return string.Compare(a.FileName[1..], b.FileName[1..]);
+                this.files.Add(GetDir(dir, path));
             }
 
-            if (a.Type != b.Type)
+            foreach (var file in dirInfo.EnumerateFiles().OrderBy(f => f.Name))
             {
-                return a.Type == FileStructType.Directory ? -1 : 1;
-            }
-
-            return string.Compare(a.FileName, b.FileName);
-        }
-
-        private static int SortByTypeDesc(FileStruct a, FileStruct b)
-        {
-            if (a.Type != b.Type)
-            {
-                return (a.Type == FileStructType.Directory) ? 1 : -1;
-            }
-
-            return string.Compare(a.Ext, b.Ext);
-        }
-
-        private static int SortByTypeAsc(FileStruct a, FileStruct b)
-        {
-            if (a.Type != b.Type)
-            {
-                return (a.Type == FileStructType.Directory) ? -1 : 1;
-            }
-
-            return -1 * string.Compare(a.Ext, b.Ext);
-        }
-
-        private static int SortBySizeDesc(FileStruct a, FileStruct b)
-        {
-            if (a.Type != b.Type)
-            {
-                return (a.Type == FileStructType.Directory) ? 1 : -1;
-            }
-
-            return (a.FileSize > b.FileSize) ? 1 : -1;
-        }
-
-        private static int SortBySizeAsc(FileStruct a, FileStruct b)
-        {
-            if (a.Type != b.Type)
-            {
-                return (a.Type == FileStructType.Directory) ? -1 : 1;
-            }
-
-            return (a.FileSize > b.FileSize) ? -1 : 1;
-        }
-
-        private static int SortByDateDesc(FileStruct a, FileStruct b)
-        {
-            if (a.Type != b.Type)
-            {
-                return (a.Type == FileStructType.Directory) ? 1 : -1;
-            }
-
-            return string.Compare(a.FileModifiedDate, b.FileModifiedDate);
-        }
-
-        private static int SortByDateAsc(FileStruct a, FileStruct b)
-        {
-            if (a.Type != b.Type)
-            {
-                return (a.Type == FileStructType.Directory) ? -1 : 1;
-            }
-
-            return -1 * string.Compare(a.FileModifiedDate, b.FileModifiedDate);
-        }
-
-        private bool CreateDir(string dirPath)
-        {
-            var newPath = Path.Combine(this.currentPath, dirPath);
-            if (string.IsNullOrEmpty(newPath))
-            {
-                return false;
-            }
-
-            Directory.CreateDirectory(newPath);
-            return true;
-        }
-
-        private void ScanDir(string path)
-        {
-            if (!Directory.Exists(path))
-            {
-                return;
-            }
-
-            if (this.pathDecomposition.Count == 0)
-            {
-                this.SetCurrentDir(path);
-            }
-
-            if (this.pathDecomposition.Count > 0)
-            {
-                this.files.Clear();
-
-                if (this.pathDecomposition.Count > 1)
+                if (string.IsNullOrEmpty(file.Name))
                 {
-                    this.files.Add(new FileStruct
-                    {
-                        Type = FileStructType.Directory,
-                        FilePath = path,
-                        FileName = "..",
-                        FileSize = 0,
-                        FileModifiedDate = string.Empty,
-                        FormattedFileSize = string.Empty,
-                        Ext = string.Empty,
-                    });
+                    continue;
                 }
 
-                var dirInfo = new DirectoryInfo(path);
-
-                var dontShowHidden = this.flags.HasFlag(ImGuiFileDialogFlags.DontShowHiddenFiles);
-
-                foreach (var dir in dirInfo.EnumerateDirectories().OrderBy(d => d.Name))
+                if (dontShowHidden && file.Name[0] == '.')
                 {
-                    if (string.IsNullOrEmpty(dir.Name))
+                    continue;
+                }
+
+                if (!string.IsNullOrEmpty(file.Extension))
+                {
+                    var ext = file.Extension;
+                    if (this.filters.Count > 0 && !this.selectedFilter.Empty() && !this.selectedFilter.FilterExists(ext) && this.selectedFilter.Filter != ".*")
                     {
                         continue;
                     }
-
-                    if (dontShowHidden && dir.Name[0] == '.')
-                    {
-                        continue;
-                    }
-
-                    this.files.Add(GetDir(dir, path));
                 }
 
-                foreach (var file in dirInfo.EnumerateFiles().OrderBy(f => f.Name))
-                {
-                    if (string.IsNullOrEmpty(file.Name))
-                    {
-                        continue;
-                    }
-
-                    if (dontShowHidden && file.Name[0] == '.')
-                    {
-                        continue;
-                    }
-
-                    if (!string.IsNullOrEmpty(file.Extension))
-                    {
-                        var ext = file.Extension;
-                        if (this.filters.Count > 0 && !this.selectedFilter.Empty() && !this.selectedFilter.FilterExists(ext) && this.selectedFilter.Filter != ".*")
-                        {
-                            continue;
-                        }
-                    }
-
-                    this.files.Add(GetFile(file, path));
-                }
-
-                this.SortFields(this.currentSortingField);
-            }
-        }
-
-        private void SetupSideBar()
-        {
-            foreach (var drive in DriveInfo.GetDrives())
-            {
-                this.drives.Add(new SideBarItem(drive.Name, drive.Name, FontAwesomeIcon.Server));
+                this.files.Add(GetFile(file, path));
             }
 
-            var personal = Path.GetDirectoryName(Environment.GetFolderPath(Environment.SpecialFolder.Personal));
-
-            this.quickAccess.Add(new SideBarItem("Desktop", Environment.GetFolderPath(Environment.SpecialFolder.Desktop), FontAwesomeIcon.Desktop));
-            this.quickAccess.Add(new SideBarItem("Documents", Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), FontAwesomeIcon.File));
-
-            if (!string.IsNullOrEmpty(personal))
-            {
-                this.quickAccess.Add(new SideBarItem("Downloads", Path.Combine(personal, "Downloads"), FontAwesomeIcon.Download));
-            }
-
-            this.quickAccess.Add(new SideBarItem("Favorites", Environment.GetFolderPath(Environment.SpecialFolder.Favorites), FontAwesomeIcon.Star));
-            this.quickAccess.Add(new SideBarItem("Music", Environment.GetFolderPath(Environment.SpecialFolder.MyMusic), FontAwesomeIcon.Music));
-            this.quickAccess.Add(new SideBarItem("Pictures", Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), FontAwesomeIcon.Image));
-            this.quickAccess.Add(new SideBarItem("Videos", Environment.GetFolderPath(Environment.SpecialFolder.MyVideos), FontAwesomeIcon.Video));
-        }
-
-        private void SortFields(SortingField sortingField, bool canChangeOrder = false)
-        {
-            switch (sortingField)
-            {
-                case SortingField.FileName:
-                    if (canChangeOrder && sortingField == this.currentSortingField)
-                    {
-                        this.sortDescending[0] = !this.sortDescending[0];
-                    }
-
-                    this.files.Sort(this.sortDescending[0] ? SortByFileNameDesc : SortByFileNameAsc);
-                    break;
-
-                case SortingField.Type:
-                    if (canChangeOrder && sortingField == this.currentSortingField)
-                    {
-                        this.sortDescending[1] = !this.sortDescending[1];
-                    }
-
-                    this.files.Sort(this.sortDescending[1] ? SortByTypeDesc : SortByTypeAsc);
-                    break;
-
-                case SortingField.Size:
-                    if (canChangeOrder && sortingField == this.currentSortingField)
-                    {
-                        this.sortDescending[2] = !this.sortDescending[2];
-                    }
-
-                    this.files.Sort(this.sortDescending[2] ? SortBySizeDesc : SortBySizeAsc);
-                    break;
-
-                case SortingField.Date:
-                    if (canChangeOrder && sortingField == this.currentSortingField)
-                    {
-                        this.sortDescending[3] = !this.sortDescending[3];
-                    }
-
-                    this.files.Sort(this.sortDescending[3] ? SortByDateDesc : SortByDateAsc);
-                    break;
-            }
-
-            if (sortingField != SortingField.None)
-            {
-                this.currentSortingField = sortingField;
-            }
-
-            this.ApplyFilteringOnFileList();
+            this.SortFields(this.currentSortingField);
         }
     }
+
+    private void SetupSideBar()
+    {
+        foreach (var drive in DriveInfo.GetDrives())
+        {
+            this.drives.Add(new SideBarItem(drive.Name, drive.Name, FontAwesomeIcon.Server));
+        }
+
+        var personal = Path.GetDirectoryName(Environment.GetFolderPath(Environment.SpecialFolder.Personal));
+
+        this.quickAccess.Add(new SideBarItem("Desktop", Environment.GetFolderPath(Environment.SpecialFolder.Desktop), FontAwesomeIcon.Desktop));
+        this.quickAccess.Add(new SideBarItem("Documents", Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), FontAwesomeIcon.File));
+
+        if (!string.IsNullOrEmpty(personal))
+        {
+            this.quickAccess.Add(new SideBarItem("Downloads", Path.Combine(personal, "Downloads"), FontAwesomeIcon.Download));
+        }
+
+        this.quickAccess.Add(new SideBarItem("Favorites", Environment.GetFolderPath(Environment.SpecialFolder.Favorites), FontAwesomeIcon.Star));
+        this.quickAccess.Add(new SideBarItem("Music", Environment.GetFolderPath(Environment.SpecialFolder.MyMusic), FontAwesomeIcon.Music));
+        this.quickAccess.Add(new SideBarItem("Pictures", Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), FontAwesomeIcon.Image));
+        this.quickAccess.Add(new SideBarItem("Videos", Environment.GetFolderPath(Environment.SpecialFolder.MyVideos), FontAwesomeIcon.Video));
+    }
+
+    private void SortFields(SortingField sortingField, bool canChangeOrder = false)
+    {
+        switch (sortingField)
+        {
+            case SortingField.FileName:
+                if (canChangeOrder && sortingField == this.currentSortingField)
+                {
+                    this.sortDescending[0] = !this.sortDescending[0];
+                }
+
+                this.files.Sort(this.sortDescending[0] ? SortByFileNameDesc : SortByFileNameAsc);
+                break;
+
+            case SortingField.Type:
+                if (canChangeOrder && sortingField == this.currentSortingField)
+                {
+                    this.sortDescending[1] = !this.sortDescending[1];
+                }
+
+                this.files.Sort(this.sortDescending[1] ? SortByTypeDesc : SortByTypeAsc);
+                break;
+
+            case SortingField.Size:
+                if (canChangeOrder && sortingField == this.currentSortingField)
+                {
+                    this.sortDescending[2] = !this.sortDescending[2];
+                }
+
+                this.files.Sort(this.sortDescending[2] ? SortBySizeDesc : SortBySizeAsc);
+                break;
+
+            case SortingField.Date:
+                if (canChangeOrder && sortingField == this.currentSortingField)
+                {
+                    this.sortDescending[3] = !this.sortDescending[3];
+                }
+
+                this.files.Sort(this.sortDescending[3] ? SortByDateDesc : SortByDateAsc);
+                break;
+        }
+
+        if (sortingField != SortingField.None)
+        {
+            this.currentSortingField = sortingField;
+        }
+
+        this.ApplyFilteringOnFileList();
+    }
 }
diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Filters.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Filters.cs
index 037155229..919e65592 100644
--- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Filters.cs
+++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Filters.cs
@@ -1,108 +1,107 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace Dalamud.Interface.ImGuiFileDialog
+namespace Dalamud.Interface.ImGuiFileDialog;
+
+/// <summary>
+/// A file or folder picker.
+/// </summary>
+public partial class FileDialog
 {
-    /// <summary>
-    /// A file or folder picker.
-    /// </summary>
-    public partial class FileDialog
+    private static Regex filterRegex = new(@"[^,{}]+(\{([^{}]*?)\})?", RegexOptions.Compiled);
+
+    private List<FilterStruct> filters = new();
+    private FilterStruct selectedFilter;
+
+    private void ParseFilters(string filters)
     {
-        private static Regex filterRegex = new(@"[^,{}]+(\{([^{}]*?)\})?", RegexOptions.Compiled);
+        // ".*,.cpp,.h,.hpp"
+        // "Source files{.cpp,.h,.hpp},Image files{.png,.gif,.jpg,.jpeg},.md"
 
-        private List<FilterStruct> filters = new();
-        private FilterStruct selectedFilter;
+        this.filters.Clear();
+        if (filters.Length == 0) return;
 
-        private void ParseFilters(string filters)
+        var currentFilterFound = false;
+        var matches = filterRegex.Matches(filters);
+        foreach (Match m in matches)
         {
-            // ".*,.cpp,.h,.hpp"
-            // "Source files{.cpp,.h,.hpp},Image files{.png,.gif,.jpg,.jpeg},.md"
+            var match = m.Value;
+            var filter = default(FilterStruct);
 
-            this.filters.Clear();
-            if (filters.Length == 0) return;
-
-            var currentFilterFound = false;
-            var matches = filterRegex.Matches(filters);
-            foreach (Match m in matches)
+            if (match.Contains("{"))
             {
-                var match = m.Value;
-                var filter = default(FilterStruct);
-
-                if (match.Contains("{"))
+                var exts = m.Groups[2].Value;
+                filter = new FilterStruct
                 {
-                    var exts = m.Groups[2].Value;
-                    filter = new FilterStruct
-                    {
-                        Filter = match.Split('{')[0],
-                        CollectionFilters = new HashSet<string>(exts.Split(',')),
-                    };
-                }
-                else
+                    Filter = match.Split('{')[0],
+                    CollectionFilters = new HashSet<string>(exts.Split(',')),
+                };
+            }
+            else
+            {
+                filter = new FilterStruct
                 {
-                    filter = new FilterStruct
-                    {
-                        Filter = match,
-                        CollectionFilters = new(),
-                    };
-                }
-
-                this.filters.Add(filter);
-
-                if (!currentFilterFound && filter.Filter == this.selectedFilter.Filter)
-                {
-                    currentFilterFound = true;
-                    this.selectedFilter = filter;
-                }
+                    Filter = match,
+                    CollectionFilters = new(),
+                };
             }
 
-            if (!currentFilterFound && !(this.filters.Count == 0))
+            this.filters.Add(filter);
+
+            if (!currentFilterFound && filter.Filter == this.selectedFilter.Filter)
             {
-                this.selectedFilter = this.filters[0];
+                currentFilterFound = true;
+                this.selectedFilter = filter;
             }
         }
 
-        private void SetSelectedFilterWithExt(string ext)
+        if (!currentFilterFound && !(this.filters.Count == 0))
         {
-            if (this.filters.Count == 0) return;
-            if (string.IsNullOrEmpty(ext)) return;
+            this.selectedFilter = this.filters[0];
+        }
+    }
 
-            foreach (var filter in this.filters)
-            {
-                if (filter.FilterExists(ext))
-                {
-                    this.selectedFilter = filter;
-                }
-            }
+    private void SetSelectedFilterWithExt(string ext)
+    {
+        if (this.filters.Count == 0) return;
+        if (string.IsNullOrEmpty(ext)) return;
 
-            if (this.selectedFilter.Empty())
+        foreach (var filter in this.filters)
+        {
+            if (filter.FilterExists(ext))
             {
-                this.selectedFilter = this.filters[0];
+                this.selectedFilter = filter;
             }
         }
 
-        private void ApplyFilteringOnFileList()
+        if (this.selectedFilter.Empty())
         {
-            lock (this.filesLock)
+            this.selectedFilter = this.filters[0];
+        }
+    }
+
+    private void ApplyFilteringOnFileList()
+    {
+        lock (this.filesLock)
+        {
+            this.filteredFiles.Clear();
+
+            foreach (var file in this.files)
             {
-                this.filteredFiles.Clear();
-
-                foreach (var file in this.files)
+                var show = true;
+                if (!string.IsNullOrEmpty(this.searchBuffer) && !file.FileName.ToLower().Contains(this.searchBuffer.ToLower()))
                 {
-                    var show = true;
-                    if (!string.IsNullOrEmpty(this.searchBuffer) && !file.FileName.ToLower().Contains(this.searchBuffer.ToLower()))
-                    {
-                        show = false;
-                    }
+                    show = false;
+                }
 
-                    if (this.IsDirectoryMode() && file.Type != FileStructType.Directory)
-                    {
-                        show = false;
-                    }
+                if (this.IsDirectoryMode() && file.Type != FileStructType.Directory)
+                {
+                    show = false;
+                }
 
-                    if (show)
-                    {
-                        this.filteredFiles.Add(file);
-                    }
+                if (show)
+                {
+                    this.filteredFiles.Add(file);
                 }
             }
         }
diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Helpers.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Helpers.cs
index 16bc3e46f..96bdb3172 100644
--- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Helpers.cs
+++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Helpers.cs
@@ -1,26 +1,25 @@
 using System;
 
-namespace Dalamud.Interface.ImGuiFileDialog
-{
-    /// <summary>
-    /// A file or folder picker.
-    /// </summary>
-    public partial class FileDialog
-    {
-        private static string FormatModifiedDate(DateTime date)
-        {
-            return date.ToString("yyyy/MM/dd HH:mm");
-        }
+namespace Dalamud.Interface.ImGuiFileDialog;
 
-        private static string BytesToString(long byteCount)
-        {
-            string[] suf = { " B", " KB", " MB", " GB", " TB" };
-            if (byteCount == 0)
-                return "0" + suf[0];
-            var bytes = Math.Abs(byteCount);
-            var place = Convert.ToInt32(Math.Floor(Math.Log(bytes, 1024)));
-            var num = Math.Round(bytes / Math.Pow(1024, place), 1);
-            return (Math.Sign(byteCount) * num).ToString() + suf[place];
-        }
+/// <summary>
+/// A file or folder picker.
+/// </summary>
+public partial class FileDialog
+{
+    private static string FormatModifiedDate(DateTime date)
+    {
+        return date.ToString("yyyy/MM/dd HH:mm");
+    }
+
+    private static string BytesToString(long byteCount)
+    {
+        string[] suf = { " B", " KB", " MB", " GB", " TB" };
+        if (byteCount == 0)
+            return "0" + suf[0];
+        var bytes = Math.Abs(byteCount);
+        var place = Convert.ToInt32(Math.Floor(Math.Log(bytes, 1024)));
+        var num = Math.Round(bytes / Math.Pow(1024, place), 1);
+        return (Math.Sign(byteCount) * num).ToString() + suf[place];
     }
 }
diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Structs.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Structs.cs
index 8671a2736..1373c9189 100644
--- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Structs.cs
+++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Structs.cs
@@ -6,72 +6,71 @@ using System.Numerics;
 
 using Dalamud.Utility;
 
-namespace Dalamud.Interface.ImGuiFileDialog
+namespace Dalamud.Interface.ImGuiFileDialog;
+
+/// <summary>
+/// A file or folder picker.
+/// </summary>
+public partial class FileDialog
 {
-    /// <summary>
-    /// A file or folder picker.
-    /// </summary>
-    public partial class FileDialog
+    private struct FileStruct
     {
-        private struct FileStruct
+        public FileStructType Type;
+        public string FilePath;
+        public string FileName;
+        public string Ext;
+        public long FileSize;
+        public string FormattedFileSize;
+        public string FileModifiedDate;
+    }
+
+    private readonly struct SideBarItem
+    {
+        public SideBarItem(string text, string location, FontAwesomeIcon icon)
         {
-            public FileStructType Type;
-            public string FilePath;
-            public string FileName;
-            public string Ext;
-            public long FileSize;
-            public string FormattedFileSize;
-            public string FileModifiedDate;
+            this.Text = text;
+            this.Location = location;
+            this.Icon = icon;
+            this.Exists = !this.Location.IsNullOrEmpty() && Directory.Exists(this.Location);
         }
 
-        private readonly struct SideBarItem
+        public string Text { get; init; }
+
+        public string Location { get; init; }
+
+        public FontAwesomeIcon Icon { get; init; }
+
+        public bool Exists { get; init; }
+
+        public bool CheckExistence()
+            => !this.Location.IsNullOrEmpty() && Directory.Exists(this.Location);
+    }
+
+    private struct FilterStruct
+    {
+        public string Filter;
+        public HashSet<string> CollectionFilters;
+
+        public void Clear()
         {
-            public SideBarItem(string text, string location, FontAwesomeIcon icon)
-            {
-                this.Text = text;
-                this.Location = location;
-                this.Icon = icon;
-                this.Exists = !this.Location.IsNullOrEmpty() && Directory.Exists(this.Location);
-            }
-
-            public string Text { get; init; }
-
-            public string Location { get; init; }
-
-            public FontAwesomeIcon Icon { get; init; }
-
-            public bool Exists { get; init; }
-
-            public bool CheckExistence()
-                => !this.Location.IsNullOrEmpty() && Directory.Exists(this.Location);
+            this.Filter = string.Empty;
+            this.CollectionFilters.Clear();
         }
 
-        private struct FilterStruct
+        public bool Empty()
         {
-            public string Filter;
-            public HashSet<string> CollectionFilters;
-
-            public void Clear()
-            {
-                this.Filter = string.Empty;
-                this.CollectionFilters.Clear();
-            }
-
-            public bool Empty()
-            {
-                return string.IsNullOrEmpty(this.Filter) && (this.CollectionFilters == null || (this.CollectionFilters.Count == 0));
-            }
-
-            public bool FilterExists(string filter)
-            {
-                return this.Filter.Equals(filter, StringComparison.InvariantCultureIgnoreCase) || (this.CollectionFilters != null && this.CollectionFilters.Any(colFilter => colFilter.Equals(filter, StringComparison.InvariantCultureIgnoreCase)));
-            }
+            return string.IsNullOrEmpty(this.Filter) && (this.CollectionFilters == null || (this.CollectionFilters.Count == 0));
         }
 
-        private struct IconColorItem
+        public bool FilterExists(string filter)
         {
-            public FontAwesomeIcon Icon;
-            public Vector4 Color;
+            return this.Filter.Equals(filter, StringComparison.InvariantCultureIgnoreCase) || (this.CollectionFilters != null && this.CollectionFilters.Any(colFilter => colFilter.Equals(filter, StringComparison.InvariantCultureIgnoreCase)));
         }
     }
+
+    private struct IconColorItem
+    {
+        public FontAwesomeIcon Icon;
+        public Vector4 Color;
+    }
 }
diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs
index 5f51d2739..c55722b4a 100644
--- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs
+++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs
@@ -5,561 +5,574 @@ using System.Numerics;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.ImGuiFileDialog
+namespace Dalamud.Interface.ImGuiFileDialog;
+
+/// <summary>
+/// A file or folder picker.
+/// </summary>
+public partial class FileDialog
 {
+    private static Vector4 pathDecompColor = new(0.188f, 0.188f, 0.2f, 1f);
+    private static Vector4 selectedTextColor = new(1.00000000000f, 0.33333333333f, 0.33333333333f, 1f);
+    private static Vector4 dirTextColor = new(0.54509803922f, 0.91372549020f, 0.99215686275f, 1f);
+    private static Vector4 codeTextColor = new(0.94509803922f, 0.98039215686f, 0.54901960784f, 1f);
+    private static Vector4 miscTextColor = new(1.00000000000f, 0.47450980392f, 0.77647058824f, 1f);
+    private static Vector4 imageTextColor = new(0.31372549020f, 0.98039215686f, 0.48235294118f, 1f);
+    private static Vector4 standardTextColor = new(1f);
+
+    private static Dictionary<string, IconColorItem> iconMap;
+
     /// <summary>
-    /// A file or folder picker.
+    /// Draws the dialog.
     /// </summary>
-    public partial class FileDialog
+    /// <returns>Whether a selection or cancel action was performed.</returns>
+    public bool Draw()
     {
-        private static Vector4 pathDecompColor = new(0.188f, 0.188f, 0.2f, 1f);
-        private static Vector4 selectedTextColor = new(1.00000000000f, 0.33333333333f, 0.33333333333f, 1f);
-        private static Vector4 dirTextColor = new(0.54509803922f, 0.91372549020f, 0.99215686275f, 1f);
-        private static Vector4 codeTextColor = new(0.94509803922f, 0.98039215686f, 0.54901960784f, 1f);
-        private static Vector4 miscTextColor = new(1.00000000000f, 0.47450980392f, 0.77647058824f, 1f);
-        private static Vector4 imageTextColor = new(0.31372549020f, 0.98039215686f, 0.48235294118f, 1f);
-        private static Vector4 standardTextColor = new(1f);
+        if (!this.visible) return false;
 
-        private static Dictionary<string, IconColorItem> iconMap;
+        var res = false;
+        var name = this.title + "###" + this.id;
 
-        /// <summary>
-        /// Draws the dialog.
-        /// </summary>
-        /// <returns>Whether a selection or cancel action was performed.</returns>
-        public bool Draw()
+        bool windowVisible;
+        this.isOk = false;
+        this.wantsToQuit = false;
+
+        this.ResetEvents();
+
+        ImGui.SetNextWindowSize(ImGuiHelpers.ScaledVector2(800, 500), ImGuiCond.FirstUseEver);
+
+        if (this.isModal && !this.okResultToConfirm)
         {
-            if (!this.visible) return false;
+            ImGui.OpenPopup(name);
+            windowVisible = ImGui.BeginPopupModal(name, ref this.visible, this.WindowFlags);
+        }
+        else
+        {
+            windowVisible = ImGui.Begin(name, ref this.visible, this.WindowFlags);
+        }
 
-            var res = false;
-            var name = this.title + "###" + this.id;
+        bool wasClosed = false;
+        if (windowVisible)
+        {
+            if (!this.visible)
+            { // window closed
+                this.isOk = false;
+                wasClosed = true;
+            }
+            else
+            {
+                if (this.selectedFilter.Empty() && (this.filters.Count > 0))
+                {
+                    this.selectedFilter = this.filters[0];
+                }
 
-            bool windowVisible;
-            this.isOk = false;
-            this.wantsToQuit = false;
+                if (this.files.Count == 0)
+                {
+                    if (!string.IsNullOrEmpty(this.defaultFileName))
+                    {
+                        this.SetDefaultFileName();
+                        this.SetSelectedFilterWithExt(this.defaultExtension);
+                    }
+                    else if (this.IsDirectoryMode())
+                    {
+                        this.SetDefaultFileName();
+                    }
 
-            this.ResetEvents();
+                    this.ScanDir(this.currentPath);
+                }
 
-            ImGui.SetNextWindowSize(ImGuiHelpers.ScaledVector2(800, 500), ImGuiCond.FirstUseEver);
+                this.DrawHeader();
+                this.DrawContent();
+                res = this.DrawFooter();
+            }
 
             if (this.isModal && !this.okResultToConfirm)
             {
-                ImGui.OpenPopup(name);
-                windowVisible = ImGui.BeginPopupModal(name, ref this.visible, this.WindowFlags);
-            }
-            else
-            {
-                windowVisible = ImGui.Begin(name, ref this.visible, this.WindowFlags);
-            }
-
-            bool wasClosed = false;
-            if (windowVisible)
-            {
-                if (!this.visible)
-                { // window closed
-                    this.isOk = false;
-                    wasClosed = true;
-                }
-                else
-                {
-                    if (this.selectedFilter.Empty() && (this.filters.Count > 0))
-                    {
-                        this.selectedFilter = this.filters[0];
-                    }
-
-                    if (this.files.Count == 0)
-                    {
-                        if (!string.IsNullOrEmpty(this.defaultFileName))
-                        {
-                            this.SetDefaultFileName();
-                            this.SetSelectedFilterWithExt(this.defaultExtension);
-                        }
-                        else if (this.IsDirectoryMode())
-                        {
-                            this.SetDefaultFileName();
-                        }
-
-                        this.ScanDir(this.currentPath);
-                    }
-
-                    this.DrawHeader();
-                    this.DrawContent();
-                    res = this.DrawFooter();
-                }
-
-                if (this.isModal && !this.okResultToConfirm)
-                {
-                    ImGui.EndPopup();
-                }
-            }
-
-            if (!this.isModal || this.okResultToConfirm)
-            {
-                ImGui.End();
-            }
-
-            return wasClosed || this.ConfirmOrOpenOverWriteFileDialogIfNeeded(res);
-        }
-
-        private static float Scaled(float value)
-            => value * ImGuiHelpers.GlobalScale;
-
-        private static void AddToIconMap(string[] extensions, FontAwesomeIcon icon, Vector4 color)
-        {
-            foreach (var ext in extensions)
-            {
-                iconMap[ext] = new IconColorItem
-                {
-                    Icon = icon,
-                    Color = color,
-                };
+                ImGui.EndPopup();
             }
         }
 
-        private static IconColorItem GetIcon(string ext)
+        if (!this.isModal || this.okResultToConfirm)
         {
-            if (iconMap == null)
-            {
-                iconMap = new();
-                AddToIconMap(new[] { "mp4", "gif", "mov", "avi" }, FontAwesomeIcon.FileVideo, miscTextColor);
-                AddToIconMap(new[] { "pdf" }, FontAwesomeIcon.FilePdf, miscTextColor);
-                AddToIconMap(new[] { "png", "jpg", "jpeg", "tiff" }, FontAwesomeIcon.FileImage, imageTextColor);
-                AddToIconMap(new[] { "cs", "json", "cpp", "h", "py", "xml", "yaml", "js", "html", "css", "ts", "java" }, FontAwesomeIcon.FileCode, codeTextColor);
-                AddToIconMap(new[] { "txt", "md" }, FontAwesomeIcon.FileAlt, standardTextColor);
-                AddToIconMap(new[] { "zip", "7z", "gz", "tar" }, FontAwesomeIcon.FileArchive, miscTextColor);
-                AddToIconMap(new[] { "mp3", "m4a", "ogg", "wav" }, FontAwesomeIcon.FileAudio, miscTextColor);
-                AddToIconMap(new[] { "csv" }, FontAwesomeIcon.FileCsv, miscTextColor);
-            }
+            ImGui.End();
+        }
 
-            return iconMap.TryGetValue(ext.ToLower(), out var icon) ? icon : new IconColorItem
+        return wasClosed || this.ConfirmOrOpenOverWriteFileDialogIfNeeded(res);
+    }
+
+    private static float Scaled(float value)
+        => value * ImGuiHelpers.GlobalScale;
+
+    private static void AddToIconMap(string[] extensions, FontAwesomeIcon icon, Vector4 color)
+    {
+        foreach (var ext in extensions)
+        {
+            iconMap[ext] = new IconColorItem
             {
-                Icon = FontAwesomeIcon.File,
-                Color = standardTextColor,
+                Icon = icon,
+                Color = color,
             };
         }
+    }
 
-        private void DrawHeader()
+    private static IconColorItem GetIcon(string ext)
+    {
+        if (iconMap == null)
         {
-            this.DrawPathComposer();
-
-            ImGui.SetCursorPosY(ImGui.GetCursorPosY() + Scaled(2));
-            ImGui.Separator();
-            ImGui.SetCursorPosY(ImGui.GetCursorPosY() + Scaled(2));
-
-            this.DrawSearchBar();
+            iconMap = new();
+            AddToIconMap(new[] { "mp4", "gif", "mov", "avi" }, FontAwesomeIcon.FileVideo, miscTextColor);
+            AddToIconMap(new[] { "pdf" }, FontAwesomeIcon.FilePdf, miscTextColor);
+            AddToIconMap(new[] { "png", "jpg", "jpeg", "tiff" }, FontAwesomeIcon.FileImage, imageTextColor);
+            AddToIconMap(new[] { "cs", "json", "cpp", "h", "py", "xml", "yaml", "js", "html", "css", "ts", "java" }, FontAwesomeIcon.FileCode, codeTextColor);
+            AddToIconMap(new[] { "txt", "md" }, FontAwesomeIcon.FileAlt, standardTextColor);
+            AddToIconMap(new[] { "zip", "7z", "gz", "tar" }, FontAwesomeIcon.FileArchive, miscTextColor);
+            AddToIconMap(new[] { "mp3", "m4a", "ogg", "wav" }, FontAwesomeIcon.FileAudio, miscTextColor);
+            AddToIconMap(new[] { "csv" }, FontAwesomeIcon.FileCsv, miscTextColor);
         }
 
-        private void DrawPathComposer()
+        return iconMap.TryGetValue(ext.ToLower(), out var icon) ? icon : new IconColorItem
         {
-            ImGui.PushFont(UiBuilder.IconFont);
-            if (ImGui.Button(this.pathInputActivated ? FontAwesomeIcon.Times.ToIconString() : FontAwesomeIcon.Edit.ToIconString()))
-            {
-                this.pathInputActivated = !this.pathInputActivated;
-            }
+            Icon = FontAwesomeIcon.File,
+            Color = standardTextColor,
+        };
+    }
 
-            ImGui.PopFont();
+    private void DrawHeader()
+    {
+        this.DrawPathComposer();
 
-            ImGui.SameLine();
+        ImGui.SetCursorPosY(ImGui.GetCursorPosY() + Scaled(2));
+        ImGui.Separator();
+        ImGui.SetCursorPosY(ImGui.GetCursorPosY() + Scaled(2));
 
-            if (this.pathDecomposition.Count > 0)
-            {
-                if (this.pathInputActivated)
-                {
-                    ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X);
-                    ImGui.InputText("##pathedit", ref this.pathInputBuffer, 255);
-                }
-                else
-                {
-                    for (var idx = 0; idx < this.pathDecomposition.Count; idx++)
-                    {
-                        if (idx > 0)
-                        {
-                            ImGui.SameLine();
-                            ImGui.SetCursorPosX(ImGui.GetCursorPosX() - Scaled(3));
-                        }
+        this.DrawSearchBar();
+    }
 
-                        ImGui.PushID(idx);
-                        ImGui.PushStyleColor(ImGuiCol.Button, pathDecompColor);
-                        var click = ImGui.Button(this.pathDecomposition[idx]);
-                        ImGui.PopStyleColor();
-                        ImGui.PopID();
-
-                        if (click)
-                        {
-                            this.currentPath = ComposeNewPath(this.pathDecomposition.GetRange(0, idx + 1));
-                            this.pathClicked = true;
-                            break;
-                        }
-
-                        if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
-                        {
-                            this.pathInputBuffer = ComposeNewPath(this.pathDecomposition.GetRange(0, idx + 1));
-                            this.pathInputActivated = true;
-                            break;
-                        }
-                    }
-                }
-            }
+    private void DrawPathComposer()
+    {
+        ImGui.PushFont(UiBuilder.IconFont);
+        if (ImGui.Button(this.pathInputActivated ? FontAwesomeIcon.Times.ToIconString() : FontAwesomeIcon.Edit.ToIconString()))
+        {
+            this.pathInputActivated = !this.pathInputActivated;
         }
 
-        private void DrawSearchBar()
+        ImGui.PopFont();
+
+        ImGui.SameLine();
+
+        if (this.pathDecomposition.Count > 0)
         {
-            ImGui.PushFont(UiBuilder.IconFont);
-            if (ImGui.Button(FontAwesomeIcon.Home.ToIconString()))
+            if (this.pathInputActivated)
             {
-                this.SetPath(".");
-            }
-
-            ImGui.PopFont();
-
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.SetTooltip("Reset to current directory");
-            }
-
-            ImGui.SameLine();
-
-            this.DrawDirectoryCreation();
-
-            if (!this.createDirectoryMode)
-            {
-                ImGui.SameLine();
-                ImGui.TextUnformatted("Search :");
-                ImGui.SameLine();
                 ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X);
-                if (ImGui.InputText("##InputImGuiFileDialogSearchField", ref this.searchBuffer, 255))
-                {
-                    this.ApplyFilteringOnFileList();
-                }
-            }
-        }
-
-        private void DrawDirectoryCreation()
-        {
-            if (this.flags.HasFlag(ImGuiFileDialogFlags.DisableCreateDirectoryButton)) return;
-
-            ImGui.PushFont(UiBuilder.IconFont);
-            if (ImGui.Button(FontAwesomeIcon.FolderPlus.ToIconString()) && !this.createDirectoryMode)
-            {
-                this.createDirectoryMode = true;
-                this.createDirectoryBuffer = string.Empty;
-            }
-
-            ImGui.PopFont();
-
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.SetTooltip("Create Directory");
-            }
-
-            if (this.createDirectoryMode)
-            {
-                ImGui.SameLine();
-                ImGui.TextUnformatted("New Directory Name");
-
-                ImGui.SameLine();
-                ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X - Scaled(100));
-                ImGui.InputText("##DirectoryFileName", ref this.createDirectoryBuffer, 255);
-
-                ImGui.SameLine();
-
-                if (ImGui.Button("Ok"))
-                {
-                    if (this.CreateDir(this.createDirectoryBuffer))
-                    {
-                        this.SetPath(Path.Combine(this.currentPath, this.createDirectoryBuffer));
-                    }
-
-                    this.createDirectoryMode = false;
-                }
-
-                ImGui.SameLine();
-
-                if (ImGui.Button("Cancel"))
-                {
-                    this.createDirectoryMode = false;
-                }
-            }
-        }
-
-        private void DrawContent()
-        {
-            var size = ImGui.GetContentRegionAvail() - new Vector2(0, this.footerHeight);
-
-            if (!this.flags.HasFlag(ImGuiFileDialogFlags.HideSideBar))
-            {
-                if (ImGui.BeginChild("##FileDialog_ColumnChild", size))
-                {
-                    ImGui.Columns(2, "##FileDialog_Columns");
-
-                    this.DrawSideBar(size with { X = Scaled(150) });
-
-                    ImGui.SetColumnWidth(0, Scaled(150));
-                    ImGui.NextColumn();
-
-                    this.DrawFileListView(size - new Vector2(Scaled(160), 0));
-
-                    ImGui.Columns(1);
-                }
-
-                ImGui.EndChild();
+                ImGui.InputText("##pathedit", ref this.pathInputBuffer, 255);
             }
             else
             {
-                this.DrawFileListView(size);
-            }
-        }
-
-        private void DrawSideBar(Vector2 size)
-        {
-            if (ImGui.BeginChild("##FileDialog_SideBar", size))
-            {
-                ImGui.SetCursorPosY(ImGui.GetCursorPosY() + Scaled(5));
-
-                var idx = 0;
-                foreach (var qa in this.drives.Concat(this.quickAccess).Where(qa => qa.Exists))
+                for (var idx = 0; idx < this.pathDecomposition.Count; idx++)
                 {
-                    ImGui.PushID(idx++);
-                    ImGui.SetCursorPosX(Scaled(25));
-                    if (ImGui.Selectable(qa.Text, qa.Text == this.selectedSideBar) && qa.CheckExistence())
+                    if (idx > 0)
                     {
-                        this.SetPath(qa.Location);
-                        this.selectedSideBar = qa.Text;
+                        ImGui.SameLine();
+                        ImGui.SetCursorPosX(ImGui.GetCursorPosX() - Scaled(3));
                     }
 
-                    ImGui.PushFont(UiBuilder.IconFont);
-                    ImGui.SameLine();
-                    ImGui.SetCursorPosX(0);
-                    ImGui.TextUnformatted(qa.Icon.ToIconString());
-
-                    ImGui.PopFont();
+                    ImGui.PushID(idx);
+                    ImGui.PushStyleColor(ImGuiCol.Button, pathDecompColor);
+                    var click = ImGui.Button(this.pathDecomposition[idx]);
+                    ImGui.PopStyleColor();
                     ImGui.PopID();
+
+                    if (click)
+                    {
+                        this.currentPath = ComposeNewPath(this.pathDecomposition.GetRange(0, idx + 1));
+                        this.pathClicked = true;
+                        break;
+                    }
+
+                    if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
+                    {
+                        this.pathInputBuffer = ComposeNewPath(this.pathDecomposition.GetRange(0, idx + 1));
+                        this.pathInputActivated = true;
+                        break;
+                    }
                 }
             }
+        }
+    }
+
+    private void DrawSearchBar()
+    {
+        ImGui.PushFont(UiBuilder.IconFont);
+        if (ImGui.Button(FontAwesomeIcon.Home.ToIconString()))
+        {
+            this.SetPath(".");
+        }
+
+        ImGui.PopFont();
+
+        if (ImGui.IsItemHovered())
+        {
+            ImGui.SetTooltip("Reset to current directory");
+        }
+
+        ImGui.SameLine();
+
+        this.DrawDirectoryCreation();
+
+        if (!this.createDirectoryMode)
+        {
+            ImGui.SameLine();
+            ImGui.TextUnformatted("Search :");
+            ImGui.SameLine();
+            ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X);
+            if (ImGui.InputText("##InputImGuiFileDialogSearchField", ref this.searchBuffer, 255))
+            {
+                this.ApplyFilteringOnFileList();
+            }
+        }
+    }
+
+    private void DrawDirectoryCreation()
+    {
+        if (this.flags.HasFlag(ImGuiFileDialogFlags.DisableCreateDirectoryButton)) return;
+
+        ImGui.PushFont(UiBuilder.IconFont);
+        if (ImGui.Button(FontAwesomeIcon.FolderPlus.ToIconString()) && !this.createDirectoryMode)
+        {
+            this.createDirectoryMode = true;
+            this.createDirectoryBuffer = string.Empty;
+        }
+
+        ImGui.PopFont();
+
+        if (ImGui.IsItemHovered())
+        {
+            ImGui.SetTooltip("Create Directory");
+        }
+
+        if (this.createDirectoryMode)
+        {
+            ImGui.SameLine();
+            ImGui.TextUnformatted("New Directory Name");
+
+            ImGui.SameLine();
+            ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X - Scaled(100));
+            ImGui.InputText("##DirectoryFileName", ref this.createDirectoryBuffer, 255);
+
+            ImGui.SameLine();
+
+            if (ImGui.Button("Ok"))
+            {
+                if (this.CreateDir(this.createDirectoryBuffer))
+                {
+                    this.SetPath(Path.Combine(this.currentPath, this.createDirectoryBuffer));
+                }
+
+                this.createDirectoryMode = false;
+            }
+
+            ImGui.SameLine();
+
+            if (ImGui.Button("Cancel"))
+            {
+                this.createDirectoryMode = false;
+            }
+        }
+    }
+
+    private void DrawContent()
+    {
+        var size = ImGui.GetContentRegionAvail() - new Vector2(0, this.footerHeight);
+
+        if (!this.flags.HasFlag(ImGuiFileDialogFlags.HideSideBar))
+        {
+            if (ImGui.BeginChild("##FileDialog_ColumnChild", size))
+            {
+                ImGui.Columns(2, "##FileDialog_Columns");
+
+                this.DrawSideBar(size with { X = Scaled(150) });
+
+                ImGui.SetColumnWidth(0, Scaled(150));
+                ImGui.NextColumn();
+
+                this.DrawFileListView(size - new Vector2(Scaled(160), 0));
+
+                ImGui.Columns(1);
+            }
 
             ImGui.EndChild();
         }
-
-        private unsafe void DrawFileListView(Vector2 size)
+        else
         {
-            if (!ImGui.BeginChild("##FileDialog_FileList", size))
+            this.DrawFileListView(size);
+        }
+    }
+
+    private void DrawSideBar(Vector2 size)
+    {
+        if (ImGui.BeginChild("##FileDialog_SideBar", size))
+        {
+            ImGui.SetCursorPosY(ImGui.GetCursorPosY() + Scaled(5));
+
+            var idx = 0;
+            foreach (var qa in this.drives.Concat(this.quickAccess).Where(qa => qa.Exists))
             {
-                ImGui.EndChild();
-                return;
-            }
-
-            const ImGuiTableFlags tableFlags = ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg | ImGuiTableFlags.Hideable | ImGuiTableFlags.ScrollY | ImGuiTableFlags.NoHostExtendX;
-            if (ImGui.BeginTable("##FileTable", 4, tableFlags, size))
-            {
-                ImGui.TableSetupScrollFreeze(0, 1);
-
-                var hideType = this.flags.HasFlag(ImGuiFileDialogFlags.HideColumnType);
-                var hideSize = this.flags.HasFlag(ImGuiFileDialogFlags.HideColumnSize);
-                var hideDate = this.flags.HasFlag(ImGuiFileDialogFlags.HideColumnDate);
-
-                ImGui.TableSetupColumn(" File Name", ImGuiTableColumnFlags.WidthStretch, -1, 0);
-                ImGui.TableSetupColumn("Type", ImGuiTableColumnFlags.WidthFixed | (hideType ? ImGuiTableColumnFlags.DefaultHide : ImGuiTableColumnFlags.None), -1, 1);
-                ImGui.TableSetupColumn("Size", ImGuiTableColumnFlags.WidthFixed | (hideSize ? ImGuiTableColumnFlags.DefaultHide : ImGuiTableColumnFlags.None), -1, 2);
-                ImGui.TableSetupColumn("Date", ImGuiTableColumnFlags.WidthFixed | (hideDate ? ImGuiTableColumnFlags.DefaultHide : ImGuiTableColumnFlags.None), -1, 3);
-
-                ImGui.TableNextRow(ImGuiTableRowFlags.Headers);
-                for (var column = 0; column < 4; column++)
+                ImGui.PushID(idx++);
+                ImGui.SetCursorPosX(Scaled(25));
+                if (ImGui.Selectable(qa.Text, qa.Text == this.selectedSideBar) && qa.CheckExistence())
                 {
-                    ImGui.TableSetColumnIndex(column);
-                    var columnName = ImGui.TableGetColumnName(column);
-                    ImGui.PushID(column);
-                    ImGui.TableHeader(columnName);
-                    ImGui.PopID();
-                    if (ImGui.IsItemClicked())
-                    {
-                        if (column == 0)
-                        {
-                            this.SortFields(SortingField.FileName, true);
-                        }
-                        else if (column == 1)
-                        {
-                            this.SortFields(SortingField.Type, true);
-                        }
-                        else if (column == 2)
-                        {
-                            this.SortFields(SortingField.Size, true);
-                        }
-                        else
-                        {
-                            this.SortFields(SortingField.Date, true);
-                        }
-                    }
+                    this.SetPath(qa.Location);
+                    this.selectedSideBar = qa.Text;
                 }
 
-                if (this.filteredFiles.Count > 0)
-                {
-                    ImGuiListClipperPtr clipper;
-                    unsafe
-                    {
-                        clipper = new ImGuiListClipperPtr(ImGuiNative.ImGuiListClipper_ImGuiListClipper());
-                    }
+                ImGui.PushFont(UiBuilder.IconFont);
+                ImGui.SameLine();
+                ImGui.SetCursorPosX(0);
+                ImGui.TextUnformatted(qa.Icon.ToIconString());
 
-                    lock (this.filesLock)
+                ImGui.PopFont();
+                ImGui.PopID();
+            }
+        }
+
+        ImGui.EndChild();
+    }
+
+    private unsafe void DrawFileListView(Vector2 size)
+    {
+        if (!ImGui.BeginChild("##FileDialog_FileList", size))
+        {
+            ImGui.EndChild();
+            return;
+        }
+
+        const ImGuiTableFlags tableFlags = ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.RowBg | ImGuiTableFlags.Hideable | ImGuiTableFlags.ScrollY | ImGuiTableFlags.NoHostExtendX;
+        if (ImGui.BeginTable("##FileTable", 4, tableFlags, size))
+        {
+            ImGui.TableSetupScrollFreeze(0, 1);
+
+            var hideType = this.flags.HasFlag(ImGuiFileDialogFlags.HideColumnType);
+            var hideSize = this.flags.HasFlag(ImGuiFileDialogFlags.HideColumnSize);
+            var hideDate = this.flags.HasFlag(ImGuiFileDialogFlags.HideColumnDate);
+
+            ImGui.TableSetupColumn(" File Name", ImGuiTableColumnFlags.WidthStretch, -1, 0);
+            ImGui.TableSetupColumn("Type", ImGuiTableColumnFlags.WidthFixed | (hideType ? ImGuiTableColumnFlags.DefaultHide : ImGuiTableColumnFlags.None), -1, 1);
+            ImGui.TableSetupColumn("Size", ImGuiTableColumnFlags.WidthFixed | (hideSize ? ImGuiTableColumnFlags.DefaultHide : ImGuiTableColumnFlags.None), -1, 2);
+            ImGui.TableSetupColumn("Date", ImGuiTableColumnFlags.WidthFixed | (hideDate ? ImGuiTableColumnFlags.DefaultHide : ImGuiTableColumnFlags.None), -1, 3);
+
+            ImGui.TableNextRow(ImGuiTableRowFlags.Headers);
+            for (var column = 0; column < 4; column++)
+            {
+                ImGui.TableSetColumnIndex(column);
+                var columnName = ImGui.TableGetColumnName(column);
+                ImGui.PushID(column);
+                ImGui.TableHeader(columnName);
+                ImGui.PopID();
+                if (ImGui.IsItemClicked())
+                {
+                    if (column == 0)
                     {
-                        clipper.Begin(this.filteredFiles.Count);
-                        while (clipper.Step())
+                        this.SortFields(SortingField.FileName, true);
+                    }
+                    else if (column == 1)
+                    {
+                        this.SortFields(SortingField.Type, true);
+                    }
+                    else if (column == 2)
+                    {
+                        this.SortFields(SortingField.Size, true);
+                    }
+                    else
+                    {
+                        this.SortFields(SortingField.Date, true);
+                    }
+                }
+            }
+
+            if (this.filteredFiles.Count > 0)
+            {
+                ImGuiListClipperPtr clipper;
+                unsafe
+                {
+                    clipper = new ImGuiListClipperPtr(ImGuiNative.ImGuiListClipper_ImGuiListClipper());
+                }
+
+                lock (this.filesLock)
+                {
+                    clipper.Begin(this.filteredFiles.Count);
+                    while (clipper.Step())
+                    {
+                        for (var i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
                         {
-                            for (var i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
+                            if (i < 0) continue;
+
+                            var file = this.filteredFiles[i];
+                            var selected = this.selectedFileNames.Contains(file.FileName);
+                            var needToBreak = false;
+
+                            var dir = file.Type == FileStructType.Directory;
+                            var item = !dir ? GetIcon(file.Ext) : new IconColorItem
                             {
-                                if (i < 0) continue;
+                                Color = dirTextColor,
+                                Icon = FontAwesomeIcon.Folder,
+                            };
 
-                                var file = this.filteredFiles[i];
-                                var selected = this.selectedFileNames.Contains(file.FileName);
-                                var needToBreak = false;
+                            ImGui.PushStyleColor(ImGuiCol.Text, selected ? selectedTextColor : item.Color);
 
-                                var dir = file.Type == FileStructType.Directory;
-                                var item = !dir ? GetIcon(file.Ext) : new IconColorItem
-                                               {
-                                                   Color = dirTextColor,
-                                                   Icon = FontAwesomeIcon.Folder,
-                                               };
+                            ImGui.TableNextRow();
 
-                                ImGui.PushStyleColor(ImGuiCol.Text, selected ? selectedTextColor : item.Color);
-
-                                ImGui.TableNextRow();
-
-                                if (ImGui.TableNextColumn())
-                                {
-                                    needToBreak = this.SelectableItem(file, selected, item.Icon);
-                                }
-
-                                if (ImGui.TableNextColumn())
-                                {
-                                    ImGui.TextUnformatted(file.Ext);
-                                }
-
-                                if (ImGui.TableNextColumn())
-                                {
-                                    if (file.Type == FileStructType.File)
-                                    {
-                                        ImGui.TextUnformatted(file.FormattedFileSize + " ");
-                                    }
-                                    else
-                                    {
-                                        ImGui.TextUnformatted(" ");
-                                    }
-                                }
-
-                                if (ImGui.TableNextColumn())
-                                {
-                                    var sz = ImGui.CalcTextSize(file.FileModifiedDate);
-                                    ImGui.SetNextItemWidth(sz.X + Scaled(5));
-                                    ImGui.TextUnformatted(file.FileModifiedDate + " ");
-                                }
-
-                                ImGui.PopStyleColor();
-
-                                if (needToBreak) break;
+                            if (ImGui.TableNextColumn())
+                            {
+                                needToBreak = this.SelectableItem(file, selected, item.Icon);
                             }
+
+                            if (ImGui.TableNextColumn())
+                            {
+                                ImGui.TextUnformatted(file.Ext);
+                            }
+
+                            if (ImGui.TableNextColumn())
+                            {
+                                if (file.Type == FileStructType.File)
+                                {
+                                    ImGui.TextUnformatted(file.FormattedFileSize + " ");
+                                }
+                                else
+                                {
+                                    ImGui.TextUnformatted(" ");
+                                }
+                            }
+
+                            if (ImGui.TableNextColumn())
+                            {
+                                var sz = ImGui.CalcTextSize(file.FileModifiedDate);
+                                ImGui.SetNextItemWidth(sz.X + Scaled(5));
+                                ImGui.TextUnformatted(file.FileModifiedDate + " ");
+                            }
+
+                            ImGui.PopStyleColor();
+
+                            if (needToBreak) break;
                         }
-
-                        clipper.End();
-                        clipper.Destroy();
                     }
+
+                    clipper.End();
+                    clipper.Destroy();
                 }
-
-                if (this.pathInputActivated)
-                {
-                    if (ImGui.IsKeyReleased(ImGuiKey.Enter))
-                    {
-                        if (Directory.Exists(this.pathInputBuffer)) this.SetPath(this.pathInputBuffer);
-                        this.pathInputActivated = false;
-                    }
-
-                    if (ImGui.IsKeyReleased(ImGuiKey.Escape))
-                    {
-                        this.pathInputActivated = false;
-                    }
-                }
-
-                ImGui.EndTable();
             }
 
-            if (this.pathClicked)
+            if (this.pathInputActivated)
             {
-                this.SetPath(this.currentPath);
+                if (ImGui.IsKeyReleased(ImGuiKey.Enter))
+                {
+                    if (Directory.Exists(this.pathInputBuffer)) this.SetPath(this.pathInputBuffer);
+                    this.pathInputActivated = false;
+                }
+
+                if (ImGui.IsKeyReleased(ImGuiKey.Escape))
+                {
+                    this.pathInputActivated = false;
+                }
             }
 
-            ImGui.EndChild();
+            ImGui.EndTable();
         }
 
-        private bool SelectableItem(FileStruct file, bool selected, FontAwesomeIcon icon)
+        if (this.pathClicked)
         {
-            const ImGuiSelectableFlags flags = ImGuiSelectableFlags.AllowDoubleClick | ImGuiSelectableFlags.SpanAllColumns;
+            this.SetPath(this.currentPath);
+        }
 
-            ImGui.PushFont(UiBuilder.IconFont);
+        ImGui.EndChild();
+    }
 
-            ImGui.TextUnformatted(icon.ToIconString());
-            ImGui.PopFont();
+    private bool SelectableItem(FileStruct file, bool selected, FontAwesomeIcon icon)
+    {
+        const ImGuiSelectableFlags flags = ImGuiSelectableFlags.AllowDoubleClick | ImGuiSelectableFlags.SpanAllColumns;
 
-            ImGui.SameLine(Scaled(25f));
+        ImGui.PushFont(UiBuilder.IconFont);
 
-            if (ImGui.Selectable(file.FileName, selected, flags))
+        ImGui.TextUnformatted(icon.ToIconString());
+        ImGui.PopFont();
+
+        ImGui.SameLine(Scaled(25f));
+
+        if (ImGui.Selectable(file.FileName, selected, flags))
+        {
+            if (file.Type == FileStructType.Directory)
             {
-                if (file.Type == FileStructType.Directory)
+                if (ImGui.IsMouseDoubleClicked(ImGuiMouseButton.Left))
                 {
-                    if (ImGui.IsMouseDoubleClicked(ImGuiMouseButton.Left))
-                    {
-                        this.pathClicked = this.SelectDirectory(file);
-                        return true;
-                    }
-
-                    if (this.IsDirectoryMode())
-                    {
-                        this.SelectFileName(file);
-                    }
+                    this.pathClicked = this.SelectDirectory(file);
+                    return true;
                 }
-                else
+
+                if (this.IsDirectoryMode())
                 {
                     this.SelectFileName(file);
-                    if (ImGui.IsMouseDoubleClicked(ImGuiMouseButton.Left))
-                    {
-                        this.wantsToQuit = true;
-                        this.isOk = true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        private bool SelectDirectory(FileStruct file)
-        {
-            var pathClick = false;
-
-            if (file.FileName == "..")
-            {
-                if (this.pathDecomposition.Count > 1)
-                {
-                    this.currentPath = ComposeNewPath(this.pathDecomposition.GetRange(0, this.pathDecomposition.Count - 1));
-                    pathClick = true;
                 }
             }
             else
             {
-                var newPath = Path.Combine(this.currentPath, file.FileName);
-
-                if (Directory.Exists(newPath))
+                this.SelectFileName(file);
+                if (ImGui.IsMouseDoubleClicked(ImGuiMouseButton.Left))
                 {
-                    this.currentPath = newPath;
+                    this.wantsToQuit = true;
+                    this.isOk = true;
                 }
-
-                pathClick = true;
             }
-
-            return pathClick;
         }
 
-        private void SelectFileName(FileStruct file)
+        return false;
+    }
+
+    private bool SelectDirectory(FileStruct file)
+    {
+        var pathClick = false;
+
+        if (file.FileName == "..")
         {
-            if (ImGui.GetIO().KeyCtrl)
+            if (this.pathDecomposition.Count > 1)
             {
-                if (this.selectionCountMax == 0)
-                { // infinite select
+                this.currentPath = ComposeNewPath(this.pathDecomposition.GetRange(0, this.pathDecomposition.Count - 1));
+                pathClick = true;
+            }
+        }
+        else
+        {
+            var newPath = Path.Combine(this.currentPath, file.FileName);
+
+            if (Directory.Exists(newPath))
+            {
+                this.currentPath = newPath;
+            }
+
+            pathClick = true;
+        }
+
+        return pathClick;
+    }
+
+    private void SelectFileName(FileStruct file)
+    {
+        if (ImGui.GetIO().KeyCtrl)
+        {
+            if (this.selectionCountMax == 0)
+            { // infinite select
+                if (!this.selectedFileNames.Contains(file.FileName))
+                {
+                    this.AddFileNameInSelection(file.FileName, true);
+                }
+                else
+                {
+                    this.RemoveFileNameInSelection(file.FileName);
+                }
+            }
+            else
+            {
+                if (this.selectedFileNames.Count < this.selectionCountMax)
+                {
                     if (!this.selectedFileNames.Contains(file.FileName))
                     {
                         this.AddFileNameInSelection(file.FileName, true);
@@ -569,76 +582,39 @@ namespace Dalamud.Interface.ImGuiFileDialog
                         this.RemoveFileNameInSelection(file.FileName);
                     }
                 }
-                else
+            }
+        }
+        else if (ImGui.GetIO().KeyShift)
+        {
+            if (this.selectionCountMax != 1)
+            { // can select a block
+                this.selectedFileNames.Clear();
+
+                var startMultiSelection = false;
+                var fileNameToSelect = file.FileName;
+                var savedLastSelectedFileName = string.Empty;
+
+                foreach (var f in this.filteredFiles)
                 {
-                    if (this.selectedFileNames.Count < this.selectionCountMax)
+                    // select top-to-bottom
+                    if (f.FileName == this.lastSelectedFileName)
+                    { // start (the previously selected one)
+                        startMultiSelection = true;
+                        this.AddFileNameInSelection(this.lastSelectedFileName, false);
+                    }
+                    else if (startMultiSelection)
                     {
-                        if (!this.selectedFileNames.Contains(file.FileName))
+                        if (this.selectionCountMax == 0)
                         {
-                            this.AddFileNameInSelection(file.FileName, true);
+                            this.AddFileNameInSelection(f.FileName, false);
                         }
                         else
                         {
-                            this.RemoveFileNameInSelection(file.FileName);
-                        }
-                    }
-                }
-            }
-            else if (ImGui.GetIO().KeyShift)
-            {
-                if (this.selectionCountMax != 1)
-                { // can select a block
-                    this.selectedFileNames.Clear();
-
-                    var startMultiSelection = false;
-                    var fileNameToSelect = file.FileName;
-                    var savedLastSelectedFileName = string.Empty;
-
-                    foreach (var f in this.filteredFiles)
-                    {
-                        // select top-to-bottom
-                        if (f.FileName == this.lastSelectedFileName)
-                        { // start (the previously selected one)
-                            startMultiSelection = true;
-                            this.AddFileNameInSelection(this.lastSelectedFileName, false);
-                        }
-                        else if (startMultiSelection)
-                        {
-                            if (this.selectionCountMax == 0)
+                            if (this.selectedFileNames.Count < this.selectionCountMax)
                             {
                                 this.AddFileNameInSelection(f.FileName, false);
                             }
                             else
-                            {
-                                if (this.selectedFileNames.Count < this.selectionCountMax)
-                                {
-                                    this.AddFileNameInSelection(f.FileName, false);
-                                }
-                                else
-                                {
-                                    startMultiSelection = false;
-                                    if (!string.IsNullOrEmpty(savedLastSelectedFileName))
-                                    {
-                                        this.lastSelectedFileName = savedLastSelectedFileName;
-                                    }
-
-                                    break;
-                                }
-                            }
-                        }
-
-                        // select bottom-to-top
-                        if (f.FileName == fileNameToSelect)
-                        {
-                            if (!startMultiSelection)
-                            {
-                                savedLastSelectedFileName = this.lastSelectedFileName;
-                                this.lastSelectedFileName = fileNameToSelect;
-                                fileNameToSelect = savedLastSelectedFileName;
-                                startMultiSelection = true;
-                                this.AddFileNameInSelection(this.lastSelectedFileName, false);
-                            }
-                            else
                             {
                                 startMultiSelection = false;
                                 if (!string.IsNullOrEmpty(savedLastSelectedFileName))
@@ -650,201 +626,224 @@ namespace Dalamud.Interface.ImGuiFileDialog
                             }
                         }
                     }
+
+                    // select bottom-to-top
+                    if (f.FileName == fileNameToSelect)
+                    {
+                        if (!startMultiSelection)
+                        {
+                            savedLastSelectedFileName = this.lastSelectedFileName;
+                            this.lastSelectedFileName = fileNameToSelect;
+                            fileNameToSelect = savedLastSelectedFileName;
+                            startMultiSelection = true;
+                            this.AddFileNameInSelection(this.lastSelectedFileName, false);
+                        }
+                        else
+                        {
+                            startMultiSelection = false;
+                            if (!string.IsNullOrEmpty(savedLastSelectedFileName))
+                            {
+                                this.lastSelectedFileName = savedLastSelectedFileName;
+                            }
+
+                            break;
+                        }
+                    }
                 }
             }
-            else
-            {
-                this.selectedFileNames.Clear();
-                this.fileNameBuffer = string.Empty;
-                this.AddFileNameInSelection(file.FileName, true);
-            }
+        }
+        else
+        {
+            this.selectedFileNames.Clear();
+            this.fileNameBuffer = string.Empty;
+            this.AddFileNameInSelection(file.FileName, true);
+        }
+    }
+
+    private void AddFileNameInSelection(string name, bool setLastSelection)
+    {
+        this.selectedFileNames.Add(name);
+        if (this.selectedFileNames.Count == 1)
+        {
+            this.fileNameBuffer = name;
+        }
+        else
+        {
+            this.fileNameBuffer = $"{this.selectedFileNames.Count} files Selected";
         }
 
-        private void AddFileNameInSelection(string name, bool setLastSelection)
+        if (setLastSelection)
         {
-            this.selectedFileNames.Add(name);
-            if (this.selectedFileNames.Count == 1)
-            {
-                this.fileNameBuffer = name;
-            }
-            else
-            {
-                this.fileNameBuffer = $"{this.selectedFileNames.Count} files Selected";
-            }
+            this.lastSelectedFileName = name;
+        }
+    }
 
-            if (setLastSelection)
-            {
-                this.lastSelectedFileName = name;
-            }
+    private void RemoveFileNameInSelection(string name)
+    {
+        this.selectedFileNames.Remove(name);
+        if (this.selectedFileNames.Count == 1)
+        {
+            this.fileNameBuffer = name;
+        }
+        else
+        {
+            this.fileNameBuffer = $"{this.selectedFileNames.Count} files Selected";
+        }
+    }
+
+    private bool DrawFooter()
+    {
+        var posY = ImGui.GetCursorPosY();
+
+        if (this.IsDirectoryMode())
+        {
+            ImGui.TextUnformatted("Directory Path :");
+        }
+        else
+        {
+            ImGui.TextUnformatted("File Name :");
         }
 
-        private void RemoveFileNameInSelection(string name)
+        ImGui.SameLine();
+
+        var width = ImGui.GetContentRegionAvail().X - Scaled(100);
+        if (this.filters.Count > 0)
         {
-            this.selectedFileNames.Remove(name);
-            if (this.selectedFileNames.Count == 1)
-            {
-                this.fileNameBuffer = name;
-            }
-            else
-            {
-                this.fileNameBuffer = $"{this.selectedFileNames.Count} files Selected";
-            }
+            width -= Scaled(150);
         }
 
-        private bool DrawFooter()
+        var selectOnly = this.flags.HasFlag(ImGuiFileDialogFlags.SelectOnly);
+
+        ImGui.SetNextItemWidth(width);
+        if (selectOnly) ImGui.PushStyleVar(ImGuiStyleVar.Alpha, 0.5f);
+        ImGui.InputText("##FileName", ref this.fileNameBuffer, 255, selectOnly ? ImGuiInputTextFlags.ReadOnly : ImGuiInputTextFlags.None);
+        if (selectOnly) ImGui.PopStyleVar();
+
+        if (this.filters.Count > 0)
         {
-            var posY = ImGui.GetCursorPosY();
-
-            if (this.IsDirectoryMode())
-            {
-                ImGui.TextUnformatted("Directory Path :");
-            }
-            else
-            {
-                ImGui.TextUnformatted("File Name :");
-            }
-
             ImGui.SameLine();
+            var needToApplyNewFilter = false;
 
-            var width = ImGui.GetContentRegionAvail().X - Scaled(100);
-            if (this.filters.Count > 0)
+            ImGui.SetNextItemWidth(Scaled(150f));
+            if (ImGui.BeginCombo("##Filters", this.selectedFilter.Filter, ImGuiComboFlags.None))
             {
-                width -= Scaled(150);
-            }
-
-            var selectOnly = this.flags.HasFlag(ImGuiFileDialogFlags.SelectOnly);
-
-            ImGui.SetNextItemWidth(width);
-            if (selectOnly) ImGui.PushStyleVar(ImGuiStyleVar.Alpha, 0.5f);
-            ImGui.InputText("##FileName", ref this.fileNameBuffer, 255, selectOnly ? ImGuiInputTextFlags.ReadOnly : ImGuiInputTextFlags.None);
-            if (selectOnly) ImGui.PopStyleVar();
-
-            if (this.filters.Count > 0)
-            {
-                ImGui.SameLine();
-                var needToApplyNewFilter = false;
-
-                ImGui.SetNextItemWidth(Scaled(150f));
-                if (ImGui.BeginCombo("##Filters", this.selectedFilter.Filter, ImGuiComboFlags.None))
+                var idx = 0;
+                foreach (var filter in this.filters)
                 {
-                    var idx = 0;
-                    foreach (var filter in this.filters)
+                    var selected = filter.Filter == this.selectedFilter.Filter;
+                    ImGui.PushID(idx++);
+                    if (ImGui.Selectable(filter.Filter, selected))
                     {
-                        var selected = filter.Filter == this.selectedFilter.Filter;
-                        ImGui.PushID(idx++);
-                        if (ImGui.Selectable(filter.Filter, selected))
-                        {
-                            this.selectedFilter = filter;
-                            needToApplyNewFilter = true;
-                        }
-
-                        ImGui.PopID();
+                        this.selectedFilter = filter;
+                        needToApplyNewFilter = true;
                     }
 
-                    ImGui.EndCombo();
+                    ImGui.PopID();
                 }
 
-                if (needToApplyNewFilter)
-                {
-                    this.SetPath(this.currentPath);
+                ImGui.EndCombo();
+            }
+
+            if (needToApplyNewFilter)
+            {
+                this.SetPath(this.currentPath);
+            }
+        }
+
+        var res = false;
+
+        ImGui.SameLine();
+
+        var disableOk = string.IsNullOrEmpty(this.fileNameBuffer) || (selectOnly && !this.IsItemSelected());
+        if (disableOk) ImGui.PushStyleVar(ImGuiStyleVar.Alpha, 0.5f);
+
+        if (ImGui.Button("Ok") && !disableOk)
+        {
+            this.isOk = true;
+            res = true;
+        }
+
+        if (disableOk) ImGui.PopStyleVar();
+
+        ImGui.SameLine();
+
+        if (ImGui.Button("Cancel"))
+        {
+            this.isOk = false;
+            res = true;
+        }
+
+        this.footerHeight = ImGui.GetCursorPosY() - posY;
+
+        if (this.wantsToQuit && this.isOk)
+        {
+            res = true;
+        }
+
+        return res;
+    }
+
+    private bool IsItemSelected()
+    {
+        if (this.selectedFileNames.Count > 0) return true;
+        if (this.IsDirectoryMode()) return true; // current directory
+        return false;
+    }
+
+    private bool ConfirmOrOpenOverWriteFileDialogIfNeeded(bool lastAction)
+    {
+        if (this.IsDirectoryMode()) return lastAction;
+        if (!this.isOk && lastAction) return true; // no need to confirm anything, since it was cancelled
+
+        var confirmOverwrite = this.flags.HasFlag(ImGuiFileDialogFlags.ConfirmOverwrite);
+
+        if (this.isOk && lastAction && !confirmOverwrite) return true;
+
+        if (this.okResultToConfirm || (this.isOk && lastAction && confirmOverwrite))
+        { // if waiting on a confirmation, or need to start one
+            if (this.isOk)
+            {
+                if (!File.Exists(this.GetFilePathName()))
+                { // quit dialog, it doesn't exist anyway
+                    return true;
                 }
-            }
 
-            var res = false;
-
-            ImGui.SameLine();
-
-            var disableOk = string.IsNullOrEmpty(this.fileNameBuffer) || (selectOnly && !this.IsItemSelected());
-            if (disableOk) ImGui.PushStyleVar(ImGuiStyleVar.Alpha, 0.5f);
-
-            if (ImGui.Button("Ok") && !disableOk)
-            {
-                this.isOk = true;
-                res = true;
-            }
-
-            if (disableOk) ImGui.PopStyleVar();
-
-            ImGui.SameLine();
-
-            if (ImGui.Button("Cancel"))
-            {
+                // already exists, open dialog to confirm overwrite
                 this.isOk = false;
-                res = true;
+                this.okResultToConfirm = true;
             }
 
-            this.footerHeight = ImGui.GetCursorPosY() - posY;
+            var name = $"The file Already Exists !##{this.title}{this.id}OverWriteDialog";
+            var res = false;
+            var open = true;
 
-            if (this.wantsToQuit && this.isOk)
+            ImGui.OpenPopup(name);
+            if (ImGui.BeginPopupModal(name, ref open, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove))
             {
-                res = true;
+                ImGui.TextUnformatted("Would you like to Overwrite it ?");
+                if (ImGui.Button("Confirm"))
+                {
+                    this.okResultToConfirm = false;
+                    this.isOk = true;
+                    res = true;
+                    ImGui.CloseCurrentPopup();
+                }
+
+                ImGui.SameLine();
+                if (ImGui.Button("Cancel"))
+                {
+                    this.okResultToConfirm = false;
+                    this.isOk = false;
+                    res = false;
+                    ImGui.CloseCurrentPopup();
+                }
+
+                ImGui.EndPopup();
             }
 
             return res;
         }
 
-        private bool IsItemSelected()
-        {
-            if (this.selectedFileNames.Count > 0) return true;
-            if (this.IsDirectoryMode()) return true; // current directory
-            return false;
-        }
-
-        private bool ConfirmOrOpenOverWriteFileDialogIfNeeded(bool lastAction)
-        {
-            if (this.IsDirectoryMode()) return lastAction;
-            if (!this.isOk && lastAction) return true; // no need to confirm anything, since it was cancelled
-
-            var confirmOverwrite = this.flags.HasFlag(ImGuiFileDialogFlags.ConfirmOverwrite);
-
-            if (this.isOk && lastAction && !confirmOverwrite) return true;
-
-            if (this.okResultToConfirm || (this.isOk && lastAction && confirmOverwrite))
-            { // if waiting on a confirmation, or need to start one
-                if (this.isOk)
-                {
-                    if (!File.Exists(this.GetFilePathName()))
-                    { // quit dialog, it doesn't exist anyway
-                        return true;
-                    }
-
-                    // already exists, open dialog to confirm overwrite
-                    this.isOk = false;
-                    this.okResultToConfirm = true;
-                }
-
-                var name = $"The file Already Exists !##{this.title}{this.id}OverWriteDialog";
-                var res = false;
-                var open = true;
-
-                ImGui.OpenPopup(name);
-                if (ImGui.BeginPopupModal(name, ref open, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove))
-                {
-                    ImGui.TextUnformatted("Would you like to Overwrite it ?");
-                    if (ImGui.Button("Confirm"))
-                    {
-                        this.okResultToConfirm = false;
-                        this.isOk = true;
-                        res = true;
-                        ImGui.CloseCurrentPopup();
-                    }
-
-                    ImGui.SameLine();
-                    if (ImGui.Button("Cancel"))
-                    {
-                        this.okResultToConfirm = false;
-                        this.isOk = false;
-                        res = false;
-                        ImGui.CloseCurrentPopup();
-                    }
-
-                    ImGui.EndPopup();
-                }
-
-                return res;
-            }
-
-            return false;
-        }
+        return false;
     }
 }
diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.cs
index de42e9e9d..fe224be76 100644
--- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.cs
+++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.cs
@@ -5,294 +5,293 @@ using System.Linq;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.ImGuiFileDialog
+namespace Dalamud.Interface.ImGuiFileDialog;
+
+/// <summary>
+/// A file or folder picker.
+/// </summary>
+public partial class FileDialog
 {
     /// <summary>
-    /// A file or folder picker.
+    /// The flags used to draw the file picker window.
     /// </summary>
-    public partial class FileDialog
-    {
-        /// <summary>
-        /// The flags used to draw the file picker window.
-        /// </summary>
 #pragma warning disable SA1401
-        public ImGuiWindowFlags WindowFlags;
+    public ImGuiWindowFlags WindowFlags;
 #pragma warning restore SA1401
 
-        private readonly string title;
-        private readonly int selectionCountMax;
-        private readonly ImGuiFileDialogFlags flags;
-        private readonly string id;
-        private readonly string defaultExtension;
-        private readonly string defaultFileName;
+    private readonly string title;
+    private readonly int selectionCountMax;
+    private readonly ImGuiFileDialogFlags flags;
+    private readonly string id;
+    private readonly string defaultExtension;
+    private readonly string defaultFileName;
 
-        private bool visible;
+    private bool visible;
 
-        private string currentPath;
-        private string fileNameBuffer = string.Empty;
+    private string currentPath;
+    private string fileNameBuffer = string.Empty;
 
-        private List<string> pathDecomposition = new();
-        private bool pathClicked = true;
-        private bool pathInputActivated = false;
-        private string pathInputBuffer = string.Empty;
+    private List<string> pathDecomposition = new();
+    private bool pathClicked = true;
+    private bool pathInputActivated = false;
+    private string pathInputBuffer = string.Empty;
 
-        private bool isModal = false;
-        private bool okResultToConfirm = false;
-        private bool isOk;
-        private bool wantsToQuit;
+    private bool isModal = false;
+    private bool okResultToConfirm = false;
+    private bool isOk;
+    private bool wantsToQuit;
 
-        private bool createDirectoryMode = false;
-        private string createDirectoryBuffer = string.Empty;
+    private bool createDirectoryMode = false;
+    private string createDirectoryBuffer = string.Empty;
 
-        private string searchBuffer = string.Empty;
+    private string searchBuffer = string.Empty;
 
-        private string lastSelectedFileName = string.Empty;
-        private List<string> selectedFileNames = new();
+    private string lastSelectedFileName = string.Empty;
+    private List<string> selectedFileNames = new();
 
-        private float footerHeight = 0;
+    private float footerHeight = 0;
 
-        private string selectedSideBar = string.Empty;
-        private List<SideBarItem> drives = new();
-        private List<SideBarItem> quickAccess = new();
+    private string selectedSideBar = string.Empty;
+    private List<SideBarItem> drives = new();
+    private List<SideBarItem> quickAccess = new();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileDialog"/> class.
-        /// </summary>
-        /// <param name="id">A unique id for the dialog.</param>
-        /// <param name="title">The text which is shown at the top of the dialog.</param>
-        /// <param name="filters">Which file extension filters to apply. This should be left blank to select directories.</param>
-        /// <param name="path">The directory which the dialog should start inside of.</param>
-        /// <param name="defaultFileName">The default file or directory name.</param>
-        /// <param name="defaultExtension">The default extension when creating new files.</param>
-        /// <param name="selectionCountMax">The maximum amount of files or directories which can be selected. Set to 0 for an infinite number.</param>
-        /// <param name="isModal">Whether the dialog should be a modal popup.</param>
-        /// <param name="flags">Settings flags for the dialog, see <see cref="ImGuiFileDialogFlags"/>.</param>
-        public FileDialog(
-            string id,
-            string title,
-            string filters,
-            string path,
-            string defaultFileName,
-            string defaultExtension,
-            int selectionCountMax,
-            bool isModal,
-            ImGuiFileDialogFlags flags)
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FileDialog"/> class.
+    /// </summary>
+    /// <param name="id">A unique id for the dialog.</param>
+    /// <param name="title">The text which is shown at the top of the dialog.</param>
+    /// <param name="filters">Which file extension filters to apply. This should be left blank to select directories.</param>
+    /// <param name="path">The directory which the dialog should start inside of.</param>
+    /// <param name="defaultFileName">The default file or directory name.</param>
+    /// <param name="defaultExtension">The default extension when creating new files.</param>
+    /// <param name="selectionCountMax">The maximum amount of files or directories which can be selected. Set to 0 for an infinite number.</param>
+    /// <param name="isModal">Whether the dialog should be a modal popup.</param>
+    /// <param name="flags">Settings flags for the dialog, see <see cref="ImGuiFileDialogFlags"/>.</param>
+    public FileDialog(
+        string id,
+        string title,
+        string filters,
+        string path,
+        string defaultFileName,
+        string defaultExtension,
+        int selectionCountMax,
+        bool isModal,
+        ImGuiFileDialogFlags flags)
+    {
+        this.id = id;
+        this.title = title;
+        this.flags = flags;
+        this.selectionCountMax = selectionCountMax;
+        this.isModal = isModal;
+        this.WindowFlags = ImGuiWindowFlags.NoNav;
+        if (!isModal)
+            this.WindowFlags |= ImGuiWindowFlags.NoScrollbar;
+
+        this.currentPath = path;
+        this.defaultExtension = defaultExtension;
+        this.defaultFileName = defaultFileName;
+
+        this.ParseFilters(filters);
+        this.SetSelectedFilterWithExt(this.defaultExtension);
+        this.SetDefaultFileName();
+        this.SetPath(this.currentPath);
+
+        this.SetupSideBar();
+    }
+
+    /// <summary>
+    /// Shows the dialog.
+    /// </summary>
+    public void Show()
+    {
+        this.visible = true;
+    }
+
+    /// <summary>
+    /// Hides the dialog.
+    /// </summary>
+    public void Hide()
+    {
+        this.visible = false;
+    }
+
+    /// <summary>
+    /// Gets whether a file or folder was successfully selected.
+    /// </summary>
+    /// <returns>The success state. Will be false if the selection was canceled or was otherwise unsuccessful.</returns>
+    public bool GetIsOk()
+    {
+        return this.isOk;
+    }
+
+    /// <summary>
+    /// Gets the result of the selection.
+    /// </summary>
+    /// <returns>The result of the selection (file or folder path). If multiple entries were selected, they are separated with commas.</returns>
+    [Obsolete("Use GetResults() instead.", true)]
+    public string GetResult()
+    {
+        return string.Join(',', this.GetResults());
+    }
+
+    /// <summary>
+    /// Gets the result of the selection.
+    /// </summary>
+    /// <returns>The list of selected paths.</returns>
+    public List<string> GetResults()
+    {
+        if (!this.flags.HasFlag(ImGuiFileDialogFlags.SelectOnly))
         {
-            this.id = id;
-            this.title = title;
-            this.flags = flags;
-            this.selectionCountMax = selectionCountMax;
-            this.isModal = isModal;
-            this.WindowFlags = ImGuiWindowFlags.NoNav;
-            if (!isModal)
-                this.WindowFlags |= ImGuiWindowFlags.NoScrollbar;
-
-            this.currentPath = path;
-            this.defaultExtension = defaultExtension;
-            this.defaultFileName = defaultFileName;
-
-            this.ParseFilters(filters);
-            this.SetSelectedFilterWithExt(this.defaultExtension);
-            this.SetDefaultFileName();
-            this.SetPath(this.currentPath);
-
-            this.SetupSideBar();
+            return new List<string> { this.GetFilePathName() };
         }
 
-        /// <summary>
-        /// Shows the dialog.
-        /// </summary>
-        public void Show()
+        if (this.IsDirectoryMode() && this.selectedFileNames.Count == 0)
         {
-            this.visible = true;
+            return new List<string> { this.GetFilePathName() }; // current directory
         }
 
-        /// <summary>
-        /// Hides the dialog.
-        /// </summary>
-        public void Hide()
-        {
-            this.visible = false;
-        }
+        var fullPaths = this.selectedFileNames.Where(x => !string.IsNullOrEmpty(x)).Select(x => Path.Combine(this.currentPath, x));
+        return fullPaths.ToList();
+    }
 
-        /// <summary>
-        /// Gets whether a file or folder was successfully selected.
-        /// </summary>
-        /// <returns>The success state. Will be false if the selection was canceled or was otherwise unsuccessful.</returns>
-        public bool GetIsOk()
+    /// <summary>
+    /// Gets the current path of the dialog.
+    /// </summary>
+    /// <returns>The path of the directory which the dialog is current viewing.</returns>
+    public string GetCurrentPath()
+    {
+        if (this.IsDirectoryMode())
         {
-            return this.isOk;
-        }
-
-        /// <summary>
-        /// Gets the result of the selection.
-        /// </summary>
-        /// <returns>The result of the selection (file or folder path). If multiple entries were selected, they are separated with commas.</returns>
-        [Obsolete("Use GetResults() instead.", true)]
-        public string GetResult()
-        {
-            return string.Join(',', this.GetResults());
-        }
-
-        /// <summary>
-        /// Gets the result of the selection.
-        /// </summary>
-        /// <returns>The list of selected paths.</returns>
-        public List<string> GetResults()
-        {
-            if (!this.flags.HasFlag(ImGuiFileDialogFlags.SelectOnly))
+            // combine path file with directory input
+            var selectedDirectory = this.fileNameBuffer;
+            if (!string.IsNullOrEmpty(selectedDirectory) && selectedDirectory != ".")
             {
-                return new List<string> { this.GetFilePathName() };
+                return string.IsNullOrEmpty(this.currentPath) ? selectedDirectory : Path.Combine(this.currentPath, selectedDirectory);
             }
-
-            if (this.IsDirectoryMode() && this.selectedFileNames.Count == 0)
-            {
-                return new List<string> { this.GetFilePathName() }; // current directory
-            }
-
-            var fullPaths = this.selectedFileNames.Where(x => !string.IsNullOrEmpty(x)).Select(x => Path.Combine(this.currentPath, x));
-            return fullPaths.ToList();
         }
 
-        /// <summary>
-        /// Gets the current path of the dialog.
-        /// </summary>
-        /// <returns>The path of the directory which the dialog is current viewing.</returns>
-        public string GetCurrentPath()
+        return this.currentPath;
+    }
+
+    /// <summary>
+    /// Set or remove a quick access folder for the navigation panel.
+    /// </summary>
+    /// <param name="name">The displayed name of the folder. If this name already exists, it will be overwritten.</param>
+    /// <param name="path">The new linked path. If this is empty, no link will be added and existing links will be removed.</param>
+    /// <param name="icon">The FontAwesomeIcon-ID of the icon displayed before the name.</param>
+    /// <param name="position">An optional position at which to insert the new link. If the link is updated, having this less than zero will keep its position.
+    /// Otherwise, invalid indices will insert it at the end.</param>
+    public void SetQuickAccess(string name, string path, FontAwesomeIcon icon, int position = -1)
+    {
+        var idx = this.quickAccess.FindIndex(q => q.Text.Equals(name, StringComparison.InvariantCultureIgnoreCase));
+        if (idx >= 0)
         {
-            if (this.IsDirectoryMode())
+            if (position >= 0 || path.Length == 0)
             {
-                // combine path file with directory input
-                var selectedDirectory = this.fileNameBuffer;
-                if (!string.IsNullOrEmpty(selectedDirectory) && selectedDirectory != ".")
-                {
-                    return string.IsNullOrEmpty(this.currentPath) ? selectedDirectory : Path.Combine(this.currentPath, selectedDirectory);
-                }
-            }
-
-            return this.currentPath;
-        }
-
-        /// <summary>
-        /// Set or remove a quick access folder for the navigation panel.
-        /// </summary>
-        /// <param name="name">The displayed name of the folder. If this name already exists, it will be overwritten.</param>
-        /// <param name="path">The new linked path. If this is empty, no link will be added and existing links will be removed.</param>
-        /// <param name="icon">The FontAwesomeIcon-ID of the icon displayed before the name.</param>
-        /// <param name="position">An optional position at which to insert the new link. If the link is updated, having this less than zero will keep its position.
-        /// Otherwise, invalid indices will insert it at the end.</param>
-        public void SetQuickAccess(string name, string path, FontAwesomeIcon icon, int position = -1)
-        {
-            var idx = this.quickAccess.FindIndex(q => q.Text.Equals(name, StringComparison.InvariantCultureIgnoreCase));
-            if (idx >= 0)
-            {
-                if (position >= 0 || path.Length == 0)
-                {
-                    this.quickAccess.RemoveAt(idx);
-                }
-                else
-                {
-                    this.quickAccess[idx] = new SideBarItem(name, path, icon);
-                    return;
-                }
-            }
-
-            if (path.Length == 0) return;
-
-            if (position < 0 || position >= this.quickAccess.Count)
-            {
-                this.quickAccess.Add(new SideBarItem(name, path, icon));
+                this.quickAccess.RemoveAt(idx);
             }
             else
             {
-                this.quickAccess.Insert(position, new SideBarItem(name, path, icon));
+                this.quickAccess[idx] = new SideBarItem(name, path, icon);
+                return;
             }
         }
 
-        private string GetFilePathName()
+        if (path.Length == 0) return;
+
+        if (position < 0 || position >= this.quickAccess.Count)
         {
-            var path = this.GetCurrentPath();
-            var fileName = this.GetCurrentFileName();
+            this.quickAccess.Add(new SideBarItem(name, path, icon));
+        }
+        else
+        {
+            this.quickAccess.Insert(position, new SideBarItem(name, path, icon));
+        }
+    }
 
-            if (!string.IsNullOrEmpty(fileName))
-            {
-                return Path.Combine(path, fileName);
-            }
+    private string GetFilePathName()
+    {
+        var path = this.GetCurrentPath();
+        var fileName = this.GetCurrentFileName();
 
-            return path;
+        if (!string.IsNullOrEmpty(fileName))
+        {
+            return Path.Combine(path, fileName);
         }
 
-        private string GetCurrentFileName()
+        return path;
+    }
+
+    private string GetCurrentFileName()
+    {
+        if (this.IsDirectoryMode())
         {
-            if (this.IsDirectoryMode())
-            {
-                return string.Empty;
-            }
+            return string.Empty;
+        }
 
-            var result = this.fileNameBuffer;
-
-            // a collection like {.cpp, .h}, so can't decide on an extension
-            if (this.selectedFilter.CollectionFilters is { Count: > 0 })
-            {
-                return result;
-            }
-
-            // a single one, like .cpp
-            if (!this.selectedFilter.Filter.Contains('*') && result != this.selectedFilter.Filter)
-            {
-                var lastPoint = result.LastIndexOf('.');
-                if (lastPoint != -1)
-                {
-                    result = result[..lastPoint];
-                }
-
-                result += this.selectedFilter.Filter;
-            }
+        var result = this.fileNameBuffer;
 
+        // a collection like {.cpp, .h}, so can't decide on an extension
+        if (this.selectedFilter.CollectionFilters is { Count: > 0 })
+        {
             return result;
         }
 
-        private void SetDefaultFileName()
+        // a single one, like .cpp
+        if (!this.selectedFilter.Filter.Contains('*') && result != this.selectedFilter.Filter)
         {
-            this.fileNameBuffer = this.defaultFileName;
-        }
-
-        private void SetPath(string path)
-        {
-            this.selectedSideBar = string.Empty;
-            this.currentPath = path;
-            this.files.Clear();
-            this.pathDecomposition.Clear();
-            this.selectedFileNames.Clear();
-            if (this.IsDirectoryMode())
+            var lastPoint = result.LastIndexOf('.');
+            if (lastPoint != -1)
             {
-                this.SetDefaultFileName();
+                result = result[..lastPoint];
             }
 
-            this.ScanDir(this.currentPath);
+            result += this.selectedFilter.Filter;
         }
 
-        private void SetCurrentDir(string path)
+        return result;
+    }
+
+    private void SetDefaultFileName()
+    {
+        this.fileNameBuffer = this.defaultFileName;
+    }
+
+    private void SetPath(string path)
+    {
+        this.selectedSideBar = string.Empty;
+        this.currentPath = path;
+        this.files.Clear();
+        this.pathDecomposition.Clear();
+        this.selectedFileNames.Clear();
+        if (this.IsDirectoryMode())
         {
-            var dir = new DirectoryInfo(path);
-            this.currentPath = dir.FullName;
-            if (this.currentPath[^1] == Path.DirectorySeparatorChar)
-            { // handle selecting a drive, like C: -> C:\
-                this.currentPath = this.currentPath[..^1];
-            }
-
-            this.pathInputBuffer = this.currentPath;
-            this.pathDecomposition = new List<string>(this.currentPath.Split(Path.DirectorySeparatorChar));
+            this.SetDefaultFileName();
         }
 
-        private bool IsDirectoryMode()
-        {
-            return this.filters.Count == 0;
+        this.ScanDir(this.currentPath);
+    }
+
+    private void SetCurrentDir(string path)
+    {
+        var dir = new DirectoryInfo(path);
+        this.currentPath = dir.FullName;
+        if (this.currentPath[^1] == Path.DirectorySeparatorChar)
+        { // handle selecting a drive, like C: -> C:\
+            this.currentPath = this.currentPath[..^1];
         }
 
-        private void ResetEvents()
-        {
-            this.pathClicked = false;
-        }
+        this.pathInputBuffer = this.currentPath;
+        this.pathDecomposition = new List<string>(this.currentPath.Split(Path.DirectorySeparatorChar));
+    }
+
+    private bool IsDirectoryMode()
+    {
+        return this.filters.Count == 0;
+    }
+
+    private void ResetEvents()
+    {
+        this.pathClicked = false;
     }
 }
diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialogManager.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialogManager.cs
index eff871d30..7970279af 100644
--- a/Dalamud/Interface/ImGuiFileDialog/FileDialogManager.cs
+++ b/Dalamud/Interface/ImGuiFileDialog/FileDialogManager.cs
@@ -3,198 +3,197 @@ using System.Collections.Generic;
 
 using ImGuiNET;
 
-namespace Dalamud.Interface.ImGuiFileDialog
-{
-    /// <summary>
-    /// A manager for the <see cref="FileDialog"/> class.
-    /// </summary>
-    public class FileDialogManager
-    {
-#pragma warning disable SA1401
-        /// <summary> Additional quick access items for the side bar.</summary>
-        public readonly List<(string Name, string Path, FontAwesomeIcon Icon, int Position)> CustomSideBarItems = new();
+namespace Dalamud.Interface.ImGuiFileDialog;
 
-        /// <summary> Additional flags with which to draw the window. </summary>
-        public ImGuiWindowFlags AddedWindowFlags = ImGuiWindowFlags.None;
+/// <summary>
+/// A manager for the <see cref="FileDialog"/> class.
+/// </summary>
+public class FileDialogManager
+{
+#pragma warning disable SA1401
+    /// <summary> Additional quick access items for the side bar.</summary>
+    public readonly List<(string Name, string Path, FontAwesomeIcon Icon, int Position)> CustomSideBarItems = new();
+
+    /// <summary> Additional flags with which to draw the window. </summary>
+    public ImGuiWindowFlags AddedWindowFlags = ImGuiWindowFlags.None;
 #pragma warning restore SA1401
 
-        private FileDialog? dialog;
-        private Action<bool, string>? callback;
-        private Action<bool, List<string>>? multiCallback;
-        private string savedPath = ".";
+    private FileDialog? dialog;
+    private Action<bool, string>? callback;
+    private Action<bool, List<string>>? multiCallback;
+    private string savedPath = ".";
 
-        /// <summary>
-        /// Create a dialog which selects an already existing folder.
-        /// </summary>
-        /// <param name="title">The header title of the dialog.</param>
-        /// <param name="callback">The action to execute when the dialog is finished.</param>
-        public void OpenFolderDialog(string title, Action<bool, string> callback)
-        {
-            this.SetDialog("OpenFolderDialog", title, string.Empty, this.savedPath, ".", string.Empty, 1, false, ImGuiFileDialogFlags.SelectOnly, callback);
-        }
+    /// <summary>
+    /// Create a dialog which selects an already existing folder.
+    /// </summary>
+    /// <param name="title">The header title of the dialog.</param>
+    /// <param name="callback">The action to execute when the dialog is finished.</param>
+    public void OpenFolderDialog(string title, Action<bool, string> callback)
+    {
+        this.SetDialog("OpenFolderDialog", title, string.Empty, this.savedPath, ".", string.Empty, 1, false, ImGuiFileDialogFlags.SelectOnly, callback);
+    }
 
-        /// <summary>
-        /// Create a dialog which selects an already existing folder.
-        /// </summary>
-        /// <param name="title">The header title of the dialog.</param>
-        /// <param name="callback">The action to execute when the dialog is finished.</param>
-        /// <param name="startPath">The directory which the dialog should start inside of. The last path this manager was in is used if this is null.</param>
-        /// <param name="isModal">Whether the dialog should be a modal popup.</param>
-        public void OpenFolderDialog(string title, Action<bool, string> callback, string? startPath, bool isModal = false)
-        {
-            this.SetDialog("OpenFolderDialog", title, string.Empty, startPath ?? this.savedPath, ".", string.Empty, 1, isModal, ImGuiFileDialogFlags.SelectOnly, callback);
-        }
+    /// <summary>
+    /// Create a dialog which selects an already existing folder.
+    /// </summary>
+    /// <param name="title">The header title of the dialog.</param>
+    /// <param name="callback">The action to execute when the dialog is finished.</param>
+    /// <param name="startPath">The directory which the dialog should start inside of. The last path this manager was in is used if this is null.</param>
+    /// <param name="isModal">Whether the dialog should be a modal popup.</param>
+    public void OpenFolderDialog(string title, Action<bool, string> callback, string? startPath, bool isModal = false)
+    {
+        this.SetDialog("OpenFolderDialog", title, string.Empty, startPath ?? this.savedPath, ".", string.Empty, 1, isModal, ImGuiFileDialogFlags.SelectOnly, callback);
+    }
 
-        /// <summary>
-        /// Create a dialog which selects an already existing folder or new folder.
-        /// </summary>
-        /// <param name="title">The header title of the dialog.</param>
-        /// <param name="defaultFolderName">The default name to use when creating a new folder.</param>
-        /// <param name="callback">The action to execute when the dialog is finished.</param>
-        public void SaveFolderDialog(string title, string defaultFolderName, Action<bool, string> callback)
-        {
-            this.SetDialog("SaveFolderDialog", title, string.Empty, this.savedPath, defaultFolderName, string.Empty, 1, false, ImGuiFileDialogFlags.None, callback);
-        }
+    /// <summary>
+    /// Create a dialog which selects an already existing folder or new folder.
+    /// </summary>
+    /// <param name="title">The header title of the dialog.</param>
+    /// <param name="defaultFolderName">The default name to use when creating a new folder.</param>
+    /// <param name="callback">The action to execute when the dialog is finished.</param>
+    public void SaveFolderDialog(string title, string defaultFolderName, Action<bool, string> callback)
+    {
+        this.SetDialog("SaveFolderDialog", title, string.Empty, this.savedPath, defaultFolderName, string.Empty, 1, false, ImGuiFileDialogFlags.None, callback);
+    }
 
-        /// <summary>
-        /// Create a dialog which selects an already existing folder or new folder.
-        /// </summary>
-        /// <param name="title">The header title of the dialog.</param>
-        /// <param name="defaultFolderName">The default name to use when creating a new folder.</param>
-        /// <param name="callback">The action to execute when the dialog is finished.</param>
-        /// <param name="startPath">The directory which the dialog should start inside of. The last path this manager was in is used if this is null.</param>
-        /// <param name="isModal">Whether the dialog should be a modal popup.</param>
-        public void SaveFolderDialog(string title, string defaultFolderName, Action<bool, string> callback, string? startPath, bool isModal = false)
-        {
-            this.SetDialog("SaveFolderDialog", title, string.Empty, startPath ?? this.savedPath, defaultFolderName, string.Empty, 1, isModal, ImGuiFileDialogFlags.None, callback);
-        }
+    /// <summary>
+    /// Create a dialog which selects an already existing folder or new folder.
+    /// </summary>
+    /// <param name="title">The header title of the dialog.</param>
+    /// <param name="defaultFolderName">The default name to use when creating a new folder.</param>
+    /// <param name="callback">The action to execute when the dialog is finished.</param>
+    /// <param name="startPath">The directory which the dialog should start inside of. The last path this manager was in is used if this is null.</param>
+    /// <param name="isModal">Whether the dialog should be a modal popup.</param>
+    public void SaveFolderDialog(string title, string defaultFolderName, Action<bool, string> callback, string? startPath, bool isModal = false)
+    {
+        this.SetDialog("SaveFolderDialog", title, string.Empty, startPath ?? this.savedPath, defaultFolderName, string.Empty, 1, isModal, ImGuiFileDialogFlags.None, callback);
+    }
 
-        /// <summary>
-        /// Create a dialog which selects a single, already existing file.
-        /// </summary>
-        /// <param name="title">The header title of the dialog.</param>
-        /// <param name="filters">Which files to show in the dialog.</param>
-        /// <param name="callback">The action to execute when the dialog is finished.</param>
-        public void OpenFileDialog(string title, string filters, Action<bool, string> callback)
-        {
-            this.SetDialog("OpenFileDialog", title, filters, this.savedPath, ".", string.Empty, 1, false, ImGuiFileDialogFlags.SelectOnly, callback);
-        }
+    /// <summary>
+    /// Create a dialog which selects a single, already existing file.
+    /// </summary>
+    /// <param name="title">The header title of the dialog.</param>
+    /// <param name="filters">Which files to show in the dialog.</param>
+    /// <param name="callback">The action to execute when the dialog is finished.</param>
+    public void OpenFileDialog(string title, string filters, Action<bool, string> callback)
+    {
+        this.SetDialog("OpenFileDialog", title, filters, this.savedPath, ".", string.Empty, 1, false, ImGuiFileDialogFlags.SelectOnly, callback);
+    }
 
-        /// <summary>
-        /// Create a dialog which selects already existing files.
-        /// </summary>
-        /// <param name="title">The header title of the dialog.</param>
-        /// <param name="filters">Which files to show in the dialog.</param>
-        /// <param name="callback">The action to execute when the dialog is finished.</param>
-        /// <param name="selectionCountMax">The maximum amount of files or directories which can be selected. Set to 0 for an infinite number.</param>
-        /// <param name="startPath">The directory which the dialog should start inside of. The last path this manager was in is used if this is null.</param>
-        /// <param name="isModal">Whether the dialog should be a modal popup.</param>
-        public void OpenFileDialog(
-            string title,
-            string filters,
-            Action<bool, List<string>> callback,
-            int selectionCountMax,
-            string? startPath = null,
-            bool isModal = false)
-        {
-            this.SetDialog("OpenFileDialog", title, filters, startPath ?? this.savedPath, ".", string.Empty, selectionCountMax, isModal, ImGuiFileDialogFlags.SelectOnly, callback);
-        }
+    /// <summary>
+    /// Create a dialog which selects already existing files.
+    /// </summary>
+    /// <param name="title">The header title of the dialog.</param>
+    /// <param name="filters">Which files to show in the dialog.</param>
+    /// <param name="callback">The action to execute when the dialog is finished.</param>
+    /// <param name="selectionCountMax">The maximum amount of files or directories which can be selected. Set to 0 for an infinite number.</param>
+    /// <param name="startPath">The directory which the dialog should start inside of. The last path this manager was in is used if this is null.</param>
+    /// <param name="isModal">Whether the dialog should be a modal popup.</param>
+    public void OpenFileDialog(
+        string title,
+        string filters,
+        Action<bool, List<string>> callback,
+        int selectionCountMax,
+        string? startPath = null,
+        bool isModal = false)
+    {
+        this.SetDialog("OpenFileDialog", title, filters, startPath ?? this.savedPath, ".", string.Empty, selectionCountMax, isModal, ImGuiFileDialogFlags.SelectOnly, callback);
+    }
 
-        /// <summary>
-        /// Create a dialog which selects an already existing folder or new file.
-        /// </summary>
-        /// <param name="title">The header title of the dialog.</param>
-        /// <param name="filters">Which files to show in the dialog.</param>
-        /// <param name="defaultFileName">The default name to use when creating a new file.</param>
-        /// <param name="defaultExtension">The extension to use when creating a new file.</param>
-        /// <param name="callback">The action to execute when the dialog is finished.</param>
-        public void SaveFileDialog(
-            string title,
-            string filters,
-            string defaultFileName,
-            string defaultExtension,
-            Action<bool, string> callback)
-        {
-            this.SetDialog("SaveFileDialog", title, filters, this.savedPath, defaultFileName, defaultExtension, 1, false, ImGuiFileDialogFlags.None, callback);
-        }
+    /// <summary>
+    /// Create a dialog which selects an already existing folder or new file.
+    /// </summary>
+    /// <param name="title">The header title of the dialog.</param>
+    /// <param name="filters">Which files to show in the dialog.</param>
+    /// <param name="defaultFileName">The default name to use when creating a new file.</param>
+    /// <param name="defaultExtension">The extension to use when creating a new file.</param>
+    /// <param name="callback">The action to execute when the dialog is finished.</param>
+    public void SaveFileDialog(
+        string title,
+        string filters,
+        string defaultFileName,
+        string defaultExtension,
+        Action<bool, string> callback)
+    {
+        this.SetDialog("SaveFileDialog", title, filters, this.savedPath, defaultFileName, defaultExtension, 1, false, ImGuiFileDialogFlags.None, callback);
+    }
 
-        /// <summary>
-        /// Create a dialog which selects an already existing folder or new file.
-        /// </summary>
-        /// <param name="title">The header title of the dialog.</param>
-        /// <param name="filters">Which files to show in the dialog.</param>
-        /// <param name="defaultFileName">The default name to use when creating a new file.</param>
-        /// <param name="defaultExtension">The extension to use when creating a new file.</param>
-        /// <param name="callback">The action to execute when the dialog is finished.</param>
-        /// <param name="startPath">The directory which the dialog should start inside of. The last path this manager was in is used if this is null.</param>
-        /// <param name="isModal">Whether the dialog should be a modal popup.</param>
-        public void SaveFileDialog(
-            string title,
-            string filters,
-            string defaultFileName,
-            string defaultExtension,
-            Action<bool, string> callback,
-            string? startPath,
-            bool isModal = false)
-        {
-            this.SetDialog("SaveFileDialog", title, filters, startPath ?? this.savedPath, defaultFileName, defaultExtension, 1, isModal, ImGuiFileDialogFlags.None, callback);
-        }
+    /// <summary>
+    /// Create a dialog which selects an already existing folder or new file.
+    /// </summary>
+    /// <param name="title">The header title of the dialog.</param>
+    /// <param name="filters">Which files to show in the dialog.</param>
+    /// <param name="defaultFileName">The default name to use when creating a new file.</param>
+    /// <param name="defaultExtension">The extension to use when creating a new file.</param>
+    /// <param name="callback">The action to execute when the dialog is finished.</param>
+    /// <param name="startPath">The directory which the dialog should start inside of. The last path this manager was in is used if this is null.</param>
+    /// <param name="isModal">Whether the dialog should be a modal popup.</param>
+    public void SaveFileDialog(
+        string title,
+        string filters,
+        string defaultFileName,
+        string defaultExtension,
+        Action<bool, string> callback,
+        string? startPath,
+        bool isModal = false)
+    {
+        this.SetDialog("SaveFileDialog", title, filters, startPath ?? this.savedPath, defaultFileName, defaultExtension, 1, isModal, ImGuiFileDialogFlags.None, callback);
+    }
 
-        /// <summary>
-        /// Draws the current dialog, if any, and executes the callback if it is finished.
-        /// </summary>
-        public void Draw()
-        {
-            if (this.dialog == null) return;
-            if (this.dialog.Draw())
-            {
-                var isOk = this.dialog.GetIsOk();
-                var results = this.dialog.GetResults();
-                this.callback?.Invoke(isOk, results.Count > 0 ? results[0] : string.Empty);
-                this.multiCallback?.Invoke(isOk, results);
-                this.savedPath = this.dialog.GetCurrentPath();
-                this.Reset();
-            }
-        }
-
-        /// <summary>
-        /// Removes the current dialog, if any.
-        /// </summary>
-        public void Reset()
-        {
-            this.dialog?.Hide();
-            this.dialog = null;
-            this.callback = null;
-            this.multiCallback = null;
-        }
-
-        private void SetDialog(
-            string id,
-            string title,
-            string filters,
-            string path,
-            string defaultFileName,
-            string defaultExtension,
-            int selectionCountMax,
-            bool isModal,
-            ImGuiFileDialogFlags flags,
-            Delegate callback)
+    /// <summary>
+    /// Draws the current dialog, if any, and executes the callback if it is finished.
+    /// </summary>
+    public void Draw()
+    {
+        if (this.dialog == null) return;
+        if (this.dialog.Draw())
         {
+            var isOk = this.dialog.GetIsOk();
+            var results = this.dialog.GetResults();
+            this.callback?.Invoke(isOk, results.Count > 0 ? results[0] : string.Empty);
+            this.multiCallback?.Invoke(isOk, results);
+            this.savedPath = this.dialog.GetCurrentPath();
             this.Reset();
-            if (callback is Action<bool, List<string>> multi)
-            {
-                this.multiCallback = multi;
-            }
-            else
-            {
-                this.callback = callback as Action<bool, string>;
-            }
-
-            this.dialog = new FileDialog(id, title, filters, path, defaultFileName, defaultExtension, selectionCountMax, isModal, flags);
-            this.dialog.WindowFlags |= this.AddedWindowFlags;
-            foreach (var (name, location, icon, position) in this.CustomSideBarItems)
-                this.dialog.SetQuickAccess(name, location, icon, position);
-            this.dialog.Show();
         }
     }
+
+    /// <summary>
+    /// Removes the current dialog, if any.
+    /// </summary>
+    public void Reset()
+    {
+        this.dialog?.Hide();
+        this.dialog = null;
+        this.callback = null;
+        this.multiCallback = null;
+    }
+
+    private void SetDialog(
+        string id,
+        string title,
+        string filters,
+        string path,
+        string defaultFileName,
+        string defaultExtension,
+        int selectionCountMax,
+        bool isModal,
+        ImGuiFileDialogFlags flags,
+        Delegate callback)
+    {
+        this.Reset();
+        if (callback is Action<bool, List<string>> multi)
+        {
+            this.multiCallback = multi;
+        }
+        else
+        {
+            this.callback = callback as Action<bool, string>;
+        }
+
+        this.dialog = new FileDialog(id, title, filters, path, defaultFileName, defaultExtension, selectionCountMax, isModal, flags);
+        this.dialog.WindowFlags |= this.AddedWindowFlags;
+        foreach (var (name, location, icon, position) in this.CustomSideBarItems)
+            this.dialog.SetQuickAccess(name, location, icon, position);
+        this.dialog.Show();
+    }
 }
diff --git a/Dalamud/Interface/ImGuiFileDialog/ImGuiFileDialogFlags.cs b/Dalamud/Interface/ImGuiFileDialog/ImGuiFileDialogFlags.cs
index fd5ee2531..ea35f4c65 100644
--- a/Dalamud/Interface/ImGuiFileDialog/ImGuiFileDialogFlags.cs
+++ b/Dalamud/Interface/ImGuiFileDialog/ImGuiFileDialogFlags.cs
@@ -1,56 +1,55 @@
 using System;
 
-namespace Dalamud.Interface.ImGuiFileDialog
+namespace Dalamud.Interface.ImGuiFileDialog;
+
+/// <summary>
+/// Settings flags for the <see cref="FileDialog"/> class.
+/// </summary>
+[Flags]
+public enum ImGuiFileDialogFlags
 {
     /// <summary>
-    /// Settings flags for the <see cref="FileDialog"/> class.
+    /// None.
     /// </summary>
-    [Flags]
-    public enum ImGuiFileDialogFlags
-    {
-        /// <summary>
-        /// None.
-        /// </summary>
-        None = 0,
+    None = 0,
 
-        /// <summary>
-        /// Confirm the selection when choosing a file which already exists.
-        /// </summary>
-        ConfirmOverwrite = 0x01,
+    /// <summary>
+    /// Confirm the selection when choosing a file which already exists.
+    /// </summary>
+    ConfirmOverwrite = 0x01,
 
-        /// <summary>
-        /// Only allow selection of files or folders which currently exist.
-        /// </summary>
-        SelectOnly = 0x02,
+    /// <summary>
+    /// Only allow selection of files or folders which currently exist.
+    /// </summary>
+    SelectOnly = 0x02,
 
-        /// <summary>
-        /// Hide files or folders which start with a period.
-        /// </summary>
-        DontShowHiddenFiles = 0x04,
+    /// <summary>
+    /// Hide files or folders which start with a period.
+    /// </summary>
+    DontShowHiddenFiles = 0x04,
 
-        /// <summary>
-        /// Disable the creation of new folders within the dialog.
-        /// </summary>
-        DisableCreateDirectoryButton = 0x08,
+    /// <summary>
+    /// Disable the creation of new folders within the dialog.
+    /// </summary>
+    DisableCreateDirectoryButton = 0x08,
 
-        /// <summary>
-        /// Hide the type column.
-        /// </summary>
-        HideColumnType = 0x10,
+    /// <summary>
+    /// Hide the type column.
+    /// </summary>
+    HideColumnType = 0x10,
 
-        /// <summary>
-        /// Hide the file size column.
-        /// </summary>
-        HideColumnSize = 0x20,
+    /// <summary>
+    /// Hide the file size column.
+    /// </summary>
+    HideColumnSize = 0x20,
 
-        /// <summary>
-        /// Hide the last modified date column.
-        /// </summary>
-        HideColumnDate = 0x40,
+    /// <summary>
+    /// Hide the last modified date column.
+    /// </summary>
+    HideColumnDate = 0x40,
 
-        /// <summary>
-        /// Hide the quick access sidebar.
-        /// </summary>
-        HideSideBar = 0x80,
-    }
+    /// <summary>
+    /// Hide the quick access sidebar.
+    /// </summary>
+    HideSideBar = 0x80,
 }
diff --git a/Dalamud/Interface/ImGuiHelpers.cs b/Dalamud/Interface/ImGuiHelpers.cs
index 19704bd77..12fc1a284 100644
--- a/Dalamud/Interface/ImGuiHelpers.cs
+++ b/Dalamud/Interface/ImGuiHelpers.cs
@@ -8,401 +8,400 @@ using Dalamud.Game.ClientState.Keys;
 using ImGuiNET;
 using ImGuiScene;
 
-namespace Dalamud.Interface
+namespace Dalamud.Interface;
+
+/// <summary>
+/// Class containing various helper methods for use with ImGui inside Dalamud.
+/// </summary>
+public static class ImGuiHelpers
 {
     /// <summary>
-    /// Class containing various helper methods for use with ImGui inside Dalamud.
+    /// Gets the main viewport.
     /// </summary>
-    public static class ImGuiHelpers
+    public static ImGuiViewportPtr MainViewport { get; internal set; }
+
+    /// <summary>
+    /// Gets the global Dalamud scale.
+    /// </summary>
+    public static float GlobalScale { get; private set; }
+
+    /// <summary>
+    /// Gets a <see cref="Vector2"/> that is pre-scaled with the <see cref="GlobalScale"/> multiplier.
+    /// </summary>
+    /// <param name="x">Vector2 X/Y parameter.</param>
+    /// <returns>A scaled Vector2.</returns>
+    public static Vector2 ScaledVector2(float x) => new Vector2(x, x) * GlobalScale;
+
+    /// <summary>
+    /// Gets a <see cref="Vector2"/> that is pre-scaled with the <see cref="GlobalScale"/> multiplier.
+    /// </summary>
+    /// <param name="x">Vector2 X parameter.</param>
+    /// <param name="y">Vector2 Y parameter.</param>
+    /// <returns>A scaled Vector2.</returns>
+    public static Vector2 ScaledVector2(float x, float y) => new Vector2(x, y) * GlobalScale;
+
+    /// <summary>
+    /// Gets a <see cref="Vector4"/> that is pre-scaled with the <see cref="GlobalScale"/> multiplier.
+    /// </summary>
+    /// <param name="x">Vector4 X parameter.</param>
+    /// <param name="y">Vector4 Y parameter.</param>
+    /// <param name="z">Vector4 Z parameter.</param>
+    /// <param name="w">Vector4 W parameter.</param>
+    /// <returns>A scaled Vector2.</returns>
+    public static Vector4 ScaledVector4(float x, float y, float z, float w) => new Vector4(x, y, z, w) * GlobalScale;
+
+    /// <summary>
+    /// Force the next ImGui window to stay inside the main game window.
+    /// </summary>
+    public static void ForceNextWindowMainViewport() => ImGui.SetNextWindowViewport(MainViewport.ID);
+
+    /// <summary>
+    /// Create a dummy scaled by the global Dalamud scale.
+    /// </summary>
+    /// <param name="size">The size of the dummy.</param>
+    public static void ScaledDummy(float size) => ScaledDummy(size, size);
+
+    /// <summary>
+    /// Create a dummy scaled by the global Dalamud scale.
+    /// </summary>
+    /// <param name="x">Vector2 X parameter.</param>
+    /// <param name="y">Vector2 Y parameter.</param>
+    public static void ScaledDummy(float x, float y) => ScaledDummy(new Vector2(x, y));
+
+    /// <summary>
+    /// Create a dummy scaled by the global Dalamud scale.
+    /// </summary>
+    /// <param name="size">The size of the dummy.</param>
+    public static void ScaledDummy(Vector2 size) => ImGui.Dummy(size * GlobalScale);
+
+    /// <summary>
+    /// Use a relative ImGui.SameLine() from your current cursor position, scaled by the Dalamud global scale.
+    /// </summary>
+    /// <param name="offset">The offset from your current cursor position.</param>
+    /// <param name="spacing">The spacing to use.</param>
+    public static void ScaledRelativeSameLine(float offset, float spacing = -1.0f)
+        => ImGui.SameLine(ImGui.GetCursorPosX() + (offset * GlobalScale), spacing);
+
+    /// <summary>
+    /// Set the position of the next window relative to the main viewport.
+    /// </summary>
+    /// <param name="position">The position of the next window.</param>
+    /// <param name="condition">When to set the position.</param>
+    /// <param name="pivot">The pivot to set the position around.</param>
+    public static void SetNextWindowPosRelativeMainViewport(Vector2 position, ImGuiCond condition = ImGuiCond.None, Vector2 pivot = default)
+        => ImGui.SetNextWindowPos(position + MainViewport.Pos, condition, pivot);
+
+    /// <summary>
+    /// Set the position of a window relative to the main viewport.
+    /// </summary>
+    /// <param name="name">The name/ID of the window.</param>
+    /// <param name="position">The position of the window.</param>
+    /// <param name="condition">When to set the position.</param>
+    public static void SetWindowPosRelativeMainViewport(string name, Vector2 position, ImGuiCond condition = ImGuiCond.None)
+        => ImGui.SetWindowPos(name, position + MainViewport.Pos, condition);
+
+    /// <summary>
+    /// Creates default color palette for use with color pickers.
+    /// </summary>
+    /// <param name="swatchCount">The total number of swatches to use.</param>
+    /// <returns>Default color palette.</returns>
+    public static List<Vector4> DefaultColorPalette(int swatchCount = 32)
     {
-        /// <summary>
-        /// Gets the main viewport.
-        /// </summary>
-        public static ImGuiViewportPtr MainViewport { get; internal set; }
-
-        /// <summary>
-        /// Gets the global Dalamud scale.
-        /// </summary>
-        public static float GlobalScale { get; private set; }
-
-        /// <summary>
-        /// Gets a <see cref="Vector2"/> that is pre-scaled with the <see cref="GlobalScale"/> multiplier.
-        /// </summary>
-        /// <param name="x">Vector2 X/Y parameter.</param>
-        /// <returns>A scaled Vector2.</returns>
-        public static Vector2 ScaledVector2(float x) => new Vector2(x, x) * GlobalScale;
-
-        /// <summary>
-        /// Gets a <see cref="Vector2"/> that is pre-scaled with the <see cref="GlobalScale"/> multiplier.
-        /// </summary>
-        /// <param name="x">Vector2 X parameter.</param>
-        /// <param name="y">Vector2 Y parameter.</param>
-        /// <returns>A scaled Vector2.</returns>
-        public static Vector2 ScaledVector2(float x, float y) => new Vector2(x, y) * GlobalScale;
-
-        /// <summary>
-        /// Gets a <see cref="Vector4"/> that is pre-scaled with the <see cref="GlobalScale"/> multiplier.
-        /// </summary>
-        /// <param name="x">Vector4 X parameter.</param>
-        /// <param name="y">Vector4 Y parameter.</param>
-        /// <param name="z">Vector4 Z parameter.</param>
-        /// <param name="w">Vector4 W parameter.</param>
-        /// <returns>A scaled Vector2.</returns>
-        public static Vector4 ScaledVector4(float x, float y, float z, float w) => new Vector4(x, y, z, w) * GlobalScale;
-
-        /// <summary>
-        /// Force the next ImGui window to stay inside the main game window.
-        /// </summary>
-        public static void ForceNextWindowMainViewport() => ImGui.SetNextWindowViewport(MainViewport.ID);
-
-        /// <summary>
-        /// Create a dummy scaled by the global Dalamud scale.
-        /// </summary>
-        /// <param name="size">The size of the dummy.</param>
-        public static void ScaledDummy(float size) => ScaledDummy(size, size);
-
-        /// <summary>
-        /// Create a dummy scaled by the global Dalamud scale.
-        /// </summary>
-        /// <param name="x">Vector2 X parameter.</param>
-        /// <param name="y">Vector2 Y parameter.</param>
-        public static void ScaledDummy(float x, float y) => ScaledDummy(new Vector2(x, y));
-
-        /// <summary>
-        /// Create a dummy scaled by the global Dalamud scale.
-        /// </summary>
-        /// <param name="size">The size of the dummy.</param>
-        public static void ScaledDummy(Vector2 size) => ImGui.Dummy(size * GlobalScale);
-
-        /// <summary>
-        /// Use a relative ImGui.SameLine() from your current cursor position, scaled by the Dalamud global scale.
-        /// </summary>
-        /// <param name="offset">The offset from your current cursor position.</param>
-        /// <param name="spacing">The spacing to use.</param>
-        public static void ScaledRelativeSameLine(float offset, float spacing = -1.0f)
-            => ImGui.SameLine(ImGui.GetCursorPosX() + (offset * GlobalScale), spacing);
-
-        /// <summary>
-        /// Set the position of the next window relative to the main viewport.
-        /// </summary>
-        /// <param name="position">The position of the next window.</param>
-        /// <param name="condition">When to set the position.</param>
-        /// <param name="pivot">The pivot to set the position around.</param>
-        public static void SetNextWindowPosRelativeMainViewport(Vector2 position, ImGuiCond condition = ImGuiCond.None, Vector2 pivot = default)
-            => ImGui.SetNextWindowPos(position + MainViewport.Pos, condition, pivot);
-
-        /// <summary>
-        /// Set the position of a window relative to the main viewport.
-        /// </summary>
-        /// <param name="name">The name/ID of the window.</param>
-        /// <param name="position">The position of the window.</param>
-        /// <param name="condition">When to set the position.</param>
-        public static void SetWindowPosRelativeMainViewport(string name, Vector2 position, ImGuiCond condition = ImGuiCond.None)
-            => ImGui.SetWindowPos(name, position + MainViewport.Pos, condition);
-
-        /// <summary>
-        /// Creates default color palette for use with color pickers.
-        /// </summary>
-        /// <param name="swatchCount">The total number of swatches to use.</param>
-        /// <returns>Default color palette.</returns>
-        public static List<Vector4> DefaultColorPalette(int swatchCount = 32)
+        var colorPalette = new List<Vector4>();
+        for (var i = 0; i < swatchCount; i++)
         {
-            var colorPalette = new List<Vector4>();
-            for (var i = 0; i < swatchCount; i++)
-            {
-                ImGui.ColorConvertHSVtoRGB(i / 31.0f, 0.7f, 0.8f, out var r, out var g, out var b);
-                colorPalette.Add(new Vector4(r, g, b, 1.0f));
-            }
-
-            return colorPalette;
+            ImGui.ColorConvertHSVtoRGB(i / 31.0f, 0.7f, 0.8f, out var r, out var g, out var b);
+            colorPalette.Add(new Vector4(r, g, b, 1.0f));
         }
 
-        /// <summary>
-        /// Get the size of a button considering the default frame padding.
-        /// </summary>
-        /// <param name="text">Text in the button.</param>
-        /// <returns><see cref="Vector2"/> with the size of the button.</returns>
-        public static Vector2 GetButtonSize(string text) => ImGui.CalcTextSize(text) + (ImGui.GetStyle().FramePadding * 2);
+        return colorPalette;
+    }
 
-        /// <summary>
-        /// Print out text that can be copied when clicked.
-        /// </summary>
-        /// <param name="text">The text to show.</param>
-        /// <param name="textCopy">The text to copy when clicked.</param>
-        public static void ClickToCopyText(string text, string? textCopy = null)
+    /// <summary>
+    /// Get the size of a button considering the default frame padding.
+    /// </summary>
+    /// <param name="text">Text in the button.</param>
+    /// <returns><see cref="Vector2"/> with the size of the button.</returns>
+    public static Vector2 GetButtonSize(string text) => ImGui.CalcTextSize(text) + (ImGui.GetStyle().FramePadding * 2);
+
+    /// <summary>
+    /// Print out text that can be copied when clicked.
+    /// </summary>
+    /// <param name="text">The text to show.</param>
+    /// <param name="textCopy">The text to copy when clicked.</param>
+    public static void ClickToCopyText(string text, string? textCopy = null)
+    {
+        textCopy ??= text;
+        ImGui.Text($"{text}");
+        if (ImGui.IsItemHovered())
         {
-            textCopy ??= text;
-            ImGui.Text($"{text}");
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
-                if (textCopy != text) ImGui.SetTooltip(textCopy);
-            }
-
-            if (ImGui.IsItemClicked()) ImGui.SetClipboardText($"{textCopy}");
+            ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
+            if (textCopy != text) ImGui.SetTooltip(textCopy);
         }
 
-        /// <summary>
-        /// Write unformatted text wrapped.
-        /// </summary>
-        /// <param name="text">The text to write.</param>
-        public static void SafeTextWrapped(string text) => ImGui.TextWrapped(text.Replace("%", "%%"));
+        if (ImGui.IsItemClicked()) ImGui.SetClipboardText($"{textCopy}");
+    }
 
-        /// <summary>
-        /// Fills missing glyphs in target font from source font, if both are not null.
-        /// </summary>
-        /// <param name="source">Source font.</param>
-        /// <param name="target">Target font.</param>
-        /// <param name="missingOnly">Whether to copy missing glyphs only.</param>
-        /// <param name="rebuildLookupTable">Whether to call target.BuildLookupTable().</param>
-        /// <param name="rangeLow">Low codepoint range to copy.</param>
-        /// <param name="rangeHigh">High codepoing range to copy.</param>
-        public static void CopyGlyphsAcrossFonts(ImFontPtr? source, ImFontPtr? target, bool missingOnly, bool rebuildLookupTable, int rangeLow = 32, int rangeHigh = 0xFFFE)
+    /// <summary>
+    /// Write unformatted text wrapped.
+    /// </summary>
+    /// <param name="text">The text to write.</param>
+    public static void SafeTextWrapped(string text) => ImGui.TextWrapped(text.Replace("%", "%%"));
+
+    /// <summary>
+    /// Fills missing glyphs in target font from source font, if both are not null.
+    /// </summary>
+    /// <param name="source">Source font.</param>
+    /// <param name="target">Target font.</param>
+    /// <param name="missingOnly">Whether to copy missing glyphs only.</param>
+    /// <param name="rebuildLookupTable">Whether to call target.BuildLookupTable().</param>
+    /// <param name="rangeLow">Low codepoint range to copy.</param>
+    /// <param name="rangeHigh">High codepoing range to copy.</param>
+    public static void CopyGlyphsAcrossFonts(ImFontPtr? source, ImFontPtr? target, bool missingOnly, bool rebuildLookupTable, int rangeLow = 32, int rangeHigh = 0xFFFE)
+    {
+        if (!source.HasValue || !target.HasValue)
+            return;
+
+        var scale = target.Value!.FontSize / source.Value!.FontSize;
+        var addedCodepoints = new HashSet<int>();
+        unsafe
         {
-            if (!source.HasValue || !target.HasValue)
-                return;
-
-            var scale = target.Value!.FontSize / source.Value!.FontSize;
-            var addedCodepoints = new HashSet<int>();
-            unsafe
+            var glyphs = (ImFontGlyphReal*)source.Value!.Glyphs.Data;
+            for (int j = 0, k = source.Value!.Glyphs.Size; j < k; j++)
             {
-                var glyphs = (ImFontGlyphReal*)source.Value!.Glyphs.Data;
-                for (int j = 0, k = source.Value!.Glyphs.Size; j < k; j++)
+                Debug.Assert(glyphs != null, nameof(glyphs) + " != null");
+
+                var glyph = &glyphs[j];
+                if (glyph->Codepoint < rangeLow || glyph->Codepoint > rangeHigh)
+                    continue;
+
+                var prevGlyphPtr = (ImFontGlyphReal*)target.Value!.FindGlyphNoFallback((ushort)glyph->Codepoint).NativePtr;
+                if ((IntPtr)prevGlyphPtr == IntPtr.Zero)
                 {
-                    Debug.Assert(glyphs != null, nameof(glyphs) + " != null");
-
-                    var glyph = &glyphs[j];
-                    if (glyph->Codepoint < rangeLow || glyph->Codepoint > rangeHigh)
-                        continue;
-
-                    var prevGlyphPtr = (ImFontGlyphReal*)target.Value!.FindGlyphNoFallback((ushort)glyph->Codepoint).NativePtr;
-                    if ((IntPtr)prevGlyphPtr == IntPtr.Zero)
-                    {
-                        addedCodepoints.Add(glyph->Codepoint);
-                        target.Value!.AddGlyph(
-                            target.Value!.ConfigData,
-                            (ushort)glyph->Codepoint,
-                            glyph->TextureIndex,
-                            glyph->X0 * scale,
-                            ((glyph->Y0 - source.Value!.Ascent) * scale) + target.Value!.Ascent,
-                            glyph->X1 * scale,
-                            ((glyph->Y1 - source.Value!.Ascent) * scale) + target.Value!.Ascent,
-                            glyph->U0,
-                            glyph->V0,
-                            glyph->U1,
-                            glyph->V1,
-                            glyph->AdvanceX * scale);
-                    }
-                    else if (!missingOnly)
-                    {
-                        addedCodepoints.Add(glyph->Codepoint);
-                        prevGlyphPtr->TextureIndex = glyph->TextureIndex;
-                        prevGlyphPtr->X0 = glyph->X0 * scale;
-                        prevGlyphPtr->Y0 = ((glyph->Y0 - source.Value!.Ascent) * scale) + target.Value!.Ascent;
-                        prevGlyphPtr->X1 = glyph->X1 * scale;
-                        prevGlyphPtr->Y1 = ((glyph->Y1 - source.Value!.Ascent) * scale) + target.Value!.Ascent;
-                        prevGlyphPtr->U0 = glyph->U0;
-                        prevGlyphPtr->V0 = glyph->V0;
-                        prevGlyphPtr->U1 = glyph->U1;
-                        prevGlyphPtr->V1 = glyph->V1;
-                        prevGlyphPtr->AdvanceX = glyph->AdvanceX * scale;
-                    }
+                    addedCodepoints.Add(glyph->Codepoint);
+                    target.Value!.AddGlyph(
+                        target.Value!.ConfigData,
+                        (ushort)glyph->Codepoint,
+                        glyph->TextureIndex,
+                        glyph->X0 * scale,
+                        ((glyph->Y0 - source.Value!.Ascent) * scale) + target.Value!.Ascent,
+                        glyph->X1 * scale,
+                        ((glyph->Y1 - source.Value!.Ascent) * scale) + target.Value!.Ascent,
+                        glyph->U0,
+                        glyph->V0,
+                        glyph->U1,
+                        glyph->V1,
+                        glyph->AdvanceX * scale);
                 }
-
-                var kernPairs = source.Value!.KerningPairs;
-                for (int j = 0, k = kernPairs.Size; j < k; j++)
+                else if (!missingOnly)
                 {
-                    if (!addedCodepoints.Contains(kernPairs[j].Left))
-                        continue;
-                    if (!addedCodepoints.Contains(kernPairs[j].Right))
-                        continue;
-                    target.Value.AddKerningPair(kernPairs[j].Left, kernPairs[j].Right, kernPairs[j].AdvanceXAdjustment);
+                    addedCodepoints.Add(glyph->Codepoint);
+                    prevGlyphPtr->TextureIndex = glyph->TextureIndex;
+                    prevGlyphPtr->X0 = glyph->X0 * scale;
+                    prevGlyphPtr->Y0 = ((glyph->Y0 - source.Value!.Ascent) * scale) + target.Value!.Ascent;
+                    prevGlyphPtr->X1 = glyph->X1 * scale;
+                    prevGlyphPtr->Y1 = ((glyph->Y1 - source.Value!.Ascent) * scale) + target.Value!.Ascent;
+                    prevGlyphPtr->U0 = glyph->U0;
+                    prevGlyphPtr->V0 = glyph->V0;
+                    prevGlyphPtr->U1 = glyph->U1;
+                    prevGlyphPtr->V1 = glyph->V1;
+                    prevGlyphPtr->AdvanceX = glyph->AdvanceX * scale;
                 }
             }
 
-            if (rebuildLookupTable && target.Value!.Glyphs.Size > 0)
-                target.Value!.BuildLookupTable();
-        }
-
-        /// <summary>
-        /// Map a VirtualKey keycode to an ImGuiKey enum value.
-        /// </summary>
-        /// <param name="key">The VirtualKey value to retrieve the ImGuiKey counterpart for.</param>
-        /// <returns>The ImGuiKey that corresponds to this VirtualKey, or <c>ImGuiKey.None</c> otherwise.</returns>
-        public static ImGuiKey VirtualKeyToImGuiKey(VirtualKey key)
-        {
-            return ImGui_Input_Impl_Direct.VirtualKeyToImGuiKey((int)key);
-        }
-
-        /// <summary>
-        /// Map an ImGuiKey enum value to a VirtualKey code.
-        /// </summary>
-        /// <param name="key">The ImGuiKey value to retrieve the VirtualKey counterpart for.</param>
-        /// <returns>The VirtualKey that corresponds to this ImGuiKey, or <c>VirtualKey.NO_KEY</c> otherwise.</returns>
-        public static VirtualKey ImGuiKeyToVirtualKey(ImGuiKey key)
-        {
-            return (VirtualKey)ImGui_Input_Impl_Direct.ImGuiKeyToVirtualKey(key);
-        }
-
-        /// <summary>
-        /// Show centered text.
-        /// </summary>
-        /// <param name="text">Text to show.</param>
-        public static void CenteredText(string text)
-        {
-            CenterCursorForText(text);
-            ImGui.TextUnformatted(text);
-        }
-
-        /// <summary>
-        /// Center the ImGui cursor for a certain text.
-        /// </summary>
-        /// <param name="text">The text to center for.</param>
-        public static void CenterCursorForText(string text)
-        {
-            var textWidth = ImGui.CalcTextSize(text).X;
-            CenterCursorFor((int)textWidth);
-        }
-
-        /// <summary>
-        /// Center the ImGui cursor for an item with a certain width.
-        /// </summary>
-        /// <param name="itemWidth">The width to center for.</param>
-        public static void CenterCursorFor(int itemWidth)
-        {
-            var window = (int)ImGui.GetWindowWidth();
-            ImGui.SetCursorPosX((window / 2) - (itemWidth / 2));
-        }
-
-        /// <summary>
-        /// Get data needed for each new frame.
-        /// </summary>
-        internal static void NewFrame()
-        {
-            GlobalScale = ImGui.GetIO().FontGlobalScale;
-        }
-
-        /// <summary>
-        /// ImFontGlyph the correct version.
-        /// </summary>
-        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "ImGui internals")]
-        public struct ImFontGlyphReal
-        {
-            public uint ColoredVisibleTextureIndexCodepoint;
-            public float AdvanceX;
-            public float X0;
-            public float Y0;
-            public float X1;
-            public float Y1;
-            public float U0;
-            public float V0;
-            public float U1;
-            public float V1;
-
-            private const uint ColoredMask /*****/ = 0b_00000000_00000000_00000000_00000001u;
-            private const uint VisibleMask /*****/ = 0b_00000000_00000000_00000000_00000010u;
-            private const uint TextureMask /*****/ = 0b_00000000_00000000_00000111_11111100u;
-            private const uint CodepointMask /***/ = 0b_11111111_11111111_11111000_00000000u;
-
-            private const int ColoredShift = 0;
-            private const int VisibleShift = 1;
-            private const int TextureShift = 2;
-            private const int CodepointShift = 11;
-
-            public bool Colored
+            var kernPairs = source.Value!.KerningPairs;
+            for (int j = 0, k = kernPairs.Size; j < k; j++)
             {
-                get => (int)((this.ColoredVisibleTextureIndexCodepoint & ColoredMask) >> ColoredShift) != 0;
-                set => this.ColoredVisibleTextureIndexCodepoint = (this.ColoredVisibleTextureIndexCodepoint & ~ColoredMask) | (value ? 1u << ColoredShift : 0u);
-            }
-
-            public bool Visible
-            {
-                get => (int)((this.ColoredVisibleTextureIndexCodepoint & VisibleMask) >> VisibleShift) != 0;
-                set => this.ColoredVisibleTextureIndexCodepoint = (this.ColoredVisibleTextureIndexCodepoint & ~VisibleMask) | (value ? 1u << VisibleShift : 0u);
-            }
-
-            public int TextureIndex
-            {
-                get => (int)(this.ColoredVisibleTextureIndexCodepoint & TextureMask) >> TextureShift;
-                set => this.ColoredVisibleTextureIndexCodepoint = (this.ColoredVisibleTextureIndexCodepoint & ~TextureMask) | ((uint)value << TextureShift);
-            }
-
-            public int Codepoint
-            {
-                get => (int)(this.ColoredVisibleTextureIndexCodepoint & CodepointMask) >> CodepointShift;
-                set => this.ColoredVisibleTextureIndexCodepoint = (this.ColoredVisibleTextureIndexCodepoint & ~CodepointMask) | ((uint)value << CodepointShift);
+                if (!addedCodepoints.Contains(kernPairs[j].Left))
+                    continue;
+                if (!addedCodepoints.Contains(kernPairs[j].Right))
+                    continue;
+                target.Value.AddKerningPair(kernPairs[j].Left, kernPairs[j].Right, kernPairs[j].AdvanceXAdjustment);
             }
         }
 
-        /// <summary>
-        /// ImFontGlyphHotData the correct version.
-        /// </summary>
-        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "ImGui internals")]
-        public struct ImFontGlyphHotDataReal
+        if (rebuildLookupTable && target.Value!.Glyphs.Size > 0)
+            target.Value!.BuildLookupTable();
+    }
+
+    /// <summary>
+    /// Map a VirtualKey keycode to an ImGuiKey enum value.
+    /// </summary>
+    /// <param name="key">The VirtualKey value to retrieve the ImGuiKey counterpart for.</param>
+    /// <returns>The ImGuiKey that corresponds to this VirtualKey, or <c>ImGuiKey.None</c> otherwise.</returns>
+    public static ImGuiKey VirtualKeyToImGuiKey(VirtualKey key)
+    {
+        return ImGui_Input_Impl_Direct.VirtualKeyToImGuiKey((int)key);
+    }
+
+    /// <summary>
+    /// Map an ImGuiKey enum value to a VirtualKey code.
+    /// </summary>
+    /// <param name="key">The ImGuiKey value to retrieve the VirtualKey counterpart for.</param>
+    /// <returns>The VirtualKey that corresponds to this ImGuiKey, or <c>VirtualKey.NO_KEY</c> otherwise.</returns>
+    public static VirtualKey ImGuiKeyToVirtualKey(ImGuiKey key)
+    {
+        return (VirtualKey)ImGui_Input_Impl_Direct.ImGuiKeyToVirtualKey(key);
+    }
+
+    /// <summary>
+    /// Show centered text.
+    /// </summary>
+    /// <param name="text">Text to show.</param>
+    public static void CenteredText(string text)
+    {
+        CenterCursorForText(text);
+        ImGui.TextUnformatted(text);
+    }
+
+    /// <summary>
+    /// Center the ImGui cursor for a certain text.
+    /// </summary>
+    /// <param name="text">The text to center for.</param>
+    public static void CenterCursorForText(string text)
+    {
+        var textWidth = ImGui.CalcTextSize(text).X;
+        CenterCursorFor((int)textWidth);
+    }
+
+    /// <summary>
+    /// Center the ImGui cursor for an item with a certain width.
+    /// </summary>
+    /// <param name="itemWidth">The width to center for.</param>
+    public static void CenterCursorFor(int itemWidth)
+    {
+        var window = (int)ImGui.GetWindowWidth();
+        ImGui.SetCursorPosX((window / 2) - (itemWidth / 2));
+    }
+
+    /// <summary>
+    /// Get data needed for each new frame.
+    /// </summary>
+    internal static void NewFrame()
+    {
+        GlobalScale = ImGui.GetIO().FontGlobalScale;
+    }
+
+    /// <summary>
+    /// ImFontGlyph the correct version.
+    /// </summary>
+    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "ImGui internals")]
+    public struct ImFontGlyphReal
+    {
+        public uint ColoredVisibleTextureIndexCodepoint;
+        public float AdvanceX;
+        public float X0;
+        public float Y0;
+        public float X1;
+        public float Y1;
+        public float U0;
+        public float V0;
+        public float U1;
+        public float V1;
+
+        private const uint ColoredMask /*****/ = 0b_00000000_00000000_00000000_00000001u;
+        private const uint VisibleMask /*****/ = 0b_00000000_00000000_00000000_00000010u;
+        private const uint TextureMask /*****/ = 0b_00000000_00000000_00000111_11111100u;
+        private const uint CodepointMask /***/ = 0b_11111111_11111111_11111000_00000000u;
+
+        private const int ColoredShift = 0;
+        private const int VisibleShift = 1;
+        private const int TextureShift = 2;
+        private const int CodepointShift = 11;
+
+        public bool Colored
         {
-            public float AdvanceX;
-            public float OccupiedWidth;
-            public uint KerningPairInfo;
-
-            private const uint UseBisectMask /***/ = 0b_00000000_00000000_00000000_00000001u;
-            private const uint OffsetMask /******/ = 0b_00000000_00001111_11111111_11111110u;
-            private const uint CountMask /*******/ = 0b_11111111_11110000_00000111_11111100u;
-
-            private const int UseBisectShift = 0;
-            private const int OffsetShift = 1;
-            private const int CountShift = 20;
-
-            public bool UseBisect
-            {
-                get => (int)((this.KerningPairInfo & UseBisectMask) >> UseBisectShift) != 0;
-                set => this.KerningPairInfo = (this.KerningPairInfo & ~UseBisectMask) | (value ? 1u << UseBisectShift : 0u);
-            }
-
-            public bool Offset
-            {
-                get => (int)((this.KerningPairInfo & OffsetMask) >> OffsetShift) != 0;
-                set => this.KerningPairInfo = (this.KerningPairInfo & ~OffsetMask) | (value ? 1u << OffsetShift : 0u);
-            }
-
-            public int Count
-            {
-                get => (int)(this.KerningPairInfo & CountMask) >> CountShift;
-                set => this.KerningPairInfo = (this.KerningPairInfo & ~CountMask) | ((uint)value << CountShift);
-            }
+            get => (int)((this.ColoredVisibleTextureIndexCodepoint & ColoredMask) >> ColoredShift) != 0;
+            set => this.ColoredVisibleTextureIndexCodepoint = (this.ColoredVisibleTextureIndexCodepoint & ~ColoredMask) | (value ? 1u << ColoredShift : 0u);
         }
 
-        /// <summary>
-        /// ImFontAtlasCustomRect the correct version.
-        /// </summary>
-        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "ImGui internals")]
-        public unsafe struct ImFontAtlasCustomRectReal
+        public bool Visible
         {
-            public ushort Width;
-            public ushort Height;
-            public ushort X;
-            public ushort Y;
-            public uint TextureIndexAndGlyphId;
-            public float GlyphAdvanceX;
-            public Vector2 GlyphOffset;
-            public ImFont* Font;
+            get => (int)((this.ColoredVisibleTextureIndexCodepoint & VisibleMask) >> VisibleShift) != 0;
+            set => this.ColoredVisibleTextureIndexCodepoint = (this.ColoredVisibleTextureIndexCodepoint & ~VisibleMask) | (value ? 1u << VisibleShift : 0u);
+        }
 
-            private const uint TextureIndexMask /***/ = 0b_00000000_00000000_00000111_11111100u;
-            private const uint GlyphIDMask /********/ = 0b_11111111_11111111_11111000_00000000u;
+        public int TextureIndex
+        {
+            get => (int)(this.ColoredVisibleTextureIndexCodepoint & TextureMask) >> TextureShift;
+            set => this.ColoredVisibleTextureIndexCodepoint = (this.ColoredVisibleTextureIndexCodepoint & ~TextureMask) | ((uint)value << TextureShift);
+        }
 
-            private const int TextureIndexShift = 2;
-            private const int GlyphIDShift = 11;
+        public int Codepoint
+        {
+            get => (int)(this.ColoredVisibleTextureIndexCodepoint & CodepointMask) >> CodepointShift;
+            set => this.ColoredVisibleTextureIndexCodepoint = (this.ColoredVisibleTextureIndexCodepoint & ~CodepointMask) | ((uint)value << CodepointShift);
+        }
+    }
 
-            public int TextureIndex
-            {
-                get => (int)(this.TextureIndexAndGlyphId & TextureIndexMask) >> TextureIndexShift;
-                set => this.TextureIndexAndGlyphId = (this.TextureIndexAndGlyphId & ~TextureIndexMask) | ((uint)value << TextureIndexShift);
-            }
+    /// <summary>
+    /// ImFontGlyphHotData the correct version.
+    /// </summary>
+    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "ImGui internals")]
+    public struct ImFontGlyphHotDataReal
+    {
+        public float AdvanceX;
+        public float OccupiedWidth;
+        public uint KerningPairInfo;
 
-            public int GlyphId
-            {
-                get => (int)(this.TextureIndexAndGlyphId & GlyphIDMask) >> GlyphIDShift;
-                set => this.TextureIndexAndGlyphId = (this.TextureIndexAndGlyphId & ~GlyphIDMask) | ((uint)value << GlyphIDShift);
-            }
+        private const uint UseBisectMask /***/ = 0b_00000000_00000000_00000000_00000001u;
+        private const uint OffsetMask /******/ = 0b_00000000_00001111_11111111_11111110u;
+        private const uint CountMask /*******/ = 0b_11111111_11110000_00000111_11111100u;
+
+        private const int UseBisectShift = 0;
+        private const int OffsetShift = 1;
+        private const int CountShift = 20;
+
+        public bool UseBisect
+        {
+            get => (int)((this.KerningPairInfo & UseBisectMask) >> UseBisectShift) != 0;
+            set => this.KerningPairInfo = (this.KerningPairInfo & ~UseBisectMask) | (value ? 1u << UseBisectShift : 0u);
+        }
+
+        public bool Offset
+        {
+            get => (int)((this.KerningPairInfo & OffsetMask) >> OffsetShift) != 0;
+            set => this.KerningPairInfo = (this.KerningPairInfo & ~OffsetMask) | (value ? 1u << OffsetShift : 0u);
+        }
+
+        public int Count
+        {
+            get => (int)(this.KerningPairInfo & CountMask) >> CountShift;
+            set => this.KerningPairInfo = (this.KerningPairInfo & ~CountMask) | ((uint)value << CountShift);
+        }
+    }
+
+    /// <summary>
+    /// ImFontAtlasCustomRect the correct version.
+    /// </summary>
+    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "ImGui internals")]
+    public unsafe struct ImFontAtlasCustomRectReal
+    {
+        public ushort Width;
+        public ushort Height;
+        public ushort X;
+        public ushort Y;
+        public uint TextureIndexAndGlyphId;
+        public float GlyphAdvanceX;
+        public Vector2 GlyphOffset;
+        public ImFont* Font;
+
+        private const uint TextureIndexMask /***/ = 0b_00000000_00000000_00000111_11111100u;
+        private const uint GlyphIDMask /********/ = 0b_11111111_11111111_11111000_00000000u;
+
+        private const int TextureIndexShift = 2;
+        private const int GlyphIDShift = 11;
+
+        public int TextureIndex
+        {
+            get => (int)(this.TextureIndexAndGlyphId & TextureIndexMask) >> TextureIndexShift;
+            set => this.TextureIndexAndGlyphId = (this.TextureIndexAndGlyphId & ~TextureIndexMask) | ((uint)value << TextureIndexShift);
+        }
+
+        public int GlyphId
+        {
+            get => (int)(this.TextureIndexAndGlyphId & GlyphIDMask) >> GlyphIDShift;
+            set => this.TextureIndexAndGlyphId = (this.TextureIndexAndGlyphId & ~GlyphIDMask) | ((uint)value << GlyphIDShift);
         }
     }
 }
diff --git a/Dalamud/Interface/Internal/DalamudCommands.cs b/Dalamud/Interface/Internal/DalamudCommands.cs
index 49ce45a95..35e216eef 100644
--- a/Dalamud/Interface/Internal/DalamudCommands.cs
+++ b/Dalamud/Interface/Internal/DalamudCommands.cs
@@ -13,378 +13,377 @@ using Dalamud.Plugin.Internal;
 using Dalamud.Utility;
 using Serilog;
 
-namespace Dalamud.Interface.Internal
+namespace Dalamud.Interface.Internal;
+
+/// <summary>
+/// Class handling Dalamud core commands.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class DalamudCommands : IServiceType
 {
-    /// <summary>
-    /// Class handling Dalamud core commands.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal class DalamudCommands : IServiceType
+    [ServiceManager.ServiceConstructor]
+    private DalamudCommands(CommandManager commandManager)
     {
-        [ServiceManager.ServiceConstructor]
-        private DalamudCommands(CommandManager commandManager)
+        commandManager.AddHandler("/xldclose", new CommandInfo(this.OnUnloadCommand)
         {
-            commandManager.AddHandler("/xldclose", new CommandInfo(this.OnUnloadCommand)
-            {
-                HelpMessage = Loc.Localize("DalamudUnloadHelp", "Unloads XIVLauncher in-game addon."),
-                ShowInHelp = false,
-            });
+            HelpMessage = Loc.Localize("DalamudUnloadHelp", "Unloads XIVLauncher in-game addon."),
+            ShowInHelp = false,
+        });
 
-            commandManager.AddHandler("/xlhelp", new CommandInfo(this.OnHelpCommand)
-            {
-                HelpMessage = Loc.Localize("DalamudCmdInfoHelp", "Shows list of commands available."),
-            });
+        commandManager.AddHandler("/xlhelp", new CommandInfo(this.OnHelpCommand)
+        {
+            HelpMessage = Loc.Localize("DalamudCmdInfoHelp", "Shows list of commands available."),
+        });
 
-            commandManager.AddHandler("/xlmute", new CommandInfo(this.OnBadWordsAddCommand)
-            {
-                HelpMessage = Loc.Localize("DalamudMuteHelp", "Mute a word or sentence from appearing in chat. Usage: /xlmute <word or sentence>"),
-            });
+        commandManager.AddHandler("/xlmute", new CommandInfo(this.OnBadWordsAddCommand)
+        {
+            HelpMessage = Loc.Localize("DalamudMuteHelp", "Mute a word or sentence from appearing in chat. Usage: /xlmute <word or sentence>"),
+        });
 
-            commandManager.AddHandler("/xlmutelist", new CommandInfo(this.OnBadWordsListCommand)
-            {
-                HelpMessage = Loc.Localize("DalamudMuteListHelp", "List muted words or sentences."),
-            });
+        commandManager.AddHandler("/xlmutelist", new CommandInfo(this.OnBadWordsListCommand)
+        {
+            HelpMessage = Loc.Localize("DalamudMuteListHelp", "List muted words or sentences."),
+        });
 
-            commandManager.AddHandler("/xlunmute", new CommandInfo(this.OnBadWordsRemoveCommand)
-            {
-                HelpMessage = Loc.Localize("DalamudUnmuteHelp", "Unmute a word or sentence. Usage: /xlunmute <word or sentence>"),
-            });
+        commandManager.AddHandler("/xlunmute", new CommandInfo(this.OnBadWordsRemoveCommand)
+        {
+            HelpMessage = Loc.Localize("DalamudUnmuteHelp", "Unmute a word or sentence. Usage: /xlunmute <word or sentence>"),
+        });
 
-            commandManager.AddHandler("/ll", new CommandInfo(this.OnLastLinkCommand)
-            {
-                HelpMessage = Loc.Localize("DalamudLastLinkHelp", "Open the last posted link in your default browser."),
-            });
+        commandManager.AddHandler("/ll", new CommandInfo(this.OnLastLinkCommand)
+        {
+            HelpMessage = Loc.Localize("DalamudLastLinkHelp", "Open the last posted link in your default browser."),
+        });
 
-            commandManager.AddHandler("/xlbgmset", new CommandInfo(this.OnBgmSetCommand)
-            {
-                HelpMessage = Loc.Localize("DalamudBgmSetHelp", "Set the Game background music. Usage: /xlbgmset <BGM ID>"),
-            });
+        commandManager.AddHandler("/xlbgmset", new CommandInfo(this.OnBgmSetCommand)
+        {
+            HelpMessage = Loc.Localize("DalamudBgmSetHelp", "Set the Game background music. Usage: /xlbgmset <BGM ID>"),
+        });
 
-            commandManager.AddHandler("/xldev", new CommandInfo(this.OnDebugDrawDevMenu)
-            {
-                HelpMessage = Loc.Localize("DalamudDevMenuHelp", "Draw dev menu DEBUG"),
-                ShowInHelp = false,
-            });
+        commandManager.AddHandler("/xldev", new CommandInfo(this.OnDebugDrawDevMenu)
+        {
+            HelpMessage = Loc.Localize("DalamudDevMenuHelp", "Draw dev menu DEBUG"),
+            ShowInHelp = false,
+        });
 
-            commandManager.AddHandler("/xlstats", new CommandInfo(this.OnTogglePluginStats)
-            {
-                HelpMessage = Loc.Localize("DalamudPluginStats", "Draw plugin statistics window"),
-                ShowInHelp = false,
-            });
+        commandManager.AddHandler("/xlstats", new CommandInfo(this.OnTogglePluginStats)
+        {
+            HelpMessage = Loc.Localize("DalamudPluginStats", "Draw plugin statistics window"),
+            ShowInHelp = false,
+        });
 
-            commandManager.AddHandler("/xlbranch", new CommandInfo(this.OnToggleBranchSwitcher)
-            {
-                HelpMessage = Loc.Localize("DalamudBranchSwitcher", "Draw branch switcher"),
-                ShowInHelp = false,
-            });
+        commandManager.AddHandler("/xlbranch", new CommandInfo(this.OnToggleBranchSwitcher)
+        {
+            HelpMessage = Loc.Localize("DalamudBranchSwitcher", "Draw branch switcher"),
+            ShowInHelp = false,
+        });
 
-            commandManager.AddHandler("/xldata", new CommandInfo(this.OnDebugDrawDataMenu)
-            {
-                HelpMessage = Loc.Localize("DalamudDevDataMenuHelp", "Draw dev data menu DEBUG. Usage: /xldata [Data Dropdown Type]"),
-                ShowInHelp = false,
-            });
+        commandManager.AddHandler("/xldata", new CommandInfo(this.OnDebugDrawDataMenu)
+        {
+            HelpMessage = Loc.Localize("DalamudDevDataMenuHelp", "Draw dev data menu DEBUG. Usage: /xldata [Data Dropdown Type]"),
+            ShowInHelp = false,
+        });
 
-            commandManager.AddHandler("/xlime", new CommandInfo(this.OnDebugDrawIMEPanel)
-            {
-                HelpMessage = Loc.Localize("DalamudIMEPanelHelp", "Draw IME panel"),
-                ShowInHelp = false,
-            });
+        commandManager.AddHandler("/xlime", new CommandInfo(this.OnDebugDrawIMEPanel)
+        {
+            HelpMessage = Loc.Localize("DalamudIMEPanelHelp", "Draw IME panel"),
+            ShowInHelp = false,
+        });
 
-            commandManager.AddHandler("/xllog", new CommandInfo(this.OnOpenLog)
-            {
-                HelpMessage = Loc.Localize("DalamudDevLogHelp", "Open dev log DEBUG"),
-                ShowInHelp = false,
-            });
+        commandManager.AddHandler("/xllog", new CommandInfo(this.OnOpenLog)
+        {
+            HelpMessage = Loc.Localize("DalamudDevLogHelp", "Open dev log DEBUG"),
+            ShowInHelp = false,
+        });
 
-            commandManager.AddHandler("/xlplugins", new CommandInfo(this.OnOpenInstallerCommand)
-            {
-                HelpMessage = Loc.Localize("DalamudInstallerHelp", "Open the plugin installer"),
-            });
+        commandManager.AddHandler("/xlplugins", new CommandInfo(this.OnOpenInstallerCommand)
+        {
+            HelpMessage = Loc.Localize("DalamudInstallerHelp", "Open the plugin installer"),
+        });
 
-            commandManager.AddHandler("/xlcredits", new CommandInfo(this.OnOpenCreditsCommand)
-            {
-                HelpMessage = Loc.Localize("DalamudCreditsHelp", "Opens the credits for dalamud."),
-            });
+        commandManager.AddHandler("/xlcredits", new CommandInfo(this.OnOpenCreditsCommand)
+        {
+            HelpMessage = Loc.Localize("DalamudCreditsHelp", "Opens the credits for dalamud."),
+        });
 
-            commandManager.AddHandler("/xllanguage", new CommandInfo(this.OnSetLanguageCommand)
-            {
-                HelpMessage =
-                    Loc.Localize(
-                        "DalamudLanguageHelp",
-                        "Set the language for Dalamud and plugins that support it. Available languages: ") +
-                        Localization.ApplicableLangCodes.Aggregate("en", (current, code) => current + ", " + code),
-            });
+        commandManager.AddHandler("/xllanguage", new CommandInfo(this.OnSetLanguageCommand)
+        {
+            HelpMessage =
+                Loc.Localize(
+                    "DalamudLanguageHelp",
+                    "Set the language for Dalamud and plugins that support it. Available languages: ") +
+                Localization.ApplicableLangCodes.Aggregate("en", (current, code) => current + ", " + code),
+        });
 
-            commandManager.AddHandler("/xlsettings", new CommandInfo(this.OnOpenSettingsCommand)
-            {
-                HelpMessage = Loc.Localize(
-                        "DalamudSettingsHelp",
-                        "Change various In-Game-Addon settings like chat channels and the discord bot setup."),
-            });
+        commandManager.AddHandler("/xlsettings", new CommandInfo(this.OnOpenSettingsCommand)
+        {
+            HelpMessage = Loc.Localize(
+                "DalamudSettingsHelp",
+                "Change various In-Game-Addon settings like chat channels and the discord bot setup."),
+        });
 
-            commandManager.AddHandler("/xlversion", new CommandInfo(this.OnVersionInfoCommand)
-            {
-                HelpMessage = "Dalamud version info",
-            });
+        commandManager.AddHandler("/xlversion", new CommandInfo(this.OnVersionInfoCommand)
+        {
+            HelpMessage = "Dalamud version info",
+        });
 
-            commandManager.AddHandler("/xlui", new CommandInfo(this.OnUiCommand)
-            {
-                HelpMessage = Loc.Localize(
-                    "DalamudUiModeHelp",
-                    "Toggle Dalamud UI display modes. Native UI modifications may also be affected by this, but that depends on the plugin."),
-            });
+        commandManager.AddHandler("/xlui", new CommandInfo(this.OnUiCommand)
+        {
+            HelpMessage = Loc.Localize(
+                "DalamudUiModeHelp",
+                "Toggle Dalamud UI display modes. Native UI modifications may also be affected by this, but that depends on the plugin."),
+        });
 
-            commandManager.AddHandler("/imdebug", new CommandInfo(this.OnDebugImInfoCommand)
-            {
-                HelpMessage = "ImGui DEBUG",
-                ShowInHelp = false,
-            });
+        commandManager.AddHandler("/imdebug", new CommandInfo(this.OnDebugImInfoCommand)
+        {
+            HelpMessage = "ImGui DEBUG",
+            ShowInHelp = false,
+        });
+    }
+
+    private void OnUnloadCommand(string command, string arguments)
+    {
+        Service<ChatGui>.Get().Print("Unloading...");
+        Service<Dalamud>.Get().Unload();
+    }
+
+    private void OnHelpCommand(string command, string arguments)
+    {
+        var chatGui = Service<ChatGui>.Get();
+        var commandManager = Service<CommandManager>.Get();
+
+        var showDebug = arguments.Contains("debug");
+
+        chatGui.Print(Loc.Localize("DalamudCmdHelpAvailable", "Available commands:"));
+        foreach (var cmd in commandManager.Commands)
+        {
+            if (!cmd.Value.ShowInHelp && !showDebug)
+                continue;
+
+            chatGui.Print($"{cmd.Key}: {cmd.Value.HelpMessage}");
+        }
+    }
+
+    private void OnBadWordsAddCommand(string command, string arguments)
+    {
+        var chatGui = Service<ChatGui>.Get();
+        var configuration = Service<DalamudConfiguration>.Get();
+
+        configuration.BadWords ??= new List<string>();
+
+        if (string.IsNullOrEmpty(arguments))
+        {
+            chatGui.Print(Loc.Localize("DalamudMuteNoArgs", "Please provide a word to mute."));
+            return;
         }
 
-        private void OnUnloadCommand(string command, string arguments)
+        configuration.BadWords.Add(arguments);
+
+        configuration.Save();
+
+        chatGui.Print(string.Format(Loc.Localize("DalamudMuted", "Muted \"{0}\"."), arguments));
+    }
+
+    private void OnBadWordsListCommand(string command, string arguments)
+    {
+        var chatGui = Service<ChatGui>.Get();
+        var configuration = Service<DalamudConfiguration>.Get();
+
+        configuration.BadWords ??= new List<string>();
+
+        if (configuration.BadWords.Count == 0)
         {
-            Service<ChatGui>.Get().Print("Unloading...");
-            Service<Dalamud>.Get().Unload();
+            chatGui.Print(Loc.Localize("DalamudNoneMuted", "No muted words or sentences."));
+            return;
         }
 
-        private void OnHelpCommand(string command, string arguments)
+        configuration.Save();
+
+        foreach (var word in configuration.BadWords)
+            chatGui.Print($"\"{word}\"");
+    }
+
+    private void OnBadWordsRemoveCommand(string command, string arguments)
+    {
+        var chatGui = Service<ChatGui>.Get();
+        var configuration = Service<DalamudConfiguration>.Get();
+
+        configuration.BadWords ??= new List<string>();
+
+        configuration.BadWords.RemoveAll(x => x == arguments);
+
+        configuration.Save();
+
+        chatGui.Print(string.Format(Loc.Localize("DalamudUnmuted", "Unmuted \"{0}\"."), arguments));
+    }
+
+    private void OnLastLinkCommand(string command, string arguments)
+    {
+        var chatHandlers = Service<ChatHandlers>.Get();
+        var chatGui = Service<ChatGui>.Get();
+
+        if (string.IsNullOrEmpty(chatHandlers.LastLink))
         {
-            var chatGui = Service<ChatGui>.Get();
-            var commandManager = Service<CommandManager>.Get();
-
-            var showDebug = arguments.Contains("debug");
-
-            chatGui.Print(Loc.Localize("DalamudCmdHelpAvailable", "Available commands:"));
-            foreach (var cmd in commandManager.Commands)
-            {
-                if (!cmd.Value.ShowInHelp && !showDebug)
-                    continue;
-
-                chatGui.Print($"{cmd.Key}: {cmd.Value.HelpMessage}");
-            }
+            chatGui.Print(Loc.Localize("DalamudNoLastLink", "No last link..."));
+            return;
         }
 
-        private void OnBadWordsAddCommand(string command, string arguments)
+        chatGui.Print(string.Format(Loc.Localize("DalamudOpeningLink", "Opening {0}"), chatHandlers.LastLink));
+        Process.Start(new ProcessStartInfo(chatHandlers.LastLink)
         {
-            var chatGui = Service<ChatGui>.Get();
-            var configuration = Service<DalamudConfiguration>.Get();
+            UseShellExecute = true,
+        });
+    }
 
-            configuration.BadWords ??= new List<string>();
+    private void OnBgmSetCommand(string command, string arguments)
+    {
+        var gameGui = Service<GameGui>.Get();
 
-            if (string.IsNullOrEmpty(arguments))
-            {
-                chatGui.Print(Loc.Localize("DalamudMuteNoArgs", "Please provide a word to mute."));
-                return;
-            }
+        if (ushort.TryParse(arguments, out var value))
+        {
+            gameGui.SetBgm(value);
+        }
+        else
+        {
+            // Revert to the original BGM by specifying an invalid one
+            gameGui.SetBgm(9999);
+        }
+    }
 
-            configuration.BadWords.Add(arguments);
+    private void OnDebugDrawDevMenu(string command, string arguments)
+    {
+        Service<DalamudInterface>.Get().ToggleDevMenu();
+    }
 
-            configuration.Save();
+    private void OnTogglePluginStats(string command, string arguments)
+    {
+        Service<DalamudInterface>.Get().TogglePluginStatsWindow();
+    }
 
-            chatGui.Print(string.Format(Loc.Localize("DalamudMuted", "Muted \"{0}\"."), arguments));
+    private void OnToggleBranchSwitcher(string command, string arguments)
+    {
+        Service<DalamudInterface>.Get().ToggleBranchSwitcher();
+    }
+
+    private void OnDebugDrawDataMenu(string command, string arguments)
+    {
+        var dalamudInterface = Service<DalamudInterface>.Get();
+
+        if (string.IsNullOrEmpty(arguments))
+            dalamudInterface.ToggleDataWindow();
+        else
+            dalamudInterface.ToggleDataWindow(arguments);
+    }
+
+    private void OnDebugDrawIMEPanel(string command, string arguments)
+    {
+        Service<DalamudInterface>.Get().OpenImeWindow();
+    }
+
+    private void OnOpenLog(string command, string arguments)
+    {
+        Service<DalamudInterface>.Get().ToggleLogWindow();
+    }
+
+    private void OnDebugImInfoCommand(string command, string arguments)
+    {
+        var io = Service<InterfaceManager>.Get().LastImGuiIoPtr;
+        var info = $"WantCaptureKeyboard: {io.WantCaptureKeyboard}\n";
+        info += $"WantCaptureMouse: {io.WantCaptureMouse}\n";
+        info += $"WantSetMousePos: {io.WantSetMousePos}\n";
+        info += $"WantTextInput: {io.WantTextInput}\n";
+        info += $"WantSaveIniSettings: {io.WantSaveIniSettings}\n";
+        info += $"BackendFlags: {(int)io.BackendFlags}\n";
+        info += $"DeltaTime: {io.DeltaTime}\n";
+        info += $"DisplaySize: {io.DisplaySize.X} {io.DisplaySize.Y}\n";
+        info += $"Framerate: {io.Framerate}\n";
+        info += $"MetricsActiveWindows: {io.MetricsActiveWindows}\n";
+        info += $"MetricsRenderWindows: {io.MetricsRenderWindows}\n";
+        info += $"MousePos: {io.MousePos.X} {io.MousePos.Y}\n";
+        info += $"MouseClicked: {io.MouseClicked}\n";
+        info += $"MouseDown: {io.MouseDown}\n";
+        info += $"NavActive: {io.NavActive}\n";
+        info += $"NavVisible: {io.NavVisible}\n";
+
+        Log.Information(info);
+    }
+
+    private void OnVersionInfoCommand(string command, string arguments)
+    {
+        var chatGui = Service<ChatGui>.Get();
+
+        chatGui.Print(new SeStringBuilder()
+                      .AddItalics("Dalamud:")
+                      .AddText($" D{Util.AssemblyVersion}({Util.GetGitHash()}")
+                      .Build());
+
+        chatGui.Print(new SeStringBuilder()
+                      .AddItalics("FFXIVCS:")
+                      .AddText($" {Util.GetGitHashClientStructs()}")
+                      .Build());
+    }
+
+    private void OnOpenInstallerCommand(string command, string arguments)
+    {
+        Service<DalamudInterface>.Get().TogglePluginInstallerWindow();
+    }
+
+    private void OnOpenCreditsCommand(string command, string arguments)
+    {
+        Service<DalamudInterface>.Get().ToggleCreditsWindow();
+    }
+
+    private void OnSetLanguageCommand(string command, string arguments)
+    {
+        var chatGui = Service<ChatGui>.Get();
+        var configuration = Service<DalamudConfiguration>.Get();
+        var localization = Service<Localization>.Get();
+
+        if (Localization.ApplicableLangCodes.Contains(arguments.ToLower()) || arguments.ToLower() == "en")
+        {
+            localization.SetupWithLangCode(arguments.ToLower());
+            configuration.LanguageOverride = arguments.ToLower();
+
+            chatGui.Print(string.Format(Loc.Localize("DalamudLanguageSetTo", "Language set to {0}"), arguments));
+        }
+        else
+        {
+            localization.SetupWithUiCulture();
+            configuration.LanguageOverride = null;
+
+            chatGui.Print(string.Format(Loc.Localize("DalamudLanguageSetTo", "Language set to {0}"), "default"));
         }
 
-        private void OnBadWordsListCommand(string command, string arguments)
+        configuration.Save();
+    }
+
+    private void OnOpenSettingsCommand(string command, string arguments)
+    {
+        Service<DalamudInterface>.Get().ToggleSettingsWindow();
+    }
+
+    private void OnUiCommand(string command, string arguments)
+    {
+        var im = Service<InterfaceManager>.Get();
+
+        im.IsDispatchingEvents = arguments switch
         {
-            var chatGui = Service<ChatGui>.Get();
-            var configuration = Service<DalamudConfiguration>.Get();
+            "show" => true,
+            "hide" => false,
+            _ => !im.IsDispatchingEvents,
+        };
 
-            configuration.BadWords ??= new List<string>();
+        var pm = Service<PluginManager>.Get();
 
-            if (configuration.BadWords.Count == 0)
-            {
-                chatGui.Print(Loc.Localize("DalamudNoneMuted", "No muted words or sentences."));
-                return;
-            }
-
-            configuration.Save();
-
-            foreach (var word in configuration.BadWords)
-                chatGui.Print($"\"{word}\"");
-        }
-
-        private void OnBadWordsRemoveCommand(string command, string arguments)
+        foreach (var plugin in pm.InstalledPlugins)
         {
-            var chatGui = Service<ChatGui>.Get();
-            var configuration = Service<DalamudConfiguration>.Get();
-
-            configuration.BadWords ??= new List<string>();
-
-            configuration.BadWords.RemoveAll(x => x == arguments);
-
-            configuration.Save();
-
-            chatGui.Print(string.Format(Loc.Localize("DalamudUnmuted", "Unmuted \"{0}\"."), arguments));
-        }
-
-        private void OnLastLinkCommand(string command, string arguments)
-        {
-            var chatHandlers = Service<ChatHandlers>.Get();
-            var chatGui = Service<ChatGui>.Get();
-
-            if (string.IsNullOrEmpty(chatHandlers.LastLink))
+            if (im.IsDispatchingEvents)
             {
-                chatGui.Print(Loc.Localize("DalamudNoLastLink", "No last link..."));
-                return;
-            }
-
-            chatGui.Print(string.Format(Loc.Localize("DalamudOpeningLink", "Opening {0}"), chatHandlers.LastLink));
-            Process.Start(new ProcessStartInfo(chatHandlers.LastLink)
-            {
-                UseShellExecute = true,
-            });
-        }
-
-        private void OnBgmSetCommand(string command, string arguments)
-        {
-            var gameGui = Service<GameGui>.Get();
-
-            if (ushort.TryParse(arguments, out var value))
-            {
-                gameGui.SetBgm(value);
+                plugin.DalamudInterface?.UiBuilder.NotifyShowUi();
             }
             else
             {
-                // Revert to the original BGM by specifying an invalid one
-                gameGui.SetBgm(9999);
-            }
-        }
-
-        private void OnDebugDrawDevMenu(string command, string arguments)
-        {
-            Service<DalamudInterface>.Get().ToggleDevMenu();
-        }
-
-        private void OnTogglePluginStats(string command, string arguments)
-        {
-            Service<DalamudInterface>.Get().TogglePluginStatsWindow();
-        }
-
-        private void OnToggleBranchSwitcher(string command, string arguments)
-        {
-            Service<DalamudInterface>.Get().ToggleBranchSwitcher();
-        }
-
-        private void OnDebugDrawDataMenu(string command, string arguments)
-        {
-            var dalamudInterface = Service<DalamudInterface>.Get();
-
-            if (string.IsNullOrEmpty(arguments))
-                dalamudInterface.ToggleDataWindow();
-            else
-                dalamudInterface.ToggleDataWindow(arguments);
-        }
-
-        private void OnDebugDrawIMEPanel(string command, string arguments)
-        {
-            Service<DalamudInterface>.Get().OpenImeWindow();
-        }
-
-        private void OnOpenLog(string command, string arguments)
-        {
-            Service<DalamudInterface>.Get().ToggleLogWindow();
-        }
-
-        private void OnDebugImInfoCommand(string command, string arguments)
-        {
-            var io = Service<InterfaceManager>.Get().LastImGuiIoPtr;
-            var info = $"WantCaptureKeyboard: {io.WantCaptureKeyboard}\n";
-            info += $"WantCaptureMouse: {io.WantCaptureMouse}\n";
-            info += $"WantSetMousePos: {io.WantSetMousePos}\n";
-            info += $"WantTextInput: {io.WantTextInput}\n";
-            info += $"WantSaveIniSettings: {io.WantSaveIniSettings}\n";
-            info += $"BackendFlags: {(int)io.BackendFlags}\n";
-            info += $"DeltaTime: {io.DeltaTime}\n";
-            info += $"DisplaySize: {io.DisplaySize.X} {io.DisplaySize.Y}\n";
-            info += $"Framerate: {io.Framerate}\n";
-            info += $"MetricsActiveWindows: {io.MetricsActiveWindows}\n";
-            info += $"MetricsRenderWindows: {io.MetricsRenderWindows}\n";
-            info += $"MousePos: {io.MousePos.X} {io.MousePos.Y}\n";
-            info += $"MouseClicked: {io.MouseClicked}\n";
-            info += $"MouseDown: {io.MouseDown}\n";
-            info += $"NavActive: {io.NavActive}\n";
-            info += $"NavVisible: {io.NavVisible}\n";
-
-            Log.Information(info);
-        }
-
-        private void OnVersionInfoCommand(string command, string arguments)
-        {
-            var chatGui = Service<ChatGui>.Get();
-
-            chatGui.Print(new SeStringBuilder()
-                              .AddItalics("Dalamud:")
-                              .AddText($" D{Util.AssemblyVersion}({Util.GetGitHash()}")
-                              .Build());
-
-            chatGui.Print(new SeStringBuilder()
-                          .AddItalics("FFXIVCS:")
-                          .AddText($" {Util.GetGitHashClientStructs()}")
-                          .Build());
-        }
-
-        private void OnOpenInstallerCommand(string command, string arguments)
-        {
-            Service<DalamudInterface>.Get().TogglePluginInstallerWindow();
-        }
-
-        private void OnOpenCreditsCommand(string command, string arguments)
-        {
-            Service<DalamudInterface>.Get().ToggleCreditsWindow();
-        }
-
-        private void OnSetLanguageCommand(string command, string arguments)
-        {
-            var chatGui = Service<ChatGui>.Get();
-            var configuration = Service<DalamudConfiguration>.Get();
-            var localization = Service<Localization>.Get();
-
-            if (Localization.ApplicableLangCodes.Contains(arguments.ToLower()) || arguments.ToLower() == "en")
-            {
-                localization.SetupWithLangCode(arguments.ToLower());
-                configuration.LanguageOverride = arguments.ToLower();
-
-                chatGui.Print(string.Format(Loc.Localize("DalamudLanguageSetTo", "Language set to {0}"), arguments));
-            }
-            else
-            {
-                localization.SetupWithUiCulture();
-                configuration.LanguageOverride = null;
-
-                chatGui.Print(string.Format(Loc.Localize("DalamudLanguageSetTo", "Language set to {0}"), "default"));
-            }
-
-            configuration.Save();
-        }
-
-        private void OnOpenSettingsCommand(string command, string arguments)
-        {
-            Service<DalamudInterface>.Get().ToggleSettingsWindow();
-        }
-
-        private void OnUiCommand(string command, string arguments)
-        {
-            var im = Service<InterfaceManager>.Get();
-
-            im.IsDispatchingEvents = arguments switch
-            {
-                "show" => true,
-                "hide" => false,
-                _ => !im.IsDispatchingEvents,
-            };
-
-            var pm = Service<PluginManager>.Get();
-
-            foreach (var plugin in pm.InstalledPlugins)
-            {
-                if (im.IsDispatchingEvents)
-                {
-                    plugin.DalamudInterface?.UiBuilder.NotifyShowUi();
-                }
-                else
-                {
-                    plugin.DalamudInterface?.UiBuilder.NotifyHideUi();
-                }
+                plugin.DalamudInterface?.UiBuilder.NotifyHideUi();
             }
         }
     }
diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs
index a8808e54f..e6048f2ec 100644
--- a/Dalamud/Interface/Internal/DalamudInterface.cs
+++ b/Dalamud/Interface/Internal/DalamudInterface.cs
@@ -32,365 +32,365 @@ using ImPlotNET;
 using PInvoke;
 using Serilog.Events;
 
-namespace Dalamud.Interface.Internal
+namespace Dalamud.Interface.Internal;
+
+/// <summary>
+/// This plugin implements all of the Dalamud interface separately, to allow for reloading of the interface and rapid prototyping.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class DalamudInterface : IDisposable, IServiceType
 {
-    /// <summary>
-    /// This plugin implements all of the Dalamud interface separately, to allow for reloading of the interface and rapid prototyping.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal class DalamudInterface : IDisposable, IServiceType
-    {
-        private static readonly ModuleLog Log = new("DUI");
+    private static readonly ModuleLog Log = new("DUI");
 
-        private readonly ChangelogWindow changelogWindow;
-        private readonly ColorDemoWindow colorDemoWindow;
-        private readonly ComponentDemoWindow componentDemoWindow;
-        private readonly CreditsWindow creditsWindow;
-        private readonly DataWindow dataWindow;
-        private readonly GamepadModeNotifierWindow gamepadModeNotifierWindow;
-        private readonly ImeWindow imeWindow;
-        private readonly ConsoleWindow consoleWindow;
-        private readonly PluginStatWindow pluginStatWindow;
-        private readonly PluginInstallerWindow pluginWindow;
-        private readonly SettingsWindow settingsWindow;
-        private readonly SelfTestWindow selfTestWindow;
-        private readonly StyleEditorWindow styleEditorWindow;
-        private readonly TitleScreenMenuWindow titleScreenMenuWindow;
-        private readonly ProfilerWindow profilerWindow;
-        private readonly BranchSwitcherWindow branchSwitcherWindow;
+    private readonly ChangelogWindow changelogWindow;
+    private readonly ColorDemoWindow colorDemoWindow;
+    private readonly ComponentDemoWindow componentDemoWindow;
+    private readonly CreditsWindow creditsWindow;
+    private readonly DataWindow dataWindow;
+    private readonly GamepadModeNotifierWindow gamepadModeNotifierWindow;
+    private readonly ImeWindow imeWindow;
+    private readonly ConsoleWindow consoleWindow;
+    private readonly PluginStatWindow pluginStatWindow;
+    private readonly PluginInstallerWindow pluginWindow;
+    private readonly SettingsWindow settingsWindow;
+    private readonly SelfTestWindow selfTestWindow;
+    private readonly StyleEditorWindow styleEditorWindow;
+    private readonly TitleScreenMenuWindow titleScreenMenuWindow;
+    private readonly ProfilerWindow profilerWindow;
+    private readonly BranchSwitcherWindow branchSwitcherWindow;
 
-        private readonly TextureWrap logoTexture;
-        private readonly TextureWrap tsmLogoTexture;
+    private readonly TextureWrap logoTexture;
+    private readonly TextureWrap tsmLogoTexture;
 
 #if DEBUG
         private bool isImGuiDrawDevMenu = true;
 #else
-        private bool isImGuiDrawDevMenu = false;
+    private bool isImGuiDrawDevMenu = false;
 #endif
 
 #if BOOT_AGING
         private bool signaledBoot = false;
 #endif
 
-        private bool isImGuiDrawDemoWindow = false;
-        private bool isImPlotDrawDemoWindow = false;
-        private bool isImGuiTestWindowsInMonospace = false;
-        private bool isImGuiDrawMetricsWindow = false;
+    private bool isImGuiDrawDemoWindow = false;
+    private bool isImPlotDrawDemoWindow = false;
+    private bool isImGuiTestWindowsInMonospace = false;
+    private bool isImGuiDrawMetricsWindow = false;
 
-        [ServiceManager.ServiceConstructor]
-        private DalamudInterface(
-            Dalamud dalamud,
-            DalamudConfiguration configuration,
-            InterfaceManager.InterfaceManagerWithScene interfaceManagerWithScene,
-            PluginImageCache pluginImageCache)
+    [ServiceManager.ServiceConstructor]
+    private DalamudInterface(
+        Dalamud dalamud,
+        DalamudConfiguration configuration,
+        InterfaceManager.InterfaceManagerWithScene interfaceManagerWithScene,
+        PluginImageCache pluginImageCache)
+    {
+        var interfaceManager = interfaceManagerWithScene.Manager;
+        this.WindowSystem = new WindowSystem("DalamudCore");
+
+        this.changelogWindow = new ChangelogWindow() { IsOpen = false };
+        this.colorDemoWindow = new ColorDemoWindow() { IsOpen = false };
+        this.componentDemoWindow = new ComponentDemoWindow() { IsOpen = false };
+        this.creditsWindow = new CreditsWindow() { IsOpen = false };
+        this.dataWindow = new DataWindow() { IsOpen = false };
+        this.gamepadModeNotifierWindow = new GamepadModeNotifierWindow() { IsOpen = false };
+        this.imeWindow = new ImeWindow() { IsOpen = false };
+        this.consoleWindow = new ConsoleWindow() { IsOpen = configuration.LogOpenAtStartup };
+        this.pluginStatWindow = new PluginStatWindow() { IsOpen = false };
+        this.pluginWindow = new PluginInstallerWindow(pluginImageCache) { IsOpen = false };
+        this.settingsWindow = new SettingsWindow() { IsOpen = false };
+        this.selfTestWindow = new SelfTestWindow() { IsOpen = false };
+        this.styleEditorWindow = new StyleEditorWindow() { IsOpen = false };
+        this.titleScreenMenuWindow = new TitleScreenMenuWindow() { IsOpen = false };
+        this.profilerWindow = new ProfilerWindow() { IsOpen = false };
+        this.branchSwitcherWindow = new BranchSwitcherWindow() { IsOpen = false };
+
+        this.WindowSystem.AddWindow(this.changelogWindow);
+        this.WindowSystem.AddWindow(this.colorDemoWindow);
+        this.WindowSystem.AddWindow(this.componentDemoWindow);
+        this.WindowSystem.AddWindow(this.creditsWindow);
+        this.WindowSystem.AddWindow(this.dataWindow);
+        this.WindowSystem.AddWindow(this.gamepadModeNotifierWindow);
+        this.WindowSystem.AddWindow(this.imeWindow);
+        this.WindowSystem.AddWindow(this.consoleWindow);
+        this.WindowSystem.AddWindow(this.pluginStatWindow);
+        this.WindowSystem.AddWindow(this.pluginWindow);
+        this.WindowSystem.AddWindow(this.settingsWindow);
+        this.WindowSystem.AddWindow(this.selfTestWindow);
+        this.WindowSystem.AddWindow(this.styleEditorWindow);
+        this.WindowSystem.AddWindow(this.titleScreenMenuWindow);
+        this.WindowSystem.AddWindow(this.profilerWindow);
+        this.WindowSystem.AddWindow(this.branchSwitcherWindow);
+
+        ImGuiManagedAsserts.AssertsEnabled = configuration.AssertsEnabledAtStartup;
+        this.isImGuiDrawDevMenu = this.isImGuiDrawDevMenu || configuration.DevBarOpenAtStartup;
+
+        interfaceManager.Draw += this.OnDraw;
+
+        var logoTex =
+            interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "logo.png"));
+        var tsmLogoTex =
+            interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "tsmLogo.png"));
+
+        if (logoTex == null || tsmLogoTex == null)
         {
-            var interfaceManager = interfaceManagerWithScene.Manager;
-            this.WindowSystem = new WindowSystem("DalamudCore");
-
-            this.changelogWindow = new ChangelogWindow() { IsOpen = false };
-            this.colorDemoWindow = new ColorDemoWindow() { IsOpen = false };
-            this.componentDemoWindow = new ComponentDemoWindow() { IsOpen = false };
-            this.creditsWindow = new CreditsWindow() { IsOpen = false };
-            this.dataWindow = new DataWindow() { IsOpen = false };
-            this.gamepadModeNotifierWindow = new GamepadModeNotifierWindow() { IsOpen = false };
-            this.imeWindow = new ImeWindow() { IsOpen = false };
-            this.consoleWindow = new ConsoleWindow() { IsOpen = configuration.LogOpenAtStartup };
-            this.pluginStatWindow = new PluginStatWindow() { IsOpen = false };
-            this.pluginWindow = new PluginInstallerWindow(pluginImageCache) { IsOpen = false };
-            this.settingsWindow = new SettingsWindow() { IsOpen = false };
-            this.selfTestWindow = new SelfTestWindow() { IsOpen = false };
-            this.styleEditorWindow = new StyleEditorWindow() { IsOpen = false };
-            this.titleScreenMenuWindow = new TitleScreenMenuWindow() { IsOpen = false };
-            this.profilerWindow = new ProfilerWindow() { IsOpen = false };
-            this.branchSwitcherWindow = new BranchSwitcherWindow() { IsOpen = false };
-
-            this.WindowSystem.AddWindow(this.changelogWindow);
-            this.WindowSystem.AddWindow(this.colorDemoWindow);
-            this.WindowSystem.AddWindow(this.componentDemoWindow);
-            this.WindowSystem.AddWindow(this.creditsWindow);
-            this.WindowSystem.AddWindow(this.dataWindow);
-            this.WindowSystem.AddWindow(this.gamepadModeNotifierWindow);
-            this.WindowSystem.AddWindow(this.imeWindow);
-            this.WindowSystem.AddWindow(this.consoleWindow);
-            this.WindowSystem.AddWindow(this.pluginStatWindow);
-            this.WindowSystem.AddWindow(this.pluginWindow);
-            this.WindowSystem.AddWindow(this.settingsWindow);
-            this.WindowSystem.AddWindow(this.selfTestWindow);
-            this.WindowSystem.AddWindow(this.styleEditorWindow);
-            this.WindowSystem.AddWindow(this.titleScreenMenuWindow);
-            this.WindowSystem.AddWindow(this.profilerWindow);
-            this.WindowSystem.AddWindow(this.branchSwitcherWindow);
-
-            ImGuiManagedAsserts.AssertsEnabled = configuration.AssertsEnabledAtStartup;
-            this.isImGuiDrawDevMenu = this.isImGuiDrawDevMenu || configuration.DevBarOpenAtStartup;
-
-            interfaceManager.Draw += this.OnDraw;
-
-            var logoTex =
-                interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "logo.png"));
-            var tsmLogoTex =
-                interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "tsmLogo.png"));
-
-            if (logoTex == null || tsmLogoTex == null)
-            {
-                throw new Exception("Failed to load logo textures");
-            }
-
-            this.logoTexture = logoTex;
-            this.tsmLogoTexture = tsmLogoTex;
-
-            var tsm = Service<TitleScreenMenu>.Get();
-            tsm.AddEntryCore(Loc.Localize("TSMDalamudPlugins", "Plugin Installer"), this.tsmLogoTexture, () => this.pluginWindow.IsOpen = true);
-            tsm.AddEntryCore(Loc.Localize("TSMDalamudSettings", "Dalamud Settings"), this.tsmLogoTexture, () => this.settingsWindow.IsOpen = true);
-
-            if (!configuration.DalamudBetaKind.IsNullOrEmpty())
-            {
-                tsm.AddEntryCore(Loc.Localize("TSMDalamudDevMenu", "Developer Menu"), this.tsmLogoTexture, () => this.isImGuiDrawDevMenu = true);
-            }
+            throw new Exception("Failed to load logo textures");
         }
 
-        /// <summary>
-        /// Gets the number of frames since Dalamud has loaded.
-        /// </summary>
-        public ulong FrameCount { get; private set; }
+        this.logoTexture = logoTex;
+        this.tsmLogoTexture = tsmLogoTex;
 
-        /// <summary>
-        /// Gets the <see cref="WindowSystem"/> controlling all Dalamud-internal windows.
-        /// </summary>
-        public WindowSystem WindowSystem { get; init; }
+        var tsm = Service<TitleScreenMenu>.Get();
+        tsm.AddEntryCore(Loc.Localize("TSMDalamudPlugins", "Plugin Installer"), this.tsmLogoTexture, () => this.pluginWindow.IsOpen = true);
+        tsm.AddEntryCore(Loc.Localize("TSMDalamudSettings", "Dalamud Settings"), this.tsmLogoTexture, () => this.settingsWindow.IsOpen = true);
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the /xldev menu is open.
-        /// </summary>
-        public bool IsDevMenuOpen
+        if (!configuration.DalamudBetaKind.IsNullOrEmpty())
         {
-            get => this.isImGuiDrawDevMenu;
-            set => this.isImGuiDrawDevMenu = value;
+            tsm.AddEntryCore(Loc.Localize("TSMDalamudDevMenu", "Developer Menu"), this.tsmLogoTexture, () => this.isImGuiDrawDevMenu = true);
         }
+    }
 
-        /// <inheritdoc/>
-        public void Dispose()
+    /// <summary>
+    /// Gets the number of frames since Dalamud has loaded.
+    /// </summary>
+    public ulong FrameCount { get; private set; }
+
+    /// <summary>
+    /// Gets the <see cref="WindowSystem"/> controlling all Dalamud-internal windows.
+    /// </summary>
+    public WindowSystem WindowSystem { get; init; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the /xldev menu is open.
+    /// </summary>
+    public bool IsDevMenuOpen
+    {
+        get => this.isImGuiDrawDevMenu;
+        set => this.isImGuiDrawDevMenu = value;
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        Service<InterfaceManager>.Get().Draw -= this.OnDraw;
+
+        this.WindowSystem.RemoveAllWindows();
+
+        this.changelogWindow.Dispose();
+        this.creditsWindow.Dispose();
+        this.consoleWindow.Dispose();
+        this.pluginWindow.Dispose();
+        this.titleScreenMenuWindow.Dispose();
+
+        this.logoTexture.Dispose();
+        this.tsmLogoTexture.Dispose();
+    }
+
+    #region Open
+
+    /// <summary>
+    /// Opens the <see cref="ChangelogWindow"/>.
+    /// </summary>
+    public void OpenChangelogWindow() => this.changelogWindow.IsOpen = true;
+
+    /// <summary>
+    /// Opens the <see cref="ColorDemoWindow"/>.
+    /// </summary>
+    public void OpenColorsDemoWindow() => this.colorDemoWindow.IsOpen = true;
+
+    /// <summary>
+    /// Opens the <see cref="ComponentDemoWindow"/>.
+    /// </summary>
+    public void OpenComponentDemoWindow() => this.componentDemoWindow.IsOpen = true;
+
+    /// <summary>
+    /// Opens the <see cref="CreditsWindow"/>.
+    /// </summary>
+    public void OpenCreditsWindow() => this.creditsWindow.IsOpen = true;
+
+    /// <summary>
+    /// Opens the <see cref="DataWindow"/>.
+    /// </summary>
+    /// <param name="dataKind">The data kind to switch to after opening.</param>
+    public void OpenDataWindow(string? dataKind = null)
+    {
+        this.dataWindow.IsOpen = true;
+        if (dataKind != null && this.dataWindow.IsOpen)
         {
-            Service<InterfaceManager>.Get().Draw -= this.OnDraw;
-
-            this.WindowSystem.RemoveAllWindows();
-
-            this.changelogWindow.Dispose();
-            this.creditsWindow.Dispose();
-            this.consoleWindow.Dispose();
-            this.pluginWindow.Dispose();
-            this.titleScreenMenuWindow.Dispose();
-
-            this.logoTexture.Dispose();
-            this.tsmLogoTexture.Dispose();
+            this.dataWindow.SetDataKind(dataKind);
         }
+    }
 
-        #region Open
+    /// <summary>
+    /// Opens the dev menu bar.
+    /// </summary>
+    public void OpenDevMenu() => this.isImGuiDrawDevMenu = true;
 
-        /// <summary>
-        /// Opens the <see cref="ChangelogWindow"/>.
-        /// </summary>
-        public void OpenChangelogWindow() => this.changelogWindow.IsOpen = true;
+    /// <summary>
+    /// Opens the <see cref="GamepadModeNotifierWindow"/>.
+    /// </summary>
+    public void OpenGamepadModeNotifierWindow() => this.gamepadModeNotifierWindow.IsOpen = true;
 
-        /// <summary>
-        /// Opens the <see cref="ColorDemoWindow"/>.
-        /// </summary>
-        public void OpenColorsDemoWindow() => this.colorDemoWindow.IsOpen = true;
+    /// <summary>
+    /// Opens the <see cref="ImeWindow"/>.
+    /// </summary>
+    public void OpenImeWindow() => this.imeWindow.IsOpen = true;
 
-        /// <summary>
-        /// Opens the <see cref="ComponentDemoWindow"/>.
-        /// </summary>
-        public void OpenComponentDemoWindow() => this.componentDemoWindow.IsOpen = true;
+    /// <summary>
+    /// Opens the <see cref="ConsoleWindow"/>.
+    /// </summary>
+    public void OpenLogWindow() => this.consoleWindow.IsOpen = true;
 
-        /// <summary>
-        /// Opens the <see cref="CreditsWindow"/>.
-        /// </summary>
-        public void OpenCreditsWindow() => this.creditsWindow.IsOpen = true;
+    /// <summary>
+    /// Opens the <see cref="PluginStatWindow"/>.
+    /// </summary>
+    public void OpenPluginStats() => this.pluginStatWindow.IsOpen = true;
 
-        /// <summary>
-        /// Opens the <see cref="DataWindow"/>.
-        /// </summary>
-        /// <param name="dataKind">The data kind to switch to after opening.</param>
-        public void OpenDataWindow(string? dataKind = null)
+    /// <summary>
+    /// Opens the <see cref="PluginInstallerWindow"/>.
+    /// </summary>
+    public void OpenPluginInstaller() => this.pluginWindow.IsOpen = true;
+
+    /// <summary>
+    /// Opens the <see cref="PluginInstallerWindow"/> on the plugin changelogs.
+    /// </summary>
+    public void OpenPluginInstallerPluginChangelogs() => this.pluginWindow.OpenPluginChangelogs();
+
+    /// <summary>
+    /// Opens the <see cref="SettingsWindow"/>.
+    /// </summary>
+    public void OpenSettings() => this.settingsWindow.IsOpen = true;
+
+    /// <summary>
+    /// Opens the <see cref="SelfTestWindow"/>.
+    /// </summary>
+    public void OpenSelfTest() => this.selfTestWindow.IsOpen = true;
+
+    /// <summary>
+    /// Opens the <see cref="StyleEditorWindow"/>.
+    /// </summary>
+    public void OpenStyleEditor() => this.styleEditorWindow.IsOpen = true;
+
+    /// <summary>
+    /// Opens the <see cref="ProfilerWindow"/>.
+    /// </summary>
+    public void OpenProfiler() => this.profilerWindow.IsOpen = true;
+
+    /// <summary>
+    /// Opens the <see cref="BranchSwitcherWindow"/>.
+    /// </summary>
+    public void OpenBranchSwitcher() => this.branchSwitcherWindow.IsOpen = true;
+
+    #endregion
+
+    #region Close
+
+    /// <summary>
+    /// Closes the <see cref="ImeWindow"/>.
+    /// </summary>
+    public void CloseImeWindow() => this.imeWindow.IsOpen = false;
+
+    /// <summary>
+    /// Closes the <see cref="GamepadModeNotifierWindow"/>.
+    /// </summary>
+    public void CloseGamepadModeNotifierWindow() => this.gamepadModeNotifierWindow.IsOpen = false;
+
+    #endregion
+
+    #region Toggle
+
+    /// <summary>
+    /// Toggles the <see cref="ChangelogWindow"/>.
+    /// </summary>
+    public void ToggleChangelogWindow() => this.changelogWindow.Toggle();
+
+    /// <summary>
+    /// Toggles the <see cref="ColorDemoWindow"/>.
+    /// </summary>
+    public void ToggleColorsDemoWindow() => this.colorDemoWindow.Toggle();
+
+    /// <summary>
+    /// Toggles the <see cref="ComponentDemoWindow"/>.
+    /// </summary>
+    public void ToggleComponentDemoWindow() => this.componentDemoWindow.Toggle();
+
+    /// <summary>
+    /// Toggles the <see cref="CreditsWindow"/>.
+    /// </summary>
+    public void ToggleCreditsWindow() => this.creditsWindow.Toggle();
+
+    /// <summary>
+    /// Toggles the <see cref="DataWindow"/>.
+    /// </summary>
+    /// <param name="dataKind">The data kind to switch to after opening.</param>
+    public void ToggleDataWindow(string dataKind = null)
+    {
+        this.dataWindow.Toggle();
+        if (dataKind != null && this.dataWindow.IsOpen)
         {
-            this.dataWindow.IsOpen = true;
-            if (dataKind != null && this.dataWindow.IsOpen)
-            {
-                this.dataWindow.SetDataKind(dataKind);
-            }
+            this.dataWindow.SetDataKind(dataKind);
         }
+    }
 
-        /// <summary>
-        /// Opens the dev menu bar.
-        /// </summary>
-        public void OpenDevMenu() => this.isImGuiDrawDevMenu = true;
+    /// <summary>
+    /// Toggles the dev menu bar.
+    /// </summary>
+    public void ToggleDevMenu() => this.isImGuiDrawDevMenu ^= true;
 
-        /// <summary>
-        /// Opens the <see cref="GamepadModeNotifierWindow"/>.
-        /// </summary>
-        public void OpenGamepadModeNotifierWindow() => this.gamepadModeNotifierWindow.IsOpen = true;
+    /// <summary>
+    /// Toggles the <see cref="GamepadModeNotifierWindow"/>.
+    /// </summary>
+    public void ToggleGamepadModeNotifierWindow() => this.gamepadModeNotifierWindow.Toggle();
 
-        /// <summary>
-        /// Opens the <see cref="ImeWindow"/>.
-        /// </summary>
-        public void OpenImeWindow() => this.imeWindow.IsOpen = true;
+    /// <summary>
+    /// Toggles the <see cref="ImeWindow"/>.
+    /// </summary>
+    public void ToggleIMEWindow() => this.imeWindow.Toggle();
 
-        /// <summary>
-        /// Opens the <see cref="ConsoleWindow"/>.
-        /// </summary>
-        public void OpenLogWindow() => this.consoleWindow.IsOpen = true;
+    /// <summary>
+    /// Toggles the <see cref="ConsoleWindow"/>.
+    /// </summary>
+    public void ToggleLogWindow() => this.consoleWindow.Toggle();
 
-        /// <summary>
-        /// Opens the <see cref="PluginStatWindow"/>.
-        /// </summary>
-        public void OpenPluginStats() => this.pluginStatWindow.IsOpen = true;
+    /// <summary>
+    /// Toggles the <see cref="PluginStatWindow"/>.
+    /// </summary>
+    public void TogglePluginStatsWindow() => this.pluginStatWindow.Toggle();
 
-        /// <summary>
-        /// Opens the <see cref="PluginInstallerWindow"/>.
-        /// </summary>
-        public void OpenPluginInstaller() => this.pluginWindow.IsOpen = true;
+    /// <summary>
+    /// Toggles the <see cref="PluginInstallerWindow"/>.
+    /// </summary>
+    public void TogglePluginInstallerWindow() => this.pluginWindow.Toggle();
 
-        /// <summary>
-        /// Opens the <see cref="PluginInstallerWindow"/> on the plugin changelogs.
-        /// </summary>
-        public void OpenPluginInstallerPluginChangelogs() => this.pluginWindow.OpenPluginChangelogs();
+    /// <summary>
+    /// Toggles the <see cref="SettingsWindow"/>.
+    /// </summary>
+    public void ToggleSettingsWindow() => this.settingsWindow.Toggle();
 
-        /// <summary>
-        /// Opens the <see cref="SettingsWindow"/>.
-        /// </summary>
-        public void OpenSettings() => this.settingsWindow.IsOpen = true;
+    /// <summary>
+    /// Toggles the <see cref="SelfTestWindow"/>.
+    /// </summary>
+    public void ToggleSelfTestWindow() => this.selfTestWindow.Toggle();
 
-        /// <summary>
-        /// Opens the <see cref="SelfTestWindow"/>.
-        /// </summary>
-        public void OpenSelfTest() => this.selfTestWindow.IsOpen = true;
+    /// <summary>
+    /// Toggles the <see cref="StyleEditorWindow"/>.
+    /// </summary>
+    public void ToggleStyleEditorWindow() => this.selfTestWindow.Toggle();
 
-        /// <summary>
-        /// Opens the <see cref="StyleEditorWindow"/>.
-        /// </summary>
-        public void OpenStyleEditor() => this.styleEditorWindow.IsOpen = true;
+    /// <summary>
+    /// Toggles the <see cref="ProfilerWindow"/>.
+    /// </summary>
+    public void ToggleProfilerWindow() => this.profilerWindow.Toggle();
 
-        /// <summary>
-        /// Opens the <see cref="ProfilerWindow"/>.
-        /// </summary>
-        public void OpenProfiler() => this.profilerWindow.IsOpen = true;
+    /// <summary>
+    /// Toggles the <see cref="BranchSwitcherWindow"/>.
+    /// </summary>
+    public void ToggleBranchSwitcher() => this.branchSwitcherWindow.Toggle();
 
-        /// <summary>
-        /// Opens the <see cref="BranchSwitcherWindow"/>.
-        /// </summary>
-        public void OpenBranchSwitcher() => this.branchSwitcherWindow.IsOpen = true;
+    #endregion
 
-        #endregion
-
-        #region Close
-
-        /// <summary>
-        /// Closes the <see cref="ImeWindow"/>.
-        /// </summary>
-        public void CloseImeWindow() => this.imeWindow.IsOpen = false;
-
-        /// <summary>
-        /// Closes the <see cref="GamepadModeNotifierWindow"/>.
-        /// </summary>
-        public void CloseGamepadModeNotifierWindow() => this.gamepadModeNotifierWindow.IsOpen = false;
-
-        #endregion
-
-        #region Toggle
-
-        /// <summary>
-        /// Toggles the <see cref="ChangelogWindow"/>.
-        /// </summary>
-        public void ToggleChangelogWindow() => this.changelogWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="ColorDemoWindow"/>.
-        /// </summary>
-        public void ToggleColorsDemoWindow() => this.colorDemoWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="ComponentDemoWindow"/>.
-        /// </summary>
-        public void ToggleComponentDemoWindow() => this.componentDemoWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="CreditsWindow"/>.
-        /// </summary>
-        public void ToggleCreditsWindow() => this.creditsWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="DataWindow"/>.
-        /// </summary>
-        /// <param name="dataKind">The data kind to switch to after opening.</param>
-        public void ToggleDataWindow(string dataKind = null)
-        {
-            this.dataWindow.Toggle();
-            if (dataKind != null && this.dataWindow.IsOpen)
-            {
-                this.dataWindow.SetDataKind(dataKind);
-            }
-        }
-
-        /// <summary>
-        /// Toggles the dev menu bar.
-        /// </summary>
-        public void ToggleDevMenu() => this.isImGuiDrawDevMenu ^= true;
-
-        /// <summary>
-        /// Toggles the <see cref="GamepadModeNotifierWindow"/>.
-        /// </summary>
-        public void ToggleGamepadModeNotifierWindow() => this.gamepadModeNotifierWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="ImeWindow"/>.
-        /// </summary>
-        public void ToggleIMEWindow() => this.imeWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="ConsoleWindow"/>.
-        /// </summary>
-        public void ToggleLogWindow() => this.consoleWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="PluginStatWindow"/>.
-        /// </summary>
-        public void TogglePluginStatsWindow() => this.pluginStatWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="PluginInstallerWindow"/>.
-        /// </summary>
-        public void TogglePluginInstallerWindow() => this.pluginWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="SettingsWindow"/>.
-        /// </summary>
-        public void ToggleSettingsWindow() => this.settingsWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="SelfTestWindow"/>.
-        /// </summary>
-        public void ToggleSelfTestWindow() => this.selfTestWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="StyleEditorWindow"/>.
-        /// </summary>
-        public void ToggleStyleEditorWindow() => this.selfTestWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="ProfilerWindow"/>.
-        /// </summary>
-        public void ToggleProfilerWindow() => this.profilerWindow.Toggle();
-
-        /// <summary>
-        /// Toggles the <see cref="BranchSwitcherWindow"/>.
-        /// </summary>
-        public void ToggleBranchSwitcher() => this.branchSwitcherWindow.Toggle();
-
-        #endregion
-
-        private void OnDraw()
-        {
-            this.FrameCount++;
+    private void OnDraw()
+    {
+        this.FrameCount++;
 
 #if BOOT_AGING
             if (this.frameCount > 500 && !this.signaledBoot)
@@ -405,456 +405,455 @@ namespace Dalamud.Interface.Internal
             }
 #endif
 
-            try
+        try
+        {
+            this.DrawHiddenDevMenuOpener();
+            this.DrawDevMenu();
+
+            if (Service<GameGui>.Get().GameUiHidden)
+                return;
+
+            this.WindowSystem.Draw();
+
+            if (this.isImGuiTestWindowsInMonospace)
+                ImGui.PushFont(InterfaceManager.MonoFont);
+
+            if (this.isImGuiDrawDemoWindow)
+                ImGui.ShowDemoWindow(ref this.isImGuiDrawDemoWindow);
+
+            if (this.isImPlotDrawDemoWindow)
+                ImPlot.ShowDemoWindow(ref this.isImPlotDrawDemoWindow);
+
+            if (this.isImGuiDrawMetricsWindow)
+                ImGui.ShowMetricsWindow(ref this.isImGuiDrawMetricsWindow);
+
+            if (this.isImGuiTestWindowsInMonospace)
+                ImGui.PopFont();
+
+            // Release focus of any ImGui window if we click into the game.
+            var io = ImGui.GetIO();
+            if (!io.WantCaptureMouse && (User32.GetKeyState((int)User32.VirtualKey.VK_LBUTTON) & 0x8000) != 0)
             {
-                this.DrawHiddenDevMenuOpener();
-                this.DrawDevMenu();
-
-                if (Service<GameGui>.Get().GameUiHidden)
-                    return;
-
-                this.WindowSystem.Draw();
-
-                if (this.isImGuiTestWindowsInMonospace)
-                    ImGui.PushFont(InterfaceManager.MonoFont);
-
-                if (this.isImGuiDrawDemoWindow)
-                    ImGui.ShowDemoWindow(ref this.isImGuiDrawDemoWindow);
-
-                if (this.isImPlotDrawDemoWindow)
-                    ImPlot.ShowDemoWindow(ref this.isImPlotDrawDemoWindow);
-
-                if (this.isImGuiDrawMetricsWindow)
-                    ImGui.ShowMetricsWindow(ref this.isImGuiDrawMetricsWindow);
-
-                if (this.isImGuiTestWindowsInMonospace)
-                    ImGui.PopFont();
-
-                // Release focus of any ImGui window if we click into the game.
-                var io = ImGui.GetIO();
-                if (!io.WantCaptureMouse && (User32.GetKeyState((int)User32.VirtualKey.VK_LBUTTON) & 0x8000) != 0)
-                {
-                    ImGui.SetWindowFocus(null);
-                }
-            }
-            catch (Exception ex)
-            {
-                PluginLog.Error(ex, "Error during OnDraw");
+                ImGui.SetWindowFocus(null);
             }
         }
-
-        private void DrawHiddenDevMenuOpener()
+        catch (Exception ex)
         {
-            var condition = Service<Condition>.Get();
+            PluginLog.Error(ex, "Error during OnDraw");
+        }
+    }
 
-            if (!this.isImGuiDrawDevMenu && !condition.Any())
+    private void DrawHiddenDevMenuOpener()
+    {
+        var condition = Service<Condition>.Get();
+
+        if (!this.isImGuiDrawDevMenu && !condition.Any())
+        {
+            ImGui.PushStyleColor(ImGuiCol.Button, Vector4.Zero);
+            ImGui.PushStyleColor(ImGuiCol.ButtonActive, Vector4.Zero);
+            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, Vector4.Zero);
+            ImGui.PushStyleColor(ImGuiCol.TextSelectedBg, new Vector4(0, 0, 0, 1));
+            ImGui.PushStyleColor(ImGuiCol.Border, new Vector4(0, 0, 0, 1));
+            ImGui.PushStyleColor(ImGuiCol.BorderShadow, new Vector4(0, 0, 0, 1));
+            ImGui.PushStyleColor(ImGuiCol.WindowBg, new Vector4(0, 0, 0, 1));
+
+            ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
+            ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
+            ImGui.PushStyleVar(ImGuiStyleVar.WindowBorderSize, 0);
+            ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 0);
+
+            var windowPos = ImGui.GetMainViewport().Pos + new Vector2(20);
+            ImGui.SetNextWindowPos(windowPos, ImGuiCond.Always);
+            ImGui.SetNextWindowBgAlpha(1);
+
+            if (ImGui.Begin("DevMenu Opener", ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoSavedSettings))
             {
-                ImGui.PushStyleColor(ImGuiCol.Button, Vector4.Zero);
-                ImGui.PushStyleColor(ImGuiCol.ButtonActive, Vector4.Zero);
-                ImGui.PushStyleColor(ImGuiCol.ButtonHovered, Vector4.Zero);
-                ImGui.PushStyleColor(ImGuiCol.TextSelectedBg, new Vector4(0, 0, 0, 1));
-                ImGui.PushStyleColor(ImGuiCol.Border, new Vector4(0, 0, 0, 1));
-                ImGui.PushStyleColor(ImGuiCol.BorderShadow, new Vector4(0, 0, 0, 1));
-                ImGui.PushStyleColor(ImGuiCol.WindowBg, new Vector4(0, 0, 0, 1));
+                ImGui.SetNextItemWidth(40);
+                if (ImGui.Button("###devMenuOpener", new Vector2(20, 20)))
+                    this.isImGuiDrawDevMenu = true;
 
-                ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
-                ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
-                ImGui.PushStyleVar(ImGuiStyleVar.WindowBorderSize, 0);
-                ImGui.PushStyleVar(ImGuiStyleVar.FrameBorderSize, 0);
+                ImGui.End();
+            }
 
-                var windowPos = ImGui.GetMainViewport().Pos + new Vector2(20);
+            if (EnvironmentConfiguration.DalamudForceMinHook)
+            {
                 ImGui.SetNextWindowPos(windowPos, ImGuiCond.Always);
                 ImGui.SetNextWindowBgAlpha(1);
 
-                if (ImGui.Begin("DevMenu Opener", ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoSavedSettings))
+                if (ImGui.Begin(
+                        "Disclaimer",
+                        ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoBackground |
+                        ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoMove |
+                        ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoMouseInputs |
+                        ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoSavedSettings))
                 {
-                    ImGui.SetNextItemWidth(40);
-                    if (ImGui.Button("###devMenuOpener", new Vector2(20, 20)))
-                        this.isImGuiDrawDevMenu = true;
-
-                    ImGui.End();
+                    ImGui.TextColored(ImGuiColors.DalamudRed, "Is force MinHook!");
                 }
 
-                if (EnvironmentConfiguration.DalamudForceMinHook)
-                {
-                    ImGui.SetNextWindowPos(windowPos, ImGuiCond.Always);
-                    ImGui.SetNextWindowBgAlpha(1);
-
-                    if (ImGui.Begin(
-                            "Disclaimer",
-                            ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoBackground |
-                            ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoMove |
-                            ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoMouseInputs |
-                            ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoSavedSettings))
-                    {
-                        ImGui.TextColored(ImGuiColors.DalamudRed, "Is force MinHook!");
-                    }
-
-                    ImGui.End();
-                }
-
-                ImGui.PopStyleVar(4);
-                ImGui.PopStyleColor(7);
+                ImGui.End();
             }
+
+            ImGui.PopStyleVar(4);
+            ImGui.PopStyleColor(7);
         }
+    }
 
-        private void DrawDevMenu()
+    private void DrawDevMenu()
+    {
+        if (this.isImGuiDrawDevMenu)
         {
-            if (this.isImGuiDrawDevMenu)
+            if (ImGui.BeginMainMenuBar())
             {
-                if (ImGui.BeginMainMenuBar())
+                var dalamud = Service<Dalamud>.Get();
+                var configuration = Service<DalamudConfiguration>.Get();
+                var pluginManager = Service<PluginManager>.Get();
+
+                if (ImGui.BeginMenu("Dalamud"))
                 {
-                    var dalamud = Service<Dalamud>.Get();
-                    var configuration = Service<DalamudConfiguration>.Get();
-                    var pluginManager = Service<PluginManager>.Get();
-
-                    if (ImGui.BeginMenu("Dalamud"))
+                    ImGui.MenuItem("Draw dev menu", string.Empty, ref this.isImGuiDrawDevMenu);
+                    var devBarAtStartup = configuration.DevBarOpenAtStartup;
+                    if (ImGui.MenuItem("Draw dev menu at startup", string.Empty, ref devBarAtStartup))
                     {
-                        ImGui.MenuItem("Draw dev menu", string.Empty, ref this.isImGuiDrawDevMenu);
-                        var devBarAtStartup = configuration.DevBarOpenAtStartup;
-                        if (ImGui.MenuItem("Draw dev menu at startup", string.Empty, ref devBarAtStartup))
-                        {
-                            configuration.DevBarOpenAtStartup ^= true;
-                            configuration.Save();
-                        }
-
-                        ImGui.Separator();
-
-                        if (ImGui.MenuItem("Open Log window"))
-                        {
-                            this.OpenLogWindow();
-                        }
-
-                        if (ImGui.BeginMenu("Set log level..."))
-                        {
-                            foreach (var logLevel in Enum.GetValues(typeof(LogEventLevel)).Cast<LogEventLevel>())
-                            {
-                                if (ImGui.MenuItem(logLevel + "##logLevelSwitch", string.Empty, EntryPoint.LogLevelSwitch.MinimumLevel == logLevel))
-                                {
-                                    EntryPoint.LogLevelSwitch.MinimumLevel = logLevel;
-                                    configuration.LogLevel = logLevel;
-                                    configuration.Save();
-                                }
-                            }
-
-                            ImGui.EndMenu();
-                        }
-
-                        var logSynchronously = configuration.LogSynchronously;
-                        if (ImGui.MenuItem("Log Synchronously", null, ref logSynchronously))
-                        {
-                            configuration.LogSynchronously = logSynchronously;
-                            configuration.Save();
-
-                            var startupInfo = Service<DalamudStartInfo>.Get();
-                            EntryPoint.InitLogging(
-                                startupInfo.WorkingDirectory!,
-                                startupInfo.BootShowConsole,
-                                configuration.LogSynchronously);
-                        }
-
-                        var antiDebug = Service<AntiDebug>.Get();
-                        if (ImGui.MenuItem("Enable AntiDebug", null, antiDebug.IsEnabled))
-                        {
-                            var newEnabled = !antiDebug.IsEnabled;
-                            if (newEnabled)
-                                antiDebug.Enable();
-                            else
-                                antiDebug.Disable();
-
-                            configuration.IsAntiAntiDebugEnabled = newEnabled;
-                            configuration.Save();
-                        }
-
-                        ImGui.Separator();
-
-                        if (ImGui.MenuItem("Open Data window"))
-                        {
-                            this.OpenDataWindow();
-                        }
-
-                        if (ImGui.MenuItem("Open Credits window"))
-                        {
-                            this.OpenCreditsWindow();
-                        }
-
-                        if (ImGui.MenuItem("Open Settings window"))
-                        {
-                            this.OpenSettings();
-                        }
-
-                        if (ImGui.MenuItem("Open Changelog window"))
-                        {
-                            this.OpenChangelogWindow();
-                        }
-
-                        if (ImGui.MenuItem("Open Components Demo"))
-                        {
-                            this.OpenComponentDemoWindow();
-                        }
-
-                        if (ImGui.MenuItem("Open Colors Demo"))
-                        {
-                            this.OpenColorsDemoWindow();
-                        }
-
-                        if (ImGui.MenuItem("Open Self-Test"))
-                        {
-                            this.OpenSelfTest();
-                        }
-
-                        if (ImGui.MenuItem("Open Style Editor"))
-                        {
-                            this.OpenStyleEditor();
-                        }
-
-                        if (ImGui.MenuItem("Open Profiler"))
-                        {
-                            this.OpenProfiler();
-                        }
-
-                        ImGui.Separator();
-
-                        if (ImGui.MenuItem("Unload Dalamud"))
-                        {
-                            Service<Dalamud>.Get().Unload();
-                        }
-
-                        if (ImGui.MenuItem("Restart game"))
-                        {
-                            [DllImport("kernel32.dll")]
-                            [return: MarshalAs(UnmanagedType.Bool)]
-                            static extern void RaiseException(uint dwExceptionCode, uint dwExceptionFlags, uint nNumberOfArguments, IntPtr lpArguments);
-
-                            RaiseException(0x12345678, 0, 0, IntPtr.Zero);
-                            Process.GetCurrentProcess().Kill();
-                        }
-
-                        if (ImGui.MenuItem("Kill game"))
-                        {
-                            Process.GetCurrentProcess().Kill();
-                        }
-
-                        ImGui.Separator();
-
-                        if (ImGui.MenuItem("Access Violation"))
-                        {
-                            Marshal.ReadByte(IntPtr.Zero);
-                        }
-
-                        if (ImGui.MenuItem("Crash game (nullptr)"))
-                        {
-                            unsafe
-                            {
-                                var framework = Framework.Instance();
-                                framework->UIModule = (UIModule*)0;
-                            }
-                        }
-
-                        if (ImGui.MenuItem("Crash game (non-nullptr)"))
-                        {
-                            unsafe
-                            {
-                                var framework = Framework.Instance();
-                                framework->UIModule = (UIModule*)0x12345678;
-                            }
-                        }
-
-                        ImGui.Separator();
-
-                        if (ImGui.MenuItem("Open Dalamud branch switcher"))
-                        {
-                            this.OpenBranchSwitcher();
-                        }
-
-                        var startInfo = Service<DalamudStartInfo>.Get();
-                        ImGui.MenuItem(Util.AssemblyVersion, false);
-                        ImGui.MenuItem(startInfo.GameVersion.ToString(), false);
-                        ImGui.MenuItem($"D: {Util.GetGitHash()} CS: {Util.GetGitHashClientStructs()}", false);
-
-                        ImGui.EndMenu();
+                        configuration.DevBarOpenAtStartup ^= true;
+                        configuration.Save();
                     }
 
-                    if (ImGui.BeginMenu("GUI"))
+                    ImGui.Separator();
+
+                    if (ImGui.MenuItem("Open Log window"))
                     {
-                        ImGui.MenuItem("Use Monospace font for following windows", string.Empty, ref this.isImGuiTestWindowsInMonospace);
-                        ImGui.MenuItem("Draw ImGui demo", string.Empty, ref this.isImGuiDrawDemoWindow);
-                        ImGui.MenuItem("Draw ImPlot demo", string.Empty, ref this.isImPlotDrawDemoWindow);
-                        ImGui.MenuItem("Draw metrics", string.Empty, ref this.isImGuiDrawMetricsWindow);
+                        this.OpenLogWindow();
+                    }
 
-                        ImGui.Separator();
-
-                        var val = ImGuiManagedAsserts.AssertsEnabled;
-                        if (ImGui.MenuItem("Enable Asserts", string.Empty, ref val))
+                    if (ImGui.BeginMenu("Set log level..."))
+                    {
+                        foreach (var logLevel in Enum.GetValues(typeof(LogEventLevel)).Cast<LogEventLevel>())
                         {
-                            ImGuiManagedAsserts.AssertsEnabled = val;
-                        }
-
-                        if (ImGui.MenuItem("Enable asserts at startup", null, configuration.AssertsEnabledAtStartup))
-                        {
-                            configuration.AssertsEnabledAtStartup = !configuration.AssertsEnabledAtStartup;
-                            configuration.Save();
-                        }
-
-                        if (ImGui.MenuItem("Clear focus"))
-                        {
-                            ImGui.SetWindowFocus(null);
-                        }
-
-                        if (ImGui.MenuItem("Dump style"))
-                        {
-                            var info = string.Empty;
-                            var style = StyleModelV1.Get();
-                            var enCulture = new CultureInfo("en-US");
-
-                            foreach (var propertyInfo in typeof(StyleModel).GetProperties(BindingFlags.Public | BindingFlags.Instance))
+                            if (ImGui.MenuItem(logLevel + "##logLevelSwitch", string.Empty, EntryPoint.LogLevelSwitch.MinimumLevel == logLevel))
                             {
-                                if (propertyInfo.PropertyType == typeof(Vector2))
-                                {
-                                    var vec2 = (Vector2)propertyInfo.GetValue(style);
-                                    info += $"{propertyInfo.Name} = new Vector2({vec2.X.ToString(enCulture)}f, {vec2.Y.ToString(enCulture)}f),\n";
-                                }
-                                else
-                                {
-                                    info += $"{propertyInfo.Name} = {propertyInfo.GetValue(style)},\n";
-                                }
+                                EntryPoint.LogLevelSwitch.MinimumLevel = logLevel;
+                                configuration.LogLevel = logLevel;
+                                configuration.Save();
                             }
-
-                            info += "Colors = new Dictionary<string, Vector4>()\n";
-                            info += "{\n";
-
-                            foreach (var color in style.Colors)
-                            {
-                                info +=
-                                    $"{{\"{color.Key}\", new Vector4({color.Value.X.ToString(enCulture)}f, {color.Value.Y.ToString(enCulture)}f, {color.Value.Z.ToString(enCulture)}f, {color.Value.W.ToString(enCulture)}f)}},\n";
-                            }
-
-                            info += "},";
-
-                            Log.Information(info);
-                        }
-
-                        if (ImGui.MenuItem("Show dev bar info", null, configuration.ShowDevBarInfo))
-                        {
-                            configuration.ShowDevBarInfo = !configuration.ShowDevBarInfo;
                         }
 
                         ImGui.EndMenu();
                     }
 
-                    if (ImGui.BeginMenu("Game"))
+                    var logSynchronously = configuration.LogSynchronously;
+                    if (ImGui.MenuItem("Log Synchronously", null, ref logSynchronously))
                     {
-                        if (ImGui.MenuItem("Replace ExceptionHandler"))
-                        {
-                            dalamud.ReplaceExceptionHandler();
-                        }
+                        configuration.LogSynchronously = logSynchronously;
+                        configuration.Save();
 
-                        ImGui.EndMenu();
+                        var startupInfo = Service<DalamudStartInfo>.Get();
+                        EntryPoint.InitLogging(
+                            startupInfo.WorkingDirectory!,
+                            startupInfo.BootShowConsole,
+                            configuration.LogSynchronously);
                     }
 
-                    if (ImGui.BeginMenu("Plugins"))
+                    var antiDebug = Service<AntiDebug>.Get();
+                    if (ImGui.MenuItem("Enable AntiDebug", null, antiDebug.IsEnabled))
                     {
-                        if (ImGui.MenuItem("Open Plugin installer"))
-                        {
-                            this.OpenPluginInstaller();
-                        }
+                        var newEnabled = !antiDebug.IsEnabled;
+                        if (newEnabled)
+                            antiDebug.Enable();
+                        else
+                            antiDebug.Disable();
 
-                        if (ImGui.MenuItem("Clear cached images/icons"))
-                        {
-                            this.pluginWindow?.ClearIconCache();
-                        }
-
-                        ImGui.Separator();
-
-                        if (ImGui.MenuItem("Open Plugin Stats"))
-                        {
-                            this.OpenPluginStats();
-                        }
-
-                        if (ImGui.MenuItem("Print plugin info"))
-                        {
-                            foreach (var plugin in pluginManager.InstalledPlugins)
-                            {
-                                // TODO: some more here, state maybe?
-                                PluginLog.Information($"{plugin.Name}");
-                            }
-                        }
-
-                        if (ImGui.MenuItem("Scan dev plugins"))
-                        {
-                            pluginManager.ScanDevPlugins();
-                        }
-
-                        ImGui.Separator();
-
-                        if (ImGui.MenuItem("Load all API levels (ONLY FOR DEVELOPERS!!!)", null, pluginManager.LoadAllApiLevels))
-                        {
-                            pluginManager.LoadAllApiLevels = !pluginManager.LoadAllApiLevels;
-                        }
-
-                        if (ImGui.MenuItem("Load blacklisted plugins", null, pluginManager.LoadBannedPlugins))
-                        {
-                            pluginManager.LoadBannedPlugins = !pluginManager.LoadBannedPlugins;
-                        }
-
-                        ImGui.Separator();
-                        ImGui.MenuItem("API Level:" + PluginManager.DalamudApiLevel, false);
-                        ImGui.MenuItem("Loaded plugins:" + pluginManager.InstalledPlugins.Count, false);
-                        ImGui.EndMenu();
+                        configuration.IsAntiAntiDebugEnabled = newEnabled;
+                        configuration.Save();
                     }
 
-                    if (ImGui.BeginMenu("Localization"))
+                    ImGui.Separator();
+
+                    if (ImGui.MenuItem("Open Data window"))
                     {
-                        var localization = Service<Localization>.Get();
-
-                        if (ImGui.MenuItem("Export localizable"))
-                        {
-                            localization.ExportLocalizable();
-                        }
-
-                        if (ImGui.BeginMenu("Load language..."))
-                        {
-                            if (ImGui.MenuItem("From Fallbacks"))
-                            {
-                                localization.SetupWithFallbacks();
-                            }
-
-                            if (ImGui.MenuItem("From UICulture"))
-                            {
-                                localization.SetupWithUiCulture();
-                            }
-
-                            foreach (var applicableLangCode in Localization.ApplicableLangCodes)
-                            {
-                                if (ImGui.MenuItem($"Applicable: {applicableLangCode}"))
-                                {
-                                    localization.SetupWithLangCode(applicableLangCode);
-                                }
-                            }
-
-                            ImGui.EndMenu();
-                        }
-
-                        ImGui.EndMenu();
+                        this.OpenDataWindow();
                     }
 
-                    if (Service<GameGui>.Get().GameUiHidden)
-                        ImGui.BeginMenu("UI is hidden...", false);
-
-                    if (configuration.ShowDevBarInfo)
+                    if (ImGui.MenuItem("Open Credits window"))
                     {
-                        ImGui.PushFont(InterfaceManager.MonoFont);
-
-                        ImGui.BeginMenu(Util.GetGitHash(), false);
-                        ImGui.BeginMenu(this.FrameCount.ToString("000000"), false);
-                        ImGui.BeginMenu(ImGui.GetIO().Framerate.ToString("000"), false);
-                        ImGui.BeginMenu($"{Util.FormatBytes(GC.GetTotalMemory(false))}", false);
-
-                        ImGui.PopFont();
+                        this.OpenCreditsWindow();
                     }
 
-                    ImGui.EndMainMenuBar();
+                    if (ImGui.MenuItem("Open Settings window"))
+                    {
+                        this.OpenSettings();
+                    }
+
+                    if (ImGui.MenuItem("Open Changelog window"))
+                    {
+                        this.OpenChangelogWindow();
+                    }
+
+                    if (ImGui.MenuItem("Open Components Demo"))
+                    {
+                        this.OpenComponentDemoWindow();
+                    }
+
+                    if (ImGui.MenuItem("Open Colors Demo"))
+                    {
+                        this.OpenColorsDemoWindow();
+                    }
+
+                    if (ImGui.MenuItem("Open Self-Test"))
+                    {
+                        this.OpenSelfTest();
+                    }
+
+                    if (ImGui.MenuItem("Open Style Editor"))
+                    {
+                        this.OpenStyleEditor();
+                    }
+
+                    if (ImGui.MenuItem("Open Profiler"))
+                    {
+                        this.OpenProfiler();
+                    }
+
+                    ImGui.Separator();
+
+                    if (ImGui.MenuItem("Unload Dalamud"))
+                    {
+                        Service<Dalamud>.Get().Unload();
+                    }
+
+                    if (ImGui.MenuItem("Restart game"))
+                    {
+                        [DllImport("kernel32.dll")]
+                        [return: MarshalAs(UnmanagedType.Bool)]
+                        static extern void RaiseException(uint dwExceptionCode, uint dwExceptionFlags, uint nNumberOfArguments, IntPtr lpArguments);
+
+                        RaiseException(0x12345678, 0, 0, IntPtr.Zero);
+                        Process.GetCurrentProcess().Kill();
+                    }
+
+                    if (ImGui.MenuItem("Kill game"))
+                    {
+                        Process.GetCurrentProcess().Kill();
+                    }
+
+                    ImGui.Separator();
+
+                    if (ImGui.MenuItem("Access Violation"))
+                    {
+                        Marshal.ReadByte(IntPtr.Zero);
+                    }
+
+                    if (ImGui.MenuItem("Crash game (nullptr)"))
+                    {
+                        unsafe
+                        {
+                            var framework = Framework.Instance();
+                            framework->UIModule = (UIModule*)0;
+                        }
+                    }
+
+                    if (ImGui.MenuItem("Crash game (non-nullptr)"))
+                    {
+                        unsafe
+                        {
+                            var framework = Framework.Instance();
+                            framework->UIModule = (UIModule*)0x12345678;
+                        }
+                    }
+
+                    ImGui.Separator();
+
+                    if (ImGui.MenuItem("Open Dalamud branch switcher"))
+                    {
+                        this.OpenBranchSwitcher();
+                    }
+
+                    var startInfo = Service<DalamudStartInfo>.Get();
+                    ImGui.MenuItem(Util.AssemblyVersion, false);
+                    ImGui.MenuItem(startInfo.GameVersion.ToString(), false);
+                    ImGui.MenuItem($"D: {Util.GetGitHash()} CS: {Util.GetGitHashClientStructs()}", false);
+
+                    ImGui.EndMenu();
                 }
+
+                if (ImGui.BeginMenu("GUI"))
+                {
+                    ImGui.MenuItem("Use Monospace font for following windows", string.Empty, ref this.isImGuiTestWindowsInMonospace);
+                    ImGui.MenuItem("Draw ImGui demo", string.Empty, ref this.isImGuiDrawDemoWindow);
+                    ImGui.MenuItem("Draw ImPlot demo", string.Empty, ref this.isImPlotDrawDemoWindow);
+                    ImGui.MenuItem("Draw metrics", string.Empty, ref this.isImGuiDrawMetricsWindow);
+
+                    ImGui.Separator();
+
+                    var val = ImGuiManagedAsserts.AssertsEnabled;
+                    if (ImGui.MenuItem("Enable Asserts", string.Empty, ref val))
+                    {
+                        ImGuiManagedAsserts.AssertsEnabled = val;
+                    }
+
+                    if (ImGui.MenuItem("Enable asserts at startup", null, configuration.AssertsEnabledAtStartup))
+                    {
+                        configuration.AssertsEnabledAtStartup = !configuration.AssertsEnabledAtStartup;
+                        configuration.Save();
+                    }
+
+                    if (ImGui.MenuItem("Clear focus"))
+                    {
+                        ImGui.SetWindowFocus(null);
+                    }
+
+                    if (ImGui.MenuItem("Dump style"))
+                    {
+                        var info = string.Empty;
+                        var style = StyleModelV1.Get();
+                        var enCulture = new CultureInfo("en-US");
+
+                        foreach (var propertyInfo in typeof(StyleModel).GetProperties(BindingFlags.Public | BindingFlags.Instance))
+                        {
+                            if (propertyInfo.PropertyType == typeof(Vector2))
+                            {
+                                var vec2 = (Vector2)propertyInfo.GetValue(style);
+                                info += $"{propertyInfo.Name} = new Vector2({vec2.X.ToString(enCulture)}f, {vec2.Y.ToString(enCulture)}f),\n";
+                            }
+                            else
+                            {
+                                info += $"{propertyInfo.Name} = {propertyInfo.GetValue(style)},\n";
+                            }
+                        }
+
+                        info += "Colors = new Dictionary<string, Vector4>()\n";
+                        info += "{\n";
+
+                        foreach (var color in style.Colors)
+                        {
+                            info +=
+                                $"{{\"{color.Key}\", new Vector4({color.Value.X.ToString(enCulture)}f, {color.Value.Y.ToString(enCulture)}f, {color.Value.Z.ToString(enCulture)}f, {color.Value.W.ToString(enCulture)}f)}},\n";
+                        }
+
+                        info += "},";
+
+                        Log.Information(info);
+                    }
+
+                    if (ImGui.MenuItem("Show dev bar info", null, configuration.ShowDevBarInfo))
+                    {
+                        configuration.ShowDevBarInfo = !configuration.ShowDevBarInfo;
+                    }
+
+                    ImGui.EndMenu();
+                }
+
+                if (ImGui.BeginMenu("Game"))
+                {
+                    if (ImGui.MenuItem("Replace ExceptionHandler"))
+                    {
+                        dalamud.ReplaceExceptionHandler();
+                    }
+
+                    ImGui.EndMenu();
+                }
+
+                if (ImGui.BeginMenu("Plugins"))
+                {
+                    if (ImGui.MenuItem("Open Plugin installer"))
+                    {
+                        this.OpenPluginInstaller();
+                    }
+
+                    if (ImGui.MenuItem("Clear cached images/icons"))
+                    {
+                        this.pluginWindow?.ClearIconCache();
+                    }
+
+                    ImGui.Separator();
+
+                    if (ImGui.MenuItem("Open Plugin Stats"))
+                    {
+                        this.OpenPluginStats();
+                    }
+
+                    if (ImGui.MenuItem("Print plugin info"))
+                    {
+                        foreach (var plugin in pluginManager.InstalledPlugins)
+                        {
+                            // TODO: some more here, state maybe?
+                            PluginLog.Information($"{plugin.Name}");
+                        }
+                    }
+
+                    if (ImGui.MenuItem("Scan dev plugins"))
+                    {
+                        pluginManager.ScanDevPlugins();
+                    }
+
+                    ImGui.Separator();
+
+                    if (ImGui.MenuItem("Load all API levels (ONLY FOR DEVELOPERS!!!)", null, pluginManager.LoadAllApiLevels))
+                    {
+                        pluginManager.LoadAllApiLevels = !pluginManager.LoadAllApiLevels;
+                    }
+
+                    if (ImGui.MenuItem("Load blacklisted plugins", null, pluginManager.LoadBannedPlugins))
+                    {
+                        pluginManager.LoadBannedPlugins = !pluginManager.LoadBannedPlugins;
+                    }
+
+                    ImGui.Separator();
+                    ImGui.MenuItem("API Level:" + PluginManager.DalamudApiLevel, false);
+                    ImGui.MenuItem("Loaded plugins:" + pluginManager.InstalledPlugins.Count, false);
+                    ImGui.EndMenu();
+                }
+
+                if (ImGui.BeginMenu("Localization"))
+                {
+                    var localization = Service<Localization>.Get();
+
+                    if (ImGui.MenuItem("Export localizable"))
+                    {
+                        localization.ExportLocalizable();
+                    }
+
+                    if (ImGui.BeginMenu("Load language..."))
+                    {
+                        if (ImGui.MenuItem("From Fallbacks"))
+                        {
+                            localization.SetupWithFallbacks();
+                        }
+
+                        if (ImGui.MenuItem("From UICulture"))
+                        {
+                            localization.SetupWithUiCulture();
+                        }
+
+                        foreach (var applicableLangCode in Localization.ApplicableLangCodes)
+                        {
+                            if (ImGui.MenuItem($"Applicable: {applicableLangCode}"))
+                            {
+                                localization.SetupWithLangCode(applicableLangCode);
+                            }
+                        }
+
+                        ImGui.EndMenu();
+                    }
+
+                    ImGui.EndMenu();
+                }
+
+                if (Service<GameGui>.Get().GameUiHidden)
+                    ImGui.BeginMenu("UI is hidden...", false);
+
+                if (configuration.ShowDevBarInfo)
+                {
+                    ImGui.PushFont(InterfaceManager.MonoFont);
+
+                    ImGui.BeginMenu(Util.GetGitHash(), false);
+                    ImGui.BeginMenu(this.FrameCount.ToString("000000"), false);
+                    ImGui.BeginMenu(ImGui.GetIO().Framerate.ToString("000"), false);
+                    ImGui.BeginMenu($"{Util.FormatBytes(GC.GetTotalMemory(false))}", false);
+
+                    ImGui.PopFont();
+                }
+
+                ImGui.EndMainMenuBar();
             }
         }
     }
diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs
index 62abeaf1d..98e0c72f1 100644
--- a/Dalamud/Interface/Internal/InterfaceManager.cs
+++ b/Dalamud/Interface/Internal/InterfaceManager.cs
@@ -40,1225 +40,1224 @@ using SharpDX.Direct3D11;
  * - Might eventually want to render to a separate target and composite, especially with reshade etc in the mix.
  */
 
-namespace Dalamud.Interface.Internal
+namespace Dalamud.Interface.Internal;
+
+/// <summary>
+/// This class manages interaction with the ImGui interface.
+/// </summary>
+[ServiceManager.BlockingEarlyLoadedService]
+internal class InterfaceManager : IDisposable, IServiceType
 {
-    /// <summary>
-    /// This class manages interaction with the ImGui interface.
-    /// </summary>
-    [ServiceManager.BlockingEarlyLoadedService]
-    internal class InterfaceManager : IDisposable, IServiceType
+    private const float DefaultFontSizePt = 12.0f;
+    private const float DefaultFontSizePx = DefaultFontSizePt * 4.0f / 3.0f;
+    private const ushort Fallback1Codepoint = 0x3013; // Geta mark; FFXIV uses this to indicate that a glyph is missing.
+    private const ushort Fallback2Codepoint = '-';    // FFXIV uses dash if Geta mark is unavailable.
+
+    private readonly HashSet<SpecialGlyphRequest> glyphRequests = new();
+    private readonly Dictionary<ImFontPtr, TargetFontModification> loadedFontInfo = new();
+
+    [ServiceManager.ServiceDependency]
+    private readonly Framework framework = Service<Framework>.Get();
+
+    private readonly ManualResetEvent fontBuildSignal;
+    private readonly SwapChainVtableResolver address;
+    private readonly Hook<DispatchMessageWDelegate> dispatchMessageWHook;
+    private readonly Hook<SetCursorDelegate> setCursorHook;
+    private Hook<ProcessMessageDelegate> processMessageHook;
+    private RawDX11Scene? scene;
+
+    private Hook<PresentDelegate>? presentHook;
+    private Hook<ResizeBuffersDelegate>? resizeBuffersHook;
+
+    // can't access imgui IO before first present call
+    private bool lastWantCapture = false;
+    private bool isRebuildingFonts = false;
+    private bool isOverrideGameCursor = true;
+
+    [ServiceManager.ServiceConstructor]
+    private InterfaceManager()
     {
-        private const float DefaultFontSizePt = 12.0f;
-        private const float DefaultFontSizePx = DefaultFontSizePt * 4.0f / 3.0f;
-        private const ushort Fallback1Codepoint = 0x3013; // Geta mark; FFXIV uses this to indicate that a glyph is missing.
-        private const ushort Fallback2Codepoint = '-'; // FFXIV uses dash if Geta mark is unavailable.
+        this.dispatchMessageWHook = Hook<DispatchMessageWDelegate>.FromImport(
+            null, "user32.dll", "DispatchMessageW", 0, this.DispatchMessageWDetour);
+        this.setCursorHook = Hook<SetCursorDelegate>.FromImport(
+            null, "user32.dll", "SetCursor", 0, this.SetCursorDetour);
 
-        private readonly HashSet<SpecialGlyphRequest> glyphRequests = new();
-        private readonly Dictionary<ImFontPtr, TargetFontModification> loadedFontInfo = new();
+        this.fontBuildSignal = new ManualResetEvent(false);
 
-        [ServiceManager.ServiceDependency]
-        private readonly Framework framework = Service<Framework>.Get();
+        this.address = new SwapChainVtableResolver();
+    }
 
-        private readonly ManualResetEvent fontBuildSignal;
-        private readonly SwapChainVtableResolver address;
-        private readonly Hook<DispatchMessageWDelegate> dispatchMessageWHook;
-        private readonly Hook<SetCursorDelegate> setCursorHook;
-        private Hook<ProcessMessageDelegate> processMessageHook;
-        private RawDX11Scene? scene;
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr PresentDelegate(IntPtr swapChain, uint syncInterval, uint presentFlags);
 
-        private Hook<PresentDelegate>? presentHook;
-        private Hook<ResizeBuffersDelegate>? resizeBuffersHook;
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr ResizeBuffersDelegate(IntPtr swapChain, uint bufferCount, uint width, uint height, uint newFormat, uint swapChainFlags);
 
-        // can't access imgui IO before first present call
-        private bool lastWantCapture = false;
-        private bool isRebuildingFonts = false;
-        private bool isOverrideGameCursor = true;
+    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+    private delegate IntPtr SetCursorDelegate(IntPtr hCursor);
 
-        [ServiceManager.ServiceConstructor]
-        private InterfaceManager()
+    [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+    private delegate IntPtr DispatchMessageWDelegate(ref User32.MSG msg);
+
+    [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
+    private delegate IntPtr ProcessMessageDelegate(IntPtr hWnd, uint msg, ulong wParam, ulong lParam, IntPtr handeled);
+
+    /// <summary>
+    /// This event gets called each frame to facilitate ImGui drawing.
+    /// </summary>
+    public event RawDX11Scene.BuildUIDelegate Draw;
+
+    /// <summary>
+    /// This event gets called when ResizeBuffers is called.
+    /// </summary>
+    public event Action ResizeBuffers;
+
+    /// <summary>
+    /// Gets or sets an action that is executed right before fonts are rebuilt.
+    /// </summary>
+    public event Action BuildFonts;
+
+    /// <summary>
+    /// Gets or sets an action that is executed right after fonts are rebuilt.
+    /// </summary>
+    public event Action AfterBuildFonts;
+
+    /// <summary>
+    /// Gets the default ImGui font.
+    /// </summary>
+    public static ImFontPtr DefaultFont { get; private set; }
+
+    /// <summary>
+    /// Gets an included FontAwesome icon font.
+    /// </summary>
+    public static ImFontPtr IconFont { get; private set; }
+
+    /// <summary>
+    /// Gets an included monospaced font.
+    /// </summary>
+    public static ImFontPtr MonoFont { get; private set; }
+
+    /// <summary>
+    /// Gets or sets the pointer to ImGui.IO(), when it was last used.
+    /// </summary>
+    public ImGuiIOPtr LastImGuiIoPtr { get; set; }
+
+    /// <summary>
+    /// Gets the D3D11 device instance.
+    /// </summary>
+    public Device? Device => this.scene?.Device;
+
+    /// <summary>
+    /// Gets the address handle to the main process window.
+    /// </summary>
+    public IntPtr WindowHandlePtr => this.scene?.WindowHandlePtr ?? IntPtr.Zero;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not the game's cursor should be overridden with the ImGui cursor.
+    /// </summary>
+    public bool OverrideGameCursor
+    {
+        get => this.scene?.UpdateCursor ?? this.isOverrideGameCursor;
+        set
         {
-            this.dispatchMessageWHook = Hook<DispatchMessageWDelegate>.FromImport(
-                null, "user32.dll", "DispatchMessageW", 0, this.DispatchMessageWDetour);
-            this.setCursorHook = Hook<SetCursorDelegate>.FromImport(
-                null, "user32.dll", "SetCursor", 0, this.SetCursorDetour);
-
-            this.fontBuildSignal = new ManualResetEvent(false);
-
-            this.address = new SwapChainVtableResolver();
+            this.isOverrideGameCursor = value;
+            if (this.scene != null)
+                this.scene.UpdateCursor = value;
         }
+    }
 
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr PresentDelegate(IntPtr swapChain, uint syncInterval, uint presentFlags);
+    /// <summary>
+    /// Gets or sets a value indicating whether the fonts are built and ready to use.
+    /// </summary>
+    public bool FontsReady { get; set; } = false;
 
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr ResizeBuffersDelegate(IntPtr swapChain, uint bufferCount, uint width, uint height, uint newFormat, uint swapChainFlags);
+    /// <summary>
+    /// Gets a value indicating whether the Dalamud interface ready to use.
+    /// </summary>
+    public bool IsReady => this.scene != null;
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate IntPtr SetCursorDelegate(IntPtr hCursor);
+    /// <summary>
+    /// Gets or sets a value indicating whether or not Draw events should be dispatched.
+    /// </summary>
+    public bool IsDispatchingEvents { get; set; } = true;
 
-        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private delegate IntPtr DispatchMessageWDelegate(ref User32.MSG msg);
+    /// <summary>
+    /// Gets or sets a value indicating whether to override configuration for UseAxis.
+    /// </summary>
+    public bool? UseAxisOverride { get; set; } = null;
 
-        [UnmanagedFunctionPointer(CallingConvention.ThisCall)]
-        private delegate IntPtr ProcessMessageDelegate(IntPtr hWnd, uint msg, ulong wParam, ulong lParam, IntPtr handeled);
+    /// <summary>
+    /// Gets a value indicating whether to use AXIS fonts.
+    /// </summary>
+    public bool UseAxis => this.UseAxisOverride ?? Service<DalamudConfiguration>.Get().UseAxisFontsFromGame;
 
-        /// <summary>
-        /// This event gets called each frame to facilitate ImGui drawing.
-        /// </summary>
-        public event RawDX11Scene.BuildUIDelegate Draw;
+    /// <summary>
+    /// Gets or sets the overrided font gamma value, instead of using the value from configuration.
+    /// </summary>
+    public float? FontGammaOverride { get; set; } = null;
 
-        /// <summary>
-        /// This event gets called when ResizeBuffers is called.
-        /// </summary>
-        public event Action ResizeBuffers;
+    /// <summary>
+    /// Gets the font gamma value to use.
+    /// </summary>
+    public float FontGamma => Math.Max(0.1f, this.FontGammaOverride.GetValueOrDefault(Service<DalamudConfiguration>.Get().FontGammaLevel));
 
-        /// <summary>
-        /// Gets or sets an action that is executed right before fonts are rebuilt.
-        /// </summary>
-        public event Action BuildFonts;
+    /// <summary>
+    /// Gets a value indicating whether we're building fonts but haven't generated atlas yet.
+    /// </summary>
+    public bool IsBuildingFontsBeforeAtlasBuild => this.isRebuildingFonts && !this.fontBuildSignal.WaitOne(0);
 
-        /// <summary>
-        /// Gets or sets an action that is executed right after fonts are rebuilt.
-        /// </summary>
-        public event Action AfterBuildFonts;
+    /// <summary>
+    /// Gets a value indicating the native handle of the game main window.
+    /// </summary>
+    public IntPtr GameWindowHandle { get; private set; }
 
-        /// <summary>
-        /// Gets the default ImGui font.
-        /// </summary>
-        public static ImFontPtr DefaultFont { get; private set; }
-
-        /// <summary>
-        /// Gets an included FontAwesome icon font.
-        /// </summary>
-        public static ImFontPtr IconFont { get; private set; }
-
-        /// <summary>
-        /// Gets an included monospaced font.
-        /// </summary>
-        public static ImFontPtr MonoFont { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the pointer to ImGui.IO(), when it was last used.
-        /// </summary>
-        public ImGuiIOPtr LastImGuiIoPtr { get; set; }
-
-        /// <summary>
-        /// Gets the D3D11 device instance.
-        /// </summary>
-        public Device? Device => this.scene?.Device;
-
-        /// <summary>
-        /// Gets the address handle to the main process window.
-        /// </summary>
-        public IntPtr WindowHandlePtr => this.scene?.WindowHandlePtr ?? IntPtr.Zero;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not the game's cursor should be overridden with the ImGui cursor.
-        /// </summary>
-        public bool OverrideGameCursor
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+        this.framework.RunOnFrameworkThread(() =>
         {
-            get => this.scene?.UpdateCursor ?? this.isOverrideGameCursor;
-            set
-            {
-                this.isOverrideGameCursor = value;
-                if (this.scene != null)
-                    this.scene.UpdateCursor = value;
-            }
-        }
+            this.setCursorHook.Dispose();
+            this.presentHook?.Dispose();
+            this.resizeBuffersHook?.Dispose();
+            this.dispatchMessageWHook.Dispose();
+            this.processMessageHook?.Dispose();
+        }).Wait();
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the fonts are built and ready to use.
-        /// </summary>
-        public bool FontsReady { get; set; } = false;
-
-        /// <summary>
-        /// Gets a value indicating whether the Dalamud interface ready to use.
-        /// </summary>
-        public bool IsReady => this.scene != null;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not Draw events should be dispatched.
-        /// </summary>
-        public bool IsDispatchingEvents { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to override configuration for UseAxis.
-        /// </summary>
-        public bool? UseAxisOverride { get; set; } = null;
-
-        /// <summary>
-        /// Gets a value indicating whether to use AXIS fonts.
-        /// </summary>
-        public bool UseAxis => this.UseAxisOverride ?? Service<DalamudConfiguration>.Get().UseAxisFontsFromGame;
-
-        /// <summary>
-        /// Gets or sets the overrided font gamma value, instead of using the value from configuration.
-        /// </summary>
-        public float? FontGammaOverride { get; set; } = null;
-
-        /// <summary>
-        /// Gets the font gamma value to use.
-        /// </summary>
-        public float FontGamma => Math.Max(0.1f, this.FontGammaOverride.GetValueOrDefault(Service<DalamudConfiguration>.Get().FontGammaLevel));
-
-        /// <summary>
-        /// Gets a value indicating whether we're building fonts but haven't generated atlas yet.
-        /// </summary>
-        public bool IsBuildingFontsBeforeAtlasBuild => this.isRebuildingFonts && !this.fontBuildSignal.WaitOne(0);
-
-        /// <summary>
-        /// Gets a value indicating the native handle of the game main window.
-        /// </summary>
-        public IntPtr GameWindowHandle { get; private set; }
-
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            this.framework.RunOnFrameworkThread(() =>
-            {
-                this.setCursorHook.Dispose();
-                this.presentHook?.Dispose();
-                this.resizeBuffersHook?.Dispose();
-                this.dispatchMessageWHook.Dispose();
-                this.processMessageHook?.Dispose();
-            }).Wait();
-
-            this.scene?.Dispose();
-        }
+        this.scene?.Dispose();
+    }
 
 #nullable enable
 
-        /// <summary>
-        /// Load an image from disk.
-        /// </summary>
-        /// <param name="filePath">The filepath to load.</param>
-        /// <returns>A texture, ready to use in ImGui.</returns>
-        public TextureWrap? LoadImage(string filePath)
+    /// <summary>
+    /// Load an image from disk.
+    /// </summary>
+    /// <param name="filePath">The filepath to load.</param>
+    /// <returns>A texture, ready to use in ImGui.</returns>
+    public TextureWrap? LoadImage(string filePath)
+    {
+        if (this.scene == null)
+            throw new InvalidOperationException("Scene isn't ready.");
+
+        try
         {
-            if (this.scene == null)
-                throw new InvalidOperationException("Scene isn't ready.");
-
-            try
-            {
-                return this.scene?.LoadImage(filePath) ?? null;
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, $"Failed to load image from {filePath}");
-            }
-
-            return null;
+            return this.scene?.LoadImage(filePath) ?? null;
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, $"Failed to load image from {filePath}");
         }
 
-        /// <summary>
-        /// Load an image from an array of bytes.
-        /// </summary>
-        /// <param name="imageData">The data to load.</param>
-        /// <returns>A texture, ready to use in ImGui.</returns>
-        public TextureWrap? LoadImage(byte[] imageData)
+        return null;
+    }
+
+    /// <summary>
+    /// Load an image from an array of bytes.
+    /// </summary>
+    /// <param name="imageData">The data to load.</param>
+    /// <returns>A texture, ready to use in ImGui.</returns>
+    public TextureWrap? LoadImage(byte[] imageData)
+    {
+        if (this.scene == null)
+            throw new InvalidOperationException("Scene isn't ready.");
+
+        try
         {
-            if (this.scene == null)
-                throw new InvalidOperationException("Scene isn't ready.");
-
-            try
-            {
-                return this.scene?.LoadImage(imageData) ?? null;
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Failed to load image from memory");
-            }
-
-            return null;
+            return this.scene?.LoadImage(imageData) ?? null;
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Failed to load image from memory");
         }
 
-        /// <summary>
-        /// Load an image from an array of bytes.
-        /// </summary>
-        /// <param name="imageData">The data to load.</param>
-        /// <param name="width">The width in pixels.</param>
-        /// <param name="height">The height in pixels.</param>
-        /// <param name="numChannels">The number of channels.</param>
-        /// <returns>A texture, ready to use in ImGui.</returns>
-        public TextureWrap? LoadImageRaw(byte[] imageData, int width, int height, int numChannels)
+        return null;
+    }
+
+    /// <summary>
+    /// Load an image from an array of bytes.
+    /// </summary>
+    /// <param name="imageData">The data to load.</param>
+    /// <param name="width">The width in pixels.</param>
+    /// <param name="height">The height in pixels.</param>
+    /// <param name="numChannels">The number of channels.</param>
+    /// <returns>A texture, ready to use in ImGui.</returns>
+    public TextureWrap? LoadImageRaw(byte[] imageData, int width, int height, int numChannels)
+    {
+        if (this.scene == null)
+            throw new InvalidOperationException("Scene isn't ready.");
+
+        try
         {
-            if (this.scene == null)
-                throw new InvalidOperationException("Scene isn't ready.");
-
-            try
-            {
-                return this.scene?.LoadImageRaw(imageData, width, height, numChannels) ?? null;
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Failed to load image from raw data");
-            }
-
-            return null;
+            return this.scene?.LoadImageRaw(imageData, width, height, numChannels) ?? null;
         }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Failed to load image from raw data");
+        }
+
+        return null;
+    }
 
 #nullable restore
 
-        /// <summary>
-        /// Sets up a deferred invocation of font rebuilding, before the next render frame.
-        /// </summary>
-        public void RebuildFonts()
+    /// <summary>
+    /// Sets up a deferred invocation of font rebuilding, before the next render frame.
+    /// </summary>
+    public void RebuildFonts()
+    {
+        if (this.scene == null)
         {
-            if (this.scene == null)
+            Log.Verbose("[FONT] RebuildFonts(): scene not ready, doing nothing");
+            return;
+        }
+
+        Log.Verbose("[FONT] RebuildFonts() called");
+
+        // don't invoke this multiple times per frame, in case multiple plugins call it
+        if (!this.isRebuildingFonts)
+        {
+            Log.Verbose("[FONT] RebuildFonts() trigger");
+            this.isRebuildingFonts = true;
+            this.scene.OnNewRenderFrame += this.RebuildFontsInternal;
+        }
+    }
+
+    /// <summary>
+    /// Wait for the rebuilding fonts to complete.
+    /// </summary>
+    public void WaitForFontRebuild()
+    {
+        this.fontBuildSignal.WaitOne();
+    }
+
+    /// <summary>
+    /// Requests a default font of specified size to exist.
+    /// </summary>
+    /// <param name="size">Font size in pixels.</param>
+    /// <param name="ranges">Ranges of glyphs.</param>
+    /// <returns>Requets handle.</returns>
+    public SpecialGlyphRequest NewFontSizeRef(float size, List<Tuple<ushort, ushort>> ranges)
+    {
+        var allContained = false;
+        var fonts = ImGui.GetIO().Fonts.Fonts;
+        ImFontPtr foundFont = null;
+        unsafe
+        {
+            for (int i = 0, i_ = fonts.Size; i < i_; i++)
             {
-                Log.Verbose("[FONT] RebuildFonts(): scene not ready, doing nothing");
+                if (!this.glyphRequests.Any(x => x.FontInternal.NativePtr == fonts[i].NativePtr))
+                    continue;
+
+                allContained = true;
+                foreach (var range in ranges)
+                {
+                    if (!allContained)
+                        break;
+
+                    for (var j = range.Item1; j <= range.Item2 && allContained; j++)
+                        allContained &= fonts[i].FindGlyphNoFallback(j).NativePtr != null;
+                }
+
+                if (allContained)
+                    foundFont = fonts[i];
+
+                break;
+            }
+        }
+
+        var req = new SpecialGlyphRequest(this, size, ranges);
+        req.FontInternal = foundFont;
+
+        if (!allContained)
+            this.RebuildFonts();
+
+        return req;
+    }
+
+    /// <summary>
+    /// Requests a default font of specified size to exist.
+    /// </summary>
+    /// <param name="size">Font size in pixels.</param>
+    /// <param name="text">Text to calculate glyph ranges from.</param>
+    /// <returns>Requets handle.</returns>
+    public SpecialGlyphRequest NewFontSizeRef(float size, string text)
+    {
+        List<Tuple<ushort, ushort>> ranges = new();
+        foreach (var c in new SortedSet<char>(text.ToHashSet()))
+        {
+            if (ranges.Any() && ranges[^1].Item2 + 1 == c)
+                ranges[^1] = Tuple.Create<ushort, ushort>(ranges[^1].Item1, c);
+            else
+                ranges.Add(Tuple.Create<ushort, ushort>(c, c));
+        }
+
+        return this.NewFontSizeRef(size, ranges);
+    }
+
+    private static void ShowFontError(string path)
+    {
+        Util.Fatal($"One or more files required by XIVLauncher were not found.\nPlease restart and report this error if it occurs again.\n\n{path}", "Error");
+    }
+
+    private void InitScene(IntPtr swapChain)
+    {
+        RawDX11Scene newScene;
+        using (Timings.Start("IM Scene Init"))
+        {
+            try
+            {
+                newScene = new RawDX11Scene(swapChain);
+            }
+            catch (DllNotFoundException ex)
+            {
+                Service<InterfaceManagerWithScene>.ProvideException(ex);
+                Log.Error(ex, "Could not load ImGui dependencies.");
+
+                var res = PInvoke.User32.MessageBox(
+                    IntPtr.Zero,
+                    "Dalamud plugins require the Microsoft Visual C++ Redistributable to be installed.\nPlease install the runtime from the official Microsoft website or disable Dalamud.\n\nDo you want to download the redistributable now?",
+                    "Dalamud Error",
+                    User32.MessageBoxOptions.MB_YESNO | User32.MessageBoxOptions.MB_TOPMOST | User32.MessageBoxOptions.MB_ICONERROR);
+
+                if (res == User32.MessageBoxResult.IDYES)
+                {
+                    var psi = new ProcessStartInfo
+                    {
+                        FileName = "https://aka.ms/vs/16/release/vc_redist.x64.exe",
+                        UseShellExecute = true,
+                    };
+                    Process.Start(psi);
+                }
+
+                Environment.Exit(-1);
+
+                // Doesn't reach here, but to make the compiler not complain
                 return;
             }
 
-            Log.Verbose("[FONT] RebuildFonts() called");
-
-            // don't invoke this multiple times per frame, in case multiple plugins call it
-            if (!this.isRebuildingFonts)
-            {
-                Log.Verbose("[FONT] RebuildFonts() trigger");
-                this.isRebuildingFonts = true;
-                this.scene.OnNewRenderFrame += this.RebuildFontsInternal;
-            }
-        }
-
-        /// <summary>
-        /// Wait for the rebuilding fonts to complete.
-        /// </summary>
-        public void WaitForFontRebuild()
-        {
-            this.fontBuildSignal.WaitOne();
-        }
-
-        /// <summary>
-        /// Requests a default font of specified size to exist.
-        /// </summary>
-        /// <param name="size">Font size in pixels.</param>
-        /// <param name="ranges">Ranges of glyphs.</param>
-        /// <returns>Requets handle.</returns>
-        public SpecialGlyphRequest NewFontSizeRef(float size, List<Tuple<ushort, ushort>> ranges)
-        {
-            var allContained = false;
-            var fonts = ImGui.GetIO().Fonts.Fonts;
-            ImFontPtr foundFont = null;
-            unsafe
-            {
-                for (int i = 0, i_ = fonts.Size; i < i_; i++)
-                {
-                    if (!this.glyphRequests.Any(x => x.FontInternal.NativePtr == fonts[i].NativePtr))
-                        continue;
-
-                    allContained = true;
-                    foreach (var range in ranges)
-                    {
-                        if (!allContained)
-                            break;
-
-                        for (var j = range.Item1; j <= range.Item2 && allContained; j++)
-                            allContained &= fonts[i].FindGlyphNoFallback(j).NativePtr != null;
-                    }
-
-                    if (allContained)
-                        foundFont = fonts[i];
-
-                    break;
-                }
-            }
-
-            var req = new SpecialGlyphRequest(this, size, ranges);
-            req.FontInternal = foundFont;
-
-            if (!allContained)
-                this.RebuildFonts();
-
-            return req;
-        }
-
-        /// <summary>
-        /// Requests a default font of specified size to exist.
-        /// </summary>
-        /// <param name="size">Font size in pixels.</param>
-        /// <param name="text">Text to calculate glyph ranges from.</param>
-        /// <returns>Requets handle.</returns>
-        public SpecialGlyphRequest NewFontSizeRef(float size, string text)
-        {
-            List<Tuple<ushort, ushort>> ranges = new();
-            foreach (var c in new SortedSet<char>(text.ToHashSet()))
-            {
-                if (ranges.Any() && ranges[^1].Item2 + 1 == c)
-                    ranges[^1] = Tuple.Create<ushort, ushort>(ranges[^1].Item1, c);
-                else
-                    ranges.Add(Tuple.Create<ushort, ushort>(c, c));
-            }
-
-            return this.NewFontSizeRef(size, ranges);
-        }
-
-        private static void ShowFontError(string path)
-        {
-            Util.Fatal($"One or more files required by XIVLauncher were not found.\nPlease restart and report this error if it occurs again.\n\n{path}", "Error");
-        }
-
-        private void InitScene(IntPtr swapChain)
-        {
-            RawDX11Scene newScene;
-            using (Timings.Start("IM Scene Init"))
-            {
-                try
-                {
-                    newScene = new RawDX11Scene(swapChain);
-                }
-                catch (DllNotFoundException ex)
-                {
-                    Service<InterfaceManagerWithScene>.ProvideException(ex);
-                    Log.Error(ex, "Could not load ImGui dependencies.");
-
-                    var res = PInvoke.User32.MessageBox(
-                        IntPtr.Zero,
-                        "Dalamud plugins require the Microsoft Visual C++ Redistributable to be installed.\nPlease install the runtime from the official Microsoft website or disable Dalamud.\n\nDo you want to download the redistributable now?",
-                        "Dalamud Error",
-                        User32.MessageBoxOptions.MB_YESNO | User32.MessageBoxOptions.MB_TOPMOST | User32.MessageBoxOptions.MB_ICONERROR);
-
-                    if (res == User32.MessageBoxResult.IDYES)
-                    {
-                        var psi = new ProcessStartInfo
-                        {
-                            FileName = "https://aka.ms/vs/16/release/vc_redist.x64.exe",
-                            UseShellExecute = true,
-                        };
-                        Process.Start(psi);
-                    }
-
-                    Environment.Exit(-1);
-
-                    // Doesn't reach here, but to make the compiler not complain
-                    return;
-                }
-
-                var startInfo = Service<DalamudStartInfo>.Get();
-                var configuration = Service<DalamudConfiguration>.Get();
-
-                var iniFileInfo = new FileInfo(Path.Combine(Path.GetDirectoryName(startInfo.ConfigurationPath), "dalamudUI.ini"));
-
-                try
-                {
-                    if (iniFileInfo.Length > 1200000)
-                    {
-                        Log.Warning("dalamudUI.ini was over 1mb, deleting");
-                        iniFileInfo.CopyTo(Path.Combine(iniFileInfo.DirectoryName, $"dalamudUI-{DateTimeOffset.Now.ToUnixTimeSeconds()}.ini"));
-                        iniFileInfo.Delete();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Log.Error(ex, "Could not delete dalamudUI.ini");
-                }
-
-                newScene.UpdateCursor = this.isOverrideGameCursor;
-                newScene.ImGuiIniPath = iniFileInfo.FullName;
-                newScene.OnBuildUI += this.Display;
-                newScene.OnNewInputFrame += this.OnNewInputFrame;
-
-                StyleModel.TransferOldModels();
-
-                if (configuration.SavedStyles == null || configuration.SavedStyles.All(x => x.Name != StyleModelV1.DalamudStandard.Name))
-                {
-                    configuration.SavedStyles = new List<StyleModel> { StyleModelV1.DalamudStandard, StyleModelV1.DalamudClassic };
-                    configuration.ChosenStyle = StyleModelV1.DalamudStandard.Name;
-                }
-                else if (configuration.SavedStyles.Count == 1)
-                {
-                    configuration.SavedStyles.Add(StyleModelV1.DalamudClassic);
-                }
-                else if (configuration.SavedStyles[1].Name != StyleModelV1.DalamudClassic.Name)
-                {
-                    configuration.SavedStyles.Insert(1, StyleModelV1.DalamudClassic);
-                }
-
-                configuration.SavedStyles[0] = StyleModelV1.DalamudStandard;
-                configuration.SavedStyles[1] = StyleModelV1.DalamudClassic;
-
-                var style = configuration.SavedStyles.FirstOrDefault(x => x.Name == configuration.ChosenStyle);
-                if (style == null)
-                {
-                    style = StyleModelV1.DalamudStandard;
-                    configuration.ChosenStyle = style.Name;
-                    configuration.Save();
-                }
-
-                style.Apply();
-
-                ImGui.GetIO().FontGlobalScale = configuration.GlobalUiScale;
-
-                this.SetupFonts();
-
-                if (!configuration.IsDocking)
-                {
-                    ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.DockingEnable;
-                }
-                else
-                {
-                    ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.DockingEnable;
-                }
-
-                // NOTE (Chiv) Toggle gamepad navigation via setting
-                if (!configuration.IsGamepadNavigationEnabled)
-                {
-                    ImGui.GetIO().BackendFlags &= ~ImGuiBackendFlags.HasGamepad;
-                    ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableSetMousePos;
-                }
-                else
-                {
-                    ImGui.GetIO().BackendFlags |= ImGuiBackendFlags.HasGamepad;
-                    ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.NavEnableSetMousePos;
-                }
-
-                // NOTE (Chiv) Explicitly deactivate on dalamud boot
-                ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableGamepad;
-
-                ImGuiHelpers.MainViewport = ImGui.GetMainViewport();
-
-                Log.Information("[IM] Scene & ImGui setup OK!");
-            }
-
-            this.scene = newScene;
-            Service<InterfaceManagerWithScene>.Provide(new(this));
-        }
-
-        /*
-         * NOTE(goat): When hooking ReShade DXGISwapChain::runtime_present, this is missing the syncInterval arg.
-         *             Seems to work fine regardless, I guess, so whatever.
-         */
-        private IntPtr PresentDetour(IntPtr swapChain, uint syncInterval, uint presentFlags)
-        {
-            if (this.scene != null && swapChain != this.scene.SwapChain.NativePointer)
-                return this.presentHook!.Original(swapChain, syncInterval, presentFlags);
-
-            if (this.scene == null)
-                this.InitScene(swapChain);
-
-            if (this.address.IsReshade)
-            {
-                var pRes = this.presentHook.Original(swapChain, syncInterval, presentFlags);
-
-                this.RenderImGui();
-
-                return pRes;
-            }
-
-            this.RenderImGui();
-
-            return this.presentHook.Original(swapChain, syncInterval, presentFlags);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void RenderImGui()
-        {
-            // Process information needed by ImGuiHelpers each frame.
-            ImGuiHelpers.NewFrame();
-
-            // Check if we can still enable viewports without any issues.
-            this.CheckViewportState();
-
-            this.scene.Render();
-        }
-
-        private void CheckViewportState()
-        {
+            var startInfo = Service<DalamudStartInfo>.Get();
             var configuration = Service<DalamudConfiguration>.Get();
 
-            if (configuration.IsDisableViewport || this.scene.SwapChain.IsFullScreen || ImGui.GetPlatformIO().Monitors.Size == 1)
-            {
-                ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.ViewportsEnable;
-                return;
-            }
-
-            ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.ViewportsEnable;
-        }
-
-        /// <summary>
-        /// Loads font for use in ImGui text functions.
-        /// </summary>
-        private unsafe void SetupFonts()
-        {
-            using var setupFontsTimings = Timings.Start("IM SetupFonts");
-
-            var gameFontManager = Service<GameFontManager>.Get();
-            var dalamud = Service<Dalamud>.Get();
-            var io = ImGui.GetIO();
-            var ioFonts = io.Fonts;
-
-            var fontGamma = this.FontGamma;
-
-            this.fontBuildSignal.Reset();
-            ioFonts.Clear();
-            ioFonts.TexDesiredWidth = 4096;
-
-            Log.Verbose("[FONT] SetupFonts - 1");
-
-            foreach (var v in this.loadedFontInfo)
-                v.Value.Dispose();
-
-            this.loadedFontInfo.Clear();
-
-            Log.Verbose("[FONT] SetupFonts - 2");
-
-            ImFontConfigPtr fontConfig = null;
-            List<GCHandle> garbageList = new();
+            var iniFileInfo = new FileInfo(Path.Combine(Path.GetDirectoryName(startInfo.ConfigurationPath), "dalamudUI.ini"));
 
             try
             {
-                var dummyRangeHandle = GCHandle.Alloc(new ushort[] { '0', '0', 0 }, GCHandleType.Pinned);
-                garbageList.Add(dummyRangeHandle);
-
-                fontConfig = ImGuiNative.ImFontConfig_ImFontConfig();
-                fontConfig.OversampleH = 1;
-                fontConfig.OversampleV = 1;
-
-                var fontPathJp = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "NotoSansCJKjp-Regular.otf");
-                if (!File.Exists(fontPathJp))
-                    fontPathJp = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "NotoSansCJKjp-Medium.otf");
-                if (!File.Exists(fontPathJp))
-                    ShowFontError(fontPathJp);
-                Log.Verbose("[FONT] fontPathJp = {0}", fontPathJp);
-
-                var fontPathKr = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "NotoSansCJKkr-Regular.otf");
-                if (!File.Exists(fontPathKr))
-                    fontPathKr = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "NotoSansKR-Regular.otf");
-                if (!File.Exists(fontPathKr))
-                    fontPathKr = null;
-                Log.Verbose("[FONT] fontPathKr = {0}", fontPathKr);
-
-                // Default font
-                Log.Verbose("[FONT] SetupFonts - Default font");
-                var fontInfo = new TargetFontModification(
-                    "Default",
-                    this.UseAxis ? TargetFontModification.AxisMode.Overwrite : TargetFontModification.AxisMode.GameGlyphsOnly,
-                    this.UseAxis ? DefaultFontSizePx : DefaultFontSizePx + 1,
-                    io.FontGlobalScale);
-                Log.Verbose("[FONT] SetupFonts - Default corresponding AXIS size: {0}pt ({1}px)", fontInfo.SourceAxis.Style.BaseSizePt, fontInfo.SourceAxis.Style.BaseSizePx);
-                fontConfig.SizePixels = fontInfo.TargetSizePx * io.FontGlobalScale;
-                if (this.UseAxis)
+                if (iniFileInfo.Length > 1200000)
                 {
-                    fontConfig.GlyphRanges = dummyRangeHandle.AddrOfPinnedObject();
-                    fontConfig.PixelSnapH = false;
-                    DefaultFont = ioFonts.AddFontDefault(fontConfig);
-                    this.loadedFontInfo[DefaultFont] = fontInfo;
+                    Log.Warning("dalamudUI.ini was over 1mb, deleting");
+                    iniFileInfo.CopyTo(Path.Combine(iniFileInfo.DirectoryName, $"dalamudUI-{DateTimeOffset.Now.ToUnixTimeSeconds()}.ini"));
+                    iniFileInfo.Delete();
                 }
-                else
-                {
-                    var japaneseRangeHandle = GCHandle.Alloc(GlyphRangesJapanese.GlyphRanges, GCHandleType.Pinned);
-                    garbageList.Add(japaneseRangeHandle);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Could not delete dalamudUI.ini");
+            }
 
-                    fontConfig.GlyphRanges = japaneseRangeHandle.AddrOfPinnedObject();
-                    fontConfig.PixelSnapH = true;
-                    DefaultFont = ioFonts.AddFontFromFileTTF(fontPathJp, fontConfig.SizePixels, fontConfig);
-                    this.loadedFontInfo[DefaultFont] = fontInfo;
+            newScene.UpdateCursor = this.isOverrideGameCursor;
+            newScene.ImGuiIniPath = iniFileInfo.FullName;
+            newScene.OnBuildUI += this.Display;
+            newScene.OnNewInputFrame += this.OnNewInputFrame;
+
+            StyleModel.TransferOldModels();
+
+            if (configuration.SavedStyles == null || configuration.SavedStyles.All(x => x.Name != StyleModelV1.DalamudStandard.Name))
+            {
+                configuration.SavedStyles = new List<StyleModel> { StyleModelV1.DalamudStandard, StyleModelV1.DalamudClassic };
+                configuration.ChosenStyle = StyleModelV1.DalamudStandard.Name;
+            }
+            else if (configuration.SavedStyles.Count == 1)
+            {
+                configuration.SavedStyles.Add(StyleModelV1.DalamudClassic);
+            }
+            else if (configuration.SavedStyles[1].Name != StyleModelV1.DalamudClassic.Name)
+            {
+                configuration.SavedStyles.Insert(1, StyleModelV1.DalamudClassic);
+            }
+
+            configuration.SavedStyles[0] = StyleModelV1.DalamudStandard;
+            configuration.SavedStyles[1] = StyleModelV1.DalamudClassic;
+
+            var style = configuration.SavedStyles.FirstOrDefault(x => x.Name == configuration.ChosenStyle);
+            if (style == null)
+            {
+                style = StyleModelV1.DalamudStandard;
+                configuration.ChosenStyle = style.Name;
+                configuration.Save();
+            }
+
+            style.Apply();
+
+            ImGui.GetIO().FontGlobalScale = configuration.GlobalUiScale;
+
+            this.SetupFonts();
+
+            if (!configuration.IsDocking)
+            {
+                ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.DockingEnable;
+            }
+            else
+            {
+                ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.DockingEnable;
+            }
+
+            // NOTE (Chiv) Toggle gamepad navigation via setting
+            if (!configuration.IsGamepadNavigationEnabled)
+            {
+                ImGui.GetIO().BackendFlags &= ~ImGuiBackendFlags.HasGamepad;
+                ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableSetMousePos;
+            }
+            else
+            {
+                ImGui.GetIO().BackendFlags |= ImGuiBackendFlags.HasGamepad;
+                ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.NavEnableSetMousePos;
+            }
+
+            // NOTE (Chiv) Explicitly deactivate on dalamud boot
+            ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableGamepad;
+
+            ImGuiHelpers.MainViewport = ImGui.GetMainViewport();
+
+            Log.Information("[IM] Scene & ImGui setup OK!");
+        }
+
+        this.scene = newScene;
+        Service<InterfaceManagerWithScene>.Provide(new(this));
+    }
+
+    /*
+     * NOTE(goat): When hooking ReShade DXGISwapChain::runtime_present, this is missing the syncInterval arg.
+     *             Seems to work fine regardless, I guess, so whatever.
+     */
+    private IntPtr PresentDetour(IntPtr swapChain, uint syncInterval, uint presentFlags)
+    {
+        if (this.scene != null && swapChain != this.scene.SwapChain.NativePointer)
+            return this.presentHook!.Original(swapChain, syncInterval, presentFlags);
+
+        if (this.scene == null)
+            this.InitScene(swapChain);
+
+        if (this.address.IsReshade)
+        {
+            var pRes = this.presentHook.Original(swapChain, syncInterval, presentFlags);
+
+            this.RenderImGui();
+
+            return pRes;
+        }
+
+        this.RenderImGui();
+
+        return this.presentHook.Original(swapChain, syncInterval, presentFlags);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private void RenderImGui()
+    {
+        // Process information needed by ImGuiHelpers each frame.
+        ImGuiHelpers.NewFrame();
+
+        // Check if we can still enable viewports without any issues.
+        this.CheckViewportState();
+
+        this.scene.Render();
+    }
+
+    private void CheckViewportState()
+    {
+        var configuration = Service<DalamudConfiguration>.Get();
+
+        if (configuration.IsDisableViewport || this.scene.SwapChain.IsFullScreen || ImGui.GetPlatformIO().Monitors.Size == 1)
+        {
+            ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.ViewportsEnable;
+            return;
+        }
+
+        ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.ViewportsEnable;
+    }
+
+    /// <summary>
+    /// Loads font for use in ImGui text functions.
+    /// </summary>
+    private unsafe void SetupFonts()
+    {
+        using var setupFontsTimings = Timings.Start("IM SetupFonts");
+
+        var gameFontManager = Service<GameFontManager>.Get();
+        var dalamud = Service<Dalamud>.Get();
+        var io = ImGui.GetIO();
+        var ioFonts = io.Fonts;
+
+        var fontGamma = this.FontGamma;
+
+        this.fontBuildSignal.Reset();
+        ioFonts.Clear();
+        ioFonts.TexDesiredWidth = 4096;
+
+        Log.Verbose("[FONT] SetupFonts - 1");
+
+        foreach (var v in this.loadedFontInfo)
+            v.Value.Dispose();
+
+        this.loadedFontInfo.Clear();
+
+        Log.Verbose("[FONT] SetupFonts - 2");
+
+        ImFontConfigPtr fontConfig = null;
+        List<GCHandle> garbageList = new();
+
+        try
+        {
+            var dummyRangeHandle = GCHandle.Alloc(new ushort[] { '0', '0', 0 }, GCHandleType.Pinned);
+            garbageList.Add(dummyRangeHandle);
+
+            fontConfig = ImGuiNative.ImFontConfig_ImFontConfig();
+            fontConfig.OversampleH = 1;
+            fontConfig.OversampleV = 1;
+
+            var fontPathJp = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "NotoSansCJKjp-Regular.otf");
+            if (!File.Exists(fontPathJp))
+                fontPathJp = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "NotoSansCJKjp-Medium.otf");
+            if (!File.Exists(fontPathJp))
+                ShowFontError(fontPathJp);
+            Log.Verbose("[FONT] fontPathJp = {0}", fontPathJp);
+
+            var fontPathKr = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "NotoSansCJKkr-Regular.otf");
+            if (!File.Exists(fontPathKr))
+                fontPathKr = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "NotoSansKR-Regular.otf");
+            if (!File.Exists(fontPathKr))
+                fontPathKr = null;
+            Log.Verbose("[FONT] fontPathKr = {0}", fontPathKr);
+
+            // Default font
+            Log.Verbose("[FONT] SetupFonts - Default font");
+            var fontInfo = new TargetFontModification(
+                "Default",
+                this.UseAxis ? TargetFontModification.AxisMode.Overwrite : TargetFontModification.AxisMode.GameGlyphsOnly,
+                this.UseAxis ? DefaultFontSizePx : DefaultFontSizePx + 1,
+                io.FontGlobalScale);
+            Log.Verbose("[FONT] SetupFonts - Default corresponding AXIS size: {0}pt ({1}px)", fontInfo.SourceAxis.Style.BaseSizePt, fontInfo.SourceAxis.Style.BaseSizePx);
+            fontConfig.SizePixels = fontInfo.TargetSizePx * io.FontGlobalScale;
+            if (this.UseAxis)
+            {
+                fontConfig.GlyphRanges = dummyRangeHandle.AddrOfPinnedObject();
+                fontConfig.PixelSnapH = false;
+                DefaultFont = ioFonts.AddFontDefault(fontConfig);
+                this.loadedFontInfo[DefaultFont] = fontInfo;
+            }
+            else
+            {
+                var japaneseRangeHandle = GCHandle.Alloc(GlyphRangesJapanese.GlyphRanges, GCHandleType.Pinned);
+                garbageList.Add(japaneseRangeHandle);
+
+                fontConfig.GlyphRanges = japaneseRangeHandle.AddrOfPinnedObject();
+                fontConfig.PixelSnapH = true;
+                DefaultFont = ioFonts.AddFontFromFileTTF(fontPathJp, fontConfig.SizePixels, fontConfig);
+                this.loadedFontInfo[DefaultFont] = fontInfo;
+            }
+
+            if (fontPathKr != null && Service<DalamudConfiguration>.Get().EffectiveLanguage == "ko")
+            {
+                fontConfig.MergeMode = true;
+                fontConfig.GlyphRanges = ioFonts.GetGlyphRangesKorean();
+                fontConfig.PixelSnapH = true;
+                ioFonts.AddFontFromFileTTF(fontPathKr, fontConfig.SizePixels, fontConfig);
+                fontConfig.MergeMode = false;
+            }
+
+            // FontAwesome icon font
+            Log.Verbose("[FONT] SetupFonts - FontAwesome icon font");
+            {
+                var fontPathIcon = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "FontAwesome5FreeSolid.otf");
+                if (!File.Exists(fontPathIcon))
+                    ShowFontError(fontPathIcon);
+
+                var iconRangeHandle = GCHandle.Alloc(new ushort[] { 0xE000, 0xF8FF, 0, }, GCHandleType.Pinned);
+                garbageList.Add(iconRangeHandle);
+
+                fontConfig.GlyphRanges = iconRangeHandle.AddrOfPinnedObject();
+                fontConfig.PixelSnapH = true;
+                IconFont = ioFonts.AddFontFromFileTTF(fontPathIcon, DefaultFontSizePx * io.FontGlobalScale, fontConfig);
+                this.loadedFontInfo[IconFont] = new("Icon", TargetFontModification.AxisMode.GameGlyphsOnly, DefaultFontSizePx, io.FontGlobalScale);
+            }
+
+            // Monospace font
+            Log.Verbose("[FONT] SetupFonts - Monospace font");
+            {
+                var fontPathMono = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "Inconsolata-Regular.ttf");
+                if (!File.Exists(fontPathMono))
+                    ShowFontError(fontPathMono);
+
+                fontConfig.GlyphRanges = IntPtr.Zero;
+                fontConfig.PixelSnapH = true;
+                MonoFont = ioFonts.AddFontFromFileTTF(fontPathMono, DefaultFontSizePx * io.FontGlobalScale, fontConfig);
+                this.loadedFontInfo[MonoFont] = new("Mono", TargetFontModification.AxisMode.GameGlyphsOnly, DefaultFontSizePx, io.FontGlobalScale);
+            }
+
+            // Default font but in requested size for requested glyphs
+            Log.Verbose("[FONT] SetupFonts - Default font but in requested size for requested glyphs");
+            {
+                Dictionary<float, List<SpecialGlyphRequest>> extraFontRequests = new();
+                foreach (var extraFontRequest in this.glyphRequests)
+                {
+                    if (!extraFontRequests.ContainsKey(extraFontRequest.Size))
+                        extraFontRequests[extraFontRequest.Size] = new();
+                    extraFontRequests[extraFontRequest.Size].Add(extraFontRequest);
                 }
 
-                if (fontPathKr != null && Service<DalamudConfiguration>.Get().EffectiveLanguage == "ko")
+                foreach (var (fontSize, requests) in extraFontRequests)
                 {
-                    fontConfig.MergeMode = true;
-                    fontConfig.GlyphRanges = ioFonts.GetGlyphRangesKorean();
-                    fontConfig.PixelSnapH = true;
-                    ioFonts.AddFontFromFileTTF(fontPathKr, fontConfig.SizePixels, fontConfig);
-                    fontConfig.MergeMode = false;
-                }
+                    List<Tuple<ushort, ushort>> codepointRanges = new();
+                    codepointRanges.Add(Tuple.Create(Fallback1Codepoint, Fallback1Codepoint));
+                    codepointRanges.Add(Tuple.Create(Fallback2Codepoint, Fallback2Codepoint));
 
-                // FontAwesome icon font
-                Log.Verbose("[FONT] SetupFonts - FontAwesome icon font");
-                {
-                    var fontPathIcon = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "FontAwesome5FreeSolid.otf");
-                    if (!File.Exists(fontPathIcon))
-                        ShowFontError(fontPathIcon);
+                    // ImGui default ellipsis characters
+                    codepointRanges.Add(Tuple.Create<ushort, ushort>(0x2026, 0x2026));
+                    codepointRanges.Add(Tuple.Create<ushort, ushort>(0x0085, 0x0085));
 
-                    var iconRangeHandle = GCHandle.Alloc(new ushort[] { 0xE000, 0xF8FF, 0, }, GCHandleType.Pinned);
-                    garbageList.Add(iconRangeHandle);
-
-                    fontConfig.GlyphRanges = iconRangeHandle.AddrOfPinnedObject();
-                    fontConfig.PixelSnapH = true;
-                    IconFont = ioFonts.AddFontFromFileTTF(fontPathIcon, DefaultFontSizePx * io.FontGlobalScale, fontConfig);
-                    this.loadedFontInfo[IconFont] = new("Icon", TargetFontModification.AxisMode.GameGlyphsOnly, DefaultFontSizePx, io.FontGlobalScale);
-                }
-
-                // Monospace font
-                Log.Verbose("[FONT] SetupFonts - Monospace font");
-                {
-                    var fontPathMono = Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "Inconsolata-Regular.ttf");
-                    if (!File.Exists(fontPathMono))
-                        ShowFontError(fontPathMono);
-
-                    fontConfig.GlyphRanges = IntPtr.Zero;
-                    fontConfig.PixelSnapH = true;
-                    MonoFont = ioFonts.AddFontFromFileTTF(fontPathMono, DefaultFontSizePx * io.FontGlobalScale, fontConfig);
-                    this.loadedFontInfo[MonoFont] = new("Mono", TargetFontModification.AxisMode.GameGlyphsOnly, DefaultFontSizePx, io.FontGlobalScale);
-                }
-
-                // Default font but in requested size for requested glyphs
-                Log.Verbose("[FONT] SetupFonts - Default font but in requested size for requested glyphs");
-                {
-                    Dictionary<float, List<SpecialGlyphRequest>> extraFontRequests = new();
-                    foreach (var extraFontRequest in this.glyphRequests)
+                    foreach (var request in requests)
                     {
-                        if (!extraFontRequests.ContainsKey(extraFontRequest.Size))
-                            extraFontRequests[extraFontRequest.Size] = new();
-                        extraFontRequests[extraFontRequest.Size].Add(extraFontRequest);
+                        foreach (var range in request.CodepointRanges)
+                            codepointRanges.Add(range);
                     }
 
-                    foreach (var (fontSize, requests) in extraFontRequests)
+                    codepointRanges.Sort((x, y) => (x.Item1 == y.Item1 ? (x.Item2 < y.Item2 ? -1 : (x.Item2 == y.Item2 ? 0 : 1)) : (x.Item1 < y.Item1 ? -1 : 1)));
+
+                    List<ushort> flattenedRanges = new();
+                    foreach (var range in codepointRanges)
                     {
-                        List<Tuple<ushort, ushort>> codepointRanges = new();
-                        codepointRanges.Add(Tuple.Create(Fallback1Codepoint, Fallback1Codepoint));
-                        codepointRanges.Add(Tuple.Create(Fallback2Codepoint, Fallback2Codepoint));
-
-                        // ImGui default ellipsis characters
-                        codepointRanges.Add(Tuple.Create<ushort, ushort>(0x2026, 0x2026));
-                        codepointRanges.Add(Tuple.Create<ushort, ushort>(0x0085, 0x0085));
-
-                        foreach (var request in requests)
+                        if (flattenedRanges.Any() && flattenedRanges[^1] >= range.Item1 - 1)
                         {
-                            foreach (var range in request.CodepointRanges)
-                                codepointRanges.Add(range);
-                        }
-
-                        codepointRanges.Sort((x, y) => (x.Item1 == y.Item1 ? (x.Item2 < y.Item2 ? -1 : (x.Item2 == y.Item2 ? 0 : 1)) : (x.Item1 < y.Item1 ? -1 : 1)));
-
-                        List<ushort> flattenedRanges = new();
-                        foreach (var range in codepointRanges)
-                        {
-                            if (flattenedRanges.Any() && flattenedRanges[^1] >= range.Item1 - 1)
-                            {
-                                flattenedRanges[^1] = Math.Max(flattenedRanges[^1], range.Item2);
-                            }
-                            else
-                            {
-                                flattenedRanges.Add(range.Item1);
-                                flattenedRanges.Add(range.Item2);
-                            }
-                        }
-
-                        flattenedRanges.Add(0);
-
-                        fontInfo = new(
-                            $"Requested({fontSize}px)",
-                            this.UseAxis ? TargetFontModification.AxisMode.Overwrite : TargetFontModification.AxisMode.GameGlyphsOnly,
-                            fontSize,
-                            io.FontGlobalScale);
-                        if (this.UseAxis)
-                        {
-                            fontConfig.GlyphRanges = dummyRangeHandle.AddrOfPinnedObject();
-                            fontConfig.SizePixels = fontInfo.SourceAxis.Style.BaseSizePx;
-                            fontConfig.PixelSnapH = false;
-
-                            var sizedFont = ioFonts.AddFontDefault(fontConfig);
-                            this.loadedFontInfo[sizedFont] = fontInfo;
-                            foreach (var request in requests)
-                                request.FontInternal = sizedFont;
+                            flattenedRanges[^1] = Math.Max(flattenedRanges[^1], range.Item2);
                         }
                         else
                         {
-                            var rangeHandle = GCHandle.Alloc(flattenedRanges.ToArray(), GCHandleType.Pinned);
-                            garbageList.Add(rangeHandle);
-                            fontConfig.PixelSnapH = true;
-
-                            var sizedFont = ioFonts.AddFontFromFileTTF(fontPathJp, fontSize * io.FontGlobalScale, fontConfig, rangeHandle.AddrOfPinnedObject());
-                            this.loadedFontInfo[sizedFont] = fontInfo;
-                            foreach (var request in requests)
-                                request.FontInternal = sizedFont;
+                            flattenedRanges.Add(range.Item1);
+                            flattenedRanges.Add(range.Item2);
                         }
                     }
-                }
 
-                gameFontManager.BuildFonts();
+                    flattenedRanges.Add(0);
 
-                var customFontFirstConfigIndex = ioFonts.ConfigData.Size;
-
-                Log.Verbose("[FONT] Invoke OnBuildFonts");
-                this.BuildFonts?.InvokeSafely();
-                Log.Verbose("[FONT] OnBuildFonts OK!");
-
-                for (int i = customFontFirstConfigIndex, i_ = ioFonts.ConfigData.Size; i < i_; i++)
-                {
-                    var config = ioFonts.ConfigData[i];
-                    if (gameFontManager.OwnsFont(config.DstFont))
-                        continue;
-
-                    config.OversampleH = 1;
-                    config.OversampleV = 1;
-
-                    var name = Encoding.UTF8.GetString((byte*)config.Name.Data, config.Name.Count).TrimEnd('\0');
-                    if (name.IsNullOrEmpty())
-                        name = $"{config.SizePixels}px";
-
-                    // ImFont information is reflected only if corresponding ImFontConfig has MergeMode not set.
-                    if (config.MergeMode)
+                    fontInfo = new(
+                        $"Requested({fontSize}px)",
+                        this.UseAxis ? TargetFontModification.AxisMode.Overwrite : TargetFontModification.AxisMode.GameGlyphsOnly,
+                        fontSize,
+                        io.FontGlobalScale);
+                    if (this.UseAxis)
                     {
-                        if (!this.loadedFontInfo.ContainsKey(config.DstFont.NativePtr))
-                        {
-                            Log.Warning("MergeMode specified for {0} but not found in loadedFontInfo. Skipping.", name);
-                            continue;
-                        }
+                        fontConfig.GlyphRanges = dummyRangeHandle.AddrOfPinnedObject();
+                        fontConfig.SizePixels = fontInfo.SourceAxis.Style.BaseSizePx;
+                        fontConfig.PixelSnapH = false;
+
+                        var sizedFont = ioFonts.AddFontDefault(fontConfig);
+                        this.loadedFontInfo[sizedFont] = fontInfo;
+                        foreach (var request in requests)
+                            request.FontInternal = sizedFont;
                     }
                     else
                     {
-                        if (this.loadedFontInfo.ContainsKey(config.DstFont.NativePtr))
-                        {
-                            Log.Warning("MergeMode not specified for {0} but found in loadedFontInfo. Skipping.", name);
-                            continue;
-                        }
+                        var rangeHandle = GCHandle.Alloc(flattenedRanges.ToArray(), GCHandleType.Pinned);
+                        garbageList.Add(rangeHandle);
+                        fontConfig.PixelSnapH = true;
 
-                        // While the font will be loaded in the scaled size after FontScale is applied, the font will be treated as having the requested size when used from plugins.
-                        this.loadedFontInfo[config.DstFont.NativePtr] = new($"PlReq({name})", config.SizePixels);
+                        var sizedFont = ioFonts.AddFontFromFileTTF(fontPathJp, fontSize * io.FontGlobalScale, fontConfig, rangeHandle.AddrOfPinnedObject());
+                        this.loadedFontInfo[sizedFont] = fontInfo;
+                        foreach (var request in requests)
+                            request.FontInternal = sizedFont;
                     }
-
-                    config.SizePixels = config.SizePixels * io.FontGlobalScale;
                 }
+            }
 
-                for (int i = 0, i_ = ioFonts.ConfigData.Size; i < i_; i++)
+            gameFontManager.BuildFonts();
+
+            var customFontFirstConfigIndex = ioFonts.ConfigData.Size;
+
+            Log.Verbose("[FONT] Invoke OnBuildFonts");
+            this.BuildFonts?.InvokeSafely();
+            Log.Verbose("[FONT] OnBuildFonts OK!");
+
+            for (int i = customFontFirstConfigIndex, i_ = ioFonts.ConfigData.Size; i < i_; i++)
+            {
+                var config = ioFonts.ConfigData[i];
+                if (gameFontManager.OwnsFont(config.DstFont))
+                    continue;
+
+                config.OversampleH = 1;
+                config.OversampleV = 1;
+
+                var name = Encoding.UTF8.GetString((byte*)config.Name.Data, config.Name.Count).TrimEnd('\0');
+                if (name.IsNullOrEmpty())
+                    name = $"{config.SizePixels}px";
+
+                // ImFont information is reflected only if corresponding ImFontConfig has MergeMode not set.
+                if (config.MergeMode)
                 {
-                    var config = ioFonts.ConfigData[i];
-                    config.RasterizerGamma *= fontGamma;
+                    if (!this.loadedFontInfo.ContainsKey(config.DstFont.NativePtr))
+                    {
+                        Log.Warning("MergeMode specified for {0} but not found in loadedFontInfo. Skipping.", name);
+                        continue;
+                    }
                 }
-
-                Log.Verbose("[FONT] ImGui.IO.Build will be called.");
-                ioFonts.Build();
-                gameFontManager.AfterIoFontsBuild();
-                Log.Verbose("[FONT] ImGui.IO.Build OK!");
-
-                gameFontManager.AfterBuildFonts();
-
-                foreach (var (font, mod) in this.loadedFontInfo)
+                else
                 {
-                    // I have no idea what's causing NPE, so just to be safe
-                    try
+                    if (this.loadedFontInfo.ContainsKey(config.DstFont.NativePtr))
                     {
-                        if (font.NativePtr != null && font.NativePtr->ConfigData != null)
-                        {
-                            var nameBytes = Encoding.UTF8.GetBytes($"{mod.Name}\0");
-                            Marshal.Copy(nameBytes, 0, (IntPtr)font.ConfigData.Name.Data, Math.Min(nameBytes.Length, font.ConfigData.Name.Count));
-                        }
-                    }
-                    catch (NullReferenceException)
-                    {
-                        // do nothing
-                    }
-
-                    Log.Verbose("[FONT] {0}: Unscale with scale value of {1}", mod.Name, mod.Scale);
-                    GameFontManager.UnscaleFont(font, mod.Scale, false);
-
-                    if (mod.Axis == TargetFontModification.AxisMode.Overwrite)
-                    {
-                        Log.Verbose("[FONT] {0}: Overwrite from AXIS of size {1}px (was {2}px)", mod.Name, mod.SourceAxis.ImFont.FontSize, font.FontSize);
-                        GameFontManager.UnscaleFont(font, font.FontSize / mod.SourceAxis.ImFont.FontSize, false);
-                        var ascentDiff = mod.SourceAxis.ImFont.Ascent - font.Ascent;
-                        font.Ascent += ascentDiff;
-                        font.Descent = ascentDiff;
-                        font.FallbackChar = mod.SourceAxis.ImFont.FallbackChar;
-                        font.EllipsisChar = mod.SourceAxis.ImFont.EllipsisChar;
-                        ImGuiHelpers.CopyGlyphsAcrossFonts(mod.SourceAxis.ImFont, font, false, false);
-                    }
-                    else if (mod.Axis == TargetFontModification.AxisMode.GameGlyphsOnly)
-                    {
-                        Log.Verbose("[FONT] {0}: Overwrite game specific glyphs from AXIS of size {1}px", mod.Name, mod.SourceAxis.ImFont.FontSize, font.FontSize);
-                        if (!this.UseAxis && font.NativePtr == DefaultFont.NativePtr)
-                            mod.SourceAxis.ImFont.FontSize -= 1;
-                        ImGuiHelpers.CopyGlyphsAcrossFonts(mod.SourceAxis.ImFont, font, true, false, 0xE020, 0xE0DB);
-                        if (!this.UseAxis && font.NativePtr == DefaultFont.NativePtr)
-                            mod.SourceAxis.ImFont.FontSize += 1;
-                    }
-
-                    Log.Verbose("[FONT] {0}: Resize from {1}px to {2}px", mod.Name, font.FontSize, mod.TargetSizePx);
-                    GameFontManager.UnscaleFont(font, font.FontSize / mod.TargetSizePx, false);
-                }
-
-                // Fill missing glyphs in MonoFont from DefaultFont
-                ImGuiHelpers.CopyGlyphsAcrossFonts(DefaultFont, MonoFont, true, false);
-
-                for (int i = 0, i_ = ioFonts.Fonts.Size; i < i_; i++)
-                {
-                    var font = ioFonts.Fonts[i];
-                    if (font.Glyphs.Size == 0)
-                    {
-                        Log.Warning("[FONT] Font has no glyph: {0}", font.GetDebugName());
+                        Log.Warning("MergeMode not specified for {0} but found in loadedFontInfo. Skipping.", name);
                         continue;
                     }
 
-                    if (font.FindGlyphNoFallback(Fallback1Codepoint).NativePtr != null)
-                        font.FallbackChar = Fallback1Codepoint;
-
-                    font.BuildLookupTable();
+                    // While the font will be loaded in the scaled size after FontScale is applied, the font will be treated as having the requested size when used from plugins.
+                    this.loadedFontInfo[config.DstFont.NativePtr] = new($"PlReq({name})", config.SizePixels);
                 }
 
-                Log.Verbose("[FONT] Invoke OnAfterBuildFonts");
-                this.AfterBuildFonts?.InvokeSafely();
-                Log.Verbose("[FONT] OnAfterBuildFonts OK!");
-
-                if (ioFonts.Fonts[0].NativePtr != DefaultFont.NativePtr)
-                    Log.Warning("[FONT] First font is not DefaultFont");
-
-                Log.Verbose("[FONT] Fonts built!");
-
-                this.fontBuildSignal.Set();
-
-                this.FontsReady = true;
+                config.SizePixels = config.SizePixels * io.FontGlobalScale;
             }
-            finally
-            {
-                if (fontConfig.NativePtr != null)
-                    fontConfig.Destroy();
 
-                foreach (var garbage in garbageList)
-                    garbage.Free();
+            for (int i = 0, i_ = ioFonts.ConfigData.Size; i < i_; i++)
+            {
+                var config = ioFonts.ConfigData[i];
+                config.RasterizerGamma *= fontGamma;
             }
-        }
 
-        [ServiceManager.CallWhenServicesReady]
-        private void ContinueConstruction(SigScanner sigScanner, Framework framework)
-        {
-            this.address.Setup(sigScanner);
-            framework.RunOnFrameworkThread(() =>
+            Log.Verbose("[FONT] ImGui.IO.Build will be called.");
+            ioFonts.Build();
+            gameFontManager.AfterIoFontsBuild();
+            Log.Verbose("[FONT] ImGui.IO.Build OK!");
+
+            gameFontManager.AfterBuildFonts();
+
+            foreach (var (font, mod) in this.loadedFontInfo)
             {
-                while ((this.GameWindowHandle = NativeFunctions.FindWindowEx(IntPtr.Zero, this.GameWindowHandle, "FFXIVGAME", IntPtr.Zero)) != IntPtr.Zero)
+                // I have no idea what's causing NPE, so just to be safe
+                try
                 {
-                    _ = User32.GetWindowThreadProcessId(this.GameWindowHandle, out var pid);
-
-                    if (pid == Environment.ProcessId && User32.IsWindowVisible(this.GameWindowHandle))
-                        break;
+                    if (font.NativePtr != null && font.NativePtr->ConfigData != null)
+                    {
+                        var nameBytes = Encoding.UTF8.GetBytes($"{mod.Name}\0");
+                        Marshal.Copy(nameBytes, 0, (IntPtr)font.ConfigData.Name.Data, Math.Min(nameBytes.Length, font.ConfigData.Name.Count));
+                    }
+                }
+                catch (NullReferenceException)
+                {
+                    // do nothing
                 }
 
-                this.presentHook = Hook<PresentDelegate>.FromAddress(this.address.Present, this.PresentDetour);
-                this.resizeBuffersHook = Hook<ResizeBuffersDelegate>.FromAddress(this.address.ResizeBuffers, this.ResizeBuffersDetour);
+                Log.Verbose("[FONT] {0}: Unscale with scale value of {1}", mod.Name, mod.Scale);
+                GameFontManager.UnscaleFont(font, mod.Scale, false);
 
-                Log.Verbose("===== S W A P C H A I N =====");
-                Log.Verbose($"Present address 0x{this.presentHook!.Address.ToInt64():X}");
-                Log.Verbose($"ResizeBuffers address 0x{this.resizeBuffersHook!.Address.ToInt64():X}");
+                if (mod.Axis == TargetFontModification.AxisMode.Overwrite)
+                {
+                    Log.Verbose("[FONT] {0}: Overwrite from AXIS of size {1}px (was {2}px)", mod.Name, mod.SourceAxis.ImFont.FontSize, font.FontSize);
+                    GameFontManager.UnscaleFont(font, font.FontSize / mod.SourceAxis.ImFont.FontSize, false);
+                    var ascentDiff = mod.SourceAxis.ImFont.Ascent - font.Ascent;
+                    font.Ascent += ascentDiff;
+                    font.Descent = ascentDiff;
+                    font.FallbackChar = mod.SourceAxis.ImFont.FallbackChar;
+                    font.EllipsisChar = mod.SourceAxis.ImFont.EllipsisChar;
+                    ImGuiHelpers.CopyGlyphsAcrossFonts(mod.SourceAxis.ImFont, font, false, false);
+                }
+                else if (mod.Axis == TargetFontModification.AxisMode.GameGlyphsOnly)
+                {
+                    Log.Verbose("[FONT] {0}: Overwrite game specific glyphs from AXIS of size {1}px", mod.Name, mod.SourceAxis.ImFont.FontSize, font.FontSize);
+                    if (!this.UseAxis && font.NativePtr == DefaultFont.NativePtr)
+                        mod.SourceAxis.ImFont.FontSize -= 1;
+                    ImGuiHelpers.CopyGlyphsAcrossFonts(mod.SourceAxis.ImFont, font, true, false, 0xE020, 0xE0DB);
+                    if (!this.UseAxis && font.NativePtr == DefaultFont.NativePtr)
+                        mod.SourceAxis.ImFont.FontSize += 1;
+                }
 
-                var wndProcAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 80 7C 24 ?? ?? 74 ?? B8");
-                Log.Verbose($"WndProc address 0x{wndProcAddress.ToInt64():X}");
-                this.processMessageHook = Hook<ProcessMessageDelegate>.FromAddress(wndProcAddress, this.ProcessMessageDetour);
-
-                this.setCursorHook.Enable();
-                this.presentHook.Enable();
-                this.resizeBuffersHook.Enable();
-                this.dispatchMessageWHook.Enable();
-                this.processMessageHook.Enable();
-            });
-        }
-
-        // This is intended to only be called as a handler attached to scene.OnNewRenderFrame
-        private void RebuildFontsInternal()
-        {
-            Log.Verbose("[FONT] RebuildFontsInternal() called");
-            this.SetupFonts();
-
-            Log.Verbose("[FONT] RebuildFontsInternal() detaching");
-            this.scene!.OnNewRenderFrame -= this.RebuildFontsInternal;
-
-            Log.Verbose("[FONT] Calling InvalidateFonts");
-            this.scene.InvalidateFonts();
-
-            Log.Verbose("[FONT] Font Rebuild OK!");
-
-            this.isRebuildingFonts = false;
-        }
-
-        private unsafe IntPtr ProcessMessageDetour(IntPtr hWnd, uint msg, ulong wParam, ulong lParam, IntPtr handeled)
-        {
-            var ime = Service<DalamudIME>.GetNullable();
-            var res = ime?.ProcessWndProcW(hWnd, (User32.WindowMessage)msg, (void*)wParam, (void*)lParam);
-            return this.processMessageHook.Original(hWnd, msg, wParam, lParam, handeled);
-        }
-
-        private unsafe IntPtr DispatchMessageWDetour(ref User32.MSG msg)
-        {
-            if (msg.hwnd == this.GameWindowHandle && this.scene != null)
-            {
-                var res = this.scene.ProcessWndProcW(msg.hwnd, msg.message, (void*)msg.wParam, (void*)msg.lParam);
-                if (res != null)
-                    return res.Value;
+                Log.Verbose("[FONT] {0}: Resize from {1}px to {2}px", mod.Name, font.FontSize, mod.TargetSizePx);
+                GameFontManager.UnscaleFont(font, font.FontSize / mod.TargetSizePx, false);
             }
 
-            return this.dispatchMessageWHook.IsDisposed ? User32.DispatchMessage(ref msg) : this.dispatchMessageWHook.Original(ref msg);
+            // Fill missing glyphs in MonoFont from DefaultFont
+            ImGuiHelpers.CopyGlyphsAcrossFonts(DefaultFont, MonoFont, true, false);
+
+            for (int i = 0, i_ = ioFonts.Fonts.Size; i < i_; i++)
+            {
+                var font = ioFonts.Fonts[i];
+                if (font.Glyphs.Size == 0)
+                {
+                    Log.Warning("[FONT] Font has no glyph: {0}", font.GetDebugName());
+                    continue;
+                }
+
+                if (font.FindGlyphNoFallback(Fallback1Codepoint).NativePtr != null)
+                    font.FallbackChar = Fallback1Codepoint;
+
+                font.BuildLookupTable();
+            }
+
+            Log.Verbose("[FONT] Invoke OnAfterBuildFonts");
+            this.AfterBuildFonts?.InvokeSafely();
+            Log.Verbose("[FONT] OnAfterBuildFonts OK!");
+
+            if (ioFonts.Fonts[0].NativePtr != DefaultFont.NativePtr)
+                Log.Warning("[FONT] First font is not DefaultFont");
+
+            Log.Verbose("[FONT] Fonts built!");
+
+            this.fontBuildSignal.Set();
+
+            this.FontsReady = true;
+        }
+        finally
+        {
+            if (fontConfig.NativePtr != null)
+                fontConfig.Destroy();
+
+            foreach (var garbage in garbageList)
+                garbage.Free();
+        }
+    }
+
+    [ServiceManager.CallWhenServicesReady]
+    private void ContinueConstruction(SigScanner sigScanner, Framework framework)
+    {
+        this.address.Setup(sigScanner);
+        framework.RunOnFrameworkThread(() =>
+        {
+            while ((this.GameWindowHandle = NativeFunctions.FindWindowEx(IntPtr.Zero, this.GameWindowHandle, "FFXIVGAME", IntPtr.Zero)) != IntPtr.Zero)
+            {
+                _ = User32.GetWindowThreadProcessId(this.GameWindowHandle, out var pid);
+
+                if (pid == Environment.ProcessId && User32.IsWindowVisible(this.GameWindowHandle))
+                    break;
+            }
+
+            this.presentHook = Hook<PresentDelegate>.FromAddress(this.address.Present, this.PresentDetour);
+            this.resizeBuffersHook = Hook<ResizeBuffersDelegate>.FromAddress(this.address.ResizeBuffers, this.ResizeBuffersDetour);
+
+            Log.Verbose("===== S W A P C H A I N =====");
+            Log.Verbose($"Present address 0x{this.presentHook!.Address.ToInt64():X}");
+            Log.Verbose($"ResizeBuffers address 0x{this.resizeBuffersHook!.Address.ToInt64():X}");
+
+            var wndProcAddress = sigScanner.ScanText("E8 ?? ?? ?? ?? 80 7C 24 ?? ?? 74 ?? B8");
+            Log.Verbose($"WndProc address 0x{wndProcAddress.ToInt64():X}");
+            this.processMessageHook = Hook<ProcessMessageDelegate>.FromAddress(wndProcAddress, this.ProcessMessageDetour);
+
+            this.setCursorHook.Enable();
+            this.presentHook.Enable();
+            this.resizeBuffersHook.Enable();
+            this.dispatchMessageWHook.Enable();
+            this.processMessageHook.Enable();
+        });
+    }
+
+    // This is intended to only be called as a handler attached to scene.OnNewRenderFrame
+    private void RebuildFontsInternal()
+    {
+        Log.Verbose("[FONT] RebuildFontsInternal() called");
+        this.SetupFonts();
+
+        Log.Verbose("[FONT] RebuildFontsInternal() detaching");
+        this.scene!.OnNewRenderFrame -= this.RebuildFontsInternal;
+
+        Log.Verbose("[FONT] Calling InvalidateFonts");
+        this.scene.InvalidateFonts();
+
+        Log.Verbose("[FONT] Font Rebuild OK!");
+
+        this.isRebuildingFonts = false;
+    }
+
+    private unsafe IntPtr ProcessMessageDetour(IntPtr hWnd, uint msg, ulong wParam, ulong lParam, IntPtr handeled)
+    {
+        var ime = Service<DalamudIME>.GetNullable();
+        var res = ime?.ProcessWndProcW(hWnd, (User32.WindowMessage)msg, (void*)wParam, (void*)lParam);
+        return this.processMessageHook.Original(hWnd, msg, wParam, lParam, handeled);
+    }
+
+    private unsafe IntPtr DispatchMessageWDetour(ref User32.MSG msg)
+    {
+        if (msg.hwnd == this.GameWindowHandle && this.scene != null)
+        {
+            var res = this.scene.ProcessWndProcW(msg.hwnd, msg.message, (void*)msg.wParam, (void*)msg.lParam);
+            if (res != null)
+                return res.Value;
         }
 
-        private IntPtr ResizeBuffersDetour(IntPtr swapChain, uint bufferCount, uint width, uint height, uint newFormat, uint swapChainFlags)
-        {
+        return this.dispatchMessageWHook.IsDisposed ? User32.DispatchMessage(ref msg) : this.dispatchMessageWHook.Original(ref msg);
+    }
+
+    private IntPtr ResizeBuffersDetour(IntPtr swapChain, uint bufferCount, uint width, uint height, uint newFormat, uint swapChainFlags)
+    {
 #if DEBUG
             Log.Verbose($"Calling resizebuffers swap@{swapChain.ToInt64():X}{bufferCount} {width} {height} {newFormat} {swapChainFlags}");
 #endif
 
-            this.ResizeBuffers?.InvokeSafely();
+        this.ResizeBuffers?.InvokeSafely();
 
-            // We have to ensure we're working with the main swapchain,
-            // as viewports might be resizing as well
-            if (this.scene == null || swapChain != this.scene.SwapChain.NativePointer)
-                return this.resizeBuffersHook!.Original(swapChain, bufferCount, width, height, newFormat, swapChainFlags);
+        // We have to ensure we're working with the main swapchain,
+        // as viewports might be resizing as well
+        if (this.scene == null || swapChain != this.scene.SwapChain.NativePointer)
+            return this.resizeBuffersHook!.Original(swapChain, bufferCount, width, height, newFormat, swapChainFlags);
 
-            this.scene?.OnPreResize();
+        this.scene?.OnPreResize();
 
-            var ret = this.resizeBuffersHook!.Original(swapChain, bufferCount, width, height, newFormat, swapChainFlags);
-            if (ret.ToInt64() == 0x887A0001)
-            {
-                Log.Error("invalid call to resizeBuffers");
-            }
-
-            this.scene?.OnPostResize((int)width, (int)height);
-
-            return ret;
+        var ret = this.resizeBuffersHook!.Original(swapChain, bufferCount, width, height, newFormat, swapChainFlags);
+        if (ret.ToInt64() == 0x887A0001)
+        {
+            Log.Error("invalid call to resizeBuffers");
         }
 
-        private IntPtr SetCursorDetour(IntPtr hCursor)
-        {
-            if (this.lastWantCapture == true && (!this.scene?.IsImGuiCursor(hCursor) ?? false) && this.OverrideGameCursor)
-                return IntPtr.Zero;
+        this.scene?.OnPostResize((int)width, (int)height);
 
-            return this.setCursorHook.IsDisposed ? User32.SetCursor(new User32.SafeCursorHandle(hCursor, false)).DangerousGetHandle() : this.setCursorHook.Original(hCursor);
+        return ret;
+    }
+
+    private IntPtr SetCursorDetour(IntPtr hCursor)
+    {
+        if (this.lastWantCapture == true && (!this.scene?.IsImGuiCursor(hCursor) ?? false) && this.OverrideGameCursor)
+            return IntPtr.Zero;
+
+        return this.setCursorHook.IsDisposed ? User32.SetCursor(new User32.SafeCursorHandle(hCursor, false)).DangerousGetHandle() : this.setCursorHook.Original(hCursor);
+    }
+
+    private void OnNewInputFrame()
+    {
+        var dalamudInterface = Service<DalamudInterface>.GetNullable();
+        var gamepadState = Service<GamepadState>.GetNullable();
+        var keyState = Service<KeyState>.GetNullable();
+
+        if (dalamudInterface == null || gamepadState == null || keyState == null)
+            return;
+
+        // fix for keys in game getting stuck, if you were holding a game key (like run)
+        // and then clicked on an imgui textbox - imgui would swallow the keyup event,
+        // so the game would think the key remained pressed continuously until you left
+        // imgui and pressed and released the key again
+        if (ImGui.GetIO().WantTextInput)
+        {
+            keyState.ClearAll();
         }
 
-        private void OnNewInputFrame()
+        // TODO: mouse state?
+
+        var gamepadEnabled = (ImGui.GetIO().BackendFlags & ImGuiBackendFlags.HasGamepad) > 0;
+
+        // NOTE (Chiv) Activate ImGui navigation  via L1+L3 press
+        // (mimicking how mouse navigation is activated via L1+R3 press in game).
+        if (gamepadEnabled
+            && gamepadState.Raw(GamepadButtons.L1) > 0
+            && gamepadState.Pressed(GamepadButtons.L3) > 0)
         {
-            var dalamudInterface = Service<DalamudInterface>.GetNullable();
-            var gamepadState = Service<GamepadState>.GetNullable();
-            var keyState = Service<KeyState>.GetNullable();
-
-            if (dalamudInterface == null || gamepadState == null || keyState == null)
-                return;
-
-            // fix for keys in game getting stuck, if you were holding a game key (like run)
-            // and then clicked on an imgui textbox - imgui would swallow the keyup event,
-            // so the game would think the key remained pressed continuously until you left
-            // imgui and pressed and released the key again
-            if (ImGui.GetIO().WantTextInput)
-            {
-                keyState.ClearAll();
-            }
-
-            // TODO: mouse state?
-
-            var gamepadEnabled = (ImGui.GetIO().BackendFlags & ImGuiBackendFlags.HasGamepad) > 0;
-
-            // NOTE (Chiv) Activate ImGui navigation  via L1+L3 press
-            // (mimicking how mouse navigation is activated via L1+R3 press in game).
-            if (gamepadEnabled
-                && gamepadState.Raw(GamepadButtons.L1) > 0
-                && gamepadState.Pressed(GamepadButtons.L3) > 0)
-            {
-                ImGui.GetIO().ConfigFlags ^= ImGuiConfigFlags.NavEnableGamepad;
-                gamepadState.NavEnableGamepad ^= true;
-                dalamudInterface.ToggleGamepadModeNotifierWindow();
-            }
-
-            if (gamepadEnabled && (ImGui.GetIO().ConfigFlags & ImGuiConfigFlags.NavEnableGamepad) > 0)
-            {
-                var northButton = gamepadState.Raw(GamepadButtons.North) != 0;
-                var eastButton = gamepadState.Raw(GamepadButtons.East) != 0;
-                var southButton = gamepadState.Raw(GamepadButtons.South) != 0;
-                var westButton = gamepadState.Raw(GamepadButtons.West) != 0;
-                var dPadUp = gamepadState.Raw(GamepadButtons.DpadUp) != 0;
-                var dPadRight = gamepadState.Raw(GamepadButtons.DpadRight) != 0;
-                var dPadDown = gamepadState.Raw(GamepadButtons.DpadDown) != 0;
-                var dPadLeft = gamepadState.Raw(GamepadButtons.DpadLeft) != 0;
-                var leftStickUp = gamepadState.LeftStickUp;
-                var leftStickRight = gamepadState.LeftStickRight;
-                var leftStickDown = gamepadState.LeftStickDown;
-                var leftStickLeft = gamepadState.LeftStickLeft;
-                var l1Button = gamepadState.Raw(GamepadButtons.L1) != 0;
-                var l2Button = gamepadState.Raw(GamepadButtons.L2) != 0;
-                var r1Button = gamepadState.Raw(GamepadButtons.R1) != 0;
-                var r2Button = gamepadState.Raw(GamepadButtons.R2) != 0;
-
-                var io = ImGui.GetIO();
-                io.AddKeyEvent(ImGuiKey.GamepadFaceUp, northButton);
-                io.AddKeyEvent(ImGuiKey.GamepadFaceRight, eastButton);
-                io.AddKeyEvent(ImGuiKey.GamepadFaceDown, southButton);
-                io.AddKeyEvent(ImGuiKey.GamepadFaceLeft, westButton);
-
-                io.AddKeyEvent(ImGuiKey.GamepadDpadUp, dPadUp);
-                io.AddKeyEvent(ImGuiKey.GamepadDpadRight, dPadRight);
-                io.AddKeyEvent(ImGuiKey.GamepadDpadDown, dPadDown);
-                io.AddKeyEvent(ImGuiKey.GamepadDpadLeft, dPadLeft);
-
-                io.AddKeyAnalogEvent(ImGuiKey.GamepadLStickUp, leftStickUp != 0, leftStickUp);
-                io.AddKeyAnalogEvent(ImGuiKey.GamepadLStickRight, leftStickRight != 0, leftStickRight);
-                io.AddKeyAnalogEvent(ImGuiKey.GamepadLStickDown, leftStickDown != 0, leftStickDown);
-                io.AddKeyAnalogEvent(ImGuiKey.GamepadLStickLeft, leftStickLeft != 0, leftStickLeft);
-
-                io.AddKeyEvent(ImGuiKey.GamepadL1, l1Button);
-                io.AddKeyEvent(ImGuiKey.GamepadL2, l2Button);
-                io.AddKeyEvent(ImGuiKey.GamepadR1, r1Button);
-                io.AddKeyEvent(ImGuiKey.GamepadR2, r2Button);
-
-                if (gamepadState.Pressed(GamepadButtons.R3) > 0)
-                {
-                    dalamudInterface.TogglePluginInstallerWindow();
-                }
-            }
+            ImGui.GetIO().ConfigFlags ^= ImGuiConfigFlags.NavEnableGamepad;
+            gamepadState.NavEnableGamepad ^= true;
+            dalamudInterface.ToggleGamepadModeNotifierWindow();
         }
 
-        private void Display()
+        if (gamepadEnabled && (ImGui.GetIO().ConfigFlags & ImGuiConfigFlags.NavEnableGamepad) > 0)
         {
-            // this is more or less part of what reshade/etc do to avoid having to manually
-            // set the cursor inside the ui
-            // This will just tell ImGui to draw its own software cursor instead of using the hardware cursor
-            // The scene internally will handle hiding and showing the hardware (game) cursor
-            // If the player has the game software cursor enabled, we can't really do anything about that and
-            // they will see both cursors.
-            // Doing this here because it's somewhat application-specific behavior
-            // ImGui.GetIO().MouseDrawCursor = ImGui.GetIO().WantCaptureMouse;
-            this.LastImGuiIoPtr = ImGui.GetIO();
-            this.lastWantCapture = this.LastImGuiIoPtr.WantCaptureMouse;
+            var northButton = gamepadState.Raw(GamepadButtons.North) != 0;
+            var eastButton = gamepadState.Raw(GamepadButtons.East) != 0;
+            var southButton = gamepadState.Raw(GamepadButtons.South) != 0;
+            var westButton = gamepadState.Raw(GamepadButtons.West) != 0;
+            var dPadUp = gamepadState.Raw(GamepadButtons.DpadUp) != 0;
+            var dPadRight = gamepadState.Raw(GamepadButtons.DpadRight) != 0;
+            var dPadDown = gamepadState.Raw(GamepadButtons.DpadDown) != 0;
+            var dPadLeft = gamepadState.Raw(GamepadButtons.DpadLeft) != 0;
+            var leftStickUp = gamepadState.LeftStickUp;
+            var leftStickRight = gamepadState.LeftStickRight;
+            var leftStickDown = gamepadState.LeftStickDown;
+            var leftStickLeft = gamepadState.LeftStickLeft;
+            var l1Button = gamepadState.Raw(GamepadButtons.L1) != 0;
+            var l2Button = gamepadState.Raw(GamepadButtons.L2) != 0;
+            var r1Button = gamepadState.Raw(GamepadButtons.R1) != 0;
+            var r2Button = gamepadState.Raw(GamepadButtons.R2) != 0;
 
-            WindowSystem.HasAnyWindowSystemFocus = false;
-            WindowSystem.FocusedWindowSystemNamespace = string.Empty;
+            var io = ImGui.GetIO();
+            io.AddKeyEvent(ImGuiKey.GamepadFaceUp, northButton);
+            io.AddKeyEvent(ImGuiKey.GamepadFaceRight, eastButton);
+            io.AddKeyEvent(ImGuiKey.GamepadFaceDown, southButton);
+            io.AddKeyEvent(ImGuiKey.GamepadFaceLeft, westButton);
 
-            var snap = ImGuiManagedAsserts.GetSnapshot();
+            io.AddKeyEvent(ImGuiKey.GamepadDpadUp, dPadUp);
+            io.AddKeyEvent(ImGuiKey.GamepadDpadRight, dPadRight);
+            io.AddKeyEvent(ImGuiKey.GamepadDpadDown, dPadDown);
+            io.AddKeyEvent(ImGuiKey.GamepadDpadLeft, dPadLeft);
 
-            if (this.IsDispatchingEvents)
-                this.Draw?.Invoke();
+            io.AddKeyAnalogEvent(ImGuiKey.GamepadLStickUp, leftStickUp != 0, leftStickUp);
+            io.AddKeyAnalogEvent(ImGuiKey.GamepadLStickRight, leftStickRight != 0, leftStickRight);
+            io.AddKeyAnalogEvent(ImGuiKey.GamepadLStickDown, leftStickDown != 0, leftStickDown);
+            io.AddKeyAnalogEvent(ImGuiKey.GamepadLStickLeft, leftStickLeft != 0, leftStickLeft);
 
-            ImGuiManagedAsserts.ReportProblems("Dalamud Core", snap);
+            io.AddKeyEvent(ImGuiKey.GamepadL1, l1Button);
+            io.AddKeyEvent(ImGuiKey.GamepadL2, l2Button);
+            io.AddKeyEvent(ImGuiKey.GamepadR1, r1Button);
+            io.AddKeyEvent(ImGuiKey.GamepadR2, r2Button);
 
-            Service<NotificationManager>.Get().Draw();
-        }
-
-        /// <summary>
-        /// Represents an instance of InstanceManager with scene ready for use.
-        /// </summary>
-        public class InterfaceManagerWithScene : IServiceType
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="InterfaceManagerWithScene"/> class.
-            /// </summary>
-            /// <param name="interfaceManager">An instance of <see cref="InterfaceManager"/>.</param>
-            internal InterfaceManagerWithScene(InterfaceManager interfaceManager)
+            if (gamepadState.Pressed(GamepadButtons.R3) > 0)
             {
-                this.Manager = interfaceManager;
-            }
-
-            /// <summary>
-            /// Gets the associated InterfaceManager.
-            /// </summary>
-            public InterfaceManager Manager { get; init; }
-        }
-
-        /// <summary>
-        /// Represents a glyph request.
-        /// </summary>
-        public class SpecialGlyphRequest : IDisposable
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="SpecialGlyphRequest"/> class.
-            /// </summary>
-            /// <param name="manager">InterfaceManager to associate.</param>
-            /// <param name="size">Font size in pixels.</param>
-            /// <param name="ranges">Codepoint ranges.</param>
-            internal SpecialGlyphRequest(InterfaceManager manager, float size, List<Tuple<ushort, ushort>> ranges)
-            {
-                this.Manager = manager;
-                this.Size = size;
-                this.CodepointRanges = ranges;
-                this.Manager.glyphRequests.Add(this);
-            }
-
-            /// <summary>
-            /// Gets the font of specified size, or DefaultFont if it's not ready yet.
-            /// </summary>
-            public ImFontPtr Font
-            {
-                get
-                {
-                    unsafe
-                    {
-                        return this.FontInternal.NativePtr == null ? DefaultFont : this.FontInternal;
-                    }
-                }
-            }
-
-            /// <summary>
-            /// Gets or sets the associated ImFont.
-            /// </summary>
-            internal ImFontPtr FontInternal { get; set; }
-
-            /// <summary>
-            /// Gets associated InterfaceManager.
-            /// </summary>
-            internal InterfaceManager Manager { get; init; }
-
-            /// <summary>
-            /// Gets font size.
-            /// </summary>
-            internal float Size { get; init; }
-
-            /// <summary>
-            /// Gets codepoint ranges.
-            /// </summary>
-            internal List<Tuple<ushort, ushort>> CodepointRanges { get; init; }
-
-            /// <inheritdoc/>
-            public void Dispose()
-            {
-                this.Manager.glyphRequests.Remove(this);
-            }
-        }
-
-        private unsafe class TargetFontModification : IDisposable
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="TargetFontModification"/> class.
-            /// Constructs new target font modification information, assuming that AXIS fonts will not be applied.
-            /// </summary>
-            /// <param name="name">Name of the font to write to ImGui font information.</param>
-            /// <param name="sizePx">Target font size in pixels, which will not be considered for further scaling.</param>
-            internal TargetFontModification(string name, float sizePx)
-            {
-                this.Name = name;
-                this.Axis = AxisMode.Suppress;
-                this.TargetSizePx = sizePx;
-                this.Scale = 1;
-                this.SourceAxis = null;
-            }
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="TargetFontModification"/> class.
-            /// Constructs new target font modification information.
-            /// </summary>
-            /// <param name="name">Name of the font to write to ImGui font information.</param>
-            /// <param name="axis">Whether and how to use AXIS fonts.</param>
-            /// <param name="sizePx">Target font size in pixels, which will not be considered for further scaling.</param>
-            /// <param name="globalFontScale">Font scale to be referred for loading AXIS font of appropriate size.</param>
-            internal TargetFontModification(string name, AxisMode axis, float sizePx, float globalFontScale)
-            {
-                this.Name = name;
-                this.Axis = axis;
-                this.TargetSizePx = sizePx;
-                this.Scale = globalFontScale;
-                this.SourceAxis = Service<GameFontManager>.Get().NewFontRef(new(GameFontFamily.Axis, this.TargetSizePx * this.Scale));
-            }
-
-            internal enum AxisMode
-            {
-                Suppress,
-                GameGlyphsOnly,
-                Overwrite,
-            }
-
-            internal string Name { get; private init; }
-
-            internal AxisMode Axis { get; private init; }
-
-            internal float TargetSizePx { get; private init; }
-
-            internal float Scale { get; private init; }
-
-            internal GameFontHandle? SourceAxis { get; private init; }
-
-            internal bool SourceAxisAvailable => this.SourceAxis != null && this.SourceAxis.ImFont.NativePtr != null;
-
-            public void Dispose()
-            {
-                this.SourceAxis?.Dispose();
+                dalamudInterface.TogglePluginInstallerWindow();
             }
         }
     }
+
+    private void Display()
+    {
+        // this is more or less part of what reshade/etc do to avoid having to manually
+        // set the cursor inside the ui
+        // This will just tell ImGui to draw its own software cursor instead of using the hardware cursor
+        // The scene internally will handle hiding and showing the hardware (game) cursor
+        // If the player has the game software cursor enabled, we can't really do anything about that and
+        // they will see both cursors.
+        // Doing this here because it's somewhat application-specific behavior
+        // ImGui.GetIO().MouseDrawCursor = ImGui.GetIO().WantCaptureMouse;
+        this.LastImGuiIoPtr = ImGui.GetIO();
+        this.lastWantCapture = this.LastImGuiIoPtr.WantCaptureMouse;
+
+        WindowSystem.HasAnyWindowSystemFocus = false;
+        WindowSystem.FocusedWindowSystemNamespace = string.Empty;
+
+        var snap = ImGuiManagedAsserts.GetSnapshot();
+
+        if (this.IsDispatchingEvents)
+            this.Draw?.Invoke();
+
+        ImGuiManagedAsserts.ReportProblems("Dalamud Core", snap);
+
+        Service<NotificationManager>.Get().Draw();
+    }
+
+    /// <summary>
+    /// Represents an instance of InstanceManager with scene ready for use.
+    /// </summary>
+    public class InterfaceManagerWithScene : IServiceType
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InterfaceManagerWithScene"/> class.
+        /// </summary>
+        /// <param name="interfaceManager">An instance of <see cref="InterfaceManager"/>.</param>
+        internal InterfaceManagerWithScene(InterfaceManager interfaceManager)
+        {
+            this.Manager = interfaceManager;
+        }
+
+        /// <summary>
+        /// Gets the associated InterfaceManager.
+        /// </summary>
+        public InterfaceManager Manager { get; init; }
+    }
+
+    /// <summary>
+    /// Represents a glyph request.
+    /// </summary>
+    public class SpecialGlyphRequest : IDisposable
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SpecialGlyphRequest"/> class.
+        /// </summary>
+        /// <param name="manager">InterfaceManager to associate.</param>
+        /// <param name="size">Font size in pixels.</param>
+        /// <param name="ranges">Codepoint ranges.</param>
+        internal SpecialGlyphRequest(InterfaceManager manager, float size, List<Tuple<ushort, ushort>> ranges)
+        {
+            this.Manager = manager;
+            this.Size = size;
+            this.CodepointRanges = ranges;
+            this.Manager.glyphRequests.Add(this);
+        }
+
+        /// <summary>
+        /// Gets the font of specified size, or DefaultFont if it's not ready yet.
+        /// </summary>
+        public ImFontPtr Font
+        {
+            get
+            {
+                unsafe
+                {
+                    return this.FontInternal.NativePtr == null ? DefaultFont : this.FontInternal;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated ImFont.
+        /// </summary>
+        internal ImFontPtr FontInternal { get; set; }
+
+        /// <summary>
+        /// Gets associated InterfaceManager.
+        /// </summary>
+        internal InterfaceManager Manager { get; init; }
+
+        /// <summary>
+        /// Gets font size.
+        /// </summary>
+        internal float Size { get; init; }
+
+        /// <summary>
+        /// Gets codepoint ranges.
+        /// </summary>
+        internal List<Tuple<ushort, ushort>> CodepointRanges { get; init; }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            this.Manager.glyphRequests.Remove(this);
+        }
+    }
+
+    private unsafe class TargetFontModification : IDisposable
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TargetFontModification"/> class.
+        /// Constructs new target font modification information, assuming that AXIS fonts will not be applied.
+        /// </summary>
+        /// <param name="name">Name of the font to write to ImGui font information.</param>
+        /// <param name="sizePx">Target font size in pixels, which will not be considered for further scaling.</param>
+        internal TargetFontModification(string name, float sizePx)
+        {
+            this.Name = name;
+            this.Axis = AxisMode.Suppress;
+            this.TargetSizePx = sizePx;
+            this.Scale = 1;
+            this.SourceAxis = null;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TargetFontModification"/> class.
+        /// Constructs new target font modification information.
+        /// </summary>
+        /// <param name="name">Name of the font to write to ImGui font information.</param>
+        /// <param name="axis">Whether and how to use AXIS fonts.</param>
+        /// <param name="sizePx">Target font size in pixels, which will not be considered for further scaling.</param>
+        /// <param name="globalFontScale">Font scale to be referred for loading AXIS font of appropriate size.</param>
+        internal TargetFontModification(string name, AxisMode axis, float sizePx, float globalFontScale)
+        {
+            this.Name = name;
+            this.Axis = axis;
+            this.TargetSizePx = sizePx;
+            this.Scale = globalFontScale;
+            this.SourceAxis = Service<GameFontManager>.Get().NewFontRef(new(GameFontFamily.Axis, this.TargetSizePx * this.Scale));
+        }
+
+        internal enum AxisMode
+        {
+            Suppress,
+            GameGlyphsOnly,
+            Overwrite,
+        }
+
+        internal string Name { get; private init; }
+
+        internal AxisMode Axis { get; private init; }
+
+        internal float TargetSizePx { get; private init; }
+
+        internal float Scale { get; private init; }
+
+        internal GameFontHandle? SourceAxis { get; private init; }
+
+        internal bool SourceAxisAvailable => this.SourceAxis != null && this.SourceAxis.ImFont.NativePtr != null;
+
+        public void Dispose()
+        {
+            this.SourceAxis?.Dispose();
+        }
+    }
 }
diff --git a/Dalamud/Interface/Internal/ManagedAsserts/ImGuiContextOffsets.cs b/Dalamud/Interface/Internal/ManagedAsserts/ImGuiContextOffsets.cs
index 5c76854d2..fd203192f 100644
--- a/Dalamud/Interface/Internal/ManagedAsserts/ImGuiContextOffsets.cs
+++ b/Dalamud/Interface/Internal/ManagedAsserts/ImGuiContextOffsets.cs
@@ -1,22 +1,21 @@
-namespace Dalamud.Interface.Internal.ManagedAsserts
+namespace Dalamud.Interface.Internal.ManagedAsserts;
+
+/// <summary>
+/// Offsets to various data in ImGui context.
+/// </summary>
+/// <remarks>
+/// Last updated for ImGui 1.83.
+/// </remarks>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Document the unsage instead.")]
+internal static class ImGuiContextOffsets
 {
-    /// <summary>
-    /// Offsets to various data in ImGui context.
-    /// </summary>
-    /// <remarks>
-    /// Last updated for ImGui 1.83.
-    /// </remarks>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1600:Elements should be documented", Justification = "Document the unsage instead.")]
-    internal static class ImGuiContextOffsets
-    {
-        public const int CurrentWindowStackOffset = 0x73A;
+    public const int CurrentWindowStackOffset = 0x73A;
 
-        public const int ColorStackOffset = 0x79C;
+    public const int ColorStackOffset = 0x79C;
 
-        public const int StyleVarStackOffset = 0x7A0;
+    public const int StyleVarStackOffset = 0x7A0;
 
-        public const int FontStackOffset = 0x7A4;
+    public const int FontStackOffset = 0x7A4;
 
-        public const int BeginPopupStackOffset = 0x7B8;
-    }
+    public const int BeginPopupStackOffset = 0x7B8;
 }
diff --git a/Dalamud/Interface/Internal/ManagedAsserts/ImGuiManagedAsserts.cs b/Dalamud/Interface/Internal/ManagedAsserts/ImGuiManagedAsserts.cs
index 5940a42a3..ff42e93f3 100644
--- a/Dalamud/Interface/Internal/ManagedAsserts/ImGuiManagedAsserts.cs
+++ b/Dalamud/Interface/Internal/ManagedAsserts/ImGuiManagedAsserts.cs
@@ -4,138 +4,137 @@ using ImGuiNET;
 
 using static Dalamud.NativeFunctions;
 
-namespace Dalamud.Interface.Internal.ManagedAsserts
+namespace Dalamud.Interface.Internal.ManagedAsserts;
+
+/// <summary>
+/// Report ImGui problems with a MessageBox dialog.
+/// </summary>
+internal static class ImGuiManagedAsserts
 {
     /// <summary>
-    /// Report ImGui problems with a MessageBox dialog.
+    /// Gets or sets a value indicating whether asserts are enabled for ImGui.
     /// </summary>
-    internal static class ImGuiManagedAsserts
+    public static bool AssertsEnabled { get; set; }
+
+    /// <summary>
+    /// Create a snapshot of the current ImGui context.
+    /// Should be called before rendering an ImGui frame.
+    /// </summary>
+    /// <returns>A snapshot of the current context.</returns>
+    public static unsafe ImGuiContextSnapshot GetSnapshot()
     {
-        /// <summary>
-        /// Gets or sets a value indicating whether asserts are enabled for ImGui.
-        /// </summary>
-        public static bool AssertsEnabled { get; set; }
+        var contextPtr = ImGui.GetCurrentContext();
 
-        /// <summary>
-        /// Create a snapshot of the current ImGui context.
-        /// Should be called before rendering an ImGui frame.
-        /// </summary>
-        /// <returns>A snapshot of the current context.</returns>
-        public static unsafe ImGuiContextSnapshot GetSnapshot()
+        var styleVarStack = *((int*)contextPtr + ImGuiContextOffsets.StyleVarStackOffset);    // ImVector.Size
+        var colorStack = *((int*)contextPtr + ImGuiContextOffsets.ColorStackOffset);          // ImVector.Size
+        var fontStack = *((int*)contextPtr + ImGuiContextOffsets.FontStackOffset);            // ImVector.Size
+        var popupStack = *((int*)contextPtr + ImGuiContextOffsets.BeginPopupStackOffset);     // ImVector.Size
+        var windowStack = *((int*)contextPtr + ImGuiContextOffsets.CurrentWindowStackOffset); // ImVector.Size
+
+        return new ImGuiContextSnapshot
         {
-            var contextPtr = ImGui.GetCurrentContext();
+            StyleVarStackSize = styleVarStack,
+            ColorStackSize = colorStack,
+            FontStackSize = fontStack,
+            BeginPopupStackSize = popupStack,
+            WindowStackSize = windowStack,
+        };
+    }
 
-            var styleVarStack = *((int*)contextPtr + ImGuiContextOffsets.StyleVarStackOffset); // ImVector.Size
-            var colorStack = *((int*)contextPtr + ImGuiContextOffsets.ColorStackOffset); // ImVector.Size
-            var fontStack = *((int*)contextPtr + ImGuiContextOffsets.FontStackOffset); // ImVector.Size
-            var popupStack = *((int*)contextPtr + ImGuiContextOffsets.BeginPopupStackOffset); // ImVector.Size
-            var windowStack = *((int*)contextPtr + ImGuiContextOffsets.CurrentWindowStackOffset); // ImVector.Size
-
-            return new ImGuiContextSnapshot
-            {
-                StyleVarStackSize = styleVarStack,
-                ColorStackSize = colorStack,
-                FontStackSize = fontStack,
-                BeginPopupStackSize = popupStack,
-                WindowStackSize = windowStack,
-            };
-        }
-
-        /// <summary>
-        /// Compare a snapshot to the current post-draw state and report any errors in a MessageBox dialog.
-        /// </summary>
-        /// <param name="source">The source of any problems, something to blame.</param>
-        /// <param name="before">ImGui context snapshot.</param>
-        public static void ReportProblems(string source, ImGuiContextSnapshot before)
-        {
-            // TODO: Needs to be updated for ImGui 1.88
-            return;
+    /// <summary>
+    /// Compare a snapshot to the current post-draw state and report any errors in a MessageBox dialog.
+    /// </summary>
+    /// <param name="source">The source of any problems, something to blame.</param>
+    /// <param name="before">ImGui context snapshot.</param>
+    public static void ReportProblems(string source, ImGuiContextSnapshot before)
+    {
+        // TODO: Needs to be updated for ImGui 1.88
+        return;
 
 #pragma warning disable CS0162
-            if (!AssertsEnabled)
-            {
-                return;
-            }
-
-            var cSnap = GetSnapshot();
-
-            if (before.StyleVarStackSize != cSnap.StyleVarStackSize)
-            {
-                ShowAssert(source, $"You forgot to pop a style var!\n\nBefore: {before.StyleVarStackSize}, after: {cSnap.StyleVarStackSize}");
-                return;
-            }
-
-            if (before.ColorStackSize != cSnap.ColorStackSize)
-            {
-                ShowAssert(source, $"You forgot to pop a color!\n\nBefore: {before.ColorStackSize}, after: {cSnap.ColorStackSize}");
-                return;
-            }
-
-            if (before.FontStackSize != cSnap.FontStackSize)
-            {
-                ShowAssert(source, $"You forgot to pop a font!\n\nBefore: {before.FontStackSize}, after: {cSnap.FontStackSize}");
-                return;
-            }
-
-            if (before.BeginPopupStackSize != cSnap.BeginPopupStackSize)
-            {
-                ShowAssert(source, $"You forgot to end a popup!\n\nBefore: {before.BeginPopupStackSize}, after: {cSnap.BeginPopupStackSize}");
-                return;
-            }
-
-            if (cSnap.WindowStackSize != 1)
-            {
-                if (cSnap.WindowStackSize > 1)
-                {
-                    ShowAssert(source, $"Mismatched Begin/BeginChild vs End/EndChild calls: did you forget to call End/EndChild?\n\ncSnap.WindowStackSize = {cSnap.WindowStackSize}");
-                }
-                else
-                {
-                    ShowAssert(source, $"Mismatched Begin/BeginChild vs End/EndChild calls: did you call End/EndChild too much?\n\ncSnap.WindowStackSize = {cSnap.WindowStackSize}");
-                }
-            }
-#pragma warning restore CS0162
-        }
-
-        private static void ShowAssert(string source, string message)
+        if (!AssertsEnabled)
         {
-            var caption = $"You fucked up";
-            message = $"{message}\n\nSource: {source}\n\nAsserts are now disabled. You may re-enable them.";
-            var flags = MessageBoxType.Ok | MessageBoxType.IconError;
-
-            _ = MessageBoxW(Process.GetCurrentProcess().MainWindowHandle, message, caption, flags);
-            AssertsEnabled = false;
+            return;
         }
 
+        var cSnap = GetSnapshot();
+
+        if (before.StyleVarStackSize != cSnap.StyleVarStackSize)
+        {
+            ShowAssert(source, $"You forgot to pop a style var!\n\nBefore: {before.StyleVarStackSize}, after: {cSnap.StyleVarStackSize}");
+            return;
+        }
+
+        if (before.ColorStackSize != cSnap.ColorStackSize)
+        {
+            ShowAssert(source, $"You forgot to pop a color!\n\nBefore: {before.ColorStackSize}, after: {cSnap.ColorStackSize}");
+            return;
+        }
+
+        if (before.FontStackSize != cSnap.FontStackSize)
+        {
+            ShowAssert(source, $"You forgot to pop a font!\n\nBefore: {before.FontStackSize}, after: {cSnap.FontStackSize}");
+            return;
+        }
+
+        if (before.BeginPopupStackSize != cSnap.BeginPopupStackSize)
+        {
+            ShowAssert(source, $"You forgot to end a popup!\n\nBefore: {before.BeginPopupStackSize}, after: {cSnap.BeginPopupStackSize}");
+            return;
+        }
+
+        if (cSnap.WindowStackSize != 1)
+        {
+            if (cSnap.WindowStackSize > 1)
+            {
+                ShowAssert(source, $"Mismatched Begin/BeginChild vs End/EndChild calls: did you forget to call End/EndChild?\n\ncSnap.WindowStackSize = {cSnap.WindowStackSize}");
+            }
+            else
+            {
+                ShowAssert(source, $"Mismatched Begin/BeginChild vs End/EndChild calls: did you call End/EndChild too much?\n\ncSnap.WindowStackSize = {cSnap.WindowStackSize}");
+            }
+        }
+#pragma warning restore CS0162
+    }
+
+    private static void ShowAssert(string source, string message)
+    {
+        var caption = $"You fucked up";
+        message = $"{message}\n\nSource: {source}\n\nAsserts are now disabled. You may re-enable them.";
+        var flags = MessageBoxType.Ok | MessageBoxType.IconError;
+
+        _ = MessageBoxW(Process.GetCurrentProcess().MainWindowHandle, message, caption, flags);
+        AssertsEnabled = false;
+    }
+
+    /// <summary>
+    /// A snapshot of various ImGui context properties.
+    /// </summary>
+    public class ImGuiContextSnapshot
+    {
+        /// <summary>
+        /// Gets the ImGui style var stack size.
+        /// </summary>
+        public int StyleVarStackSize { get; init; }
+
         /// <summary>
-        /// A snapshot of various ImGui context properties.
+        /// Gets the ImGui color stack size.
         /// </summary>
-        public class ImGuiContextSnapshot
-        {
-            /// <summary>
-            /// Gets the ImGui style var stack size.
-            /// </summary>
-            public int StyleVarStackSize { get; init; }
+        public int ColorStackSize { get; init; }
 
-            /// <summary>
-            /// Gets the ImGui color stack size.
-            /// </summary>
-            public int ColorStackSize { get; init; }
+        /// <summary>
+        /// Gets the ImGui font stack size.
+        /// </summary>
+        public int FontStackSize { get; init; }
 
-            /// <summary>
-            /// Gets the ImGui font stack size.
-            /// </summary>
-            public int FontStackSize { get; init; }
+        /// <summary>
+        /// Gets the ImGui begin popup stack size.
+        /// </summary>
+        public int BeginPopupStackSize { get; init; }
 
-            /// <summary>
-            /// Gets the ImGui begin popup stack size.
-            /// </summary>
-            public int BeginPopupStackSize { get; init; }
-
-            /// <summary>
-            /// Gets the ImGui window stack size.
-            /// </summary>
-            public int WindowStackSize { get; init; }
-        }
+        /// <summary>
+        /// Gets the ImGui window stack size.
+        /// </summary>
+        public int WindowStackSize { get; init; }
     }
 }
diff --git a/Dalamud/Interface/Internal/Notifications/NotificationManager.cs b/Dalamud/Interface/Internal/Notifications/NotificationManager.cs
index f1318a7fe..e941db7a4 100644
--- a/Dalamud/Interface/Internal/Notifications/NotificationManager.cs
+++ b/Dalamud/Interface/Internal/Notifications/NotificationManager.cs
@@ -7,312 +7,311 @@ using Dalamud.Interface.Colors;
 using Dalamud.Utility;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Notifications
+namespace Dalamud.Interface.Internal.Notifications;
+
+/// <summary>
+/// Class handling notifications/toasts in ImGui.
+/// Ported from https://github.com/patrickcjk/imgui-notify.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class NotificationManager : IServiceType
 {
     /// <summary>
-    /// Class handling notifications/toasts in ImGui.
-    /// Ported from https://github.com/patrickcjk/imgui-notify.
+    /// Value indicating the bottom-left X padding.
     /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal class NotificationManager : IServiceType
+    internal const float NotifyPaddingX = 20.0f;
+
+    /// <summary>
+    /// Value indicating the bottom-left Y padding.
+    /// </summary>
+    internal const float NotifyPaddingY = 20.0f;
+
+    /// <summary>
+    /// Value indicating the Y padding between each message.
+    /// </summary>
+    internal const float NotifyPaddingMessageY = 10.0f;
+
+    /// <summary>
+    /// Value indicating the fade-in and out duration.
+    /// </summary>
+    internal const int NotifyFadeInOutTime = 500;
+
+    /// <summary>
+    /// Value indicating the default time until the notification is dismissed.
+    /// </summary>
+    internal const int NotifyDefaultDismiss = 3000;
+
+    /// <summary>
+    /// Value indicating the maximum opacity.
+    /// </summary>
+    internal const float NotifyOpacity = 0.82f;
+
+    /// <summary>
+    /// Value indicating default window flags for the notifications.
+    /// </summary>
+    internal const ImGuiWindowFlags NotifyToastFlags =
+        ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoInputs |
+        ImGuiWindowFlags.NoNav | ImGuiWindowFlags.NoBringToFrontOnFocus | ImGuiWindowFlags.NoFocusOnAppearing;
+
+    private readonly List<Notification> notifications = new();
+
+    [ServiceManager.ServiceConstructor]
+    private NotificationManager()
     {
-        /// <summary>
-        /// Value indicating the bottom-left X padding.
-        /// </summary>
-        internal const float NotifyPaddingX = 20.0f;
+    }
 
-        /// <summary>
-        /// Value indicating the bottom-left Y padding.
-        /// </summary>
-        internal const float NotifyPaddingY = 20.0f;
-
-        /// <summary>
-        /// Value indicating the Y padding between each message.
-        /// </summary>
-        internal const float NotifyPaddingMessageY = 10.0f;
-
-        /// <summary>
-        /// Value indicating the fade-in and out duration.
-        /// </summary>
-        internal const int NotifyFadeInOutTime = 500;
-
-        /// <summary>
-        /// Value indicating the default time until the notification is dismissed.
-        /// </summary>
-        internal const int NotifyDefaultDismiss = 3000;
-
-        /// <summary>
-        /// Value indicating the maximum opacity.
-        /// </summary>
-        internal const float NotifyOpacity = 0.82f;
-
-        /// <summary>
-        /// Value indicating default window flags for the notifications.
-        /// </summary>
-        internal const ImGuiWindowFlags NotifyToastFlags =
-            ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoInputs |
-            ImGuiWindowFlags.NoNav | ImGuiWindowFlags.NoBringToFrontOnFocus | ImGuiWindowFlags.NoFocusOnAppearing;
-
-        private readonly List<Notification> notifications = new();
-
-        [ServiceManager.ServiceConstructor]
-        private NotificationManager()
+    /// <summary>
+    /// Add a notification to the notification queue.
+    /// </summary>
+    /// <param name="content">The content of the notification.</param>
+    /// <param name="title">The title of the notification.</param>
+    /// <param name="type">The type of the notification.</param>
+    /// <param name="msDelay">The time the notification should be displayed for.</param>
+    public void AddNotification(string content, string? title = null, NotificationType type = NotificationType.None, uint msDelay = NotifyDefaultDismiss)
+    {
+        this.notifications.Add(new Notification
         {
-        }
+            Content = content,
+            Title = title,
+            NotificationType = type,
+            DurationMs = msDelay,
+        });
+    }
 
-        /// <summary>
-        /// Add a notification to the notification queue.
-        /// </summary>
-        /// <param name="content">The content of the notification.</param>
-        /// <param name="title">The title of the notification.</param>
-        /// <param name="type">The type of the notification.</param>
-        /// <param name="msDelay">The time the notification should be displayed for.</param>
-        public void AddNotification(string content, string? title = null, NotificationType type = NotificationType.None, uint msDelay = NotifyDefaultDismiss)
+    /// <summary>
+    /// Draw all currently queued notifications.
+    /// </summary>
+    public void Draw()
+    {
+        var viewportSize = ImGuiHelpers.MainViewport.Size;
+        var height = 0f;
+
+        for (var i = 0; i < this.notifications.Count; i++)
         {
-            this.notifications.Add(new Notification
+            var tn = this.notifications.ElementAt(i);
+
+            if (tn.GetPhase() == Notification.Phase.Expired)
             {
-                Content = content,
-                Title = title,
-                NotificationType = type,
-                DurationMs = msDelay,
-            });
-        }
+                this.notifications.RemoveAt(i);
+                continue;
+            }
 
-        /// <summary>
-        /// Draw all currently queued notifications.
-        /// </summary>
-        public void Draw()
-        {
-            var viewportSize = ImGuiHelpers.MainViewport.Size;
-            var height = 0f;
+            var opacity = tn.GetFadePercent();
 
-            for (var i = 0; i < this.notifications.Count; i++)
+            var iconColor = tn.Color;
+            iconColor.W = opacity;
+
+            var windowName = $"##NOTIFY{i}";
+
+            ImGuiHelpers.ForceNextWindowMainViewport();
+            ImGui.SetNextWindowBgAlpha(opacity);
+            ImGui.SetNextWindowPos(new Vector2(viewportSize.X - NotifyPaddingX, viewportSize.Y - NotifyPaddingY - height), ImGuiCond.Always, Vector2.One);
+            ImGui.Begin(windowName, NotifyToastFlags);
+
+            ImGui.PushTextWrapPos(viewportSize.X / 3.0f);
+
+            var wasTitleRendered = false;
+
+            if (!tn.Icon.IsNullOrEmpty())
             {
-                var tn = this.notifications.ElementAt(i);
+                wasTitleRendered = true;
+                ImGui.PushFont(InterfaceManager.IconFont);
+                ImGui.TextColored(iconColor, tn.Icon);
+                ImGui.PopFont();
+            }
 
-                if (tn.GetPhase() == Notification.Phase.Expired)
-                {
-                    this.notifications.RemoveAt(i);
-                    continue;
-                }
+            var textColor = ImGuiColors.DalamudWhite;
+            textColor.W = opacity;
 
-                var opacity = tn.GetFadePercent();
-
-                var iconColor = tn.Color;
-                iconColor.W = opacity;
-
-                var windowName = $"##NOTIFY{i}";
-
-                ImGuiHelpers.ForceNextWindowMainViewport();
-                ImGui.SetNextWindowBgAlpha(opacity);
-                ImGui.SetNextWindowPos(new Vector2(viewportSize.X - NotifyPaddingX, viewportSize.Y - NotifyPaddingY - height), ImGuiCond.Always, Vector2.One);
-                ImGui.Begin(windowName, NotifyToastFlags);
-
-                ImGui.PushTextWrapPos(viewportSize.X / 3.0f);
-
-                var wasTitleRendered = false;
+            ImGui.PushStyleColor(ImGuiCol.Text, textColor);
 
+            if (!tn.Title.IsNullOrEmpty())
+            {
                 if (!tn.Icon.IsNullOrEmpty())
                 {
-                    wasTitleRendered = true;
-                    ImGui.PushFont(InterfaceManager.IconFont);
-                    ImGui.TextColored(iconColor, tn.Icon);
-                    ImGui.PopFont();
+                    ImGui.SameLine();
                 }
 
-                var textColor = ImGuiColors.DalamudWhite;
-                textColor.W = opacity;
-
-                ImGui.PushStyleColor(ImGuiCol.Text, textColor);
-
-                if (!tn.Title.IsNullOrEmpty())
-                {
-                    if (!tn.Icon.IsNullOrEmpty())
-                    {
-                        ImGui.SameLine();
-                    }
-
-                    ImGui.TextUnformatted(tn.Title);
-                    wasTitleRendered = true;
-                }
-                else if (!tn.DefaultTitle.IsNullOrEmpty())
-                {
-                    if (!tn.Icon.IsNullOrEmpty())
-                    {
-                        ImGui.SameLine();
-                    }
-
-                    ImGui.TextUnformatted(tn.DefaultTitle);
-                    wasTitleRendered = true;
-                }
-
-                if (wasTitleRendered && !tn.Content.IsNullOrEmpty())
-                {
-                    ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 5.0f);
-                }
-
-                if (!tn.Content.IsNullOrEmpty())
-                {
-                    if (wasTitleRendered)
-                    {
-                        ImGui.Separator();
-                    }
-
-                    ImGui.TextUnformatted(tn.Content);
-                }
-
-                ImGui.PopStyleColor();
-
-                ImGui.PopTextWrapPos();
-
-                height += ImGui.GetWindowHeight() + NotifyPaddingMessageY;
-
-                ImGui.End();
+                ImGui.TextUnformatted(tn.Title);
+                wasTitleRendered = true;
             }
+            else if (!tn.DefaultTitle.IsNullOrEmpty())
+            {
+                if (!tn.Icon.IsNullOrEmpty())
+                {
+                    ImGui.SameLine();
+                }
+
+                ImGui.TextUnformatted(tn.DefaultTitle);
+                wasTitleRendered = true;
+            }
+
+            if (wasTitleRendered && !tn.Content.IsNullOrEmpty())
+            {
+                ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 5.0f);
+            }
+
+            if (!tn.Content.IsNullOrEmpty())
+            {
+                if (wasTitleRendered)
+                {
+                    ImGui.Separator();
+                }
+
+                ImGui.TextUnformatted(tn.Content);
+            }
+
+            ImGui.PopStyleColor();
+
+            ImGui.PopTextWrapPos();
+
+            height += ImGui.GetWindowHeight() + NotifyPaddingMessageY;
+
+            ImGui.End();
+        }
+    }
+
+    /// <summary>
+    /// Container class for notifications.
+    /// </summary>
+    internal class Notification
+    {
+        /// <summary>
+        /// Possible notification phases.
+        /// </summary>
+        internal enum Phase
+        {
+            /// <summary>
+            /// Phase indicating fade-in.
+            /// </summary>
+            FadeIn,
+
+            /// <summary>
+            /// Phase indicating waiting until fade-out.
+            /// </summary>
+            Wait,
+
+            /// <summary>
+            /// Phase indicating fade-out.
+            /// </summary>
+            FadeOut,
+
+            /// <summary>
+            /// Phase indicating that the notification has expired.
+            /// </summary>
+            Expired,
         }
 
         /// <summary>
-        /// Container class for notifications.
+        /// Gets the type of the notification.
         /// </summary>
-        internal class Notification
+        internal NotificationType NotificationType { get; init; }
+
+        /// <summary>
+        /// Gets the title of the notification.
+        /// </summary>
+        internal string? Title { get; init; }
+
+        /// <summary>
+        /// Gets the content of the notification.
+        /// </summary>
+        internal string Content { get; init; }
+
+        /// <summary>
+        /// Gets the duration of the notification in milliseconds.
+        /// </summary>
+        internal uint DurationMs { get; init; }
+
+        /// <summary>
+        /// Gets the creation time of the notification.
+        /// </summary>
+        internal DateTime CreationTime { get; init; } = DateTime.Now;
+
+        /// <summary>
+        /// Gets the default color of the notification.
+        /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <see cref="NotificationType"/> is set to an out-of-range value.</exception>
+        internal Vector4 Color => this.NotificationType switch
         {
-            /// <summary>
-            /// Possible notification phases.
-            /// </summary>
-            internal enum Phase
+            NotificationType.None => ImGuiColors.DalamudWhite,
+            NotificationType.Success => ImGuiColors.HealerGreen,
+            NotificationType.Warning => ImGuiColors.DalamudOrange,
+            NotificationType.Error => ImGuiColors.DalamudRed,
+            NotificationType.Info => ImGuiColors.TankBlue,
+            _ => throw new ArgumentOutOfRangeException(),
+        };
+
+        /// <summary>
+        /// Gets the icon of the notification.
+        /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <see cref="NotificationType"/> is set to an out-of-range value.</exception>
+        internal string? Icon => this.NotificationType switch
+        {
+            NotificationType.None => null,
+            NotificationType.Success => FontAwesomeIcon.CheckCircle.ToIconString(),
+            NotificationType.Warning => FontAwesomeIcon.ExclamationCircle.ToIconString(),
+            NotificationType.Error => FontAwesomeIcon.TimesCircle.ToIconString(),
+            NotificationType.Info => FontAwesomeIcon.InfoCircle.ToIconString(),
+            _ => throw new ArgumentOutOfRangeException(),
+        };
+
+        /// <summary>
+        /// Gets the default title of the notification.
+        /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <see cref="NotificationType"/> is set to an out-of-range value.</exception>
+        internal string? DefaultTitle => this.NotificationType switch
+        {
+            NotificationType.None => null,
+            NotificationType.Success => NotificationType.Success.ToString(),
+            NotificationType.Warning => NotificationType.Warning.ToString(),
+            NotificationType.Error => NotificationType.Error.ToString(),
+            NotificationType.Info => NotificationType.Info.ToString(),
+            _ => throw new ArgumentOutOfRangeException(),
+        };
+
+        /// <summary>
+        /// Gets the elapsed time since creating the notification.
+        /// </summary>
+        internal TimeSpan ElapsedTime => DateTime.Now - this.CreationTime;
+
+        /// <summary>
+        /// Gets the phase of the notification.
+        /// </summary>
+        /// <returns>The phase of the notification.</returns>
+        internal Phase GetPhase()
+        {
+            var elapsed = (int)this.ElapsedTime.TotalMilliseconds;
+
+            if (elapsed > NotifyFadeInOutTime + this.DurationMs + NotifyFadeInOutTime)
+                return Phase.Expired;
+            else if (elapsed > NotifyFadeInOutTime + this.DurationMs)
+                return Phase.FadeOut;
+            else if (elapsed > NotifyFadeInOutTime)
+                return Phase.Wait;
+            else
+                return Phase.FadeIn;
+        }
+
+        /// <summary>
+        /// Gets the opacity of the notification.
+        /// </summary>
+        /// <returns>The opacity, in a range from 0 to 1.</returns>
+        internal float GetFadePercent()
+        {
+            var phase = this.GetPhase();
+            var elapsed = this.ElapsedTime.TotalMilliseconds;
+
+            if (phase == Phase.FadeIn)
             {
-                /// <summary>
-                /// Phase indicating fade-in.
-                /// </summary>
-                FadeIn,
-
-                /// <summary>
-                /// Phase indicating waiting until fade-out.
-                /// </summary>
-                Wait,
-
-                /// <summary>
-                /// Phase indicating fade-out.
-                /// </summary>
-                FadeOut,
-
-                /// <summary>
-                /// Phase indicating that the notification has expired.
-                /// </summary>
-                Expired,
+                return (float)elapsed / NotifyFadeInOutTime * NotifyOpacity;
+            }
+            else if (phase == Phase.FadeOut)
+            {
+                return (1.0f - (((float)elapsed - NotifyFadeInOutTime - this.DurationMs) /
+                                NotifyFadeInOutTime)) * NotifyOpacity;
             }
 
-            /// <summary>
-            /// Gets the type of the notification.
-            /// </summary>
-            internal NotificationType NotificationType { get; init; }
-
-            /// <summary>
-            /// Gets the title of the notification.
-            /// </summary>
-            internal string? Title { get; init; }
-
-            /// <summary>
-            /// Gets the content of the notification.
-            /// </summary>
-            internal string Content { get; init; }
-
-            /// <summary>
-            /// Gets the duration of the notification in milliseconds.
-            /// </summary>
-            internal uint DurationMs { get; init; }
-
-            /// <summary>
-            /// Gets the creation time of the notification.
-            /// </summary>
-            internal DateTime CreationTime { get; init; } = DateTime.Now;
-
-            /// <summary>
-            /// Gets the default color of the notification.
-            /// </summary>
-            /// <exception cref="ArgumentOutOfRangeException">Thrown when <see cref="NotificationType"/> is set to an out-of-range value.</exception>
-            internal Vector4 Color => this.NotificationType switch
-            {
-                NotificationType.None => ImGuiColors.DalamudWhite,
-                NotificationType.Success => ImGuiColors.HealerGreen,
-                NotificationType.Warning => ImGuiColors.DalamudOrange,
-                NotificationType.Error => ImGuiColors.DalamudRed,
-                NotificationType.Info => ImGuiColors.TankBlue,
-                _ => throw new ArgumentOutOfRangeException(),
-            };
-
-            /// <summary>
-            /// Gets the icon of the notification.
-            /// </summary>
-            /// <exception cref="ArgumentOutOfRangeException">Thrown when <see cref="NotificationType"/> is set to an out-of-range value.</exception>
-            internal string? Icon => this.NotificationType switch
-            {
-                NotificationType.None => null,
-                NotificationType.Success => FontAwesomeIcon.CheckCircle.ToIconString(),
-                NotificationType.Warning => FontAwesomeIcon.ExclamationCircle.ToIconString(),
-                NotificationType.Error => FontAwesomeIcon.TimesCircle.ToIconString(),
-                NotificationType.Info => FontAwesomeIcon.InfoCircle.ToIconString(),
-                _ => throw new ArgumentOutOfRangeException(),
-            };
-
-            /// <summary>
-            /// Gets the default title of the notification.
-            /// </summary>
-            /// <exception cref="ArgumentOutOfRangeException">Thrown when <see cref="NotificationType"/> is set to an out-of-range value.</exception>
-            internal string? DefaultTitle => this.NotificationType switch
-            {
-                NotificationType.None => null,
-                NotificationType.Success => NotificationType.Success.ToString(),
-                NotificationType.Warning => NotificationType.Warning.ToString(),
-                NotificationType.Error => NotificationType.Error.ToString(),
-                NotificationType.Info => NotificationType.Info.ToString(),
-                _ => throw new ArgumentOutOfRangeException(),
-            };
-
-            /// <summary>
-            /// Gets the elapsed time since creating the notification.
-            /// </summary>
-            internal TimeSpan ElapsedTime => DateTime.Now - this.CreationTime;
-
-            /// <summary>
-            /// Gets the phase of the notification.
-            /// </summary>
-            /// <returns>The phase of the notification.</returns>
-            internal Phase GetPhase()
-            {
-                var elapsed = (int)this.ElapsedTime.TotalMilliseconds;
-
-                if (elapsed > NotifyFadeInOutTime + this.DurationMs + NotifyFadeInOutTime)
-                    return Phase.Expired;
-                else if (elapsed > NotifyFadeInOutTime + this.DurationMs)
-                    return Phase.FadeOut;
-                else if (elapsed > NotifyFadeInOutTime)
-                    return Phase.Wait;
-                else
-                    return Phase.FadeIn;
-            }
-
-            /// <summary>
-            /// Gets the opacity of the notification.
-            /// </summary>
-            /// <returns>The opacity, in a range from 0 to 1.</returns>
-            internal float GetFadePercent()
-            {
-                var phase = this.GetPhase();
-                var elapsed = this.ElapsedTime.TotalMilliseconds;
-
-                if (phase == Phase.FadeIn)
-                {
-                    return (float)elapsed / NotifyFadeInOutTime * NotifyOpacity;
-                }
-                else if (phase == Phase.FadeOut)
-                {
-                    return (1.0f - (((float)elapsed - NotifyFadeInOutTime - this.DurationMs) /
-                                    NotifyFadeInOutTime)) * NotifyOpacity;
-                }
-
-                return 1.0f * NotifyOpacity;
-            }
+            return 1.0f * NotifyOpacity;
         }
     }
 }
diff --git a/Dalamud/Interface/Internal/Notifications/NotificationType.cs b/Dalamud/Interface/Internal/Notifications/NotificationType.cs
index d2cb56686..1885ec809 100644
--- a/Dalamud/Interface/Internal/Notifications/NotificationType.cs
+++ b/Dalamud/Interface/Internal/Notifications/NotificationType.cs
@@ -1,33 +1,32 @@
-namespace Dalamud.Interface.Internal.Notifications
+namespace Dalamud.Interface.Internal.Notifications;
+
+/// <summary>
+/// Possible notification types.
+/// </summary>
+public enum NotificationType
 {
     /// <summary>
-    /// Possible notification types.
+    /// No special type.
     /// </summary>
-    public enum NotificationType
-    {
-        /// <summary>
-        /// No special type.
-        /// </summary>
-        None,
+    None,
 
-        /// <summary>
-        /// Type indicating success.
-        /// </summary>
-        Success,
+    /// <summary>
+    /// Type indicating success.
+    /// </summary>
+    Success,
 
-        /// <summary>
-        /// Type indicating a warning.
-        /// </summary>
-        Warning,
+    /// <summary>
+    /// Type indicating a warning.
+    /// </summary>
+    Warning,
 
-        /// <summary>
-        /// Type indicating an error.
-        /// </summary>
-        Error,
+    /// <summary>
+    /// Type indicating an error.
+    /// </summary>
+    Error,
 
-        /// <summary>
-        /// Type indicating generic information.
-        /// </summary>
-        Info,
-    }
+    /// <summary>
+    /// Type indicating generic information.
+    /// </summary>
+    Info,
 }
diff --git a/Dalamud/Interface/Internal/PluginCategoryManager.cs b/Dalamud/Interface/Internal/PluginCategoryManager.cs
index cb7849c27..208e898f7 100644
--- a/Dalamud/Interface/Internal/PluginCategoryManager.cs
+++ b/Dalamud/Interface/Internal/PluginCategoryManager.cs
@@ -5,416 +5,415 @@ using System.Linq;
 using CheapLoc;
 using Dalamud.Plugin.Internal.Types;
 
-namespace Dalamud.Interface.Internal
+namespace Dalamud.Interface.Internal;
+
+/// <summary>
+/// Manage category filters for PluginInstallerWindow.
+/// </summary>
+internal class PluginCategoryManager
 {
     /// <summary>
-    /// Manage category filters for PluginInstallerWindow.
+    /// First categoryId for tag based categories.
     /// </summary>
-    internal class PluginCategoryManager
+    public const int FirstTagBasedCategoryId = 100;
+
+    private readonly CategoryInfo[] categoryList =
+    {
+        new(0, "special.all", () => Locs.Category_All),
+        new(10, "special.devInstalled", () => Locs.Category_DevInstalled),
+        new(11, "special.devIconTester", () => Locs.Category_IconTester),
+        new(12, "special.dalamud", () => Locs.Category_Dalamud),
+        new(13, "special.plugins", () => Locs.Category_Plugins),
+        new(FirstTagBasedCategoryId + 0, "other", () => Locs.Category_Other),
+        new(FirstTagBasedCategoryId + 1, "jobs", () => Locs.Category_Jobs),
+        new(FirstTagBasedCategoryId + 2, "ui", () => Locs.Category_UI),
+        new(FirstTagBasedCategoryId + 3, "minigames", () => Locs.Category_MiniGames),
+        new(FirstTagBasedCategoryId + 4, "inventory", () => Locs.Category_Inventory),
+        new(FirstTagBasedCategoryId + 5, "sound", () => Locs.Category_Sound),
+        new(FirstTagBasedCategoryId + 6, "social", () => Locs.Category_Social),
+        new(FirstTagBasedCategoryId + 7, "utility", () => Locs.Category_Utility),
+
+        // order doesn't matter, all tag driven categories should have Id >= FirstTagBasedCategoryId
+    };
+
+    private GroupInfo[] groupList =
+    {
+        new(GroupKind.DevTools, () => Locs.Group_DevTools, 10, 11),
+        new(GroupKind.Installed, () => Locs.Group_Installed, 0),
+        new(GroupKind.Available, () => Locs.Group_Available, 0),
+        new(GroupKind.Changelog, () => Locs.Group_Changelog, 0, 12, 13),
+
+        // order important, used for drawing, keep in sync with defaults for currentGroupIdx
+    };
+
+    private int currentGroupIdx = 2;
+    private int currentCategoryIdx = 0;
+    private bool isContentDirty;
+
+    private Dictionary<PluginManifest, int[]> mapPluginCategories = new();
+    private List<int> highlightedCategoryIds = new();
+
+    /// <summary>
+    /// Type of category group.
+    /// </summary>
+    public enum GroupKind
     {
         /// <summary>
-        /// First categoryId for tag based categories.
+        /// UI group: dev mode only.
         /// </summary>
-        public const int FirstTagBasedCategoryId = 100;
+        DevTools,
 
-        private readonly CategoryInfo[] categoryList =
+        /// <summary>
+        /// UI group: installed plugins.
+        /// </summary>
+        Installed,
+
+        /// <summary>
+        /// UI group: plugins that can be installed.
+        /// </summary>
+        Available,
+
+        /// <summary>
+        /// UI group: changelog of plugins.
+        /// </summary>
+        Changelog,
+    }
+
+    /// <summary>
+    /// Gets the list of all known categories.
+    /// </summary>
+    public CategoryInfo[] CategoryList => this.categoryList;
+
+    /// <summary>
+    /// Gets the list of all known UI groups.
+    /// </summary>
+    public GroupInfo[] GroupList => this.groupList;
+
+    /// <summary>
+    /// Gets or sets current group.
+    /// </summary>
+    public int CurrentGroupIdx
+    {
+        get => this.currentGroupIdx;
+        set
         {
-            new(0, "special.all", () => Locs.Category_All),
-            new(10, "special.devInstalled", () => Locs.Category_DevInstalled),
-            new(11, "special.devIconTester", () => Locs.Category_IconTester),
-            new(12, "special.dalamud", () => Locs.Category_Dalamud),
-            new(13, "special.plugins", () => Locs.Category_Plugins),
-            new(FirstTagBasedCategoryId + 0, "other", () => Locs.Category_Other),
-            new(FirstTagBasedCategoryId + 1, "jobs", () => Locs.Category_Jobs),
-            new(FirstTagBasedCategoryId + 2, "ui", () => Locs.Category_UI),
-            new(FirstTagBasedCategoryId + 3, "minigames", () => Locs.Category_MiniGames),
-            new(FirstTagBasedCategoryId + 4, "inventory", () => Locs.Category_Inventory),
-            new(FirstTagBasedCategoryId + 5, "sound", () => Locs.Category_Sound),
-            new(FirstTagBasedCategoryId + 6, "social", () => Locs.Category_Social),
-            new(FirstTagBasedCategoryId + 7, "utility", () => Locs.Category_Utility),
-
-            // order doesn't matter, all tag driven categories should have Id >= FirstTagBasedCategoryId
-        };
-
-        private GroupInfo[] groupList =
-        {
-            new(GroupKind.DevTools, () => Locs.Group_DevTools, 10, 11),
-            new(GroupKind.Installed, () => Locs.Group_Installed, 0),
-            new(GroupKind.Available, () => Locs.Group_Available, 0),
-            new(GroupKind.Changelog, () => Locs.Group_Changelog, 0, 12, 13),
-
-            // order important, used for drawing, keep in sync with defaults for currentGroupIdx
-        };
-
-        private int currentGroupIdx = 2;
-        private int currentCategoryIdx = 0;
-        private bool isContentDirty;
-
-        private Dictionary<PluginManifest, int[]> mapPluginCategories = new();
-        private List<int> highlightedCategoryIds = new();
-
-        /// <summary>
-        /// Type of category group.
-        /// </summary>
-        public enum GroupKind
-        {
-            /// <summary>
-            /// UI group: dev mode only.
-            /// </summary>
-            DevTools,
-
-            /// <summary>
-            /// UI group: installed plugins.
-            /// </summary>
-            Installed,
-
-            /// <summary>
-            /// UI group: plugins that can be installed.
-            /// </summary>
-            Available,
-
-            /// <summary>
-            /// UI group: changelog of plugins.
-            /// </summary>
-            Changelog,
-        }
-
-        /// <summary>
-        /// Gets the list of all known categories.
-        /// </summary>
-        public CategoryInfo[] CategoryList => this.categoryList;
-
-        /// <summary>
-        /// Gets the list of all known UI groups.
-        /// </summary>
-        public GroupInfo[] GroupList => this.groupList;
-
-        /// <summary>
-        /// Gets or sets current group.
-        /// </summary>
-        public int CurrentGroupIdx
-        {
-            get => this.currentGroupIdx;
-            set
-            {
-                if (this.currentGroupIdx != value)
-                {
-                    this.currentGroupIdx = value;
-                    this.currentCategoryIdx = 0;
-                    this.isContentDirty = true;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets current category, index in current Group.Categories array.
-        /// </summary>
-        public int CurrentCategoryIdx
-        {
-            get => this.currentCategoryIdx;
-            set
-            {
-                if (this.currentCategoryIdx != value)
-                {
-                    this.currentCategoryIdx = value;
-                    this.isContentDirty = true;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether current group + category selection changed recently.
-        /// Changes in Available group should be followed with <see cref="GetCurrentCategoryContent"/>, everythine else can use <see cref="ResetContentDirty"/>.
-        /// </summary>
-        public bool IsContentDirty => this.isContentDirty;
-
-        /// <summary>
-        /// Gets a value indicating whether <see cref="CurrentCategoryIdx"/> and <see cref="CurrentGroupIdx"/> are valid.
-        /// </summary>
-        public bool IsSelectionValid =>
-            (this.currentGroupIdx >= 0) &&
-            (this.currentGroupIdx < this.groupList.Length) &&
-            (this.currentCategoryIdx >= 0) &&
-            (this.currentCategoryIdx < this.groupList[this.currentGroupIdx].Categories.Count);
-
-        /// <summary>
-        /// Rebuild available categories based on currently available plugins.
-        /// </summary>
-        /// <param name="availablePlugins">list of all available plugin manifests to install.</param>
-        public void BuildCategories(IEnumerable<PluginManifest> availablePlugins)
-        {
-            // rebuild map plugin name -> categoryIds
-            this.mapPluginCategories.Clear();
-
-            var groupAvail = Array.Find(this.groupList, x => x.GroupKind == GroupKind.Available);
-            var prevCategoryIds = new List<int>();
-            prevCategoryIds.AddRange(groupAvail.Categories);
-
-            var categoryList = new List<int>();
-            var allCategoryIndices = new List<int>();
-
-            foreach (var plugin in availablePlugins)
-            {
-                categoryList.Clear();
-
-                var pluginCategoryTags = this.GetCategoryTagsForManifest(plugin);
-                if (pluginCategoryTags != null)
-                {
-                    foreach (var tag in pluginCategoryTags)
-                    {
-                        // only tags from whitelist can be accepted
-                        var matchIdx = Array.FindIndex(this.CategoryList, x => x.Tag.Equals(tag, StringComparison.InvariantCultureIgnoreCase));
-                        if (matchIdx >= 0)
-                        {
-                            var categoryId = this.CategoryList[matchIdx].CategoryId;
-                            if (categoryId >= FirstTagBasedCategoryId)
-                            {
-                                categoryList.Add(categoryId);
-
-                                if (!allCategoryIndices.Contains(matchIdx))
-                                {
-                                    allCategoryIndices.Add(matchIdx);
-                                }
-                            }
-                        }
-                    }
-                }
-
-                // always add, even if empty
-                this.mapPluginCategories.Add(plugin, categoryList.ToArray());
-            }
-
-            // sort all categories by their loc name
-            allCategoryIndices.Sort((idxX, idxY) => this.CategoryList[idxX].Name.CompareTo(this.CategoryList[idxY].Name));
-
-            // rebuild all categories in group, leaving first entry = All intact and always on top
-            if (groupAvail.Categories.Count > 1)
-            {
-                groupAvail.Categories.RemoveRange(1, groupAvail.Categories.Count - 1);
-            }
-
-            foreach (var categoryIdx in allCategoryIndices)
-            {
-                groupAvail.Categories.Add(this.CategoryList[categoryIdx].CategoryId);
-            }
-
-            // compare with prev state and mark as dirty if needed
-            var noCategoryChanges = Enumerable.SequenceEqual(prevCategoryIds, groupAvail.Categories);
-            if (!noCategoryChanges)
+            if (this.currentGroupIdx != value)
             {
+                this.currentGroupIdx = value;
+                this.currentCategoryIdx = 0;
                 this.isContentDirty = true;
             }
         }
+    }
 
-        /// <summary>
-        /// Filters list of available plugins based on currently selected category.
-        /// Resets <see cref="IsContentDirty"/>.
-        /// </summary>
-        /// <param name="plugins">List of available plugins to install.</param>
-        /// <returns>Filtered list of plugins.</returns>
-        public List<PluginManifest> GetCurrentCategoryContent(IEnumerable<PluginManifest> plugins)
+    /// <summary>
+    /// Gets or sets current category, index in current Group.Categories array.
+    /// </summary>
+    public int CurrentCategoryIdx
+    {
+        get => this.currentCategoryIdx;
+        set
         {
-            var result = new List<PluginManifest>();
-
-            if (this.IsSelectionValid)
+            if (this.currentCategoryIdx != value)
             {
-                var groupInfo = this.groupList[this.currentGroupIdx];
-
-                var includeAll = (this.currentCategoryIdx == 0) || (groupInfo.GroupKind != GroupKind.Available);
-                if (includeAll)
-                {
-                    result.AddRange(plugins);
-                }
-                else
-                {
-                    var selectedCategoryInfo = Array.Find(this.categoryList, x => x.CategoryId == groupInfo.Categories[this.currentCategoryIdx]);
-
-                    foreach (var plugin in plugins)
-                    {
-                        if (this.mapPluginCategories.TryGetValue(plugin, out var pluginCategoryIds))
-                        {
-                            var matchIdx = Array.IndexOf(pluginCategoryIds, selectedCategoryInfo.CategoryId);
-                            if (matchIdx >= 0)
-                            {
-                                result.Add(plugin);
-                            }
-                        }
-                    }
-                }
+                this.currentCategoryIdx = value;
+                this.isContentDirty = true;
             }
-
-            this.ResetContentDirty();
-            return result;
-        }
-
-        /// <summary>
-        /// Clears <see cref="IsContentDirty"/> flag, indicating that all cached values about currently selected group + category have been updated.
-        /// </summary>
-        public void ResetContentDirty()
-        {
-            this.isContentDirty = false;
-        }
-
-        /// <summary>
-        /// Sets category highlight based on list of plugins. Used for searching.
-        /// </summary>
-        /// <param name="plugins">List of plugins whose categories should be highlighted.</param>
-        public void SetCategoryHighlightsForPlugins(IEnumerable<PluginManifest> plugins)
-        {
-            this.highlightedCategoryIds.Clear();
-
-            if (plugins != null)
-            {
-                foreach (var entry in plugins)
-                {
-                    if (this.mapPluginCategories.TryGetValue(entry, out var pluginCategories))
-                    {
-                        foreach (var categoryId in pluginCategories)
-                        {
-                            if (!this.highlightedCategoryIds.Contains(categoryId))
-                            {
-                                this.highlightedCategoryIds.Add(categoryId);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Checks if category should be highlighted.
-        /// </summary>
-        /// <param name="categoryId">CategoryId to check.</param>
-        /// <returns>true if highlight is needed.</returns>
-        public bool IsCategoryHighlighted(int categoryId) => this.highlightedCategoryIds.Contains(categoryId);
-
-        private IEnumerable<string> GetCategoryTagsForManifest(PluginManifest pluginManifest)
-        {
-            if (pluginManifest.CategoryTags != null)
-            {
-                return pluginManifest.CategoryTags;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Plugin installer category info.
-        /// </summary>
-        public struct CategoryInfo
-        {
-            /// <summary>
-            /// Unique Id number of category, tag match based should be greater of equal <see cref="FirstTagBasedCategoryId"/>.
-            /// </summary>
-            public int CategoryId;
-
-            /// <summary>
-            /// Tag from plugin manifest to match.
-            /// </summary>
-            public string Tag;
-
-            private Func<string> nameFunc;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="CategoryInfo"/> struct.
-            /// </summary>
-            /// <param name="categoryId">Unique id of category.</param>
-            /// <param name="tag">Tag to match.</param>
-            /// <param name="nameFunc">Function returning localized name of category.</param>
-            public CategoryInfo(int categoryId, string tag, Func<string> nameFunc)
-            {
-                this.CategoryId = categoryId;
-                this.Tag = tag;
-                this.nameFunc = nameFunc;
-            }
-
-            /// <summary>
-            /// Gets the name of category.
-            /// </summary>
-            public string Name => this.nameFunc();
-        }
-
-        /// <summary>
-        /// Plugin installer UI group, a container for categories.
-        /// </summary>
-        public struct GroupInfo
-        {
-            /// <summary>
-            /// Type of group.
-            /// </summary>
-            public GroupKind GroupKind;
-
-            /// <summary>
-            /// List of categories in container.
-            /// </summary>
-            public List<int> Categories;
-
-            private Func<string> nameFunc;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="GroupInfo"/> struct.
-            /// </summary>
-            /// <param name="groupKind">Type of group.</param>
-            /// <param name="nameFunc">Function returning localized name of category.</param>
-            /// <param name="categories">List of category Ids to hardcode.</param>
-            public GroupInfo(GroupKind groupKind, Func<string> nameFunc, params int[] categories)
-            {
-                this.GroupKind = groupKind;
-                this.nameFunc = nameFunc;
-
-                this.Categories = new();
-                this.Categories.AddRange(categories);
-            }
-
-            /// <summary>
-            /// Gets the name of UI group.
-            /// </summary>
-            public string Name => this.nameFunc();
-        }
-
-        private static class Locs
-        {
-            #region UI groups
-
-            public static string Group_DevTools => Loc.Localize("InstallerDevTools", "Dev Tools");
-
-            public static string Group_Installed => Loc.Localize("InstallerInstalledPlugins", "Installed Plugins");
-
-            public static string Group_Available => Loc.Localize("InstallerAllPlugins", "All Plugins");
-
-            public static string Group_Changelog => Loc.Localize("InstallerChangelog", "Changelog");
-
-            #endregion
-
-            #region Categories
-
-            public static string Category_All => Loc.Localize("InstallerCategoryAll", "All");
-
-            public static string Category_DevInstalled => Loc.Localize("InstallerInstalledDevPlugins", "Installed Dev Plugins");
-
-            public static string Category_IconTester => "Image/Icon Tester";
-
-            public static string Category_Other => Loc.Localize("InstallerCategoryOther", "Other");
-
-            public static string Category_Jobs => Loc.Localize("InstallerCategoryJobs", "Jobs");
-
-            public static string Category_UI => Loc.Localize("InstallerCategoryUI", "UI");
-
-            public static string Category_MiniGames => Loc.Localize("InstallerCategoryMiniGames", "Mini games");
-
-            public static string Category_Inventory => Loc.Localize("InstallerCategoryInventory", "Inventory");
-
-            public static string Category_Sound => Loc.Localize("InstallerCategorySound", "Sound");
-
-            public static string Category_Social => Loc.Localize("InstallerCategorySocial", "Social");
-
-            public static string Category_Utility => Loc.Localize("InstallerCategoryUtility", "Utility");
-
-            public static string Category_Plugins => Loc.Localize("InstallerCategoryPlugins", "Plugins");
-
-            public static string Category_Dalamud => Loc.Localize("InstallerCategoryDalamud", "Dalamud");
-
-            #endregion
         }
     }
+
+    /// <summary>
+    /// Gets a value indicating whether current group + category selection changed recently.
+    /// Changes in Available group should be followed with <see cref="GetCurrentCategoryContent"/>, everythine else can use <see cref="ResetContentDirty"/>.
+    /// </summary>
+    public bool IsContentDirty => this.isContentDirty;
+
+    /// <summary>
+    /// Gets a value indicating whether <see cref="CurrentCategoryIdx"/> and <see cref="CurrentGroupIdx"/> are valid.
+    /// </summary>
+    public bool IsSelectionValid =>
+        (this.currentGroupIdx >= 0) &&
+        (this.currentGroupIdx < this.groupList.Length) &&
+        (this.currentCategoryIdx >= 0) &&
+        (this.currentCategoryIdx < this.groupList[this.currentGroupIdx].Categories.Count);
+
+    /// <summary>
+    /// Rebuild available categories based on currently available plugins.
+    /// </summary>
+    /// <param name="availablePlugins">list of all available plugin manifests to install.</param>
+    public void BuildCategories(IEnumerable<PluginManifest> availablePlugins)
+    {
+        // rebuild map plugin name -> categoryIds
+        this.mapPluginCategories.Clear();
+
+        var groupAvail = Array.Find(this.groupList, x => x.GroupKind == GroupKind.Available);
+        var prevCategoryIds = new List<int>();
+        prevCategoryIds.AddRange(groupAvail.Categories);
+
+        var categoryList = new List<int>();
+        var allCategoryIndices = new List<int>();
+
+        foreach (var plugin in availablePlugins)
+        {
+            categoryList.Clear();
+
+            var pluginCategoryTags = this.GetCategoryTagsForManifest(plugin);
+            if (pluginCategoryTags != null)
+            {
+                foreach (var tag in pluginCategoryTags)
+                {
+                    // only tags from whitelist can be accepted
+                    var matchIdx = Array.FindIndex(this.CategoryList, x => x.Tag.Equals(tag, StringComparison.InvariantCultureIgnoreCase));
+                    if (matchIdx >= 0)
+                    {
+                        var categoryId = this.CategoryList[matchIdx].CategoryId;
+                        if (categoryId >= FirstTagBasedCategoryId)
+                        {
+                            categoryList.Add(categoryId);
+
+                            if (!allCategoryIndices.Contains(matchIdx))
+                            {
+                                allCategoryIndices.Add(matchIdx);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // always add, even if empty
+            this.mapPluginCategories.Add(plugin, categoryList.ToArray());
+        }
+
+        // sort all categories by their loc name
+        allCategoryIndices.Sort((idxX, idxY) => this.CategoryList[idxX].Name.CompareTo(this.CategoryList[idxY].Name));
+
+        // rebuild all categories in group, leaving first entry = All intact and always on top
+        if (groupAvail.Categories.Count > 1)
+        {
+            groupAvail.Categories.RemoveRange(1, groupAvail.Categories.Count - 1);
+        }
+
+        foreach (var categoryIdx in allCategoryIndices)
+        {
+            groupAvail.Categories.Add(this.CategoryList[categoryIdx].CategoryId);
+        }
+
+        // compare with prev state and mark as dirty if needed
+        var noCategoryChanges = Enumerable.SequenceEqual(prevCategoryIds, groupAvail.Categories);
+        if (!noCategoryChanges)
+        {
+            this.isContentDirty = true;
+        }
+    }
+
+    /// <summary>
+    /// Filters list of available plugins based on currently selected category.
+    /// Resets <see cref="IsContentDirty"/>.
+    /// </summary>
+    /// <param name="plugins">List of available plugins to install.</param>
+    /// <returns>Filtered list of plugins.</returns>
+    public List<PluginManifest> GetCurrentCategoryContent(IEnumerable<PluginManifest> plugins)
+    {
+        var result = new List<PluginManifest>();
+
+        if (this.IsSelectionValid)
+        {
+            var groupInfo = this.groupList[this.currentGroupIdx];
+
+            var includeAll = (this.currentCategoryIdx == 0) || (groupInfo.GroupKind != GroupKind.Available);
+            if (includeAll)
+            {
+                result.AddRange(plugins);
+            }
+            else
+            {
+                var selectedCategoryInfo = Array.Find(this.categoryList, x => x.CategoryId == groupInfo.Categories[this.currentCategoryIdx]);
+
+                foreach (var plugin in plugins)
+                {
+                    if (this.mapPluginCategories.TryGetValue(plugin, out var pluginCategoryIds))
+                    {
+                        var matchIdx = Array.IndexOf(pluginCategoryIds, selectedCategoryInfo.CategoryId);
+                        if (matchIdx >= 0)
+                        {
+                            result.Add(plugin);
+                        }
+                    }
+                }
+            }
+        }
+
+        this.ResetContentDirty();
+        return result;
+    }
+
+    /// <summary>
+    /// Clears <see cref="IsContentDirty"/> flag, indicating that all cached values about currently selected group + category have been updated.
+    /// </summary>
+    public void ResetContentDirty()
+    {
+        this.isContentDirty = false;
+    }
+
+    /// <summary>
+    /// Sets category highlight based on list of plugins. Used for searching.
+    /// </summary>
+    /// <param name="plugins">List of plugins whose categories should be highlighted.</param>
+    public void SetCategoryHighlightsForPlugins(IEnumerable<PluginManifest> plugins)
+    {
+        this.highlightedCategoryIds.Clear();
+
+        if (plugins != null)
+        {
+            foreach (var entry in plugins)
+            {
+                if (this.mapPluginCategories.TryGetValue(entry, out var pluginCategories))
+                {
+                    foreach (var categoryId in pluginCategories)
+                    {
+                        if (!this.highlightedCategoryIds.Contains(categoryId))
+                        {
+                            this.highlightedCategoryIds.Add(categoryId);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Checks if category should be highlighted.
+    /// </summary>
+    /// <param name="categoryId">CategoryId to check.</param>
+    /// <returns>true if highlight is needed.</returns>
+    public bool IsCategoryHighlighted(int categoryId) => this.highlightedCategoryIds.Contains(categoryId);
+
+    private IEnumerable<string> GetCategoryTagsForManifest(PluginManifest pluginManifest)
+    {
+        if (pluginManifest.CategoryTags != null)
+        {
+            return pluginManifest.CategoryTags;
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Plugin installer category info.
+    /// </summary>
+    public struct CategoryInfo
+    {
+        /// <summary>
+        /// Unique Id number of category, tag match based should be greater of equal <see cref="FirstTagBasedCategoryId"/>.
+        /// </summary>
+        public int CategoryId;
+
+        /// <summary>
+        /// Tag from plugin manifest to match.
+        /// </summary>
+        public string Tag;
+
+        private Func<string> nameFunc;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CategoryInfo"/> struct.
+        /// </summary>
+        /// <param name="categoryId">Unique id of category.</param>
+        /// <param name="tag">Tag to match.</param>
+        /// <param name="nameFunc">Function returning localized name of category.</param>
+        public CategoryInfo(int categoryId, string tag, Func<string> nameFunc)
+        {
+            this.CategoryId = categoryId;
+            this.Tag = tag;
+            this.nameFunc = nameFunc;
+        }
+
+        /// <summary>
+        /// Gets the name of category.
+        /// </summary>
+        public string Name => this.nameFunc();
+    }
+
+    /// <summary>
+    /// Plugin installer UI group, a container for categories.
+    /// </summary>
+    public struct GroupInfo
+    {
+        /// <summary>
+        /// Type of group.
+        /// </summary>
+        public GroupKind GroupKind;
+
+        /// <summary>
+        /// List of categories in container.
+        /// </summary>
+        public List<int> Categories;
+
+        private Func<string> nameFunc;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="GroupInfo"/> struct.
+        /// </summary>
+        /// <param name="groupKind">Type of group.</param>
+        /// <param name="nameFunc">Function returning localized name of category.</param>
+        /// <param name="categories">List of category Ids to hardcode.</param>
+        public GroupInfo(GroupKind groupKind, Func<string> nameFunc, params int[] categories)
+        {
+            this.GroupKind = groupKind;
+            this.nameFunc = nameFunc;
+
+            this.Categories = new();
+            this.Categories.AddRange(categories);
+        }
+
+        /// <summary>
+        /// Gets the name of UI group.
+        /// </summary>
+        public string Name => this.nameFunc();
+    }
+
+    private static class Locs
+    {
+        #region UI groups
+
+        public static string Group_DevTools => Loc.Localize("InstallerDevTools", "Dev Tools");
+
+        public static string Group_Installed => Loc.Localize("InstallerInstalledPlugins", "Installed Plugins");
+
+        public static string Group_Available => Loc.Localize("InstallerAllPlugins", "All Plugins");
+
+        public static string Group_Changelog => Loc.Localize("InstallerChangelog", "Changelog");
+
+        #endregion
+
+        #region Categories
+
+        public static string Category_All => Loc.Localize("InstallerCategoryAll", "All");
+
+        public static string Category_DevInstalled => Loc.Localize("InstallerInstalledDevPlugins", "Installed Dev Plugins");
+
+        public static string Category_IconTester => "Image/Icon Tester";
+
+        public static string Category_Other => Loc.Localize("InstallerCategoryOther", "Other");
+
+        public static string Category_Jobs => Loc.Localize("InstallerCategoryJobs", "Jobs");
+
+        public static string Category_UI => Loc.Localize("InstallerCategoryUI", "UI");
+
+        public static string Category_MiniGames => Loc.Localize("InstallerCategoryMiniGames", "Mini games");
+
+        public static string Category_Inventory => Loc.Localize("InstallerCategoryInventory", "Inventory");
+
+        public static string Category_Sound => Loc.Localize("InstallerCategorySound", "Sound");
+
+        public static string Category_Social => Loc.Localize("InstallerCategorySocial", "Social");
+
+        public static string Category_Utility => Loc.Localize("InstallerCategoryUtility", "Utility");
+
+        public static string Category_Plugins => Loc.Localize("InstallerCategoryPlugins", "Plugins");
+
+        public static string Category_Dalamud => Loc.Localize("InstallerCategoryDalamud", "Dalamud");
+
+        #endregion
+    }
 }
diff --git a/Dalamud/Interface/Internal/UiDebug.cs b/Dalamud/Interface/Internal/UiDebug.cs
index 99c6dd3d1..75c94a61d 100644
--- a/Dalamud/Interface/Internal/UiDebug.cs
+++ b/Dalamud/Interface/Internal/UiDebug.cs
@@ -10,591 +10,590 @@ using ImGuiNET;
 
 // Customised version of https://github.com/aers/FFXIVUIDebug
 
-namespace Dalamud.Interface.Internal
+namespace Dalamud.Interface.Internal;
+
+/// <summary>
+/// This class displays a debug window to inspect native addons.
+/// </summary>
+internal unsafe class UiDebug
 {
-    /// <summary>
-    /// This class displays a debug window to inspect native addons.
-    /// </summary>
-    internal unsafe class UiDebug
+    private const int UnitListCount = 18;
+
+    private readonly GetAtkStageSingleton getAtkStageSingleton;
+    private readonly bool[] selectedInList = new bool[UnitListCount];
+    private readonly string[] listNames = new string[UnitListCount]
     {
-        private const int UnitListCount = 18;
+        "Depth Layer 1",
+        "Depth Layer 2",
+        "Depth Layer 3",
+        "Depth Layer 4",
+        "Depth Layer 5",
+        "Depth Layer 6",
+        "Depth Layer 7",
+        "Depth Layer 8",
+        "Depth Layer 9",
+        "Depth Layer 10",
+        "Depth Layer 11",
+        "Depth Layer 12",
+        "Depth Layer 13",
+        "Loaded Units",
+        "Focused Units",
+        "Units 16",
+        "Units 17",
+        "Units 18",
+    };
 
-        private readonly GetAtkStageSingleton getAtkStageSingleton;
-        private readonly bool[] selectedInList = new bool[UnitListCount];
-        private readonly string[] listNames = new string[UnitListCount]
+    private bool doingSearch;
+    private string searchInput = string.Empty;
+    private AtkUnitBase* selectedUnitBase = null;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="UiDebug"/> class.
+    /// </summary>
+    public UiDebug()
+    {
+        var sigScanner = Service<SigScanner>.Get();
+        var getSingletonAddr = sigScanner.ScanText("E8 ?? ?? ?? ?? 41 B8 01 00 00 00 48 8D 15 ?? ?? ?? ?? 48 8B 48 20 E8 ?? ?? ?? ?? 48 8B CF");
+        this.getAtkStageSingleton = Marshal.GetDelegateForFunctionPointer<GetAtkStageSingleton>(getSingletonAddr);
+    }
+
+    private delegate AtkStage* GetAtkStageSingleton();
+
+    /// <summary>
+    /// Renders this window.
+    /// </summary>
+    public void Draw()
+    {
+        ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(3, 2));
+        ImGui.BeginChild("st_uiDebug_unitBaseSelect", new Vector2(250, -1), true);
+
+        ImGui.SetNextItemWidth(-1);
+        ImGui.InputTextWithHint("###atkUnitBaseSearch", "Search", ref this.searchInput, 0x20);
+
+        this.DrawUnitBaseList();
+        ImGui.EndChild();
+        if (this.selectedUnitBase != null)
         {
-            "Depth Layer 1",
-            "Depth Layer 2",
-            "Depth Layer 3",
-            "Depth Layer 4",
-            "Depth Layer 5",
-            "Depth Layer 6",
-            "Depth Layer 7",
-            "Depth Layer 8",
-            "Depth Layer 9",
-            "Depth Layer 10",
-            "Depth Layer 11",
-            "Depth Layer 12",
-            "Depth Layer 13",
-            "Loaded Units",
-            "Focused Units",
-            "Units 16",
-            "Units 17",
-            "Units 18",
-        };
-
-        private bool doingSearch;
-        private string searchInput = string.Empty;
-        private AtkUnitBase* selectedUnitBase = null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UiDebug"/> class.
-        /// </summary>
-        public UiDebug()
-        {
-            var sigScanner = Service<SigScanner>.Get();
-            var getSingletonAddr = sigScanner.ScanText("E8 ?? ?? ?? ?? 41 B8 01 00 00 00 48 8D 15 ?? ?? ?? ?? 48 8B 48 20 E8 ?? ?? ?? ?? 48 8B CF");
-            this.getAtkStageSingleton = Marshal.GetDelegateForFunctionPointer<GetAtkStageSingleton>(getSingletonAddr);
-        }
-
-        private delegate AtkStage* GetAtkStageSingleton();
-
-        /// <summary>
-        /// Renders this window.
-        /// </summary>
-        public void Draw()
-        {
-            ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(3, 2));
-            ImGui.BeginChild("st_uiDebug_unitBaseSelect", new Vector2(250, -1), true);
-
-            ImGui.SetNextItemWidth(-1);
-            ImGui.InputTextWithHint("###atkUnitBaseSearch", "Search", ref this.searchInput, 0x20);
-
-            this.DrawUnitBaseList();
-            ImGui.EndChild();
-            if (this.selectedUnitBase != null)
-            {
-                ImGui.SameLine();
-                ImGui.BeginChild("st_uiDebug_selectedUnitBase", new Vector2(-1, -1), true);
-                this.DrawUnitBase(this.selectedUnitBase);
-                ImGui.EndChild();
-            }
-
-            ImGui.PopStyleVar();
-        }
-
-        private void DrawUnitBase(AtkUnitBase* atkUnitBase)
-        {
-            var isVisible = (atkUnitBase->Flags & 0x20) == 0x20;
-            var addonName = Marshal.PtrToStringAnsi(new IntPtr(atkUnitBase->Name));
-            var agent = Service<GameGui>.Get().FindAgentInterface(atkUnitBase);
-
-            ImGui.Text($"{addonName}");
             ImGui.SameLine();
-            ImGui.PushStyleColor(ImGuiCol.Text, isVisible ? 0xFF00FF00 : 0xFF0000FF);
-            ImGui.Text(isVisible ? "Visible" : "Not Visible");
-            ImGui.PopStyleColor();
+            ImGui.BeginChild("st_uiDebug_selectedUnitBase", new Vector2(-1, -1), true);
+            this.DrawUnitBase(this.selectedUnitBase);
+            ImGui.EndChild();
+        }
 
-            ImGui.SameLine(ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - 25);
-            if (ImGui.SmallButton("V"))
-            {
-                atkUnitBase->Flags ^= 0x20;
-            }
+        ImGui.PopStyleVar();
+    }
 
-            ImGui.Separator();
-            ImGuiHelpers.ClickToCopyText($"Address: {(ulong)atkUnitBase:X}", $"{(ulong)atkUnitBase:X}");
-            ImGuiHelpers.ClickToCopyText($"Agent: {(ulong)agent:X}", $"{(ulong)agent:X}");
-            ImGui.Separator();
+    private void DrawUnitBase(AtkUnitBase* atkUnitBase)
+    {
+        var isVisible = (atkUnitBase->Flags & 0x20) == 0x20;
+        var addonName = Marshal.PtrToStringAnsi(new IntPtr(atkUnitBase->Name));
+        var agent = Service<GameGui>.Get().FindAgentInterface(atkUnitBase);
 
-            ImGui.Text($"Position: [ {atkUnitBase->X} , {atkUnitBase->Y} ]");
-            ImGui.Text($"Scale: {atkUnitBase->Scale * 100}%%");
-            ImGui.Text($"Widget Count {atkUnitBase->UldManager.ObjectCount}");
+        ImGui.Text($"{addonName}");
+        ImGui.SameLine();
+        ImGui.PushStyleColor(ImGuiCol.Text, isVisible ? 0xFF00FF00 : 0xFF0000FF);
+        ImGui.Text(isVisible ? "Visible" : "Not Visible");
+        ImGui.PopStyleColor();
 
-            ImGui.Separator();
+        ImGui.SameLine(ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - 25);
+        if (ImGui.SmallButton("V"))
+        {
+            atkUnitBase->Flags ^= 0x20;
+        }
 
-            object addonObj = *atkUnitBase;
+        ImGui.Separator();
+        ImGuiHelpers.ClickToCopyText($"Address: {(ulong)atkUnitBase:X}", $"{(ulong)atkUnitBase:X}");
+        ImGuiHelpers.ClickToCopyText($"Agent: {(ulong)agent:X}", $"{(ulong)agent:X}");
+        ImGui.Separator();
 
-            Util.ShowStruct(addonObj, (ulong)atkUnitBase);
+        ImGui.Text($"Position: [ {atkUnitBase->X} , {atkUnitBase->Y} ]");
+        ImGui.Text($"Scale: {atkUnitBase->Scale * 100}%%");
+        ImGui.Text($"Widget Count {atkUnitBase->UldManager.ObjectCount}");
 
+        ImGui.Separator();
+
+        object addonObj = *atkUnitBase;
+
+        Util.ShowStruct(addonObj, (ulong)atkUnitBase);
+
+        ImGui.Dummy(new Vector2(25 * ImGui.GetIO().FontGlobalScale));
+        ImGui.Separator();
+        if (atkUnitBase->RootNode != null)
+            this.PrintNode(atkUnitBase->RootNode);
+
+        if (atkUnitBase->UldManager.NodeListCount > 0)
+        {
             ImGui.Dummy(new Vector2(25 * ImGui.GetIO().FontGlobalScale));
             ImGui.Separator();
-            if (atkUnitBase->RootNode != null)
-                this.PrintNode(atkUnitBase->RootNode);
-
-            if (atkUnitBase->UldManager.NodeListCount > 0)
+            ImGui.PushStyleColor(ImGuiCol.Text, 0xFFFFAAAA);
+            if (ImGui.TreeNode($"Node List##{(ulong)atkUnitBase:X}"))
             {
-                ImGui.Dummy(new Vector2(25 * ImGui.GetIO().FontGlobalScale));
-                ImGui.Separator();
-                ImGui.PushStyleColor(ImGuiCol.Text, 0xFFFFAAAA);
-                if (ImGui.TreeNode($"Node List##{(ulong)atkUnitBase:X}"))
-                {
-                    ImGui.PopStyleColor();
+                ImGui.PopStyleColor();
 
-                    for (var j = 0; j < atkUnitBase->UldManager.NodeListCount; j++)
-                    {
-                        this.PrintNode(atkUnitBase->UldManager.NodeList[j], false, $"[{j}] ");
-                    }
-
-                    ImGui.TreePop();
-                }
-                else
+                for (var j = 0; j < atkUnitBase->UldManager.NodeListCount; j++)
                 {
-                    ImGui.PopStyleColor();
+                    this.PrintNode(atkUnitBase->UldManager.NodeList[j], false, $"[{j}] ");
                 }
+
+                ImGui.TreePop();
             }
-        }
-
-        private void PrintNode(AtkResNode* node, bool printSiblings = true, string treePrefix = "")
-        {
-            if (node == null)
-                return;
-
-            if ((int)node->Type < 1000)
-                this.PrintSimpleNode(node, treePrefix);
             else
-                this.PrintComponentNode(node, treePrefix);
-
-            if (printSiblings)
             {
-                var prevNode = node;
-                while ((prevNode = prevNode->PrevSiblingNode) != null)
-                    this.PrintNode(prevNode, false, "prev ");
-
-                var nextNode = node;
-                while ((nextNode = nextNode->NextSiblingNode) != null)
-                    this.PrintNode(nextNode, false, "next ");
+                ImGui.PopStyleColor();
             }
         }
+    }
 
-        private void PrintSimpleNode(AtkResNode* node, string treePrefix)
+    private void PrintNode(AtkResNode* node, bool printSiblings = true, string treePrefix = "")
+    {
+        if (node == null)
+            return;
+
+        if ((int)node->Type < 1000)
+            this.PrintSimpleNode(node, treePrefix);
+        else
+            this.PrintComponentNode(node, treePrefix);
+
+        if (printSiblings)
         {
-            var popped = false;
-            var isVisible = (node->Flags & 0x10) == 0x10;
+            var prevNode = node;
+            while ((prevNode = prevNode->PrevSiblingNode) != null)
+                this.PrintNode(prevNode, false, "prev ");
+
+            var nextNode = node;
+            while ((nextNode = nextNode->NextSiblingNode) != null)
+                this.PrintNode(nextNode, false, "next ");
+        }
+    }
+
+    private void PrintSimpleNode(AtkResNode* node, string treePrefix)
+    {
+        var popped = false;
+        var isVisible = (node->Flags & 0x10) == 0x10;
+
+        if (isVisible)
+            ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(0, 255, 0, 255));
+
+        if (ImGui.TreeNode($"{treePrefix}{node->Type} Node (ptr = {(long)node:X})###{(long)node}"))
+        {
+            if (ImGui.IsItemHovered())
+                this.DrawOutline(node);
 
             if (isVisible)
-                ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(0, 255, 0, 255));
-
-            if (ImGui.TreeNode($"{treePrefix}{node->Type} Node (ptr = {(long)node:X})###{(long)node}"))
             {
-                if (ImGui.IsItemHovered())
-                    this.DrawOutline(node);
+                ImGui.PopStyleColor();
+                popped = true;
+            }
 
-                if (isVisible)
-                {
-                    ImGui.PopStyleColor();
-                    popped = true;
-                }
+            ImGui.Text("Node: ");
+            ImGui.SameLine();
+            ImGuiHelpers.ClickToCopyText($"{(ulong)node:X}");
+            ImGui.SameLine();
+            switch (node->Type)
+            {
+                case NodeType.Text: Util.ShowStruct(*(AtkTextNode*)node, (ulong)node); break;
+                case NodeType.Image: Util.ShowStruct(*(AtkImageNode*)node, (ulong)node); break;
+                case NodeType.Collision: Util.ShowStruct(*(AtkCollisionNode*)node, (ulong)node); break;
+                case NodeType.NineGrid: Util.ShowStruct(*(AtkNineGridNode*)node, (ulong)node); break;
+                case NodeType.Counter: Util.ShowStruct(*(AtkCounterNode*)node, (ulong)node); break;
+                default: Util.ShowStruct(*node, (ulong)node); break;
+            }
 
-                ImGui.Text("Node: ");
-                ImGui.SameLine();
-                ImGuiHelpers.ClickToCopyText($"{(ulong)node:X}");
-                ImGui.SameLine();
-                switch (node->Type)
-                {
-                    case NodeType.Text: Util.ShowStruct(*(AtkTextNode*)node, (ulong)node); break;
-                    case NodeType.Image: Util.ShowStruct(*(AtkImageNode*)node, (ulong)node); break;
-                    case NodeType.Collision: Util.ShowStruct(*(AtkCollisionNode*)node, (ulong)node); break;
-                    case NodeType.NineGrid: Util.ShowStruct(*(AtkNineGridNode*)node, (ulong)node); break;
-                    case NodeType.Counter: Util.ShowStruct(*(AtkCounterNode*)node, (ulong)node); break;
-                    default: Util.ShowStruct(*node, (ulong)node); break;
-                }
+            this.PrintResNode(node);
 
-                this.PrintResNode(node);
+            if (node->ChildNode != null)
+                this.PrintNode(node->ChildNode);
 
-                if (node->ChildNode != null)
-                    this.PrintNode(node->ChildNode);
+            switch (node->Type)
+            {
+                case NodeType.Text:
+                    var textNode = (AtkTextNode*)node;
+                    ImGui.Text($"text: {Marshal.PtrToStringAnsi(new IntPtr(textNode->NodeText.StringPtr))}");
 
-                switch (node->Type)
-                {
-                    case NodeType.Text:
-                        var textNode = (AtkTextNode*)node;
-                        ImGui.Text($"text: {Marshal.PtrToStringAnsi(new IntPtr(textNode->NodeText.StringPtr))}");
+                    ImGui.InputText($"Replace Text##{(ulong)textNode:X}", new IntPtr(textNode->NodeText.StringPtr), (uint)textNode->NodeText.BufSize);
 
-                        ImGui.InputText($"Replace Text##{(ulong)textNode:X}", new IntPtr(textNode->NodeText.StringPtr), (uint)textNode->NodeText.BufSize);
+                    ImGui.Text($"AlignmentType: {(AlignmentType)textNode->AlignmentFontType}  FontSize: {textNode->FontSize}");
+                    int b = textNode->AlignmentFontType;
+                    if (ImGui.InputInt($"###setAlignment{(ulong)textNode:X}", ref b, 1))
+                    {
+                        while (b > byte.MaxValue) b -= byte.MaxValue;
+                        while (b < byte.MinValue) b += byte.MaxValue;
+                        textNode->AlignmentFontType = (byte)b;
+                        textNode->AtkResNode.Flags_2 |= 0x1;
+                    }
 
-                        ImGui.Text($"AlignmentType: {(AlignmentType)textNode->AlignmentFontType}  FontSize: {textNode->FontSize}");
-                        int b = textNode->AlignmentFontType;
-                        if (ImGui.InputInt($"###setAlignment{(ulong)textNode:X}", ref b, 1))
+                    ImGui.Text($"Color: #{textNode->TextColor.R:X2}{textNode->TextColor.G:X2}{textNode->TextColor.B:X2}{textNode->TextColor.A:X2}");
+                    ImGui.SameLine();
+                    ImGui.Text($"EdgeColor: #{textNode->EdgeColor.R:X2}{textNode->EdgeColor.G:X2}{textNode->EdgeColor.B:X2}{textNode->EdgeColor.A:X2}");
+                    ImGui.SameLine();
+                    ImGui.Text($"BGColor: #{textNode->BackgroundColor.R:X2}{textNode->BackgroundColor.G:X2}{textNode->BackgroundColor.B:X2}{textNode->BackgroundColor.A:X2}");
+
+                    ImGui.Text($"TextFlags: {textNode->TextFlags}");
+                    ImGui.SameLine();
+                    ImGui.Text($"TextFlags2: {textNode->TextFlags2}");
+
+                    break;
+                case NodeType.Counter:
+                    var counterNode = (AtkCounterNode*)node;
+                    ImGui.Text($"text: {Marshal.PtrToStringAnsi(new IntPtr(counterNode->NodeText.StringPtr))}");
+                    break;
+                case NodeType.Image:
+                    var imageNode = (AtkImageNode*)node;
+                    if (imageNode->PartsList != null)
+                    {
+                        if (imageNode->PartId > imageNode->PartsList->PartCount)
                         {
-                            while (b > byte.MaxValue) b -= byte.MaxValue;
-                            while (b < byte.MinValue) b += byte.MaxValue;
-                            textNode->AlignmentFontType = (byte)b;
-                            textNode->AtkResNode.Flags_2 |= 0x1;
-                        }
-
-                        ImGui.Text($"Color: #{textNode->TextColor.R:X2}{textNode->TextColor.G:X2}{textNode->TextColor.B:X2}{textNode->TextColor.A:X2}");
-                        ImGui.SameLine();
-                        ImGui.Text($"EdgeColor: #{textNode->EdgeColor.R:X2}{textNode->EdgeColor.G:X2}{textNode->EdgeColor.B:X2}{textNode->EdgeColor.A:X2}");
-                        ImGui.SameLine();
-                        ImGui.Text($"BGColor: #{textNode->BackgroundColor.R:X2}{textNode->BackgroundColor.G:X2}{textNode->BackgroundColor.B:X2}{textNode->BackgroundColor.A:X2}");
-
-                        ImGui.Text($"TextFlags: {textNode->TextFlags}");
-                        ImGui.SameLine();
-                        ImGui.Text($"TextFlags2: {textNode->TextFlags2}");
-
-                        break;
-                    case NodeType.Counter:
-                        var counterNode = (AtkCounterNode*)node;
-                        ImGui.Text($"text: {Marshal.PtrToStringAnsi(new IntPtr(counterNode->NodeText.StringPtr))}");
-                        break;
-                    case NodeType.Image:
-                        var imageNode = (AtkImageNode*)node;
-                        if (imageNode->PartsList != null)
-                        {
-                            if (imageNode->PartId > imageNode->PartsList->PartCount)
-                            {
-                                ImGui.Text("part id > part count?");
-                            }
-                            else
-                            {
-                                var textureInfo = imageNode->PartsList->Parts[imageNode->PartId].UldAsset;
-                                var texType = textureInfo->AtkTexture.TextureType;
-                                ImGui.Text($"texture type: {texType} part_id={imageNode->PartId} part_id_count={imageNode->PartsList->PartCount}");
-                                if (texType == TextureType.Resource)
-                                {
-                                    var texFileNameStdString = &textureInfo->AtkTexture.Resource->TexFileResourceHandle->ResourceHandle.FileName;
-                                    var texString = texFileNameStdString->Length < 16
-                                        ? Marshal.PtrToStringAnsi((IntPtr)texFileNameStdString->Buffer)
-                                        : Marshal.PtrToStringAnsi((IntPtr)texFileNameStdString->BufferPtr);
-
-                                    ImGui.Text($"texture path: {texString}");
-                                    var kernelTexture = textureInfo->AtkTexture.Resource->KernelTextureObject;
-
-                                    if (ImGui.TreeNode($"Texture##{(ulong)kernelTexture->D3D11ShaderResourceView:X}"))
-                                    {
-                                        ImGui.Image(new IntPtr(kernelTexture->D3D11ShaderResourceView), new Vector2(kernelTexture->Width, kernelTexture->Height));
-                                        ImGui.TreePop();
-                                    }
-                                }
-                                else if (texType == TextureType.KernelTexture)
-                                {
-                                    if (ImGui.TreeNode($"Texture##{(ulong)textureInfo->AtkTexture.KernelTexture->D3D11ShaderResourceView:X}"))
-                                    {
-                                        ImGui.Image(new IntPtr(textureInfo->AtkTexture.KernelTexture->D3D11ShaderResourceView), new Vector2(textureInfo->AtkTexture.KernelTexture->Width, textureInfo->AtkTexture.KernelTexture->Height));
-                                        ImGui.TreePop();
-                                    }
-                                }
-                            }
+                            ImGui.Text("part id > part count?");
                         }
                         else
                         {
-                            ImGui.Text("no texture loaded");
+                            var textureInfo = imageNode->PartsList->Parts[imageNode->PartId].UldAsset;
+                            var texType = textureInfo->AtkTexture.TextureType;
+                            ImGui.Text($"texture type: {texType} part_id={imageNode->PartId} part_id_count={imageNode->PartsList->PartCount}");
+                            if (texType == TextureType.Resource)
+                            {
+                                var texFileNameStdString = &textureInfo->AtkTexture.Resource->TexFileResourceHandle->ResourceHandle.FileName;
+                                var texString = texFileNameStdString->Length < 16
+                                                    ? Marshal.PtrToStringAnsi((IntPtr)texFileNameStdString->Buffer)
+                                                    : Marshal.PtrToStringAnsi((IntPtr)texFileNameStdString->BufferPtr);
+
+                                ImGui.Text($"texture path: {texString}");
+                                var kernelTexture = textureInfo->AtkTexture.Resource->KernelTextureObject;
+
+                                if (ImGui.TreeNode($"Texture##{(ulong)kernelTexture->D3D11ShaderResourceView:X}"))
+                                {
+                                    ImGui.Image(new IntPtr(kernelTexture->D3D11ShaderResourceView), new Vector2(kernelTexture->Width, kernelTexture->Height));
+                                    ImGui.TreePop();
+                                }
+                            }
+                            else if (texType == TextureType.KernelTexture)
+                            {
+                                if (ImGui.TreeNode($"Texture##{(ulong)textureInfo->AtkTexture.KernelTexture->D3D11ShaderResourceView:X}"))
+                                {
+                                    ImGui.Image(new IntPtr(textureInfo->AtkTexture.KernelTexture->D3D11ShaderResourceView), new Vector2(textureInfo->AtkTexture.KernelTexture->Width, textureInfo->AtkTexture.KernelTexture->Height));
+                                    ImGui.TreePop();
+                                }
+                            }
                         }
-
-                        break;
-                }
-
-                ImGui.TreePop();
-            }
-            else if (ImGui.IsItemHovered())
-            {
-                this.DrawOutline(node);
-            }
-
-            if (isVisible && !popped)
-                ImGui.PopStyleColor();
-        }
-
-        private void PrintComponentNode(AtkResNode* node, string treePrefix)
-        {
-            var compNode = (AtkComponentNode*)node;
-
-            var popped = false;
-            var isVisible = (node->Flags & 0x10) == 0x10;
-
-            var componentInfo = compNode->Component->UldManager;
-
-            var childCount = componentInfo.NodeListCount;
-
-            var objectInfo = (AtkUldComponentInfo*)componentInfo.Objects;
-            if (objectInfo == null)
-            {
-                return;
-            }
-
-            if (isVisible)
-                ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(0, 255, 0, 255));
-
-            if (ImGui.TreeNode($"{treePrefix}{objectInfo->ComponentType} Component Node (ptr = {(long)node:X}, component ptr = {(long)compNode->Component:X}) child count = {childCount}  ###{(long)node}"))
-            {
-                if (ImGui.IsItemHovered())
-                    this.DrawOutline(node);
-
-                if (isVisible)
-                {
-                    ImGui.PopStyleColor();
-                    popped = true;
-                }
-
-                ImGui.Text("Node: ");
-                ImGui.SameLine();
-                ImGuiHelpers.ClickToCopyText($"{(ulong)node:X}");
-                ImGui.SameLine();
-                Util.ShowStruct(*compNode, (ulong)compNode);
-                ImGui.Text("Component: ");
-                ImGui.SameLine();
-                ImGuiHelpers.ClickToCopyText($"{(ulong)compNode->Component:X}");
-                ImGui.SameLine();
-
-                switch (objectInfo->ComponentType)
-                {
-                    case ComponentType.Button: Util.ShowStruct(*(AtkComponentButton*)compNode->Component, (ulong)compNode->Component); break;
-                    case ComponentType.Slider: Util.ShowStruct(*(AtkComponentSlider*)compNode->Component, (ulong)compNode->Component); break;
-                    case ComponentType.Window: Util.ShowStruct(*(AtkComponentWindow*)compNode->Component, (ulong)compNode->Component); break;
-                    case ComponentType.CheckBox: Util.ShowStruct(*(AtkComponentCheckBox*)compNode->Component, (ulong)compNode->Component); break;
-                    case ComponentType.GaugeBar: Util.ShowStruct(*(AtkComponentGaugeBar*)compNode->Component, (ulong)compNode->Component); break;
-                    case ComponentType.RadioButton: Util.ShowStruct(*(AtkComponentRadioButton*)compNode->Component, (ulong)compNode->Component); break;
-                    case ComponentType.TextInput: Util.ShowStruct(*(AtkComponentTextInput*)compNode->Component, (ulong)compNode->Component); break;
-                    case ComponentType.Icon: Util.ShowStruct(*(AtkComponentIcon*)compNode->Component, (ulong)compNode->Component); break;
-                    default: Util.ShowStruct(*compNode->Component, (ulong)compNode->Component); break;
-                }
-
-                this.PrintResNode(node);
-                this.PrintNode(componentInfo.RootNode);
-
-                switch (objectInfo->ComponentType)
-                {
-                    case ComponentType.TextInput:
-                        var textInputComponent = (AtkComponentTextInput*)compNode->Component;
-                        ImGui.Text($"InputBase Text1: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->AtkComponentInputBase.UnkText1.StringPtr))}");
-                        ImGui.Text($"InputBase Text2: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->AtkComponentInputBase.UnkText2.StringPtr))}");
-                        ImGui.Text($"Text1: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->UnkText1.StringPtr))}");
-                        ImGui.Text($"Text2: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->UnkText2.StringPtr))}");
-                        ImGui.Text($"Text3: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->UnkText3.StringPtr))}");
-                        ImGui.Text($"Text4: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->UnkText4.StringPtr))}");
-                        ImGui.Text($"Text5: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->UnkText5.StringPtr))}");
-                        break;
-                }
-
-                ImGui.PushStyleColor(ImGuiCol.Text, 0xFFFFAAAA);
-                if (ImGui.TreeNode($"Node List##{(ulong)node:X}"))
-                {
-                    ImGui.PopStyleColor();
-
-                    for (var i = 0; i < compNode->Component->UldManager.NodeListCount; i++)
+                    }
+                    else
                     {
-                        this.PrintNode(compNode->Component->UldManager.NodeList[i], false, $"[{i}] ");
+                        ImGui.Text("no texture loaded");
                     }
 
-                    ImGui.TreePop();
-                }
-                else
+                    break;
+            }
+
+            ImGui.TreePop();
+        }
+        else if (ImGui.IsItemHovered())
+        {
+            this.DrawOutline(node);
+        }
+
+        if (isVisible && !popped)
+            ImGui.PopStyleColor();
+    }
+
+    private void PrintComponentNode(AtkResNode* node, string treePrefix)
+    {
+        var compNode = (AtkComponentNode*)node;
+
+        var popped = false;
+        var isVisible = (node->Flags & 0x10) == 0x10;
+
+        var componentInfo = compNode->Component->UldManager;
+
+        var childCount = componentInfo.NodeListCount;
+
+        var objectInfo = (AtkUldComponentInfo*)componentInfo.Objects;
+        if (objectInfo == null)
+        {
+            return;
+        }
+
+        if (isVisible)
+            ImGui.PushStyleColor(ImGuiCol.Text, new Vector4(0, 255, 0, 255));
+
+        if (ImGui.TreeNode($"{treePrefix}{objectInfo->ComponentType} Component Node (ptr = {(long)node:X}, component ptr = {(long)compNode->Component:X}) child count = {childCount}  ###{(long)node}"))
+        {
+            if (ImGui.IsItemHovered())
+                this.DrawOutline(node);
+
+            if (isVisible)
+            {
+                ImGui.PopStyleColor();
+                popped = true;
+            }
+
+            ImGui.Text("Node: ");
+            ImGui.SameLine();
+            ImGuiHelpers.ClickToCopyText($"{(ulong)node:X}");
+            ImGui.SameLine();
+            Util.ShowStruct(*compNode, (ulong)compNode);
+            ImGui.Text("Component: ");
+            ImGui.SameLine();
+            ImGuiHelpers.ClickToCopyText($"{(ulong)compNode->Component:X}");
+            ImGui.SameLine();
+
+            switch (objectInfo->ComponentType)
+            {
+                case ComponentType.Button: Util.ShowStruct(*(AtkComponentButton*)compNode->Component, (ulong)compNode->Component); break;
+                case ComponentType.Slider: Util.ShowStruct(*(AtkComponentSlider*)compNode->Component, (ulong)compNode->Component); break;
+                case ComponentType.Window: Util.ShowStruct(*(AtkComponentWindow*)compNode->Component, (ulong)compNode->Component); break;
+                case ComponentType.CheckBox: Util.ShowStruct(*(AtkComponentCheckBox*)compNode->Component, (ulong)compNode->Component); break;
+                case ComponentType.GaugeBar: Util.ShowStruct(*(AtkComponentGaugeBar*)compNode->Component, (ulong)compNode->Component); break;
+                case ComponentType.RadioButton: Util.ShowStruct(*(AtkComponentRadioButton*)compNode->Component, (ulong)compNode->Component); break;
+                case ComponentType.TextInput: Util.ShowStruct(*(AtkComponentTextInput*)compNode->Component, (ulong)compNode->Component); break;
+                case ComponentType.Icon: Util.ShowStruct(*(AtkComponentIcon*)compNode->Component, (ulong)compNode->Component); break;
+                default: Util.ShowStruct(*compNode->Component, (ulong)compNode->Component); break;
+            }
+
+            this.PrintResNode(node);
+            this.PrintNode(componentInfo.RootNode);
+
+            switch (objectInfo->ComponentType)
+            {
+                case ComponentType.TextInput:
+                    var textInputComponent = (AtkComponentTextInput*)compNode->Component;
+                    ImGui.Text($"InputBase Text1: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->AtkComponentInputBase.UnkText1.StringPtr))}");
+                    ImGui.Text($"InputBase Text2: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->AtkComponentInputBase.UnkText2.StringPtr))}");
+                    ImGui.Text($"Text1: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->UnkText1.StringPtr))}");
+                    ImGui.Text($"Text2: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->UnkText2.StringPtr))}");
+                    ImGui.Text($"Text3: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->UnkText3.StringPtr))}");
+                    ImGui.Text($"Text4: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->UnkText4.StringPtr))}");
+                    ImGui.Text($"Text5: {Marshal.PtrToStringAnsi(new IntPtr(textInputComponent->UnkText5.StringPtr))}");
+                    break;
+            }
+
+            ImGui.PushStyleColor(ImGuiCol.Text, 0xFFFFAAAA);
+            if (ImGui.TreeNode($"Node List##{(ulong)node:X}"))
+            {
+                ImGui.PopStyleColor();
+
+                for (var i = 0; i < compNode->Component->UldManager.NodeListCount; i++)
                 {
-                    ImGui.PopStyleColor();
+                    this.PrintNode(compNode->Component->UldManager.NodeList[i], false, $"[{i}] ");
                 }
 
                 ImGui.TreePop();
             }
-            else if (ImGui.IsItemHovered())
+            else
             {
-                this.DrawOutline(node);
-            }
-
-            if (isVisible && !popped)
                 ImGui.PopStyleColor();
+            }
+
+            ImGui.TreePop();
+        }
+        else if (ImGui.IsItemHovered())
+        {
+            this.DrawOutline(node);
         }
 
-        private void PrintResNode(AtkResNode* node)
-        {
-            ImGui.Text($"NodeID: {node->NodeID}");
-            ImGui.SameLine();
-            if (ImGui.SmallButton($"T:Visible##{(ulong)node:X}"))
-            {
-                node->Flags ^= 0x10;
-            }
-
-            ImGui.SameLine();
-            if (ImGui.SmallButton($"C:Ptr##{(ulong)node:X}"))
-            {
-                ImGui.SetClipboardText($"{(ulong)node:X}");
-            }
-
-            ImGui.Text(
-                $"X: {node->X} Y: {node->Y} " +
-                $"ScaleX: {node->ScaleX} ScaleY: {node->ScaleY} " +
-                $"Rotation: {node->Rotation} " +
-                $"Width: {node->Width} Height: {node->Height} " +
-                $"OriginX: {node->OriginX} OriginY: {node->OriginY}");
-            ImGui.Text(
-                $"RGBA: 0x{node->Color.R:X2}{node->Color.G:X2}{node->Color.B:X2}{node->Color.A:X2} " +
-                $"AddRGB: {node->AddRed} {node->AddGreen} {node->AddBlue} " +
-                $"MultiplyRGB: {node->MultiplyRed} {node->MultiplyGreen} {node->MultiplyBlue}");
-        }
-
-        private bool DrawUnitListHeader(int index, uint count, ulong ptr, bool highlight)
-        {
-            ImGui.PushStyleColor(ImGuiCol.Text, highlight ? 0xFFAAAA00 : 0xFFFFFFFF);
-            if (!string.IsNullOrEmpty(this.searchInput) && !this.doingSearch)
-            {
-                ImGui.SetNextItemOpen(true, ImGuiCond.Always);
-            }
-            else if (this.doingSearch && string.IsNullOrEmpty(this.searchInput))
-            {
-                ImGui.SetNextItemOpen(false, ImGuiCond.Always);
-            }
-
-            var treeNode = ImGui.TreeNode($"{this.listNames[index]}##unitList_{index}");
+        if (isVisible && !popped)
             ImGui.PopStyleColor();
+    }
 
-            ImGui.SameLine();
-            ImGui.TextDisabled($"C:{count}  {ptr:X}");
-            return treeNode;
+    private void PrintResNode(AtkResNode* node)
+    {
+        ImGui.Text($"NodeID: {node->NodeID}");
+        ImGui.SameLine();
+        if (ImGui.SmallButton($"T:Visible##{(ulong)node:X}"))
+        {
+            node->Flags ^= 0x10;
         }
 
-        private void DrawUnitBaseList()
+        ImGui.SameLine();
+        if (ImGui.SmallButton($"C:Ptr##{(ulong)node:X}"))
         {
-            var foundSelected = false;
-            var noResults = true;
-            var stage = this.getAtkStageSingleton();
+            ImGui.SetClipboardText($"{(ulong)node:X}");
+        }
 
-            var unitManagers = &stage->RaptureAtkUnitManager->AtkUnitManager.DepthLayerOneList;
+        ImGui.Text(
+            $"X: {node->X} Y: {node->Y} " +
+            $"ScaleX: {node->ScaleX} ScaleY: {node->ScaleY} " +
+            $"Rotation: {node->Rotation} " +
+            $"Width: {node->Width} Height: {node->Height} " +
+            $"OriginX: {node->OriginX} OriginY: {node->OriginY}");
+        ImGui.Text(
+            $"RGBA: 0x{node->Color.R:X2}{node->Color.G:X2}{node->Color.B:X2}{node->Color.A:X2} " +
+            $"AddRGB: {node->AddRed} {node->AddGreen} {node->AddBlue} " +
+            $"MultiplyRGB: {node->MultiplyRed} {node->MultiplyGreen} {node->MultiplyBlue}");
+    }
 
-            var searchStr = this.searchInput;
-            var searching = !string.IsNullOrEmpty(searchStr);
+    private bool DrawUnitListHeader(int index, uint count, ulong ptr, bool highlight)
+    {
+        ImGui.PushStyleColor(ImGuiCol.Text, highlight ? 0xFFAAAA00 : 0xFFFFFFFF);
+        if (!string.IsNullOrEmpty(this.searchInput) && !this.doingSearch)
+        {
+            ImGui.SetNextItemOpen(true, ImGuiCond.Always);
+        }
+        else if (this.doingSearch && string.IsNullOrEmpty(this.searchInput))
+        {
+            ImGui.SetNextItemOpen(false, ImGuiCond.Always);
+        }
 
-            for (var i = 0; i < UnitListCount; i++)
+        var treeNode = ImGui.TreeNode($"{this.listNames[index]}##unitList_{index}");
+        ImGui.PopStyleColor();
+
+        ImGui.SameLine();
+        ImGui.TextDisabled($"C:{count}  {ptr:X}");
+        return treeNode;
+    }
+
+    private void DrawUnitBaseList()
+    {
+        var foundSelected = false;
+        var noResults = true;
+        var stage = this.getAtkStageSingleton();
+
+        var unitManagers = &stage->RaptureAtkUnitManager->AtkUnitManager.DepthLayerOneList;
+
+        var searchStr = this.searchInput;
+        var searching = !string.IsNullOrEmpty(searchStr);
+
+        for (var i = 0; i < UnitListCount; i++)
+        {
+            var headerDrawn = false;
+
+            var highlight = this.selectedUnitBase != null && this.selectedInList[i];
+            this.selectedInList[i] = false;
+            var unitManager = &unitManagers[i];
+
+            var unitBaseArray = &unitManager->AtkUnitEntries;
+
+            var headerOpen = true;
+
+            if (!searching)
             {
-                var headerDrawn = false;
+                headerOpen = this.DrawUnitListHeader(i, unitManager->Count, (ulong)unitManager, highlight);
+                headerDrawn = true;
+                noResults = false;
+            }
 
-                var highlight = this.selectedUnitBase != null && this.selectedInList[i];
-                this.selectedInList[i] = false;
-                var unitManager = &unitManagers[i];
+            for (var j = 0; j < unitManager->Count && headerOpen; j++)
+            {
+                var unitBase = unitBaseArray[j];
+                if (this.selectedUnitBase != null && unitBase == this.selectedUnitBase)
+                {
+                    this.selectedInList[i] = true;
+                    foundSelected = true;
+                }
 
-                var unitBaseArray = &unitManager->AtkUnitEntries;
+                var name = Marshal.PtrToStringAnsi(new IntPtr(unitBase->Name));
+                if (searching)
+                {
+                    if (name == null || !name.ToLower().Contains(searchStr.ToLower())) continue;
+                }
 
-                var headerOpen = true;
-
-                if (!searching)
+                noResults = false;
+                if (!headerDrawn)
                 {
                     headerOpen = this.DrawUnitListHeader(i, unitManager->Count, (ulong)unitManager, highlight);
                     headerDrawn = true;
-                    noResults = false;
                 }
 
-                for (var j = 0; j < unitManager->Count && headerOpen; j++)
+                if (headerOpen)
                 {
-                    var unitBase = unitBaseArray[j];
-                    if (this.selectedUnitBase != null && unitBase == this.selectedUnitBase)
+                    var visible = (unitBase->Flags & 0x20) == 0x20;
+                    ImGui.PushStyleColor(ImGuiCol.Text, visible ? 0xFF00FF00 : 0xFF999999);
+
+                    if (ImGui.Selectable($"{name}##list{i}-{(ulong)unitBase:X}_{j}", this.selectedUnitBase == unitBase))
                     {
-                        this.selectedInList[i] = true;
+                        this.selectedUnitBase = unitBase;
                         foundSelected = true;
-                    }
-
-                    var name = Marshal.PtrToStringAnsi(new IntPtr(unitBase->Name));
-                    if (searching)
-                    {
-                        if (name == null || !name.ToLower().Contains(searchStr.ToLower())) continue;
-                    }
-
-                    noResults = false;
-                    if (!headerDrawn)
-                    {
-                        headerOpen = this.DrawUnitListHeader(i, unitManager->Count, (ulong)unitManager, highlight);
-                        headerDrawn = true;
-                    }
-
-                    if (headerOpen)
-                    {
-                        var visible = (unitBase->Flags & 0x20) == 0x20;
-                        ImGui.PushStyleColor(ImGuiCol.Text, visible ? 0xFF00FF00 : 0xFF999999);
-
-                        if (ImGui.Selectable($"{name}##list{i}-{(ulong)unitBase:X}_{j}", this.selectedUnitBase == unitBase))
-                        {
-                            this.selectedUnitBase = unitBase;
-                            foundSelected = true;
-                            this.selectedInList[i] = true;
-                        }
-
-                        ImGui.PopStyleColor();
-                    }
-                }
-
-                if (headerDrawn && headerOpen)
-                {
-                    ImGui.TreePop();
-                }
-
-                if (this.selectedInList[i] == false && this.selectedUnitBase != null)
-                {
-                    for (var j = 0; j < unitManager->Count; j++)
-                    {
-                        if (this.selectedUnitBase == null || unitBaseArray[j] != this.selectedUnitBase) continue;
                         this.selectedInList[i] = true;
-                        foundSelected = true;
                     }
+
+                    ImGui.PopStyleColor();
                 }
             }
 
-            if (noResults)
+            if (headerDrawn && headerOpen)
             {
-                ImGui.TextDisabled("No Results");
+                ImGui.TreePop();
             }
 
-            if (!foundSelected)
+            if (this.selectedInList[i] == false && this.selectedUnitBase != null)
             {
-                this.selectedUnitBase = null;
-            }
-
-            if (this.doingSearch && string.IsNullOrEmpty(this.searchInput))
-            {
-                this.doingSearch = false;
-            }
-            else if (!this.doingSearch && !string.IsNullOrEmpty(this.searchInput))
-            {
-                this.doingSearch = true;
+                for (var j = 0; j < unitManager->Count; j++)
+                {
+                    if (this.selectedUnitBase == null || unitBaseArray[j] != this.selectedUnitBase) continue;
+                    this.selectedInList[i] = true;
+                    foundSelected = true;
+                }
             }
         }
 
-        private Vector2 GetNodePosition(AtkResNode* node)
+        if (noResults)
         {
-            var pos = new Vector2(node->X, node->Y);
-            var par = node->ParentNode;
-            while (par != null)
-            {
-                pos *= new Vector2(par->ScaleX, par->ScaleY);
-                pos += new Vector2(par->X, par->Y);
-                par = par->ParentNode;
-            }
-
-            return pos;
+            ImGui.TextDisabled("No Results");
         }
 
-        private Vector2 GetNodeScale(AtkResNode* node)
+        if (!foundSelected)
         {
-            if (node == null) return new Vector2(1, 1);
-            var scale = new Vector2(node->ScaleX, node->ScaleY);
-            while (node->ParentNode != null)
-            {
-                node = node->ParentNode;
-                scale *= new Vector2(node->ScaleX, node->ScaleY);
-            }
-
-            return scale;
+            this.selectedUnitBase = null;
         }
 
-        private bool GetNodeVisible(AtkResNode* node)
+        if (this.doingSearch && string.IsNullOrEmpty(this.searchInput))
         {
-            if (node == null) return false;
-            while (node != null)
-            {
-                if ((node->Flags & (short)NodeFlags.Visible) != (short)NodeFlags.Visible) return false;
-                node = node->ParentNode;
-            }
-
-            return true;
+            this.doingSearch = false;
         }
-
-        private void DrawOutline(AtkResNode* node)
+        else if (!this.doingSearch && !string.IsNullOrEmpty(this.searchInput))
         {
-            var position = this.GetNodePosition(node);
-            var scale = this.GetNodeScale(node);
-            var size = new Vector2(node->Width, node->Height) * scale;
-
-            var nodeVisible = this.GetNodeVisible(node);
-
-            position += ImGuiHelpers.MainViewport.Pos;
-
-            ImGui.GetForegroundDrawList(ImGuiHelpers.MainViewport).AddRect(position, position + size, nodeVisible ? 0xFF00FF00 : 0xFF0000FF);
+            this.doingSearch = true;
         }
     }
+
+    private Vector2 GetNodePosition(AtkResNode* node)
+    {
+        var pos = new Vector2(node->X, node->Y);
+        var par = node->ParentNode;
+        while (par != null)
+        {
+            pos *= new Vector2(par->ScaleX, par->ScaleY);
+            pos += new Vector2(par->X, par->Y);
+            par = par->ParentNode;
+        }
+
+        return pos;
+    }
+
+    private Vector2 GetNodeScale(AtkResNode* node)
+    {
+        if (node == null) return new Vector2(1, 1);
+        var scale = new Vector2(node->ScaleX, node->ScaleY);
+        while (node->ParentNode != null)
+        {
+            node = node->ParentNode;
+            scale *= new Vector2(node->ScaleX, node->ScaleY);
+        }
+
+        return scale;
+    }
+
+    private bool GetNodeVisible(AtkResNode* node)
+    {
+        if (node == null) return false;
+        while (node != null)
+        {
+            if ((node->Flags & (short)NodeFlags.Visible) != (short)NodeFlags.Visible) return false;
+            node = node->ParentNode;
+        }
+
+        return true;
+    }
+
+    private void DrawOutline(AtkResNode* node)
+    {
+        var position = this.GetNodePosition(node);
+        var scale = this.GetNodeScale(node);
+        var size = new Vector2(node->Width, node->Height) * scale;
+
+        var nodeVisible = this.GetNodeVisible(node);
+
+        position += ImGuiHelpers.MainViewport.Pos;
+
+        ImGui.GetForegroundDrawList(ImGuiHelpers.MainViewport).AddRect(position, position + size, nodeVisible ? 0xFF00FF00 : 0xFF0000FF);
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
index c035f0d6f..ea1f7cd95 100644
--- a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
@@ -8,161 +8,160 @@ using Dalamud.Utility;
 using ImGuiNET;
 using ImGuiScene;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// For major updates, an in-game Changelog window.
+/// </summary>
+internal sealed class ChangelogWindow : Window, IDisposable
 {
     /// <summary>
-    /// For major updates, an in-game Changelog window.
+    /// Whether the latest update warrants a changelog window.
     /// </summary>
-    internal sealed class ChangelogWindow : Window, IDisposable
-    {
-        /// <summary>
-        /// Whether the latest update warrants a changelog window.
-        /// </summary>
-        public const string WarrantsChangelogForMajorMinor = "7.0.";
+    public const string WarrantsChangelogForMajorMinor = "7.0.";
 
-        private const string ChangeLog =
-            @"• Updated Dalamud for compatibility with Patch 6.2
+    private const string ChangeLog =
+        @"• Updated Dalamud for compatibility with Patch 6.2
 • Made things more speedy
 • Plugins can now be toggled off while remaining installed, instead of being removed completely
 
 If you note any issues or need help, please check the FAQ, and reach out on our Discord if you need help.
 Thanks and have fun!";
 
-        private const string UpdatePluginsInfo =
-            @"• All of your plugins were disabled automatically, due to this update. This is normal.
+    private const string UpdatePluginsInfo =
+        @"• All of your plugins were disabled automatically, due to this update. This is normal.
 • Open the plugin installer, then click 'update plugins'. Updated plugins should update and then re-enable themselves.
    => Please keep in mind that not all of your plugins may already be updated for the new version.
    => If some plugins are displayed with a red cross in the 'Installed Plugins' tab, they may not yet be available.";
 
-        private readonly string assemblyVersion = Util.AssemblyVersion;
+    private readonly string assemblyVersion = Util.AssemblyVersion;
 
-        private readonly TextureWrap logoTexture;
+    private readonly TextureWrap logoTexture;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ChangelogWindow"/> class.
-        /// </summary>
-        public ChangelogWindow()
-            : base("What's new in Dalamud?", ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize)
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ChangelogWindow"/> class.
+    /// </summary>
+    public ChangelogWindow()
+        : base("What's new in Dalamud?", ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize)
+    {
+        this.Namespace = "DalamudChangelogWindow";
+
+        this.Size = new Vector2(885, 463);
+        this.SizeCondition = ImGuiCond.Appearing;
+
+        var interfaceManager = Service<InterfaceManager>.Get();
+        var dalamud = Service<Dalamud>.Get();
+
+        this.logoTexture =
+            interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "logo.png"))!;
+    }
+
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        ImGui.Text($"Dalamud has been updated to version D{this.assemblyVersion}.");
+
+        ImGuiHelpers.ScaledDummy(10);
+
+        ImGui.Text("The following changes were introduced:");
+
+        ImGui.SameLine();
+        ImGuiHelpers.ScaledDummy(0);
+        var imgCursor = ImGui.GetCursorPos();
+
+        ImGui.TextWrapped(ChangeLog);
+
+        ImGuiHelpers.ScaledDummy(5);
+
+        ImGui.TextColored(ImGuiColors.DalamudRed, " !!! ATTENTION !!!");
+
+        ImGui.TextWrapped(UpdatePluginsInfo);
+
+        ImGuiHelpers.ScaledDummy(10);
+
+        // ImGui.Text("Thank you for using our tools!");
+
+        // ImGuiHelpers.ScaledDummy(10);
+
+        ImGui.PushFont(UiBuilder.IconFont);
+
+        if (ImGui.Button(FontAwesomeIcon.Download.ToIconString()))
         {
-            this.Namespace = "DalamudChangelogWindow";
-
-            this.Size = new Vector2(885, 463);
-            this.SizeCondition = ImGuiCond.Appearing;
-
-            var interfaceManager = Service<InterfaceManager>.Get();
-            var dalamud = Service<Dalamud>.Get();
-
-            this.logoTexture =
-                interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "logo.png"))!;
+            Service<DalamudInterface>.Get().OpenPluginInstaller();
         }
 
-        /// <inheritdoc/>
-        public override void Draw()
+        if (ImGui.IsItemHovered())
         {
-            ImGui.Text($"Dalamud has been updated to version D{this.assemblyVersion}.");
-
-            ImGuiHelpers.ScaledDummy(10);
-
-            ImGui.Text("The following changes were introduced:");
-
-            ImGui.SameLine();
-            ImGuiHelpers.ScaledDummy(0);
-            var imgCursor = ImGui.GetCursorPos();
-
-            ImGui.TextWrapped(ChangeLog);
-
-            ImGuiHelpers.ScaledDummy(5);
-
-            ImGui.TextColored(ImGuiColors.DalamudRed, " !!! ATTENTION !!!");
-
-            ImGui.TextWrapped(UpdatePluginsInfo);
-
-            ImGuiHelpers.ScaledDummy(10);
-
-            // ImGui.Text("Thank you for using our tools!");
-
-            // ImGuiHelpers.ScaledDummy(10);
-
-            ImGui.PushFont(UiBuilder.IconFont);
-
-            if (ImGui.Button(FontAwesomeIcon.Download.ToIconString()))
-            {
-                Service<DalamudInterface>.Get().OpenPluginInstaller();
-            }
-
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.PopFont();
-                ImGui.SetTooltip("Open Plugin Installer");
-                ImGui.PushFont(UiBuilder.IconFont);
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button(FontAwesomeIcon.LaughBeam.ToIconString()))
-            {
-                Util.OpenLink("https://discord.gg/3NMcUV5");
-            }
-
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.PopFont();
-                ImGui.SetTooltip("Join our Discord server");
-                ImGui.PushFont(UiBuilder.IconFont);
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button(FontAwesomeIcon.Globe.ToIconString()))
-            {
-                Util.OpenLink("https://goatcorp.github.io/faq/");
-            }
-
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.PopFont();
-                ImGui.SetTooltip("See the FAQ");
-                ImGui.PushFont(UiBuilder.IconFont);
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button(FontAwesomeIcon.Heart.ToIconString()))
-            {
-                Util.OpenLink("https://goatcorp.github.io/faq/support");
-            }
-
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.PopFont();
-                ImGui.SetTooltip("Support what we care about");
-                ImGui.PushFont(UiBuilder.IconFont);
-            }
-
             ImGui.PopFont();
-
-            ImGui.SameLine();
-            ImGuiHelpers.ScaledDummy(20, 0);
-            ImGui.SameLine();
-
-            if (ImGui.Button("Close"))
-            {
-                this.IsOpen = false;
-            }
-
-            imgCursor.X += 750;
-            imgCursor.Y -= 30;
-            ImGui.SetCursorPos(imgCursor);
-
-            ImGui.Image(this.logoTexture.ImGuiHandle, new Vector2(100));
+            ImGui.SetTooltip("Open Plugin Installer");
+            ImGui.PushFont(UiBuilder.IconFont);
         }
 
-        /// <summary>
-        /// Dispose this window.
-        /// </summary>
-        public void Dispose()
+        ImGui.SameLine();
+
+        if (ImGui.Button(FontAwesomeIcon.LaughBeam.ToIconString()))
         {
-            this.logoTexture.Dispose();
+            Util.OpenLink("https://discord.gg/3NMcUV5");
         }
+
+        if (ImGui.IsItemHovered())
+        {
+            ImGui.PopFont();
+            ImGui.SetTooltip("Join our Discord server");
+            ImGui.PushFont(UiBuilder.IconFont);
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button(FontAwesomeIcon.Globe.ToIconString()))
+        {
+            Util.OpenLink("https://goatcorp.github.io/faq/");
+        }
+
+        if (ImGui.IsItemHovered())
+        {
+            ImGui.PopFont();
+            ImGui.SetTooltip("See the FAQ");
+            ImGui.PushFont(UiBuilder.IconFont);
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button(FontAwesomeIcon.Heart.ToIconString()))
+        {
+            Util.OpenLink("https://goatcorp.github.io/faq/support");
+        }
+
+        if (ImGui.IsItemHovered())
+        {
+            ImGui.PopFont();
+            ImGui.SetTooltip("Support what we care about");
+            ImGui.PushFont(UiBuilder.IconFont);
+        }
+
+        ImGui.PopFont();
+
+        ImGui.SameLine();
+        ImGuiHelpers.ScaledDummy(20, 0);
+        ImGui.SameLine();
+
+        if (ImGui.Button("Close"))
+        {
+            this.IsOpen = false;
+        }
+
+        imgCursor.X += 750;
+        imgCursor.Y -= 30;
+        ImGui.SetCursorPos(imgCursor);
+
+        ImGui.Image(this.logoTexture.ImGuiHandle, new Vector2(100));
+    }
+
+    /// <summary>
+    /// Dispose this window.
+    /// </summary>
+    public void Dispose()
+    {
+        this.logoTexture.Dispose();
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs b/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs
index aeabf5e5f..3d2b585ac 100644
--- a/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs
@@ -7,60 +7,59 @@ using Dalamud.Interface.Colors;
 using Dalamud.Interface.Windowing;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// Color Demo Window to view custom ImGui colors.
+/// </summary>
+internal sealed class ColorDemoWindow : Window
 {
+    private readonly List<(string Name, Vector4 Color)> colors;
+
     /// <summary>
-    /// Color Demo Window to view custom ImGui colors.
+    /// Initializes a new instance of the <see cref="ColorDemoWindow"/> class.
     /// </summary>
-    internal sealed class ColorDemoWindow : Window
+    public ColorDemoWindow()
+        : base("Dalamud Colors Demo")
     {
-        private readonly List<(string Name, Vector4 Color)> colors;
+        this.Size = new Vector2(600, 500);
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ColorDemoWindow"/> class.
-        /// </summary>
-        public ColorDemoWindow()
-            : base("Dalamud Colors Demo")
+        this.colors = new List<(string Name, Vector4 Color)>()
         {
-            this.Size = new Vector2(600, 500);
-            this.SizeCondition = ImGuiCond.FirstUseEver;
+            ("DalamudRed", ImGuiColors.DalamudRed),
+            ("DalamudGrey", ImGuiColors.DalamudGrey),
+            ("DalamudGrey2", ImGuiColors.DalamudGrey2),
+            ("DalamudGrey3", ImGuiColors.DalamudGrey3),
+            ("DalamudWhite", ImGuiColors.DalamudWhite),
+            ("DalamudWhite2", ImGuiColors.DalamudWhite2),
+            ("DalamudOrange", ImGuiColors.DalamudOrange),
+            ("DalamudYellow", ImGuiColors.DalamudYellow),
+            ("DalamudViolet", ImGuiColors.DalamudViolet),
+            ("TankBlue", ImGuiColors.TankBlue),
+            ("HealerGreen", ImGuiColors.HealerGreen),
+            ("DPSRed", ImGuiColors.DPSRed),
+            ("ParsedGrey", ImGuiColors.ParsedGrey),
+            ("ParsedGreen", ImGuiColors.ParsedGreen),
+            ("ParsedBlue", ImGuiColors.ParsedBlue),
+            ("ParsedPurple", ImGuiColors.ParsedPurple),
+            ("ParsedOrange", ImGuiColors.ParsedOrange),
+            ("ParsedPink", ImGuiColors.ParsedPink),
+            ("ParsedGold", ImGuiColors.ParsedGold),
+        }.OrderBy(colorDemo => colorDemo.Name).ToList();
+    }
 
-            this.colors = new List<(string Name, Vector4 Color)>()
-            {
-                ("DalamudRed", ImGuiColors.DalamudRed),
-                ("DalamudGrey", ImGuiColors.DalamudGrey),
-                ("DalamudGrey2", ImGuiColors.DalamudGrey2),
-                ("DalamudGrey3", ImGuiColors.DalamudGrey3),
-                ("DalamudWhite", ImGuiColors.DalamudWhite),
-                ("DalamudWhite2", ImGuiColors.DalamudWhite2),
-                ("DalamudOrange", ImGuiColors.DalamudOrange),
-                ("DalamudYellow", ImGuiColors.DalamudYellow),
-                ("DalamudViolet", ImGuiColors.DalamudViolet),
-                ("TankBlue", ImGuiColors.TankBlue),
-                ("HealerGreen", ImGuiColors.HealerGreen),
-                ("DPSRed", ImGuiColors.DPSRed),
-                ("ParsedGrey", ImGuiColors.ParsedGrey),
-                ("ParsedGreen", ImGuiColors.ParsedGreen),
-                ("ParsedBlue", ImGuiColors.ParsedBlue),
-                ("ParsedPurple", ImGuiColors.ParsedPurple),
-                ("ParsedOrange", ImGuiColors.ParsedOrange),
-                ("ParsedPink", ImGuiColors.ParsedPink),
-                ("ParsedGold", ImGuiColors.ParsedGold),
-            }.OrderBy(colorDemo => colorDemo.Name).ToList();
-        }
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        ImGui.Text("This is a collection of UI colors you can use in your plugin.");
 
-        /// <inheritdoc/>
-        public override void Draw()
+        ImGui.Separator();
+
+        foreach (var property in typeof(ImGuiColors).GetProperties(BindingFlags.Public | BindingFlags.Static))
         {
-            ImGui.Text("This is a collection of UI colors you can use in your plugin.");
-
-            ImGui.Separator();
-
-            foreach (var property in typeof(ImGuiColors).GetProperties(BindingFlags.Public | BindingFlags.Static))
-            {
-                var color = (Vector4)property.GetValue(null);
-                ImGui.TextColored(color, property.Name);
-            }
+            var color = (Vector4)property.GetValue(null);
+            ImGui.TextColored(color, property.Name);
         }
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs b/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs
index a3c1f48d5..638b30e66 100644
--- a/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs
@@ -9,154 +9,153 @@ using Dalamud.Interface.Components;
 using Dalamud.Interface.Windowing;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// Component Demo Window to view custom ImGui components.
+/// </summary>
+internal sealed class ComponentDemoWindow : Window
 {
-    /// <summary>
-    /// Component Demo Window to view custom ImGui components.
-    /// </summary>
-    internal sealed class ComponentDemoWindow : Window
+    private static readonly TimeSpan DefaultEasingTime = new(0, 0, 0, 1700);
+
+    private readonly List<(string Name, Action Demo)> componentDemos;
+    private readonly IReadOnlyList<Easing> easings = new Easing[]
     {
-        private static readonly TimeSpan DefaultEasingTime = new(0, 0, 0, 1700);
+        new InSine(DefaultEasingTime), new OutSine(DefaultEasingTime), new InOutSine(DefaultEasingTime),
+        new InCubic(DefaultEasingTime), new OutCubic(DefaultEasingTime), new InOutCubic(DefaultEasingTime),
+        new InQuint(DefaultEasingTime), new OutQuint(DefaultEasingTime), new InOutQuint(DefaultEasingTime),
+        new InCirc(DefaultEasingTime), new OutCirc(DefaultEasingTime), new InOutCirc(DefaultEasingTime),
+        new InElastic(DefaultEasingTime), new OutElastic(DefaultEasingTime), new InOutElastic(DefaultEasingTime),
+    };
 
-        private readonly List<(string Name, Action Demo)> componentDemos;
-        private readonly IReadOnlyList<Easing> easings = new Easing[]
+    private int animationTimeMs = (int)DefaultEasingTime.TotalMilliseconds;
+    private Vector4 defaultColor = ImGuiColors.DalamudOrange;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ComponentDemoWindow"/> class.
+    /// </summary>
+    public ComponentDemoWindow()
+        : base("Dalamud Components Demo")
+    {
+        this.Size = new Vector2(600, 500);
+        this.SizeCondition = ImGuiCond.FirstUseEver;
+
+        this.RespectCloseHotkey = false;
+
+        this.componentDemos = new()
         {
-            new InSine(DefaultEasingTime), new OutSine(DefaultEasingTime), new InOutSine(DefaultEasingTime),
-            new InCubic(DefaultEasingTime), new OutCubic(DefaultEasingTime), new InOutCubic(DefaultEasingTime),
-            new InQuint(DefaultEasingTime), new OutQuint(DefaultEasingTime), new InOutQuint(DefaultEasingTime),
-            new InCirc(DefaultEasingTime), new OutCirc(DefaultEasingTime), new InOutCirc(DefaultEasingTime),
-            new InElastic(DefaultEasingTime), new OutElastic(DefaultEasingTime), new InOutElastic(DefaultEasingTime),
+            ("Test", ImGuiComponents.Test),
+            ("HelpMarker", HelpMarkerDemo),
+            ("IconButton", IconButtonDemo),
+            ("TextWithLabel", TextWithLabelDemo),
+            ("ColorPickerWithPalette", this.ColorPickerWithPaletteDemo),
         };
+    }
 
-        private int animationTimeMs = (int)DefaultEasingTime.TotalMilliseconds;
-        private Vector4 defaultColor = ImGuiColors.DalamudOrange;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ComponentDemoWindow"/> class.
-        /// </summary>
-        public ComponentDemoWindow()
-            : base("Dalamud Components Demo")
+    /// <inheritdoc/>
+    public override void OnOpen()
+    {
+        foreach (var easing in this.easings)
         {
-            this.Size = new Vector2(600, 500);
-            this.SizeCondition = ImGuiCond.FirstUseEver;
+            easing.Restart();
+        }
+    }
 
-            this.RespectCloseHotkey = false;
+    /// <inheritdoc/>
+    public override void OnClose()
+    {
+        foreach (var easing in this.easings)
+        {
+            easing.Stop();
+        }
+    }
 
-            this.componentDemos = new()
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        ImGui.Text("This is a collection of UI components you can use in your plugin.");
+
+        for (var i = 0; i < this.componentDemos.Count; i++)
+        {
+            var componentDemo = this.componentDemos[i];
+
+            if (ImGui.CollapsingHeader($"{componentDemo.Name}###comp{i}"))
             {
-                ("Test", ImGuiComponents.Test),
-                ("HelpMarker", HelpMarkerDemo),
-                ("IconButton", IconButtonDemo),
-                ("TextWithLabel", TextWithLabelDemo),
-                ("ColorPickerWithPalette", this.ColorPickerWithPaletteDemo),
-            };
+                componentDemo.Demo();
+            }
         }
 
-        /// <inheritdoc/>
-        public override void OnOpen()
+        if (ImGui.CollapsingHeader("Easing animations"))
         {
-            foreach (var easing in this.easings)
+            this.EasingsDemo();
+        }
+    }
+
+    private static void HelpMarkerDemo()
+    {
+        ImGui.Text("Hover over the icon to learn more.");
+        ImGuiComponents.HelpMarker("help me!");
+    }
+
+    private static void IconButtonDemo()
+    {
+        ImGui.Text("Click on the icon to use as a button.");
+        ImGui.SameLine();
+        if (ImGuiComponents.IconButton(1, FontAwesomeIcon.Carrot))
+        {
+            ImGui.OpenPopup("IconButtonDemoPopup");
+        }
+
+        if (ImGui.BeginPopup("IconButtonDemoPopup"))
+        {
+            ImGui.Text("You clicked!");
+            ImGui.EndPopup();
+        }
+    }
+
+    private static void TextWithLabelDemo()
+    {
+        ImGuiComponents.TextWithLabel("Label", "Hover to see more", "more");
+    }
+
+    private void EasingsDemo()
+    {
+        ImGui.SliderInt("Speed in MS", ref this.animationTimeMs, 200, 5000);
+
+        foreach (var easing in this.easings)
+        {
+            easing.Duration = new TimeSpan(0, 0, 0, 0, this.animationTimeMs);
+
+            if (!easing.IsRunning)
+            {
+                easing.Start();
+            }
+
+            var cursor = ImGui.GetCursorPos();
+            var p1 = new Vector2(cursor.X + 5, cursor.Y);
+            var p2 = p1 + new Vector2(45, 0);
+            easing.Point1 = p1;
+            easing.Point2 = p2;
+            easing.Update();
+
+            if (easing.IsDone)
             {
                 easing.Restart();
             }
-        }
 
-        /// <inheritdoc/>
-        public override void OnClose()
-        {
-            foreach (var easing in this.easings)
-            {
-                easing.Stop();
-            }
-        }
+            ImGui.SetCursorPos(easing.EasedPoint);
+            ImGui.Bullet();
 
-        /// <inheritdoc/>
-        public override void Draw()
-        {
-            ImGui.Text("This is a collection of UI components you can use in your plugin.");
-
-            for (var i = 0; i < this.componentDemos.Count; i++)
-            {
-                var componentDemo = this.componentDemos[i];
-
-                if (ImGui.CollapsingHeader($"{componentDemo.Name}###comp{i}"))
-                {
-                    componentDemo.Demo();
-                }
-            }
-
-            if (ImGui.CollapsingHeader("Easing animations"))
-            {
-                this.EasingsDemo();
-            }
-        }
-
-        private static void HelpMarkerDemo()
-        {
-            ImGui.Text("Hover over the icon to learn more.");
-            ImGuiComponents.HelpMarker("help me!");
-        }
-
-        private static void IconButtonDemo()
-        {
-            ImGui.Text("Click on the icon to use as a button.");
-            ImGui.SameLine();
-            if (ImGuiComponents.IconButton(1, FontAwesomeIcon.Carrot))
-            {
-                ImGui.OpenPopup("IconButtonDemoPopup");
-            }
-
-            if (ImGui.BeginPopup("IconButtonDemoPopup"))
-            {
-                ImGui.Text("You clicked!");
-                ImGui.EndPopup();
-            }
-        }
-
-        private static void TextWithLabelDemo()
-        {
-            ImGuiComponents.TextWithLabel("Label", "Hover to see more", "more");
-        }
-
-        private void EasingsDemo()
-        {
-            ImGui.SliderInt("Speed in MS", ref this.animationTimeMs, 200, 5000);
-
-            foreach (var easing in this.easings)
-            {
-                easing.Duration = new TimeSpan(0, 0, 0, 0, this.animationTimeMs);
-
-                if (!easing.IsRunning)
-                {
-                    easing.Start();
-                }
-
-                var cursor = ImGui.GetCursorPos();
-                var p1 = new Vector2(cursor.X + 5, cursor.Y);
-                var p2 = p1 + new Vector2(45, 0);
-                easing.Point1 = p1;
-                easing.Point2 = p2;
-                easing.Update();
-
-                if (easing.IsDone)
-                {
-                    easing.Restart();
-                }
-
-                ImGui.SetCursorPos(easing.EasedPoint);
-                ImGui.Bullet();
-
-                ImGui.SetCursorPos(cursor + new Vector2(0, 10));
-                ImGui.Text($"{easing.GetType().Name} ({easing.Value})");
-                ImGuiHelpers.ScaledDummy(5);
-            }
-        }
-
-        private void ColorPickerWithPaletteDemo()
-        {
-            ImGui.Text("Click on the color button to use the picker.");
-            ImGui.SameLine();
-            this.defaultColor = ImGuiComponents.ColorPickerWithPalette(1, "ColorPickerWithPalette Demo", this.defaultColor);
+            ImGui.SetCursorPos(cursor + new Vector2(0, 10));
+            ImGui.Text($"{easing.GetType().Name} ({easing.Value})");
+            ImGuiHelpers.ScaledDummy(5);
         }
     }
+
+    private void ColorPickerWithPaletteDemo()
+    {
+        ImGui.Text("Click on the color button to use the picker.");
+        ImGui.SameLine();
+        this.defaultColor = ImGuiComponents.ColorPickerWithPalette(1, "ColorPickerWithPalette Demo", this.defaultColor);
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs b/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
index 5a233b37a..ffa3323dd 100644
--- a/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
@@ -17,570 +17,569 @@ using ImGuiNET;
 using Serilog;
 using Serilog.Events;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// The window that displays the Dalamud log file in-game.
+/// </summary>
+internal class ConsoleWindow : Window, IDisposable
 {
+    private readonly List<LogEntry> logText = new();
+    private readonly object renderLock = new();
+
+    private readonly string[] logLevelStrings = new[] { "Verbose", "Debug", "Information", "Warning", "Error", "Fatal" };
+
+    private List<LogEntry> filteredLogText = new();
+    private bool autoScroll;
+    private bool openAtStartup;
+
+    private bool? lastCmdSuccess;
+
+    private string commandText = string.Empty;
+
+    private string textFilter = string.Empty;
+    private int levelFilter;
+    private List<string> sourceFilters = new();
+    private bool filterShowUncaughtExceptions = false;
+    private bool isFiltered = false;
+
+    private int historyPos;
+    private List<string> history = new();
+
+    private bool killGameArmed = false;
+
     /// <summary>
-    /// The window that displays the Dalamud log file in-game.
+    /// Initializes a new instance of the <see cref="ConsoleWindow"/> class.
     /// </summary>
-    internal class ConsoleWindow : Window, IDisposable
+    public ConsoleWindow()
+        : base("Dalamud Console")
     {
-        private readonly List<LogEntry> logText = new();
-        private readonly object renderLock = new();
+        var configuration = Service<DalamudConfiguration>.Get();
 
-        private readonly string[] logLevelStrings = new[] { "Verbose", "Debug", "Information", "Warning", "Error", "Fatal" };
+        this.autoScroll = configuration.LogAutoScroll;
+        this.openAtStartup = configuration.LogOpenAtStartup;
+        SerilogEventSink.Instance.LogLine += this.OnLogLine;
 
-        private List<LogEntry> filteredLogText = new();
-        private bool autoScroll;
-        private bool openAtStartup;
+        this.Size = new Vector2(500, 400);
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
-        private bool? lastCmdSuccess;
+        this.RespectCloseHotkey = false;
+    }
 
-        private string commandText = string.Empty;
+    private List<LogEntry> LogEntries => this.isFiltered ? this.filteredLogText : this.logText;
 
-        private string textFilter = string.Empty;
-        private int levelFilter;
-        private List<string> sourceFilters = new();
-        private bool filterShowUncaughtExceptions = false;
-        private bool isFiltered = false;
+    /// <inheritdoc/>
+    public override void OnOpen()
+    {
+        this.killGameArmed = false;
+        base.OnOpen();
+    }
 
-        private int historyPos;
-        private List<string> history = new();
+    /// <summary>
+    /// Dispose of managed and unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+        SerilogEventSink.Instance.LogLine -= this.OnLogLine;
+    }
 
-        private bool killGameArmed = false;
+    /// <summary>
+    /// Clear the window of all log entries.
+    /// </summary>
+    public void Clear()
+    {
+        lock (this.renderLock)
+        {
+            this.logText.Clear();
+            this.filteredLogText.Clear();
+        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConsoleWindow"/> class.
-        /// </summary>
-        public ConsoleWindow()
-            : base("Dalamud Console")
+    /// <summary>
+    /// Add a single log line to the display.
+    /// </summary>
+    /// <param name="line">The line to add.</param>
+    /// <param name="logEvent">The Serilog event associated with this line.</param>
+    public void HandleLogLine(string line, LogEvent logEvent)
+    {
+        if (line.IndexOfAny(new[] { '\n', '\r' }) != -1)
+        {
+            var subLines = line.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries);
+
+            this.AddAndFilter(subLines[0], logEvent, false);
+
+            for (var i = 1; i < subLines.Length; i++)
+            {
+                this.AddAndFilter(subLines[i], logEvent, true);
+            }
+        }
+        else
+        {
+            this.AddAndFilter(line, logEvent, false);
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        // Options menu
+        if (ImGui.BeginPopup("Options"))
         {
             var configuration = Service<DalamudConfiguration>.Get();
 
-            this.autoScroll = configuration.LogAutoScroll;
-            this.openAtStartup = configuration.LogOpenAtStartup;
-            SerilogEventSink.Instance.LogLine += this.OnLogLine;
-
-            this.Size = new Vector2(500, 400);
-            this.SizeCondition = ImGuiCond.FirstUseEver;
-
-            this.RespectCloseHotkey = false;
-        }
-
-        private List<LogEntry> LogEntries => this.isFiltered ? this.filteredLogText : this.logText;
-
-        /// <inheritdoc/>
-        public override void OnOpen()
-        {
-            this.killGameArmed = false;
-            base.OnOpen();
-        }
-
-        /// <summary>
-        /// Dispose of managed and unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            SerilogEventSink.Instance.LogLine -= this.OnLogLine;
-        }
-
-        /// <summary>
-        /// Clear the window of all log entries.
-        /// </summary>
-        public void Clear()
-        {
-            lock (this.renderLock)
+            if (ImGui.Checkbox("Auto-scroll", ref this.autoScroll))
             {
-                this.logText.Clear();
-                this.filteredLogText.Clear();
-            }
-        }
-
-        /// <summary>
-        /// Add a single log line to the display.
-        /// </summary>
-        /// <param name="line">The line to add.</param>
-        /// <param name="logEvent">The Serilog event associated with this line.</param>
-        public void HandleLogLine(string line, LogEvent logEvent)
-        {
-            if (line.IndexOfAny(new[] { '\n', '\r' }) != -1)
-            {
-                var subLines = line.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries);
-
-                this.AddAndFilter(subLines[0], logEvent, false);
-
-                for (var i = 1; i < subLines.Length; i++)
-                {
-                    this.AddAndFilter(subLines[i], logEvent, true);
-                }
-            }
-            else
-            {
-                this.AddAndFilter(line, logEvent, false);
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void Draw()
-        {
-            // Options menu
-            if (ImGui.BeginPopup("Options"))
-            {
-                var configuration = Service<DalamudConfiguration>.Get();
-
-                if (ImGui.Checkbox("Auto-scroll", ref this.autoScroll))
-                {
-                    configuration.LogAutoScroll = this.autoScroll;
-                    configuration.Save();
-                }
-
-                if (ImGui.Checkbox("Open at startup", ref this.openAtStartup))
-                {
-                    configuration.LogOpenAtStartup = this.openAtStartup;
-                    configuration.Save();
-                }
-
-                var prevLevel = (int)EntryPoint.LogLevelSwitch.MinimumLevel;
-                if (ImGui.Combo("Log Level", ref prevLevel, Enum.GetValues(typeof(LogEventLevel)).Cast<LogEventLevel>().Select(x => x.ToString()).ToArray(), 6))
-                {
-                    EntryPoint.LogLevelSwitch.MinimumLevel = (LogEventLevel)prevLevel;
-                    configuration.LogLevel = (LogEventLevel)prevLevel;
-                    configuration.Save();
-                }
-
-                ImGui.EndPopup();
+                configuration.LogAutoScroll = this.autoScroll;
+                configuration.Save();
             }
 
-            // Filter menu
-            if (ImGui.BeginPopup("Filters"))
+            if (ImGui.Checkbox("Open at startup", ref this.openAtStartup))
             {
-                if (ImGui.Checkbox("Enabled", ref this.isFiltered))
-                {
-                    this.Refilter();
-                }
+                configuration.LogOpenAtStartup = this.openAtStartup;
+                configuration.Save();
+            }
 
-                if (ImGui.InputTextWithHint("##filterText", "Text Filter", ref this.textFilter, 255, ImGuiInputTextFlags.EnterReturnsTrue))
-                {
-                    this.Refilter();
-                }
+            var prevLevel = (int)EntryPoint.LogLevelSwitch.MinimumLevel;
+            if (ImGui.Combo("Log Level", ref prevLevel, Enum.GetValues(typeof(LogEventLevel)).Cast<LogEventLevel>().Select(x => x.ToString()).ToArray(), 6))
+            {
+                EntryPoint.LogLevelSwitch.MinimumLevel = (LogEventLevel)prevLevel;
+                configuration.LogLevel = (LogEventLevel)prevLevel;
+                configuration.Save();
+            }
 
-                ImGui.TextColored(ImGuiColors.DalamudGrey, "Enter to confirm.");
+            ImGui.EndPopup();
+        }
 
-                if (ImGui.BeginCombo("Levels", this.levelFilter == 0 ? "All Levels..." : "Selected Levels..."))
+        // Filter menu
+        if (ImGui.BeginPopup("Filters"))
+        {
+            if (ImGui.Checkbox("Enabled", ref this.isFiltered))
+            {
+                this.Refilter();
+            }
+
+            if (ImGui.InputTextWithHint("##filterText", "Text Filter", ref this.textFilter, 255, ImGuiInputTextFlags.EnterReturnsTrue))
+            {
+                this.Refilter();
+            }
+
+            ImGui.TextColored(ImGuiColors.DalamudGrey, "Enter to confirm.");
+
+            if (ImGui.BeginCombo("Levels", this.levelFilter == 0 ? "All Levels..." : "Selected Levels..."))
+            {
+                for (var i = 0; i < this.logLevelStrings.Length; i++)
                 {
-                    for (var i = 0; i < this.logLevelStrings.Length; i++)
+                    if (ImGui.Selectable(this.logLevelStrings[i], ((this.levelFilter >> i) & 1) == 1))
                     {
-                        if (ImGui.Selectable(this.logLevelStrings[i], ((this.levelFilter >> i) & 1) == 1))
-                        {
-                            this.levelFilter ^= 1 << i;
-                            this.Refilter();
-                        }
+                        this.levelFilter ^= 1 << i;
+                        this.Refilter();
                     }
-
-                    ImGui.EndCombo();
                 }
 
-                // Filter by specific plugin(s)
-                var pluginInternalNames = Service<PluginManager>.Get().InstalledPlugins
-                                                                .Select(p => p.Manifest.InternalName)
-                                                                .OrderBy(s => s).ToList();
-                var sourcePreviewVal = this.sourceFilters.Count switch
+                ImGui.EndCombo();
+            }
+
+            // Filter by specific plugin(s)
+            var pluginInternalNames = Service<PluginManager>.Get().InstalledPlugins
+                                                            .Select(p => p.Manifest.InternalName)
+                                                            .OrderBy(s => s).ToList();
+            var sourcePreviewVal = this.sourceFilters.Count switch
+            {
+                0 => "All plugins...",
+                1 => "1 plugin...",
+                _ => $"{this.sourceFilters.Count} plugins...",
+            };
+            var sourceSelectables = pluginInternalNames.Union(this.sourceFilters).ToList();
+            if (ImGui.BeginCombo("Plugins", sourcePreviewVal))
+            {
+                foreach (var selectable in sourceSelectables)
                 {
-                    0 => "All plugins...",
-                    1 => "1 plugin...",
-                    _ => $"{this.sourceFilters.Count} plugins...",
-                };
-                var sourceSelectables = pluginInternalNames.Union(this.sourceFilters).ToList();
-                if (ImGui.BeginCombo("Plugins", sourcePreviewVal))
-                {
-                    foreach (var selectable in sourceSelectables)
+                    if (ImGui.Selectable(selectable, this.sourceFilters.Contains(selectable)))
                     {
-                        if (ImGui.Selectable(selectable, this.sourceFilters.Contains(selectable)))
+                        if (!this.sourceFilters.Contains(selectable))
                         {
-                            if (!this.sourceFilters.Contains(selectable))
-                            {
-                                this.sourceFilters.Add(selectable);
-                            }
-                            else
-                            {
-                                this.sourceFilters.Remove(selectable);
-                            }
-
-                            this.Refilter();
+                            this.sourceFilters.Add(selectable);
                         }
+                        else
+                        {
+                            this.sourceFilters.Remove(selectable);
+                        }
+
+                        this.Refilter();
                     }
-
-                    ImGui.EndCombo();
                 }
 
-                if (ImGui.Checkbox("Always Show Uncaught Exceptions", ref this.filterShowUncaughtExceptions))
+                ImGui.EndCombo();
+            }
+
+            if (ImGui.Checkbox("Always Show Uncaught Exceptions", ref this.filterShowUncaughtExceptions))
+            {
+                this.Refilter();
+            }
+
+            ImGui.EndPopup();
+        }
+
+        ImGui.SameLine();
+
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.Cog))
+            ImGui.OpenPopup("Options");
+
+        if (ImGui.IsItemHovered())
+            ImGui.SetTooltip("Options");
+
+        ImGui.SameLine();
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.Search))
+            ImGui.OpenPopup("Filters");
+
+        if (ImGui.IsItemHovered())
+            ImGui.SetTooltip("Filters");
+
+        ImGui.SameLine();
+        var clear = ImGuiComponents.IconButton(FontAwesomeIcon.Trash);
+
+        if (ImGui.IsItemHovered())
+            ImGui.SetTooltip("Clear Log");
+
+        ImGui.SameLine();
+        var copy = ImGuiComponents.IconButton(FontAwesomeIcon.Copy);
+
+        if (ImGui.IsItemHovered())
+            ImGui.SetTooltip("Copy Log");
+
+        ImGui.SameLine();
+        if (this.killGameArmed)
+        {
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Flushed))
+                Process.GetCurrentProcess().Kill();
+        }
+        else
+        {
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Skull))
+                this.killGameArmed = true;
+        }
+
+        if (ImGui.IsItemHovered())
+            ImGui.SetTooltip("Kill game");
+
+        ImGui.BeginChild("scrolling", new Vector2(0, ImGui.GetFrameHeightWithSpacing() - 55), false, ImGuiWindowFlags.AlwaysHorizontalScrollbar | ImGuiWindowFlags.AlwaysVerticalScrollbar);
+
+        if (clear)
+        {
+            this.Clear();
+        }
+
+        if (copy)
+        {
+            ImGui.LogToClipboard();
+        }
+
+        ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, Vector2.Zero);
+
+        ImGuiListClipperPtr clipper;
+        unsafe
+        {
+            clipper = new ImGuiListClipperPtr(ImGuiNative.ImGuiListClipper_ImGuiListClipper());
+        }
+
+        ImGui.PushFont(InterfaceManager.MonoFont);
+
+        var childPos = ImGui.GetWindowPos();
+        var childDrawList = ImGui.GetWindowDrawList();
+        var childSize = ImGui.GetWindowSize();
+
+        var cursorDiv = ImGuiHelpers.GlobalScale * 92;
+        var cursorLogLevel = ImGuiHelpers.GlobalScale * 100;
+        var cursorLogLine = ImGuiHelpers.GlobalScale * 135;
+
+        lock (this.renderLock)
+        {
+            clipper.Begin(this.LogEntries.Count);
+            while (clipper.Step())
+            {
+                for (var i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
                 {
-                    this.Refilter();
-                }
+                    var line = this.LogEntries[i];
 
-                ImGui.EndPopup();
-            }
+                    if (!line.IsMultiline)
+                        ImGui.Separator();
 
-            ImGui.SameLine();
+                    ImGui.PushStyleColor(ImGuiCol.Header, this.GetColorForLogEventLevel(line.Level));
+                    ImGui.PushStyleColor(ImGuiCol.HeaderActive, this.GetColorForLogEventLevel(line.Level));
+                    ImGui.PushStyleColor(ImGuiCol.HeaderHovered, this.GetColorForLogEventLevel(line.Level));
 
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.Cog))
-                ImGui.OpenPopup("Options");
+                    ImGui.Selectable("###consolenull", true, ImGuiSelectableFlags.AllowItemOverlap | ImGuiSelectableFlags.SpanAllColumns);
+                    ImGui.SameLine();
 
-            if (ImGui.IsItemHovered())
-                ImGui.SetTooltip("Options");
+                    ImGui.PopStyleColor(3);
 
-            ImGui.SameLine();
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.Search))
-                ImGui.OpenPopup("Filters");
-
-            if (ImGui.IsItemHovered())
-                ImGui.SetTooltip("Filters");
-
-            ImGui.SameLine();
-            var clear = ImGuiComponents.IconButton(FontAwesomeIcon.Trash);
-
-            if (ImGui.IsItemHovered())
-                ImGui.SetTooltip("Clear Log");
-
-            ImGui.SameLine();
-            var copy = ImGuiComponents.IconButton(FontAwesomeIcon.Copy);
-
-            if (ImGui.IsItemHovered())
-                ImGui.SetTooltip("Copy Log");
-
-            ImGui.SameLine();
-            if (this.killGameArmed)
-            {
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.Flushed))
-                    Process.GetCurrentProcess().Kill();
-            }
-            else
-            {
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.Skull))
-                    this.killGameArmed = true;
-            }
-
-            if (ImGui.IsItemHovered())
-                ImGui.SetTooltip("Kill game");
-
-            ImGui.BeginChild("scrolling", new Vector2(0, ImGui.GetFrameHeightWithSpacing() - 55), false, ImGuiWindowFlags.AlwaysHorizontalScrollbar | ImGuiWindowFlags.AlwaysVerticalScrollbar);
-
-            if (clear)
-            {
-                this.Clear();
-            }
-
-            if (copy)
-            {
-                ImGui.LogToClipboard();
-            }
-
-            ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, Vector2.Zero);
-
-            ImGuiListClipperPtr clipper;
-            unsafe
-            {
-                clipper = new ImGuiListClipperPtr(ImGuiNative.ImGuiListClipper_ImGuiListClipper());
-            }
-
-            ImGui.PushFont(InterfaceManager.MonoFont);
-
-            var childPos = ImGui.GetWindowPos();
-            var childDrawList = ImGui.GetWindowDrawList();
-            var childSize = ImGui.GetWindowSize();
-
-            var cursorDiv = ImGuiHelpers.GlobalScale * 92;
-            var cursorLogLevel = ImGuiHelpers.GlobalScale * 100;
-            var cursorLogLine = ImGuiHelpers.GlobalScale * 135;
-
-            lock (this.renderLock)
-            {
-                clipper.Begin(this.LogEntries.Count);
-                while (clipper.Step())
-                {
-                    for (var i = clipper.DisplayStart; i < clipper.DisplayEnd; i++)
+                    if (!line.IsMultiline)
                     {
-                        var line = this.LogEntries[i];
-
-                        if (!line.IsMultiline)
-                            ImGui.Separator();
-
-                        ImGui.PushStyleColor(ImGuiCol.Header, this.GetColorForLogEventLevel(line.Level));
-                        ImGui.PushStyleColor(ImGuiCol.HeaderActive, this.GetColorForLogEventLevel(line.Level));
-                        ImGui.PushStyleColor(ImGuiCol.HeaderHovered, this.GetColorForLogEventLevel(line.Level));
-
-                        ImGui.Selectable("###consolenull", true, ImGuiSelectableFlags.AllowItemOverlap | ImGuiSelectableFlags.SpanAllColumns);
+                        ImGui.TextUnformatted(line.TimeStamp.ToString("HH:mm:ss.fff"));
+                        ImGui.SameLine();
+                        ImGui.SetCursorPosX(cursorDiv);
+                        ImGui.TextUnformatted("|");
+                        ImGui.SameLine();
+                        ImGui.SetCursorPosX(cursorLogLevel);
+                        ImGui.TextUnformatted(this.GetTextForLogEventLevel(line.Level));
                         ImGui.SameLine();
-
-                        ImGui.PopStyleColor(3);
-
-                        if (!line.IsMultiline)
-                        {
-                            ImGui.TextUnformatted(line.TimeStamp.ToString("HH:mm:ss.fff"));
-                            ImGui.SameLine();
-                            ImGui.SetCursorPosX(cursorDiv);
-                            ImGui.TextUnformatted("|");
-                            ImGui.SameLine();
-                            ImGui.SetCursorPosX(cursorLogLevel);
-                            ImGui.TextUnformatted(this.GetTextForLogEventLevel(line.Level));
-                            ImGui.SameLine();
-                        }
-
-                        ImGui.SetCursorPosX(cursorLogLine);
-                        ImGui.TextUnformatted(line.Line);
                     }
-                }
 
-                clipper.End();
+                    ImGui.SetCursorPosX(cursorLogLine);
+                    ImGui.TextUnformatted(line.Line);
+                }
             }
 
-            ImGui.PopFont();
+            clipper.End();
+        }
 
-            ImGui.PopStyleVar();
+        ImGui.PopFont();
 
-            if (this.autoScroll && ImGui.GetScrollY() >= ImGui.GetScrollMaxY())
+        ImGui.PopStyleVar();
+
+        if (this.autoScroll && ImGui.GetScrollY() >= ImGui.GetScrollMaxY())
+        {
+            ImGui.SetScrollHereY(1.0f);
+        }
+
+        // Draw dividing line
+        var offset = ImGuiHelpers.GlobalScale * 127;
+        childDrawList.AddLine(new Vector2(childPos.X + offset, childPos.Y), new Vector2(childPos.X + offset, childPos.Y + childSize.Y), 0x4FFFFFFF, 1.0f);
+
+        ImGui.EndChild();
+
+        var hadColor = false;
+        if (this.lastCmdSuccess.HasValue)
+        {
+            hadColor = true;
+            if (this.lastCmdSuccess.Value)
             {
-                ImGui.SetScrollHereY(1.0f);
+                ImGui.PushStyleColor(ImGuiCol.FrameBg, ImGuiColors.HealerGreen - new Vector4(0, 0, 0, 0.7f));
             }
-
-            // Draw dividing line
-            var offset = ImGuiHelpers.GlobalScale * 127;
-            childDrawList.AddLine(new Vector2(childPos.X + offset, childPos.Y), new Vector2(childPos.X + offset, childPos.Y + childSize.Y), 0x4FFFFFFF, 1.0f);
-
-            ImGui.EndChild();
-
-            var hadColor = false;
-            if (this.lastCmdSuccess.HasValue)
+            else
             {
-                hadColor = true;
-                if (this.lastCmdSuccess.Value)
-                {
-                    ImGui.PushStyleColor(ImGuiCol.FrameBg, ImGuiColors.HealerGreen - new Vector4(0, 0, 0, 0.7f));
-                }
-                else
-                {
-                    ImGui.PushStyleColor(ImGuiCol.FrameBg, ImGuiColors.DalamudRed - new Vector4(0, 0, 0, 0.7f));
-                }
+                ImGui.PushStyleColor(ImGuiCol.FrameBg, ImGuiColors.DalamudRed - new Vector4(0, 0, 0, 0.7f));
             }
+        }
 
-            ImGui.SetNextItemWidth(ImGui.GetWindowSize().X - 80);
+        ImGui.SetNextItemWidth(ImGui.GetWindowSize().X - 80);
 
-            var getFocus = false;
-            unsafe
-            {
-                if (ImGui.InputText("##commandbox", ref this.commandText, 255, ImGuiInputTextFlags.EnterReturnsTrue | ImGuiInputTextFlags.CallbackCompletion | ImGuiInputTextFlags.CallbackHistory, this.CommandInputCallback))
-                {
-                    this.ProcessCommand();
-                    getFocus = true;
-                }
-
-                ImGui.SameLine();
-            }
-
-            ImGui.SetItemDefaultFocus();
-            if (getFocus)
-                ImGui.SetKeyboardFocusHere(-1); // Auto focus previous widget
-
-            if (hadColor)
-                ImGui.PopStyleColor();
-
-            if (ImGui.Button("Send"))
+        var getFocus = false;
+        unsafe
+        {
+            if (ImGui.InputText("##commandbox", ref this.commandText, 255, ImGuiInputTextFlags.EnterReturnsTrue | ImGuiInputTextFlags.CallbackCompletion | ImGuiInputTextFlags.CallbackHistory, this.CommandInputCallback))
             {
                 this.ProcessCommand();
-            }
-        }
-
-        private void ProcessCommand()
-        {
-            try
-            {
-                this.historyPos = -1;
-                for (var i = this.history.Count - 1; i >= 0; i--)
-                {
-                    if (this.history[i] == this.commandText)
-                    {
-                        this.history.RemoveAt(i);
-                        break;
-                    }
-                }
-
-                this.history.Add(this.commandText);
-
-                if (this.commandText == "clear" || this.commandText == "cls")
-                {
-                    this.Clear();
-                    return;
-                }
-
-                this.lastCmdSuccess = Service<CommandManager>.Get().ProcessCommand("/" + this.commandText);
-                this.commandText = string.Empty;
-
-                // TODO: Force scroll to bottom
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Error during command dispatch");
-                this.lastCmdSuccess = false;
-            }
-        }
-
-        private unsafe int CommandInputCallback(ImGuiInputTextCallbackData* data)
-        {
-            var ptr = new ImGuiInputTextCallbackDataPtr(data);
-
-            switch (data->EventFlag)
-            {
-                case ImGuiInputTextFlags.CallbackCompletion:
-                    var textBytes = new byte[data->BufTextLen];
-                    Marshal.Copy((IntPtr)data->Buf, textBytes, 0, data->BufTextLen);
-                    var text = Encoding.UTF8.GetString(textBytes);
-
-                    var words = text.Split();
-
-                    // We can't do any completion for parameters at the moment since it just calls into CommandHandler
-                    if (words.Length > 1)
-                        return 0;
-
-                    // TODO: Improve this, add partial completion
-                    // https://github.com/ocornut/imgui/blob/master/imgui_demo.cpp#L6443-L6484
-                    var candidates = Service<CommandManager>.Get().Commands.Where(x => x.Key.Contains("/" + words[0])).ToList();
-                    if (candidates.Count > 0)
-                    {
-                        ptr.DeleteChars(0, ptr.BufTextLen);
-                        ptr.InsertChars(0, candidates[0].Key.Replace("/", string.Empty));
-                    }
-
-                    break;
-                case ImGuiInputTextFlags.CallbackHistory:
-                    var prevPos = this.historyPos;
-
-                    if (ptr.EventKey == ImGuiKey.UpArrow)
-                    {
-                        if (this.historyPos == -1)
-                            this.historyPos = this.history.Count - 1;
-                        else if (this.historyPos > 0)
-                            this.historyPos--;
-                    }
-                    else if (data->EventKey == ImGuiKey.DownArrow)
-                    {
-                        if (this.historyPos != -1)
-                        {
-                            if (++this.historyPos >= this.history.Count)
-                            {
-                                this.historyPos = -1;
-                            }
-                        }
-                    }
-
-                    if (prevPos != this.historyPos)
-                    {
-                        var historyStr = this.historyPos >= 0 ? this.history[this.historyPos] : string.Empty;
-
-                        ptr.DeleteChars(0, ptr.BufTextLen);
-                        ptr.InsertChars(0, historyStr);
-                    }
-
-                    break;
+                getFocus = true;
             }
 
-            return 0;
+            ImGui.SameLine();
         }
 
-        private void AddAndFilter(string line, LogEvent logEvent, bool isMultiline)
+        ImGui.SetItemDefaultFocus();
+        if (getFocus)
+            ImGui.SetKeyboardFocusHere(-1); // Auto focus previous widget
+
+        if (hadColor)
+            ImGui.PopStyleColor();
+
+        if (ImGui.Button("Send"))
         {
-            if (line.StartsWith("TROUBLESHOOTING:") || line.StartsWith("LASTEXCEPTION:"))
-                return;
-
-            var entry = new LogEntry
-            {
-                IsMultiline = isMultiline,
-                Level = logEvent.Level,
-                Line = line,
-                TimeStamp = logEvent.Timestamp,
-                HasException = logEvent.Exception != null,
-            };
-
-            if (logEvent.Properties.TryGetValue("SourceContext", out var sourceProp) &&
-                sourceProp is ScalarValue { Value: string value })
-            {
-                entry.Source = value;
-            }
-
-            this.logText.Add(entry);
-
-            if (!this.isFiltered)
-                return;
-
-            if (this.IsFilterApplicable(entry))
-                this.filteredLogText.Add(entry);
-        }
-
-        private bool IsFilterApplicable(LogEntry entry)
-        {
-            if (this.levelFilter > 0 && ((this.levelFilter >> (int)entry.Level) & 1) == 0)
-                return false;
-
-            // Show exceptions that weren't properly tagged with a Source (generally meaning they were uncaught)
-            // After log levels because uncaught exceptions should *never* fall below Error.
-            if (this.filterShowUncaughtExceptions && entry.HasException && entry.Source == null)
-                return true;
-
-            if (this.sourceFilters.Count > 0 && !this.sourceFilters.Contains(entry.Source))
-                return false;
-
-            if (!string.IsNullOrEmpty(this.textFilter) && !entry.Line.Contains(this.textFilter))
-                return false;
-
-            return true;
-        }
-
-        private void Refilter()
-        {
-            lock (this.renderLock)
-            {
-                this.filteredLogText = this.logText.Where(this.IsFilterApplicable).ToList();
-            }
-        }
-
-        private string GetTextForLogEventLevel(LogEventLevel level) => level switch
-        {
-            LogEventLevel.Error => "ERR",
-            LogEventLevel.Verbose => "VRB",
-            LogEventLevel.Debug => "DBG",
-            LogEventLevel.Information => "INF",
-            LogEventLevel.Warning => "WRN",
-            LogEventLevel.Fatal => "FTL",
-            _ => throw new ArgumentOutOfRangeException(level.ToString(), "Invalid LogEventLevel"),
-        };
-
-        private uint GetColorForLogEventLevel(LogEventLevel level) => level switch
-        {
-            LogEventLevel.Error => 0x800000EE,
-            LogEventLevel.Verbose => 0x00000000,
-            LogEventLevel.Debug => 0x00000000,
-            LogEventLevel.Information => 0x00000000,
-            LogEventLevel.Warning => 0x8A0070EE,
-            LogEventLevel.Fatal => 0xFF00000A,
-            _ => throw new ArgumentOutOfRangeException(level.ToString(), "Invalid LogEventLevel"),
-        };
-
-        private void OnLogLine(object sender, (string Line, LogEvent LogEvent) logEvent)
-        {
-            this.HandleLogLine(logEvent.Line, logEvent.LogEvent);
-        }
-
-        private class LogEntry
-        {
-            public string Line { get; set; }
-
-            public LogEventLevel Level { get; set; }
-
-            public DateTimeOffset TimeStamp { get; set; }
-
-            public bool IsMultiline { get; set; }
-
-            public string? Source { get; set; }
-
-            public bool HasException { get; set; }
+            this.ProcessCommand();
         }
     }
+
+    private void ProcessCommand()
+    {
+        try
+        {
+            this.historyPos = -1;
+            for (var i = this.history.Count - 1; i >= 0; i--)
+            {
+                if (this.history[i] == this.commandText)
+                {
+                    this.history.RemoveAt(i);
+                    break;
+                }
+            }
+
+            this.history.Add(this.commandText);
+
+            if (this.commandText == "clear" || this.commandText == "cls")
+            {
+                this.Clear();
+                return;
+            }
+
+            this.lastCmdSuccess = Service<CommandManager>.Get().ProcessCommand("/" + this.commandText);
+            this.commandText = string.Empty;
+
+            // TODO: Force scroll to bottom
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Error during command dispatch");
+            this.lastCmdSuccess = false;
+        }
+    }
+
+    private unsafe int CommandInputCallback(ImGuiInputTextCallbackData* data)
+    {
+        var ptr = new ImGuiInputTextCallbackDataPtr(data);
+
+        switch (data->EventFlag)
+        {
+            case ImGuiInputTextFlags.CallbackCompletion:
+                var textBytes = new byte[data->BufTextLen];
+                Marshal.Copy((IntPtr)data->Buf, textBytes, 0, data->BufTextLen);
+                var text = Encoding.UTF8.GetString(textBytes);
+
+                var words = text.Split();
+
+                // We can't do any completion for parameters at the moment since it just calls into CommandHandler
+                if (words.Length > 1)
+                    return 0;
+
+                // TODO: Improve this, add partial completion
+                // https://github.com/ocornut/imgui/blob/master/imgui_demo.cpp#L6443-L6484
+                var candidates = Service<CommandManager>.Get().Commands.Where(x => x.Key.Contains("/" + words[0])).ToList();
+                if (candidates.Count > 0)
+                {
+                    ptr.DeleteChars(0, ptr.BufTextLen);
+                    ptr.InsertChars(0, candidates[0].Key.Replace("/", string.Empty));
+                }
+
+                break;
+            case ImGuiInputTextFlags.CallbackHistory:
+                var prevPos = this.historyPos;
+
+                if (ptr.EventKey == ImGuiKey.UpArrow)
+                {
+                    if (this.historyPos == -1)
+                        this.historyPos = this.history.Count - 1;
+                    else if (this.historyPos > 0)
+                        this.historyPos--;
+                }
+                else if (data->EventKey == ImGuiKey.DownArrow)
+                {
+                    if (this.historyPos != -1)
+                    {
+                        if (++this.historyPos >= this.history.Count)
+                        {
+                            this.historyPos = -1;
+                        }
+                    }
+                }
+
+                if (prevPos != this.historyPos)
+                {
+                    var historyStr = this.historyPos >= 0 ? this.history[this.historyPos] : string.Empty;
+
+                    ptr.DeleteChars(0, ptr.BufTextLen);
+                    ptr.InsertChars(0, historyStr);
+                }
+
+                break;
+        }
+
+        return 0;
+    }
+
+    private void AddAndFilter(string line, LogEvent logEvent, bool isMultiline)
+    {
+        if (line.StartsWith("TROUBLESHOOTING:") || line.StartsWith("LASTEXCEPTION:"))
+            return;
+
+        var entry = new LogEntry
+        {
+            IsMultiline = isMultiline,
+            Level = logEvent.Level,
+            Line = line,
+            TimeStamp = logEvent.Timestamp,
+            HasException = logEvent.Exception != null,
+        };
+
+        if (logEvent.Properties.TryGetValue("SourceContext", out var sourceProp) &&
+            sourceProp is ScalarValue { Value: string value })
+        {
+            entry.Source = value;
+        }
+
+        this.logText.Add(entry);
+
+        if (!this.isFiltered)
+            return;
+
+        if (this.IsFilterApplicable(entry))
+            this.filteredLogText.Add(entry);
+    }
+
+    private bool IsFilterApplicable(LogEntry entry)
+    {
+        if (this.levelFilter > 0 && ((this.levelFilter >> (int)entry.Level) & 1) == 0)
+            return false;
+
+        // Show exceptions that weren't properly tagged with a Source (generally meaning they were uncaught)
+        // After log levels because uncaught exceptions should *never* fall below Error.
+        if (this.filterShowUncaughtExceptions && entry.HasException && entry.Source == null)
+            return true;
+
+        if (this.sourceFilters.Count > 0 && !this.sourceFilters.Contains(entry.Source))
+            return false;
+
+        if (!string.IsNullOrEmpty(this.textFilter) && !entry.Line.Contains(this.textFilter))
+            return false;
+
+        return true;
+    }
+
+    private void Refilter()
+    {
+        lock (this.renderLock)
+        {
+            this.filteredLogText = this.logText.Where(this.IsFilterApplicable).ToList();
+        }
+    }
+
+    private string GetTextForLogEventLevel(LogEventLevel level) => level switch
+    {
+        LogEventLevel.Error => "ERR",
+        LogEventLevel.Verbose => "VRB",
+        LogEventLevel.Debug => "DBG",
+        LogEventLevel.Information => "INF",
+        LogEventLevel.Warning => "WRN",
+        LogEventLevel.Fatal => "FTL",
+        _ => throw new ArgumentOutOfRangeException(level.ToString(), "Invalid LogEventLevel"),
+    };
+
+    private uint GetColorForLogEventLevel(LogEventLevel level) => level switch
+    {
+        LogEventLevel.Error => 0x800000EE,
+        LogEventLevel.Verbose => 0x00000000,
+        LogEventLevel.Debug => 0x00000000,
+        LogEventLevel.Information => 0x00000000,
+        LogEventLevel.Warning => 0x8A0070EE,
+        LogEventLevel.Fatal => 0xFF00000A,
+        _ => throw new ArgumentOutOfRangeException(level.ToString(), "Invalid LogEventLevel"),
+    };
+
+    private void OnLogLine(object sender, (string Line, LogEvent LogEvent) logEvent)
+    {
+        this.HandleLogLine(logEvent.Line, logEvent.LogEvent);
+    }
+
+    private class LogEntry
+    {
+        public string Line { get; set; }
+
+        public LogEventLevel Level { get; set; }
+
+        public DateTimeOffset TimeStamp { get; set; }
+
+        public bool IsMultiline { get; set; }
+
+        public string? Source { get; set; }
+
+        public bool HasException { get; set; }
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/CreditsWindow.cs b/Dalamud/Interface/Internal/Windows/CreditsWindow.cs
index 9051642ca..83857a826 100644
--- a/Dalamud/Interface/Internal/Windows/CreditsWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/CreditsWindow.cs
@@ -12,16 +12,16 @@ using Dalamud.Utility;
 using ImGuiNET;
 using ImGuiScene;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// A window documenting contributors to the project.
+/// </summary>
+internal class CreditsWindow : Window, IDisposable
 {
-    /// <summary>
-    /// A window documenting contributors to the project.
-    /// </summary>
-    internal class CreditsWindow : Window, IDisposable
-    {
-        private const float CreditFps = 60.0f;
-        private const string ThankYouText = "Thank you!";
-        private const string CreditsTextTempl = @"
+    private const float CreditFps = 60.0f;
+    private const string ThankYouText = "Thank you!";
+    private const string CreditsTextTempl = @"
 Dalamud
 A FFXIV Plugin Framework
 Version D{0}
@@ -158,170 +158,169 @@ Dalamud is licensed under AGPL v3 or later
 Contribute at: https://github.com/goatsoft/Dalamud
 ";
 
-        private readonly TextureWrap logoTexture;
-        private readonly Stopwatch creditsThrottler;
+    private readonly TextureWrap logoTexture;
+    private readonly Stopwatch creditsThrottler;
 
-        private string creditsText;
+    private string creditsText;
 
-        private GameFontHandle? thankYouFont;
+    private GameFontHandle? thankYouFont;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CreditsWindow"/> class.
-        /// </summary>
-        public CreditsWindow()
-            : base("Dalamud Credits", ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoTitleBar, true)
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CreditsWindow"/> class.
+    /// </summary>
+    public CreditsWindow()
+        : base("Dalamud Credits", ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoTitleBar, true)
+    {
+        var dalamud = Service<Dalamud>.Get();
+        var interfaceManager = Service<InterfaceManager>.Get();
+
+        this.logoTexture = interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "logo.png"));
+        this.creditsThrottler = new();
+
+        this.Size = new Vector2(500, 400);
+        this.SizeCondition = ImGuiCond.Always;
+
+        this.PositionCondition = ImGuiCond.Always;
+
+        this.BgAlpha = 0.8f;
+    }
+
+    /// <inheritdoc/>
+    public override void OnOpen()
+    {
+        var pluginCredits = Service<PluginManager>.Get().InstalledPlugins
+                                                  .Where(plugin => plugin.Manifest != null)
+                                                  .Select(plugin => $"{plugin.Manifest.Name} by {plugin.Manifest.Author}\n")
+                                                  .Aggregate(string.Empty, (current, next) => $"{current}{next}");
+
+        this.creditsText = string.Format(CreditsTextTempl, typeof(Dalamud).Assembly.GetName().Version, pluginCredits, Util.GetGitHashClientStructs());
+
+        Service<GameGui>.Get().SetBgm(833);
+        this.creditsThrottler.Restart();
+
+        if (this.thankYouFont == null)
         {
-            var dalamud = Service<Dalamud>.Get();
-            var interfaceManager = Service<InterfaceManager>.Get();
-
-            this.logoTexture = interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "logo.png"));
-            this.creditsThrottler = new();
-
-            this.Size = new Vector2(500, 400);
-            this.SizeCondition = ImGuiCond.Always;
-
-            this.PositionCondition = ImGuiCond.Always;
-
-            this.BgAlpha = 0.8f;
-        }
-
-        /// <inheritdoc/>
-        public override void OnOpen()
-        {
-            var pluginCredits = Service<PluginManager>.Get().InstalledPlugins
-                .Where(plugin => plugin.Manifest != null)
-                .Select(plugin => $"{plugin.Manifest.Name} by {plugin.Manifest.Author}\n")
-                .Aggregate(string.Empty, (current, next) => $"{current}{next}");
-
-            this.creditsText = string.Format(CreditsTextTempl, typeof(Dalamud).Assembly.GetName().Version, pluginCredits, Util.GetGitHashClientStructs());
-
-            Service<GameGui>.Get().SetBgm(833);
-            this.creditsThrottler.Restart();
-
-            if (this.thankYouFont == null)
-            {
-                var gfm = Service<GameFontManager>.Get();
-                this.thankYouFont = gfm.NewFontRef(new GameFontStyle(GameFontFamilyAndSize.TrumpGothic34));
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void OnClose()
-        {
-            this.creditsThrottler.Reset();
-            Service<GameGui>.Get().SetBgm(9999);
-        }
-
-        /// <inheritdoc/>
-        public override void PreDraw()
-        {
-            ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(0, 0));
-
-            base.PreDraw();
-        }
-
-        /// <inheritdoc/>
-        public override void PostDraw()
-        {
-            ImGui.PopStyleVar();
-
-            base.PostDraw();
-        }
-
-        /// <inheritdoc/>
-        public override void Draw()
-        {
-            var screenSize = ImGui.GetMainViewport().Size;
-            var windowSize = ImGui.GetWindowSize();
-
-            this.Position = (screenSize - windowSize) / 2;
-
-            ImGui.BeginChild("scrolling", Vector2.Zero, false, ImGuiWindowFlags.NoScrollbar);
-
-            ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, Vector2.Zero);
-
-            ImGuiHelpers.ScaledDummy(0, windowSize.Y + 20f);
-            ImGui.Text(string.Empty);
-
-            const float imageSize = 190f;
-            ImGui.SameLine((ImGui.GetWindowWidth() / 2) - (imageSize / 2));
-            ImGui.Image(this.logoTexture.ImGuiHandle, ImGuiHelpers.ScaledVector2(imageSize));
-
-            ImGuiHelpers.ScaledDummy(0, 20f);
-
-            var windowX = ImGui.GetWindowSize().X;
-
-            foreach (var creditsLine in this.creditsText.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None))
-            {
-                var lineLenX = ImGui.CalcTextSize(creditsLine).X;
-
-                ImGui.Dummy(new Vector2((windowX / 2) - (lineLenX / 2), 0f));
-                ImGui.SameLine();
-                ImGui.TextUnformatted(creditsLine);
-            }
-
-            ImGuiHelpers.ScaledDummy(0, 40f);
-
-            if (this.thankYouFont != null)
-            {
-                ImGui.PushFont(this.thankYouFont.ImFont);
-                var thankYouLenX = ImGui.CalcTextSize(ThankYouText).X;
-
-                ImGui.Dummy(new Vector2((windowX / 2) - (thankYouLenX / 2), 0f));
-                ImGui.SameLine();
-                ImGui.TextUnformatted(ThankYouText);
-
-                ImGui.PopFont();
-            }
-
-            ImGuiHelpers.ScaledDummy(0, windowSize.Y + 50f);
-
-            ImGui.PopStyleVar();
-
-            if (this.creditsThrottler.Elapsed.TotalMilliseconds > (1000.0f / CreditFps))
-            {
-                var curY = ImGui.GetScrollY();
-                var maxY = ImGui.GetScrollMaxY();
-
-                if (curY < maxY - 1)
-                {
-                    ImGui.SetScrollY(curY + 1);
-                }
-                else
-                {
-                    ImGui.SetScrollY(0);
-                }
-            }
-
-            ImGui.EndChild();
-
-            ImGui.SetCursorPos(new Vector2(0));
-            ImGui.BeginChild("button", Vector2.Zero, false, ImGuiWindowFlags.NoScrollbar);
-
-            var closeButtonSize = new Vector2(30);
-            ImGui.PushFont(InterfaceManager.IconFont);
-            ImGui.SetCursorPos(new Vector2(windowSize.X - closeButtonSize.X - 5, 5));
-            ImGui.PushStyleColor(ImGuiCol.Button, Vector4.Zero);
-            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, Vector4.Zero);
-            ImGui.PushStyleColor(ImGuiCol.ButtonActive, Vector4.Zero);
-
-            if (ImGui.Button(FontAwesomeIcon.Times.ToIconString(), closeButtonSize))
-            {
-                this.IsOpen = false;
-            }
-
-            ImGui.PopStyleColor(3);
-            ImGui.PopFont();
-            ImGui.EndChild();
-        }
-
-        /// <summary>
-        /// Disposes of managed and unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            this.logoTexture?.Dispose();
-            this.thankYouFont?.Dispose();
+            var gfm = Service<GameFontManager>.Get();
+            this.thankYouFont = gfm.NewFontRef(new GameFontStyle(GameFontFamilyAndSize.TrumpGothic34));
         }
     }
+
+    /// <inheritdoc/>
+    public override void OnClose()
+    {
+        this.creditsThrottler.Reset();
+        Service<GameGui>.Get().SetBgm(9999);
+    }
+
+    /// <inheritdoc/>
+    public override void PreDraw()
+    {
+        ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(0, 0));
+
+        base.PreDraw();
+    }
+
+    /// <inheritdoc/>
+    public override void PostDraw()
+    {
+        ImGui.PopStyleVar();
+
+        base.PostDraw();
+    }
+
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        var screenSize = ImGui.GetMainViewport().Size;
+        var windowSize = ImGui.GetWindowSize();
+
+        this.Position = (screenSize - windowSize) / 2;
+
+        ImGui.BeginChild("scrolling", Vector2.Zero, false, ImGuiWindowFlags.NoScrollbar);
+
+        ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, Vector2.Zero);
+
+        ImGuiHelpers.ScaledDummy(0, windowSize.Y + 20f);
+        ImGui.Text(string.Empty);
+
+        const float imageSize = 190f;
+        ImGui.SameLine((ImGui.GetWindowWidth() / 2) - (imageSize / 2));
+        ImGui.Image(this.logoTexture.ImGuiHandle, ImGuiHelpers.ScaledVector2(imageSize));
+
+        ImGuiHelpers.ScaledDummy(0, 20f);
+
+        var windowX = ImGui.GetWindowSize().X;
+
+        foreach (var creditsLine in this.creditsText.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None))
+        {
+            var lineLenX = ImGui.CalcTextSize(creditsLine).X;
+
+            ImGui.Dummy(new Vector2((windowX / 2) - (lineLenX / 2), 0f));
+            ImGui.SameLine();
+            ImGui.TextUnformatted(creditsLine);
+        }
+
+        ImGuiHelpers.ScaledDummy(0, 40f);
+
+        if (this.thankYouFont != null)
+        {
+            ImGui.PushFont(this.thankYouFont.ImFont);
+            var thankYouLenX = ImGui.CalcTextSize(ThankYouText).X;
+
+            ImGui.Dummy(new Vector2((windowX / 2) - (thankYouLenX / 2), 0f));
+            ImGui.SameLine();
+            ImGui.TextUnformatted(ThankYouText);
+
+            ImGui.PopFont();
+        }
+
+        ImGuiHelpers.ScaledDummy(0, windowSize.Y + 50f);
+
+        ImGui.PopStyleVar();
+
+        if (this.creditsThrottler.Elapsed.TotalMilliseconds > (1000.0f / CreditFps))
+        {
+            var curY = ImGui.GetScrollY();
+            var maxY = ImGui.GetScrollMaxY();
+
+            if (curY < maxY - 1)
+            {
+                ImGui.SetScrollY(curY + 1);
+            }
+            else
+            {
+                ImGui.SetScrollY(0);
+            }
+        }
+
+        ImGui.EndChild();
+
+        ImGui.SetCursorPos(new Vector2(0));
+        ImGui.BeginChild("button", Vector2.Zero, false, ImGuiWindowFlags.NoScrollbar);
+
+        var closeButtonSize = new Vector2(30);
+        ImGui.PushFont(InterfaceManager.IconFont);
+        ImGui.SetCursorPos(new Vector2(windowSize.X - closeButtonSize.X - 5, 5));
+        ImGui.PushStyleColor(ImGuiCol.Button, Vector4.Zero);
+        ImGui.PushStyleColor(ImGuiCol.ButtonHovered, Vector4.Zero);
+        ImGui.PushStyleColor(ImGuiCol.ButtonActive, Vector4.Zero);
+
+        if (ImGui.Button(FontAwesomeIcon.Times.ToIconString(), closeButtonSize))
+        {
+            this.IsOpen = false;
+        }
+
+        ImGui.PopStyleColor(3);
+        ImGui.PopFont();
+        ImGui.EndChild();
+    }
+
+    /// <summary>
+    /// Disposes of managed and unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+        this.logoTexture?.Dispose();
+        this.thankYouFont?.Dispose();
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/DataWindow.cs b/Dalamud/Interface/Internal/Windows/DataWindow.cs
index c9e76e18a..8cb542b81 100644
--- a/Dalamud/Interface/Internal/Windows/DataWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/DataWindow.cs
@@ -44,594 +44,645 @@ using Newtonsoft.Json;
 using PInvoke;
 using Serilog;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// Class responsible for drawing the data/debug window.
+/// </summary>
+internal class DataWindow : Window
 {
+    private readonly string[] dataKindNames = Enum.GetNames(typeof(DataKind)).Select(k => k.Replace("_", " ")).ToArray();
+
+    private bool wasReady;
+    private bool isExcept;
+    private string serverOpString;
+    private DataKind currentKind;
+
+    private bool drawCharas = false;
+    private float maxCharaDrawDistance = 20;
+
+    private string inputSig = string.Empty;
+    private IntPtr sigResult = IntPtr.Zero;
+
+    private string inputAddonName = string.Empty;
+    private int inputAddonIndex;
+
+    private IntPtr findAgentInterfacePtr;
+
+    private bool resolveGameData = false;
+    private bool resolveObjects = false;
+
+    private UiDebug addonInspector = null;
+
+    private Hook<MessageBoxWDelegate>? messageBoxMinHook;
+    private bool hookUseMinHook = false;
+
+    // IPC
+    private ICallGateProvider<string, string> ipcPub;
+    private ICallGateSubscriber<string, string> ipcSub;
+    private string callGateResponse = string.Empty;
+
+    // Toast fields
+    private string inputTextToast = string.Empty;
+    private int toastPosition = 0;
+    private int toastSpeed = 0;
+    private int questToastPosition = 0;
+    private bool questToastSound = false;
+    private int questToastIconId = 0;
+    private bool questToastCheckmark = false;
+
+    // Fly text fields
+    private int flyActor;
+    private FlyTextKind flyKind;
+    private int flyVal1;
+    private int flyVal2;
+    private string flyText1 = string.Empty;
+    private string flyText2 = string.Empty;
+    private int flyIcon;
+    private Vector4 flyColor = new(1, 0, 0, 1);
+
+    // ImGui fields
+    private string inputTexPath = string.Empty;
+    private TextureWrap debugTex = null;
+    private Vector2 inputTexUv0 = Vector2.Zero;
+    private Vector2 inputTexUv1 = Vector2.One;
+    private Vector4 inputTintCol = Vector4.One;
+    private Vector2 inputTexScale = Vector2.Zero;
+
+    // DTR
+    private DtrBarEntry? dtrTest1;
+    private DtrBarEntry? dtrTest2;
+    private DtrBarEntry? dtrTest3;
+
+    // Task Scheduler
+    private CancellationTokenSource taskSchedCancelSource = new();
+
+    private uint copyButtonIndex = 0;
+
     /// <summary>
-    /// Class responsible for drawing the data/debug window.
+    /// Initializes a new instance of the <see cref="DataWindow"/> class.
     /// </summary>
-    internal class DataWindow : Window
+    public DataWindow()
+        : base("Dalamud Data")
     {
-        private readonly string[] dataKindNames = Enum.GetNames(typeof(DataKind)).Select(k => k.Replace("_", " ")).ToArray();
+        this.Size = new Vector2(500, 500);
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
-        private bool wasReady;
-        private bool isExcept;
-        private string serverOpString;
-        private DataKind currentKind;
+        this.RespectCloseHotkey = false;
 
-        private bool drawCharas = false;
-        private float maxCharaDrawDistance = 20;
+        this.Load();
+    }
 
-        private string inputSig = string.Empty;
-        private IntPtr sigResult = IntPtr.Zero;
+    private delegate int MessageBoxWDelegate(
+        IntPtr hWnd,
+        [MarshalAs(UnmanagedType.LPWStr)] string text,
+        [MarshalAs(UnmanagedType.LPWStr)] string caption,
+        NativeFunctions.MessageBoxType type);
 
-        private string inputAddonName = string.Empty;
-        private int inputAddonIndex;
+    private enum DataKind
+    {
+        Server_OpCode,
+        Address,
+        Object_Table,
+        Fate_Table,
+        Font_Test,
+        Party_List,
+        Buddy_List,
+        Plugin_IPC,
+        Condition,
+        Gauge,
+        Command,
+        Addon,
+        Addon_Inspector,
+        AtkArrayData_Browser,
+        StartInfo,
+        Target,
+        Toast,
+        FlyText,
+        ImGui,
+        Tex,
+        KeyState,
+        Gamepad,
+        Configuration,
+        TaskSched,
+        Hook,
+        Aetherytes,
+        Dtr_Bar,
+    }
 
-        private IntPtr findAgentInterfacePtr;
+    /// <inheritdoc/>
+    public override void OnOpen()
+    {
+    }
 
-        private bool resolveGameData = false;
-        private bool resolveObjects = false;
+    /// <inheritdoc/>
+    public override void OnClose()
+    {
+    }
 
-        private UiDebug addonInspector = null;
+    /// <summary>
+    /// Set the DataKind dropdown menu.
+    /// </summary>
+    /// <param name="dataKind">Data kind name, can be lower and/or without spaces.</param>
+    public void SetDataKind(string dataKind)
+    {
+        if (string.IsNullOrEmpty(dataKind))
+            return;
 
-        private Hook<MessageBoxWDelegate>? messageBoxMinHook;
-        private bool hookUseMinHook = false;
-
-        // IPC
-        private ICallGateProvider<string, string> ipcPub;
-        private ICallGateSubscriber<string, string> ipcSub;
-        private string callGateResponse = string.Empty;
-
-        // Toast fields
-        private string inputTextToast = string.Empty;
-        private int toastPosition = 0;
-        private int toastSpeed = 0;
-        private int questToastPosition = 0;
-        private bool questToastSound = false;
-        private int questToastIconId = 0;
-        private bool questToastCheckmark = false;
-
-        // Fly text fields
-        private int flyActor;
-        private FlyTextKind flyKind;
-        private int flyVal1;
-        private int flyVal2;
-        private string flyText1 = string.Empty;
-        private string flyText2 = string.Empty;
-        private int flyIcon;
-        private Vector4 flyColor = new(1, 0, 0, 1);
-
-        // ImGui fields
-        private string inputTexPath = string.Empty;
-        private TextureWrap debugTex = null;
-        private Vector2 inputTexUv0 = Vector2.Zero;
-        private Vector2 inputTexUv1 = Vector2.One;
-        private Vector4 inputTintCol = Vector4.One;
-        private Vector2 inputTexScale = Vector2.Zero;
-
-        // DTR
-        private DtrBarEntry? dtrTest1;
-        private DtrBarEntry? dtrTest2;
-        private DtrBarEntry? dtrTest3;
-
-        // Task Scheduler
-        private CancellationTokenSource taskSchedCancelSource = new();
-
-        private uint copyButtonIndex = 0;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataWindow"/> class.
-        /// </summary>
-        public DataWindow()
-            : base("Dalamud Data")
+        dataKind = dataKind switch
         {
-            this.Size = new Vector2(500, 500);
-            this.SizeCondition = ImGuiCond.FirstUseEver;
+            "ai" => "Addon Inspector",
+            "at" => "Object Table", // Actor Table
+            "ot" => "Object Table",
+            _ => dataKind,
+        };
 
-            this.RespectCloseHotkey = false;
+        dataKind = dataKind.Replace(" ", string.Empty).ToLower();
 
+        var matched = Enum.GetValues<DataKind>()
+                          .Where(kind => Enum.GetName(kind).Replace("_", string.Empty).ToLower() == dataKind)
+                          .FirstOrDefault();
+
+        if (matched != default)
+        {
+            this.currentKind = matched;
+        }
+        else
+        {
+            Service<ChatGui>.Get().PrintError($"/xldata: Invalid data type {dataKind}");
+        }
+    }
+
+    /// <summary>
+    /// Draw the window via ImGui.
+    /// </summary>
+    public override void Draw()
+    {
+        this.copyButtonIndex = 0;
+
+        // Main window
+        if (ImGui.Button("Force Reload"))
             this.Load();
+        ImGui.SameLine();
+        var copy = ImGui.Button("Copy all");
+        ImGui.SameLine();
+
+        var currentKindIndex = (int)this.currentKind;
+        if (ImGui.Combo("Data kind", ref currentKindIndex, this.dataKindNames, this.dataKindNames.Length))
+        {
+            this.currentKind = (DataKind)currentKindIndex;
         }
 
-        private delegate int MessageBoxWDelegate(
-            IntPtr hWnd,
-            [MarshalAs(UnmanagedType.LPWStr)] string text,
-            [MarshalAs(UnmanagedType.LPWStr)] string caption,
-            NativeFunctions.MessageBoxType type);
+        ImGui.Checkbox("Resolve GameData", ref this.resolveGameData);
 
-        private enum DataKind
+        ImGui.BeginChild("scrolling", new Vector2(0, 0), false, ImGuiWindowFlags.HorizontalScrollbar);
+
+        if (copy)
+            ImGui.LogToClipboard();
+
+        ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(0, 0));
+
+        try
         {
-            Server_OpCode,
-            Address,
-            Object_Table,
-            Fate_Table,
-            Font_Test,
-            Party_List,
-            Buddy_List,
-            Plugin_IPC,
-            Condition,
-            Gauge,
-            Command,
-            Addon,
-            Addon_Inspector,
-            AtkArrayData_Browser,
-            StartInfo,
-            Target,
-            Toast,
-            FlyText,
-            ImGui,
-            Tex,
-            KeyState,
-            Gamepad,
-            Configuration,
-            TaskSched,
-            Hook,
-            Aetherytes,
-            Dtr_Bar,
-        }
-
-        /// <inheritdoc/>
-        public override void OnOpen()
-        {
-        }
-
-        /// <inheritdoc/>
-        public override void OnClose()
-        {
-        }
-
-        /// <summary>
-        /// Set the DataKind dropdown menu.
-        /// </summary>
-        /// <param name="dataKind">Data kind name, can be lower and/or without spaces.</param>
-        public void SetDataKind(string dataKind)
-        {
-            if (string.IsNullOrEmpty(dataKind))
-                return;
-
-            dataKind = dataKind switch
+            if (this.wasReady)
             {
-                "ai" => "Addon Inspector",
-                "at" => "Object Table",  // Actor Table
-                "ot" => "Object Table",
-                _ => dataKind,
-            };
+                switch (this.currentKind)
+                {
+                    case DataKind.Server_OpCode:
+                        this.DrawServerOpCode();
+                        break;
 
-            dataKind = dataKind.Replace(" ", string.Empty).ToLower();
+                    case DataKind.Address:
+                        this.DrawAddress();
+                        break;
 
-            var matched = Enum.GetValues<DataKind>()
-                .Where(kind => Enum.GetName(kind).Replace("_", string.Empty).ToLower() == dataKind)
-                .FirstOrDefault();
+                    case DataKind.Object_Table:
+                        this.DrawObjectTable();
+                        break;
 
-            if (matched != default)
-            {
-                this.currentKind = matched;
+                    case DataKind.Fate_Table:
+                        this.DrawFateTable();
+                        break;
+
+                    case DataKind.Font_Test:
+                        this.DrawFontTest();
+                        break;
+
+                    case DataKind.Party_List:
+                        this.DrawPartyList();
+                        break;
+
+                    case DataKind.Buddy_List:
+                        this.DrawBuddyList();
+                        break;
+
+                    case DataKind.Plugin_IPC:
+                        this.DrawPluginIPC();
+                        break;
+
+                    case DataKind.Condition:
+                        this.DrawCondition();
+                        break;
+
+                    case DataKind.Gauge:
+                        this.DrawGauge();
+                        break;
+
+                    case DataKind.Command:
+                        this.DrawCommand();
+                        break;
+
+                    case DataKind.Addon:
+                        this.DrawAddon();
+                        break;
+
+                    case DataKind.Addon_Inspector:
+                        this.DrawAddonInspector();
+                        break;
+
+                    case DataKind.AtkArrayData_Browser:
+                        this.DrawAtkArrayDataBrowser();
+                        break;
+
+                    case DataKind.StartInfo:
+                        this.DrawStartInfo();
+                        break;
+
+                    case DataKind.Target:
+                        this.DrawTarget();
+                        break;
+
+                    case DataKind.Toast:
+                        this.DrawToast();
+                        break;
+
+                    case DataKind.FlyText:
+                        this.DrawFlyText();
+                        break;
+
+                    case DataKind.ImGui:
+                        this.DrawImGui();
+                        break;
+
+                    case DataKind.Tex:
+                        this.DrawTex();
+                        break;
+
+                    case DataKind.KeyState:
+                        this.DrawKeyState();
+                        break;
+
+                    case DataKind.Gamepad:
+                        this.DrawGamepad();
+                        break;
+
+                    case DataKind.Configuration:
+                        this.DrawConfiguration();
+                        break;
+
+                    case DataKind.TaskSched:
+                        this.DrawTaskSched();
+                        break;
+
+                    case DataKind.Hook:
+                        this.DrawHook();
+                        break;
+
+                    case DataKind.Aetherytes:
+                        this.DrawAetherytes();
+                        break;
+
+                    case DataKind.Dtr_Bar:
+                        this.DrawDtr();
+                        break;
+                }
             }
             else
             {
-                Service<ChatGui>.Get().PrintError($"/xldata: Invalid data type {dataKind}");
+                ImGui.TextUnformatted("Data not ready.");
+            }
+
+            this.isExcept = false;
+        }
+        catch (Exception ex)
+        {
+            if (!this.isExcept)
+            {
+                Log.Error(ex, "Could not draw data");
+            }
+
+            this.isExcept = true;
+
+            ImGui.TextUnformatted(ex.ToString());
+        }
+
+        ImGui.PopStyleVar();
+
+        ImGui.EndChild();
+    }
+
+    private int MessageBoxWDetour(IntPtr hwnd, string text, string caption, NativeFunctions.MessageBoxType type)
+    {
+        Log.Information("[DATAHOOK] {0} {1} {2} {3}", hwnd, text, caption, type);
+
+        var result = this.messageBoxMinHook.Original(hwnd, "Cause Access Violation?", caption, NativeFunctions.MessageBoxType.YesNo);
+
+        if (result == (int)User32.MessageBoxResult.IDYES)
+        {
+            Marshal.ReadByte(IntPtr.Zero);
+        }
+
+        return result;
+    }
+
+    private void DrawServerOpCode()
+    {
+        ImGui.TextUnformatted(this.serverOpString);
+    }
+
+    private void DrawAddress()
+    {
+        ImGui.InputText(".text sig", ref this.inputSig, 400);
+        if (ImGui.Button("Resolve"))
+        {
+            try
+            {
+                var sigScanner = Service<SigScanner>.Get();
+                this.sigResult = sigScanner.ScanText(this.inputSig);
+            }
+            catch (KeyNotFoundException)
+            {
+                this.sigResult = new IntPtr(-1);
             }
         }
 
-        /// <summary>
-        /// Draw the window via ImGui.
-        /// </summary>
-        public override void Draw()
+        ImGui.Text($"Result: {this.sigResult.ToInt64():X}");
+        ImGui.SameLine();
+        if (ImGui.Button($"C{this.copyButtonIndex++}"))
+            ImGui.SetClipboardText(this.sigResult.ToInt64().ToString("x"));
+
+        foreach (var debugScannedValue in BaseAddressResolver.DebugScannedValues)
         {
-            this.copyButtonIndex = 0;
-
-            // Main window
-            if (ImGui.Button("Force Reload"))
-                this.Load();
-            ImGui.SameLine();
-            var copy = ImGui.Button("Copy all");
-            ImGui.SameLine();
-
-            var currentKindIndex = (int)this.currentKind;
-            if (ImGui.Combo("Data kind", ref currentKindIndex, this.dataKindNames, this.dataKindNames.Length))
+            ImGui.TextUnformatted($"{debugScannedValue.Key}");
+            foreach (var valueTuple in debugScannedValue.Value)
             {
-                this.currentKind = (DataKind)currentKindIndex;
+                ImGui.TextUnformatted(
+                    $"      {valueTuple.ClassName} - 0x{valueTuple.Address.ToInt64():x}");
+                ImGui.SameLine();
+
+                if (ImGui.Button($"C##copyAddress{this.copyButtonIndex++}"))
+                    ImGui.SetClipboardText(valueTuple.Address.ToInt64().ToString("x"));
+            }
+        }
+    }
+
+    private void DrawObjectTable()
+    {
+        var chatGui = Service<ChatGui>.Get();
+        var clientState = Service<ClientState>.Get();
+        var framework = Service<Framework>.Get();
+        var gameGui = Service<GameGui>.Get();
+        var objectTable = Service<ObjectTable>.Get();
+
+        var stateString = string.Empty;
+
+        if (clientState.LocalPlayer == null)
+        {
+            ImGui.TextUnformatted("LocalPlayer null.");
+        }
+        else
+        {
+            stateString += $"ObjectTableLen: {objectTable.Length}\n";
+            stateString += $"LocalPlayerName: {clientState.LocalPlayer.Name}\n";
+            stateString += $"CurrentWorldName: {(this.resolveGameData ? clientState.LocalPlayer.CurrentWorld.GameData.Name : clientState.LocalPlayer.CurrentWorld.Id.ToString())}\n";
+            stateString += $"HomeWorldName: {(this.resolveGameData ? clientState.LocalPlayer.HomeWorld.GameData.Name : clientState.LocalPlayer.HomeWorld.Id.ToString())}\n";
+            stateString += $"LocalCID: {clientState.LocalContentId:X}\n";
+            stateString += $"LastLinkedItem: {chatGui.LastLinkedItemId}\n";
+            stateString += $"TerritoryType: {clientState.TerritoryType}\n\n";
+
+            ImGui.TextUnformatted(stateString);
+
+            ImGui.Checkbox("Draw characters on screen", ref this.drawCharas);
+            ImGui.SliderFloat("Draw Distance", ref this.maxCharaDrawDistance, 2f, 40f);
+
+            for (var i = 0; i < objectTable.Length; i++)
+            {
+                var obj = objectTable[i];
+
+                if (obj == null)
+                    continue;
+
+                this.PrintGameObject(obj, i.ToString());
+
+                if (this.drawCharas && gameGui.WorldToScreen(obj.Position, out var screenCoords))
+                {
+                    // So, while WorldToScreen will return false if the point is off of game client screen, to
+                    // to avoid performance issues, we have to manually determine if creating a window would
+                    // produce a new viewport, and skip rendering it if so
+                    var objectText = $"{obj.Address.ToInt64():X}:{obj.ObjectId:X}[{i}] - {obj.ObjectKind} - {obj.Name}";
+
+                    var screenPos = ImGui.GetMainViewport().Pos;
+                    var screenSize = ImGui.GetMainViewport().Size;
+
+                    var windowSize = ImGui.CalcTextSize(objectText);
+
+                    // Add some extra safety padding
+                    windowSize.X += ImGui.GetStyle().WindowPadding.X + 10;
+                    windowSize.Y += ImGui.GetStyle().WindowPadding.Y + 10;
+
+                    if (screenCoords.X + windowSize.X > screenPos.X + screenSize.X ||
+                        screenCoords.Y + windowSize.Y > screenPos.Y + screenSize.Y)
+                        continue;
+
+                    if (obj.YalmDistanceX > this.maxCharaDrawDistance)
+                        continue;
+
+                    ImGui.SetNextWindowPos(new Vector2(screenCoords.X, screenCoords.Y));
+
+                    ImGui.SetNextWindowBgAlpha(Math.Max(1f - (obj.YalmDistanceX / this.maxCharaDrawDistance), 0.2f));
+                    if (ImGui.Begin(
+                            $"Actor{i}##ActorWindow{i}",
+                            ImGuiWindowFlags.NoDecoration |
+                            ImGuiWindowFlags.AlwaysAutoResize |
+                            ImGuiWindowFlags.NoSavedSettings |
+                            ImGuiWindowFlags.NoMove |
+                            ImGuiWindowFlags.NoMouseInputs |
+                            ImGuiWindowFlags.NoDocking |
+                            ImGuiWindowFlags.NoFocusOnAppearing |
+                            ImGuiWindowFlags.NoNav))
+                        ImGui.Text(objectText);
+                    ImGui.End();
+                }
+            }
+        }
+    }
+
+    private void DrawFateTable()
+    {
+        var fateTable = Service<FateTable>.Get();
+        var framework = Service<Framework>.Get();
+
+        var stateString = string.Empty;
+        if (fateTable.Length == 0)
+        {
+            ImGui.TextUnformatted("No fates or data not ready.");
+        }
+        else
+        {
+            stateString += $"FateTableLen: {fateTable.Length}\n";
+
+            ImGui.TextUnformatted(stateString);
+
+            for (var i = 0; i < fateTable.Length; i++)
+            {
+                var fate = fateTable[i];
+                if (fate == null)
+                    continue;
+
+                var fateString = $"{fate.Address.ToInt64():X}:[{i}]" +
+                                 $" - Lv.{fate.Level} {fate.Name} ({fate.Progress}%)" +
+                                 $" - X{fate.Position.X} Y{fate.Position.Y} Z{fate.Position.Z}" +
+                                 $" - Territory {(this.resolveGameData ? (fate.TerritoryType.GameData?.Name ?? fate.TerritoryType.Id.ToString()) : fate.TerritoryType.Id.ToString())}\n";
+
+                fateString += $"       StartTimeEpoch: {fate.StartTimeEpoch}" +
+                              $" - Duration: {fate.Duration}" +
+                              $" - State: {fate.State}" +
+                              $" - GameData name: {(this.resolveGameData ? (fate.GameData?.Name ?? fate.FateId.ToString()) : fate.FateId.ToString())}";
+
+                ImGui.TextUnformatted(fateString);
+                ImGui.SameLine();
+                if (ImGui.Button("C"))
+                {
+                    ImGui.SetClipboardText(fate.Address.ToString("X"));
+                }
+            }
+        }
+    }
+
+    private void DrawFontTest()
+    {
+        var specialChars = string.Empty;
+
+        for (var i = 0xE020; i <= 0xE0DB; i++)
+            specialChars += $"0x{i:X} - {(SeIconChar)i} - {(char)i}\n";
+
+        ImGui.TextUnformatted(specialChars);
+
+        foreach (var fontAwesomeIcon in Enum.GetValues(typeof(FontAwesomeIcon)).Cast<FontAwesomeIcon>())
+        {
+            ImGui.Text(((int)fontAwesomeIcon.ToIconChar()).ToString("X") + " - ");
+            ImGui.SameLine();
+
+            ImGui.PushFont(UiBuilder.IconFont);
+            ImGui.Text(fontAwesomeIcon.ToIconString());
+            ImGui.PopFont();
+        }
+    }
+
+    private void DrawPartyList()
+    {
+        var partyList = Service<PartyList>.Get();
+
+        ImGui.Checkbox("Resolve Actors", ref this.resolveObjects);
+
+        ImGui.Text($"GroupManager: {partyList.GroupManagerAddress.ToInt64():X}");
+        ImGui.Text($"GroupList: {partyList.GroupListAddress.ToInt64():X}");
+        ImGui.Text($"AllianceList: {partyList.AllianceListAddress.ToInt64():X}");
+
+        ImGui.Text($"{partyList.Length} Members");
+
+        for (var i = 0; i < partyList.Length; i++)
+        {
+            var member = partyList[i];
+            if (member == null)
+            {
+                ImGui.Text($"[{i}] was null");
+                continue;
             }
 
-            ImGui.Checkbox("Resolve GameData", ref this.resolveGameData);
-
-            ImGui.BeginChild("scrolling", new Vector2(0, 0), false, ImGuiWindowFlags.HorizontalScrollbar);
-
-            if (copy)
-                ImGui.LogToClipboard();
-
-            ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(0, 0));
-
-            try
+            ImGui.Text($"[{i}] {member.Address.ToInt64():X} - {member.Name} - {member.GameObject.ObjectId}");
+            if (this.resolveObjects)
             {
-                if (this.wasReady)
+                var actor = member.GameObject;
+                if (actor == null)
                 {
-                    switch (this.currentKind)
-                    {
-                        case DataKind.Server_OpCode:
-                            this.DrawServerOpCode();
-                            break;
-
-                        case DataKind.Address:
-                            this.DrawAddress();
-                            break;
-
-                        case DataKind.Object_Table:
-                            this.DrawObjectTable();
-                            break;
-
-                        case DataKind.Fate_Table:
-                            this.DrawFateTable();
-                            break;
-
-                        case DataKind.Font_Test:
-                            this.DrawFontTest();
-                            break;
-
-                        case DataKind.Party_List:
-                            this.DrawPartyList();
-                            break;
-
-                        case DataKind.Buddy_List:
-                            this.DrawBuddyList();
-                            break;
-
-                        case DataKind.Plugin_IPC:
-                            this.DrawPluginIPC();
-                            break;
-
-                        case DataKind.Condition:
-                            this.DrawCondition();
-                            break;
-
-                        case DataKind.Gauge:
-                            this.DrawGauge();
-                            break;
-
-                        case DataKind.Command:
-                            this.DrawCommand();
-                            break;
-
-                        case DataKind.Addon:
-                            this.DrawAddon();
-                            break;
-
-                        case DataKind.Addon_Inspector:
-                            this.DrawAddonInspector();
-                            break;
-
-                        case DataKind.AtkArrayData_Browser:
-                            this.DrawAtkArrayDataBrowser();
-                            break;
-
-                        case DataKind.StartInfo:
-                            this.DrawStartInfo();
-                            break;
-
-                        case DataKind.Target:
-                            this.DrawTarget();
-                            break;
-
-                        case DataKind.Toast:
-                            this.DrawToast();
-                            break;
-
-                        case DataKind.FlyText:
-                            this.DrawFlyText();
-                            break;
-
-                        case DataKind.ImGui:
-                            this.DrawImGui();
-                            break;
-
-                        case DataKind.Tex:
-                            this.DrawTex();
-                            break;
-
-                        case DataKind.KeyState:
-                            this.DrawKeyState();
-                            break;
-
-                        case DataKind.Gamepad:
-                            this.DrawGamepad();
-                            break;
-
-                        case DataKind.Configuration:
-                            this.DrawConfiguration();
-                            break;
-
-                        case DataKind.TaskSched:
-                            this.DrawTaskSched();
-                            break;
-
-                        case DataKind.Hook:
-                            this.DrawHook();
-                            break;
-
-                        case DataKind.Aetherytes:
-                            this.DrawAetherytes();
-                            break;
-
-                        case DataKind.Dtr_Bar:
-                            this.DrawDtr();
-                            break;
-                    }
+                    ImGui.Text("Actor was null");
                 }
                 else
                 {
-                    ImGui.TextUnformatted("Data not ready.");
-                }
-
-                this.isExcept = false;
-            }
-            catch (Exception ex)
-            {
-                if (!this.isExcept)
-                {
-                    Log.Error(ex, "Could not draw data");
-                }
-
-                this.isExcept = true;
-
-                ImGui.TextUnformatted(ex.ToString());
-            }
-
-            ImGui.PopStyleVar();
-
-            ImGui.EndChild();
-        }
-
-        private int MessageBoxWDetour(IntPtr hwnd, string text, string caption, NativeFunctions.MessageBoxType type)
-        {
-            Log.Information("[DATAHOOK] {0} {1} {2} {3}", hwnd, text, caption, type);
-
-            var result = this.messageBoxMinHook.Original(hwnd, "Cause Access Violation?", caption, NativeFunctions.MessageBoxType.YesNo);
-
-            if (result == (int)User32.MessageBoxResult.IDYES)
-            {
-                Marshal.ReadByte(IntPtr.Zero);
-            }
-
-            return result;
-        }
-
-        private void DrawServerOpCode()
-        {
-            ImGui.TextUnformatted(this.serverOpString);
-        }
-
-        private void DrawAddress()
-        {
-            ImGui.InputText(".text sig", ref this.inputSig, 400);
-            if (ImGui.Button("Resolve"))
-            {
-                try
-                {
-                    var sigScanner = Service<SigScanner>.Get();
-                    this.sigResult = sigScanner.ScanText(this.inputSig);
-                }
-                catch (KeyNotFoundException)
-                {
-                    this.sigResult = new IntPtr(-1);
-                }
-            }
-
-            ImGui.Text($"Result: {this.sigResult.ToInt64():X}");
-            ImGui.SameLine();
-            if (ImGui.Button($"C{this.copyButtonIndex++}"))
-                ImGui.SetClipboardText(this.sigResult.ToInt64().ToString("x"));
-
-            foreach (var debugScannedValue in BaseAddressResolver.DebugScannedValues)
-            {
-                ImGui.TextUnformatted($"{debugScannedValue.Key}");
-                foreach (var valueTuple in debugScannedValue.Value)
-                {
-                    ImGui.TextUnformatted(
-                        $"      {valueTuple.ClassName} - 0x{valueTuple.Address.ToInt64():x}");
-                    ImGui.SameLine();
-
-                    if (ImGui.Button($"C##copyAddress{this.copyButtonIndex++}"))
-                        ImGui.SetClipboardText(valueTuple.Address.ToInt64().ToString("x"));
+                    this.PrintGameObject(actor, "-");
                 }
             }
         }
+    }
 
-        private void DrawObjectTable()
+    private void DrawBuddyList()
+    {
+        var buddyList = Service<BuddyList>.Get();
+
+        ImGui.Checkbox("Resolve Actors", ref this.resolveObjects);
+
+        ImGui.Text($"BuddyList: {buddyList.BuddyListAddress.ToInt64():X}");
         {
-            var chatGui = Service<ChatGui>.Get();
-            var clientState = Service<ClientState>.Get();
-            var framework = Service<Framework>.Get();
-            var gameGui = Service<GameGui>.Get();
-            var objectTable = Service<ObjectTable>.Get();
-
-            var stateString = string.Empty;
-
-            if (clientState.LocalPlayer == null)
+            var member = buddyList.CompanionBuddy;
+            if (member == null)
             {
-                ImGui.TextUnformatted("LocalPlayer null.");
+                ImGui.Text("[Companion] null");
             }
             else
             {
-                stateString += $"ObjectTableLen: {objectTable.Length}\n";
-                stateString += $"LocalPlayerName: {clientState.LocalPlayer.Name}\n";
-                stateString += $"CurrentWorldName: {(this.resolveGameData ? clientState.LocalPlayer.CurrentWorld.GameData.Name : clientState.LocalPlayer.CurrentWorld.Id.ToString())}\n";
-                stateString += $"HomeWorldName: {(this.resolveGameData ? clientState.LocalPlayer.HomeWorld.GameData.Name : clientState.LocalPlayer.HomeWorld.Id.ToString())}\n";
-                stateString += $"LocalCID: {clientState.LocalContentId:X}\n";
-                stateString += $"LastLinkedItem: {chatGui.LastLinkedItemId}\n";
-                stateString += $"TerritoryType: {clientState.TerritoryType}\n\n";
-
-                ImGui.TextUnformatted(stateString);
-
-                ImGui.Checkbox("Draw characters on screen", ref this.drawCharas);
-                ImGui.SliderFloat("Draw Distance", ref this.maxCharaDrawDistance, 2f, 40f);
-
-                for (var i = 0; i < objectTable.Length; i++)
-                {
-                    var obj = objectTable[i];
-
-                    if (obj == null)
-                        continue;
-
-                    this.PrintGameObject(obj, i.ToString());
-
-                    if (this.drawCharas && gameGui.WorldToScreen(obj.Position, out var screenCoords))
-                    {
-                        // So, while WorldToScreen will return false if the point is off of game client screen, to
-                        // to avoid performance issues, we have to manually determine if creating a window would
-                        // produce a new viewport, and skip rendering it if so
-                        var objectText = $"{obj.Address.ToInt64():X}:{obj.ObjectId:X}[{i}] - {obj.ObjectKind} - {obj.Name}";
-
-                        var screenPos = ImGui.GetMainViewport().Pos;
-                        var screenSize = ImGui.GetMainViewport().Size;
-
-                        var windowSize = ImGui.CalcTextSize(objectText);
-
-                        // Add some extra safety padding
-                        windowSize.X += ImGui.GetStyle().WindowPadding.X + 10;
-                        windowSize.Y += ImGui.GetStyle().WindowPadding.Y + 10;
-
-                        if (screenCoords.X + windowSize.X > screenPos.X + screenSize.X ||
-                            screenCoords.Y + windowSize.Y > screenPos.Y + screenSize.Y)
-                            continue;
-
-                        if (obj.YalmDistanceX > this.maxCharaDrawDistance)
-                            continue;
-
-                        ImGui.SetNextWindowPos(new Vector2(screenCoords.X, screenCoords.Y));
-
-                        ImGui.SetNextWindowBgAlpha(Math.Max(1f - (obj.YalmDistanceX / this.maxCharaDrawDistance), 0.2f));
-                        if (ImGui.Begin(
-                                $"Actor{i}##ActorWindow{i}",
-                                ImGuiWindowFlags.NoDecoration |
-                                ImGuiWindowFlags.AlwaysAutoResize |
-                                ImGuiWindowFlags.NoSavedSettings |
-                                ImGuiWindowFlags.NoMove |
-                                ImGuiWindowFlags.NoMouseInputs |
-                                ImGuiWindowFlags.NoDocking |
-                                ImGuiWindowFlags.NoFocusOnAppearing |
-                                ImGuiWindowFlags.NoNav))
-                            ImGui.Text(objectText);
-                        ImGui.End();
-                    }
-                }
-            }
-        }
-
-        private void DrawFateTable()
-        {
-            var fateTable = Service<FateTable>.Get();
-            var framework = Service<Framework>.Get();
-
-            var stateString = string.Empty;
-            if (fateTable.Length == 0)
-            {
-                ImGui.TextUnformatted("No fates or data not ready.");
-            }
-            else
-            {
-                stateString += $"FateTableLen: {fateTable.Length}\n";
-
-                ImGui.TextUnformatted(stateString);
-
-                for (var i = 0; i < fateTable.Length; i++)
-                {
-                    var fate = fateTable[i];
-                    if (fate == null)
-                        continue;
-
-                    var fateString = $"{fate.Address.ToInt64():X}:[{i}]" +
-                        $" - Lv.{fate.Level} {fate.Name} ({fate.Progress}%)" +
-                        $" - X{fate.Position.X} Y{fate.Position.Y} Z{fate.Position.Z}" +
-                        $" - Territory {(this.resolveGameData ? (fate.TerritoryType.GameData?.Name ?? fate.TerritoryType.Id.ToString()) : fate.TerritoryType.Id.ToString())}\n";
-
-                    fateString += $"       StartTimeEpoch: {fate.StartTimeEpoch}" +
-                        $" - Duration: {fate.Duration}" +
-                        $" - State: {fate.State}" +
-                        $" - GameData name: {(this.resolveGameData ? (fate.GameData?.Name ?? fate.FateId.ToString()) : fate.FateId.ToString())}";
-
-                    ImGui.TextUnformatted(fateString);
-                    ImGui.SameLine();
-                    if (ImGui.Button("C"))
-                    {
-                        ImGui.SetClipboardText(fate.Address.ToString("X"));
-                    }
-                }
-            }
-        }
-
-        private void DrawFontTest()
-        {
-            var specialChars = string.Empty;
-
-            for (var i = 0xE020; i <= 0xE0DB; i++)
-                specialChars += $"0x{i:X} - {(SeIconChar)i} - {(char)i}\n";
-
-            ImGui.TextUnformatted(specialChars);
-
-            foreach (var fontAwesomeIcon in Enum.GetValues(typeof(FontAwesomeIcon)).Cast<FontAwesomeIcon>())
-            {
-                ImGui.Text(((int)fontAwesomeIcon.ToIconChar()).ToString("X") + " - ");
-                ImGui.SameLine();
-
-                ImGui.PushFont(UiBuilder.IconFont);
-                ImGui.Text(fontAwesomeIcon.ToIconString());
-                ImGui.PopFont();
-            }
-        }
-
-        private void DrawPartyList()
-        {
-            var partyList = Service<PartyList>.Get();
-
-            ImGui.Checkbox("Resolve Actors", ref this.resolveObjects);
-
-            ImGui.Text($"GroupManager: {partyList.GroupManagerAddress.ToInt64():X}");
-            ImGui.Text($"GroupList: {partyList.GroupListAddress.ToInt64():X}");
-            ImGui.Text($"AllianceList: {partyList.AllianceListAddress.ToInt64():X}");
-
-            ImGui.Text($"{partyList.Length} Members");
-
-            for (var i = 0; i < partyList.Length; i++)
-            {
-                var member = partyList[i];
-                if (member == null)
-                {
-                    ImGui.Text($"[{i}] was null");
-                    continue;
-                }
-
-                ImGui.Text($"[{i}] {member.Address.ToInt64():X} - {member.Name} - {member.GameObject.ObjectId}");
+                ImGui.Text($"[Companion] {member.Address.ToInt64():X} - {member.ObjectId} - {member.DataID}");
                 if (this.resolveObjects)
                 {
-                    var actor = member.GameObject;
-                    if (actor == null)
+                    var gameObject = member.GameObject;
+                    if (gameObject == null)
                     {
-                        ImGui.Text("Actor was null");
+                        ImGui.Text("GameObject was null");
                     }
                     else
                     {
-                        this.PrintGameObject(actor, "-");
+                        this.PrintGameObject(gameObject, "-");
                     }
                 }
             }
         }
 
-        private void DrawBuddyList()
         {
-            var buddyList = Service<BuddyList>.Get();
-
-            ImGui.Checkbox("Resolve Actors", ref this.resolveObjects);
-
-            ImGui.Text($"BuddyList: {buddyList.BuddyListAddress.ToInt64():X}");
+            var member = buddyList.PetBuddy;
+            if (member == null)
             {
-                var member = buddyList.CompanionBuddy;
-                if (member == null)
+                ImGui.Text("[Pet] null");
+            }
+            else
+            {
+                ImGui.Text($"[Pet] {member.Address.ToInt64():X} - {member.ObjectId} - {member.DataID}");
+                if (this.resolveObjects)
                 {
-                    ImGui.Text("[Companion] null");
+                    var gameObject = member.GameObject;
+                    if (gameObject == null)
+                    {
+                        ImGui.Text("GameObject was null");
+                    }
+                    else
+                    {
+                        this.PrintGameObject(gameObject, "-");
+                    }
                 }
-                else
+            }
+        }
+
+        {
+            var count = buddyList.Length;
+            if (count == 0)
+            {
+                ImGui.Text("[BattleBuddy] None present");
+            }
+            else
+            {
+                for (var i = 0; i < count; i++)
                 {
-                    ImGui.Text($"[Companion] {member.Address.ToInt64():X} - {member.ObjectId} - {member.DataID}");
+                    var member = buddyList[i];
+                    ImGui.Text($"[BattleBuddy] [{i}] {member.Address.ToInt64():X} - {member.ObjectId} - {member.DataID}");
                     if (this.resolveObjects)
                     {
                         var gameObject = member.GameObject;
@@ -646,668 +697,617 @@ namespace Dalamud.Interface.Internal.Windows
                     }
                 }
             }
+        }
+    }
 
-            {
-                var member = buddyList.PetBuddy;
-                if (member == null)
-                {
-                    ImGui.Text("[Pet] null");
-                }
-                else
-                {
-                    ImGui.Text($"[Pet] {member.Address.ToInt64():X} - {member.ObjectId} - {member.DataID}");
-                    if (this.resolveObjects)
-                    {
-                        var gameObject = member.GameObject;
-                        if (gameObject == null)
-                        {
-                            ImGui.Text("GameObject was null");
-                        }
-                        else
-                        {
-                            this.PrintGameObject(gameObject, "-");
-                        }
-                    }
-                }
-            }
+    private void DrawPluginIPC()
+    {
+        if (this.ipcPub == null)
+        {
+            this.ipcPub = new CallGatePubSub<string, string>("dataDemo1");
 
+            this.ipcPub.RegisterAction((msg) =>
             {
-                var count = buddyList.Length;
-                if (count == 0)
-                {
-                    ImGui.Text("[BattleBuddy] None present");
-                }
-                else
-                {
-                    for (var i = 0; i < count; i++)
-                    {
-                        var member = buddyList[i];
-                        ImGui.Text($"[BattleBuddy] [{i}] {member.Address.ToInt64():X} - {member.ObjectId} - {member.DataID}");
-                        if (this.resolveObjects)
-                        {
-                            var gameObject = member.GameObject;
-                            if (gameObject == null)
-                            {
-                                ImGui.Text("GameObject was null");
-                            }
-                            else
-                            {
-                                this.PrintGameObject(gameObject, "-");
-                            }
-                        }
-                    }
-                }
-            }
+                Log.Information($"Data action was called: {msg}");
+            });
+
+            this.ipcPub.RegisterFunc((msg) =>
+            {
+                Log.Information($"Data func was called: {msg}");
+                return Guid.NewGuid().ToString();
+            });
         }
 
-        private void DrawPluginIPC()
+        if (this.ipcSub == null)
         {
-            if (this.ipcPub == null)
+            this.ipcSub = new CallGatePubSub<string, string>("dataDemo1");
+            this.ipcSub.Subscribe((msg) =>
             {
-                this.ipcPub = new CallGatePubSub<string, string>("dataDemo1");
-
-                this.ipcPub.RegisterAction((msg) =>
-                {
-                    Log.Information($"Data action was called: {msg}");
-                });
-
-                this.ipcPub.RegisterFunc((msg) =>
-                {
-                    Log.Information($"Data func was called: {msg}");
-                    return Guid.NewGuid().ToString();
-                });
-            }
-
-            if (this.ipcSub == null)
+                Log.Information("PONG1");
+            });
+            this.ipcSub.Subscribe((msg) =>
             {
-                this.ipcSub = new CallGatePubSub<string, string>("dataDemo1");
-                this.ipcSub.Subscribe((msg) =>
-                {
-                    Log.Information("PONG1");
-                });
-                this.ipcSub.Subscribe((msg) =>
-                {
-                    Log.Information("PONG2");
-                });
-                this.ipcSub.Subscribe((msg) =>
-                {
-                    throw new Exception("PONG3");
-                });
-            }
-
-            if (ImGui.Button("PING"))
+                Log.Information("PONG2");
+            });
+            this.ipcSub.Subscribe((msg) =>
             {
-                this.ipcPub.SendMessage("PING");
-            }
-
-            if (ImGui.Button("Action"))
-            {
-                this.ipcSub.InvokeAction("button1");
-            }
-
-            if (ImGui.Button("Func"))
-            {
-                this.callGateResponse = this.ipcSub.InvokeFunc("button2");
-            }
-
-            if (!this.callGateResponse.IsNullOrEmpty())
-                ImGui.Text($"Response: {this.callGateResponse}");
+                throw new Exception("PONG3");
+            });
         }
 
-        private void DrawCondition()
+        if (ImGui.Button("PING"))
         {
-            var condition = Service<Condition>.Get();
+            this.ipcPub.SendMessage("PING");
+        }
+
+        if (ImGui.Button("Action"))
+        {
+            this.ipcSub.InvokeAction("button1");
+        }
+
+        if (ImGui.Button("Func"))
+        {
+            this.callGateResponse = this.ipcSub.InvokeFunc("button2");
+        }
+
+        if (!this.callGateResponse.IsNullOrEmpty())
+            ImGui.Text($"Response: {this.callGateResponse}");
+    }
+
+    private void DrawCondition()
+    {
+        var condition = Service<Condition>.Get();
 
 #if DEBUG
             ImGui.Text($"ptr: 0x{condition.Address.ToInt64():X}");
 #endif
 
-            ImGui.Text("Current Conditions:");
-            ImGui.Separator();
+        ImGui.Text("Current Conditions:");
+        ImGui.Separator();
 
-            var didAny = false;
+        var didAny = false;
 
-            for (var i = 0; i < Condition.MaxConditionEntries; i++)
-            {
-                var typedCondition = (ConditionFlag)i;
-                var cond = condition[typedCondition];
+        for (var i = 0; i < Condition.MaxConditionEntries; i++)
+        {
+            var typedCondition = (ConditionFlag)i;
+            var cond = condition[typedCondition];
 
-                if (!cond) continue;
+            if (!cond) continue;
 
-                didAny = true;
+            didAny = true;
 
-                ImGui.Text($"ID: {i} Enum: {typedCondition}");
-            }
-
-            if (!didAny)
-                ImGui.Text("None. Talk to a shop NPC or visit a market board to find out more!!!!!!!");
+            ImGui.Text($"ID: {i} Enum: {typedCondition}");
         }
 
-        private void DrawGauge()
+        if (!didAny)
+            ImGui.Text("None. Talk to a shop NPC or visit a market board to find out more!!!!!!!");
+    }
+
+    private void DrawGauge()
+    {
+        var clientState = Service<ClientState>.Get();
+        var jobGauges = Service<JobGauges>.Get();
+
+        var player = clientState.LocalPlayer;
+        if (player == null)
         {
-            var clientState = Service<ClientState>.Get();
-            var jobGauges = Service<JobGauges>.Get();
-
-            var player = clientState.LocalPlayer;
-            if (player == null)
-            {
-                ImGui.Text("Player is not present");
-                return;
-            }
-
-            var jobID = player.ClassJob.Id;
-            JobGaugeBase? gauge = jobID switch
-            {
-                19 => jobGauges.Get<PLDGauge>(),
-                20 => jobGauges.Get<MNKGauge>(),
-                21 => jobGauges.Get<WARGauge>(),
-                22 => jobGauges.Get<DRGGauge>(),
-                23 => jobGauges.Get<BRDGauge>(),
-                24 => jobGauges.Get<WHMGauge>(),
-                25 => jobGauges.Get<BLMGauge>(),
-                27 => jobGauges.Get<SMNGauge>(),
-                28 => jobGauges.Get<SCHGauge>(),
-                30 => jobGauges.Get<NINGauge>(),
-                31 => jobGauges.Get<MCHGauge>(),
-                32 => jobGauges.Get<DRKGauge>(),
-                33 => jobGauges.Get<ASTGauge>(),
-                34 => jobGauges.Get<SAMGauge>(),
-                35 => jobGauges.Get<RDMGauge>(),
-                37 => jobGauges.Get<GNBGauge>(),
-                38 => jobGauges.Get<DNCGauge>(),
-                39 => jobGauges.Get<RPRGauge>(),
-                40 => jobGauges.Get<SGEGauge>(),
-                _ => null,
-            };
-
-            if (gauge == null)
-            {
-                ImGui.Text("No supported gauge exists for this job.");
-                return;
-            }
-
-            Util.ShowObject(gauge);
+            ImGui.Text("Player is not present");
+            return;
         }
 
-        private void DrawCommand()
+        var jobID = player.ClassJob.Id;
+        JobGaugeBase? gauge = jobID switch
         {
-            var commandManager = Service<CommandManager>.Get();
+            19 => jobGauges.Get<PLDGauge>(),
+            20 => jobGauges.Get<MNKGauge>(),
+            21 => jobGauges.Get<WARGauge>(),
+            22 => jobGauges.Get<DRGGauge>(),
+            23 => jobGauges.Get<BRDGauge>(),
+            24 => jobGauges.Get<WHMGauge>(),
+            25 => jobGauges.Get<BLMGauge>(),
+            27 => jobGauges.Get<SMNGauge>(),
+            28 => jobGauges.Get<SCHGauge>(),
+            30 => jobGauges.Get<NINGauge>(),
+            31 => jobGauges.Get<MCHGauge>(),
+            32 => jobGauges.Get<DRKGauge>(),
+            33 => jobGauges.Get<ASTGauge>(),
+            34 => jobGauges.Get<SAMGauge>(),
+            35 => jobGauges.Get<RDMGauge>(),
+            37 => jobGauges.Get<GNBGauge>(),
+            38 => jobGauges.Get<DNCGauge>(),
+            39 => jobGauges.Get<RPRGauge>(),
+            40 => jobGauges.Get<SGEGauge>(),
+            _ => null,
+        };
 
-            foreach (var command in commandManager.Commands)
-            {
-                ImGui.Text($"{command.Key}\n    -> {command.Value.HelpMessage}\n    -> In help: {command.Value.ShowInHelp}\n\n");
-            }
+        if (gauge == null)
+        {
+            ImGui.Text("No supported gauge exists for this job.");
+            return;
         }
 
-        private unsafe void DrawAddon()
+        Util.ShowObject(gauge);
+    }
+
+    private void DrawCommand()
+    {
+        var commandManager = Service<CommandManager>.Get();
+
+        foreach (var command in commandManager.Commands)
         {
-            var gameGui = Service<GameGui>.Get();
+            ImGui.Text($"{command.Key}\n    -> {command.Value.HelpMessage}\n    -> In help: {command.Value.ShowInHelp}\n\n");
+        }
+    }
 
-            ImGui.InputText("Addon name", ref this.inputAddonName, 256);
-            ImGui.InputInt("Addon Index", ref this.inputAddonIndex);
+    private unsafe void DrawAddon()
+    {
+        var gameGui = Service<GameGui>.Get();
 
-            if (this.inputAddonName.IsNullOrEmpty())
-                return;
+        ImGui.InputText("Addon name", ref this.inputAddonName, 256);
+        ImGui.InputInt("Addon Index", ref this.inputAddonIndex);
 
-            var address = gameGui.GetAddonByName(this.inputAddonName, this.inputAddonIndex);
+        if (this.inputAddonName.IsNullOrEmpty())
+            return;
 
-            if (address == IntPtr.Zero)
-            {
-                ImGui.Text("Null");
-                return;
-            }
+        var address = gameGui.GetAddonByName(this.inputAddonName, this.inputAddonIndex);
 
-            var addon = (FFXIVClientStructs.FFXIV.Component.GUI.AtkUnitBase*)address;
-            var name = MemoryHelper.ReadStringNullTerminated((IntPtr)addon->Name);
-            ImGui.TextUnformatted($"{name} - 0x{address.ToInt64():x}\n    v:{addon->IsVisible} x:{addon->X} y:{addon->Y} s:{addon->Scale}, w:{addon->RootNode->Width}, h:{addon->RootNode->Height}");
-
-            if (ImGui.Button("Find Agent"))
-            {
-                this.findAgentInterfacePtr = gameGui.FindAgentInterface(address);
-            }
-
-            if (this.findAgentInterfacePtr != IntPtr.Zero)
-            {
-                ImGui.TextUnformatted($"Agent: 0x{this.findAgentInterfacePtr.ToInt64():x}");
-                ImGui.SameLine();
-
-                if (ImGui.Button("C"))
-                    ImGui.SetClipboardText(this.findAgentInterfacePtr.ToInt64().ToString("x"));
-            }
+        if (address == IntPtr.Zero)
+        {
+            ImGui.Text("Null");
+            return;
         }
 
-        private void DrawAddonInspector()
+        var addon = (FFXIVClientStructs.FFXIV.Component.GUI.AtkUnitBase*)address;
+        var name = MemoryHelper.ReadStringNullTerminated((IntPtr)addon->Name);
+        ImGui.TextUnformatted($"{name} - 0x{address.ToInt64():x}\n    v:{addon->IsVisible} x:{addon->X} y:{addon->Y} s:{addon->Scale}, w:{addon->RootNode->Width}, h:{addon->RootNode->Height}");
+
+        if (ImGui.Button("Find Agent"))
         {
-            this.addonInspector ??= new UiDebug();
-            this.addonInspector.Draw();
+            this.findAgentInterfacePtr = gameGui.FindAgentInterface(address);
         }
 
-        private unsafe void DrawAtkArrayDataBrowser()
+        if (this.findAgentInterfacePtr != IntPtr.Zero)
         {
-            var fontWidth = ImGui.CalcTextSize("A").X;
-            var fontHeight = ImGui.GetTextLineHeightWithSpacing();
-            var uiModule = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance()->GetUiModule();
+            ImGui.TextUnformatted($"Agent: 0x{this.findAgentInterfacePtr.ToInt64():x}");
+            ImGui.SameLine();
 
-            if (uiModule == null)
+            if (ImGui.Button("C"))
+                ImGui.SetClipboardText(this.findAgentInterfacePtr.ToInt64().ToString("x"));
+        }
+    }
+
+    private void DrawAddonInspector()
+    {
+        this.addonInspector ??= new UiDebug();
+        this.addonInspector.Draw();
+    }
+
+    private unsafe void DrawAtkArrayDataBrowser()
+    {
+        var fontWidth = ImGui.CalcTextSize("A").X;
+        var fontHeight = ImGui.GetTextLineHeightWithSpacing();
+        var uiModule = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance()->GetUiModule();
+
+        if (uiModule == null)
+        {
+            ImGui.Text("UIModule unavailable.");
+            return;
+        }
+
+        var atkArrayDataHolder = &uiModule->GetRaptureAtkModule()->AtkModule.AtkArrayDataHolder;
+
+        if (ImGui.BeginTabBar("AtkArrayDataBrowserTabBar"))
+        {
+            if (ImGui.BeginTabItem($"NumberArrayData [{atkArrayDataHolder->NumberArrayCount}]"))
             {
-                ImGui.Text("UIModule unavailable.");
-                return;
-            }
-
-            var atkArrayDataHolder = &uiModule->GetRaptureAtkModule()->AtkModule.AtkArrayDataHolder;
-
-            if (ImGui.BeginTabBar("AtkArrayDataBrowserTabBar"))
-            {
-                if (ImGui.BeginTabItem($"NumberArrayData [{atkArrayDataHolder->NumberArrayCount}]"))
+                if (ImGui.BeginTable("NumberArrayDataTable", 3, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY))
                 {
-                    if (ImGui.BeginTable("NumberArrayDataTable", 3, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY))
+                    ImGui.TableSetupColumn("Index", ImGuiTableColumnFlags.WidthFixed, fontWidth * 10);
+                    ImGui.TableSetupColumn("Size", ImGuiTableColumnFlags.WidthFixed, fontWidth * 10);
+                    ImGui.TableSetupColumn("Pointer", ImGuiTableColumnFlags.WidthStretch);
+                    ImGui.TableHeadersRow();
+                    for (var numberArrayIndex = 0; numberArrayIndex < atkArrayDataHolder->NumberArrayCount; numberArrayIndex++)
                     {
-                        ImGui.TableSetupColumn("Index", ImGuiTableColumnFlags.WidthFixed, fontWidth * 10);
-                        ImGui.TableSetupColumn("Size", ImGuiTableColumnFlags.WidthFixed, fontWidth * 10);
-                        ImGui.TableSetupColumn("Pointer", ImGuiTableColumnFlags.WidthStretch);
-                        ImGui.TableHeadersRow();
-                        for (var numberArrayIndex = 0; numberArrayIndex < atkArrayDataHolder->NumberArrayCount; numberArrayIndex++)
+                        ImGui.TableNextRow();
+                        ImGui.TableNextColumn();
+                        ImGui.Text($"{numberArrayIndex} [{numberArrayIndex * 8:X}]");
+                        ImGui.TableNextColumn();
+                        var numberArrayData = atkArrayDataHolder->NumberArrays[numberArrayIndex];
+                        if (numberArrayData != null)
                         {
-                            ImGui.TableNextRow();
+                            ImGui.Text($"{numberArrayData->AtkArrayData.Size}");
                             ImGui.TableNextColumn();
-                            ImGui.Text($"{numberArrayIndex} [{numberArrayIndex * 8:X}]");
-                            ImGui.TableNextColumn();
-                            var numberArrayData = atkArrayDataHolder->NumberArrays[numberArrayIndex];
-                            if (numberArrayData != null)
+                            if (ImGui.TreeNodeEx($"{(long)numberArrayData:X}###{numberArrayIndex}", ImGuiTreeNodeFlags.SpanFullWidth))
                             {
-                                ImGui.Text($"{numberArrayData->AtkArrayData.Size}");
-                                ImGui.TableNextColumn();
-                                if (ImGui.TreeNodeEx($"{(long)numberArrayData:X}###{numberArrayIndex}", ImGuiTreeNodeFlags.SpanFullWidth))
+                                ImGui.NewLine();
+                                var tableHeight = Math.Min(40, numberArrayData->AtkArrayData.Size + 4);
+                                if (ImGui.BeginTable($"NumberArrayDataTable", 4, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY, new Vector2(0.0F, fontHeight * tableHeight)))
                                 {
-                                    ImGui.NewLine();
-                                    var tableHeight = Math.Min(40, numberArrayData->AtkArrayData.Size + 4);
-                                    if (ImGui.BeginTable($"NumberArrayDataTable", 4, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY, new Vector2(0.0F, fontHeight * tableHeight)))
+                                    ImGui.TableSetupColumn("Index", ImGuiTableColumnFlags.WidthFixed, fontWidth * 6);
+                                    ImGui.TableSetupColumn("Hex", ImGuiTableColumnFlags.WidthFixed, fontWidth * 9);
+                                    ImGui.TableSetupColumn("Integer", ImGuiTableColumnFlags.WidthFixed, fontWidth * 12);
+                                    ImGui.TableSetupColumn("Float", ImGuiTableColumnFlags.WidthFixed, fontWidth * 20);
+                                    ImGui.TableHeadersRow();
+                                    for (var numberIndex = 0; numberIndex < numberArrayData->AtkArrayData.Size; numberIndex++)
                                     {
-                                        ImGui.TableSetupColumn("Index", ImGuiTableColumnFlags.WidthFixed, fontWidth * 6);
-                                        ImGui.TableSetupColumn("Hex", ImGuiTableColumnFlags.WidthFixed, fontWidth * 9);
-                                        ImGui.TableSetupColumn("Integer", ImGuiTableColumnFlags.WidthFixed, fontWidth * 12);
-                                        ImGui.TableSetupColumn("Float", ImGuiTableColumnFlags.WidthFixed, fontWidth * 20);
-                                        ImGui.TableHeadersRow();
-                                        for (var numberIndex = 0; numberIndex < numberArrayData->AtkArrayData.Size; numberIndex++)
-                                        {
-                                            ImGui.TableNextRow();
-                                            ImGui.TableNextColumn();
-                                            ImGui.Text($"{numberIndex}");
-                                            ImGui.TableNextColumn();
-                                            ImGui.Text($"{numberArrayData->IntArray[numberIndex]:X}");
-                                            ImGui.TableNextColumn();
-                                            ImGui.Text($"{numberArrayData->IntArray[numberIndex]}");
-                                            ImGui.TableNextColumn();
-                                            ImGui.Text($"{*(float*)&numberArrayData->IntArray[numberIndex]}");
-                                        }
-
-                                        ImGui.EndTable();
+                                        ImGui.TableNextRow();
+                                        ImGui.TableNextColumn();
+                                        ImGui.Text($"{numberIndex}");
+                                        ImGui.TableNextColumn();
+                                        ImGui.Text($"{numberArrayData->IntArray[numberIndex]:X}");
+                                        ImGui.TableNextColumn();
+                                        ImGui.Text($"{numberArrayData->IntArray[numberIndex]}");
+                                        ImGui.TableNextColumn();
+                                        ImGui.Text($"{*(float*)&numberArrayData->IntArray[numberIndex]}");
                                     }
 
-                                    ImGui.TreePop();
+                                    ImGui.EndTable();
                                 }
-                            }
-                            else
-                            {
-                                ImGui.TextDisabled("--");
-                                ImGui.TableNextColumn();
-                                ImGui.TextDisabled("--");
+
+                                ImGui.TreePop();
                             }
                         }
-
-                        ImGui.EndTable();
+                        else
+                        {
+                            ImGui.TextDisabled("--");
+                            ImGui.TableNextColumn();
+                            ImGui.TextDisabled("--");
+                        }
                     }
 
-                    ImGui.EndTabItem();
+                    ImGui.EndTable();
                 }
 
-                if (ImGui.BeginTabItem($"StringArrayData [{atkArrayDataHolder->StringArrayCount}]"))
-                {
-                    if (ImGui.BeginTable("StringArrayDataTable", 3, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY))
-                    {
-                        ImGui.TableSetupColumn("Index", ImGuiTableColumnFlags.WidthFixed, fontWidth * 10);
-                        ImGui.TableSetupColumn("Size", ImGuiTableColumnFlags.WidthFixed, fontWidth * 10);
-                        ImGui.TableSetupColumn("Pointer", ImGuiTableColumnFlags.WidthStretch);
-                        ImGui.TableHeadersRow();
-                        for (var stringArrayIndex = 0; stringArrayIndex < atkArrayDataHolder->StringArrayCount; stringArrayIndex++)
-                        {
-                            ImGui.TableNextRow();
-                            ImGui.TableNextColumn();
-                            ImGui.Text($"{stringArrayIndex} [{stringArrayIndex * 8:X}]");
-                            ImGui.TableNextColumn();
-                            var stringArrayData = atkArrayDataHolder->StringArrays[stringArrayIndex];
-                            if (stringArrayData != null)
-                            {
-                                ImGui.Text($"{stringArrayData->AtkArrayData.Size}");
-                                ImGui.TableNextColumn();
-                                if (ImGui.TreeNodeEx($"{(long)stringArrayData:X}###{stringArrayIndex}", ImGuiTreeNodeFlags.SpanFullWidth))
-                                {
-                                    ImGui.NewLine();
-                                    var tableHeight = Math.Min(40, stringArrayData->AtkArrayData.Size + 4);
-                                    if (ImGui.BeginTable($"StringArrayDataTable", 2, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY, new Vector2(0.0F, fontHeight * tableHeight)))
-                                    {
-                                        ImGui.TableSetupColumn("Index", ImGuiTableColumnFlags.WidthFixed, fontWidth * 6);
-                                        ImGui.TableSetupColumn("String", ImGuiTableColumnFlags.WidthStretch);
-                                        ImGui.TableHeadersRow();
-                                        for (var stringIndex = 0; stringIndex < stringArrayData->AtkArrayData.Size; stringIndex++)
-                                        {
-                                            ImGui.TableNextRow();
-                                            ImGui.TableNextColumn();
-                                            ImGui.Text($"{stringIndex}");
-                                            ImGui.TableNextColumn();
-                                            if (stringArrayData->StringArray[stringIndex] != null)
-                                            {
-                                                ImGui.Text($"{MemoryHelper.ReadSeStringNullTerminated(new IntPtr(stringArrayData->StringArray[stringIndex]))}");
-                                            }
-                                            else
-                                            {
-                                                ImGui.TextDisabled("--");
-                                            }
-                                        }
+                ImGui.EndTabItem();
+            }
 
-                                        ImGui.EndTable();
+            if (ImGui.BeginTabItem($"StringArrayData [{atkArrayDataHolder->StringArrayCount}]"))
+            {
+                if (ImGui.BeginTable("StringArrayDataTable", 3, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY))
+                {
+                    ImGui.TableSetupColumn("Index", ImGuiTableColumnFlags.WidthFixed, fontWidth * 10);
+                    ImGui.TableSetupColumn("Size", ImGuiTableColumnFlags.WidthFixed, fontWidth * 10);
+                    ImGui.TableSetupColumn("Pointer", ImGuiTableColumnFlags.WidthStretch);
+                    ImGui.TableHeadersRow();
+                    for (var stringArrayIndex = 0; stringArrayIndex < atkArrayDataHolder->StringArrayCount; stringArrayIndex++)
+                    {
+                        ImGui.TableNextRow();
+                        ImGui.TableNextColumn();
+                        ImGui.Text($"{stringArrayIndex} [{stringArrayIndex * 8:X}]");
+                        ImGui.TableNextColumn();
+                        var stringArrayData = atkArrayDataHolder->StringArrays[stringArrayIndex];
+                        if (stringArrayData != null)
+                        {
+                            ImGui.Text($"{stringArrayData->AtkArrayData.Size}");
+                            ImGui.TableNextColumn();
+                            if (ImGui.TreeNodeEx($"{(long)stringArrayData:X}###{stringArrayIndex}", ImGuiTreeNodeFlags.SpanFullWidth))
+                            {
+                                ImGui.NewLine();
+                                var tableHeight = Math.Min(40, stringArrayData->AtkArrayData.Size + 4);
+                                if (ImGui.BeginTable($"StringArrayDataTable", 2, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY, new Vector2(0.0F, fontHeight * tableHeight)))
+                                {
+                                    ImGui.TableSetupColumn("Index", ImGuiTableColumnFlags.WidthFixed, fontWidth * 6);
+                                    ImGui.TableSetupColumn("String", ImGuiTableColumnFlags.WidthStretch);
+                                    ImGui.TableHeadersRow();
+                                    for (var stringIndex = 0; stringIndex < stringArrayData->AtkArrayData.Size; stringIndex++)
+                                    {
+                                        ImGui.TableNextRow();
+                                        ImGui.TableNextColumn();
+                                        ImGui.Text($"{stringIndex}");
+                                        ImGui.TableNextColumn();
+                                        if (stringArrayData->StringArray[stringIndex] != null)
+                                        {
+                                            ImGui.Text($"{MemoryHelper.ReadSeStringNullTerminated(new IntPtr(stringArrayData->StringArray[stringIndex]))}");
+                                        }
+                                        else
+                                        {
+                                            ImGui.TextDisabled("--");
+                                        }
                                     }
 
-                                    ImGui.TreePop();
+                                    ImGui.EndTable();
                                 }
-                            }
-                            else
-                            {
-                                ImGui.TextDisabled("--");
-                                ImGui.TableNextColumn();
-                                ImGui.TextDisabled("--");
+
+                                ImGui.TreePop();
                             }
                         }
-
-                        ImGui.EndTable();
+                        else
+                        {
+                            ImGui.TextDisabled("--");
+                            ImGui.TableNextColumn();
+                            ImGui.TextDisabled("--");
+                        }
                     }
 
-                    ImGui.EndTabItem();
+                    ImGui.EndTable();
                 }
 
-                ImGui.EndTabBar();
+                ImGui.EndTabItem();
             }
+
+            ImGui.EndTabBar();
         }
+    }
 
-        private void DrawStartInfo()
+    private void DrawStartInfo()
+    {
+        var startInfo = Service<DalamudStartInfo>.Get();
+
+        ImGui.Text(JsonConvert.SerializeObject(startInfo, Formatting.Indented));
+    }
+
+    private void DrawTarget()
+    {
+        var clientState = Service<ClientState>.Get();
+        var targetMgr = Service<TargetManager>.Get();
+
+        if (targetMgr.Target != null)
         {
-            var startInfo = Service<DalamudStartInfo>.Get();
+            this.PrintGameObject(targetMgr.Target, "CurrentTarget");
 
-            ImGui.Text(JsonConvert.SerializeObject(startInfo, Formatting.Indented));
-        }
+            ImGui.Text("Target");
+            Util.ShowGameObjectStruct(targetMgr.Target);
 
-        private void DrawTarget()
-        {
-            var clientState = Service<ClientState>.Get();
-            var targetMgr = Service<TargetManager>.Get();
-
-            if (targetMgr.Target != null)
+            var tot = targetMgr.Target.TargetObject;
+            if (tot != null)
             {
-                this.PrintGameObject(targetMgr.Target, "CurrentTarget");
-
-                ImGui.Text("Target");
-                Util.ShowGameObjectStruct(targetMgr.Target);
-
-                var tot = targetMgr.Target.TargetObject;
-                if (tot != null)
-                {
-                    ImGuiHelpers.ScaledDummy(10);
-
-                    ImGui.Separator();
-                    ImGui.Text("ToT");
-                    Util.ShowGameObjectStruct(tot);
-                }
-
                 ImGuiHelpers.ScaledDummy(10);
-            }
 
-            if (targetMgr.FocusTarget != null)
-                this.PrintGameObject(targetMgr.FocusTarget, "FocusTarget");
-
-            if (targetMgr.MouseOverTarget != null)
-                this.PrintGameObject(targetMgr.MouseOverTarget, "MouseOverTarget");
-
-            if (targetMgr.PreviousTarget != null)
-                this.PrintGameObject(targetMgr.PreviousTarget, "PreviousTarget");
-
-            if (targetMgr.SoftTarget != null)
-                this.PrintGameObject(targetMgr.SoftTarget, "SoftTarget");
-
-            if (ImGui.Button("Clear CT"))
-                targetMgr.ClearTarget();
-
-            if (ImGui.Button("Clear FT"))
-                targetMgr.ClearFocusTarget();
-
-            var localPlayer = clientState.LocalPlayer;
-
-            if (localPlayer != null)
-            {
-                if (ImGui.Button("Set CT"))
-                    targetMgr.SetTarget(localPlayer);
-
-                if (ImGui.Button("Set FT"))
-                    targetMgr.SetFocusTarget(localPlayer);
-            }
-            else
-            {
-                ImGui.Text("LocalPlayer is null.");
-            }
-        }
-
-        private void DrawToast()
-        {
-            var toastGui = Service<ToastGui>.Get();
-
-            ImGui.InputText("Toast text", ref this.inputTextToast, 200);
-
-            ImGui.Combo("Toast Position", ref this.toastPosition, new[] { "Bottom", "Top", }, 2);
-            ImGui.Combo("Toast Speed", ref this.toastSpeed, new[] { "Slow", "Fast", }, 2);
-            ImGui.Combo("Quest Toast Position", ref this.questToastPosition, new[] { "Centre", "Right", "Left" }, 3);
-            ImGui.Checkbox("Quest Checkmark", ref this.questToastCheckmark);
-            ImGui.Checkbox("Quest Play Sound", ref this.questToastSound);
-            ImGui.InputInt("Quest Icon ID", ref this.questToastIconId);
-
-            ImGuiHelpers.ScaledDummy(new Vector2(10, 10));
-
-            if (ImGui.Button("Show toast"))
-            {
-                toastGui.ShowNormal(this.inputTextToast, new ToastOptions
-                {
-                    Position = (ToastPosition)this.toastPosition,
-                    Speed = (ToastSpeed)this.toastSpeed,
-                });
-            }
-
-            if (ImGui.Button("Show Quest toast"))
-            {
-                toastGui.ShowQuest(this.inputTextToast, new QuestToastOptions
-                {
-                    Position = (QuestToastPosition)this.questToastPosition,
-                    DisplayCheckmark = this.questToastCheckmark,
-                    IconId = (uint)this.questToastIconId,
-                    PlaySound = this.questToastSound,
-                });
-            }
-
-            if (ImGui.Button("Show Error toast"))
-            {
-                toastGui.ShowError(this.inputTextToast);
-            }
-        }
-
-        private void DrawFlyText()
-        {
-            if (ImGui.BeginCombo("Kind", this.flyKind.ToString()))
-            {
-                var names = Enum.GetNames(typeof(FlyTextKind));
-                for (var i = 0; i < names.Length; i++)
-                {
-                    if (ImGui.Selectable($"{names[i]} ({i})"))
-                        this.flyKind = (FlyTextKind)i;
-                }
-
-                ImGui.EndCombo();
-            }
-
-            ImGui.InputText("Text1", ref this.flyText1, 200);
-            ImGui.InputText("Text2", ref this.flyText2, 200);
-
-            ImGui.InputInt("Val1", ref this.flyVal1);
-            ImGui.InputInt("Val2", ref this.flyVal2);
-
-            ImGui.InputInt("Icon ID", ref this.flyIcon);
-            ImGui.ColorEdit4("Color", ref this.flyColor);
-            ImGui.InputInt("Actor Index", ref this.flyActor);
-            var sendColor = ImGui.ColorConvertFloat4ToU32(this.flyColor);
-
-            if (ImGui.Button("Send"))
-            {
-                Service<FlyTextGui>.Get().AddFlyText(
-                    this.flyKind,
-                    unchecked((uint)this.flyActor),
-                    unchecked((uint)this.flyVal1),
-                    unchecked((uint)this.flyVal2),
-                    this.flyText1,
-                    this.flyText2,
-                    sendColor,
-                    unchecked((uint)this.flyIcon));
-            }
-        }
-
-        private void DrawImGui()
-        {
-            var interfaceManager = Service<InterfaceManager>.Get();
-            var notifications = Service<NotificationManager>.Get();
-
-            ImGui.Text("Monitor count: " + ImGui.GetPlatformIO().Monitors.Size);
-            ImGui.Text("OverrideGameCursor: " + interfaceManager.OverrideGameCursor);
-
-            ImGui.Button("THIS IS A BUTTON###hoverTestButton");
-            interfaceManager.OverrideGameCursor = !ImGui.IsItemHovered();
-
-            ImGui.Separator();
-
-            ImGui.TextUnformatted($"WindowSystem.TimeSinceLastAnyFocus: {WindowSystem.TimeSinceLastAnyFocus.TotalMilliseconds:0}ms");
-
-            ImGui.Separator();
-
-            if (ImGui.Button("Add random notification"))
-            {
-                var rand = new Random();
-
-                var title = rand.Next(0, 5) switch
-                {
-                    0 => "This is a toast",
-                    1 => "Truly, a toast",
-                    2 => "I am testing this toast",
-                    3 => "I hope this looks right",
-                    4 => "Good stuff",
-                    5 => "Nice",
-                    _ => null,
-                };
-
-                var type = rand.Next(0, 4) switch
-                {
-                    0 => Notifications.NotificationType.Error,
-                    1 => Notifications.NotificationType.Warning,
-                    2 => Notifications.NotificationType.Info,
-                    3 => Notifications.NotificationType.Success,
-                    4 => Notifications.NotificationType.None,
-                    _ => Notifications.NotificationType.None,
-                };
-
-                var text = "Bla bla bla bla bla bla bla bla bla bla bla.\nBla bla bla bla bla bla bla bla bla bla bla bla bla bla.";
-
-                notifications.AddNotification(text, title, type);
-            }
-        }
-
-        private void DrawTex()
-        {
-            var dataManager = Service<DataManager>.Get();
-
-            ImGui.InputText("Tex Path", ref this.inputTexPath, 255);
-            ImGui.InputFloat2("UV0", ref this.inputTexUv0);
-            ImGui.InputFloat2("UV1", ref this.inputTexUv1);
-            ImGui.InputFloat4("Tint", ref this.inputTintCol);
-            ImGui.InputFloat2("Scale", ref this.inputTexScale);
-
-            if (ImGui.Button("Load Tex"))
-            {
-                try
-                {
-                    this.debugTex = dataManager.GetImGuiTexture(this.inputTexPath);
-                    this.inputTexScale = new Vector2(this.debugTex.Width, this.debugTex.Height);
-                }
-                catch (Exception ex)
-                {
-                    Log.Error(ex, "Could not load tex.");
-                }
+                ImGui.Separator();
+                ImGui.Text("ToT");
+                Util.ShowGameObjectStruct(tot);
             }
 
             ImGuiHelpers.ScaledDummy(10);
+        }
 
-            if (this.debugTex != null)
+        if (targetMgr.FocusTarget != null)
+            this.PrintGameObject(targetMgr.FocusTarget, "FocusTarget");
+
+        if (targetMgr.MouseOverTarget != null)
+            this.PrintGameObject(targetMgr.MouseOverTarget, "MouseOverTarget");
+
+        if (targetMgr.PreviousTarget != null)
+            this.PrintGameObject(targetMgr.PreviousTarget, "PreviousTarget");
+
+        if (targetMgr.SoftTarget != null)
+            this.PrintGameObject(targetMgr.SoftTarget, "SoftTarget");
+
+        if (ImGui.Button("Clear CT"))
+            targetMgr.ClearTarget();
+
+        if (ImGui.Button("Clear FT"))
+            targetMgr.ClearFocusTarget();
+
+        var localPlayer = clientState.LocalPlayer;
+
+        if (localPlayer != null)
+        {
+            if (ImGui.Button("Set CT"))
+                targetMgr.SetTarget(localPlayer);
+
+            if (ImGui.Button("Set FT"))
+                targetMgr.SetFocusTarget(localPlayer);
+        }
+        else
+        {
+            ImGui.Text("LocalPlayer is null.");
+        }
+    }
+
+    private void DrawToast()
+    {
+        var toastGui = Service<ToastGui>.Get();
+
+        ImGui.InputText("Toast text", ref this.inputTextToast, 200);
+
+        ImGui.Combo("Toast Position", ref this.toastPosition, new[] { "Bottom", "Top", }, 2);
+        ImGui.Combo("Toast Speed", ref this.toastSpeed, new[] { "Slow", "Fast", }, 2);
+        ImGui.Combo("Quest Toast Position", ref this.questToastPosition, new[] { "Centre", "Right", "Left" }, 3);
+        ImGui.Checkbox("Quest Checkmark", ref this.questToastCheckmark);
+        ImGui.Checkbox("Quest Play Sound", ref this.questToastSound);
+        ImGui.InputInt("Quest Icon ID", ref this.questToastIconId);
+
+        ImGuiHelpers.ScaledDummy(new Vector2(10, 10));
+
+        if (ImGui.Button("Show toast"))
+        {
+            toastGui.ShowNormal(this.inputTextToast, new ToastOptions
             {
-                ImGui.Image(this.debugTex.ImGuiHandle, this.inputTexScale, this.inputTexUv0, this.inputTexUv1, this.inputTintCol);
-                ImGuiHelpers.ScaledDummy(5);
-                Util.ShowObject(this.debugTex);
+                Position = (ToastPosition)this.toastPosition,
+                Speed = (ToastSpeed)this.toastSpeed,
+            });
+        }
+
+        if (ImGui.Button("Show Quest toast"))
+        {
+            toastGui.ShowQuest(this.inputTextToast, new QuestToastOptions
+            {
+                Position = (QuestToastPosition)this.questToastPosition,
+                DisplayCheckmark = this.questToastCheckmark,
+                IconId = (uint)this.questToastIconId,
+                PlaySound = this.questToastSound,
+            });
+        }
+
+        if (ImGui.Button("Show Error toast"))
+        {
+            toastGui.ShowError(this.inputTextToast);
+        }
+    }
+
+    private void DrawFlyText()
+    {
+        if (ImGui.BeginCombo("Kind", this.flyKind.ToString()))
+        {
+            var names = Enum.GetNames(typeof(FlyTextKind));
+            for (var i = 0; i < names.Length; i++)
+            {
+                if (ImGui.Selectable($"{names[i]} ({i})"))
+                    this.flyKind = (FlyTextKind)i;
+            }
+
+            ImGui.EndCombo();
+        }
+
+        ImGui.InputText("Text1", ref this.flyText1, 200);
+        ImGui.InputText("Text2", ref this.flyText2, 200);
+
+        ImGui.InputInt("Val1", ref this.flyVal1);
+        ImGui.InputInt("Val2", ref this.flyVal2);
+
+        ImGui.InputInt("Icon ID", ref this.flyIcon);
+        ImGui.ColorEdit4("Color", ref this.flyColor);
+        ImGui.InputInt("Actor Index", ref this.flyActor);
+        var sendColor = ImGui.ColorConvertFloat4ToU32(this.flyColor);
+
+        if (ImGui.Button("Send"))
+        {
+            Service<FlyTextGui>.Get().AddFlyText(
+                this.flyKind,
+                unchecked((uint)this.flyActor),
+                unchecked((uint)this.flyVal1),
+                unchecked((uint)this.flyVal2),
+                this.flyText1,
+                this.flyText2,
+                sendColor,
+                unchecked((uint)this.flyIcon));
+        }
+    }
+
+    private void DrawImGui()
+    {
+        var interfaceManager = Service<InterfaceManager>.Get();
+        var notifications = Service<NotificationManager>.Get();
+
+        ImGui.Text("Monitor count: " + ImGui.GetPlatformIO().Monitors.Size);
+        ImGui.Text("OverrideGameCursor: " + interfaceManager.OverrideGameCursor);
+
+        ImGui.Button("THIS IS A BUTTON###hoverTestButton");
+        interfaceManager.OverrideGameCursor = !ImGui.IsItemHovered();
+
+        ImGui.Separator();
+
+        ImGui.TextUnformatted($"WindowSystem.TimeSinceLastAnyFocus: {WindowSystem.TimeSinceLastAnyFocus.TotalMilliseconds:0}ms");
+
+        ImGui.Separator();
+
+        if (ImGui.Button("Add random notification"))
+        {
+            var rand = new Random();
+
+            var title = rand.Next(0, 5) switch
+            {
+                0 => "This is a toast",
+                1 => "Truly, a toast",
+                2 => "I am testing this toast",
+                3 => "I hope this looks right",
+                4 => "Good stuff",
+                5 => "Nice",
+                _ => null,
+            };
+
+            var type = rand.Next(0, 4) switch
+            {
+                0 => Notifications.NotificationType.Error,
+                1 => Notifications.NotificationType.Warning,
+                2 => Notifications.NotificationType.Info,
+                3 => Notifications.NotificationType.Success,
+                4 => Notifications.NotificationType.None,
+                _ => Notifications.NotificationType.None,
+            };
+
+            var text = "Bla bla bla bla bla bla bla bla bla bla bla.\nBla bla bla bla bla bla bla bla bla bla bla bla bla bla.";
+
+            notifications.AddNotification(text, title, type);
+        }
+    }
+
+    private void DrawTex()
+    {
+        var dataManager = Service<DataManager>.Get();
+
+        ImGui.InputText("Tex Path", ref this.inputTexPath, 255);
+        ImGui.InputFloat2("UV0", ref this.inputTexUv0);
+        ImGui.InputFloat2("UV1", ref this.inputTexUv1);
+        ImGui.InputFloat4("Tint", ref this.inputTintCol);
+        ImGui.InputFloat2("Scale", ref this.inputTexScale);
+
+        if (ImGui.Button("Load Tex"))
+        {
+            try
+            {
+                this.debugTex = dataManager.GetImGuiTexture(this.inputTexPath);
+                this.inputTexScale = new Vector2(this.debugTex.Width, this.debugTex.Height);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Could not load tex.");
             }
         }
 
-        private void DrawKeyState()
+        ImGuiHelpers.ScaledDummy(10);
+
+        if (this.debugTex != null)
         {
-            var keyState = Service<KeyState>.Get();
+            ImGui.Image(this.debugTex.ImGuiHandle, this.inputTexScale, this.inputTexUv0, this.inputTexUv1, this.inputTintCol);
+            ImGuiHelpers.ScaledDummy(5);
+            Util.ShowObject(this.debugTex);
+        }
+    }
 
-            ImGui.Columns(4);
+    private void DrawKeyState()
+    {
+        var keyState = Service<KeyState>.Get();
 
-            var i = 0;
-            foreach (var vkCode in keyState.GetValidVirtualKeys())
-            {
-                var code = (int)vkCode;
-                var value = keyState[code];
+        ImGui.Columns(4);
 
-                ImGui.PushStyleColor(ImGuiCol.Text, value ? ImGuiColors.HealerGreen : ImGuiColors.DPSRed);
+        var i = 0;
+        foreach (var vkCode in keyState.GetValidVirtualKeys())
+        {
+            var code = (int)vkCode;
+            var value = keyState[code];
 
-                ImGui.Text($"{vkCode} ({code})");
+            ImGui.PushStyleColor(ImGuiCol.Text, value ? ImGuiColors.HealerGreen : ImGuiColors.DPSRed);
 
-                ImGui.PopStyleColor();
+            ImGui.Text($"{vkCode} ({code})");
 
-                i++;
-                if (i % 24 == 0)
-                    ImGui.NextColumn();
-            }
+            ImGui.PopStyleColor();
 
-            ImGui.Columns(1);
+            i++;
+            if (i % 24 == 0)
+                ImGui.NextColumn();
         }
 
-        private void DrawGamepad()
+        ImGui.Columns(1);
+    }
+
+    private void DrawGamepad()
+    {
+        var gamepadState = Service<GamepadState>.Get();
+
+        static void DrawHelper(string text, uint mask, Func<GamepadButtons, float> resolve)
         {
-            var gamepadState = Service<GamepadState>.Get();
+            ImGui.Text($"{text} {mask:X4}");
+            ImGui.Text($"DPadLeft {resolve(GamepadButtons.DpadLeft)} " +
+                       $"DPadUp {resolve(GamepadButtons.DpadUp)} " +
+                       $"DPadRight {resolve(GamepadButtons.DpadRight)} " +
+                       $"DPadDown {resolve(GamepadButtons.DpadDown)} ");
+            ImGui.Text($"West {resolve(GamepadButtons.West)} " +
+                       $"North {resolve(GamepadButtons.North)} " +
+                       $"East {resolve(GamepadButtons.East)} " +
+                       $"South {resolve(GamepadButtons.South)} ");
+            ImGui.Text($"L1 {resolve(GamepadButtons.L1)} " +
+                       $"L2 {resolve(GamepadButtons.L2)} " +
+                       $"R1 {resolve(GamepadButtons.R1)} " +
+                       $"R2 {resolve(GamepadButtons.R2)} ");
+            ImGui.Text($"Select {resolve(GamepadButtons.Select)} " +
+                       $"Start {resolve(GamepadButtons.Start)} " +
+                       $"L3 {resolve(GamepadButtons.L3)} " +
+                       $"R3 {resolve(GamepadButtons.R3)} ");
+        }
 
-            static void DrawHelper(string text, uint mask, Func<GamepadButtons, float> resolve)
-            {
-                ImGui.Text($"{text} {mask:X4}");
-                ImGui.Text($"DPadLeft {resolve(GamepadButtons.DpadLeft)} " +
-                           $"DPadUp {resolve(GamepadButtons.DpadUp)} " +
-                           $"DPadRight {resolve(GamepadButtons.DpadRight)} " +
-                           $"DPadDown {resolve(GamepadButtons.DpadDown)} ");
-                ImGui.Text($"West {resolve(GamepadButtons.West)} " +
-                           $"North {resolve(GamepadButtons.North)} " +
-                           $"East {resolve(GamepadButtons.East)} " +
-                           $"South {resolve(GamepadButtons.South)} ");
-                ImGui.Text($"L1 {resolve(GamepadButtons.L1)} " +
-                           $"L2 {resolve(GamepadButtons.L2)} " +
-                           $"R1 {resolve(GamepadButtons.R1)} " +
-                           $"R2 {resolve(GamepadButtons.R2)} ");
-                ImGui.Text($"Select {resolve(GamepadButtons.Select)} " +
-                           $"Start {resolve(GamepadButtons.Start)} " +
-                           $"L3 {resolve(GamepadButtons.L3)} " +
-                           $"R3 {resolve(GamepadButtons.R3)} ");
-            }
-
-            ImGui.Text($"GamepadInput 0x{gamepadState.GamepadInputAddress.ToInt64():X}");
+        ImGui.Text($"GamepadInput 0x{gamepadState.GamepadInputAddress.ToInt64():X}");
 
 #if DEBUG
             if (ImGui.IsItemHovered())
@@ -1317,444 +1317,443 @@ namespace Dalamud.Interface.Internal.Windows
                 ImGui.SetClipboardText($"0x{gamepadState.GamepadInputAddress.ToInt64():X}");
 #endif
 
-            DrawHelper(
-                "Buttons Raw",
-                gamepadState.ButtonsRaw,
-                gamepadState.Raw);
-            DrawHelper(
-                "Buttons Pressed",
-                gamepadState.ButtonsPressed,
-                gamepadState.Pressed);
-            DrawHelper(
-                "Buttons Repeat",
-                gamepadState.ButtonsRepeat,
-                gamepadState.Repeat);
-            DrawHelper(
-                "Buttons Released",
-                gamepadState.ButtonsReleased,
-                gamepadState.Released);
-            ImGui.Text($"LeftStickLeft {gamepadState.LeftStickLeft:0.00} " +
-                       $"LeftStickUp {gamepadState.LeftStickUp:0.00} " +
-                       $"LeftStickRight {gamepadState.LeftStickRight:0.00} " +
-                       $"LeftStickDown {gamepadState.LeftStickDown:0.00} ");
-            ImGui.Text($"RightStickLeft {gamepadState.RightStickLeft:0.00} " +
-                       $"RightStickUp {gamepadState.RightStickUp:0.00} " +
-                       $"RightStickRight {gamepadState.RightStickRight:0.00} " +
-                       $"RightStickDown {gamepadState.RightStickDown:0.00} ");
+        DrawHelper(
+            "Buttons Raw",
+            gamepadState.ButtonsRaw,
+            gamepadState.Raw);
+        DrawHelper(
+            "Buttons Pressed",
+            gamepadState.ButtonsPressed,
+            gamepadState.Pressed);
+        DrawHelper(
+            "Buttons Repeat",
+            gamepadState.ButtonsRepeat,
+            gamepadState.Repeat);
+        DrawHelper(
+            "Buttons Released",
+            gamepadState.ButtonsReleased,
+            gamepadState.Released);
+        ImGui.Text($"LeftStickLeft {gamepadState.LeftStickLeft:0.00} " +
+                   $"LeftStickUp {gamepadState.LeftStickUp:0.00} " +
+                   $"LeftStickRight {gamepadState.LeftStickRight:0.00} " +
+                   $"LeftStickDown {gamepadState.LeftStickDown:0.00} ");
+        ImGui.Text($"RightStickLeft {gamepadState.RightStickLeft:0.00} " +
+                   $"RightStickUp {gamepadState.RightStickUp:0.00} " +
+                   $"RightStickRight {gamepadState.RightStickRight:0.00} " +
+                   $"RightStickDown {gamepadState.RightStickDown:0.00} ");
+    }
+
+    private void DrawConfiguration()
+    {
+        var config = Service<DalamudConfiguration>.Get();
+        Util.ShowObject(config);
+    }
+
+    private void DrawTaskSched()
+    {
+        if (ImGui.Button("Clear list"))
+        {
+            TaskTracker.Clear();
         }
 
-        private void DrawConfiguration()
+        ImGui.SameLine();
+        ImGuiHelpers.ScaledDummy(10);
+        ImGui.SameLine();
+
+        if (ImGui.Button("Cancel using CancellationTokenSource"))
         {
-            var config = Service<DalamudConfiguration>.Get();
-            Util.ShowObject(config);
+            this.taskSchedCancelSource.Cancel();
+            this.taskSchedCancelSource = new();
         }
 
-        private void DrawTaskSched()
+        ImGui.Text("Run in any thread: ");
+        ImGui.SameLine();
+
+        if (ImGui.Button("Short Task.Run"))
         {
-            if (ImGui.Button("Clear list"))
+            Task.Run(() => { Thread.Sleep(500); });
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button("Task in task(Delay)"))
+        {
+            var token = this.taskSchedCancelSource.Token;
+            Task.Run(async () => await this.TestTaskInTaskDelay(token));
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button("Task in task(Sleep)"))
+        {
+            Task.Run(async () => await this.TestTaskInTaskSleep());
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button("Faulting task"))
+        {
+            Task.Run(() =>
             {
-                TaskTracker.Clear();
-            }
+                Thread.Sleep(200);
 
-            ImGui.SameLine();
-            ImGuiHelpers.ScaledDummy(10);
-            ImGui.SameLine();
+                string a = null;
+                a.Contains("dalamud");
+            });
+        }
 
-            if (ImGui.Button("Cancel using CancellationTokenSource"))
+        ImGui.Text("Run in Framework.Update: ");
+        ImGui.SameLine();
+
+        if (ImGui.Button("ASAP"))
+        {
+            Task.Run(async () => await Service<Framework>.Get().RunOnTick(() => { }, cancellationToken: this.taskSchedCancelSource.Token));
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button("In 1s"))
+        {
+            Task.Run(async () => await Service<Framework>.Get().RunOnTick(() => { }, cancellationToken: this.taskSchedCancelSource.Token, delay: TimeSpan.FromSeconds(1)));
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button("In 60f"))
+        {
+            Task.Run(async () => await Service<Framework>.Get().RunOnTick(() => { }, cancellationToken: this.taskSchedCancelSource.Token, delayTicks: 60));
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button("Error in 1s"))
+        {
+            Task.Run(async () => await Service<Framework>.Get().RunOnTick(() => throw new Exception("Test Exception"), cancellationToken: this.taskSchedCancelSource.Token, delay: TimeSpan.FromSeconds(1)));
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button("As long as it's in Framework Thread"))
+        {
+            Task.Run(async () => await Service<Framework>.Get().RunOnFrameworkThread(() => { Log.Information("Task dispatched from non-framework.update thread"); }));
+            Service<Framework>.Get().RunOnFrameworkThread(() => { Log.Information("Task dispatched from framework.update thread"); }).Wait();
+        }
+
+        if (ImGui.Button("Drown in tasks"))
+        {
+            var token = this.taskSchedCancelSource.Token;
+            Task.Run(() =>
             {
-                this.taskSchedCancelSource.Cancel();
-                this.taskSchedCancelSource = new();
-            }
-
-            ImGui.Text("Run in any thread: ");
-            ImGui.SameLine();
-
-            if (ImGui.Button("Short Task.Run"))
-            {
-                Task.Run(() => { Thread.Sleep(500); });
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button("Task in task(Delay)"))
-            {
-                var token = this.taskSchedCancelSource.Token;
-                Task.Run(async () => await this.TestTaskInTaskDelay(token));
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button("Task in task(Sleep)"))
-            {
-                Task.Run(async () => await this.TestTaskInTaskSleep());
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button("Faulting task"))
-            {
-                Task.Run(() =>
+                for (var i = 0; i < 100; i++)
                 {
-                    Thread.Sleep(200);
-
-                    string a = null;
-                    a.Contains("dalamud");
-                });
-            }
-
-            ImGui.Text("Run in Framework.Update: ");
-            ImGui.SameLine();
-
-            if (ImGui.Button("ASAP"))
-            {
-                Task.Run(async () => await Service<Framework>.Get().RunOnTick(() => { }, cancellationToken: this.taskSchedCancelSource.Token));
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button("In 1s"))
-            {
-                Task.Run(async () => await Service<Framework>.Get().RunOnTick(() => { }, cancellationToken: this.taskSchedCancelSource.Token, delay: TimeSpan.FromSeconds(1)));
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button("In 60f"))
-            {
-                Task.Run(async () => await Service<Framework>.Get().RunOnTick(() => { }, cancellationToken: this.taskSchedCancelSource.Token, delayTicks: 60));
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button("Error in 1s"))
-            {
-                Task.Run(async () => await Service<Framework>.Get().RunOnTick(() => throw new Exception("Test Exception"), cancellationToken: this.taskSchedCancelSource.Token, delay: TimeSpan.FromSeconds(1)));
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button("As long as it's in Framework Thread"))
-            {
-                Task.Run(async () => await Service<Framework>.Get().RunOnFrameworkThread(() => { Log.Information("Task dispatched from non-framework.update thread"); }));
-                Service<Framework>.Get().RunOnFrameworkThread(() => { Log.Information("Task dispatched from framework.update thread"); }).Wait();
-            }
-
-            if (ImGui.Button("Drown in tasks"))
-            {
-                var token = this.taskSchedCancelSource.Token;
-                Task.Run(() =>
-                {
-                    for (var i = 0; i < 100; i++)
+                    token.ThrowIfCancellationRequested();
+                    Task.Run(() =>
                     {
-                        token.ThrowIfCancellationRequested();
-                        Task.Run(() =>
+                        for (var i = 0; i < 100; i++)
                         {
-                            for (var i = 0; i < 100; i++)
+                            token.ThrowIfCancellationRequested();
+                            Task.Run(() =>
                             {
-                                token.ThrowIfCancellationRequested();
-                                Task.Run(() =>
+                                for (var i = 0; i < 100; i++)
                                 {
-                                    for (var i = 0; i < 100; i++)
+                                    token.ThrowIfCancellationRequested();
+                                    Task.Run(() =>
                                     {
-                                        token.ThrowIfCancellationRequested();
-                                        Task.Run(() =>
+                                        for (var i = 0; i < 100; i++)
                                         {
-                                            for (var i = 0; i < 100; i++)
+                                            token.ThrowIfCancellationRequested();
+                                            Task.Run(async () =>
                                             {
-                                                token.ThrowIfCancellationRequested();
-                                                Task.Run(async () =>
+                                                for (var i = 0; i < 100; i++)
                                                 {
-                                                    for (var i = 0; i < 100; i++)
-                                                    {
-                                                        token.ThrowIfCancellationRequested();
-                                                        await Task.Delay(1);
-                                                    }
-                                                });
-                                            }
-                                        });
-                                    }
-                                });
-                            }
-                        });
-                    }
-                });
-            }
-
-            ImGui.SameLine();
-
-            ImGuiHelpers.ScaledDummy(20);
-
-            // Needed to init the task tracker, if we're not on a debug build
-            Service<TaskTracker>.Get().Enable();
-
-            for (var i = 0; i < TaskTracker.Tasks.Count; i++)
-            {
-                var task = TaskTracker.Tasks[i];
-                var subTime = DateTime.Now;
-                if (task.Task == null)
-                    subTime = task.FinishTime;
-
-                switch (task.Status)
-                {
-                    case TaskStatus.Created:
-                    case TaskStatus.WaitingForActivation:
-                    case TaskStatus.WaitingToRun:
-                        ImGui.PushStyleColor(ImGuiCol.Header, ImGuiColors.DalamudGrey);
-                        break;
-                    case TaskStatus.Running:
-                    case TaskStatus.WaitingForChildrenToComplete:
-                        ImGui.PushStyleColor(ImGuiCol.Header, ImGuiColors.ParsedBlue);
-                        break;
-                    case TaskStatus.RanToCompletion:
-                        ImGui.PushStyleColor(ImGuiCol.Header, ImGuiColors.ParsedGreen);
-                        break;
-                    case TaskStatus.Canceled:
-                    case TaskStatus.Faulted:
-                        ImGui.PushStyleColor(ImGuiCol.Header, ImGuiColors.DalamudRed);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
-
-                if (ImGui.CollapsingHeader($"#{task.Id} - {task.Status} {(subTime - task.StartTime).TotalMilliseconds}ms###task{i}"))
-                {
-                    task.IsBeingViewed = true;
-
-                    if (ImGui.Button("CANCEL (May not work)"))
-                    {
-                        try
-                        {
-                            var cancelFunc =
-                                typeof(Task).GetMethod("InternalCancel", BindingFlags.NonPublic | BindingFlags.Instance);
-                            cancelFunc.Invoke(task, null);
+                                                    token.ThrowIfCancellationRequested();
+                                                    await Task.Delay(1);
+                                                }
+                                            });
+                                        }
+                                    });
+                                }
+                            });
                         }
-                        catch (Exception ex)
-                        {
-                            Log.Error(ex, "Could not cancel task.");
-                        }
-                    }
+                    });
+                }
+            });
+        }
 
-                    ImGuiHelpers.ScaledDummy(10);
+        ImGui.SameLine();
 
-                    ImGui.TextUnformatted(task.StackTrace.ToString());
+        ImGuiHelpers.ScaledDummy(20);
 
-                    if (task.Exception != null)
+        // Needed to init the task tracker, if we're not on a debug build
+        Service<TaskTracker>.Get().Enable();
+
+        for (var i = 0; i < TaskTracker.Tasks.Count; i++)
+        {
+            var task = TaskTracker.Tasks[i];
+            var subTime = DateTime.Now;
+            if (task.Task == null)
+                subTime = task.FinishTime;
+
+            switch (task.Status)
+            {
+                case TaskStatus.Created:
+                case TaskStatus.WaitingForActivation:
+                case TaskStatus.WaitingToRun:
+                    ImGui.PushStyleColor(ImGuiCol.Header, ImGuiColors.DalamudGrey);
+                    break;
+                case TaskStatus.Running:
+                case TaskStatus.WaitingForChildrenToComplete:
+                    ImGui.PushStyleColor(ImGuiCol.Header, ImGuiColors.ParsedBlue);
+                    break;
+                case TaskStatus.RanToCompletion:
+                    ImGui.PushStyleColor(ImGuiCol.Header, ImGuiColors.ParsedGreen);
+                    break;
+                case TaskStatus.Canceled:
+                case TaskStatus.Faulted:
+                    ImGui.PushStyleColor(ImGuiCol.Header, ImGuiColors.DalamudRed);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+
+            if (ImGui.CollapsingHeader($"#{task.Id} - {task.Status} {(subTime - task.StartTime).TotalMilliseconds}ms###task{i}"))
+            {
+                task.IsBeingViewed = true;
+
+                if (ImGui.Button("CANCEL (May not work)"))
+                {
+                    try
                     {
-                        ImGuiHelpers.ScaledDummy(15);
-                        ImGui.TextColored(ImGuiColors.DalamudRed, "EXCEPTION:");
-                        ImGui.TextUnformatted(task.Exception.ToString());
+                        var cancelFunc =
+                            typeof(Task).GetMethod("InternalCancel", BindingFlags.NonPublic | BindingFlags.Instance);
+                        cancelFunc.Invoke(task, null);
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.Error(ex, "Could not cancel task.");
                     }
                 }
-                else
+
+                ImGuiHelpers.ScaledDummy(10);
+
+                ImGui.TextUnformatted(task.StackTrace.ToString());
+
+                if (task.Exception != null)
                 {
-                    task.IsBeingViewed = false;
-                }
-
-                ImGui.PopStyleColor(1);
-            }
-        }
-
-        private void DrawHook()
-        {
-            try
-            {
-                ImGui.Checkbox("Use MinHook", ref this.hookUseMinHook);
-
-                if (ImGui.Button("Create"))
-                    this.messageBoxMinHook = Hook<MessageBoxWDelegate>.FromSymbol("User32", "MessageBoxW", this.MessageBoxWDetour, this.hookUseMinHook);
-
-                if (ImGui.Button("Enable"))
-                    this.messageBoxMinHook?.Enable();
-
-                if (ImGui.Button("Disable"))
-                    this.messageBoxMinHook?.Disable();
-
-                if (ImGui.Button("Call Original"))
-                    this.messageBoxMinHook?.Original(IntPtr.Zero, "Hello from .Original", "Hook Test", NativeFunctions.MessageBoxType.Ok);
-
-                if (ImGui.Button("Dispose"))
-                {
-                    this.messageBoxMinHook?.Dispose();
-                    this.messageBoxMinHook = null;
-                }
-
-                if (ImGui.Button("Test"))
-                    _ = NativeFunctions.MessageBoxW(IntPtr.Zero, "Hi", "Hello", NativeFunctions.MessageBoxType.Ok);
-
-                if (this.messageBoxMinHook != null)
-                    ImGui.Text("Enabled: " + this.messageBoxMinHook?.IsEnabled);
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "MinHook error caught");
-            }
-        }
-
-        private void DrawAetherytes()
-        {
-            if (!ImGui.BeginTable("##aetheryteTable", 11, ImGuiTableFlags.ScrollY | ImGuiTableFlags.RowBg | ImGuiTableFlags.Borders))
-                return;
-
-            ImGui.TableSetupScrollFreeze(0, 1);
-            ImGui.TableSetupColumn("Idx", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableSetupColumn("Name", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableSetupColumn("ID", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableSetupColumn("Zone", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableSetupColumn("Ward", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableSetupColumn("Plot", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableSetupColumn("Sub", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableSetupColumn("Gil", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableSetupColumn("Fav", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableSetupColumn("Shared", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableSetupColumn("Appartment", ImGuiTableColumnFlags.WidthFixed);
-            ImGui.TableHeadersRow();
-
-            var tpList = Service<AetheryteList>.Get();
-
-            for (var i = 0; i < tpList.Length; i++)
-            {
-                var info = tpList[i];
-                if (info == null)
-                    continue;
-
-                ImGui.TableNextColumn(); // Idx
-                ImGui.TextUnformatted($"{i}");
-
-                ImGui.TableNextColumn(); // Name
-                ImGui.TextUnformatted($"{info.AetheryteData.GameData.PlaceName.Value?.Name}");
-
-                ImGui.TableNextColumn(); // ID
-                ImGui.TextUnformatted($"{info.AetheryteId}");
-
-                ImGui.TableNextColumn(); // Zone
-                ImGui.TextUnformatted($"{info.TerritoryId}");
-
-                ImGui.TableNextColumn(); // Ward
-                ImGui.TextUnformatted($"{info.Ward}");
-
-                ImGui.TableNextColumn(); // Plot
-                ImGui.TextUnformatted($"{info.Plot}");
-
-                ImGui.TableNextColumn(); // Sub
-                ImGui.TextUnformatted($"{info.SubIndex}");
-
-                ImGui.TableNextColumn(); // Gil
-                ImGui.TextUnformatted($"{info.GilCost}");
-
-                ImGui.TableNextColumn(); // Favourite
-                ImGui.TextUnformatted($"{info.IsFavourite}");
-
-                ImGui.TableNextColumn(); // Shared
-                ImGui.TextUnformatted($"{info.IsSharedHouse}");
-
-                ImGui.TableNextColumn(); // Appartment
-                ImGui.TextUnformatted($"{info.IsAppartment}");
-            }
-
-            ImGui.EndTable();
-        }
-
-        private void DrawDtr()
-        {
-            this.DrawDtrTestEntry(ref this.dtrTest1, "DTR Test #1");
-            ImGui.Separator();
-            this.DrawDtrTestEntry(ref this.dtrTest2, "DTR Test #2");
-            ImGui.Separator();
-            this.DrawDtrTestEntry(ref this.dtrTest3, "DTR Test #3");
-            ImGui.Separator();
-
-            var configuration = Service<DalamudConfiguration>.Get();
-            if (configuration.DtrOrder != null)
-            {
-                ImGui.Separator();
-
-                foreach (var order in configuration.DtrOrder)
-                {
-                    ImGui.Text(order);
-                }
-            }
-        }
-
-        private void DrawDtrTestEntry(ref DtrBarEntry? entry, string title)
-        {
-            var dtrBar = Service<DtrBar>.Get();
-
-            if (entry != null)
-            {
-                ImGui.Text(title);
-
-                var text = entry.Text?.TextValue ?? string.Empty;
-                if (ImGui.InputText($"Text###{entry.Title}t", ref text, 255))
-                    entry.Text = text;
-
-                var shown = entry.Shown;
-                if (ImGui.Checkbox($"Shown###{entry.Title}s", ref shown))
-                    entry.Shown = shown;
-
-                if (ImGui.Button($"Remove###{entry.Title}r"))
-                {
-                    entry.Remove();
-                    entry = null;
+                    ImGuiHelpers.ScaledDummy(15);
+                    ImGui.TextColored(ImGuiColors.DalamudRed, "EXCEPTION:");
+                    ImGui.TextUnformatted(task.Exception.ToString());
                 }
             }
             else
             {
-                if (ImGui.Button($"Add###{title}"))
-                {
-                    entry = dtrBar.Get(title, title);
-                }
-            }
-        }
-
-        private async Task TestTaskInTaskDelay(CancellationToken token)
-        {
-            await Task.Delay(5000, token);
-        }
-
-#pragma warning disable 1998
-        private async Task TestTaskInTaskSleep()
-#pragma warning restore 1998
-        {
-            Thread.Sleep(5000);
-        }
-
-        private void Load()
-        {
-            var dataManager = Service<DataManager>.Get();
-
-            if (dataManager.IsDataReady)
-            {
-                this.serverOpString = JsonConvert.SerializeObject(dataManager.ServerOpCodes, Formatting.Indented);
-                this.wasReady = true;
-            }
-        }
-
-        private void PrintGameObject(GameObject actor, string tag)
-        {
-            var actorString =
-                $"{actor.Address.ToInt64():X}:{actor.ObjectId:X}[{tag}] - {actor.ObjectKind} - {actor.Name} - X{actor.Position.X} Y{actor.Position.Y} Z{actor.Position.Z} D{actor.YalmDistanceX} R{actor.Rotation} - Target: {actor.TargetObjectId:X}\n";
-
-            if (actor is Npc npc)
-                actorString += $"       DataId: {npc.DataId}  NameId:{npc.NameId}\n";
-
-            if (actor is Character chara)
-            {
-                actorString +=
-                    $"       Level: {chara.Level} ClassJob: {(this.resolveGameData ? chara.ClassJob.GameData.Name : chara.ClassJob.Id.ToString())} CHP: {chara.CurrentHp} MHP: {chara.MaxHp} CMP: {chara.CurrentMp} MMP: {chara.MaxMp}\n       Customize: {BitConverter.ToString(chara.Customize).Replace("-", " ")} StatusFlags: {chara.StatusFlags}\n";
+                task.IsBeingViewed = false;
             }
 
-            if (actor is PlayerCharacter pc)
+            ImGui.PopStyleColor(1);
+        }
+    }
+
+    private void DrawHook()
+    {
+        try
+        {
+            ImGui.Checkbox("Use MinHook", ref this.hookUseMinHook);
+
+            if (ImGui.Button("Create"))
+                this.messageBoxMinHook = Hook<MessageBoxWDelegate>.FromSymbol("User32", "MessageBoxW", this.MessageBoxWDetour, this.hookUseMinHook);
+
+            if (ImGui.Button("Enable"))
+                this.messageBoxMinHook?.Enable();
+
+            if (ImGui.Button("Disable"))
+                this.messageBoxMinHook?.Disable();
+
+            if (ImGui.Button("Call Original"))
+                this.messageBoxMinHook?.Original(IntPtr.Zero, "Hello from .Original", "Hook Test", NativeFunctions.MessageBoxType.Ok);
+
+            if (ImGui.Button("Dispose"))
             {
-                actorString +=
-                    $"       HomeWorld: {(this.resolveGameData ? pc.HomeWorld.GameData.Name : pc.HomeWorld.Id.ToString())} CurrentWorld: {(this.resolveGameData ? pc.CurrentWorld.GameData.Name : pc.CurrentWorld.Id.ToString())} FC: {pc.CompanyTag}\n";
+                this.messageBoxMinHook?.Dispose();
+                this.messageBoxMinHook = null;
             }
 
-            ImGui.TextUnformatted(actorString);
-            ImGui.SameLine();
-            if (ImGui.Button($"C##{this.copyButtonIndex++}"))
+            if (ImGui.Button("Test"))
+                _ = NativeFunctions.MessageBoxW(IntPtr.Zero, "Hi", "Hello", NativeFunctions.MessageBoxType.Ok);
+
+            if (this.messageBoxMinHook != null)
+                ImGui.Text("Enabled: " + this.messageBoxMinHook?.IsEnabled);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "MinHook error caught");
+        }
+    }
+
+    private void DrawAetherytes()
+    {
+        if (!ImGui.BeginTable("##aetheryteTable", 11, ImGuiTableFlags.ScrollY | ImGuiTableFlags.RowBg | ImGuiTableFlags.Borders))
+            return;
+
+        ImGui.TableSetupScrollFreeze(0, 1);
+        ImGui.TableSetupColumn("Idx", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableSetupColumn("Name", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableSetupColumn("ID", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableSetupColumn("Zone", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableSetupColumn("Ward", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableSetupColumn("Plot", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableSetupColumn("Sub", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableSetupColumn("Gil", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableSetupColumn("Fav", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableSetupColumn("Shared", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableSetupColumn("Appartment", ImGuiTableColumnFlags.WidthFixed);
+        ImGui.TableHeadersRow();
+
+        var tpList = Service<AetheryteList>.Get();
+
+        for (var i = 0; i < tpList.Length; i++)
+        {
+            var info = tpList[i];
+            if (info == null)
+                continue;
+
+            ImGui.TableNextColumn(); // Idx
+            ImGui.TextUnformatted($"{i}");
+
+            ImGui.TableNextColumn(); // Name
+            ImGui.TextUnformatted($"{info.AetheryteData.GameData.PlaceName.Value?.Name}");
+
+            ImGui.TableNextColumn(); // ID
+            ImGui.TextUnformatted($"{info.AetheryteId}");
+
+            ImGui.TableNextColumn(); // Zone
+            ImGui.TextUnformatted($"{info.TerritoryId}");
+
+            ImGui.TableNextColumn(); // Ward
+            ImGui.TextUnformatted($"{info.Ward}");
+
+            ImGui.TableNextColumn(); // Plot
+            ImGui.TextUnformatted($"{info.Plot}");
+
+            ImGui.TableNextColumn(); // Sub
+            ImGui.TextUnformatted($"{info.SubIndex}");
+
+            ImGui.TableNextColumn(); // Gil
+            ImGui.TextUnformatted($"{info.GilCost}");
+
+            ImGui.TableNextColumn(); // Favourite
+            ImGui.TextUnformatted($"{info.IsFavourite}");
+
+            ImGui.TableNextColumn(); // Shared
+            ImGui.TextUnformatted($"{info.IsSharedHouse}");
+
+            ImGui.TableNextColumn(); // Appartment
+            ImGui.TextUnformatted($"{info.IsAppartment}");
+        }
+
+        ImGui.EndTable();
+    }
+
+    private void DrawDtr()
+    {
+        this.DrawDtrTestEntry(ref this.dtrTest1, "DTR Test #1");
+        ImGui.Separator();
+        this.DrawDtrTestEntry(ref this.dtrTest2, "DTR Test #2");
+        ImGui.Separator();
+        this.DrawDtrTestEntry(ref this.dtrTest3, "DTR Test #3");
+        ImGui.Separator();
+
+        var configuration = Service<DalamudConfiguration>.Get();
+        if (configuration.DtrOrder != null)
+        {
+            ImGui.Separator();
+
+            foreach (var order in configuration.DtrOrder)
             {
-                ImGui.SetClipboardText(actor.Address.ToInt64().ToString("X"));
+                ImGui.Text(order);
             }
         }
     }
+
+    private void DrawDtrTestEntry(ref DtrBarEntry? entry, string title)
+    {
+        var dtrBar = Service<DtrBar>.Get();
+
+        if (entry != null)
+        {
+            ImGui.Text(title);
+
+            var text = entry.Text?.TextValue ?? string.Empty;
+            if (ImGui.InputText($"Text###{entry.Title}t", ref text, 255))
+                entry.Text = text;
+
+            var shown = entry.Shown;
+            if (ImGui.Checkbox($"Shown###{entry.Title}s", ref shown))
+                entry.Shown = shown;
+
+            if (ImGui.Button($"Remove###{entry.Title}r"))
+            {
+                entry.Remove();
+                entry = null;
+            }
+        }
+        else
+        {
+            if (ImGui.Button($"Add###{title}"))
+            {
+                entry = dtrBar.Get(title, title);
+            }
+        }
+    }
+
+    private async Task TestTaskInTaskDelay(CancellationToken token)
+    {
+        await Task.Delay(5000, token);
+    }
+
+#pragma warning disable 1998
+    private async Task TestTaskInTaskSleep()
+#pragma warning restore 1998
+    {
+        Thread.Sleep(5000);
+    }
+
+    private void Load()
+    {
+        var dataManager = Service<DataManager>.Get();
+
+        if (dataManager.IsDataReady)
+        {
+            this.serverOpString = JsonConvert.SerializeObject(dataManager.ServerOpCodes, Formatting.Indented);
+            this.wasReady = true;
+        }
+    }
+
+    private void PrintGameObject(GameObject actor, string tag)
+    {
+        var actorString =
+            $"{actor.Address.ToInt64():X}:{actor.ObjectId:X}[{tag}] - {actor.ObjectKind} - {actor.Name} - X{actor.Position.X} Y{actor.Position.Y} Z{actor.Position.Z} D{actor.YalmDistanceX} R{actor.Rotation} - Target: {actor.TargetObjectId:X}\n";
+
+        if (actor is Npc npc)
+            actorString += $"       DataId: {npc.DataId}  NameId:{npc.NameId}\n";
+
+        if (actor is Character chara)
+        {
+            actorString +=
+                $"       Level: {chara.Level} ClassJob: {(this.resolveGameData ? chara.ClassJob.GameData.Name : chara.ClassJob.Id.ToString())} CHP: {chara.CurrentHp} MHP: {chara.MaxHp} CMP: {chara.CurrentMp} MMP: {chara.MaxMp}\n       Customize: {BitConverter.ToString(chara.Customize).Replace("-", " ")} StatusFlags: {chara.StatusFlags}\n";
+        }
+
+        if (actor is PlayerCharacter pc)
+        {
+            actorString +=
+                $"       HomeWorld: {(this.resolveGameData ? pc.HomeWorld.GameData.Name : pc.HomeWorld.Id.ToString())} CurrentWorld: {(this.resolveGameData ? pc.CurrentWorld.GameData.Name : pc.CurrentWorld.Id.ToString())} FC: {pc.CompanyTag}\n";
+        }
+
+        ImGui.TextUnformatted(actorString);
+        ImGui.SameLine();
+        if (ImGui.Button($"C##{this.copyButtonIndex++}"))
+        {
+            ImGui.SetClipboardText(actor.Address.ToInt64().ToString("X"));
+        }
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs b/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs
index 17fa7850a..e95c510d3 100644
--- a/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs
@@ -4,46 +4,45 @@ using CheapLoc;
 using Dalamud.Interface.Windowing;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// Class responsible for drawing a notifier on screen that gamepad mode is active.
+/// </summary>
+internal class GamepadModeNotifierWindow : Window
 {
     /// <summary>
-    /// Class responsible for drawing a notifier on screen that gamepad mode is active.
+    /// Initializes a new instance of the <see cref="GamepadModeNotifierWindow"/> class.
     /// </summary>
-    internal class GamepadModeNotifierWindow : Window
+    public GamepadModeNotifierWindow()
+        : base(
+            "###DalamudGamepadModeNotifier",
+            ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoMouseInputs
+            | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoNav
+            | ImGuiWindowFlags.NoInputs | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings,
+            true)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GamepadModeNotifierWindow"/> class.
-        /// </summary>
-        public GamepadModeNotifierWindow()
-            : base(
-                "###DalamudGamepadModeNotifier",
-                ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoMouseInputs
-                | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoNav
-                | ImGuiWindowFlags.NoInputs | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings,
-                true)
-        {
-            this.Size = Vector2.Zero;
-            this.SizeCondition = ImGuiCond.Always;
-            this.IsOpen = false;
+        this.Size = Vector2.Zero;
+        this.SizeCondition = ImGuiCond.Always;
+        this.IsOpen = false;
 
-            this.RespectCloseHotkey = false;
-        }
+        this.RespectCloseHotkey = false;
+    }
 
-        /// <summary>
-        /// Draws a light grey-ish, main-viewport-big filled rect in the background draw list alongside a text indicating gamepad mode.
-        /// </summary>
-        public override void Draw()
-        {
-            var drawList = ImGui.GetBackgroundDrawList();
-            drawList.PushClipRectFullScreen();
-            drawList.AddRectFilled(Vector2.Zero, ImGuiHelpers.MainViewport.Size, 0x661A1A1A);
-            drawList.AddText(
-                Vector2.One,
-                0xFFFFFFFF,
-                Loc.Localize(
-                    "DalamudGamepadModeNotifierText",
-                    "Gamepad mode is ON. Press L1+L3 to deactivate, press R3 to toggle PluginInstaller."));
-            drawList.PopClipRect();
-        }
+    /// <summary>
+    /// Draws a light grey-ish, main-viewport-big filled rect in the background draw list alongside a text indicating gamepad mode.
+    /// </summary>
+    public override void Draw()
+    {
+        var drawList = ImGui.GetBackgroundDrawList();
+        drawList.PushClipRectFullScreen();
+        drawList.AddRectFilled(Vector2.Zero, ImGuiHelpers.MainViewport.Size, 0x661A1A1A);
+        drawList.AddText(
+            Vector2.One,
+            0xFFFFFFFF,
+            Loc.Localize(
+                "DalamudGamepadModeNotifierText",
+                "Gamepad mode is ON. Press L1+L3 to deactivate, press R3 to toggle PluginInstaller."));
+        drawList.PopClipRect();
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/IMEWindow.cs b/Dalamud/Interface/Internal/Windows/IMEWindow.cs
index d9e508357..80e03caf3 100644
--- a/Dalamud/Interface/Internal/Windows/IMEWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/IMEWindow.cs
@@ -5,117 +5,116 @@ using Dalamud.Game.Gui.Internal;
 using Dalamud.Interface.Windowing;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// A window for displaying IME details.
+/// </summary>
+internal unsafe class ImeWindow : Window
 {
+    private const int ImePageSize = 9;
+
     /// <summary>
-    /// A window for displaying IME details.
+    /// Initializes a new instance of the <see cref="ImeWindow"/> class.
     /// </summary>
-    internal unsafe class ImeWindow : Window
+    public ImeWindow()
+        : base("Dalamud IME", ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoBackground)
     {
-        private const int ImePageSize = 9;
+        this.Size = new Vector2(100, 200);
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImeWindow"/> class.
-        /// </summary>
-        public ImeWindow()
-            : base("Dalamud IME", ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoBackground)
+        this.RespectCloseHotkey = false;
+    }
+
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        if (this.IsOpen && Service<KeyState>.Get()[VirtualKey.SHIFT]) Service<DalamudInterface>.Get().CloseImeWindow();
+        var ime = Service<DalamudIME>.GetNullable();
+
+        if (ime == null || !ime.IsEnabled)
         {
-            this.Size = new Vector2(100, 200);
-            this.SizeCondition = ImGuiCond.FirstUseEver;
-
-            this.RespectCloseHotkey = false;
+            ImGui.Text("IME is unavailable.");
+            return;
         }
 
-        /// <inheritdoc/>
-        public override void Draw()
+        // ImGui.Text($"{ime.GetCursorPos()}");
+        // ImGui.Text($"{ImGui.GetWindowViewport().WorkSize}");
+    }
+
+    /// <inheritdoc/>
+    public override void PostDraw()
+    {
+        if (this.IsOpen && Service<KeyState>.Get()[VirtualKey.SHIFT]) Service<DalamudInterface>.Get().CloseImeWindow();
+        var ime = Service<DalamudIME>.GetNullable();
+
+        if (ime == null || !ime.IsEnabled)
+            return;
+
+        var maxTextWidth = 0f;
+        var textHeight = ImGui.CalcTextSize(ime.ImmComp).Y;
+
+        var native = ime.ImmCandNative;
+        var totalIndex = native.Selection + 1;
+        var totalSize = native.Count;
+
+        var pageStart = native.PageStart;
+        var pageIndex = (pageStart / ImePageSize) + 1;
+        var pageCount = (totalSize / ImePageSize) + 1;
+        var pageInfo = $"{totalIndex}/{totalSize} ({pageIndex}/{pageCount})";
+
+        // Calc the window size
+        for (var i = 0; i < ime.ImmCand.Count; i++)
         {
-            if (this.IsOpen && Service<KeyState>.Get()[VirtualKey.SHIFT]) Service<DalamudInterface>.Get().CloseImeWindow();
-            var ime = Service<DalamudIME>.GetNullable();
-
-            if (ime == null || !ime.IsEnabled)
-            {
-                ImGui.Text("IME is unavailable.");
-                return;
-            }
-
-            // ImGui.Text($"{ime.GetCursorPos()}");
-            // ImGui.Text($"{ImGui.GetWindowViewport().WorkSize}");
+            var textSize = ImGui.CalcTextSize($"{i + 1}. {ime.ImmCand[i]}");
+            maxTextWidth = maxTextWidth > textSize.X ? maxTextWidth : textSize.X;
         }
 
-        /// <inheritdoc/>
-        public override void PostDraw()
+        maxTextWidth = maxTextWidth > ImGui.CalcTextSize(pageInfo).X ? maxTextWidth : ImGui.CalcTextSize(pageInfo).X;
+        maxTextWidth = maxTextWidth > ImGui.CalcTextSize(ime.ImmComp).X ? maxTextWidth : ImGui.CalcTextSize(ime.ImmComp).X;
+
+        var imeWindowWidth = maxTextWidth + (2 * ImGui.GetStyle().WindowPadding.X);
+        var imeWindowHeight = (textHeight * (ime.ImmCand.Count + 2)) + (5 * (ime.ImmCand.Count - 1)) + (2 * ImGui.GetStyle().WindowPadding.Y);
+
+        // Calc the window pos
+        var cursorPos = ime.GetCursorPos();
+        var imeWindowMinPos = new Vector2(cursorPos.X, cursorPos.Y);
+        var imeWindowMaxPos = new Vector2(imeWindowMinPos.X + imeWindowWidth, imeWindowMinPos.Y + imeWindowHeight);
+        var gameWindowSize = ImGui.GetWindowViewport().WorkSize;
+
+        var offset = new Vector2(
+            imeWindowMaxPos.X - gameWindowSize.X > 0 ? imeWindowMaxPos.X - gameWindowSize.X : 0,
+            imeWindowMaxPos.Y - gameWindowSize.Y > 0 ? imeWindowMaxPos.Y - gameWindowSize.Y : 0);
+        imeWindowMinPos -= offset;
+        imeWindowMaxPos -= offset;
+
+        var nextDrawPosY = imeWindowMinPos.Y;
+        var drawAreaPosX = imeWindowMinPos.X + ImGui.GetStyle().WindowPadding.X;
+
+        // Draw the ime window
+        var drawList = ImGui.GetForegroundDrawList();
+        // Draw the background rect
+        drawList.AddRectFilled(imeWindowMinPos, imeWindowMaxPos, ImGui.GetColorU32(ImGuiCol.WindowBg), ImGui.GetStyle().WindowRounding);
+        // Add component text
+        drawList.AddText(new Vector2(drawAreaPosX, nextDrawPosY), ImGui.GetColorU32(ImGuiCol.Text), ime.ImmComp);
+        nextDrawPosY += textHeight + ImGui.GetStyle().ItemSpacing.Y;
+        // Add separator
+        drawList.AddLine(new Vector2(drawAreaPosX, nextDrawPosY), new Vector2(drawAreaPosX + maxTextWidth, nextDrawPosY), ImGui.GetColorU32(ImGuiCol.Separator));
+        // Add candidate words
+        for (var i = 0; i < ime.ImmCand.Count; i++)
         {
-            if (this.IsOpen && Service<KeyState>.Get()[VirtualKey.SHIFT]) Service<DalamudInterface>.Get().CloseImeWindow();
-            var ime = Service<DalamudIME>.GetNullable();
+            var selected = i == (native.Selection % ImePageSize);
+            var color = ImGui.GetColorU32(ImGuiCol.Text);
+            if (selected)
+                color = ImGui.GetColorU32(ImGuiCol.NavHighlight);
 
-            if (ime == null || !ime.IsEnabled)
-                return;
-
-            var maxTextWidth = 0f;
-            var textHeight = ImGui.CalcTextSize(ime.ImmComp).Y;
-
-            var native = ime.ImmCandNative;
-            var totalIndex = native.Selection + 1;
-            var totalSize = native.Count;
-
-            var pageStart = native.PageStart;
-            var pageIndex = (pageStart / ImePageSize) + 1;
-            var pageCount = (totalSize / ImePageSize) + 1;
-            var pageInfo = $"{totalIndex}/{totalSize} ({pageIndex}/{pageCount})";
-
-            // Calc the window size
-            for (var i = 0; i < ime.ImmCand.Count; i++)
-            {
-                var textSize = ImGui.CalcTextSize($"{i + 1}. {ime.ImmCand[i]}");
-                maxTextWidth = maxTextWidth > textSize.X ? maxTextWidth : textSize.X;
-            }
-
-            maxTextWidth = maxTextWidth > ImGui.CalcTextSize(pageInfo).X ? maxTextWidth : ImGui.CalcTextSize(pageInfo).X;
-            maxTextWidth = maxTextWidth > ImGui.CalcTextSize(ime.ImmComp).X ? maxTextWidth : ImGui.CalcTextSize(ime.ImmComp).X;
-
-            var imeWindowWidth = maxTextWidth + (2 * ImGui.GetStyle().WindowPadding.X);
-            var imeWindowHeight = (textHeight * (ime.ImmCand.Count + 2)) + (5 * (ime.ImmCand.Count - 1)) + (2 * ImGui.GetStyle().WindowPadding.Y);
-
-            // Calc the window pos
-            var cursorPos = ime.GetCursorPos();
-            var imeWindowMinPos = new Vector2(cursorPos.X, cursorPos.Y);
-            var imeWindowMaxPos = new Vector2(imeWindowMinPos.X + imeWindowWidth, imeWindowMinPos.Y + imeWindowHeight);
-            var gameWindowSize = ImGui.GetWindowViewport().WorkSize;
-
-            var offset = new Vector2(
-                imeWindowMaxPos.X - gameWindowSize.X > 0 ? imeWindowMaxPos.X - gameWindowSize.X : 0,
-                imeWindowMaxPos.Y - gameWindowSize.Y > 0 ? imeWindowMaxPos.Y - gameWindowSize.Y : 0);
-            imeWindowMinPos -= offset;
-            imeWindowMaxPos -= offset;
-
-            var nextDrawPosY = imeWindowMinPos.Y;
-            var drawAreaPosX = imeWindowMinPos.X + ImGui.GetStyle().WindowPadding.X;
-
-            // Draw the ime window
-            var drawList = ImGui.GetForegroundDrawList();
-            // Draw the background rect
-            drawList.AddRectFilled(imeWindowMinPos, imeWindowMaxPos, ImGui.GetColorU32(ImGuiCol.WindowBg), ImGui.GetStyle().WindowRounding);
-            // Add component text
-            drawList.AddText(new Vector2(drawAreaPosX, nextDrawPosY), ImGui.GetColorU32(ImGuiCol.Text), ime.ImmComp);
+            drawList.AddText(new Vector2(drawAreaPosX, nextDrawPosY), color, $"{i + 1}. {ime.ImmCand[i]}");
             nextDrawPosY += textHeight + ImGui.GetStyle().ItemSpacing.Y;
-            // Add separator
-            drawList.AddLine(new Vector2(drawAreaPosX, nextDrawPosY), new Vector2(drawAreaPosX + maxTextWidth, nextDrawPosY), ImGui.GetColorU32(ImGuiCol.Separator));
-            // Add candidate words
-            for (var i = 0; i < ime.ImmCand.Count; i++)
-            {
-                var selected = i == (native.Selection % ImePageSize);
-                var color = ImGui.GetColorU32(ImGuiCol.Text);
-                if (selected)
-                    color = ImGui.GetColorU32(ImGuiCol.NavHighlight);
-
-                drawList.AddText(new Vector2(drawAreaPosX, nextDrawPosY), color, $"{i + 1}. {ime.ImmCand[i]}");
-                nextDrawPosY += textHeight + ImGui.GetStyle().ItemSpacing.Y;
-            }
-
-            // Add separator
-            drawList.AddLine(new Vector2(drawAreaPosX, nextDrawPosY), new Vector2(drawAreaPosX + maxTextWidth, nextDrawPosY), ImGui.GetColorU32(ImGuiCol.Separator));
-            // Add pages infomation
-            drawList.AddText(new Vector2(drawAreaPosX, nextDrawPosY), ImGui.GetColorU32(ImGuiCol.Text), pageInfo);
         }
+
+        // Add separator
+        drawList.AddLine(new Vector2(drawAreaPosX, nextDrawPosY), new Vector2(drawAreaPosX + maxTextWidth, nextDrawPosY), ImGui.GetColorU32(ImGuiCol.Separator));
+        // Add pages infomation
+        drawList.AddText(new Vector2(drawAreaPosX, nextDrawPosY), ImGui.GetColorU32(ImGuiCol.Text), pageInfo);
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/PluginImageCache.cs b/Dalamud/Interface/Internal/Windows/PluginImageCache.cs
index 8f7e61e1f..d9e15abea 100644
--- a/Dalamud/Interface/Internal/Windows/PluginImageCache.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginImageCache.cs
@@ -14,445 +14,402 @@ using Dalamud.Utility;
 using ImGuiScene;
 using Serilog;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// A cache for plugin icons and images.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class PluginImageCache : IDisposable, IServiceType
 {
     /// <summary>
-    /// A cache for plugin icons and images.
+    /// Maximum plugin image width.
     /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal class PluginImageCache : IDisposable, IServiceType
+    public const int PluginImageWidth = 730;
+
+    /// <summary>
+    /// Maximum plugin image height.
+    /// </summary>
+    public const int PluginImageHeight = 380;
+
+    /// <summary>
+    /// Maximum plugin icon width.
+    /// </summary>
+    public const int PluginIconWidth = 512;
+
+    /// <summary>
+    /// Maximum plugin height.
+    /// </summary>
+    public const int PluginIconHeight = 512;
+
+    private const string MainRepoImageUrl = "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/api6/{0}/{1}/images/{2}";
+    private const string MainRepoDip17ImageUrl = "https://raw.githubusercontent.com/goatcorp/PluginDistD17/main/{0}/{1}/images/{2}";
+
+    private readonly BlockingCollection<Tuple<ulong, Func<Task>>> downloadQueue = new();
+    private readonly BlockingCollection<Func<Task>> loadQueue = new();
+    private readonly CancellationTokenSource cancelToken = new();
+    private readonly Task downloadTask;
+    private readonly Task loadTask;
+
+    private readonly ConcurrentDictionary<string, TextureWrap?> pluginIconMap = new();
+    private readonly ConcurrentDictionary<string, TextureWrap?[]?> pluginImagesMap = new();
+
+    private readonly Task<TextureWrap> emptyTextureTask;
+    private readonly Task<TextureWrap> disabledIconTask;
+    private readonly Task<TextureWrap> outdatedInstallableIconTask;
+    private readonly Task<TextureWrap> defaultIconTask;
+    private readonly Task<TextureWrap> troubleIconTask;
+    private readonly Task<TextureWrap> updateIconTask;
+    private readonly Task<TextureWrap> installedIconTask;
+    private readonly Task<TextureWrap> thirdIconTask;
+    private readonly Task<TextureWrap> thirdInstalledIconTask;
+    private readonly Task<TextureWrap> corePluginIconTask;
+
+    [ServiceManager.ServiceConstructor]
+    private PluginImageCache(Dalamud dalamud)
     {
-        /// <summary>
-        /// Maximum plugin image width.
-        /// </summary>
-        public const int PluginImageWidth = 730;
+        var imwst = Service<InterfaceManager.InterfaceManagerWithScene>.GetAsync();
 
-        /// <summary>
-        /// Maximum plugin image height.
-        /// </summary>
-        public const int PluginImageHeight = 380;
+        Task<TextureWrap>? TaskWrapIfNonNull(TextureWrap? tw) => tw == null ? null : Task.FromResult(tw!);
 
-        /// <summary>
-        /// Maximum plugin icon width.
-        /// </summary>
-        public const int PluginIconWidth = 512;
+        this.emptyTextureTask = imwst.ContinueWith(task => task.Result.Manager.LoadImageRaw(new byte[64], 8, 8, 4)!);
+        this.defaultIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "defaultIcon.png"))) ?? this.emptyTextureTask).Unwrap();
+        this.disabledIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "disabledIcon.png"))) ?? this.emptyTextureTask).Unwrap();
+        this.outdatedInstallableIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "outdatedInstallableIcon.png"))) ?? this.emptyTextureTask).Unwrap();
+        this.troubleIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "troubleIcon.png"))) ?? this.emptyTextureTask).Unwrap();
+        this.updateIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "updateIcon.png"))) ?? this.emptyTextureTask).Unwrap();
+        this.installedIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "installedIcon.png"))) ?? this.emptyTextureTask).Unwrap();
+        this.thirdIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "thirdIcon.png"))) ?? this.emptyTextureTask).Unwrap();
+        this.thirdInstalledIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "thirdInstalledIcon.png"))) ?? this.emptyTextureTask).Unwrap();
+        this.corePluginIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "tsmLogo.png"))) ?? this.emptyTextureTask).Unwrap();
 
-        /// <summary>
-        /// Maximum plugin height.
-        /// </summary>
-        public const int PluginIconHeight = 512;
+        this.downloadTask = Task.Factory.StartNew(
+            () => this.DownloadTask(8), TaskCreationOptions.LongRunning);
+        this.loadTask = Task.Factory.StartNew(
+            () => this.LoadTask(Environment.ProcessorCount), TaskCreationOptions.LongRunning);
+    }
 
-        private const string MainRepoImageUrl = "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/api6/{0}/{1}/images/{2}";
-        private const string MainRepoDip17ImageUrl = "https://raw.githubusercontent.com/goatcorp/PluginDistD17/main/{0}/{1}/images/{2}";
+    /// <summary>
+    /// Gets the fallback empty texture.
+    /// </summary>
+    public TextureWrap EmptyTexture => this.emptyTextureTask.IsCompleted
+                                           ? this.emptyTextureTask.Result
+                                           : this.emptyTextureTask.GetAwaiter().GetResult();
 
-        private readonly BlockingCollection<Tuple<ulong, Func<Task>>> downloadQueue = new();
-        private readonly BlockingCollection<Func<Task>> loadQueue = new();
-        private readonly CancellationTokenSource cancelToken = new();
-        private readonly Task downloadTask;
-        private readonly Task loadTask;
+    /// <summary>
+    /// Gets the disabled plugin icon.
+    /// </summary>
+    public TextureWrap DisabledIcon => this.disabledIconTask.IsCompleted
+                                           ? this.disabledIconTask.Result
+                                           : this.disabledIconTask.GetAwaiter().GetResult();
 
-        private readonly ConcurrentDictionary<string, TextureWrap?> pluginIconMap = new();
-        private readonly ConcurrentDictionary<string, TextureWrap?[]?> pluginImagesMap = new();
+    /// <summary>
+    /// Gets the outdated installable plugin icon.
+    /// </summary>
+    public TextureWrap OutdatedInstallableIcon => this.outdatedInstallableIconTask.IsCompleted
+                                                      ? this.outdatedInstallableIconTask.Result
+                                                      : this.outdatedInstallableIconTask.GetAwaiter().GetResult();
 
-        private readonly Task<TextureWrap> emptyTextureTask;
-        private readonly Task<TextureWrap> disabledIconTask;
-        private readonly Task<TextureWrap> outdatedInstallableIconTask;
-        private readonly Task<TextureWrap> defaultIconTask;
-        private readonly Task<TextureWrap> troubleIconTask;
-        private readonly Task<TextureWrap> updateIconTask;
-        private readonly Task<TextureWrap> installedIconTask;
-        private readonly Task<TextureWrap> thirdIconTask;
-        private readonly Task<TextureWrap> thirdInstalledIconTask;
-        private readonly Task<TextureWrap> corePluginIconTask;
+    /// <summary>
+    /// Gets the default plugin icon.
+    /// </summary>
+    public TextureWrap DefaultIcon => this.defaultIconTask.IsCompleted
+                                          ? this.defaultIconTask.Result
+                                          : this.defaultIconTask.GetAwaiter().GetResult();
 
-        [ServiceManager.ServiceConstructor]
-        private PluginImageCache(Dalamud dalamud)
+    /// <summary>
+    /// Gets the plugin trouble icon overlay.
+    /// </summary>
+    public TextureWrap TroubleIcon => this.troubleIconTask.IsCompleted
+                                          ? this.troubleIconTask.Result
+                                          : this.troubleIconTask.GetAwaiter().GetResult();
+
+    /// <summary>
+    /// Gets the plugin update icon overlay.
+    /// </summary>
+    public TextureWrap UpdateIcon => this.updateIconTask.IsCompleted
+                                         ? this.updateIconTask.Result
+                                         : this.updateIconTask.GetAwaiter().GetResult();
+
+    /// <summary>
+    /// Gets the plugin installed icon overlay.
+    /// </summary>
+    public TextureWrap InstalledIcon => this.installedIconTask.IsCompleted
+                                            ? this.installedIconTask.Result
+                                            : this.installedIconTask.GetAwaiter().GetResult();
+
+    /// <summary>
+    /// Gets the third party plugin icon overlay.
+    /// </summary>
+    public TextureWrap ThirdIcon => this.thirdIconTask.IsCompleted
+                                        ? this.thirdIconTask.Result
+                                        : this.thirdIconTask.GetAwaiter().GetResult();
+
+    /// <summary>
+    /// Gets the installed third party plugin icon overlay.
+    /// </summary>
+    public TextureWrap ThirdInstalledIcon => this.thirdInstalledIconTask.IsCompleted
+                                                 ? this.thirdInstalledIconTask.Result
+                                                 : this.thirdInstalledIconTask.GetAwaiter().GetResult();
+
+    /// <summary>
+    /// Gets the core plugin icon.
+    /// </summary>
+    public TextureWrap CorePluginIcon => this.corePluginIconTask.IsCompleted
+                                             ? this.corePluginIconTask.Result
+                                             : this.corePluginIconTask.GetAwaiter().GetResult();
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        this.cancelToken.Cancel();
+        this.downloadQueue.CompleteAdding();
+        this.loadQueue.CompleteAdding();
+
+        if (!Task.WaitAll(new[] { this.loadTask, this.downloadTask }, 4000))
         {
-            var imwst = Service<InterfaceManager.InterfaceManagerWithScene>.GetAsync();
-
-            Task<TextureWrap>? TaskWrapIfNonNull(TextureWrap? tw) => tw == null ? null : Task.FromResult(tw!);
-
-            this.emptyTextureTask = imwst.ContinueWith(task => task.Result.Manager.LoadImageRaw(new byte[64], 8, 8, 4)!);
-            this.defaultIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "defaultIcon.png"))) ?? this.emptyTextureTask).Unwrap();
-            this.disabledIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "disabledIcon.png"))) ?? this.emptyTextureTask).Unwrap();
-            this.outdatedInstallableIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "outdatedInstallableIcon.png"))) ?? this.emptyTextureTask).Unwrap();
-            this.troubleIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "troubleIcon.png"))) ?? this.emptyTextureTask).Unwrap();
-            this.updateIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "updateIcon.png"))) ?? this.emptyTextureTask).Unwrap();
-            this.installedIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "installedIcon.png"))) ?? this.emptyTextureTask).Unwrap();
-            this.thirdIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "thirdIcon.png"))) ?? this.emptyTextureTask).Unwrap();
-            this.thirdInstalledIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "thirdInstalledIcon.png"))) ?? this.emptyTextureTask).Unwrap();
-            this.corePluginIconTask = imwst.ContinueWith(task => TaskWrapIfNonNull(task.Result.Manager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "tsmLogo.png"))) ?? this.emptyTextureTask).Unwrap();
-
-            this.downloadTask = Task.Factory.StartNew(
-                () => this.DownloadTask(8), TaskCreationOptions.LongRunning);
-            this.loadTask = Task.Factory.StartNew(
-                () => this.LoadTask(Environment.ProcessorCount), TaskCreationOptions.LongRunning);
+            Log.Error("Plugin Image download/load thread has not cancelled in time");
         }
 
-        /// <summary>
-        /// Gets the fallback empty texture.
-        /// </summary>
-        public TextureWrap EmptyTexture => this.emptyTextureTask.IsCompleted
-                                               ? this.emptyTextureTask.Result
-                                               : this.emptyTextureTask.GetAwaiter().GetResult();
+        this.cancelToken.Dispose();
+        this.downloadQueue.Dispose();
+        this.loadQueue.Dispose();
 
-        /// <summary>
-        /// Gets the disabled plugin icon.
-        /// </summary>
-        public TextureWrap DisabledIcon => this.disabledIconTask.IsCompleted
-                                              ? this.disabledIconTask.Result
-                                              : this.disabledIconTask.GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Gets the outdated installable plugin icon.
-        /// </summary>
-        public TextureWrap OutdatedInstallableIcon => this.outdatedInstallableIconTask.IsCompleted
-                                               ? this.outdatedInstallableIconTask.Result
-                                               : this.outdatedInstallableIconTask.GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Gets the default plugin icon.
-        /// </summary>
-        public TextureWrap DefaultIcon => this.defaultIconTask.IsCompleted
-                                              ? this.defaultIconTask.Result
-                                              : this.defaultIconTask.GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Gets the plugin trouble icon overlay.
-        /// </summary>
-        public TextureWrap TroubleIcon => this.troubleIconTask.IsCompleted
-                                              ? this.troubleIconTask.Result
-                                              : this.troubleIconTask.GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Gets the plugin update icon overlay.
-        /// </summary>
-        public TextureWrap UpdateIcon => this.updateIconTask.IsCompleted
-                                             ? this.updateIconTask.Result
-                                             : this.updateIconTask.GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Gets the plugin installed icon overlay.
-        /// </summary>
-        public TextureWrap InstalledIcon => this.installedIconTask.IsCompleted
-                                                ? this.installedIconTask.Result
-                                                : this.installedIconTask.GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Gets the third party plugin icon overlay.
-        /// </summary>
-        public TextureWrap ThirdIcon => this.thirdIconTask.IsCompleted
-                                            ? this.thirdIconTask.Result
-                                            : this.thirdIconTask.GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Gets the installed third party plugin icon overlay.
-        /// </summary>
-        public TextureWrap ThirdInstalledIcon => this.thirdInstalledIconTask.IsCompleted
-                                                     ? this.thirdInstalledIconTask.Result
-                                                     : this.thirdInstalledIconTask.GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Gets the core plugin icon.
-        /// </summary>
-        public TextureWrap CorePluginIcon => this.corePluginIconTask.IsCompleted
-                                                 ? this.corePluginIconTask.Result
-                                                 : this.corePluginIconTask.GetAwaiter().GetResult();
-
-        /// <inheritdoc/>
-        public void Dispose()
+        foreach (var task in new[]
+                 {
+                     this.defaultIconTask,
+                     this.troubleIconTask,
+                     this.updateIconTask,
+                     this.installedIconTask,
+                     this.thirdIconTask,
+                     this.thirdInstalledIconTask,
+                     this.corePluginIconTask,
+                 })
         {
-            this.cancelToken.Cancel();
-            this.downloadQueue.CompleteAdding();
-            this.loadQueue.CompleteAdding();
-
-            if (!Task.WaitAll(new[] { this.loadTask, this.downloadTask }, 4000))
-            {
-                Log.Error("Plugin Image download/load thread has not cancelled in time");
-            }
-
-            this.cancelToken.Dispose();
-            this.downloadQueue.Dispose();
-            this.loadQueue.Dispose();
-
-            foreach (var task in new[]
-                     {
-                         this.defaultIconTask,
-                         this.troubleIconTask,
-                         this.updateIconTask,
-                         this.installedIconTask,
-                         this.thirdIconTask,
-                         this.thirdInstalledIconTask,
-                         this.corePluginIconTask,
-                     })
-            {
-                task.Wait();
-                if (task.IsCompletedSuccessfully)
-                    task.Result.Dispose();
-            }
-
-            foreach (var icon in this.pluginIconMap.Values)
-            {
-                icon?.Dispose();
-            }
-
-            foreach (var images in this.pluginImagesMap.Values)
-            {
-                foreach (var image in images)
-                {
-                    image?.Dispose();
-                }
-            }
-
-            this.pluginIconMap.Clear();
-            this.pluginImagesMap.Clear();
+            task.Wait();
+            if (task.IsCompletedSuccessfully)
+                task.Result.Dispose();
         }
 
-        /// <summary>
-        /// Clear the cache of downloaded icons.
-        /// </summary>
-        public void ClearIconCache()
+        foreach (var icon in this.pluginIconMap.Values)
         {
-            this.pluginIconMap.Clear();
-            this.pluginImagesMap.Clear();
+            icon?.Dispose();
         }
 
-        /// <summary>
-        /// Try to get the icon associated with the internal name of a plugin.
-        /// Uses the name within the manifest to search.
-        /// </summary>
-        /// <param name="plugin">The installed plugin, if available.</param>
-        /// <param name="manifest">The plugin manifest.</param>
-        /// <param name="isThirdParty">If the plugin was third party sourced.</param>
-        /// <param name="iconTexture">Cached image textures, or an empty array.</param>
-        /// <returns>True if an entry exists, may be null if currently downloading.</returns>
-        public bool TryGetIcon(LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, out TextureWrap? iconTexture)
+        foreach (var images in this.pluginImagesMap.Values)
         {
-            if (!this.pluginIconMap.TryAdd(manifest.InternalName, null))
+            foreach (var image in images)
             {
-                iconTexture = this.pluginIconMap[manifest.InternalName];
-                return true;
+                image?.Dispose();
             }
-
-            iconTexture = null;
-            var requestedFrame = Service<DalamudInterface>.GetNullable()?.FrameCount ?? 0;
-            Task.Run(async () =>
-            {
-                try
-                {
-                    this.pluginIconMap[manifest.InternalName] =
-                        await this.DownloadPluginIconAsync(plugin, manifest, isThirdParty, requestedFrame);
-                }
-                catch (Exception ex)
-                {
-                    Log.Error(ex, $"An unexpected error occurred with the icon for {manifest.InternalName}");
-                }
-            });
-
-            return false;
         }
 
-        /// <summary>
-        /// Try to get any images associated with the internal name of a plugin.
-        /// Uses the name within the manifest to search.
-        /// </summary>
-        /// <param name="plugin">The installed plugin, if available.</param>
-        /// <param name="manifest">The plugin manifest.</param>
-        /// <param name="isThirdParty">If the plugin was third party sourced.</param>
-        /// <param name="imageTextures">Cached image textures, or an empty array.</param>
-        /// <returns>True if the image array exists, may be empty if currently downloading.</returns>
-        public bool TryGetImages(LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, out TextureWrap?[] imageTextures)
+        this.pluginIconMap.Clear();
+        this.pluginImagesMap.Clear();
+    }
+
+    /// <summary>
+    /// Clear the cache of downloaded icons.
+    /// </summary>
+    public void ClearIconCache()
+    {
+        this.pluginIconMap.Clear();
+        this.pluginImagesMap.Clear();
+    }
+
+    /// <summary>
+    /// Try to get the icon associated with the internal name of a plugin.
+    /// Uses the name within the manifest to search.
+    /// </summary>
+    /// <param name="plugin">The installed plugin, if available.</param>
+    /// <param name="manifest">The plugin manifest.</param>
+    /// <param name="isThirdParty">If the plugin was third party sourced.</param>
+    /// <param name="iconTexture">Cached image textures, or an empty array.</param>
+    /// <returns>True if an entry exists, may be null if currently downloading.</returns>
+    public bool TryGetIcon(LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, out TextureWrap? iconTexture)
+    {
+        if (!this.pluginIconMap.TryAdd(manifest.InternalName, null))
         {
-            if (!this.pluginImagesMap.TryAdd(manifest.InternalName, null))
-            {
-                var found = this.pluginImagesMap[manifest.InternalName];
-                imageTextures = found ?? Array.Empty<TextureWrap?>();
-                return true;
-            }
-
-            var target = new TextureWrap?[5];
-            this.pluginImagesMap[manifest.InternalName] = target;
-            imageTextures = target;
-
-            var requestedFrame = Service<DalamudInterface>.GetNullable()?.FrameCount ?? 0;
-            Task.Run(async () =>
-            {
-                try
-                {
-                    await this.DownloadPluginImagesAsync(target, plugin, manifest, isThirdParty, requestedFrame);
-                }
-                catch (Exception ex)
-                {
-                    Log.Error(ex, $"An unexpected error occurred with the images for {manifest.InternalName}");
-                }
-            });
-
-            return false;
+            iconTexture = this.pluginIconMap[manifest.InternalName];
+            return true;
         }
 
-        private static async Task<TextureWrap?> TryLoadImage(
-            byte[]? bytes,
-            string name,
-            string? loc,
-            PluginManifest manifest,
-            int maxWidth,
-            int maxHeight,
-            bool requireSquare)
+        iconTexture = null;
+        var requestedFrame = Service<DalamudInterface>.GetNullable()?.FrameCount ?? 0;
+        Task.Run(async () =>
         {
-            if (bytes == null)
-                return null;
-
-            var interfaceManager = (await Service<InterfaceManager.InterfaceManagerWithScene>.GetAsync()).Manager;
-            var framework = await Service<Framework>.GetAsync();
-
-            TextureWrap? image;
-            // FIXME(goat): This is a hack around this call failing randomly in certain situations. Might be related to not being called on the main thread.
             try
             {
-                image = interfaceManager.LoadImage(bytes);
+                this.pluginIconMap[manifest.InternalName] =
+                    await this.DownloadPluginIconAsync(plugin, manifest, isThirdParty, requestedFrame);
             }
             catch (Exception ex)
             {
-                Log.Error(ex, "Access violation during load plugin {name} from {Loc} (Async Thread)", name, loc);
-
-                try
-                {
-                    image = await framework.RunOnFrameworkThread(() => interfaceManager.LoadImage(bytes));
-                }
-                catch (Exception ex2)
-                {
-                    Log.Error(ex2, "Access violation during load plugin {name} from {Loc} (Framework Thread)", name, loc);
-                    return null;
-                }
+                Log.Error(ex, $"An unexpected error occurred with the icon for {manifest.InternalName}");
             }
+        });
 
-            if (image == null)
+        return false;
+    }
+
+    /// <summary>
+    /// Try to get any images associated with the internal name of a plugin.
+    /// Uses the name within the manifest to search.
+    /// </summary>
+    /// <param name="plugin">The installed plugin, if available.</param>
+    /// <param name="manifest">The plugin manifest.</param>
+    /// <param name="isThirdParty">If the plugin was third party sourced.</param>
+    /// <param name="imageTextures">Cached image textures, or an empty array.</param>
+    /// <returns>True if the image array exists, may be empty if currently downloading.</returns>
+    public bool TryGetImages(LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, out TextureWrap?[] imageTextures)
+    {
+        if (!this.pluginImagesMap.TryAdd(manifest.InternalName, null))
+        {
+            var found = this.pluginImagesMap[manifest.InternalName];
+            imageTextures = found ?? Array.Empty<TextureWrap?>();
+            return true;
+        }
+
+        var target = new TextureWrap?[5];
+        this.pluginImagesMap[manifest.InternalName] = target;
+        imageTextures = target;
+
+        var requestedFrame = Service<DalamudInterface>.GetNullable()?.FrameCount ?? 0;
+        Task.Run(async () =>
+        {
+            try
             {
-                Log.Error($"Could not load {name} for {manifest.InternalName} at {loc}");
+                await this.DownloadPluginImagesAsync(target, plugin, manifest, isThirdParty, requestedFrame);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, $"An unexpected error occurred with the images for {manifest.InternalName}");
+            }
+        });
+
+        return false;
+    }
+
+    private static async Task<TextureWrap?> TryLoadImage(
+        byte[]? bytes,
+        string name,
+        string? loc,
+        PluginManifest manifest,
+        int maxWidth,
+        int maxHeight,
+        bool requireSquare)
+    {
+        if (bytes == null)
+            return null;
+
+        var interfaceManager = (await Service<InterfaceManager.InterfaceManagerWithScene>.GetAsync()).Manager;
+        var framework = await Service<Framework>.GetAsync();
+
+        TextureWrap? image;
+        // FIXME(goat): This is a hack around this call failing randomly in certain situations. Might be related to not being called on the main thread.
+        try
+        {
+            image = interfaceManager.LoadImage(bytes);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Access violation during load plugin {name} from {Loc} (Async Thread)", name, loc);
+
+            try
+            {
+                image = await framework.RunOnFrameworkThread(() => interfaceManager.LoadImage(bytes));
+            }
+            catch (Exception ex2)
+            {
+                Log.Error(ex2, "Access violation during load plugin {name} from {Loc} (Framework Thread)", name, loc);
                 return null;
             }
+        }
 
-            if (image.Width > maxWidth || image.Height > maxHeight)
+        if (image == null)
+        {
+            Log.Error($"Could not load {name} for {manifest.InternalName} at {loc}");
+            return null;
+        }
+
+        if (image.Width > maxWidth || image.Height > maxHeight)
+        {
+            Log.Error($"Plugin {name} for {manifest.InternalName} at {loc} was larger than the maximum allowed resolution ({image.Width}x{image.Height} > {maxWidth}x{maxHeight}).");
+            image.Dispose();
+            return null;
+        }
+
+        if (requireSquare && image.Height != image.Width)
+        {
+            Log.Error($"Plugin {name} for {manifest.InternalName} at {loc} was not square.");
+            image.Dispose();
+            return null;
+        }
+
+        return image!;
+    }
+
+    private Task<T> RunInDownloadQueue<T>(Func<Task<T>> func, ulong requestedFrame)
+    {
+        var tcs = new TaskCompletionSource<T>();
+        this.downloadQueue.Add(Tuple.Create(requestedFrame, async () =>
+        {
+            try
             {
-                Log.Error($"Plugin {name} for {manifest.InternalName} at {loc} was larger than the maximum allowed resolution ({image.Width}x{image.Height} > {maxWidth}x{maxHeight}).");
-                image.Dispose();
-                return null;
+                tcs.SetResult(await func());
             }
-
-            if (requireSquare && image.Height != image.Width)
+            catch (Exception e)
             {
-                Log.Error($"Plugin {name} for {manifest.InternalName} at {loc} was not square.");
-                image.Dispose();
-                return null;
+                tcs.SetException(e);
             }
+        }));
+        return tcs.Task;
+    }
 
-            return image!;
-        }
-
-        private Task<T> RunInDownloadQueue<T>(Func<Task<T>> func, ulong requestedFrame)
+    private Task<T> RunInLoadQueue<T>(Func<Task<T>> func)
+    {
+        var tcs = new TaskCompletionSource<T>();
+        this.loadQueue.Add(async () =>
         {
-            var tcs = new TaskCompletionSource<T>();
-            this.downloadQueue.Add(Tuple.Create(requestedFrame, async () =>
+            try
             {
-                try
-                {
-                    tcs.SetResult(await func());
-                }
-                catch (Exception e)
-                {
-                    tcs.SetException(e);
-                }
-            }));
-            return tcs.Task;
-        }
-
-        private Task<T> RunInLoadQueue<T>(Func<Task<T>> func)
-        {
-            var tcs = new TaskCompletionSource<T>();
-            this.loadQueue.Add(async () =>
-            {
-                try
-                {
-                    tcs.SetResult(await func());
-                }
-                catch (Exception e)
-                {
-                    tcs.SetException(e);
-                }
-            });
-            return tcs.Task;
-        }
-
-        private async Task DownloadTask(int concurrency)
-        {
-            var token = this.cancelToken.Token;
-            var runningTasks = new List<Task>();
-            var pendingFuncs = new List<Tuple<ulong, Func<Task>>>();
-            while (true)
-            {
-                try
-                {
-                    token.ThrowIfCancellationRequested();
-                    if (!pendingFuncs.Any())
-                    {
-                        if (!this.downloadQueue.TryTake(out var taskTuple, -1, token))
-                            return;
-
-                        pendingFuncs.Add(taskTuple);
-                    }
-
-                    token.ThrowIfCancellationRequested();
-                    while (this.downloadQueue.TryTake(out var taskTuple, 0, token))
-                        pendingFuncs.Add(taskTuple);
-
-                    // Process most recently requested items first in terms of frame index.
-                    pendingFuncs = pendingFuncs.OrderBy(x => x.Item1).ToList();
-
-                    var item1 = pendingFuncs.Last().Item1;
-                    while (pendingFuncs.Any() && pendingFuncs.Last().Item1 == item1)
-                    {
-                        token.ThrowIfCancellationRequested();
-                        while (runningTasks.Count >= concurrency)
-                        {
-                            await Task.WhenAny(runningTasks);
-                            runningTasks.RemoveAll(task => task.IsCompleted);
-                        }
-
-                        token.ThrowIfCancellationRequested();
-                        runningTasks.Add(Task.Run(pendingFuncs.Last().Item2, token));
-                        pendingFuncs.RemoveAt(pendingFuncs.Count - 1);
-                    }
-                }
-                catch (OperationCanceledException)
-                {
-                    // Shutdown signal.
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    Log.Error(ex, "An unhandled exception occurred in the plugin image downloader");
-                }
-
-                while (runningTasks.Count >= concurrency)
-                {
-                    await Task.WhenAny(runningTasks);
-                    runningTasks.RemoveAll(task => task.IsCompleted);
-                }
+                tcs.SetResult(await func());
             }
-
-            await Task.WhenAll(runningTasks);
-            Log.Debug("Plugin image downloader has shutdown");
-        }
-
-        private async Task LoadTask(int concurrency)
-        {
-            await Service<InterfaceManager.InterfaceManagerWithScene>.GetAsync();
-
-            var token = this.cancelToken.Token;
-            var runningTasks = new List<Task>();
-            while (true)
+            catch (Exception e)
             {
-                try
+                tcs.SetException(e);
+            }
+        });
+        return tcs.Task;
+    }
+
+    private async Task DownloadTask(int concurrency)
+    {
+        var token = this.cancelToken.Token;
+        var runningTasks = new List<Task>();
+        var pendingFuncs = new List<Tuple<ulong, Func<Task>>>();
+        while (true)
+        {
+            try
+            {
+                token.ThrowIfCancellationRequested();
+                if (!pendingFuncs.Any())
+                {
+                    if (!this.downloadQueue.TryTake(out var taskTuple, -1, token))
+                        return;
+
+                    pendingFuncs.Add(taskTuple);
+                }
+
+                token.ThrowIfCancellationRequested();
+                while (this.downloadQueue.TryTake(out var taskTuple, 0, token))
+                    pendingFuncs.Add(taskTuple);
+
+                // Process most recently requested items first in terms of frame index.
+                pendingFuncs = pendingFuncs.OrderBy(x => x.Item1).ToList();
+
+                var item1 = pendingFuncs.Last().Item1;
+                while (pendingFuncs.Any() && pendingFuncs.Last().Item1 == item1)
                 {
                     token.ThrowIfCancellationRequested();
                     while (runningTasks.Count >= concurrency)
@@ -461,38 +418,81 @@ namespace Dalamud.Interface.Internal.Windows
                         runningTasks.RemoveAll(task => task.IsCompleted);
                     }
 
-                    if (!this.loadQueue.TryTake(out var func, -1, token))
-                        return;
-                    runningTasks.Add(Task.Run(func, token));
-                }
-                catch (OperationCanceledException)
-                {
-                    // Shutdown signal.
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    Log.Error(ex, "An unhandled exception occurred in the plugin image loader");
+                    token.ThrowIfCancellationRequested();
+                    runningTasks.Add(Task.Run(pendingFuncs.Last().Item2, token));
+                    pendingFuncs.RemoveAt(pendingFuncs.Count - 1);
                 }
             }
+            catch (OperationCanceledException)
+            {
+                // Shutdown signal.
+                break;
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "An unhandled exception occurred in the plugin image downloader");
+            }
 
-            await Task.WhenAll(runningTasks);
-            Log.Debug("Plugin image loader has shutdown");
+            while (runningTasks.Count >= concurrency)
+            {
+                await Task.WhenAny(runningTasks);
+                runningTasks.RemoveAll(task => task.IsCompleted);
+            }
         }
 
-        private async Task<TextureWrap?> DownloadPluginIconAsync(LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, ulong requestedFrame)
-        {
-            if (plugin is { IsDev: true })
-            {
-                var file = this.GetPluginIconFileInfo(plugin);
-                if (file != null)
-                {
-                    Log.Verbose($"Fetching icon for {manifest.InternalName} from {file.FullName}");
+        await Task.WhenAll(runningTasks);
+        Log.Debug("Plugin image downloader has shutdown");
+    }
 
-                    var fileBytes = await this.RunInDownloadQueue(
+    private async Task LoadTask(int concurrency)
+    {
+        await Service<InterfaceManager.InterfaceManagerWithScene>.GetAsync();
+
+        var token = this.cancelToken.Token;
+        var runningTasks = new List<Task>();
+        while (true)
+        {
+            try
+            {
+                token.ThrowIfCancellationRequested();
+                while (runningTasks.Count >= concurrency)
+                {
+                    await Task.WhenAny(runningTasks);
+                    runningTasks.RemoveAll(task => task.IsCompleted);
+                }
+
+                if (!this.loadQueue.TryTake(out var func, -1, token))
+                    return;
+                runningTasks.Add(Task.Run(func, token));
+            }
+            catch (OperationCanceledException)
+            {
+                // Shutdown signal.
+                break;
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "An unhandled exception occurred in the plugin image loader");
+            }
+        }
+
+        await Task.WhenAll(runningTasks);
+        Log.Debug("Plugin image loader has shutdown");
+    }
+
+    private async Task<TextureWrap?> DownloadPluginIconAsync(LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, ulong requestedFrame)
+    {
+        if (plugin is { IsDev: true })
+        {
+            var file = this.GetPluginIconFileInfo(plugin);
+            if (file != null)
+            {
+                Log.Verbose($"Fetching icon for {manifest.InternalName} from {file.FullName}");
+
+                var fileBytes = await this.RunInDownloadQueue(
                                     () => File.ReadAllBytesAsync(file.FullName),
                                     requestedFrame);
-                    var fileIcon = await this.RunInLoadQueue(
+                var fileIcon = await this.RunInLoadQueue(
                                    () => TryLoadImage(
                                        fileBytes,
                                        "icon",
@@ -501,237 +501,236 @@ namespace Dalamud.Interface.Internal.Windows
                                        PluginIconWidth,
                                        PluginIconHeight,
                                        true));
-                    if (fileIcon != null)
-                    {
-                        Log.Verbose($"Plugin icon for {manifest.InternalName} loaded from disk");
-                        return fileIcon;
-                    }
+                if (fileIcon != null)
+                {
+                    Log.Verbose($"Plugin icon for {manifest.InternalName} loaded from disk");
+                    return fileIcon;
                 }
-
-                // Dev plugins are likely going to look like a main repo plugin, the InstalledFrom field is going to be null.
-                // So instead, set the value manually so we download from the urls specified.
-                isThirdParty = true;
             }
 
-            var useTesting = Service<PluginManager>.Get().UseTesting(manifest);
-            var url = this.GetPluginIconUrl(manifest, isThirdParty, useTesting);
-
-            if (url.IsNullOrEmpty())
-            {
-                Log.Verbose($"Plugin icon for {manifest.InternalName} is not available");
-                return null;
-            }
-
-            Log.Verbose($"Downloading icon for {manifest.InternalName} from {url}");
-
-            // ReSharper disable once RedundantTypeArgumentsOfMethod
-            var bytes = await this.RunInDownloadQueue<byte[]?>(
-                            async () =>
-                            {
-                                var data = await Util.HttpClient.GetAsync(url);
-                                if (data.StatusCode == HttpStatusCode.NotFound)
-                                    return null;
-
-                                data.EnsureSuccessStatusCode();
-                                return await data.Content.ReadAsByteArrayAsync();
-                            },
-                            requestedFrame);
-
-            if (bytes == null)
-                return null;
-
-            var icon = await this.RunInLoadQueue(
-                           () => TryLoadImage(bytes, "icon", url, manifest, PluginIconWidth, PluginIconHeight, true));
-            if (icon != null)
-                Log.Verbose($"Plugin icon for {manifest.InternalName} loaded");
-            return icon;
+            // Dev plugins are likely going to look like a main repo plugin, the InstalledFrom field is going to be null.
+            // So instead, set the value manually so we download from the urls specified.
+            isThirdParty = true;
         }
 
-        private async Task DownloadPluginImagesAsync(TextureWrap?[] pluginImages, LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, ulong requestedFrame)
+        var useTesting = Service<PluginManager>.Get().UseTesting(manifest);
+        var url = this.GetPluginIconUrl(manifest, isThirdParty, useTesting);
+
+        if (url.IsNullOrEmpty())
         {
-            if (plugin is { IsDev: true })
-            {
-                var fileTasks = new List<Task>();
-                var files = this.GetPluginImageFileInfos(plugin)
-                                .Where(x => x is { Exists: true })
-                                .Select(x => (FileInfo)x!)
-                                .ToList();
-                for (var i = 0; i < files.Count && i < pluginImages.Length; i++)
-                {
-                    var file = files[i];
-                    var i2 = i;
-                    fileTasks.Add(Task.Run(async () =>
-                    {
-                        var bytes = await this.RunInDownloadQueue(
-                                        () => File.ReadAllBytesAsync(file.FullName),
-                                        requestedFrame);
-                        var image = await this.RunInLoadQueue(
-                                        () => TryLoadImage(
-                                            bytes,
-                                            $"image{i2 + 1}",
-                                            file.FullName,
-                                            manifest,
-                                            PluginImageWidth,
-                                            PluginImageHeight,
-                                            false));
-                        if (image == null)
-                            return;
-
-                        Log.Verbose($"Plugin image{i2 + 1} for {manifest.InternalName} loaded from disk");
-                        pluginImages[i2] = image;
-                    }));
-                }
-
-                try
-                {
-                    await Task.WhenAll(fileTasks);
-                }
-                catch (Exception ex)
-                {
-                    Log.Error(ex, $"Failed to load at least one plugin image from filesystem");
-                }
-
-                if (pluginImages.Any(x => x != null))
-                    return;
-
-                // Dev plugins are likely going to look like a main repo plugin, the InstalledFrom field is going to be null.
-                // So instead, set the value manually so we download from the urls specified.
-                isThirdParty = true;
-            }
-
-            var useTesting = Service<PluginManager>.Get().UseTesting(manifest);
-            var urls = this.GetPluginImageUrls(manifest, isThirdParty, useTesting);
-            urls = urls?.Where(x => !string.IsNullOrEmpty(x)).ToList();
-            if (urls?.Any() != true)
-            {
-                Log.Verbose($"Images for {manifest.InternalName} are not available");
-                return;
-            }
-
-            var tasks = new List<Task>();
-            for (var i = 0; i < urls.Count && i < pluginImages.Length; i++)
+            Log.Verbose($"Plugin icon for {manifest.InternalName} is not available");
+            return null;
+        }
+
+        Log.Verbose($"Downloading icon for {manifest.InternalName} from {url}");
+
+        // ReSharper disable once RedundantTypeArgumentsOfMethod
+        var bytes = await this.RunInDownloadQueue<byte[]?>(
+                        async () =>
+                        {
+                            var data = await Util.HttpClient.GetAsync(url);
+                            if (data.StatusCode == HttpStatusCode.NotFound)
+                                return null;
+
+                            data.EnsureSuccessStatusCode();
+                            return await data.Content.ReadAsByteArrayAsync();
+                        },
+                        requestedFrame);
+
+        if (bytes == null)
+            return null;
+
+        var icon = await this.RunInLoadQueue(
+                       () => TryLoadImage(bytes, "icon", url, manifest, PluginIconWidth, PluginIconHeight, true));
+        if (icon != null)
+            Log.Verbose($"Plugin icon for {manifest.InternalName} loaded");
+        return icon;
+    }
+
+    private async Task DownloadPluginImagesAsync(TextureWrap?[] pluginImages, LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, ulong requestedFrame)
+    {
+        if (plugin is { IsDev: true })
+        {
+            var fileTasks = new List<Task>();
+            var files = this.GetPluginImageFileInfos(plugin)
+                            .Where(x => x is { Exists: true })
+                            .Select(x => (FileInfo)x!)
+                            .ToList();
+            for (var i = 0; i < files.Count && i < pluginImages.Length; i++)
             {
+                var file = files[i];
                 var i2 = i;
-                var url = urls[i];
-                tasks.Add(Task.Run(async () =>
+                fileTasks.Add(Task.Run(async () =>
                 {
-                    Log.Verbose($"Downloading image{i2 + 1} for {manifest.InternalName} from {url}");
-                    // ReSharper disable once RedundantTypeArgumentsOfMethod
-                    var bytes = await this.RunInDownloadQueue<byte[]?>(
-                                    async () =>
-                                    {
-                                        var data = await Util.HttpClient.GetAsync(url);
-                                        if (data.StatusCode == HttpStatusCode.NotFound)
-                                            return null;
-
-                                        data.EnsureSuccessStatusCode();
-                                        return await data.Content.ReadAsByteArrayAsync();
-                                    },
+                    var bytes = await this.RunInDownloadQueue(
+                                    () => File.ReadAllBytesAsync(file.FullName),
                                     requestedFrame);
-
-                    if (bytes == null)
-                        return;
-
-                    var image = await TryLoadImage(
+                    var image = await this.RunInLoadQueue(
+                                    () => TryLoadImage(
                                         bytes,
                                         $"image{i2 + 1}",
-                                        "queue",
+                                        file.FullName,
                                         manifest,
                                         PluginImageWidth,
                                         PluginImageHeight,
-                                        false);
+                                        false));
                     if (image == null)
                         return;
 
-                    Log.Verbose($"Image{i2 + 1} for {manifest.InternalName} loaded");
+                    Log.Verbose($"Plugin image{i2 + 1} for {manifest.InternalName} loaded from disk");
                     pluginImages[i2] = image;
                 }));
             }
 
             try
             {
-                await Task.WhenAll(tasks);
+                await Task.WhenAll(fileTasks);
             }
             catch (Exception ex)
             {
-                Log.Error(ex, "Failed to load at least one plugin image from network.");
+                Log.Error(ex, $"Failed to load at least one plugin image from filesystem");
             }
+
+            if (pluginImages.Any(x => x != null))
+                return;
+
+            // Dev plugins are likely going to look like a main repo plugin, the InstalledFrom field is going to be null.
+            // So instead, set the value manually so we download from the urls specified.
+            isThirdParty = true;
         }
 
-        private string? GetPluginIconUrl(PluginManifest manifest, bool isThirdParty, bool isTesting)
+        var useTesting = Service<PluginManager>.Get().UseTesting(manifest);
+        var urls = this.GetPluginImageUrls(manifest, isThirdParty, useTesting);
+        urls = urls?.Where(x => !string.IsNullOrEmpty(x)).ToList();
+        if (urls?.Any() != true)
         {
-            if (isThirdParty)
-                return manifest.IconUrl;
-
-            if (manifest.IsDip17Plugin)
-                return MainRepoDip17ImageUrl.Format(manifest.Dip17Channel!, manifest.InternalName, "icon.png");
-
-            return MainRepoImageUrl.Format(isTesting ? "testing" : "plugins", manifest.InternalName, "icon.png");
+            Log.Verbose($"Images for {manifest.InternalName} are not available");
+            return;
         }
 
-        private List<string?>? GetPluginImageUrls(PluginManifest manifest, bool isThirdParty, bool isTesting)
+        var tasks = new List<Task>();
+        for (var i = 0; i < urls.Count && i < pluginImages.Length; i++)
         {
-            if (isThirdParty)
+            var i2 = i;
+            var url = urls[i];
+            tasks.Add(Task.Run(async () =>
             {
-                if (manifest.ImageUrls?.Count > 5)
-                {
-                    Log.Warning($"Plugin {manifest.InternalName} has too many images");
-                    return manifest.ImageUrls.Take(5).ToList();
-                }
+                Log.Verbose($"Downloading image{i2 + 1} for {manifest.InternalName} from {url}");
+                // ReSharper disable once RedundantTypeArgumentsOfMethod
+                var bytes = await this.RunInDownloadQueue<byte[]?>(
+                                async () =>
+                                {
+                                    var data = await Util.HttpClient.GetAsync(url);
+                                    if (data.StatusCode == HttpStatusCode.NotFound)
+                                        return null;
 
-                return manifest.ImageUrls;
-            }
+                                    data.EnsureSuccessStatusCode();
+                                    return await data.Content.ReadAsByteArrayAsync();
+                                },
+                                requestedFrame);
 
-            var output = new List<string>();
-            for (var i = 1; i <= 5; i++)
-            {
-                if (manifest.IsDip17Plugin)
-                {
-                    output.Add(MainRepoDip17ImageUrl.Format(manifest.Dip17Channel!, manifest.InternalName, $"image{i}.png"));
-                }
-                else
-                {
-                    output.Add(MainRepoImageUrl.Format(isTesting ? "testing" : "plugins", manifest.InternalName, $"image{i}.png"));
-                }
-            }
+                if (bytes == null)
+                    return;
 
-            return output;
+                var image = await TryLoadImage(
+                                bytes,
+                                $"image{i2 + 1}",
+                                "queue",
+                                manifest,
+                                PluginImageWidth,
+                                PluginImageHeight,
+                                false);
+                if (image == null)
+                    return;
+
+                Log.Verbose($"Image{i2 + 1} for {manifest.InternalName} loaded");
+                pluginImages[i2] = image;
+            }));
         }
 
-        private FileInfo? GetPluginIconFileInfo(LocalPlugin? plugin)
+        try
         {
-            var pluginDir = plugin?.DllFile.Directory;
-            if (pluginDir == null)
-                return null;
-
-            var devUrl = new FileInfo(Path.Combine(pluginDir.FullName, "images", "icon.png"));
-            if (devUrl.Exists)
-                return devUrl;
-
-            return null;
+            await Task.WhenAll(tasks);
         }
-
-        private List<FileInfo?> GetPluginImageFileInfos(LocalPlugin? plugin)
+        catch (Exception ex)
         {
-            var output = new List<FileInfo>();
-
-            var pluginDir = plugin?.DllFile.Directory;
-            if (pluginDir == null)
-                return output;
-
-            for (var i = 1; i <= 5; i++)
-            {
-                var devUrl = new FileInfo(Path.Combine(pluginDir.FullName, "images", $"image{i}.png"));
-                if (devUrl.Exists)
-                {
-                    output.Add(devUrl);
-                    continue;
-                }
-
-                output.Add(null);
-            }
-
-            return output;
+            Log.Error(ex, "Failed to load at least one plugin image from network.");
         }
     }
+
+    private string? GetPluginIconUrl(PluginManifest manifest, bool isThirdParty, bool isTesting)
+    {
+        if (isThirdParty)
+            return manifest.IconUrl;
+
+        if (manifest.IsDip17Plugin)
+            return MainRepoDip17ImageUrl.Format(manifest.Dip17Channel!, manifest.InternalName, "icon.png");
+
+        return MainRepoImageUrl.Format(isTesting ? "testing" : "plugins", manifest.InternalName, "icon.png");
+    }
+
+    private List<string?>? GetPluginImageUrls(PluginManifest manifest, bool isThirdParty, bool isTesting)
+    {
+        if (isThirdParty)
+        {
+            if (manifest.ImageUrls?.Count > 5)
+            {
+                Log.Warning($"Plugin {manifest.InternalName} has too many images");
+                return manifest.ImageUrls.Take(5).ToList();
+            }
+
+            return manifest.ImageUrls;
+        }
+
+        var output = new List<string>();
+        for (var i = 1; i <= 5; i++)
+        {
+            if (manifest.IsDip17Plugin)
+            {
+                output.Add(MainRepoDip17ImageUrl.Format(manifest.Dip17Channel!, manifest.InternalName, $"image{i}.png"));
+            }
+            else
+            {
+                output.Add(MainRepoImageUrl.Format(isTesting ? "testing" : "plugins", manifest.InternalName, $"image{i}.png"));
+            }
+        }
+
+        return output;
+    }
+
+    private FileInfo? GetPluginIconFileInfo(LocalPlugin? plugin)
+    {
+        var pluginDir = plugin?.DllFile.Directory;
+        if (pluginDir == null)
+            return null;
+
+        var devUrl = new FileInfo(Path.Combine(pluginDir.FullName, "images", "icon.png"));
+        if (devUrl.Exists)
+            return devUrl;
+
+        return null;
+    }
+
+    private List<FileInfo?> GetPluginImageFileInfos(LocalPlugin? plugin)
+    {
+        var output = new List<FileInfo>();
+
+        var pluginDir = plugin?.DllFile.Directory;
+        if (pluginDir == null)
+            return output;
+
+        for (var i = 1; i <= 5; i++)
+        {
+            var devUrl = new FileInfo(Path.Combine(pluginDir.FullName, "images", $"image{i}.png"));
+            if (devUrl.Exists)
+            {
+                output.Add(devUrl);
+                continue;
+            }
+
+            output.Add(null);
+        }
+
+        return output;
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelog.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelog.cs
index dd928898f..4f2c70a25 100644
--- a/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelog.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelog.cs
@@ -1,52 +1,51 @@
 using System;
 using System.Collections.Generic;
 
-namespace Dalamud.Interface.Internal.Windows.PluginInstaller
+namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
+
+/// <summary>
+/// Class representing a Dalamud changelog.
+/// </summary>
+internal class DalamudChangelog
 {
     /// <summary>
-    /// Class representing a Dalamud changelog.
+    /// Gets the date of the version.
     /// </summary>
-    internal class DalamudChangelog
+    public DateTime Date { get; init; }
+
+    /// <summary>
+    /// Gets the relevant version number.
+    /// </summary>
+    public string Version { get; init; }
+
+    /// <summary>
+    /// Gets the list of changes.
+    /// </summary>
+    public List<DalamudChangelogChange> Changes { get; init; }
+
+    /// <summary>
+    /// Class representing the relevant changes.
+    /// </summary>
+    public class DalamudChangelogChange
     {
         /// <summary>
-        /// Gets the date of the version.
+        /// Gets the commit message.
+        /// </summary>
+        public string Message { get; init; }
+
+        /// <summary>
+        /// Gets the commit author.
+        /// </summary>
+        public string Author { get; init; }
+
+        /// <summary>
+        /// Gets the commit reference SHA.
+        /// </summary>
+        public string Sha { get; init; }
+
+        /// <summary>
+        /// Gets the commit datetime.
         /// </summary>
         public DateTime Date { get; init; }
-
-        /// <summary>
-        /// Gets the relevant version number.
-        /// </summary>
-        public string Version { get; init; }
-
-        /// <summary>
-        /// Gets the list of changes.
-        /// </summary>
-        public List<DalamudChangelogChange> Changes { get; init; }
-
-        /// <summary>
-        /// Class representing the relevant changes.
-        /// </summary>
-        public class DalamudChangelogChange
-        {
-            /// <summary>
-            /// Gets the commit message.
-            /// </summary>
-            public string Message { get; init; }
-
-            /// <summary>
-            /// Gets the commit author.
-            /// </summary>
-            public string Author { get; init; }
-
-            /// <summary>
-            /// Gets the commit reference SHA.
-            /// </summary>
-            public string Sha { get; init; }
-
-            /// <summary>
-            /// Gets the commit datetime.
-            /// </summary>
-            public DateTime Date { get; init; }
-        }
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogEntry.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogEntry.cs
index 7a060d34f..2ea845ed1 100644
--- a/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogEntry.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogEntry.cs
@@ -1,47 +1,46 @@
 using System;
 
-namespace Dalamud.Interface.Internal.Windows.PluginInstaller
+namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
+
+/// <summary>
+/// Class representing a Dalamud changelog.
+/// </summary>
+internal class DalamudChangelogEntry : IChangelogEntry
 {
+    private readonly DalamudChangelog changelog;
+
     /// <summary>
-    /// Class representing a Dalamud changelog.
+    /// Initializes a new instance of the <see cref="DalamudChangelogEntry"/> class.
     /// </summary>
-    internal class DalamudChangelogEntry : IChangelogEntry
+    /// <param name="changelog">The changelog.</param>
+    public DalamudChangelogEntry(DalamudChangelog changelog)
     {
-        private readonly DalamudChangelog changelog;
+        this.changelog = changelog;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DalamudChangelogEntry"/> class.
-        /// </summary>
-        /// <param name="changelog">The changelog.</param>
-        public DalamudChangelogEntry(DalamudChangelog changelog)
+        var changelogText = string.Empty;
+        for (var i = 0; i < changelog.Changes.Count; i++)
         {
-            this.changelog = changelog;
+            var change = changelog.Changes[i];
+            changelogText += $"{change.Message} (by {change.Author})";
 
-            var changelogText = string.Empty;
-            for (var i = 0; i < changelog.Changes.Count; i++)
+            if (i < changelog.Changes.Count - 1)
             {
-                var change = changelog.Changes[i];
-                changelogText += $"{change.Message} (by {change.Author})";
-
-                if (i < changelog.Changes.Count - 1)
-                {
-                    changelogText += Environment.NewLine;
-                }
+                changelogText += Environment.NewLine;
             }
-
-            this.Text = changelogText;
         }
 
-        /// <inheritdoc/>
-        public string Title => "Dalamud Core";
-
-        /// <inheritdoc/>
-        public string Version => this.changelog.Version;
-
-        /// <inheritdoc/>
-        public string Text { get; init; }
-
-        /// <inheritdoc/>
-        public DateTime Date => this.changelog.Date;
+        this.Text = changelogText;
     }
+
+    /// <inheritdoc/>
+    public string Title => "Dalamud Core";
+
+    /// <inheritdoc/>
+    public string Version => this.changelog.Version;
+
+    /// <inheritdoc/>
+    public string Text { get; init; }
+
+    /// <inheritdoc/>
+    public DateTime Date => this.changelog.Date;
 }
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogManager.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogManager.cs
index f0fef8163..086a389d3 100644
--- a/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogManager.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogManager.cs
@@ -4,35 +4,34 @@ using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading.Tasks;
 
-namespace Dalamud.Interface.Internal.Windows.PluginInstaller
+namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
+
+/// <summary>
+/// Class responsible for managing Dalamud changelogs.
+/// </summary>
+internal class DalamudChangelogManager : IDisposable
 {
+    private const string ChangelogUrl = "https://kamori.goats.dev/Plugin/CoreChangelog";
+
+    private readonly HttpClient client = new();
+
     /// <summary>
-    /// Class responsible for managing Dalamud changelogs.
+    /// Gets a list of all available changelogs.
     /// </summary>
-    internal class DalamudChangelogManager : IDisposable
+    public IReadOnlyList<DalamudChangelog>? Changelogs { get; private set; }
+
+    /// <summary>
+    /// Reload the changelog list.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    public async Task ReloadChangelogAsync()
     {
-        private const string ChangelogUrl = "https://kamori.goats.dev/Plugin/CoreChangelog";
+        this.Changelogs = await this.client.GetFromJsonAsync<List<DalamudChangelog>>(ChangelogUrl);
+    }
 
-        private readonly HttpClient client = new();
-
-        /// <summary>
-        /// Gets a list of all available changelogs.
-        /// </summary>
-        public IReadOnlyList<DalamudChangelog>? Changelogs { get; private set; }
-
-        /// <summary>
-        /// Reload the changelog list.
-        /// </summary>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public async Task ReloadChangelogAsync()
-        {
-            this.Changelogs = await this.client.GetFromJsonAsync<List<DalamudChangelog>>(ChangelogUrl);
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            this.client.Dispose();
-        }
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        this.client.Dispose();
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/IChangelogEntry.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/IChangelogEntry.cs
index 21143e5c0..04089f23c 100644
--- a/Dalamud/Interface/Internal/Windows/PluginInstaller/IChangelogEntry.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/IChangelogEntry.cs
@@ -1,30 +1,29 @@
 using System;
 
-namespace Dalamud.Interface.Internal.Windows.PluginInstaller
+namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
+
+/// <summary>
+/// Class representing a changelog entry.
+/// </summary>
+internal interface IChangelogEntry
 {
     /// <summary>
-    /// Class representing a changelog entry.
+    /// Gets the title of the entry.
     /// </summary>
-    internal interface IChangelogEntry
-    {
-        /// <summary>
-        /// Gets the title of the entry.
-        /// </summary>
-        string Title { get; }
+    string Title { get; }
 
-        /// <summary>
-        /// Gets the version this entry applies to.
-        /// </summary>
-        string Version { get; }
+    /// <summary>
+    /// Gets the version this entry applies to.
+    /// </summary>
+    string Version { get; }
 
-        /// <summary>
-        /// Gets the text of the entry.
-        /// </summary>
-        string Text { get; }
+    /// <summary>
+    /// Gets the text of the entry.
+    /// </summary>
+    string Text { get; }
 
-        /// <summary>
-        /// Gets the date of the entry.
-        /// </summary>
-        DateTime Date { get; }
-    }
+    /// <summary>
+    /// Gets the date of the entry.
+    /// </summary>
+    DateTime Date { get; }
 }
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginChangelogEntry.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginChangelogEntry.cs
index 1133090e0..90e78b35a 100644
--- a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginChangelogEntry.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginChangelogEntry.cs
@@ -3,44 +3,43 @@
 using Dalamud.Plugin.Internal.Types;
 using Dalamud.Utility;
 
-namespace Dalamud.Interface.Internal.Windows.PluginInstaller
+namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
+
+/// <summary>
+/// Class representing a plugin changelog.
+/// </summary>
+internal class PluginChangelogEntry : IChangelogEntry
 {
     /// <summary>
-    /// Class representing a plugin changelog.
+    /// Initializes a new instance of the <see cref="PluginChangelogEntry"/> class.
     /// </summary>
-    internal class PluginChangelogEntry : IChangelogEntry
+    /// <param name="plugin">The plugin manifest.</param>
+    public PluginChangelogEntry(LocalPlugin plugin)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PluginChangelogEntry"/> class.
-        /// </summary>
-        /// <param name="plugin">The plugin manifest.</param>
-        public PluginChangelogEntry(LocalPlugin plugin)
-        {
-            this.Plugin = plugin;
+        this.Plugin = plugin;
 
-            if (plugin.Manifest.Changelog.IsNullOrEmpty())
-                throw new ArgumentException("Manifest has no changelog.");
+        if (plugin.Manifest.Changelog.IsNullOrEmpty())
+            throw new ArgumentException("Manifest has no changelog.");
 
-            var version = plugin.Manifest.EffectiveVersion;
+        var version = plugin.Manifest.EffectiveVersion;
 
-            this.Version = version!.ToString();
-        }
-
-        /// <summary>
-        /// Gets the respective plugin.
-        /// </summary>
-        public LocalPlugin Plugin { get; private set; }
-
-        /// <inheritdoc/>
-        public string Title => this.Plugin.Manifest.Name;
-
-        /// <inheritdoc/>
-        public string Version { get; init; }
-
-        /// <inheritdoc/>
-        public string Text => this.Plugin.Manifest.Changelog!;
-
-        /// <inheritdoc/>
-        public DateTime Date => DateTimeOffset.FromUnixTimeSeconds(this.Plugin.Manifest.LastUpdate).DateTime;
+        this.Version = version!.ToString();
     }
+
+    /// <summary>
+    /// Gets the respective plugin.
+    /// </summary>
+    public LocalPlugin Plugin { get; private set; }
+
+    /// <inheritdoc/>
+    public string Title => this.Plugin.Manifest.Name;
+
+    /// <inheritdoc/>
+    public string Version { get; init; }
+
+    /// <inheritdoc/>
+    public string Text => this.Plugin.Manifest.Changelog!;
+
+    /// <inheritdoc/>
+    public DateTime Date => DateTimeOffset.FromUnixTimeSeconds(this.Plugin.Manifest.LastUpdate).DateTime;
 }
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
index f48417ea0..c48944533 100644
--- a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
@@ -26,773 +26,773 @@ using Dalamud.Utility;
 using ImGuiNET;
 using ImGuiScene;
 
-namespace Dalamud.Interface.Internal.Windows.PluginInstaller
+namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
+
+/// <summary>
+/// Class responsible for drawing the plugin installer.
+/// </summary>
+internal class PluginInstallerWindow : Window, IDisposable
 {
+    private static readonly ModuleLog Log = new("PLUGINW");
+
+    private readonly Vector4 changelogBgColor = new(0.114f, 0.584f, 0.192f, 0.678f);
+    private readonly Vector4 changelogTextColor = new(0.812f, 1.000f, 0.816f, 1.000f);
+
+    private readonly PluginImageCache imageCache;
+    private readonly PluginCategoryManager categoryManager = new();
+    private readonly DalamudChangelogManager dalamudChangelogManager = new();
+
+    private readonly List<int> openPluginCollapsibles = new();
+
+    private readonly DateTime timeLoaded;
+
+    #region Image Tester State
+
+    private string[] testerImagePaths = new string[5];
+    private string testerIconPath = string.Empty;
+
+    private TextureWrap?[] testerImages;
+    private TextureWrap? testerIcon;
+
+    private bool testerError = false;
+    private bool testerUpdateAvailable = false;
+
+    #endregion
+
+    private bool errorModalDrawing = true;
+    private bool errorModalOnNextFrame = false;
+    private string errorModalMessage = string.Empty;
+    private TaskCompletionSource? errorModalTaskCompletionSource;
+
+    private bool updateModalDrawing = true;
+    private bool updateModalOnNextFrame = false;
+    private LocalPlugin? updateModalPlugin = null;
+    private TaskCompletionSource<bool>? updateModalTaskCompletionSource;
+
+    private bool feedbackModalDrawing = true;
+    private bool feedbackModalOnNextFrame = false;
+    private bool feedbackModalOnNextFrameDontClear = false;
+    private string feedbackModalBody = string.Empty;
+    private string feedbackModalContact = string.Empty;
+    private bool feedbackModalIncludeException = false;
+    private PluginManifest? feedbackPlugin = null;
+    private bool feedbackIsTesting = false;
+    private bool feedbackIsAnonymous = false;
+
+    private int updatePluginCount = 0;
+    private List<PluginUpdateStatus>? updatedPlugins;
+
+    private List<RemotePluginManifest> pluginListAvailable = new();
+    private List<LocalPlugin> pluginListInstalled = new();
+    private List<AvailablePluginUpdate> pluginListUpdatable = new();
+    private bool hasDevPlugins = false;
+
+    private string searchText = string.Empty;
+
+    private PluginSortKind sortKind = PluginSortKind.Alphabetical;
+    private string filterText = Locs.SortBy_Alphabetical;
+
+    private OperationStatus installStatus = OperationStatus.Idle;
+    private OperationStatus updateStatus = OperationStatus.Idle;
+    private OperationStatus enableDisableStatus = OperationStatus.Idle;
+
+    private LoadingIndicatorKind loadingIndicatorKind = LoadingIndicatorKind.Unknown;
+
     /// <summary>
-    /// Class responsible for drawing the plugin installer.
+    /// Initializes a new instance of the <see cref="PluginInstallerWindow"/> class.
     /// </summary>
-    internal class PluginInstallerWindow : Window, IDisposable
+    /// <param name="imageCache">An instance of <see cref="PluginImageCache"/> class.</param>
+    public PluginInstallerWindow(PluginImageCache imageCache)
+        : base(
+            Locs.WindowTitle + (Service<DalamudConfiguration>.Get().DoPluginTest ? Locs.WindowTitleMod_Testing : string.Empty) + "###XlPluginInstaller",
+            ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoScrollbar)
     {
-        private static readonly ModuleLog Log = new("PLUGINW");
+        this.IsOpen = true;
+        this.imageCache = imageCache;
 
-        private readonly Vector4 changelogBgColor = new(0.114f, 0.584f, 0.192f, 0.678f);
-        private readonly Vector4 changelogTextColor = new(0.812f, 1.000f, 0.816f, 1.000f);
+        this.Size = new Vector2(830, 570);
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
-        private readonly PluginImageCache imageCache;
-        private readonly PluginCategoryManager categoryManager = new();
-        private readonly DalamudChangelogManager dalamudChangelogManager = new();
-
-        private readonly List<int> openPluginCollapsibles = new();
-
-        private readonly DateTime timeLoaded;
-
-        #region Image Tester State
-
-        private string[] testerImagePaths = new string[5];
-        private string testerIconPath = string.Empty;
-
-        private TextureWrap?[] testerImages;
-        private TextureWrap? testerIcon;
-
-        private bool testerError = false;
-        private bool testerUpdateAvailable = false;
-
-        #endregion
-
-        private bool errorModalDrawing = true;
-        private bool errorModalOnNextFrame = false;
-        private string errorModalMessage = string.Empty;
-        private TaskCompletionSource? errorModalTaskCompletionSource;
-
-        private bool updateModalDrawing = true;
-        private bool updateModalOnNextFrame = false;
-        private LocalPlugin? updateModalPlugin = null;
-        private TaskCompletionSource<bool>? updateModalTaskCompletionSource;
-
-        private bool feedbackModalDrawing = true;
-        private bool feedbackModalOnNextFrame = false;
-        private bool feedbackModalOnNextFrameDontClear = false;
-        private string feedbackModalBody = string.Empty;
-        private string feedbackModalContact = string.Empty;
-        private bool feedbackModalIncludeException = false;
-        private PluginManifest? feedbackPlugin = null;
-        private bool feedbackIsTesting = false;
-        private bool feedbackIsAnonymous = false;
-
-        private int updatePluginCount = 0;
-        private List<PluginUpdateStatus>? updatedPlugins;
-
-        private List<RemotePluginManifest> pluginListAvailable = new();
-        private List<LocalPlugin> pluginListInstalled = new();
-        private List<AvailablePluginUpdate> pluginListUpdatable = new();
-        private bool hasDevPlugins = false;
-
-        private string searchText = string.Empty;
-
-        private PluginSortKind sortKind = PluginSortKind.Alphabetical;
-        private string filterText = Locs.SortBy_Alphabetical;
-
-        private OperationStatus installStatus = OperationStatus.Idle;
-        private OperationStatus updateStatus = OperationStatus.Idle;
-        private OperationStatus enableDisableStatus = OperationStatus.Idle;
-
-        private LoadingIndicatorKind loadingIndicatorKind = LoadingIndicatorKind.Unknown;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PluginInstallerWindow"/> class.
-        /// </summary>
-        /// <param name="imageCache">An instance of <see cref="PluginImageCache"/> class.</param>
-        public PluginInstallerWindow(PluginImageCache imageCache)
-            : base(
-                Locs.WindowTitle + (Service<DalamudConfiguration>.Get().DoPluginTest ? Locs.WindowTitleMod_Testing : string.Empty) + "###XlPluginInstaller",
-                ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoScrollbar)
+        this.SizeConstraints = new WindowSizeConstraints
         {
-            this.IsOpen = true;
-            this.imageCache = imageCache;
+            MinimumSize = this.Size.Value,
+            MaximumSize = new Vector2(5000, 5000),
+        };
 
-            this.Size = new Vector2(830, 570);
-            this.SizeCondition = ImGuiCond.FirstUseEver;
+        Service<PluginManager>.GetAsync().ContinueWith(pluginManagerTask =>
+        {
+            var pluginManager = pluginManagerTask.Result;
 
-            this.SizeConstraints = new WindowSizeConstraints
+            // For debugging
+            if (pluginManager.PluginsReady)
+                this.OnInstalledPluginsChanged();
+
+            pluginManager.OnAvailablePluginsChanged += this.OnAvailablePluginsChanged;
+            pluginManager.OnInstalledPluginsChanged += this.OnInstalledPluginsChanged;
+
+            for (var i = 0; i < this.testerImagePaths.Length; i++)
             {
-                MinimumSize = this.Size.Value,
-                MaximumSize = new Vector2(5000, 5000),
-            };
-
-            Service<PluginManager>.GetAsync().ContinueWith(pluginManagerTask =>
-            {
-                var pluginManager = pluginManagerTask.Result;
-
-                // For debugging
-                if (pluginManager.PluginsReady)
-                    this.OnInstalledPluginsChanged();
-
-                pluginManager.OnAvailablePluginsChanged += this.OnAvailablePluginsChanged;
-                pluginManager.OnInstalledPluginsChanged += this.OnInstalledPluginsChanged;
-
-                for (var i = 0; i < this.testerImagePaths.Length; i++)
-                {
-                    this.testerImagePaths[i] = string.Empty;
-                }
-            });
-
-            this.timeLoaded = DateTime.Now;
-        }
-
-        private enum OperationStatus
-        {
-            Idle,
-            InProgress,
-            Complete,
-        }
-
-        private enum LoadingIndicatorKind
-        {
-            Unknown,
-            EnablingSingle,
-            DisablingSingle,
-            UpdatingSingle,
-            UpdatingAll,
-            Installing,
-            Manager,
-        }
-
-        private enum PluginSortKind
-        {
-            Alphabetical,
-            DownloadCount,
-            LastUpdate,
-            NewOrNot,
-            NotInstalled,
-        }
-
-        private bool AnyOperationInProgress => this.installStatus == OperationStatus.InProgress ||
-                                               this.updateStatus == OperationStatus.InProgress ||
-                                               this.enableDisableStatus == OperationStatus.InProgress;
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            var pluginManager = Service<PluginManager>.GetNullable();
-            if (pluginManager != null)
-            {
-                pluginManager.OnAvailablePluginsChanged -= this.OnAvailablePluginsChanged;
-                pluginManager.OnInstalledPluginsChanged -= this.OnInstalledPluginsChanged;
+                this.testerImagePaths[i] = string.Empty;
             }
-        }
+        });
 
-        /// <inheritdoc/>
-        public override void OnOpen()
+        this.timeLoaded = DateTime.Now;
+    }
+
+    private enum OperationStatus
+    {
+        Idle,
+        InProgress,
+        Complete,
+    }
+
+    private enum LoadingIndicatorKind
+    {
+        Unknown,
+        EnablingSingle,
+        DisablingSingle,
+        UpdatingSingle,
+        UpdatingAll,
+        Installing,
+        Manager,
+    }
+
+    private enum PluginSortKind
+    {
+        Alphabetical,
+        DownloadCount,
+        LastUpdate,
+        NewOrNot,
+        NotInstalled,
+    }
+
+    private bool AnyOperationInProgress => this.installStatus == OperationStatus.InProgress ||
+                                           this.updateStatus == OperationStatus.InProgress ||
+                                           this.enableDisableStatus == OperationStatus.InProgress;
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        var pluginManager = Service<PluginManager>.GetNullable();
+        if (pluginManager != null)
         {
-            var pluginManager = Service<PluginManager>.Get();
+            pluginManager.OnAvailablePluginsChanged -= this.OnAvailablePluginsChanged;
+            pluginManager.OnInstalledPluginsChanged -= this.OnInstalledPluginsChanged;
+        }
+    }
 
-            _ = pluginManager.ReloadPluginMastersAsync();
-            _ = this.dalamudChangelogManager.ReloadChangelogAsync();
+    /// <inheritdoc/>
+    public override void OnOpen()
+    {
+        var pluginManager = Service<PluginManager>.Get();
 
-            this.searchText = string.Empty;
-            this.sortKind = PluginSortKind.Alphabetical;
-            this.filterText = Locs.SortBy_Alphabetical;
+        _ = pluginManager.ReloadPluginMastersAsync();
+        _ = this.dalamudChangelogManager.ReloadChangelogAsync();
 
-            if (this.updateStatus == OperationStatus.Complete || this.updateStatus == OperationStatus.Idle)
+        this.searchText = string.Empty;
+        this.sortKind = PluginSortKind.Alphabetical;
+        this.filterText = Locs.SortBy_Alphabetical;
+
+        if (this.updateStatus == OperationStatus.Complete || this.updateStatus == OperationStatus.Idle)
+        {
+            this.updateStatus = OperationStatus.Idle;
+            this.updatePluginCount = 0;
+            this.updatedPlugins = null;
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void OnClose()
+    {
+        Service<DalamudConfiguration>.Get().Save();
+    }
+
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        this.DrawHeader();
+        this.DrawPluginCategories();
+        this.DrawFooter();
+        this.DrawErrorModal();
+        this.DrawUpdateModal();
+        this.DrawFeedbackModal();
+        this.DrawProgressOverlay();
+    }
+
+    /// <summary>
+    /// Clear the icon and image caches, forcing a fresh download.
+    /// </summary>
+    public void ClearIconCache()
+    {
+        this.imageCache.ClearIconCache();
+    }
+
+    /// <summary>
+    /// Open the window on the plugin changelogs.
+    /// </summary>
+    public void OpenPluginChangelogs()
+    {
+        // Changelog group
+        this.categoryManager.CurrentGroupIdx = 3;
+        // Plugins category
+        this.categoryManager.CurrentCategoryIdx = 2;
+        this.IsOpen = true;
+    }
+
+    private void DrawProgressOverlay()
+    {
+        var pluginManager = Service<PluginManager>.Get();
+
+        var isWaitingManager = !pluginManager.PluginsReady ||
+                               !pluginManager.ReposReady;
+        var isLoading = this.AnyOperationInProgress ||
+                        isWaitingManager;
+
+        if (isWaitingManager)
+            this.loadingIndicatorKind = LoadingIndicatorKind.Manager;
+
+        if (!isLoading)
+            return;
+
+        ImGui.SetCursorPos(Vector2.Zero);
+
+        var windowSize = ImGui.GetWindowSize();
+        var titleHeight = ImGui.GetFontSize() + (ImGui.GetStyle().FramePadding.Y * 2);
+
+        if (ImGui.BeginChild("###installerLoadingFrame", new Vector2(-1, -1), false))
+        {
+            ImGui.GetWindowDrawList().PushClipRectFullScreen();
+            ImGui.GetWindowDrawList().AddRectFilled(
+                ImGui.GetWindowPos() + new Vector2(0, titleHeight),
+                ImGui.GetWindowPos() + windowSize,
+                0xCC000000,
+                ImGui.GetStyle().WindowRounding,
+                ImDrawFlags.RoundCornersBottom);
+            ImGui.PopClipRect();
+
+            ImGui.SetCursorPosY(windowSize.Y / 2);
+
+            switch (this.loadingIndicatorKind)
             {
-                this.updateStatus = OperationStatus.Idle;
-                this.updatePluginCount = 0;
-                this.updatedPlugins = null;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void OnClose()
-        {
-            Service<DalamudConfiguration>.Get().Save();
-        }
-
-        /// <inheritdoc/>
-        public override void Draw()
-        {
-            this.DrawHeader();
-            this.DrawPluginCategories();
-            this.DrawFooter();
-            this.DrawErrorModal();
-            this.DrawUpdateModal();
-            this.DrawFeedbackModal();
-            this.DrawProgressOverlay();
-        }
-
-        /// <summary>
-        /// Clear the icon and image caches, forcing a fresh download.
-        /// </summary>
-        public void ClearIconCache()
-        {
-            this.imageCache.ClearIconCache();
-        }
-
-        /// <summary>
-        /// Open the window on the plugin changelogs.
-        /// </summary>
-        public void OpenPluginChangelogs()
-        {
-            // Changelog group
-            this.categoryManager.CurrentGroupIdx = 3;
-            // Plugins category
-            this.categoryManager.CurrentCategoryIdx = 2;
-            this.IsOpen = true;
-        }
-
-        private void DrawProgressOverlay()
-        {
-            var pluginManager = Service<PluginManager>.Get();
-
-            var isWaitingManager = !pluginManager.PluginsReady ||
-                                   !pluginManager.ReposReady;
-            var isLoading = this.AnyOperationInProgress ||
-                            isWaitingManager;
-
-            if (isWaitingManager)
-                this.loadingIndicatorKind = LoadingIndicatorKind.Manager;
-
-            if (!isLoading)
-                return;
-
-            ImGui.SetCursorPos(Vector2.Zero);
-
-            var windowSize = ImGui.GetWindowSize();
-            var titleHeight = ImGui.GetFontSize() + (ImGui.GetStyle().FramePadding.Y * 2);
-
-            if (ImGui.BeginChild("###installerLoadingFrame", new Vector2(-1, -1), false))
-            {
-                ImGui.GetWindowDrawList().PushClipRectFullScreen();
-                ImGui.GetWindowDrawList().AddRectFilled(
-                    ImGui.GetWindowPos() + new Vector2(0, titleHeight),
-                    ImGui.GetWindowPos() + windowSize,
-                    0xCC000000,
-                    ImGui.GetStyle().WindowRounding,
-                    ImDrawFlags.RoundCornersBottom);
-                ImGui.PopClipRect();
-
-                ImGui.SetCursorPosY(windowSize.Y / 2);
-
-                switch (this.loadingIndicatorKind)
-                {
-                    case LoadingIndicatorKind.Unknown:
-                        ImGuiHelpers.CenteredText("Doing something, not sure what!");
-                        break;
-                    case LoadingIndicatorKind.EnablingSingle:
-                        ImGuiHelpers.CenteredText("Enabling plugin...");
-                        break;
-                    case LoadingIndicatorKind.DisablingSingle:
-                        ImGuiHelpers.CenteredText("Disabling plugin...");
-                        break;
-                    case LoadingIndicatorKind.UpdatingSingle:
-                        ImGuiHelpers.CenteredText("Updating plugin...");
-                        break;
-                    case LoadingIndicatorKind.UpdatingAll:
-                        ImGuiHelpers.CenteredText("Updating plugins...");
-                        break;
-                    case LoadingIndicatorKind.Installing:
-                        ImGuiHelpers.CenteredText("Installing plugin...");
-                        break;
-                    case LoadingIndicatorKind.Manager:
+                case LoadingIndicatorKind.Unknown:
+                    ImGuiHelpers.CenteredText("Doing something, not sure what!");
+                    break;
+                case LoadingIndicatorKind.EnablingSingle:
+                    ImGuiHelpers.CenteredText("Enabling plugin...");
+                    break;
+                case LoadingIndicatorKind.DisablingSingle:
+                    ImGuiHelpers.CenteredText("Disabling plugin...");
+                    break;
+                case LoadingIndicatorKind.UpdatingSingle:
+                    ImGuiHelpers.CenteredText("Updating plugin...");
+                    break;
+                case LoadingIndicatorKind.UpdatingAll:
+                    ImGuiHelpers.CenteredText("Updating plugins...");
+                    break;
+                case LoadingIndicatorKind.Installing:
+                    ImGuiHelpers.CenteredText("Installing plugin...");
+                    break;
+                case LoadingIndicatorKind.Manager:
+                    {
+                        if (pluginManager.PluginsReady && !pluginManager.ReposReady)
                         {
-                            if (pluginManager.PluginsReady && !pluginManager.ReposReady)
-                            {
-                                ImGuiHelpers.CenteredText("Loading repositories...");
-                            }
-                            else if (!pluginManager.PluginsReady && pluginManager.ReposReady)
-                            {
-                                ImGuiHelpers.CenteredText("Loading installed plugins...");
-                            }
-                            else
-                            {
-                                ImGuiHelpers.CenteredText("Loading repositories and plugins...");
-                            }
-
-                            var currentProgress = 0;
-                            var total = 0;
-
-                            var pendingRepos = pluginManager.Repos.ToArray()
-                                                            .Where(x => (x.State != PluginRepositoryState.Success &&
-                                                                        x.State != PluginRepositoryState.Fail) &&
-                                                                        x.IsEnabled)
-                                                            .ToArray();
-                            var allRepoCount =
-                                pluginManager.Repos.Count(x => x.State != PluginRepositoryState.Fail && x.IsEnabled);
-
-                            foreach (var repo in pendingRepos)
-                            {
-                                ImGuiHelpers.CenteredText($"{repo.PluginMasterUrl}: {repo.State}");
-                            }
-
-                            currentProgress += allRepoCount - pendingRepos.Length;
-                            total += allRepoCount;
-
-                            if (currentProgress != total)
-                            {
-                                ImGui.SetCursorPosX(windowSize.X / 3);
-                                ImGui.ProgressBar(currentProgress / (float)total, new Vector2(windowSize.X / 3, 50));
-                            }
+                            ImGuiHelpers.CenteredText("Loading repositories...");
                         }
-
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
-
-                if (DateTime.Now - this.timeLoaded > TimeSpan.FromSeconds(90) && !pluginManager.PluginsReady)
-                {
-                    ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
-                    ImGuiHelpers.CenteredText("This is embarrassing, but...");
-                    ImGuiHelpers.CenteredText("one of your plugins may be blocking the installer.");
-                    ImGuiHelpers.CenteredText("You should tell us about this, please keep this window open.");
-                    ImGui.PopStyleColor();
-                }
-
-                ImGui.EndChild();
-            }
-        }
-
-        private void DrawHeader()
-        {
-            var style = ImGui.GetStyle();
-            var windowSize = ImGui.GetWindowContentRegionMax();
-
-            ImGui.SetCursorPosY(ImGui.GetCursorPosY() - (5 * ImGuiHelpers.GlobalScale));
-
-            var searchInputWidth = 180 * ImGuiHelpers.GlobalScale;
-            var searchClearButtonWidth = 25 * ImGuiHelpers.GlobalScale;
-
-            var sortByText = Locs.SortBy_Label;
-            var sortByTextWidth = ImGui.CalcTextSize(sortByText).X;
-            var sortSelectables = new (string Localization, PluginSortKind SortKind)[]
-            {
-                (Locs.SortBy_Alphabetical, PluginSortKind.Alphabetical),
-                (Locs.SortBy_DownloadCounts, PluginSortKind.DownloadCount),
-                (Locs.SortBy_LastUpdate, PluginSortKind.LastUpdate),
-                (Locs.SortBy_NewOrNot, PluginSortKind.NewOrNot),
-                (Locs.SortBy_NotInstalled, PluginSortKind.NotInstalled),
-            };
-            var longestSelectableWidth = sortSelectables.Select(t => ImGui.CalcTextSize(t.Localization).X).Max();
-            var selectableWidth = longestSelectableWidth + (style.FramePadding.X * 2);  // This does not include the label
-            var sortSelectWidth = selectableWidth + sortByTextWidth + style.ItemInnerSpacing.X;  // Item spacing between the selectable and the label
-
-            var headerText = Locs.Header_Hint;
-            var headerTextSize = ImGui.CalcTextSize(headerText);
-            ImGui.Text(headerText);
-
-            ImGui.SameLine();
-
-            // Shift down a little to align with the middle of the header text
-            var downShift = ImGui.GetCursorPosY() + (headerTextSize.Y / 4) - 2;
-            ImGui.SetCursorPosY(downShift);
-
-            ImGui.SetCursorPosX(windowSize.X - sortSelectWidth - (style.ItemSpacing.X * 2) - searchInputWidth - searchClearButtonWidth);
-
-            var searchTextChanged = false;
-            ImGui.SetNextItemWidth(searchInputWidth);
-            searchTextChanged |= ImGui.InputTextWithHint(
-                "###XlPluginInstaller_Search",
-                Locs.Header_SearchPlaceholder,
-                ref this.searchText,
-                100);
-
-            ImGui.SameLine();
-            ImGui.SetCursorPosY(downShift);
-
-            ImGui.SetNextItemWidth(searchClearButtonWidth);
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.Times))
-            {
-                this.searchText = string.Empty;
-                searchTextChanged = true;
-            }
-
-            if (searchTextChanged)
-                this.UpdateCategoriesOnSearchChange();
-
-            // Changelog group
-            var isSortDisabled = this.categoryManager.CurrentGroupIdx == 3;
-            if (isSortDisabled)
-                ImGui.BeginDisabled();
-
-            ImGui.SameLine();
-            ImGui.SetCursorPosY(downShift);
-            ImGui.SetNextItemWidth(selectableWidth);
-            if (ImGui.BeginCombo(sortByText, this.filterText, ImGuiComboFlags.NoArrowButton))
-            {
-                foreach (var selectable in sortSelectables)
-                {
-                    if (ImGui.Selectable(selectable.Localization))
-                    {
-                        this.sortKind = selectable.SortKind;
-                        this.filterText = selectable.Localization;
-
-                        this.ResortPlugins();
-                    }
-                }
-
-                ImGui.EndCombo();
-            }
-
-            if (isSortDisabled)
-                ImGui.EndDisabled();
-        }
-
-        private void DrawFooter()
-        {
-            var configuration = Service<DalamudConfiguration>.Get();
-            var pluginManager = Service<PluginManager>.Get();
-
-            var windowSize = ImGui.GetWindowContentRegionMax();
-            var placeholderButtonSize = ImGuiHelpers.GetButtonSize("placeholder");
-
-            ImGui.Separator();
-
-            ImGui.SetCursorPosY(windowSize.Y - placeholderButtonSize.Y);
-
-            this.DrawUpdatePluginsButton();
-
-            ImGui.SameLine();
-            if (ImGui.Button(Locs.FooterButton_Settings))
-            {
-                Service<DalamudInterface>.Get().OpenSettings();
-            }
-
-            // If any dev plugins are installed, allow a shortcut for the /xldev menu item
-            if (this.hasDevPlugins)
-            {
-                ImGui.SameLine();
-                if (ImGui.Button(Locs.FooterButton_ScanDevPlugins))
-                {
-                    pluginManager.ScanDevPlugins();
-                }
-            }
-
-            var closeText = Locs.FooterButton_Close;
-            var closeButtonSize = ImGuiHelpers.GetButtonSize(closeText);
-
-            ImGui.SameLine(windowSize.X - closeButtonSize.X - 20);
-            if (ImGui.Button(closeText))
-            {
-                this.IsOpen = false;
-                configuration.Save();
-            }
-        }
-
-        private void DrawUpdatePluginsButton()
-        {
-            var pluginManager = Service<PluginManager>.Get();
-            var notifications = Service<NotificationManager>.Get();
-
-            var ready = pluginManager.PluginsReady && pluginManager.ReposReady;
-
-            if (pluginManager.SafeMode)
-            {
-                ImGuiComponents.DisabledButton(Locs.FooterButton_UpdateSafeMode);
-            }
-            else if (!ready || this.updateStatus == OperationStatus.InProgress || this.installStatus == OperationStatus.InProgress)
-            {
-                ImGuiComponents.DisabledButton(Locs.FooterButton_UpdatePlugins);
-            }
-            else if (this.updateStatus == OperationStatus.Complete)
-            {
-                ImGui.Button(this.updatePluginCount > 0
-                    ? Locs.FooterButton_UpdateComplete(this.updatePluginCount)
-                    : Locs.FooterButton_NoUpdates);
-            }
-            else
-            {
-                if (ImGui.Button(Locs.FooterButton_UpdatePlugins))
-                {
-                    this.updateStatus = OperationStatus.InProgress;
-                    this.loadingIndicatorKind = LoadingIndicatorKind.UpdatingAll;
-
-                    Task.Run(() => pluginManager.UpdatePluginsAsync(true, false))
-                        .ContinueWith(task =>
+                        else if (!pluginManager.PluginsReady && pluginManager.ReposReady)
                         {
-                            this.updateStatus = OperationStatus.Complete;
-
-                            if (task.IsFaulted)
-                            {
-                                this.updatePluginCount = 0;
-                                this.updatedPlugins = null;
-                                this.DisplayErrorContinuation(task, Locs.ErrorModal_UpdaterFatal);
-                            }
-                            else
-                            {
-                                this.updatedPlugins = task.Result.Where(res => res.WasUpdated).ToList();
-                                this.updatePluginCount = this.updatedPlugins.Count;
-
-                                var errorPlugins = task.Result.Where(res => !res.WasUpdated).ToList();
-                                var errorPluginCount = errorPlugins.Count;
-
-                                if (errorPluginCount > 0)
-                                {
-                                    var errorMessage = this.updatePluginCount > 0
-                                        ? Locs.ErrorModal_UpdaterFailPartial(this.updatePluginCount, errorPluginCount)
-                                        : Locs.ErrorModal_UpdaterFail(errorPluginCount);
-
-                                    var hintInsert = errorPlugins
-                                        .Aggregate(string.Empty, (current, pluginUpdateStatus) => $"{current}* {pluginUpdateStatus.InternalName}\n")
-                                        .TrimEnd();
-                                    errorMessage += Locs.ErrorModal_HintBlame(hintInsert);
-
-                                    this.DisplayErrorContinuation(task, errorMessage);
-                                }
-
-                                if (this.updatePluginCount > 0)
-                                {
-                                    Service<PluginManager>.Get().PrintUpdatedPlugins(this.updatedPlugins, Locs.PluginUpdateHeader_Chatbox);
-                                    notifications.AddNotification(Locs.Notifications_UpdatesInstalled(this.updatePluginCount), Locs.Notifications_UpdatesInstalledTitle, NotificationType.Success);
-
-                                    var installedGroupIdx = this.categoryManager.GroupList.TakeWhile(
-                                        x => x.GroupKind != PluginCategoryManager.GroupKind.Installed).Count();
-                                    this.categoryManager.CurrentGroupIdx = installedGroupIdx;
-                                }
-                                else if (this.updatePluginCount == 0)
-                                {
-                                    notifications.AddNotification(Locs.Notifications_NoUpdatesFound, Locs.Notifications_NoUpdatesFoundTitle, NotificationType.Info);
-                                }
-                            }
-                        });
-                }
-            }
-        }
-
-        private void DrawErrorModal()
-        {
-            var modalTitle = Locs.ErrorModal_Title;
-
-            if (ImGui.BeginPopupModal(modalTitle, ref this.errorModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
-            {
-                ImGui.Text(this.errorModalMessage);
-                ImGui.Spacing();
-
-                var buttonWidth = 120f;
-                ImGui.SetCursorPosX((ImGui.GetWindowWidth() - buttonWidth) / 2);
-
-                if (ImGui.Button(Locs.ErrorModalButton_Ok, new Vector2(buttonWidth, 40)))
-                {
-                    ImGui.CloseCurrentPopup();
-                    this.errorModalTaskCompletionSource?.SetResult();
-                }
-
-                ImGui.EndPopup();
-            }
-
-            if (this.errorModalOnNextFrame)
-            {
-                // NOTE(goat): ImGui cannot open a modal if no window is focused, at the moment.
-                // If people click out of the installer into the game while a plugin is installing, we won't be able to show a modal if we don't grab focus.
-                ImGui.SetWindowFocus(this.WindowName);
-
-                ImGui.OpenPopup(modalTitle);
-                this.errorModalOnNextFrame = false;
-                this.errorModalDrawing = true;
-            }
-        }
-
-        private void DrawUpdateModal()
-        {
-            var modalTitle = Locs.UpdateModal_Title;
-
-            if (this.updateModalPlugin == null)
-                return;
-
-            if (ImGui.BeginPopupModal(modalTitle, ref this.updateModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
-            {
-                ImGui.Text(Locs.UpdateModal_UpdateAvailable(this.updateModalPlugin.Name));
-                ImGui.Spacing();
-
-                var buttonWidth = 120f;
-                ImGui.SetCursorPosX((ImGui.GetWindowWidth() - ((buttonWidth * 2) - (ImGui.GetStyle().ItemSpacing.Y * 2))) / 2);
-
-                if (ImGui.Button(Locs.UpdateModal_Yes, new Vector2(buttonWidth, 40)))
-                {
-                    ImGui.CloseCurrentPopup();
-                    this.updateModalTaskCompletionSource?.SetResult(true);
-                }
-
-                ImGui.SameLine();
-
-                if (ImGui.Button(Locs.UpdateModal_No, new Vector2(buttonWidth, 40)))
-                {
-                    ImGui.CloseCurrentPopup();
-                    this.updateModalTaskCompletionSource?.SetResult(false);
-                }
-
-                ImGui.EndPopup();
-            }
-
-            if (this.updateModalOnNextFrame)
-            {
-                // NOTE(goat): ImGui cannot open a modal if no window is focused, at the moment.
-                // If people click out of the installer into the game while a plugin is installing, we won't be able to show a modal if we don't grab focus.
-                ImGui.SetWindowFocus(this.WindowName);
-
-                ImGui.OpenPopup(modalTitle);
-                this.updateModalOnNextFrame = false;
-                this.updateModalDrawing = true;
-            }
-        }
-
-        private void DrawFeedbackModal()
-        {
-            var modalTitle = Locs.FeedbackModal_Title;
-
-            if (ImGui.BeginPopupModal(modalTitle, ref this.feedbackModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
-            {
-                ImGui.TextUnformatted(Locs.FeedbackModal_Text(this.feedbackPlugin.Name));
-
-                if (this.feedbackPlugin?.FeedbackMessage != null)
-                {
-                    ImGuiHelpers.SafeTextWrapped(this.feedbackPlugin.FeedbackMessage);
-                }
-
-                if (this.pluginListUpdatable.Any(
-                    up => up.InstalledPlugin.Manifest.InternalName == this.feedbackPlugin?.InternalName))
-                {
-                    ImGui.TextColored(ImGuiColors.DalamudRed, Locs.FeedbackModal_HasUpdate);
-                }
-
-                ImGui.Spacing();
-
-                ImGui.InputTextMultiline("###FeedbackContent", ref this.feedbackModalBody, 1000, new Vector2(400, 200));
-
-                ImGui.Spacing();
-
-                if (ImGui.Checkbox(Locs.FeedbackModal_ContactAnonymous, ref this.feedbackIsAnonymous))
-                {
-                    if (this.feedbackIsAnonymous)
-                        this.feedbackModalContact = string.Empty;
-                }
-
-                if (this.feedbackIsAnonymous)
-                {
-                    ImGui.BeginDisabled();
-                    ImGui.InputText(Locs.FeedbackModal_ContactInformation, ref this.feedbackModalContact, 0);
-                    ImGui.EndDisabled();
-                    ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
-                    ImGui.Text(Locs.FeedbackModal_ContactAnonymousWarning);
-                    ImGui.PopStyleColor();
-                }
-                else
-                {
-                    ImGui.InputText(Locs.FeedbackModal_ContactInformation, ref this.feedbackModalContact, 100);
-
-                    ImGui.SameLine();
-
-                    if (ImGui.Button(Locs.FeedbackModal_ContactInformationDiscordButton))
-                    {
-                        Process.Start(new ProcessStartInfo(Locs.FeedbackModal_ContactInformationDiscordUrl)
-                        {
-                            UseShellExecute = true,
-                        });
-                    }
-
-                    ImGui.Text(Locs.FeedbackModal_ContactInformationHelp);
-
-                    ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
-                    ImGui.Text(Locs.FeedbackModal_ContactInformationWarning);
-                    ImGui.PopStyleColor();
-                }
-
-                ImGui.Spacing();
-
-                ImGui.Checkbox(Locs.FeedbackModal_IncludeLastError, ref this.feedbackModalIncludeException);
-                ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.FeedbackModal_IncludeLastErrorHint);
-
-                ImGui.Spacing();
-
-                ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.FeedbackModal_Hint);
-
-                var buttonWidth = 120f;
-                ImGui.SetCursorPosX((ImGui.GetWindowWidth() - buttonWidth) / 2);
-
-                if (ImGui.Button(Locs.ErrorModalButton_Ok, new Vector2(buttonWidth, 40)))
-                {
-                    if (!this.feedbackIsAnonymous && string.IsNullOrWhiteSpace(this.feedbackModalContact))
-                    {
-                        this.ShowErrorModal(Locs.FeedbackModal_ContactInformationRequired)
-                            .ContinueWith(_ =>
-                            {
-                                this.feedbackModalOnNextFrameDontClear = true;
-                                this.feedbackModalOnNextFrame = true;
-                            });
-                    }
-                    else
-                    {
-                        if (this.feedbackPlugin != null)
-                        {
-                            Task.Run(async () => await BugBait.SendFeedback(
-                                                     this.feedbackPlugin,
-                                                     this.feedbackIsTesting,
-                                                     this.feedbackModalBody,
-                                                     this.feedbackModalContact,
-                                                     this.feedbackModalIncludeException))
-                                .ContinueWith(
-                                    t =>
-                                    {
-                                        var notif = Service<NotificationManager>.Get();
-                                        if (t.IsCanceled || t.IsFaulted)
-                                        {
-                                            notif.AddNotification(
-                                                Locs.FeedbackModal_NotificationError,
-                                                Locs.FeedbackModal_Title,
-                                                NotificationType.Error);
-                                        }
-                                        else
-                                        {
-                                            notif.AddNotification(
-                                                Locs.FeedbackModal_NotificationSuccess,
-                                                Locs.FeedbackModal_Title,
-                                                NotificationType.Success);
-                                        }
-                                    });
+                            ImGuiHelpers.CenteredText("Loading installed plugins...");
                         }
                         else
                         {
-                            Log.Error("FeedbackPlugin was null.");
+                            ImGuiHelpers.CenteredText("Loading repositories and plugins...");
                         }
 
-                        if (!string.IsNullOrWhiteSpace(this.feedbackModalContact))
+                        var currentProgress = 0;
+                        var total = 0;
+
+                        var pendingRepos = pluginManager.Repos.ToArray()
+                                                        .Where(x => (x.State != PluginRepositoryState.Success &&
+                                                                     x.State != PluginRepositoryState.Fail) &&
+                                                                    x.IsEnabled)
+                                                        .ToArray();
+                        var allRepoCount =
+                            pluginManager.Repos.Count(x => x.State != PluginRepositoryState.Fail && x.IsEnabled);
+
+                        foreach (var repo in pendingRepos)
                         {
-                            Service<DalamudConfiguration>.Get().LastFeedbackContactDetails = this.feedbackModalContact;
+                            ImGuiHelpers.CenteredText($"{repo.PluginMasterUrl}: {repo.State}");
                         }
 
-                        ImGui.CloseCurrentPopup();
-                    }
-                }
+                        currentProgress += allRepoCount - pendingRepos.Length;
+                        total += allRepoCount;
 
-                ImGui.EndPopup();
+                        if (currentProgress != total)
+                        {
+                            ImGui.SetCursorPosX(windowSize.X / 3);
+                            ImGui.ProgressBar(currentProgress / (float)total, new Vector2(windowSize.X / 3, 50));
+                        }
+                    }
+
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
             }
 
-            if (this.feedbackModalOnNextFrame)
+            if (DateTime.Now - this.timeLoaded > TimeSpan.FromSeconds(90) && !pluginManager.PluginsReady)
             {
-                ImGui.OpenPopup(modalTitle);
-                this.feedbackModalOnNextFrame = false;
-                this.feedbackModalDrawing = true;
-                if (!this.feedbackModalOnNextFrameDontClear)
+                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+                ImGuiHelpers.CenteredText("This is embarrassing, but...");
+                ImGuiHelpers.CenteredText("one of your plugins may be blocking the installer.");
+                ImGuiHelpers.CenteredText("You should tell us about this, please keep this window open.");
+                ImGui.PopStyleColor();
+            }
+
+            ImGui.EndChild();
+        }
+    }
+
+    private void DrawHeader()
+    {
+        var style = ImGui.GetStyle();
+        var windowSize = ImGui.GetWindowContentRegionMax();
+
+        ImGui.SetCursorPosY(ImGui.GetCursorPosY() - (5 * ImGuiHelpers.GlobalScale));
+
+        var searchInputWidth = 180 * ImGuiHelpers.GlobalScale;
+        var searchClearButtonWidth = 25 * ImGuiHelpers.GlobalScale;
+
+        var sortByText = Locs.SortBy_Label;
+        var sortByTextWidth = ImGui.CalcTextSize(sortByText).X;
+        var sortSelectables = new (string Localization, PluginSortKind SortKind)[]
+        {
+            (Locs.SortBy_Alphabetical, PluginSortKind.Alphabetical),
+            (Locs.SortBy_DownloadCounts, PluginSortKind.DownloadCount),
+            (Locs.SortBy_LastUpdate, PluginSortKind.LastUpdate),
+            (Locs.SortBy_NewOrNot, PluginSortKind.NewOrNot),
+            (Locs.SortBy_NotInstalled, PluginSortKind.NotInstalled),
+        };
+        var longestSelectableWidth = sortSelectables.Select(t => ImGui.CalcTextSize(t.Localization).X).Max();
+        var selectableWidth = longestSelectableWidth + (style.FramePadding.X * 2);  // This does not include the label
+        var sortSelectWidth = selectableWidth + sortByTextWidth + style.ItemInnerSpacing.X;  // Item spacing between the selectable and the label
+
+        var headerText = Locs.Header_Hint;
+        var headerTextSize = ImGui.CalcTextSize(headerText);
+        ImGui.Text(headerText);
+
+        ImGui.SameLine();
+
+        // Shift down a little to align with the middle of the header text
+        var downShift = ImGui.GetCursorPosY() + (headerTextSize.Y / 4) - 2;
+        ImGui.SetCursorPosY(downShift);
+
+        ImGui.SetCursorPosX(windowSize.X - sortSelectWidth - (style.ItemSpacing.X * 2) - searchInputWidth - searchClearButtonWidth);
+
+        var searchTextChanged = false;
+        ImGui.SetNextItemWidth(searchInputWidth);
+        searchTextChanged |= ImGui.InputTextWithHint(
+            "###XlPluginInstaller_Search",
+            Locs.Header_SearchPlaceholder,
+            ref this.searchText,
+            100);
+
+        ImGui.SameLine();
+        ImGui.SetCursorPosY(downShift);
+
+        ImGui.SetNextItemWidth(searchClearButtonWidth);
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.Times))
+        {
+            this.searchText = string.Empty;
+            searchTextChanged = true;
+        }
+
+        if (searchTextChanged)
+            this.UpdateCategoriesOnSearchChange();
+
+        // Changelog group
+        var isSortDisabled = this.categoryManager.CurrentGroupIdx == 3;
+        if (isSortDisabled)
+            ImGui.BeginDisabled();
+
+        ImGui.SameLine();
+        ImGui.SetCursorPosY(downShift);
+        ImGui.SetNextItemWidth(selectableWidth);
+        if (ImGui.BeginCombo(sortByText, this.filterText, ImGuiComboFlags.NoArrowButton))
+        {
+            foreach (var selectable in sortSelectables)
+            {
+                if (ImGui.Selectable(selectable.Localization))
                 {
-                    this.feedbackModalBody = string.Empty;
-                    this.feedbackModalContact = Service<DalamudConfiguration>.Get().LastFeedbackContactDetails;
-                    this.feedbackModalIncludeException = false;
-                    this.feedbackIsAnonymous = false;
-                }
-                else
-                {
-                    this.feedbackModalOnNextFrameDontClear = false;
+                    this.sortKind = selectable.SortKind;
+                    this.filterText = selectable.Localization;
+
+                    this.ResortPlugins();
                 }
             }
+
+            ImGui.EndCombo();
+        }
+
+        if (isSortDisabled)
+            ImGui.EndDisabled();
+    }
+
+    private void DrawFooter()
+    {
+        var configuration = Service<DalamudConfiguration>.Get();
+        var pluginManager = Service<PluginManager>.Get();
+
+        var windowSize = ImGui.GetWindowContentRegionMax();
+        var placeholderButtonSize = ImGuiHelpers.GetButtonSize("placeholder");
+
+        ImGui.Separator();
+
+        ImGui.SetCursorPosY(windowSize.Y - placeholderButtonSize.Y);
+
+        this.DrawUpdatePluginsButton();
+
+        ImGui.SameLine();
+        if (ImGui.Button(Locs.FooterButton_Settings))
+        {
+            Service<DalamudInterface>.Get().OpenSettings();
+        }
+
+        // If any dev plugins are installed, allow a shortcut for the /xldev menu item
+        if (this.hasDevPlugins)
+        {
+            ImGui.SameLine();
+            if (ImGui.Button(Locs.FooterButton_ScanDevPlugins))
+            {
+                pluginManager.ScanDevPlugins();
+            }
         }
 
-        private void DrawChangelogList(bool displayDalamud, bool displayPlugins)
+        var closeText = Locs.FooterButton_Close;
+        var closeButtonSize = ImGuiHelpers.GetButtonSize(closeText);
+
+        ImGui.SameLine(windowSize.X - closeButtonSize.X - 20);
+        if (ImGui.Button(closeText))
         {
-            if (this.pluginListInstalled.Count == 0)
+            this.IsOpen = false;
+            configuration.Save();
+        }
+    }
+
+    private void DrawUpdatePluginsButton()
+    {
+        var pluginManager = Service<PluginManager>.Get();
+        var notifications = Service<NotificationManager>.Get();
+
+        var ready = pluginManager.PluginsReady && pluginManager.ReposReady;
+
+        if (pluginManager.SafeMode)
+        {
+            ImGuiComponents.DisabledButton(Locs.FooterButton_UpdateSafeMode);
+        }
+        else if (!ready || this.updateStatus == OperationStatus.InProgress || this.installStatus == OperationStatus.InProgress)
+        {
+            ImGuiComponents.DisabledButton(Locs.FooterButton_UpdatePlugins);
+        }
+        else if (this.updateStatus == OperationStatus.Complete)
+        {
+            ImGui.Button(this.updatePluginCount > 0
+                             ? Locs.FooterButton_UpdateComplete(this.updatePluginCount)
+                             : Locs.FooterButton_NoUpdates);
+        }
+        else
+        {
+            if (ImGui.Button(Locs.FooterButton_UpdatePlugins))
             {
-                ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.TabBody_SearchNoInstalled);
-                return;
+                this.updateStatus = OperationStatus.InProgress;
+                this.loadingIndicatorKind = LoadingIndicatorKind.UpdatingAll;
+
+                Task.Run(() => pluginManager.UpdatePluginsAsync(true, false))
+                    .ContinueWith(task =>
+                    {
+                        this.updateStatus = OperationStatus.Complete;
+
+                        if (task.IsFaulted)
+                        {
+                            this.updatePluginCount = 0;
+                            this.updatedPlugins = null;
+                            this.DisplayErrorContinuation(task, Locs.ErrorModal_UpdaterFatal);
+                        }
+                        else
+                        {
+                            this.updatedPlugins = task.Result.Where(res => res.WasUpdated).ToList();
+                            this.updatePluginCount = this.updatedPlugins.Count;
+
+                            var errorPlugins = task.Result.Where(res => !res.WasUpdated).ToList();
+                            var errorPluginCount = errorPlugins.Count;
+
+                            if (errorPluginCount > 0)
+                            {
+                                var errorMessage = this.updatePluginCount > 0
+                                                       ? Locs.ErrorModal_UpdaterFailPartial(this.updatePluginCount, errorPluginCount)
+                                                       : Locs.ErrorModal_UpdaterFail(errorPluginCount);
+
+                                var hintInsert = errorPlugins
+                                                 .Aggregate(string.Empty, (current, pluginUpdateStatus) => $"{current}* {pluginUpdateStatus.InternalName}\n")
+                                                 .TrimEnd();
+                                errorMessage += Locs.ErrorModal_HintBlame(hintInsert);
+
+                                this.DisplayErrorContinuation(task, errorMessage);
+                            }
+
+                            if (this.updatePluginCount > 0)
+                            {
+                                Service<PluginManager>.Get().PrintUpdatedPlugins(this.updatedPlugins, Locs.PluginUpdateHeader_Chatbox);
+                                notifications.AddNotification(Locs.Notifications_UpdatesInstalled(this.updatePluginCount), Locs.Notifications_UpdatesInstalledTitle, NotificationType.Success);
+
+                                var installedGroupIdx = this.categoryManager.GroupList.TakeWhile(
+                                    x => x.GroupKind != PluginCategoryManager.GroupKind.Installed).Count();
+                                this.categoryManager.CurrentGroupIdx = installedGroupIdx;
+                            }
+                            else if (this.updatePluginCount == 0)
+                            {
+                                notifications.AddNotification(Locs.Notifications_NoUpdatesFound, Locs.Notifications_NoUpdatesFoundTitle, NotificationType.Info);
+                            }
+                        }
+                    });
+            }
+        }
+    }
+
+    private void DrawErrorModal()
+    {
+        var modalTitle = Locs.ErrorModal_Title;
+
+        if (ImGui.BeginPopupModal(modalTitle, ref this.errorModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
+        {
+            ImGui.Text(this.errorModalMessage);
+            ImGui.Spacing();
+
+            var buttonWidth = 120f;
+            ImGui.SetCursorPosX((ImGui.GetWindowWidth() - buttonWidth) / 2);
+
+            if (ImGui.Button(Locs.ErrorModalButton_Ok, new Vector2(buttonWidth, 40)))
+            {
+                ImGui.CloseCurrentPopup();
+                this.errorModalTaskCompletionSource?.SetResult();
             }
 
-            var pluginChangelogs = this.pluginListInstalled
+            ImGui.EndPopup();
+        }
+
+        if (this.errorModalOnNextFrame)
+        {
+            // NOTE(goat): ImGui cannot open a modal if no window is focused, at the moment.
+            // If people click out of the installer into the game while a plugin is installing, we won't be able to show a modal if we don't grab focus.
+            ImGui.SetWindowFocus(this.WindowName);
+
+            ImGui.OpenPopup(modalTitle);
+            this.errorModalOnNextFrame = false;
+            this.errorModalDrawing = true;
+        }
+    }
+
+    private void DrawUpdateModal()
+    {
+        var modalTitle = Locs.UpdateModal_Title;
+
+        if (this.updateModalPlugin == null)
+            return;
+
+        if (ImGui.BeginPopupModal(modalTitle, ref this.updateModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
+        {
+            ImGui.Text(Locs.UpdateModal_UpdateAvailable(this.updateModalPlugin.Name));
+            ImGui.Spacing();
+
+            var buttonWidth = 120f;
+            ImGui.SetCursorPosX((ImGui.GetWindowWidth() - ((buttonWidth * 2) - (ImGui.GetStyle().ItemSpacing.Y * 2))) / 2);
+
+            if (ImGui.Button(Locs.UpdateModal_Yes, new Vector2(buttonWidth, 40)))
+            {
+                ImGui.CloseCurrentPopup();
+                this.updateModalTaskCompletionSource?.SetResult(true);
+            }
+
+            ImGui.SameLine();
+
+            if (ImGui.Button(Locs.UpdateModal_No, new Vector2(buttonWidth, 40)))
+            {
+                ImGui.CloseCurrentPopup();
+                this.updateModalTaskCompletionSource?.SetResult(false);
+            }
+
+            ImGui.EndPopup();
+        }
+
+        if (this.updateModalOnNextFrame)
+        {
+            // NOTE(goat): ImGui cannot open a modal if no window is focused, at the moment.
+            // If people click out of the installer into the game while a plugin is installing, we won't be able to show a modal if we don't grab focus.
+            ImGui.SetWindowFocus(this.WindowName);
+
+            ImGui.OpenPopup(modalTitle);
+            this.updateModalOnNextFrame = false;
+            this.updateModalDrawing = true;
+        }
+    }
+
+    private void DrawFeedbackModal()
+    {
+        var modalTitle = Locs.FeedbackModal_Title;
+
+        if (ImGui.BeginPopupModal(modalTitle, ref this.feedbackModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
+        {
+            ImGui.TextUnformatted(Locs.FeedbackModal_Text(this.feedbackPlugin.Name));
+
+            if (this.feedbackPlugin?.FeedbackMessage != null)
+            {
+                ImGuiHelpers.SafeTextWrapped(this.feedbackPlugin.FeedbackMessage);
+            }
+
+            if (this.pluginListUpdatable.Any(
+                    up => up.InstalledPlugin.Manifest.InternalName == this.feedbackPlugin?.InternalName))
+            {
+                ImGui.TextColored(ImGuiColors.DalamudRed, Locs.FeedbackModal_HasUpdate);
+            }
+
+            ImGui.Spacing();
+
+            ImGui.InputTextMultiline("###FeedbackContent", ref this.feedbackModalBody, 1000, new Vector2(400, 200));
+
+            ImGui.Spacing();
+
+            if (ImGui.Checkbox(Locs.FeedbackModal_ContactAnonymous, ref this.feedbackIsAnonymous))
+            {
+                if (this.feedbackIsAnonymous)
+                    this.feedbackModalContact = string.Empty;
+            }
+
+            if (this.feedbackIsAnonymous)
+            {
+                ImGui.BeginDisabled();
+                ImGui.InputText(Locs.FeedbackModal_ContactInformation, ref this.feedbackModalContact, 0);
+                ImGui.EndDisabled();
+                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+                ImGui.Text(Locs.FeedbackModal_ContactAnonymousWarning);
+                ImGui.PopStyleColor();
+            }
+            else
+            {
+                ImGui.InputText(Locs.FeedbackModal_ContactInformation, ref this.feedbackModalContact, 100);
+
+                ImGui.SameLine();
+
+                if (ImGui.Button(Locs.FeedbackModal_ContactInformationDiscordButton))
+                {
+                    Process.Start(new ProcessStartInfo(Locs.FeedbackModal_ContactInformationDiscordUrl)
+                    {
+                        UseShellExecute = true,
+                    });
+                }
+
+                ImGui.Text(Locs.FeedbackModal_ContactInformationHelp);
+
+                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+                ImGui.Text(Locs.FeedbackModal_ContactInformationWarning);
+                ImGui.PopStyleColor();
+            }
+
+            ImGui.Spacing();
+
+            ImGui.Checkbox(Locs.FeedbackModal_IncludeLastError, ref this.feedbackModalIncludeException);
+            ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.FeedbackModal_IncludeLastErrorHint);
+
+            ImGui.Spacing();
+
+            ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.FeedbackModal_Hint);
+
+            var buttonWidth = 120f;
+            ImGui.SetCursorPosX((ImGui.GetWindowWidth() - buttonWidth) / 2);
+
+            if (ImGui.Button(Locs.ErrorModalButton_Ok, new Vector2(buttonWidth, 40)))
+            {
+                if (!this.feedbackIsAnonymous && string.IsNullOrWhiteSpace(this.feedbackModalContact))
+                {
+                    this.ShowErrorModal(Locs.FeedbackModal_ContactInformationRequired)
+                        .ContinueWith(_ =>
+                        {
+                            this.feedbackModalOnNextFrameDontClear = true;
+                            this.feedbackModalOnNextFrame = true;
+                        });
+                }
+                else
+                {
+                    if (this.feedbackPlugin != null)
+                    {
+                        Task.Run(async () => await BugBait.SendFeedback(
+                                                 this.feedbackPlugin,
+                                                 this.feedbackIsTesting,
+                                                 this.feedbackModalBody,
+                                                 this.feedbackModalContact,
+                                                 this.feedbackModalIncludeException))
+                            .ContinueWith(
+                                t =>
+                                {
+                                    var notif = Service<NotificationManager>.Get();
+                                    if (t.IsCanceled || t.IsFaulted)
+                                    {
+                                        notif.AddNotification(
+                                            Locs.FeedbackModal_NotificationError,
+                                            Locs.FeedbackModal_Title,
+                                            NotificationType.Error);
+                                    }
+                                    else
+                                    {
+                                        notif.AddNotification(
+                                            Locs.FeedbackModal_NotificationSuccess,
+                                            Locs.FeedbackModal_Title,
+                                            NotificationType.Success);
+                                    }
+                                });
+                    }
+                    else
+                    {
+                        Log.Error("FeedbackPlugin was null.");
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(this.feedbackModalContact))
+                    {
+                        Service<DalamudConfiguration>.Get().LastFeedbackContactDetails = this.feedbackModalContact;
+                    }
+
+                    ImGui.CloseCurrentPopup();
+                }
+            }
+
+            ImGui.EndPopup();
+        }
+
+        if (this.feedbackModalOnNextFrame)
+        {
+            ImGui.OpenPopup(modalTitle);
+            this.feedbackModalOnNextFrame = false;
+            this.feedbackModalDrawing = true;
+            if (!this.feedbackModalOnNextFrameDontClear)
+            {
+                this.feedbackModalBody = string.Empty;
+                this.feedbackModalContact = Service<DalamudConfiguration>.Get().LastFeedbackContactDetails;
+                this.feedbackModalIncludeException = false;
+                this.feedbackIsAnonymous = false;
+            }
+            else
+            {
+                this.feedbackModalOnNextFrameDontClear = false;
+            }
+        }
+    }
+
+    private void DrawChangelogList(bool displayDalamud, bool displayPlugins)
+    {
+        if (this.pluginListInstalled.Count == 0)
+        {
+            ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.TabBody_SearchNoInstalled);
+            return;
+        }
+
+        var pluginChangelogs = this.pluginListInstalled
                                    .Where(plugin => !this.IsManifestFiltered(plugin.Manifest)
                                                     && !plugin.Manifest.Changelog.IsNullOrEmpty())
                                    .Select(x =>
@@ -801,1685 +801,424 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
                                        return (IChangelogEntry)changelog;
                                    });
 
-            IEnumerable<IChangelogEntry> changelogs = null;
-            if (displayDalamud && displayPlugins && this.dalamudChangelogManager.Changelogs != null)
-            {
-                changelogs = pluginChangelogs
-                             .Concat(this.dalamudChangelogManager.Changelogs.Select(
-                                         x => new DalamudChangelogEntry(x)));
-            }
-            else if (displayDalamud && this.dalamudChangelogManager.Changelogs != null)
-            {
-                changelogs = this.dalamudChangelogManager.Changelogs.Select(
-                    x => new DalamudChangelogEntry(x));
-            }
-            else if (displayPlugins)
-            {
-                changelogs = pluginChangelogs;
-            }
-
-            var sortedChangelogs = changelogs?.OrderByDescending(x => x.Date).ToList();
-
-            if (sortedChangelogs == null || !sortedChangelogs.Any())
-            {
-                ImGui.TextColored(
-                    ImGuiColors.DalamudGrey2,
-                    this.pluginListInstalled.Any(plugin => !plugin.Manifest.Changelog.IsNullOrEmpty())
-                      ? Locs.TabBody_SearchNoMatching
-                      : Locs.TabBody_ChangelogNone);
-
-                return;
-            }
-
-            foreach (var logEntry in sortedChangelogs)
-            {
-                this.DrawChangelog(logEntry);
-            }
+        IEnumerable<IChangelogEntry> changelogs = null;
+        if (displayDalamud && displayPlugins && this.dalamudChangelogManager.Changelogs != null)
+        {
+            changelogs = pluginChangelogs
+                .Concat(this.dalamudChangelogManager.Changelogs.Select(
+                            x => new DalamudChangelogEntry(x)));
+        }
+        else if (displayDalamud && this.dalamudChangelogManager.Changelogs != null)
+        {
+            changelogs = this.dalamudChangelogManager.Changelogs.Select(
+                x => new DalamudChangelogEntry(x));
+        }
+        else if (displayPlugins)
+        {
+            changelogs = pluginChangelogs;
         }
 
-        private void DrawAvailablePluginList()
+        var sortedChangelogs = changelogs?.OrderByDescending(x => x.Date).ToList();
+
+        if (sortedChangelogs == null || !sortedChangelogs.Any())
         {
-            var pluginList = this.pluginListAvailable;
+            ImGui.TextColored(
+                ImGuiColors.DalamudGrey2,
+                this.pluginListInstalled.Any(plugin => !plugin.Manifest.Changelog.IsNullOrEmpty())
+                    ? Locs.TabBody_SearchNoMatching
+                    : Locs.TabBody_ChangelogNone);
 
-            if (pluginList.Count == 0)
-            {
-                ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.TabBody_SearchNoCompatible);
-                return;
-            }
-
-            var filteredManifests = pluginList
-                .Where(rm => !this.IsManifestFiltered(rm))
-                .ToList();
-
-            if (filteredManifests.Count == 0)
-            {
-                ImGui.TextColored(ImGuiColors.DalamudGrey2, Locs.TabBody_SearchNoMatching);
-                return;
-            }
-
-            // get list to show and reset category dirty flag
-            var categoryManifestsList = this.categoryManager.GetCurrentCategoryContent(filteredManifests);
-
-            var i = 0;
-            foreach (var manifest in categoryManifestsList)
-            {
-                if (manifest is not RemotePluginManifest remoteManifest)
-                    continue;
-                var (isInstalled, plugin) = this.IsManifestInstalled(remoteManifest);
-
-                ImGui.PushID($"{manifest.InternalName}{manifest.AssemblyVersion}");
-                if (isInstalled)
-                {
-                    this.DrawInstalledPlugin(plugin, i++, true);
-                }
-                else
-                {
-                    this.DrawAvailablePlugin(remoteManifest, i++);
-                }
-
-                ImGui.PopID();
-            }
+            return;
         }
 
-        private void DrawInstalledPluginList()
+        foreach (var logEntry in sortedChangelogs)
         {
-            var pluginList = this.pluginListInstalled;
+            this.DrawChangelog(logEntry);
+        }
+    }
 
-            if (pluginList.Count == 0)
-            {
-                ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.TabBody_SearchNoInstalled);
-                return;
-            }
+    private void DrawAvailablePluginList()
+    {
+        var pluginList = this.pluginListAvailable;
 
-            var filteredList = pluginList
-                .Where(plugin => !this.IsManifestFiltered(plugin.Manifest))
-                .ToList();
-
-            if (filteredList.Count == 0)
-            {
-                ImGui.TextColored(ImGuiColors.DalamudGrey2, Locs.TabBody_SearchNoMatching);
-                return;
-            }
-
-            var i = 0;
-            foreach (var plugin in filteredList)
-            {
-                this.DrawInstalledPlugin(plugin, i++);
-            }
+        if (pluginList.Count == 0)
+        {
+            ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.TabBody_SearchNoCompatible);
+            return;
         }
 
-        private void DrawInstalledDevPluginList()
+        var filteredManifests = pluginList
+                                .Where(rm => !this.IsManifestFiltered(rm))
+                                .ToList();
+
+        if (filteredManifests.Count == 0)
         {
-            var pluginList = this.pluginListInstalled
-                .Where(plugin => plugin.IsDev)
-                .ToList();
-
-            if (pluginList.Count == 0)
-            {
-                ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.TabBody_SearchNoInstalled);
-                return;
-            }
-
-            var filteredList = pluginList
-                .Where(plugin => !this.IsManifestFiltered(plugin.Manifest))
-                .ToList();
-
-            if (filteredList.Count == 0)
-            {
-                ImGui.TextColored(ImGuiColors.DalamudGrey2, Locs.TabBody_SearchNoMatching);
-                return;
-            }
-
-            var i = 0;
-            foreach (var plugin in filteredList)
-            {
-                this.DrawInstalledPlugin(plugin, i++);
-            }
+            ImGui.TextColored(ImGuiColors.DalamudGrey2, Locs.TabBody_SearchNoMatching);
+            return;
         }
 
-        private void DrawPluginCategories()
+        // get list to show and reset category dirty flag
+        var categoryManifestsList = this.categoryManager.GetCurrentCategoryContent(filteredManifests);
+
+        var i = 0;
+        foreach (var manifest in categoryManifestsList)
         {
-            var useContentHeight = -40f;   // button height + spacing
-            var useMenuWidth = 180f;       // works fine as static value, table can be resized by user
+            if (manifest is not RemotePluginManifest remoteManifest)
+                continue;
+            var (isInstalled, plugin) = this.IsManifestInstalled(remoteManifest);
 
-            var useContentWidth = ImGui.GetContentRegionAvail().X;
-
-            if (ImGui.BeginChild("InstallerCategories", new Vector2(useContentWidth, useContentHeight * ImGuiHelpers.GlobalScale)))
+            ImGui.PushID($"{manifest.InternalName}{manifest.AssemblyVersion}");
+            if (isInstalled)
             {
-                ImGui.PushStyleVar(ImGuiStyleVar.CellPadding, ImGuiHelpers.ScaledVector2(5, 0));
-                if (ImGui.BeginTable("##InstallerCategoriesCont", 2, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.Resizable | ImGuiTableFlags.BordersInnerV))
-                {
-                    ImGui.TableSetupColumn("##InstallerCategoriesSelector", ImGuiTableColumnFlags.WidthFixed, useMenuWidth * ImGuiHelpers.GlobalScale);
-                    ImGui.TableSetupColumn("##InstallerCategoriesBody", ImGuiTableColumnFlags.WidthStretch);
-                    ImGui.TableNextRow();
-
-                    ImGui.TableNextColumn();
-                    this.DrawPluginCategorySelectors();
-
-                    ImGui.TableNextColumn();
-                    if (ImGui.BeginChild("ScrollingPlugins", new Vector2(-1, 0), false, ImGuiWindowFlags.NoBackground))
-                    {
-                        this.DrawPluginCategoryContent();
-                    }
-
-                    ImGui.EndChild();
-                    ImGui.EndTable();
-                }
-
-                ImGui.PopStyleVar();
-                ImGui.EndChild();
-            }
-        }
-
-        private void DrawPluginCategorySelectors()
-        {
-            var colorSearchHighlight = Vector4.One;
-            unsafe
-            {
-                var colorPtr = ImGui.GetStyleColorVec4(ImGuiCol.NavHighlight);
-                if (colorPtr != null)
-                {
-                    colorSearchHighlight = *colorPtr;
-                }
-            }
-
-            for (var groupIdx = 0; groupIdx < this.categoryManager.GroupList.Length; groupIdx++)
-            {
-                var groupInfo = this.categoryManager.GroupList[groupIdx];
-                var canShowGroup = (groupInfo.GroupKind != PluginCategoryManager.GroupKind.DevTools) || this.hasDevPlugins;
-                if (!canShowGroup)
-                {
-                    continue;
-                }
-
-                ImGui.SetNextItemOpen(groupIdx == this.categoryManager.CurrentGroupIdx);
-                if (ImGui.CollapsingHeader(groupInfo.Name, groupIdx == this.categoryManager.CurrentGroupIdx ? ImGuiTreeNodeFlags.OpenOnDoubleClick : ImGuiTreeNodeFlags.None))
-                {
-                    if (this.categoryManager.CurrentGroupIdx != groupIdx)
-                    {
-                        this.categoryManager.CurrentGroupIdx = groupIdx;
-                    }
-
-                    ImGui.Indent();
-                    var categoryItemSize = new Vector2(ImGui.GetContentRegionAvail().X - (5 * ImGuiHelpers.GlobalScale), ImGui.GetTextLineHeight());
-                    for (var categoryIdx = 0; categoryIdx < groupInfo.Categories.Count; categoryIdx++)
-                    {
-                        var categoryInfo = Array.Find(this.categoryManager.CategoryList, x => x.CategoryId == groupInfo.Categories[categoryIdx]);
-
-                        var hasSearchHighlight = this.categoryManager.IsCategoryHighlighted(categoryInfo.CategoryId);
-                        if (hasSearchHighlight)
-                        {
-                            ImGui.PushStyleColor(ImGuiCol.Text, colorSearchHighlight);
-                        }
-
-                        if (ImGui.Selectable(categoryInfo.Name, this.categoryManager.CurrentCategoryIdx == categoryIdx, ImGuiSelectableFlags.None, categoryItemSize))
-                        {
-                            this.categoryManager.CurrentCategoryIdx = categoryIdx;
-                        }
-
-                        if (hasSearchHighlight)
-                        {
-                            ImGui.PopStyleColor();
-                        }
-                    }
-
-                    ImGui.Unindent();
-
-                    if (groupIdx != this.categoryManager.GroupList.Length - 1)
-                    {
-                        ImGuiHelpers.ScaledDummy(5);
-                    }
-                }
-            }
-        }
-
-        private void DrawPluginCategoryContent()
-        {
-            var ready = this.DrawPluginListLoading() && !this.AnyOperationInProgress;
-            if (!this.categoryManager.IsSelectionValid || !ready)
-            {
-                return;
-            }
-
-            var pm = Service<PluginManager>.Get();
-            if (pm.SafeMode)
-            {
-                ImGuiHelpers.ScaledDummy(10);
-
-                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudOrange);
-                ImGui.PushFont(InterfaceManager.IconFont);
-                ImGuiHelpers.CenteredText(FontAwesomeIcon.ExclamationTriangle.ToIconString());
-                ImGui.PopFont();
-                ImGui.PopStyleColor();
-
-                var lines = Locs.SafeModeDisclaimer.Split('\n');
-                foreach (var line in lines)
-                {
-                    ImGuiHelpers.CenteredText(line);
-                }
-
-                ImGuiHelpers.ScaledDummy(10);
-                ImGui.Separator();
-            }
-
-            ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, ImGuiHelpers.ScaledVector2(1, 3));
-
-            var groupInfo = this.categoryManager.GroupList[this.categoryManager.CurrentGroupIdx];
-            if (this.categoryManager.IsContentDirty)
-            {
-                // reset opened list of collapsibles when switching between categories
-                this.openPluginCollapsibles.Clear();
-
-                // do NOT reset dirty flag when Available group is selected, it will be handled by DrawAvailablePluginList()
-                if (groupInfo.GroupKind != PluginCategoryManager.GroupKind.Available)
-                {
-                    this.categoryManager.ResetContentDirty();
-                }
-            }
-
-            switch (groupInfo.GroupKind)
-            {
-                case PluginCategoryManager.GroupKind.DevTools:
-                    // this one is never sorted and remains in hardcoded order from group ctor
-                    switch (this.categoryManager.CurrentCategoryIdx)
-                    {
-                        case 0:
-                            this.DrawInstalledDevPluginList();
-                            break;
-
-                        case 1:
-                            this.DrawImageTester();
-                            break;
-
-                        default:
-                            // umm, there's nothing else, keep handled set and just skip drawing...
-                            break;
-                    }
-
-                    break;
-                case PluginCategoryManager.GroupKind.Installed:
-                    this.DrawInstalledPluginList();
-                    break;
-                case PluginCategoryManager.GroupKind.Changelog:
-                    switch (this.categoryManager.CurrentCategoryIdx)
-                    {
-                        case 0:
-                            this.DrawChangelogList(true, true);
-                            break;
-
-                        case 1:
-                            this.DrawChangelogList(true, false);
-                            break;
-
-                        case 2:
-                            this.DrawChangelogList(false, true);
-                            break;
-                    }
-
-                    break;
-                default:
-                    this.DrawAvailablePluginList();
-                    break;
-            }
-
-            ImGui.PopStyleVar();
-        }
-
-        private void DrawImageTester()
-        {
-            var sectionSize = ImGuiHelpers.GlobalScale * 66;
-            var startCursor = ImGui.GetCursorPos();
-
-            ImGui.PushStyleColor(ImGuiCol.Button, true ? new Vector4(0.5f, 0.5f, 0.5f, 0.1f) : Vector4.Zero);
-
-            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(0.5f, 0.5f, 0.5f, 0.2f));
-            ImGui.PushStyleColor(ImGuiCol.ButtonActive, new Vector4(0.5f, 0.5f, 0.5f, 0.35f));
-            ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 0);
-
-            ImGui.Button($"###pluginTesterCollapsibleBtn", new Vector2(ImGui.GetWindowWidth() - (ImGuiHelpers.GlobalScale * 35), sectionSize));
-
-            ImGui.PopStyleVar();
-
-            ImGui.PopStyleColor(3);
-
-            ImGui.SetCursorPos(startCursor);
-
-            var hasIcon = this.testerIcon != null;
-
-            var iconTex = this.imageCache.DefaultIcon;
-            if (hasIcon) iconTex = this.testerIcon;
-
-            var iconSize = ImGuiHelpers.ScaledVector2(64, 64);
-
-            var cursorBeforeImage = ImGui.GetCursorPos();
-            ImGui.Image(iconTex.ImGuiHandle, iconSize);
-            ImGui.SameLine();
-
-            if (this.testerError)
-            {
-                ImGui.SetCursorPos(cursorBeforeImage);
-                ImGui.Image(this.imageCache.TroubleIcon.ImGuiHandle, iconSize);
-                ImGui.SameLine();
-            }
-            else if (this.testerUpdateAvailable)
-            {
-                ImGui.SetCursorPos(cursorBeforeImage);
-                ImGui.Image(this.imageCache.UpdateIcon.ImGuiHandle, iconSize);
-                ImGui.SameLine();
-            }
-
-            ImGuiHelpers.ScaledDummy(5);
-            ImGui.SameLine();
-
-            var cursor = ImGui.GetCursorPos();
-            // Name
-            ImGui.Text("My Cool Plugin");
-
-            // Download count
-            var downloadCountText = Locs.PluginBody_AuthorWithDownloadCount("Plugin Enjoyer", 69420);
-
-            ImGui.SameLine();
-            ImGui.TextColored(ImGuiColors.DalamudGrey3, downloadCountText);
-
-            cursor.Y += ImGui.GetTextLineHeightWithSpacing();
-            ImGui.SetCursorPos(cursor);
-
-            // Description
-            ImGui.TextWrapped("This plugin does very many great things.");
-
-            startCursor.Y += sectionSize;
-            ImGui.SetCursorPos(startCursor);
-
-            ImGuiHelpers.ScaledDummy(5);
-
-            ImGui.Indent();
-
-            // Description
-            ImGui.TextWrapped("This is a description.\nIt has multiple lines.\nTruly descriptive.");
-
-            ImGuiHelpers.ScaledDummy(5);
-
-            // Controls
-            var disabled = this.updateStatus == OperationStatus.InProgress || this.installStatus == OperationStatus.InProgress;
-
-            var versionString = "1.0.0.0";
-
-            if (disabled)
-            {
-                ImGuiComponents.DisabledButton(Locs.PluginButton_InstallVersion(versionString));
+                this.DrawInstalledPlugin(plugin, i++, true);
             }
             else
             {
-                var buttonText = Locs.PluginButton_InstallVersion(versionString);
-                ImGui.Button($"{buttonText}##{buttonText}testing");
-            }
-
-            this.DrawVisitRepoUrlButton("https://google.com");
-
-            if (this.testerImages != null)
-            {
-                ImGuiHelpers.ScaledDummy(5);
-
-                const float thumbFactor = 2.7f;
-
-                var scrollBarSize = 15;
-                ImGui.PushStyleVar(ImGuiStyleVar.ScrollbarSize, scrollBarSize);
-                ImGui.PushStyleColor(ImGuiCol.ScrollbarBg, Vector4.Zero);
-
-                var width = ImGui.GetWindowWidth();
-
-                if (ImGui.BeginChild(
-                    "pluginTestingImageScrolling",
-                    new Vector2(width - (70 * ImGuiHelpers.GlobalScale), (PluginImageCache.PluginImageHeight / thumbFactor) + scrollBarSize),
-                    false,
-                    ImGuiWindowFlags.HorizontalScrollbar |
-                    ImGuiWindowFlags.NoScrollWithMouse |
-                    ImGuiWindowFlags.NoBackground))
-                {
-                    if (this.testerImages != null && this.testerImages is { Length: > 0 })
-                    {
-                        for (var i = 0; i < this.testerImages.Length; i++)
-                        {
-                            var popupId = $"pluginTestingImage{i}";
-                            var image = this.testerImages[i];
-                            if (image == null)
-                                continue;
-
-                            ImGui.PushStyleVar(ImGuiStyleVar.PopupBorderSize, 0);
-                            ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
-                            ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
-
-                            if (ImGui.BeginPopup(popupId))
-                            {
-                                if (ImGui.ImageButton(image.ImGuiHandle, new Vector2(image.Width, image.Height)))
-                                    ImGui.CloseCurrentPopup();
-
-                                ImGui.EndPopup();
-                            }
-
-                            ImGui.PopStyleVar(3);
-
-                            ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
-
-                            float xAct = image.Width;
-                            float yAct = image.Height;
-                            float xMax = PluginImageCache.PluginImageWidth;
-                            float yMax = PluginImageCache.PluginImageHeight;
-
-                            // scale image if undersized
-                            if (xAct < xMax && yAct < yMax)
-                            {
-                                var scale = Math.Min(xMax / xAct, yMax / yAct);
-                                xAct *= scale;
-                                yAct *= scale;
-                            }
-
-                            var size = ImGuiHelpers.ScaledVector2(xAct / thumbFactor, yAct / thumbFactor);
-                            if (ImGui.ImageButton(image.ImGuiHandle, size))
-                                ImGui.OpenPopup(popupId);
-
-                            ImGui.PopStyleVar();
-
-                            if (i < this.testerImages.Length - 1)
-                            {
-                                ImGui.SameLine();
-                                ImGuiHelpers.ScaledDummy(5);
-                                ImGui.SameLine();
-                            }
-                        }
-                    }
-                }
-
-                ImGui.EndChild();
-
-                ImGui.PopStyleVar();
-                ImGui.PopStyleColor();
-
-                ImGui.Unindent();
-            }
-
-            ImGuiHelpers.ScaledDummy(20);
-
-            static void CheckImageSize(TextureWrap? image, int maxWidth, int maxHeight, bool requireSquare)
-            {
-                if (image == null)
-                    return;
-                if (image.Width > maxWidth || image.Height > maxHeight)
-                    ImGui.TextColored(ImGuiColors.DalamudRed, $"Image is larger than the maximum allowed resolution ({image.Width}x{image.Height} > {maxWidth}x{maxHeight})");
-                if (requireSquare && image.Width != image.Height)
-                    ImGui.TextColored(ImGuiColors.DalamudRed, $"Image must be square! Current size: {image.Width}x{image.Height}");
-            }
-
-            ImGui.InputText("Icon Path", ref this.testerIconPath, 1000);
-            if (this.testerIcon != null)
-                CheckImageSize(this.testerIcon, PluginImageCache.PluginIconWidth, PluginImageCache.PluginIconHeight, true);
-            ImGui.InputText("Image 1 Path", ref this.testerImagePaths[0], 1000);
-            if (this.testerImages?.Length > 0)
-                CheckImageSize(this.testerImages[0], PluginImageCache.PluginImageWidth, PluginImageCache.PluginImageHeight, false);
-            ImGui.InputText("Image 2 Path", ref this.testerImagePaths[1], 1000);
-            if (this.testerImages?.Length > 1)
-                CheckImageSize(this.testerImages[1], PluginImageCache.PluginImageWidth, PluginImageCache.PluginImageHeight, false);
-            ImGui.InputText("Image 3 Path", ref this.testerImagePaths[2], 1000);
-            if (this.testerImages?.Length > 2)
-                CheckImageSize(this.testerImages[2], PluginImageCache.PluginImageWidth, PluginImageCache.PluginImageHeight, false);
-            ImGui.InputText("Image 4 Path", ref this.testerImagePaths[3], 1000);
-            if (this.testerImages?.Length > 3)
-                CheckImageSize(this.testerImages[3], PluginImageCache.PluginImageWidth, PluginImageCache.PluginImageHeight, false);
-            ImGui.InputText("Image 5 Path", ref this.testerImagePaths[4], 1000);
-            if (this.testerImages?.Length > 4)
-                CheckImageSize(this.testerImages[4], PluginImageCache.PluginImageWidth, PluginImageCache.PluginImageHeight, false);
-
-            var im = Service<InterfaceManager>.Get();
-            if (ImGui.Button("Load"))
-            {
-                try
-                {
-                    if (this.testerIcon != null)
-                    {
-                        this.testerIcon.Dispose();
-                        this.testerIcon = null;
-                    }
-
-                    if (!this.testerIconPath.IsNullOrEmpty())
-                    {
-                        this.testerIcon = im.LoadImage(this.testerIconPath);
-                    }
-
-                    this.testerImages = new TextureWrap[this.testerImagePaths.Length];
-
-                    for (var i = 0; i < this.testerImagePaths.Length; i++)
-                    {
-                        if (this.testerImagePaths[i].IsNullOrEmpty())
-                            continue;
-
-                        if (this.testerImages[i] != null)
-                        {
-                            this.testerImages[i].Dispose();
-                            this.testerImages[i] = null;
-                        }
-
-                        this.testerImages[i] = im.LoadImage(this.testerImagePaths[i]);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Log.Error(ex, "Could not load plugin images for testing.");
-                }
-            }
-
-            ImGui.Checkbox("Failed", ref this.testerError);
-            ImGui.Checkbox("Has Update", ref this.testerUpdateAvailable);
-        }
-
-        private bool DrawPluginListLoading()
-        {
-            var pluginManager = Service<PluginManager>.Get();
-
-            var ready = pluginManager.PluginsReady && pluginManager.ReposReady;
-
-            if (!ready)
-            {
-                ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.TabBody_LoadingPlugins);
-            }
-
-            var failedRepos = pluginManager.Repos
-                .Where(repo => repo.State == PluginRepositoryState.Fail)
-                .ToArray();
-
-            if (failedRepos.Length > 0)
-            {
-                var failText = Locs.TabBody_DownloadFailed;
-                var aggFailText = failedRepos
-                    .Select(repo => $"{failText} ({repo.PluginMasterUrl})")
-                    .Aggregate((s1, s2) => $"{s1}\n{s2}");
-
-                ImGui.TextColored(ImGuiColors.DalamudRed, aggFailText);
-            }
-
-            return ready;
-        }
-
-        private bool DrawPluginCollapsingHeader(string label, LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, bool trouble, bool updateAvailable, bool isNew, bool installableOutdated, Action drawContextMenuAction, int index)
-        {
-            ImGui.Separator();
-
-            var isOpen = this.openPluginCollapsibles.Contains(index);
-
-            var sectionSize = ImGuiHelpers.GlobalScale * 66;
-            var startCursor = ImGui.GetCursorPos();
-
-            ImGui.PushStyleColor(ImGuiCol.Button, isOpen ? new Vector4(0.5f, 0.5f, 0.5f, 0.1f) : Vector4.Zero);
-
-            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(0.5f, 0.5f, 0.5f, 0.2f));
-            ImGui.PushStyleColor(ImGuiCol.ButtonActive, new Vector4(0.5f, 0.5f, 0.5f, 0.35f));
-            ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 0);
-
-            if (ImGui.Button($"###plugin{index}CollapsibleBtn", new Vector2(ImGui.GetWindowWidth() - (ImGuiHelpers.GlobalScale * 35), sectionSize)))
-            {
-                if (isOpen)
-                {
-                    this.openPluginCollapsibles.Remove(index);
-                }
-                else
-                {
-                    this.openPluginCollapsibles.Add(index);
-                }
-
-                isOpen = !isOpen;
-            }
-
-            drawContextMenuAction?.Invoke();
-
-            ImGui.PopStyleVar();
-
-            ImGui.PopStyleColor(3);
-
-            ImGui.SetCursorPos(startCursor);
-
-            var pluginDisabled = plugin is { IsDisabled: true };
-
-            var iconSize = ImGuiHelpers.ScaledVector2(64, 64);
-            var cursorBeforeImage = ImGui.GetCursorPos();
-            var rectOffset = ImGui.GetWindowContentRegionMin() + ImGui.GetWindowPos();
-            if (ImGui.IsRectVisible(rectOffset + cursorBeforeImage, rectOffset + cursorBeforeImage + iconSize))
-            {
-                var iconTex = this.imageCache.DefaultIcon;
-                var hasIcon = this.imageCache.TryGetIcon(plugin, manifest, isThirdParty, out var cachedIconTex);
-                if (hasIcon && cachedIconTex != null)
-                {
-                    iconTex = cachedIconTex;
-                }
-
-                if (pluginDisabled || installableOutdated)
-                {
-                    ImGui.PushStyleVar(ImGuiStyleVar.Alpha, 0.4f);
-                }
-
-                ImGui.Image(iconTex.ImGuiHandle, iconSize);
-
-                if (pluginDisabled || installableOutdated)
-                {
-                    ImGui.PopStyleVar();
-                }
-
-                ImGui.SameLine();
-                ImGui.SetCursorPos(cursorBeforeImage);
-            }
-
-            var isLoaded = plugin is { IsLoaded: true };
-
-            if (updateAvailable)
-                ImGui.Image(this.imageCache.UpdateIcon.ImGuiHandle, iconSize);
-            else if (trouble && !pluginDisabled)
-                ImGui.Image(this.imageCache.TroubleIcon.ImGuiHandle, iconSize);
-            else if (installableOutdated)
-                ImGui.Image(this.imageCache.OutdatedInstallableIcon.ImGuiHandle, iconSize);
-            else if (pluginDisabled)
-                ImGui.Image(this.imageCache.DisabledIcon.ImGuiHandle, iconSize);
-            else if (isLoaded && isThirdParty)
-                ImGui.Image(this.imageCache.ThirdInstalledIcon.ImGuiHandle, iconSize);
-            else if (isThirdParty)
-                ImGui.Image(this.imageCache.ThirdIcon.ImGuiHandle, iconSize);
-            else if (isLoaded)
-                ImGui.Image(this.imageCache.InstalledIcon.ImGuiHandle, iconSize);
-            else
-                ImGui.Dummy(iconSize);
-            ImGui.SameLine();
-
-            ImGuiHelpers.ScaledDummy(5);
-            ImGui.SameLine();
-
-            var cursor = ImGui.GetCursorPos();
-
-            // Name
-            ImGui.TextUnformatted(label);
-
-            // Download count
-            var downloadCountText = manifest.DownloadCount > 0
-                ? Locs.PluginBody_AuthorWithDownloadCount(manifest.Author, manifest.DownloadCount)
-                : Locs.PluginBody_AuthorWithDownloadCountUnavailable(manifest.Author);
-
-            ImGui.SameLine();
-            ImGui.TextColored(ImGuiColors.DalamudGrey3, downloadCountText);
-
-            if (isNew)
-            {
-                ImGui.SameLine();
-                ImGui.TextColored(ImGuiColors.TankBlue, Locs.PluginTitleMod_New);
-            }
-
-            cursor.Y += ImGui.GetTextLineHeightWithSpacing();
-            ImGui.SetCursorPos(cursor);
-
-            // Outdated warning
-            if (plugin is { IsOutdated: true, IsBanned: false } || installableOutdated)
-            {
-                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
-                ImGui.TextWrapped(Locs.PluginBody_Outdated);
-                ImGui.PopStyleColor();
-            }
-            else if (plugin is { IsBanned: true })
-            {
-                // Banned warning
-                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
-                ImGuiHelpers.SafeTextWrapped(plugin.BanReason.IsNullOrEmpty()
-                                                 ? Locs.PluginBody_Banned
-                                                 : Locs.PluginBody_BannedReason(plugin.BanReason));
-
-                ImGui.PopStyleColor();
-            }
-            else if (plugin is { IsOrphaned: true })
-            {
-                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
-                ImGui.TextWrapped(Locs.PluginBody_Orphaned);
-                ImGui.PopStyleColor();
-            }
-            else if (plugin != null && !plugin.CheckPolicy())
-            {
-                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
-                ImGui.TextWrapped(Locs.PluginBody_Policy);
-                ImGui.PopStyleColor();
-            }
-            else if (plugin is { State: PluginState.LoadError or PluginState.DependencyResolutionFailed })
-            {
-                // Load failed warning
-                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
-                ImGui.TextWrapped(Locs.PluginBody_LoadFailed);
-                ImGui.PopStyleColor();
-            }
-
-            ImGui.SetCursorPosX(cursor.X);
-
-            // Description
-            if (plugin is null or { IsOutdated: false, IsBanned: false })
-            {
-                if (!string.IsNullOrWhiteSpace(manifest.Punchline))
-                {
-                    ImGuiHelpers.SafeTextWrapped(manifest.Punchline);
-                }
-                else if (!string.IsNullOrWhiteSpace(manifest.Description))
-                {
-                    const int punchlineLen = 200;
-                    var firstLine = manifest.Description.Split(new[] { '\r', '\n' })[0];
-
-                    ImGuiHelpers.SafeTextWrapped(firstLine.Length < punchlineLen
-                                                     ? firstLine
-                                                     : firstLine[..punchlineLen]);
-                }
-            }
-
-            startCursor.Y += sectionSize;
-            ImGui.SetCursorPos(startCursor);
-
-            return isOpen;
-        }
-
-        private void DrawChangelog(IChangelogEntry log)
-        {
-            ImGui.Separator();
-
-            var startCursor = ImGui.GetCursorPos();
-
-            var iconSize = ImGuiHelpers.ScaledVector2(64, 64);
-            var cursorBeforeImage = ImGui.GetCursorPos();
-            var rectOffset = ImGui.GetWindowContentRegionMin() + ImGui.GetWindowPos();
-            if (ImGui.IsRectVisible(rectOffset + cursorBeforeImage, rectOffset + cursorBeforeImage + iconSize))
-            {
-                TextureWrap icon;
-                if (log is PluginChangelogEntry pluginLog)
-                {
-                    icon = this.imageCache.DefaultIcon;
-                    var hasIcon = this.imageCache.TryGetIcon(pluginLog.Plugin, pluginLog.Plugin.Manifest, pluginLog.Plugin.Manifest.IsThirdParty, out var cachedIconTex);
-                    if (hasIcon && cachedIconTex != null)
-                    {
-                        icon = cachedIconTex;
-                    }
-                }
-                else
-                {
-                    icon = this.imageCache.CorePluginIcon;
-                }
-
-                ImGui.Image(icon.ImGuiHandle, iconSize);
-            }
-            else
-            {
-                ImGui.Dummy(iconSize);
-            }
-
-            ImGui.SameLine();
-
-            ImGuiHelpers.ScaledDummy(5);
-
-            ImGui.SameLine();
-            var cursor = ImGui.GetCursorPos();
-            ImGui.TextUnformatted(log.Title);
-
-            ImGui.SameLine();
-            ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{log.Version}");
-
-            cursor.Y += ImGui.GetTextLineHeightWithSpacing();
-            ImGui.SetCursorPos(cursor);
-
-            ImGuiHelpers.SafeTextWrapped(log.Text);
-
-            var endCursor = ImGui.GetCursorPos();
-
-            var sectionSize = Math.Max(
-                66 * ImGuiHelpers.GlobalScale, // min size due to icons
-                endCursor.Y - startCursor.Y);
-
-            startCursor.Y += sectionSize;
-            ImGui.SetCursorPos(startCursor);
-        }
-
-        private void DrawAvailablePlugin(RemotePluginManifest manifest, int index)
-        {
-            var configuration = Service<DalamudConfiguration>.Get();
-            var notifications = Service<NotificationManager>.Get();
-            var pluginManager = Service<PluginManager>.Get();
-
-            var useTesting = pluginManager.UseTesting(manifest);
-            var wasSeen = this.WasPluginSeen(manifest.InternalName);
-
-            var isOutdated = manifest.DalamudApiLevel < PluginManager.DalamudApiLevel;
-
-            // Check for valid versions
-            if ((useTesting && manifest.TestingAssemblyVersion == null) || manifest.AssemblyVersion == null)
-            {
-                // Without a valid version, quit
-                return;
-            }
-
-            // Name
-            var label = manifest.Name;
-
-            // Testing
-            if (useTesting || manifest.IsTestingExclusive)
-            {
-                label += Locs.PluginTitleMod_TestingVersion;
-            }
-
-            ImGui.PushID($"available{index}{manifest.InternalName}");
-
-            var isThirdParty = manifest.SourceRepo.IsThirdParty;
-            if (this.DrawPluginCollapsingHeader(label, null, manifest, isThirdParty, false, false, !wasSeen, isOutdated, () => this.DrawAvailablePluginContextMenu(manifest), index))
-            {
-                if (!wasSeen)
-                    configuration.SeenPluginInternalName.Add(manifest.InternalName);
-
-                ImGuiHelpers.ScaledDummy(5);
-
-                ImGui.Indent();
-
-                // Installable from
-                if (manifest.SourceRepo.IsThirdParty)
-                {
-                    var repoText = Locs.PluginBody_Plugin3rdPartyRepo(manifest.SourceRepo.PluginMasterUrl);
-                    ImGui.TextColored(ImGuiColors.DalamudGrey3, repoText);
-
-                    ImGuiHelpers.ScaledDummy(2);
-                }
-
-                // Description
-                if (!string.IsNullOrWhiteSpace(manifest.Description))
-                {
-                    ImGuiHelpers.SafeTextWrapped(manifest.Description);
-                }
-
-                ImGuiHelpers.ScaledDummy(5);
-
-                // Controls
-                var disabled = this.updateStatus == OperationStatus.InProgress || this.installStatus == OperationStatus.InProgress || isOutdated;
-
-                var versionString = useTesting
-                    ? $"{manifest.TestingAssemblyVersion}"
-                    : $"{manifest.AssemblyVersion}";
-
-                if (pluginManager.SafeMode)
-                {
-                    ImGuiComponents.DisabledButton(Locs.PluginButton_SafeMode);
-                }
-                else if (disabled)
-                {
-                    ImGuiComponents.DisabledButton(Locs.PluginButton_InstallVersion(versionString));
-                }
-                else
-                {
-                    var buttonText = Locs.PluginButton_InstallVersion(versionString);
-                    if (ImGui.Button($"{buttonText}##{buttonText}{index}"))
-                    {
-                        this.installStatus = OperationStatus.InProgress;
-                        this.loadingIndicatorKind = LoadingIndicatorKind.Installing;
-
-                        Task.Run(() => pluginManager.InstallPluginAsync(manifest, useTesting || manifest.IsTestingExclusive, PluginLoadReason.Installer))
-                            .ContinueWith(task =>
-                            {
-                                // There is no need to set as Complete for an individual plugin installation
-                                this.installStatus = OperationStatus.Idle;
-                                if (this.DisplayErrorContinuation(task, Locs.ErrorModal_InstallFail(manifest.Name)))
-                                {
-                                    if (task.Result.State == PluginState.Loaded)
-                                    {
-                                        notifications.AddNotification(Locs.Notifications_PluginInstalled(manifest.Name), Locs.Notifications_PluginInstalledTitle, NotificationType.Success);
-                                    }
-                                    else
-                                    {
-                                        notifications.AddNotification(Locs.Notifications_PluginNotInstalled(manifest.Name), Locs.Notifications_PluginNotInstalledTitle, NotificationType.Error);
-                                        this.ShowErrorModal(Locs.ErrorModal_InstallFail(manifest.Name));
-                                    }
-                                }
-                            });
-                    }
-                }
-
-                this.DrawVisitRepoUrlButton(manifest.RepoUrl);
-
-                if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback)
-                {
-                    this.DrawSendFeedbackButton(manifest, false);
-                }
-
-                ImGuiHelpers.ScaledDummy(5);
-
-                if (this.DrawPluginImages(null, manifest, isThirdParty, index))
-                    ImGuiHelpers.ScaledDummy(5);
-
-                ImGui.Unindent();
+                this.DrawAvailablePlugin(remoteManifest, i++);
             }
 
             ImGui.PopID();
         }
+    }
 
-        private void DrawAvailablePluginContextMenu(PluginManifest manifest)
+    private void DrawInstalledPluginList()
+    {
+        var pluginList = this.pluginListInstalled;
+
+        if (pluginList.Count == 0)
         {
-            var configuration = Service<DalamudConfiguration>.Get();
-            var pluginManager = Service<PluginManager>.Get();
-            var startInfo = Service<DalamudStartInfo>.Get();
-
-            if (ImGui.BeginPopupContextItem("ItemContextMenu"))
-            {
-                if (ImGui.Selectable(Locs.PluginContext_MarkAllSeen))
-                {
-                    configuration.SeenPluginInternalName.AddRange(this.pluginListAvailable.Select(x => x.InternalName));
-                    configuration.Save();
-                    pluginManager.RefilterPluginMasters();
-                }
-
-                if (ImGui.Selectable(Locs.PluginContext_HidePlugin))
-                {
-                    Log.Debug($"Adding {manifest.InternalName} to hidden plugins");
-                    configuration.HiddenPluginInternalName.Add(manifest.InternalName);
-                    configuration.Save();
-                    pluginManager.RefilterPluginMasters();
-                }
-
-                if (ImGui.Selectable(Locs.PluginContext_DeletePluginConfig))
-                {
-                    Log.Debug($"Deleting config for {manifest.InternalName}");
-
-                    this.installStatus = OperationStatus.InProgress;
-
-                    Task.Run(() =>
-                        {
-                            pluginManager.PluginConfigs.Delete(manifest.InternalName);
-
-                            var path = Path.Combine(startInfo.PluginDirectory, manifest.InternalName);
-                            if (Directory.Exists(path))
-                                Directory.Delete(path, true);
-                        })
-                        .ContinueWith(task =>
-                        {
-                            this.installStatus = OperationStatus.Idle;
-
-                            this.DisplayErrorContinuation(task, Locs.ErrorModal_DeleteConfigFail(manifest.InternalName));
-                        });
-                }
-
-                ImGui.EndPopup();
-            }
+            ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.TabBody_SearchNoInstalled);
+            return;
         }
 
-        private void DrawInstalledPlugin(LocalPlugin plugin, int index, bool showInstalled = false)
+        var filteredList = pluginList
+                           .Where(plugin => !this.IsManifestFiltered(plugin.Manifest))
+                           .ToList();
+
+        if (filteredList.Count == 0)
         {
-            var configuration = Service<DalamudConfiguration>.Get();
-            var commandManager = Service<CommandManager>.Get();
-
-            var testingOptIn =
-                configuration.PluginTestingOptIns?.FirstOrDefault(x => x.InternalName == plugin.Manifest.InternalName);
-            var trouble = false;
-
-            // Name
-            var label = plugin.Manifest.Name;
-
-            // Dev
-            if (plugin.IsDev)
-            {
-                label += Locs.PluginTitleMod_DevPlugin;
-            }
-
-            // Testing
-            if (plugin.Manifest.Testing)
-            {
-                label += Locs.PluginTitleMod_TestingVersion;
-            }
-
-            if (plugin.Manifest.IsAvailableForTesting && configuration.DoPluginTest && testingOptIn == null)
-            {
-                label += Locs.PluginTitleMod_TestingAvailable;
-            }
-
-            // Freshly installed
-            if (showInstalled)
-            {
-                label += Locs.PluginTitleMod_Installed;
-            }
-
-            // Disabled
-            if (plugin.IsDisabled || !plugin.CheckPolicy())
-            {
-                label += Locs.PluginTitleMod_Disabled;
-                trouble = true;
-            }
-
-            // Load error
-            if (plugin.State is PluginState.LoadError or PluginState.DependencyResolutionFailed && plugin.CheckPolicy()
-                && !plugin.IsOutdated && !plugin.IsBanned && !plugin.IsOrphaned)
-            {
-                label += Locs.PluginTitleMod_LoadError;
-                trouble = true;
-            }
-
-            // Unload error
-            if (plugin.State == PluginState.UnloadError)
-            {
-                label += Locs.PluginTitleMod_UnloadError;
-                trouble = true;
-            }
-
-            var availablePluginUpdate = this.pluginListUpdatable.FirstOrDefault(up => up.InstalledPlugin == plugin);
-            // Update available
-            if (availablePluginUpdate != default)
-            {
-                label += Locs.PluginTitleMod_HasUpdate;
-            }
-
-            // Freshly updated
-            var thisWasUpdated = false;
-            if (this.updatedPlugins != null && !plugin.IsDev)
-            {
-                var update = this.updatedPlugins.FirstOrDefault(update => update.InternalName == plugin.Manifest.InternalName);
-                if (update != default)
-                {
-                    if (update.WasUpdated)
-                    {
-                        thisWasUpdated = true;
-                        label += Locs.PluginTitleMod_Updated;
-                    }
-                    else
-                    {
-                        label += Locs.PluginTitleMod_UpdateFailed;
-                    }
-                }
-            }
-
-            // Outdated API level
-            if (plugin.IsOutdated)
-            {
-                label += Locs.PluginTitleMod_OutdatedError;
-                trouble = true;
-            }
-
-            // Banned
-            if (plugin.IsBanned)
-            {
-                label += Locs.PluginTitleMod_BannedError;
-                trouble = true;
-            }
-
-            // Orphaned
-            if (plugin.IsOrphaned)
-            {
-                label += Locs.PluginTitleMod_OrphanedError;
-                trouble = true;
-            }
-
-            // Scheduled for deletion
-            if (plugin.Manifest.ScheduledForDeletion)
-            {
-                label += Locs.PluginTitleMod_ScheduledForDeletion;
-            }
-
-            ImGui.PushID($"installed{index}{plugin.Manifest.InternalName}");
-            var hasChangelog = !plugin.Manifest.Changelog.IsNullOrEmpty();
-
-            if (this.DrawPluginCollapsingHeader(label, plugin, plugin.Manifest, plugin.Manifest.IsThirdParty, trouble, availablePluginUpdate != default, false, false, () => this.DrawInstalledPluginContextMenu(plugin, testingOptIn), index))
-            {
-                if (!this.WasPluginSeen(plugin.Manifest.InternalName))
-                    configuration.SeenPluginInternalName.Add(plugin.Manifest.InternalName);
-
-                var manifest = plugin.Manifest;
-
-                ImGui.Indent();
-
-                // Name
-                ImGui.TextUnformatted(manifest.Name);
-
-                // Download count
-                var downloadText = plugin.IsDev
-                    ? Locs.PluginBody_AuthorWithoutDownloadCount(manifest.Author)
-                    : manifest.DownloadCount > 0
-                    ? Locs.PluginBody_AuthorWithDownloadCount(manifest.Author, manifest.DownloadCount)
-                    : Locs.PluginBody_AuthorWithDownloadCountUnavailable(manifest.Author);
-
-                ImGui.SameLine();
-                ImGui.TextColored(ImGuiColors.DalamudGrey3, downloadText);
-
-                var isThirdParty = manifest.IsThirdParty;
-                var canFeedback = !isThirdParty && !plugin.IsDev && plugin.Manifest.DalamudApiLevel == PluginManager.DalamudApiLevel && plugin.Manifest.AcceptsFeedback && availablePluginUpdate == default;
-
-                // Installed from
-                if (plugin.IsDev)
-                {
-                    var fileText = Locs.PluginBody_DevPluginPath(plugin.DllFile.FullName);
-                    ImGui.TextColored(ImGuiColors.DalamudGrey3, fileText);
-                }
-                else if (isThirdParty)
-                {
-                    var repoText = Locs.PluginBody_Plugin3rdPartyRepo(manifest.InstalledFromUrl);
-                    ImGui.TextColored(ImGuiColors.DalamudGrey3, repoText);
-                }
-
-                // Description
-                if (!string.IsNullOrWhiteSpace(manifest.Description))
-                {
-                    ImGuiHelpers.SafeTextWrapped(manifest.Description);
-                }
-
-                // Available commands (if loaded)
-                if (plugin.IsLoaded)
-                {
-                    var commands = commandManager.Commands
-                        .Where(cInfo => cInfo.Value.ShowInHelp && cInfo.Value.LoaderAssemblyName == plugin.Manifest.InternalName)
-                        .ToArray();
-
-                    if (commands.Any())
-                    {
-                        ImGui.Dummy(ImGuiHelpers.ScaledVector2(10f, 10f));
-                        foreach (var command in commands)
-                        {
-                            ImGuiHelpers.SafeTextWrapped($"{command.Key} → {command.Value.HelpMessage}");
-                        }
-                    }
-                }
-
-                // Controls
-                this.DrawPluginControlButton(plugin, availablePluginUpdate);
-                this.DrawDevPluginButtons(plugin);
-                this.DrawDeletePluginButton(plugin);
-                this.DrawVisitRepoUrlButton(plugin.Manifest.RepoUrl);
-
-                if (canFeedback)
-                {
-                    this.DrawSendFeedbackButton(plugin.Manifest, plugin.IsTesting);
-                }
-
-                if (availablePluginUpdate != default)
-                    this.DrawUpdateSinglePluginButton(availablePluginUpdate);
-
-                ImGui.SameLine();
-                ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{plugin.Manifest.EffectiveVersion}");
-
-                ImGuiHelpers.ScaledDummy(5);
-
-                if (this.DrawPluginImages(plugin, manifest, isThirdParty, index))
-                    ImGuiHelpers.ScaledDummy(5);
-
-                ImGui.Unindent();
-
-                if (hasChangelog)
-                {
-                    if (ImGui.TreeNode(Locs.PluginBody_CurrentChangeLog(plugin.Manifest.EffectiveVersion)))
-                    {
-                        this.DrawInstalledPluginChangelog(plugin.Manifest);
-                        ImGui.TreePop();
-                    }
-                }
-
-                if (availablePluginUpdate != default && !availablePluginUpdate.UpdateManifest.Changelog.IsNullOrWhitespace())
-                {
-                    var availablePluginUpdateVersion = availablePluginUpdate.UseTesting ? availablePluginUpdate.UpdateManifest.TestingAssemblyVersion : availablePluginUpdate.UpdateManifest.AssemblyVersion;
-                    if (ImGui.TreeNode(Locs.PluginBody_UpdateChangeLog(availablePluginUpdateVersion)))
-                    {
-                        this.DrawInstalledPluginChangelog(availablePluginUpdate.UpdateManifest);
-                        ImGui.TreePop();
-                    }
-                }
-            }
-
-            if (thisWasUpdated && hasChangelog)
-            {
-                this.DrawInstalledPluginChangelog(plugin.Manifest);
-            }
-
-            ImGui.PopID();
+            ImGui.TextColored(ImGuiColors.DalamudGrey2, Locs.TabBody_SearchNoMatching);
+            return;
         }
 
-        private void DrawInstalledPluginChangelog(PluginManifest manifest)
+        var i = 0;
+        foreach (var plugin in filteredList)
         {
-            ImGuiHelpers.ScaledDummy(5);
+            this.DrawInstalledPlugin(plugin, i++);
+        }
+    }
 
-            ImGui.PushStyleColor(ImGuiCol.ChildBg, this.changelogBgColor);
-            ImGui.PushStyleColor(ImGuiCol.Text, this.changelogTextColor);
+    private void DrawInstalledDevPluginList()
+    {
+        var pluginList = this.pluginListInstalled
+                             .Where(plugin => plugin.IsDev)
+                             .ToList();
 
-            ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(7, 5));
+        if (pluginList.Count == 0)
+        {
+            ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.TabBody_SearchNoInstalled);
+            return;
+        }
 
-            if (ImGui.BeginChild("##changelog", new Vector2(-1, 100), true, ImGuiWindowFlags.NoNavFocus | ImGuiWindowFlags.NoNavInputs | ImGuiWindowFlags.AlwaysAutoResize))
+        var filteredList = pluginList
+                           .Where(plugin => !this.IsManifestFiltered(plugin.Manifest))
+                           .ToList();
+
+        if (filteredList.Count == 0)
+        {
+            ImGui.TextColored(ImGuiColors.DalamudGrey2, Locs.TabBody_SearchNoMatching);
+            return;
+        }
+
+        var i = 0;
+        foreach (var plugin in filteredList)
+        {
+            this.DrawInstalledPlugin(plugin, i++);
+        }
+    }
+
+    private void DrawPluginCategories()
+    {
+        var useContentHeight = -40f; // button height + spacing
+        var useMenuWidth = 180f;     // works fine as static value, table can be resized by user
+
+        var useContentWidth = ImGui.GetContentRegionAvail().X;
+
+        if (ImGui.BeginChild("InstallerCategories", new Vector2(useContentWidth, useContentHeight * ImGuiHelpers.GlobalScale)))
+        {
+            ImGui.PushStyleVar(ImGuiStyleVar.CellPadding, ImGuiHelpers.ScaledVector2(5, 0));
+            if (ImGui.BeginTable("##InstallerCategoriesCont", 2, ImGuiTableFlags.SizingFixedFit | ImGuiTableFlags.Resizable | ImGuiTableFlags.BordersInnerV))
             {
-                ImGui.Text("Changelog:");
-                ImGuiHelpers.ScaledDummy(2);
-                ImGuiHelpers.SafeTextWrapped(manifest.Changelog);
+                ImGui.TableSetupColumn("##InstallerCategoriesSelector", ImGuiTableColumnFlags.WidthFixed, useMenuWidth * ImGuiHelpers.GlobalScale);
+                ImGui.TableSetupColumn("##InstallerCategoriesBody", ImGuiTableColumnFlags.WidthStretch);
+                ImGui.TableNextRow();
+
+                ImGui.TableNextColumn();
+                this.DrawPluginCategorySelectors();
+
+                ImGui.TableNextColumn();
+                if (ImGui.BeginChild("ScrollingPlugins", new Vector2(-1, 0), false, ImGuiWindowFlags.NoBackground))
+                {
+                    this.DrawPluginCategoryContent();
+                }
+
+                ImGui.EndChild();
+                ImGui.EndTable();
             }
 
+            ImGui.PopStyleVar();
             ImGui.EndChild();
-
-            ImGui.PopStyleVar();
-            ImGui.PopStyleColor(2);
         }
+    }
 
-        private void DrawInstalledPluginContextMenu(LocalPlugin plugin, PluginTestingOptIn? optIn)
+    private void DrawPluginCategorySelectors()
+    {
+        var colorSearchHighlight = Vector4.One;
+        unsafe
         {
-            var pluginManager = Service<PluginManager>.Get();
-            var configuration = Service<DalamudConfiguration>.Get();
-
-            if (ImGui.BeginPopupContextItem("InstalledItemContextMenu"))
+            var colorPtr = ImGui.GetStyleColorVec4(ImGuiCol.NavHighlight);
+            if (colorPtr != null)
             {
-                var repoManifest = this.pluginListAvailable.FirstOrDefault(x => x.InternalName == plugin.Manifest.InternalName);
-                if (repoManifest?.IsTestingExclusive == true)
-                    ImGui.BeginDisabled();
-
-                if (ImGui.MenuItem(Locs.PluginContext_TestingOptIn, string.Empty, optIn != null))
-                {
-                    if (optIn != null)
-                    {
-                        configuration.PluginTestingOptIns!.Remove(optIn);
-                    }
-                    else
-                    {
-                        configuration.PluginTestingOptIns!.Add(new PluginTestingOptIn(plugin.Manifest.InternalName));
-                    }
-
-                    configuration.Save();
-                }
-
-                if (repoManifest?.IsTestingExclusive == true)
-                    ImGui.EndDisabled();
-
-                if (ImGui.MenuItem(Locs.PluginContext_DeletePluginConfigReload))
-                {
-                    Log.Debug($"Deleting config for {plugin.Manifest.InternalName}");
-
-                    this.installStatus = OperationStatus.InProgress;
-
-                    Task.Run(() => pluginManager.DeleteConfigurationAsync(plugin))
-                        .ContinueWith(task =>
-                        {
-                            this.installStatus = OperationStatus.Idle;
-
-                            this.DisplayErrorContinuation(task, Locs.ErrorModal_DeleteConfigFail(plugin.Name));
-                        });
-                }
-
-                ImGui.EndPopup();
+                colorSearchHighlight = *colorPtr;
             }
         }
 
-        private void DrawPluginControlButton(LocalPlugin plugin, AvailablePluginUpdate? availableUpdate)
+        for (var groupIdx = 0; groupIdx < this.categoryManager.GroupList.Length; groupIdx++)
         {
-            var notifications = Service<NotificationManager>.Get();
-            var pluginManager = Service<PluginManager>.Get();
-
-            // Disable everything if the updater is running or another plugin is operating
-            var disabled = this.updateStatus == OperationStatus.InProgress || this.installStatus == OperationStatus.InProgress;
-
-            // Disable everything if the plugin is outdated
-            disabled = disabled || (plugin.IsOutdated && !pluginManager.LoadAllApiLevels) || plugin.IsBanned;
-
-            // Disable everything if the plugin is orphaned
-            disabled = disabled || plugin.IsOrphaned;
-
-            // Disable everything if the plugin failed to load
-            disabled = disabled || plugin.State == PluginState.LoadError || plugin.State == PluginState.DependencyResolutionFailed;
-
-            // Disable everything if we're working
-            disabled = disabled || plugin.State == PluginState.Loading || plugin.State == PluginState.Unloading;
-
-            var toggleId = plugin.Manifest.InternalName;
-            var isLoadedAndUnloadable = plugin.State == PluginState.Loaded ||
-                              plugin.State == PluginState.DependencyResolutionFailed;
-
-            StyleModelV1.DalamudStandard.Push();
-
-            if (plugin.State == PluginState.UnloadError)
+            var groupInfo = this.categoryManager.GroupList[groupIdx];
+            var canShowGroup = (groupInfo.GroupKind != PluginCategoryManager.GroupKind.DevTools) || this.hasDevPlugins;
+            if (!canShowGroup)
             {
-                ImGuiComponents.DisabledButton(FontAwesomeIcon.Frown);
-
-                if (ImGui.IsItemHovered())
-                    ImGui.SetTooltip(Locs.PluginButtonToolTip_UnloadFailed);
+                continue;
             }
-            else if (disabled)
+
+            ImGui.SetNextItemOpen(groupIdx == this.categoryManager.CurrentGroupIdx);
+            if (ImGui.CollapsingHeader(groupInfo.Name, groupIdx == this.categoryManager.CurrentGroupIdx ? ImGuiTreeNodeFlags.OpenOnDoubleClick : ImGuiTreeNodeFlags.None))
             {
-                ImGuiComponents.DisabledToggleButton(toggleId, isLoadedAndUnloadable);
-            }
-            else
-            {
-                if (ImGuiComponents.ToggleButton(toggleId, ref isLoadedAndUnloadable))
+                if (this.categoryManager.CurrentGroupIdx != groupIdx)
                 {
-                    if (!isLoadedAndUnloadable)
+                    this.categoryManager.CurrentGroupIdx = groupIdx;
+                }
+
+                ImGui.Indent();
+                var categoryItemSize = new Vector2(ImGui.GetContentRegionAvail().X - (5 * ImGuiHelpers.GlobalScale), ImGui.GetTextLineHeight());
+                for (var categoryIdx = 0; categoryIdx < groupInfo.Categories.Count; categoryIdx++)
+                {
+                    var categoryInfo = Array.Find(this.categoryManager.CategoryList, x => x.CategoryId == groupInfo.Categories[categoryIdx]);
+
+                    var hasSearchHighlight = this.categoryManager.IsCategoryHighlighted(categoryInfo.CategoryId);
+                    if (hasSearchHighlight)
                     {
-                        this.enableDisableStatus = OperationStatus.InProgress;
-                        this.loadingIndicatorKind = LoadingIndicatorKind.DisablingSingle;
-
-                        Task.Run(() =>
-                        {
-                            if (plugin.IsDev)
-                            {
-                                plugin.ReloadManifest();
-                            }
-
-                            var unloadTask = Task.Run(() => plugin.UnloadAsync())
-                                                 .ContinueWith(this.DisplayErrorContinuation, Locs.ErrorModal_UnloadFail(plugin.Name));
-
-                            unloadTask.Wait();
-                            if (!unloadTask.Result)
-                            {
-                                this.enableDisableStatus = OperationStatus.Complete;
-                                return;
-                            }
-
-                            var disableTask = Task.Run(() => plugin.Disable())
-                                                  .ContinueWith(this.DisplayErrorContinuation, Locs.ErrorModal_DisableFail(plugin.Name));
-
-                            disableTask.Wait();
-                            this.enableDisableStatus = OperationStatus.Complete;
-
-                            if (!disableTask.Result)
-                                return;
-
-                            notifications.AddNotification(Locs.Notifications_PluginDisabled(plugin.Manifest.Name), Locs.Notifications_PluginDisabledTitle, NotificationType.Success);
-                        });
+                        ImGui.PushStyleColor(ImGuiCol.Text, colorSearchHighlight);
                     }
-                    else
+
+                    if (ImGui.Selectable(categoryInfo.Name, this.categoryManager.CurrentCategoryIdx == categoryIdx, ImGuiSelectableFlags.None, categoryItemSize))
                     {
-                        var enabler = new Task(() =>
-                        {
-                            this.enableDisableStatus = OperationStatus.InProgress;
-                            this.loadingIndicatorKind = LoadingIndicatorKind.EnablingSingle;
+                        this.categoryManager.CurrentCategoryIdx = categoryIdx;
+                    }
 
-                            if (plugin.IsDev)
-                            {
-                                plugin.ReloadManifest();
-                            }
-
-                            var enableTask = Task.Run(plugin.Enable)
-                                                 .ContinueWith(
-                                                     this.DisplayErrorContinuation,
-                                                     Locs.ErrorModal_EnableFail(plugin.Name));
-
-                            enableTask.Wait();
-                            if (!enableTask.Result)
-                            {
-                                this.enableDisableStatus = OperationStatus.Complete;
-                                return;
-                            }
-
-                            var loadTask = Task.Run(() => plugin.LoadAsync(PluginLoadReason.Installer))
-                                               .ContinueWith(
-                                                   this.DisplayErrorContinuation,
-                                                   Locs.ErrorModal_LoadFail(plugin.Name));
-
-                            loadTask.Wait();
-                            this.enableDisableStatus = OperationStatus.Complete;
-
-                            if (!loadTask.Result)
-                                return;
-
-                            notifications.AddNotification(
-                                Locs.Notifications_PluginEnabled(plugin.Manifest.Name),
-                                Locs.Notifications_PluginEnabledTitle,
-                                NotificationType.Success);
-                        });
-
-                        if (availableUpdate != default && !availableUpdate.InstalledPlugin.IsDev)
-                        {
-                            this.ShowUpdateModal(plugin).ContinueWith(async t =>
-                            {
-                                var shouldUpdate = t.Result;
-
-                                if (shouldUpdate)
-                                {
-                                    await this.UpdateSinglePlugin(availableUpdate);
-                                }
-                                else
-                                {
-                                    enabler.Start();
-                                }
-                            });
-                        }
-                        else
-                        {
-                            enabler.Start();
-                        }
+                    if (hasSearchHighlight)
+                    {
+                        ImGui.PopStyleColor();
                     }
                 }
+
+                ImGui.Unindent();
+
+                if (groupIdx != this.categoryManager.GroupList.Length - 1)
+                {
+                    ImGuiHelpers.ScaledDummy(5);
+                }
+            }
+        }
+    }
+
+    private void DrawPluginCategoryContent()
+    {
+        var ready = this.DrawPluginListLoading() && !this.AnyOperationInProgress;
+        if (!this.categoryManager.IsSelectionValid || !ready)
+        {
+            return;
+        }
+
+        var pm = Service<PluginManager>.Get();
+        if (pm.SafeMode)
+        {
+            ImGuiHelpers.ScaledDummy(10);
+
+            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudOrange);
+            ImGui.PushFont(InterfaceManager.IconFont);
+            ImGuiHelpers.CenteredText(FontAwesomeIcon.ExclamationTriangle.ToIconString());
+            ImGui.PopFont();
+            ImGui.PopStyleColor();
+
+            var lines = Locs.SafeModeDisclaimer.Split('\n');
+            foreach (var line in lines)
+            {
+                ImGuiHelpers.CenteredText(line);
             }
 
-            StyleModelV1.DalamudStandard.Pop();
+            ImGuiHelpers.ScaledDummy(10);
+            ImGui.Separator();
+        }
 
+        ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, ImGuiHelpers.ScaledVector2(1, 3));
+
+        var groupInfo = this.categoryManager.GroupList[this.categoryManager.CurrentGroupIdx];
+        if (this.categoryManager.IsContentDirty)
+        {
+            // reset opened list of collapsibles when switching between categories
+            this.openPluginCollapsibles.Clear();
+
+            // do NOT reset dirty flag when Available group is selected, it will be handled by DrawAvailablePluginList()
+            if (groupInfo.GroupKind != PluginCategoryManager.GroupKind.Available)
+            {
+                this.categoryManager.ResetContentDirty();
+            }
+        }
+
+        switch (groupInfo.GroupKind)
+        {
+            case PluginCategoryManager.GroupKind.DevTools:
+                // this one is never sorted and remains in hardcoded order from group ctor
+                switch (this.categoryManager.CurrentCategoryIdx)
+                {
+                    case 0:
+                        this.DrawInstalledDevPluginList();
+                        break;
+
+                    case 1:
+                        this.DrawImageTester();
+                        break;
+
+                    default:
+                        // umm, there's nothing else, keep handled set and just skip drawing...
+                        break;
+                }
+
+                break;
+            case PluginCategoryManager.GroupKind.Installed:
+                this.DrawInstalledPluginList();
+                break;
+            case PluginCategoryManager.GroupKind.Changelog:
+                switch (this.categoryManager.CurrentCategoryIdx)
+                {
+                    case 0:
+                        this.DrawChangelogList(true, true);
+                        break;
+
+                    case 1:
+                        this.DrawChangelogList(true, false);
+                        break;
+
+                    case 2:
+                        this.DrawChangelogList(false, true);
+                        break;
+                }
+
+                break;
+            default:
+                this.DrawAvailablePluginList();
+                break;
+        }
+
+        ImGui.PopStyleVar();
+    }
+
+    private void DrawImageTester()
+    {
+        var sectionSize = ImGuiHelpers.GlobalScale * 66;
+        var startCursor = ImGui.GetCursorPos();
+
+        ImGui.PushStyleColor(ImGuiCol.Button, true ? new Vector4(0.5f, 0.5f, 0.5f, 0.1f) : Vector4.Zero);
+
+        ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(0.5f, 0.5f, 0.5f, 0.2f));
+        ImGui.PushStyleColor(ImGuiCol.ButtonActive, new Vector4(0.5f, 0.5f, 0.5f, 0.35f));
+        ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 0);
+
+        ImGui.Button($"###pluginTesterCollapsibleBtn", new Vector2(ImGui.GetWindowWidth() - (ImGuiHelpers.GlobalScale * 35), sectionSize));
+
+        ImGui.PopStyleVar();
+
+        ImGui.PopStyleColor(3);
+
+        ImGui.SetCursorPos(startCursor);
+
+        var hasIcon = this.testerIcon != null;
+
+        var iconTex = this.imageCache.DefaultIcon;
+        if (hasIcon) iconTex = this.testerIcon;
+
+        var iconSize = ImGuiHelpers.ScaledVector2(64, 64);
+
+        var cursorBeforeImage = ImGui.GetCursorPos();
+        ImGui.Image(iconTex.ImGuiHandle, iconSize);
+        ImGui.SameLine();
+
+        if (this.testerError)
+        {
+            ImGui.SetCursorPos(cursorBeforeImage);
+            ImGui.Image(this.imageCache.TroubleIcon.ImGuiHandle, iconSize);
             ImGui.SameLine();
-            ImGuiHelpers.ScaledDummy(15, 0);
-
-            if (plugin.State == PluginState.Loaded)
-            {
-                // Only if the plugin isn't broken.
-                this.DrawOpenPluginSettingsButton(plugin);
-            }
         }
-
-        private async Task<bool> UpdateSinglePlugin(AvailablePluginUpdate update)
-        {
-            var pluginManager = Service<PluginManager>.Get();
-
-            this.installStatus = OperationStatus.InProgress;
-            this.loadingIndicatorKind = LoadingIndicatorKind.UpdatingSingle;
-
-            return await Task.Run(async () => await pluginManager.UpdateSinglePluginAsync(update, true, false))
-                .ContinueWith(task =>
-                {
-                    // There is no need to set as Complete for an individual plugin installation
-                    this.installStatus = OperationStatus.Idle;
-
-                    var errorMessage = Locs.ErrorModal_SingleUpdateFail(update.UpdateManifest.Name);
-                    return this.DisplayErrorContinuation(task, errorMessage);
-                });
-        }
-
-        private void DrawUpdateSinglePluginButton(AvailablePluginUpdate update)
+        else if (this.testerUpdateAvailable)
         {
+            ImGui.SetCursorPos(cursorBeforeImage);
+            ImGui.Image(this.imageCache.UpdateIcon.ImGuiHandle, iconSize);
             ImGui.SameLine();
-
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.Download))
-            {
-                Task.Run(() => this.UpdateSinglePlugin(update));
-            }
-
-            if (ImGui.IsItemHovered())
-            {
-                var updateVersion = update.UseTesting
-                    ? update.UpdateManifest.TestingAssemblyVersion
-                    : update.UpdateManifest.AssemblyVersion;
-                ImGui.SetTooltip(Locs.PluginButtonToolTip_UpdateSingle(updateVersion.ToString()));
-            }
         }
 
-        private void DrawOpenPluginSettingsButton(LocalPlugin plugin)
-        {
-            if (plugin.DalamudInterface?.UiBuilder?.HasConfigUi ?? false)
-            {
-                ImGui.SameLine();
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.Cog))
-                {
-                    try
-                    {
-                        plugin.DalamudInterface.UiBuilder.OpenConfig();
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error(ex, $"Error during OpenConfigUi: {plugin.Name}");
-                    }
-                }
+        ImGuiHelpers.ScaledDummy(5);
+        ImGui.SameLine();
 
-                if (ImGui.IsItemHovered())
-                {
-                    ImGui.SetTooltip(Locs.PluginButtonToolTip_OpenConfiguration);
-                }
-            }
+        var cursor = ImGui.GetCursorPos();
+        // Name
+        ImGui.Text("My Cool Plugin");
+
+        // Download count
+        var downloadCountText = Locs.PluginBody_AuthorWithDownloadCount("Plugin Enjoyer", 69420);
+
+        ImGui.SameLine();
+        ImGui.TextColored(ImGuiColors.DalamudGrey3, downloadCountText);
+
+        cursor.Y += ImGui.GetTextLineHeightWithSpacing();
+        ImGui.SetCursorPos(cursor);
+
+        // Description
+        ImGui.TextWrapped("This plugin does very many great things.");
+
+        startCursor.Y += sectionSize;
+        ImGui.SetCursorPos(startCursor);
+
+        ImGuiHelpers.ScaledDummy(5);
+
+        ImGui.Indent();
+
+        // Description
+        ImGui.TextWrapped("This is a description.\nIt has multiple lines.\nTruly descriptive.");
+
+        ImGuiHelpers.ScaledDummy(5);
+
+        // Controls
+        var disabled = this.updateStatus == OperationStatus.InProgress || this.installStatus == OperationStatus.InProgress;
+
+        var versionString = "1.0.0.0";
+
+        if (disabled)
+        {
+            ImGuiComponents.DisabledButton(Locs.PluginButton_InstallVersion(versionString));
+        }
+        else
+        {
+            var buttonText = Locs.PluginButton_InstallVersion(versionString);
+            ImGui.Button($"{buttonText}##{buttonText}testing");
         }
 
-        private void DrawSendFeedbackButton(PluginManifest manifest, bool isTesting)
+        this.DrawVisitRepoUrlButton("https://google.com");
+
+        if (this.testerImages != null)
         {
-            ImGui.SameLine();
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.Comment))
-            {
-                this.feedbackPlugin = manifest;
-                this.feedbackModalOnNextFrame = true;
-                this.feedbackIsTesting = isTesting;
-            }
-
-            if (ImGui.IsItemHovered())
-            {
-                ImGui.SetTooltip(Locs.FeedbackModal_Title);
-            }
-        }
-
-        private void DrawDevPluginButtons(LocalPlugin localPlugin)
-        {
-            ImGui.SameLine();
-
-            var configuration = Service<DalamudConfiguration>.Get();
-
-            if (localPlugin is LocalDevPlugin plugin)
-            {
-                // https://colorswall.com/palette/2868/
-                var greenColor = new Vector4(0x5C, 0xB8, 0x5C, 0xFF) / 0xFF;
-                var redColor = new Vector4(0xD9, 0x53, 0x4F, 0xFF) / 0xFF;
-
-                // Load on boot
-                ImGui.PushStyleColor(ImGuiCol.Button, plugin.StartOnBoot ? greenColor : redColor);
-                ImGui.PushStyleColor(ImGuiCol.ButtonHovered, plugin.StartOnBoot ? greenColor : redColor);
-
-                ImGui.SameLine();
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.PowerOff))
-                {
-                    plugin.StartOnBoot ^= true;
-                    configuration.Save();
-                }
-
-                ImGui.PopStyleColor(2);
-
-                if (ImGui.IsItemHovered())
-                {
-                    ImGui.SetTooltip(Locs.PluginButtonToolTip_StartOnBoot);
-                }
-
-                // Automatic reload
-                ImGui.PushStyleColor(ImGuiCol.Button, plugin.AutomaticReload ? greenColor : redColor);
-                ImGui.PushStyleColor(ImGuiCol.ButtonHovered, plugin.AutomaticReload ? greenColor : redColor);
-
-                ImGui.SameLine();
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.SyncAlt))
-                {
-                    plugin.AutomaticReload ^= true;
-                    configuration.Save();
-                }
-
-                ImGui.PopStyleColor(2);
-
-                if (ImGui.IsItemHovered())
-                {
-                    ImGui.SetTooltip(Locs.PluginButtonToolTip_AutomaticReloading);
-                }
-            }
-        }
-
-        private void DrawDeletePluginButton(LocalPlugin plugin)
-        {
-            /*var unloaded = plugin.State == PluginState.Unloaded || plugin.State == PluginState.LoadError;
-
-            // When policy check fails, the plugin is never loaded
-            var showButton = unloaded && (plugin.IsDev || plugin.IsOutdated || plugin.IsBanned || plugin.IsOrphaned || !plugin.CheckPolicy());
-
-            if (!showButton)
-                return;*/
-
-            var pluginManager = Service<PluginManager>.Get();
-
-            var devNotDeletable = plugin.IsDev && plugin.State != PluginState.Unloaded && plugin.State != PluginState.DependencyResolutionFailed;
-
-            ImGui.SameLine();
-            if (plugin.State == PluginState.Loaded || devNotDeletable)
-            {
-                ImGui.PushFont(InterfaceManager.IconFont);
-                ImGuiComponents.DisabledButton(FontAwesomeIcon.TrashAlt.ToIconString());
-                ImGui.PopFont();
-
-                if (ImGui.IsItemHovered())
-                {
-                    ImGui.SetTooltip(plugin.State == PluginState.Loaded
-                                         ? Locs.PluginButtonToolTip_DeletePluginLoaded
-                                         : Locs.PluginButtonToolTip_DeletePluginRestricted);
-                }
-            }
-            else
-            {
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.TrashAlt))
-                {
-                    try
-                    {
-                        if (plugin.IsDev)
-                        {
-                            plugin.DllFile.Delete();
-                        }
-                        else
-                        {
-                            plugin.ScheduleDeletion(!plugin.Manifest.ScheduledForDeletion);
-                        }
-
-                        if (plugin.State is PluginState.Unloaded or PluginState.DependencyResolutionFailed)
-                        {
-                            pluginManager.RemovePlugin(plugin);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error(ex, $"Plugin installer threw an error during removal of {plugin.Name}");
-
-                        this.ShowErrorModal(Locs.ErrorModal_DeleteFail(plugin.Name));
-                    }
-                }
-
-                if (ImGui.IsItemHovered())
-                {
-                    string tooltipMessage;
-                    if (plugin.Manifest.ScheduledForDeletion)
-                    {
-                        tooltipMessage = Locs.PluginButtonToolTip_DeletePluginScheduledCancel;
-                    }
-                    else if (plugin.State is PluginState.Unloaded or PluginState.DependencyResolutionFailed)
-                    {
-                        tooltipMessage = Locs.PluginButtonToolTip_DeletePlugin;
-                    }
-                    else
-                    {
-                        tooltipMessage = Locs.PluginButtonToolTip_DeletePluginScheduled;
-                    }
-
-                    ImGui.SetTooltip(tooltipMessage);
-                }
-            }
-        }
-
-        private void DrawVisitRepoUrlButton(string? repoUrl)
-        {
-            if (!string.IsNullOrEmpty(repoUrl) && repoUrl.StartsWith("https://"))
-            {
-                ImGui.SameLine();
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.Globe))
-                {
-                    try
-                    {
-                        _ = Process.Start(new ProcessStartInfo()
-                        {
-                            FileName = repoUrl,
-                            UseShellExecute = true,
-                        });
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error(ex, $"Could not open repoUrl: {repoUrl}");
-                    }
-                }
-
-                if (ImGui.IsItemHovered())
-                    ImGui.SetTooltip(Locs.PluginButtonToolTip_VisitPluginUrl);
-            }
-        }
-
-        private bool DrawPluginImages(LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, int index)
-        {
-            var hasImages = this.imageCache.TryGetImages(plugin, manifest, isThirdParty, out var imageTextures);
-            if (!hasImages || imageTextures.All(x => x == null))
-                return false;
+            ImGuiHelpers.ScaledDummy(5);
 
             const float thumbFactor = 2.7f;
 
@@ -2489,55 +1228,64 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
 
             var width = ImGui.GetWindowWidth();
 
-            if (ImGui.BeginChild($"plugin{index}ImageScrolling", new Vector2(width - (70 * ImGuiHelpers.GlobalScale), (PluginImageCache.PluginImageHeight / thumbFactor) + scrollBarSize), false, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoScrollWithMouse | ImGuiWindowFlags.NoBackground))
+            if (ImGui.BeginChild(
+                    "pluginTestingImageScrolling",
+                    new Vector2(width - (70 * ImGuiHelpers.GlobalScale), (PluginImageCache.PluginImageHeight / thumbFactor) + scrollBarSize),
+                    false,
+                    ImGuiWindowFlags.HorizontalScrollbar |
+                    ImGuiWindowFlags.NoScrollWithMouse |
+                    ImGuiWindowFlags.NoBackground))
             {
-                for (var i = 0; i < imageTextures.Length; i++)
+                if (this.testerImages != null && this.testerImages is { Length: > 0 })
                 {
-                    var image = imageTextures[i];
-                    if (image == null)
-                        continue;
-
-                    ImGui.PushStyleVar(ImGuiStyleVar.PopupBorderSize, 0);
-                    ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
-                    ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
-
-                    var popupId = $"plugin{index}image{i}";
-                    if (ImGui.BeginPopup(popupId))
+                    for (var i = 0; i < this.testerImages.Length; i++)
                     {
-                        if (ImGui.ImageButton(image.ImGuiHandle, new Vector2(image.Width, image.Height)))
-                            ImGui.CloseCurrentPopup();
+                        var popupId = $"pluginTestingImage{i}";
+                        var image = this.testerImages[i];
+                        if (image == null)
+                            continue;
 
-                        ImGui.EndPopup();
-                    }
+                        ImGui.PushStyleVar(ImGuiStyleVar.PopupBorderSize, 0);
+                        ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
+                        ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
 
-                    ImGui.PopStyleVar(3);
+                        if (ImGui.BeginPopup(popupId))
+                        {
+                            if (ImGui.ImageButton(image.ImGuiHandle, new Vector2(image.Width, image.Height)))
+                                ImGui.CloseCurrentPopup();
 
-                    ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
+                            ImGui.EndPopup();
+                        }
 
-                    float xAct = image.Width;
-                    float yAct = image.Height;
-                    float xMax = PluginImageCache.PluginImageWidth;
-                    float yMax = PluginImageCache.PluginImageHeight;
+                        ImGui.PopStyleVar(3);
 
-                    // scale image if undersized
-                    if (xAct < xMax && yAct < yMax)
-                    {
-                        var scale = Math.Min(xMax / xAct, yMax / yAct);
-                        xAct *= scale;
-                        yAct *= scale;
-                    }
+                        ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
 
-                    var size = ImGuiHelpers.ScaledVector2(xAct / thumbFactor, yAct / thumbFactor);
-                    if (ImGui.ImageButton(image.ImGuiHandle, size))
-                        ImGui.OpenPopup(popupId);
+                        float xAct = image.Width;
+                        float yAct = image.Height;
+                        float xMax = PluginImageCache.PluginImageWidth;
+                        float yMax = PluginImageCache.PluginImageHeight;
 
-                    ImGui.PopStyleVar();
+                        // scale image if undersized
+                        if (xAct < xMax && yAct < yMax)
+                        {
+                            var scale = Math.Min(xMax / xAct, yMax / yAct);
+                            xAct *= scale;
+                            yAct *= scale;
+                        }
 
-                    if (i < imageTextures.Length - 1)
-                    {
-                        ImGui.SameLine();
-                        ImGuiHelpers.ScaledDummy(5);
-                        ImGui.SameLine();
+                        var size = ImGuiHelpers.ScaledVector2(xAct / thumbFactor, yAct / thumbFactor);
+                        if (ImGui.ImageButton(image.ImGuiHandle, size))
+                            ImGui.OpenPopup(popupId);
+
+                        ImGui.PopStyleVar();
+
+                        if (i < this.testerImages.Length - 1)
+                        {
+                            ImGui.SameLine();
+                            ImGuiHelpers.ScaledDummy(5);
+                            ImGui.SameLine();
+                        }
                     }
                 }
             }
@@ -2547,504 +1295,1755 @@ namespace Dalamud.Interface.Internal.Windows.PluginInstaller
             ImGui.PopStyleVar();
             ImGui.PopStyleColor();
 
-            return true;
+            ImGui.Unindent();
         }
 
-        private bool IsManifestFiltered(PluginManifest manifest)
+        ImGuiHelpers.ScaledDummy(20);
+
+        static void CheckImageSize(TextureWrap? image, int maxWidth, int maxHeight, bool requireSquare)
         {
-            var searchString = this.searchText.ToLowerInvariant();
-            var hasSearchString = !string.IsNullOrWhiteSpace(searchString);
-            var oldApi = manifest.DalamudApiLevel < PluginManager.DalamudApiLevel;
-            var installed = this.IsManifestInstalled(manifest).IsInstalled;
-
-            if (oldApi && !hasSearchString && !installed)
-                return true;
-
-            return hasSearchString && !(
-                manifest.Name.ToLowerInvariant().Contains(searchString) ||
-                manifest.InternalName.ToLowerInvariant().Contains(searchString) ||
-                (!manifest.Author.IsNullOrEmpty() && manifest.Author.Equals(this.searchText, StringComparison.InvariantCultureIgnoreCase)) ||
-                (!manifest.Punchline.IsNullOrEmpty() && manifest.Punchline.ToLowerInvariant().Contains(searchString)) ||
-                (manifest.Tags != null && manifest.Tags.Contains(searchString, StringComparer.InvariantCultureIgnoreCase)));
+            if (image == null)
+                return;
+            if (image.Width > maxWidth || image.Height > maxHeight)
+                ImGui.TextColored(ImGuiColors.DalamudRed, $"Image is larger than the maximum allowed resolution ({image.Width}x{image.Height} > {maxWidth}x{maxHeight})");
+            if (requireSquare && image.Width != image.Height)
+                ImGui.TextColored(ImGuiColors.DalamudRed, $"Image must be square! Current size: {image.Width}x{image.Height}");
         }
 
-        private (bool IsInstalled, LocalPlugin Plugin) IsManifestInstalled(PluginManifest? manifest)
+        ImGui.InputText("Icon Path", ref this.testerIconPath, 1000);
+        if (this.testerIcon != null)
+            CheckImageSize(this.testerIcon, PluginImageCache.PluginIconWidth, PluginImageCache.PluginIconHeight, true);
+        ImGui.InputText("Image 1 Path", ref this.testerImagePaths[0], 1000);
+        if (this.testerImages?.Length > 0)
+            CheckImageSize(this.testerImages[0], PluginImageCache.PluginImageWidth, PluginImageCache.PluginImageHeight, false);
+        ImGui.InputText("Image 2 Path", ref this.testerImagePaths[1], 1000);
+        if (this.testerImages?.Length > 1)
+            CheckImageSize(this.testerImages[1], PluginImageCache.PluginImageWidth, PluginImageCache.PluginImageHeight, false);
+        ImGui.InputText("Image 3 Path", ref this.testerImagePaths[2], 1000);
+        if (this.testerImages?.Length > 2)
+            CheckImageSize(this.testerImages[2], PluginImageCache.PluginImageWidth, PluginImageCache.PluginImageHeight, false);
+        ImGui.InputText("Image 4 Path", ref this.testerImagePaths[3], 1000);
+        if (this.testerImages?.Length > 3)
+            CheckImageSize(this.testerImages[3], PluginImageCache.PluginImageWidth, PluginImageCache.PluginImageHeight, false);
+        ImGui.InputText("Image 5 Path", ref this.testerImagePaths[4], 1000);
+        if (this.testerImages?.Length > 4)
+            CheckImageSize(this.testerImages[4], PluginImageCache.PluginImageWidth, PluginImageCache.PluginImageHeight, false);
+
+        var im = Service<InterfaceManager>.Get();
+        if (ImGui.Button("Load"))
         {
-            if (manifest == null) return (false, default);
-
-            var plugin = this.pluginListInstalled.FirstOrDefault(plugin => plugin.Manifest.InternalName == manifest.InternalName);
-            var isInstalled = plugin != default;
-
-            return (isInstalled, plugin);
-        }
-
-        private void OnAvailablePluginsChanged()
-        {
-            var pluginManager = Service<PluginManager>.Get();
-
-            // By removing installed plugins only when the available plugin list changes (basically when the window is
-            // opened), plugins that have been newly installed remain in the available plugin list as installed.
-            this.pluginListAvailable = pluginManager.AvailablePlugins.ToList();
-            this.pluginListUpdatable = pluginManager.UpdatablePlugins.ToList();
-            this.ResortPlugins();
-
-            this.UpdateCategoriesOnPluginsChange();
-        }
-
-        private void OnInstalledPluginsChanged()
-        {
-            var pluginManager = Service<PluginManager>.Get();
-
-            this.pluginListInstalled = pluginManager.InstalledPlugins.ToList();
-            this.pluginListUpdatable = pluginManager.UpdatablePlugins.ToList();
-            this.hasDevPlugins = this.pluginListInstalled.Any(plugin => plugin.IsDev);
-            this.ResortPlugins();
-
-            this.UpdateCategoriesOnPluginsChange();
-        }
-
-        private void ResortPlugins()
-        {
-            switch (this.sortKind)
+            try
             {
-                case PluginSortKind.Alphabetical:
-                    this.pluginListAvailable.Sort((p1, p2) => p1.Name.CompareTo(p2.Name));
-                    this.pluginListInstalled.Sort((p1, p2) => p1.Manifest.Name.CompareTo(p2.Manifest.Name));
-                    break;
-                case PluginSortKind.DownloadCount:
-                    this.pluginListAvailable.Sort((p1, p2) => p2.DownloadCount.CompareTo(p1.DownloadCount));
-                    this.pluginListInstalled.Sort((p1, p2) => p2.Manifest.DownloadCount.CompareTo(p1.Manifest.DownloadCount));
-                    break;
-                case PluginSortKind.LastUpdate:
-                    this.pluginListAvailable.Sort((p1, p2) => p2.LastUpdate.CompareTo(p1.LastUpdate));
-                    this.pluginListInstalled.Sort((p1, p2) => p2.Manifest.LastUpdate.CompareTo(p1.Manifest.LastUpdate));
-                    break;
-                case PluginSortKind.NewOrNot:
-                    this.pluginListAvailable.Sort((p1, p2) => this.WasPluginSeen(p1.InternalName)
-                                                                  .CompareTo(this.WasPluginSeen(p2.InternalName)));
-                    this.pluginListInstalled.Sort((p1, p2) => this.WasPluginSeen(p1.Manifest.InternalName)
-                                                                  .CompareTo(this.WasPluginSeen(p2.Manifest.InternalName)));
-                    break;
-                case PluginSortKind.NotInstalled:
-                    this.pluginListAvailable.Sort((p1, p2) => this.pluginListInstalled.Any(x => x.Manifest.InternalName == p1.InternalName)
-                                                                  .CompareTo(this.pluginListInstalled.Any(x => x.Manifest.InternalName == p2.InternalName)));
-                    this.pluginListInstalled.Sort((p1, p2) => p1.Manifest.Name.CompareTo(p2.Manifest.Name)); // Makes no sense for installed plugins
-                    break;
-                default:
-                    throw new InvalidEnumArgumentException("Unknown plugin sort type.");
-            }
-        }
-
-        private bool WasPluginSeen(string internalName) =>
-            Service<DalamudConfiguration>.Get().SeenPluginInternalName.Contains(internalName);
-
-        /// <summary>
-        /// A continuation task that displays any errors received into the error modal.
-        /// </summary>
-        /// <param name="task">The previous task.</param>
-        /// <param name="state">An error message to be displayed.</param>
-        /// <returns>A value indicating whether to continue with the next task.</returns>
-        private bool DisplayErrorContinuation(Task task, object state)
-        {
-            if (task.IsFaulted)
-            {
-                var errorModalMessage = state as string;
-
-                foreach (var ex in task.Exception.InnerExceptions)
+                if (this.testerIcon != null)
                 {
-                    if (ex is PluginException)
-                    {
-                        Log.Error(ex, "Plugin installer threw an error");
-#if DEBUG
-                        if (!string.IsNullOrEmpty(ex.Message))
-                            errorModalMessage += $"\n\n{ex.Message}";
-#endif
-                    }
-                    else
-                    {
-                        Log.Error(ex, "Plugin installer threw an unexpected error");
-#if DEBUG
-                        if (!string.IsNullOrEmpty(ex.Message))
-                            errorModalMessage += $"\n\n{ex.Message}";
-#endif
-                    }
+                    this.testerIcon.Dispose();
+                    this.testerIcon = null;
                 }
 
-                this.ShowErrorModal(errorModalMessage);
+                if (!this.testerIconPath.IsNullOrEmpty())
+                {
+                    this.testerIcon = im.LoadImage(this.testerIconPath);
+                }
 
-                return false;
+                this.testerImages = new TextureWrap[this.testerImagePaths.Length];
+
+                for (var i = 0; i < this.testerImagePaths.Length; i++)
+                {
+                    if (this.testerImagePaths[i].IsNullOrEmpty())
+                        continue;
+
+                    if (this.testerImages[i] != null)
+                    {
+                        this.testerImages[i].Dispose();
+                        this.testerImages[i] = null;
+                    }
+
+                    this.testerImages[i] = im.LoadImage(this.testerImagePaths[i]);
+                }
             }
-
-            return true;
-        }
-
-        private Task ShowErrorModal(string message)
-        {
-            this.errorModalMessage = message;
-            this.errorModalDrawing = true;
-            this.errorModalOnNextFrame = true;
-            this.errorModalTaskCompletionSource = new TaskCompletionSource();
-            return this.errorModalTaskCompletionSource.Task;
-        }
-
-        private Task<bool> ShowUpdateModal(LocalPlugin plugin)
-        {
-            this.updateModalOnNextFrame = true;
-            this.updateModalPlugin = plugin;
-            this.updateModalTaskCompletionSource = new TaskCompletionSource<bool>();
-            return this.updateModalTaskCompletionSource.Task;
-        }
-
-        private void UpdateCategoriesOnSearchChange()
-        {
-            if (string.IsNullOrEmpty(this.searchText))
+            catch (Exception ex)
             {
-                this.categoryManager.SetCategoryHighlightsForPlugins(null);
+                Log.Error(ex, "Could not load plugin images for testing.");
+            }
+        }
+
+        ImGui.Checkbox("Failed", ref this.testerError);
+        ImGui.Checkbox("Has Update", ref this.testerUpdateAvailable);
+    }
+
+    private bool DrawPluginListLoading()
+    {
+        var pluginManager = Service<PluginManager>.Get();
+
+        var ready = pluginManager.PluginsReady && pluginManager.ReposReady;
+
+        if (!ready)
+        {
+            ImGui.TextColored(ImGuiColors.DalamudGrey, Locs.TabBody_LoadingPlugins);
+        }
+
+        var failedRepos = pluginManager.Repos
+                                       .Where(repo => repo.State == PluginRepositoryState.Fail)
+                                       .ToArray();
+
+        if (failedRepos.Length > 0)
+        {
+            var failText = Locs.TabBody_DownloadFailed;
+            var aggFailText = failedRepos
+                              .Select(repo => $"{failText} ({repo.PluginMasterUrl})")
+                              .Aggregate((s1, s2) => $"{s1}\n{s2}");
+
+            ImGui.TextColored(ImGuiColors.DalamudRed, aggFailText);
+        }
+
+        return ready;
+    }
+
+    private bool DrawPluginCollapsingHeader(string label, LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, bool trouble, bool updateAvailable, bool isNew, bool installableOutdated, Action drawContextMenuAction, int index)
+    {
+        ImGui.Separator();
+
+        var isOpen = this.openPluginCollapsibles.Contains(index);
+
+        var sectionSize = ImGuiHelpers.GlobalScale * 66;
+        var startCursor = ImGui.GetCursorPos();
+
+        ImGui.PushStyleColor(ImGuiCol.Button, isOpen ? new Vector4(0.5f, 0.5f, 0.5f, 0.1f) : Vector4.Zero);
+
+        ImGui.PushStyleColor(ImGuiCol.ButtonHovered, new Vector4(0.5f, 0.5f, 0.5f, 0.2f));
+        ImGui.PushStyleColor(ImGuiCol.ButtonActive, new Vector4(0.5f, 0.5f, 0.5f, 0.35f));
+        ImGui.PushStyleVar(ImGuiStyleVar.FrameRounding, 0);
+
+        if (ImGui.Button($"###plugin{index}CollapsibleBtn", new Vector2(ImGui.GetWindowWidth() - (ImGuiHelpers.GlobalScale * 35), sectionSize)))
+        {
+            if (isOpen)
+            {
+                this.openPluginCollapsibles.Remove(index);
             }
             else
             {
-                var pluginsMatchingSearch = this.pluginListAvailable.Where(rm => !this.IsManifestFiltered(rm));
-                this.categoryManager.SetCategoryHighlightsForPlugins(pluginsMatchingSearch);
+                this.openPluginCollapsibles.Add(index);
+            }
+
+            isOpen = !isOpen;
+        }
+
+        drawContextMenuAction?.Invoke();
+
+        ImGui.PopStyleVar();
+
+        ImGui.PopStyleColor(3);
+
+        ImGui.SetCursorPos(startCursor);
+
+        var pluginDisabled = plugin is { IsDisabled: true };
+
+        var iconSize = ImGuiHelpers.ScaledVector2(64, 64);
+        var cursorBeforeImage = ImGui.GetCursorPos();
+        var rectOffset = ImGui.GetWindowContentRegionMin() + ImGui.GetWindowPos();
+        if (ImGui.IsRectVisible(rectOffset + cursorBeforeImage, rectOffset + cursorBeforeImage + iconSize))
+        {
+            var iconTex = this.imageCache.DefaultIcon;
+            var hasIcon = this.imageCache.TryGetIcon(plugin, manifest, isThirdParty, out var cachedIconTex);
+            if (hasIcon && cachedIconTex != null)
+            {
+                iconTex = cachedIconTex;
+            }
+
+            if (pluginDisabled || installableOutdated)
+            {
+                ImGui.PushStyleVar(ImGuiStyleVar.Alpha, 0.4f);
+            }
+
+            ImGui.Image(iconTex.ImGuiHandle, iconSize);
+
+            if (pluginDisabled || installableOutdated)
+            {
+                ImGui.PopStyleVar();
+            }
+
+            ImGui.SameLine();
+            ImGui.SetCursorPos(cursorBeforeImage);
+        }
+
+        var isLoaded = plugin is { IsLoaded: true };
+
+        if (updateAvailable)
+            ImGui.Image(this.imageCache.UpdateIcon.ImGuiHandle, iconSize);
+        else if (trouble && !pluginDisabled)
+            ImGui.Image(this.imageCache.TroubleIcon.ImGuiHandle, iconSize);
+        else if (installableOutdated)
+            ImGui.Image(this.imageCache.OutdatedInstallableIcon.ImGuiHandle, iconSize);
+        else if (pluginDisabled)
+            ImGui.Image(this.imageCache.DisabledIcon.ImGuiHandle, iconSize);
+        else if (isLoaded && isThirdParty)
+            ImGui.Image(this.imageCache.ThirdInstalledIcon.ImGuiHandle, iconSize);
+        else if (isThirdParty)
+            ImGui.Image(this.imageCache.ThirdIcon.ImGuiHandle, iconSize);
+        else if (isLoaded)
+            ImGui.Image(this.imageCache.InstalledIcon.ImGuiHandle, iconSize);
+        else
+            ImGui.Dummy(iconSize);
+        ImGui.SameLine();
+
+        ImGuiHelpers.ScaledDummy(5);
+        ImGui.SameLine();
+
+        var cursor = ImGui.GetCursorPos();
+
+        // Name
+        ImGui.TextUnformatted(label);
+
+        // Download count
+        var downloadCountText = manifest.DownloadCount > 0
+                                    ? Locs.PluginBody_AuthorWithDownloadCount(manifest.Author, manifest.DownloadCount)
+                                    : Locs.PluginBody_AuthorWithDownloadCountUnavailable(manifest.Author);
+
+        ImGui.SameLine();
+        ImGui.TextColored(ImGuiColors.DalamudGrey3, downloadCountText);
+
+        if (isNew)
+        {
+            ImGui.SameLine();
+            ImGui.TextColored(ImGuiColors.TankBlue, Locs.PluginTitleMod_New);
+        }
+
+        cursor.Y += ImGui.GetTextLineHeightWithSpacing();
+        ImGui.SetCursorPos(cursor);
+
+        // Outdated warning
+        if (plugin is { IsOutdated: true, IsBanned: false } || installableOutdated)
+        {
+            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+            ImGui.TextWrapped(Locs.PluginBody_Outdated);
+            ImGui.PopStyleColor();
+        }
+        else if (plugin is { IsBanned: true })
+        {
+            // Banned warning
+            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+            ImGuiHelpers.SafeTextWrapped(plugin.BanReason.IsNullOrEmpty()
+                                             ? Locs.PluginBody_Banned
+                                             : Locs.PluginBody_BannedReason(plugin.BanReason));
+
+            ImGui.PopStyleColor();
+        }
+        else if (plugin is { IsOrphaned: true })
+        {
+            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+            ImGui.TextWrapped(Locs.PluginBody_Orphaned);
+            ImGui.PopStyleColor();
+        }
+        else if (plugin != null && !plugin.CheckPolicy())
+        {
+            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+            ImGui.TextWrapped(Locs.PluginBody_Policy);
+            ImGui.PopStyleColor();
+        }
+        else if (plugin is { State: PluginState.LoadError or PluginState.DependencyResolutionFailed })
+        {
+            // Load failed warning
+            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudRed);
+            ImGui.TextWrapped(Locs.PluginBody_LoadFailed);
+            ImGui.PopStyleColor();
+        }
+
+        ImGui.SetCursorPosX(cursor.X);
+
+        // Description
+        if (plugin is null or { IsOutdated: false, IsBanned: false })
+        {
+            if (!string.IsNullOrWhiteSpace(manifest.Punchline))
+            {
+                ImGuiHelpers.SafeTextWrapped(manifest.Punchline);
+            }
+            else if (!string.IsNullOrWhiteSpace(manifest.Description))
+            {
+                const int punchlineLen = 200;
+                var firstLine = manifest.Description.Split(new[] { '\r', '\n' })[0];
+
+                ImGuiHelpers.SafeTextWrapped(firstLine.Length < punchlineLen
+                                                 ? firstLine
+                                                 : firstLine[..punchlineLen]);
             }
         }
 
-        private void UpdateCategoriesOnPluginsChange()
+        startCursor.Y += sectionSize;
+        ImGui.SetCursorPos(startCursor);
+
+        return isOpen;
+    }
+
+    private void DrawChangelog(IChangelogEntry log)
+    {
+        ImGui.Separator();
+
+        var startCursor = ImGui.GetCursorPos();
+
+        var iconSize = ImGuiHelpers.ScaledVector2(64, 64);
+        var cursorBeforeImage = ImGui.GetCursorPos();
+        var rectOffset = ImGui.GetWindowContentRegionMin() + ImGui.GetWindowPos();
+        if (ImGui.IsRectVisible(rectOffset + cursorBeforeImage, rectOffset + cursorBeforeImage + iconSize))
         {
-            this.categoryManager.BuildCategories(this.pluginListAvailable);
-            this.UpdateCategoriesOnSearchChange();
+            TextureWrap icon;
+            if (log is PluginChangelogEntry pluginLog)
+            {
+                icon = this.imageCache.DefaultIcon;
+                var hasIcon = this.imageCache.TryGetIcon(pluginLog.Plugin, pluginLog.Plugin.Manifest, pluginLog.Plugin.Manifest.IsThirdParty, out var cachedIconTex);
+                if (hasIcon && cachedIconTex != null)
+                {
+                    icon = cachedIconTex;
+                }
+            }
+            else
+            {
+                icon = this.imageCache.CorePluginIcon;
+            }
+
+            ImGui.Image(icon.ImGuiHandle, iconSize);
+        }
+        else
+        {
+            ImGui.Dummy(iconSize);
         }
 
-        [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "Disregard here")]
-        private static class Locs
+        ImGui.SameLine();
+
+        ImGuiHelpers.ScaledDummy(5);
+
+        ImGui.SameLine();
+        var cursor = ImGui.GetCursorPos();
+        ImGui.TextUnformatted(log.Title);
+
+        ImGui.SameLine();
+        ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{log.Version}");
+
+        cursor.Y += ImGui.GetTextLineHeightWithSpacing();
+        ImGui.SetCursorPos(cursor);
+
+        ImGuiHelpers.SafeTextWrapped(log.Text);
+
+        var endCursor = ImGui.GetCursorPos();
+
+        var sectionSize = Math.Max(
+            66 * ImGuiHelpers.GlobalScale, // min size due to icons
+            endCursor.Y - startCursor.Y);
+
+        startCursor.Y += sectionSize;
+        ImGui.SetCursorPos(startCursor);
+    }
+
+    private void DrawAvailablePlugin(RemotePluginManifest manifest, int index)
+    {
+        var configuration = Service<DalamudConfiguration>.Get();
+        var notifications = Service<NotificationManager>.Get();
+        var pluginManager = Service<PluginManager>.Get();
+
+        var useTesting = pluginManager.UseTesting(manifest);
+        var wasSeen = this.WasPluginSeen(manifest.InternalName);
+
+        var isOutdated = manifest.DalamudApiLevel < PluginManager.DalamudApiLevel;
+
+        // Check for valid versions
+        if ((useTesting && manifest.TestingAssemblyVersion == null) || manifest.AssemblyVersion == null)
         {
-            #region Window Title
-
-            public static string WindowTitle => Loc.Localize("InstallerHeader", "Plugin Installer");
-
-            public static string WindowTitleMod_Testing => Loc.Localize("InstallerHeaderTesting", " (TESTING)");
-
-            #endregion
-
-            #region Header
-
-            public static string Header_Hint => Loc.Localize("InstallerHint", "This window allows you to install and remove in-game plugins.\nThey are made by third-party developers.");
-
-            public static string Header_SearchPlaceholder => Loc.Localize("InstallerSearch", "Search");
-
-            #endregion
-
-            #region SortBy
-
-            public static string SortBy_Alphabetical => Loc.Localize("InstallerAlphabetical", "Alphabetical");
-
-            public static string SortBy_DownloadCounts => Loc.Localize("InstallerDownloadCount", "Download Count");
-
-            public static string SortBy_LastUpdate => Loc.Localize("InstallerLastUpdate", "Last Update");
-
-            public static string SortBy_NewOrNot => Loc.Localize("InstallerNewOrNot", "New or not");
-
-            public static string SortBy_NotInstalled => Loc.Localize("InstallerNotInstalled", "Not Installed");
-
-            public static string SortBy_Label => Loc.Localize("InstallerSortBy", "Sort By");
-
-            #endregion
-
-            #region Tab body
-
-            public static string TabBody_LoadingPlugins => Loc.Localize("InstallerLoading", "Loading plugins...");
-
-            public static string TabBody_DownloadFailed => Loc.Localize("InstallerDownloadFailed", "Download failed.");
-
-            public static string TabBody_SafeMode => Loc.Localize("InstallerSafeMode", "Dalamud is running in Plugin Safe Mode, restart to activate plugins.");
-
-            #endregion
-
-            #region Search text
-
-            public static string TabBody_SearchNoMatching => Loc.Localize("InstallerNoMatching", "No plugins were found matching your search.");
-
-            public static string TabBody_SearchNoCompatible => Loc.Localize("InstallerNoCompatible", "No compatible plugins were found :( Please restart your game and try again.");
-
-            public static string TabBody_SearchNoInstalled => Loc.Localize("InstallerNoInstalled", "No plugins are currently installed. You can install them from the \"All Plugins\" tab.");
-
-            public static string TabBody_ChangelogNone => Loc.Localize("InstallerNoChangelog", "None of your installed plugins have a changelog.");
-
-            #endregion
-
-            #region Plugin title text
-
-            public static string PluginTitleMod_Installed => Loc.Localize("InstallerInstalled", " (installed)");
-
-            public static string PluginTitleMod_Disabled => Loc.Localize("InstallerDisabled", " (disabled)");
-
-            public static string PluginTitleMod_Unloaded => Loc.Localize("InstallerUnloaded", " (unloaded)");
-
-            public static string PluginTitleMod_HasUpdate => Loc.Localize("InstallerHasUpdate", " (has update)");
-
-            public static string PluginTitleMod_Updated => Loc.Localize("InstallerUpdated", " (updated)");
-
-            public static string PluginTitleMod_TestingVersion => Loc.Localize("InstallerTestingVersion", " (testing version)");
-
-            public static string PluginTitleMod_TestingAvailable => Loc.Localize("InstallerTestingAvailable", " (available for testing)");
-
-            public static string PluginTitleMod_DevPlugin => Loc.Localize("InstallerDevPlugin", " (dev plugin)");
-
-            public static string PluginTitleMod_UpdateFailed => Loc.Localize("InstallerUpdateFailed", " (update failed)");
-
-            public static string PluginTitleMod_LoadError => Loc.Localize("InstallerLoadError", " (load error)");
-
-            public static string PluginTitleMod_UnloadError => Loc.Localize("InstallerUnloadError", " (unload error)");
-
-            public static string PluginTitleMod_OutdatedError => Loc.Localize("InstallerOutdatedError", " (outdated)");
-
-            public static string PluginTitleMod_BannedError => Loc.Localize("InstallerBannedError", " (automatically disabled)");
-
-            public static string PluginTitleMod_OrphanedError => Loc.Localize("InstallerOrphanedError", " (unknown repository)");
-
-            public static string PluginTitleMod_ScheduledForDeletion => Loc.Localize("InstallerScheduledForDeletion", " (scheduled for deletion)");
-
-            public static string PluginTitleMod_New => Loc.Localize("InstallerNewPlugin ", " New!");
-
-            #endregion
-
-            #region Plugin context menu
-
-            public static string PluginContext_TestingOptIn => Loc.Localize("InstallerTestingOptIn", "Receive plugin testing versions");
-
-            public static string PluginContext_MarkAllSeen => Loc.Localize("InstallerMarkAllSeen", "Mark all as seen");
-
-            public static string PluginContext_HidePlugin => Loc.Localize("InstallerHidePlugin", "Hide from installer");
-
-            public static string PluginContext_DeletePluginConfig => Loc.Localize("InstallerDeletePluginConfig", "Reset plugin configuration");
-
-            public static string PluginContext_DeletePluginConfigReload => Loc.Localize("InstallerDeletePluginConfigReload", "Reset plugin configuration and reload");
-
-            #endregion
-
-            #region Plugin body
-
-            public static string PluginBody_AuthorWithoutDownloadCount(string author) => Loc.Localize("InstallerAuthorWithoutDownloadCount", " by {0}").Format(author);
-
-            public static string PluginBody_AuthorWithDownloadCount(string author, long count) => Loc.Localize("InstallerAuthorWithDownloadCount", " by {0} ({1} downloads)").Format(author, count.ToString("N0"));
-
-            public static string PluginBody_AuthorWithDownloadCountUnavailable(string author) => Loc.Localize("InstallerAuthorWithDownloadCountUnavailable", " by {0}").Format(author);
-
-            public static string PluginBody_CurrentChangeLog(Version version) => Loc.Localize("InstallerCurrentChangeLog", "Changelog (v{0})").Format(version);
-
-            public static string PluginBody_UpdateChangeLog(Version version) => Loc.Localize("InstallerUpdateChangeLog", "Available update changelog (v{0})").Format(version);
-
-            public static string PluginBody_DevPluginPath(string path) => Loc.Localize("InstallerDevPluginPath", "From {0}").Format(path);
-
-            public static string PluginBody_Plugin3rdPartyRepo(string url) => Loc.Localize("InstallerPlugin3rdPartyRepo", "From custom plugin repository {0}").Format(url);
-
-            public static string PluginBody_AvailableDevPlugin => Loc.Localize("InstallerDevPlugin", " This plugin is available in one of your repos, please remove it from the devPlugins folder.");
-
-            public static string PluginBody_Outdated => Loc.Localize("InstallerOutdatedPluginBody ", "This plugin is outdated and incompatible at the moment. Please wait for it to be updated by its author.");
-
-            public static string PluginBody_Orphaned => Loc.Localize("InstallerOrphanedPluginBody ", "This plugin's source repository is no longer available. You may need to reinstall it from its repository, or re-add the repository.");
-
-            public static string PluginBody_LoadFailed => Loc.Localize("InstallerLoadFailedPluginBody ", "This plugin failed to load. Please contact the author for more information.");
-
-            public static string PluginBody_Banned => Loc.Localize("InstallerBannedPluginBody ", "This plugin was automatically disabled due to incompatibilities and is not available at the moment. Please wait for it to be updated by its author.");
-
-            public static string PluginBody_Policy => Loc.Localize("InstallerPolicyPluginBody ", "Plugin loads for this type of plugin were manually disabled.");
-
-            public static string PluginBody_BannedReason(string message) =>
-                Loc.Localize("InstallerBannedPluginBodyReason ", "This plugin was automatically disabled: {0}").Format(message);
-
-            #endregion
-
-            #region Plugin buttons
-
-            public static string PluginButton_InstallVersion(string version) => Loc.Localize("InstallerInstall", "Install v{0}").Format(version);
-
-            public static string PluginButton_Working => Loc.Localize("InstallerWorking", "Working");
-
-            public static string PluginButton_Disable => Loc.Localize("InstallerDisable", "Disable");
-
-            public static string PluginButton_Load => Loc.Localize("InstallerLoad", "Load");
-
-            public static string PluginButton_Unload => Loc.Localize("InstallerUnload", "Unload");
-
-            public static string PluginButton_SafeMode => Loc.Localize("InstallerSafeModeButton", "Can't change in safe mode");
-
-            #endregion
-
-            #region Plugin button tooltips
-
-            public static string PluginButtonToolTip_OpenConfiguration => Loc.Localize("InstallerOpenConfig", "Open Configuration");
-
-            public static string PluginButtonToolTip_StartOnBoot => Loc.Localize("InstallerStartOnBoot", "Start on boot");
-
-            public static string PluginButtonToolTip_AutomaticReloading => Loc.Localize("InstallerAutomaticReloading", "Automatic reloading");
-
-            public static string PluginButtonToolTip_DeletePlugin => Loc.Localize("InstallerDeletePlugin ", "Delete plugin");
-
-            public static string PluginButtonToolTip_DeletePluginRestricted => Loc.Localize("InstallerDeletePluginRestricted", "Cannot delete right now - please restart the game.");
-
-            public static string PluginButtonToolTip_DeletePluginScheduled => Loc.Localize("InstallerDeletePluginScheduled", "Delete plugin on next restart");
-
-            public static string PluginButtonToolTip_DeletePluginScheduledCancel => Loc.Localize("InstallerDeletePluginScheduledCancel", "Cancel scheduled deletion");
-
-            public static string PluginButtonToolTip_DeletePluginLoaded => Loc.Localize("InstallerDeletePluginLoaded", "Disable this plugin before deleting it.");
-
-            public static string PluginButtonToolTip_VisitPluginUrl => Loc.Localize("InstallerVisitPluginUrl", "Visit plugin URL");
-
-            public static string PluginButtonToolTip_UpdateSingle(string version) => Loc.Localize("InstallerUpdateSingle", "Update to {0}").Format(version);
-
-            public static string PluginButtonToolTip_UnloadFailed => Loc.Localize("InstallerUnloadFailedTooltip", "Plugin unload failed, please restart your game and try again.");
-
-            #endregion
-
-            #region Notifications
-
-            public static string Notifications_PluginInstalledTitle => Loc.Localize("NotificationsPluginInstalledTitle", "Plugin installed!");
-
-            public static string Notifications_PluginInstalled(string name) => Loc.Localize("NotificationsPluginInstalled", "'{0}' was successfully installed.").Format(name);
-
-            public static string Notifications_PluginNotInstalledTitle => Loc.Localize("NotificationsPluginNotInstalledTitle", "Plugin not installed!");
-
-            public static string Notifications_PluginNotInstalled(string name) => Loc.Localize("NotificationsPluginNotInstalled", "'{0}' failed to install.").Format(name);
-
-            public static string Notifications_NoUpdatesFoundTitle => Loc.Localize("NotificationsNoUpdatesFoundTitle", "No updates found!");
-
-            public static string Notifications_NoUpdatesFound => Loc.Localize("NotificationsNoUpdatesFound", "No updates were found.");
-
-            public static string Notifications_UpdatesInstalledTitle => Loc.Localize("NotificationsUpdatesInstalledTitle", "Updates installed!");
-
-            public static string Notifications_UpdatesInstalled(int count) => Loc.Localize("NotificationsUpdatesInstalled", "Updates for {0} of your plugins were installed.").Format(count);
-
-            public static string Notifications_PluginDisabledTitle => Loc.Localize("NotificationsPluginDisabledTitle", "Plugin disabled!");
-
-            public static string Notifications_PluginDisabled(string name) => Loc.Localize("NotificationsPluginDisabled", "'{0}' was disabled.").Format(name);
-
-            public static string Notifications_PluginEnabledTitle => Loc.Localize("NotificationsPluginEnabledTitle", "Plugin enabled!");
-
-            public static string Notifications_PluginEnabled(string name) => Loc.Localize("NotificationsPluginEnabled", "'{0}' was enabled.").Format(name);
-
-            #endregion
-
-            #region Footer
-
-            public static string FooterButton_UpdatePlugins => Loc.Localize("InstallerUpdatePlugins", "Update plugins");
-
-            public static string FooterButton_UpdateSafeMode => Loc.Localize("InstallerUpdateSafeMode", "Can't update in safe mode");
-
-            public static string FooterButton_InProgress => Loc.Localize("InstallerInProgress", "Install in progress...");
-
-            public static string FooterButton_NoUpdates => Loc.Localize("InstallerNoUpdates", "No updates found!");
-
-            public static string FooterButton_UpdateComplete(int count) => Loc.Localize("InstallerUpdateComplete", "{0} plugins updated!").Format(count);
-
-            public static string FooterButton_Settings => Loc.Localize("InstallerSettings", "Settings");
-
-            public static string FooterButton_ScanDevPlugins => Loc.Localize("InstallerScanDevPlugins", "Scan Dev Plugins");
-
-            public static string FooterButton_Close => Loc.Localize("InstallerClose", "Close");
-
-            #endregion
-
-            #region Update modal
-
-            public static string UpdateModal_Title => Loc.Localize("UpdateQuestionModal", "Update Available");
-
-            public static string UpdateModal_UpdateAvailable(string name) => Loc.Localize("UpdateModalUpdateAvailable", "An update for \"{0}\" is available.\nDo you want to update it before enabling?\nUpdates will fix bugs and incompatibilities, and may add new features.").Format(name);
-
-            public static string UpdateModal_Yes => Loc.Localize("UpdateModalYes", "Update plugin");
-
-            public static string UpdateModal_No => Loc.Localize("UpdateModalNo", "Just enable");
-
-            #endregion
-
-            #region Error modal
-
-            public static string ErrorModal_Title => Loc.Localize("InstallerError", "Installer Error");
-
-            public static string ErrorModal_InstallContactAuthor => Loc.Localize(
-                "InstallerContactAuthor",
-                "Please restart your game and try again. If this error occurs again, please contact the plugin author.");
-
-            public static string ErrorModal_InstallFail(string name) => Loc.Localize("InstallerInstallFail", "Failed to install plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
-
-            public static string ErrorModal_SingleUpdateFail(string name) => Loc.Localize("InstallerSingleUpdateFail", "Failed to update plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
-
-            public static string ErrorModal_DeleteConfigFail(string name) => Loc.Localize("InstallerDeleteConfigFail", "Failed to reset the plugin {0}.\n\nThe plugin may not support this action. You can try deleting the configuration manually while the game is shut down - please see the FAQ.").Format(name);
-
-            public static string ErrorModal_EnableFail(string name) => Loc.Localize("InstallerEnableFail", "Failed to enable plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
-
-            public static string ErrorModal_DisableFail(string name) => Loc.Localize("InstallerDisableFail", "Failed to disable plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
-
-            public static string ErrorModal_UnloadFail(string name) => Loc.Localize("InstallerUnloadFail", "Failed to unload plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
-
-            public static string ErrorModal_LoadFail(string name) => Loc.Localize("InstallerLoadFail", "Failed to load plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
-
-            public static string ErrorModal_DeleteFail(string name) => Loc.Localize("InstallerDeleteFail", "Failed to delete plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
-
-            public static string ErrorModal_UpdaterFatal => Loc.Localize("InstallerUpdaterFatal", "Failed to update plugins.\nPlease restart your game and try again. If this error occurs again, please complain.");
-
-            public static string ErrorModal_UpdaterFail(int failCount) => Loc.Localize("InstallerUpdaterFail", "Failed to update {0} plugins.\nPlease restart your game and try again. If this error occurs again, please complain.").Format(failCount);
-
-            public static string ErrorModal_UpdaterFailPartial(int successCount, int failCount) => Loc.Localize("InstallerUpdaterFailPartial", "Updated {0} plugins, failed to update {1}.\nPlease restart your game and try again. If this error occurs again, please complain.").Format(successCount, failCount);
-
-            public static string ErrorModal_HintBlame(string plugins) => Loc.Localize("InstallerErrorPluginInfo", "\n\nThe following plugins caused these issues:\n\n{0}\nYou may try removing these plugins manually and reinstalling them.").Format(plugins);
-
-            // public static string ErrorModal_Hint => Loc.Localize("InstallerErrorHint", "The plugin installer ran into an issue or the plugin is incompatible.\nPlease restart the game and report this error on our discord.");
-
-            #endregion
-
-            #region Feedback Modal
-
-            public static string FeedbackModal_Title => Loc.Localize("InstallerFeedback", "Send Feedback");
-
-            public static string FeedbackModal_Text(string pluginName) => Loc.Localize("InstallerFeedbackInfo", "You can send feedback to the developer of \"{0}\" here.").Format(pluginName);
-
-            public static string FeedbackModal_HasUpdate => Loc.Localize("InstallerFeedbackHasUpdate", "A new version of this plugin is available, please update before reporting bugs.");
-
-            public static string FeedbackModal_ContactAnonymous => Loc.Localize("InstallerFeedbackContactAnonymous", "Submit feedback anonymously");
-
-            public static string FeedbackModal_ContactAnonymousWarning => Loc.Localize("InstallerFeedbackContactAnonymousWarning", "No response will be forthcoming.\nUntick \"{0}\" and provide contact information if you need help.").Format(FeedbackModal_ContactAnonymous);
-
-            public static string FeedbackModal_ContactInformation => Loc.Localize("InstallerFeedbackContactInfo", "Contact information");
-
-            public static string FeedbackModal_ContactInformationHelp => Loc.Localize("InstallerFeedbackContactInfoHelp", "Discord usernames and e-mail addresses are accepted.\nIf you submit a Discord username, please join our discord server so that we can reach out to you easier.");
-
-            public static string FeedbackModal_ContactInformationWarning => Loc.Localize("InstallerFeedbackContactInfoWarning", "Do not submit in-game character names.");
-
-            public static string FeedbackModal_ContactInformationRequired => Loc.Localize("InstallerFeedbackContactInfoRequired", "Contact information has not been provided. If you do not want to provide contact information, tick on \"{0}\" above.").Format(FeedbackModal_ContactAnonymous);
-
-            public static string FeedbackModal_ContactInformationDiscordButton => Loc.Localize("ContactInformationDiscordButton", "Join Goat Place Discord");
-
-            public static string FeedbackModal_ContactInformationDiscordUrl => Loc.Localize("ContactInformationDiscordUrl", "https://goat.place/");
-
-            public static string FeedbackModal_IncludeLastError => Loc.Localize("InstallerFeedbackIncludeLastError", "Include last error message");
-
-            public static string FeedbackModal_IncludeLastErrorHint => Loc.Localize("InstallerFeedbackIncludeLastErrorHint", "This option can give the plugin developer useful feedback on what exactly went wrong.");
-
-            public static string FeedbackModal_Hint => Loc.Localize("InstallerFeedbackHint", "All plugin developers will be able to see your feedback.\nPlease never include any personal or revealing information.\nIf you chose to include the last error message, information like your Windows username may be included.\n\nThe collected feedback is not stored on our end and immediately relayed to Discord.");
-
-            public static string FeedbackModal_NotificationSuccess => Loc.Localize("InstallerFeedbackNotificationSuccess", "Your feedback was sent successfully!");
-
-            public static string FeedbackModal_NotificationError => Loc.Localize("InstallerFeedbackNotificationError", "Your feedback could not be sent.");
-
-            #endregion
-
-            #region Plugin Update chatbox
-
-            public static string PluginUpdateHeader_Chatbox => Loc.Localize("DalamudPluginUpdates", "Updates:");
-
-            #endregion
-
-            #region Error modal buttons
-
-            public static string ErrorModalButton_Ok => Loc.Localize("OK", "OK");
-
-            #endregion
-
-            #region Other
-
-            public static string SafeModeDisclaimer => Loc.Localize("SafeModeDisclaimer", "You enabled safe mode, no plugins will be loaded.\nYou may delete plugins from the \"Installed plugins\" tab.\nSimply restart your game to disable safe mode.");
-
-            #endregion
+            // Without a valid version, quit
+            return;
+        }
+
+        // Name
+        var label = manifest.Name;
+
+        // Testing
+        if (useTesting || manifest.IsTestingExclusive)
+        {
+            label += Locs.PluginTitleMod_TestingVersion;
+        }
+
+        ImGui.PushID($"available{index}{manifest.InternalName}");
+
+        var isThirdParty = manifest.SourceRepo.IsThirdParty;
+        if (this.DrawPluginCollapsingHeader(label, null, manifest, isThirdParty, false, false, !wasSeen, isOutdated, () => this.DrawAvailablePluginContextMenu(manifest), index))
+        {
+            if (!wasSeen)
+                configuration.SeenPluginInternalName.Add(manifest.InternalName);
+
+            ImGuiHelpers.ScaledDummy(5);
+
+            ImGui.Indent();
+
+            // Installable from
+            if (manifest.SourceRepo.IsThirdParty)
+            {
+                var repoText = Locs.PluginBody_Plugin3rdPartyRepo(manifest.SourceRepo.PluginMasterUrl);
+                ImGui.TextColored(ImGuiColors.DalamudGrey3, repoText);
+
+                ImGuiHelpers.ScaledDummy(2);
+            }
+
+            // Description
+            if (!string.IsNullOrWhiteSpace(manifest.Description))
+            {
+                ImGuiHelpers.SafeTextWrapped(manifest.Description);
+            }
+
+            ImGuiHelpers.ScaledDummy(5);
+
+            // Controls
+            var disabled = this.updateStatus == OperationStatus.InProgress || this.installStatus == OperationStatus.InProgress || isOutdated;
+
+            var versionString = useTesting
+                                    ? $"{manifest.TestingAssemblyVersion}"
+                                    : $"{manifest.AssemblyVersion}";
+
+            if (pluginManager.SafeMode)
+            {
+                ImGuiComponents.DisabledButton(Locs.PluginButton_SafeMode);
+            }
+            else if (disabled)
+            {
+                ImGuiComponents.DisabledButton(Locs.PluginButton_InstallVersion(versionString));
+            }
+            else
+            {
+                var buttonText = Locs.PluginButton_InstallVersion(versionString);
+                if (ImGui.Button($"{buttonText}##{buttonText}{index}"))
+                {
+                    this.installStatus = OperationStatus.InProgress;
+                    this.loadingIndicatorKind = LoadingIndicatorKind.Installing;
+
+                    Task.Run(() => pluginManager.InstallPluginAsync(manifest, useTesting || manifest.IsTestingExclusive, PluginLoadReason.Installer))
+                        .ContinueWith(task =>
+                        {
+                            // There is no need to set as Complete for an individual plugin installation
+                            this.installStatus = OperationStatus.Idle;
+                            if (this.DisplayErrorContinuation(task, Locs.ErrorModal_InstallFail(manifest.Name)))
+                            {
+                                if (task.Result.State == PluginState.Loaded)
+                                {
+                                    notifications.AddNotification(Locs.Notifications_PluginInstalled(manifest.Name), Locs.Notifications_PluginInstalledTitle, NotificationType.Success);
+                                }
+                                else
+                                {
+                                    notifications.AddNotification(Locs.Notifications_PluginNotInstalled(manifest.Name), Locs.Notifications_PluginNotInstalledTitle, NotificationType.Error);
+                                    this.ShowErrorModal(Locs.ErrorModal_InstallFail(manifest.Name));
+                                }
+                            }
+                        });
+                }
+            }
+
+            this.DrawVisitRepoUrlButton(manifest.RepoUrl);
+
+            if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback)
+            {
+                this.DrawSendFeedbackButton(manifest, false);
+            }
+
+            ImGuiHelpers.ScaledDummy(5);
+
+            if (this.DrawPluginImages(null, manifest, isThirdParty, index))
+                ImGuiHelpers.ScaledDummy(5);
+
+            ImGui.Unindent();
+        }
+
+        ImGui.PopID();
+    }
+
+    private void DrawAvailablePluginContextMenu(PluginManifest manifest)
+    {
+        var configuration = Service<DalamudConfiguration>.Get();
+        var pluginManager = Service<PluginManager>.Get();
+        var startInfo = Service<DalamudStartInfo>.Get();
+
+        if (ImGui.BeginPopupContextItem("ItemContextMenu"))
+        {
+            if (ImGui.Selectable(Locs.PluginContext_MarkAllSeen))
+            {
+                configuration.SeenPluginInternalName.AddRange(this.pluginListAvailable.Select(x => x.InternalName));
+                configuration.Save();
+                pluginManager.RefilterPluginMasters();
+            }
+
+            if (ImGui.Selectable(Locs.PluginContext_HidePlugin))
+            {
+                Log.Debug($"Adding {manifest.InternalName} to hidden plugins");
+                configuration.HiddenPluginInternalName.Add(manifest.InternalName);
+                configuration.Save();
+                pluginManager.RefilterPluginMasters();
+            }
+
+            if (ImGui.Selectable(Locs.PluginContext_DeletePluginConfig))
+            {
+                Log.Debug($"Deleting config for {manifest.InternalName}");
+
+                this.installStatus = OperationStatus.InProgress;
+
+                Task.Run(() =>
+                    {
+                        pluginManager.PluginConfigs.Delete(manifest.InternalName);
+
+                        var path = Path.Combine(startInfo.PluginDirectory, manifest.InternalName);
+                        if (Directory.Exists(path))
+                            Directory.Delete(path, true);
+                    })
+                    .ContinueWith(task =>
+                    {
+                        this.installStatus = OperationStatus.Idle;
+
+                        this.DisplayErrorContinuation(task, Locs.ErrorModal_DeleteConfigFail(manifest.InternalName));
+                    });
+            }
+
+            ImGui.EndPopup();
         }
     }
+
+    private void DrawInstalledPlugin(LocalPlugin plugin, int index, bool showInstalled = false)
+    {
+        var configuration = Service<DalamudConfiguration>.Get();
+        var commandManager = Service<CommandManager>.Get();
+
+        var testingOptIn =
+            configuration.PluginTestingOptIns?.FirstOrDefault(x => x.InternalName == plugin.Manifest.InternalName);
+        var trouble = false;
+
+        // Name
+        var label = plugin.Manifest.Name;
+
+        // Dev
+        if (plugin.IsDev)
+        {
+            label += Locs.PluginTitleMod_DevPlugin;
+        }
+
+        // Testing
+        if (plugin.Manifest.Testing)
+        {
+            label += Locs.PluginTitleMod_TestingVersion;
+        }
+
+        if (plugin.Manifest.IsAvailableForTesting && configuration.DoPluginTest && testingOptIn == null)
+        {
+            label += Locs.PluginTitleMod_TestingAvailable;
+        }
+
+        // Freshly installed
+        if (showInstalled)
+        {
+            label += Locs.PluginTitleMod_Installed;
+        }
+
+        // Disabled
+        if (plugin.IsDisabled || !plugin.CheckPolicy())
+        {
+            label += Locs.PluginTitleMod_Disabled;
+            trouble = true;
+        }
+
+        // Load error
+        if (plugin.State is PluginState.LoadError or PluginState.DependencyResolutionFailed && plugin.CheckPolicy()
+            && !plugin.IsOutdated && !plugin.IsBanned && !plugin.IsOrphaned)
+        {
+            label += Locs.PluginTitleMod_LoadError;
+            trouble = true;
+        }
+
+        // Unload error
+        if (plugin.State == PluginState.UnloadError)
+        {
+            label += Locs.PluginTitleMod_UnloadError;
+            trouble = true;
+        }
+
+        var availablePluginUpdate = this.pluginListUpdatable.FirstOrDefault(up => up.InstalledPlugin == plugin);
+        // Update available
+        if (availablePluginUpdate != default)
+        {
+            label += Locs.PluginTitleMod_HasUpdate;
+        }
+
+        // Freshly updated
+        var thisWasUpdated = false;
+        if (this.updatedPlugins != null && !plugin.IsDev)
+        {
+            var update = this.updatedPlugins.FirstOrDefault(update => update.InternalName == plugin.Manifest.InternalName);
+            if (update != default)
+            {
+                if (update.WasUpdated)
+                {
+                    thisWasUpdated = true;
+                    label += Locs.PluginTitleMod_Updated;
+                }
+                else
+                {
+                    label += Locs.PluginTitleMod_UpdateFailed;
+                }
+            }
+        }
+
+        // Outdated API level
+        if (plugin.IsOutdated)
+        {
+            label += Locs.PluginTitleMod_OutdatedError;
+            trouble = true;
+        }
+
+        // Banned
+        if (plugin.IsBanned)
+        {
+            label += Locs.PluginTitleMod_BannedError;
+            trouble = true;
+        }
+
+        // Orphaned
+        if (plugin.IsOrphaned)
+        {
+            label += Locs.PluginTitleMod_OrphanedError;
+            trouble = true;
+        }
+
+        // Scheduled for deletion
+        if (plugin.Manifest.ScheduledForDeletion)
+        {
+            label += Locs.PluginTitleMod_ScheduledForDeletion;
+        }
+
+        ImGui.PushID($"installed{index}{plugin.Manifest.InternalName}");
+        var hasChangelog = !plugin.Manifest.Changelog.IsNullOrEmpty();
+
+        if (this.DrawPluginCollapsingHeader(label, plugin, plugin.Manifest, plugin.Manifest.IsThirdParty, trouble, availablePluginUpdate != default, false, false, () => this.DrawInstalledPluginContextMenu(plugin, testingOptIn), index))
+        {
+            if (!this.WasPluginSeen(plugin.Manifest.InternalName))
+                configuration.SeenPluginInternalName.Add(plugin.Manifest.InternalName);
+
+            var manifest = plugin.Manifest;
+
+            ImGui.Indent();
+
+            // Name
+            ImGui.TextUnformatted(manifest.Name);
+
+            // Download count
+            var downloadText = plugin.IsDev
+                                   ? Locs.PluginBody_AuthorWithoutDownloadCount(manifest.Author)
+                                   : manifest.DownloadCount > 0
+                                       ? Locs.PluginBody_AuthorWithDownloadCount(manifest.Author, manifest.DownloadCount)
+                                       : Locs.PluginBody_AuthorWithDownloadCountUnavailable(manifest.Author);
+
+            ImGui.SameLine();
+            ImGui.TextColored(ImGuiColors.DalamudGrey3, downloadText);
+
+            var isThirdParty = manifest.IsThirdParty;
+            var canFeedback = !isThirdParty && !plugin.IsDev && plugin.Manifest.DalamudApiLevel == PluginManager.DalamudApiLevel && plugin.Manifest.AcceptsFeedback && availablePluginUpdate == default;
+
+            // Installed from
+            if (plugin.IsDev)
+            {
+                var fileText = Locs.PluginBody_DevPluginPath(plugin.DllFile.FullName);
+                ImGui.TextColored(ImGuiColors.DalamudGrey3, fileText);
+            }
+            else if (isThirdParty)
+            {
+                var repoText = Locs.PluginBody_Plugin3rdPartyRepo(manifest.InstalledFromUrl);
+                ImGui.TextColored(ImGuiColors.DalamudGrey3, repoText);
+            }
+
+            // Description
+            if (!string.IsNullOrWhiteSpace(manifest.Description))
+            {
+                ImGuiHelpers.SafeTextWrapped(manifest.Description);
+            }
+
+            // Available commands (if loaded)
+            if (plugin.IsLoaded)
+            {
+                var commands = commandManager.Commands
+                                             .Where(cInfo => cInfo.Value.ShowInHelp && cInfo.Value.LoaderAssemblyName == plugin.Manifest.InternalName)
+                                             .ToArray();
+
+                if (commands.Any())
+                {
+                    ImGui.Dummy(ImGuiHelpers.ScaledVector2(10f, 10f));
+                    foreach (var command in commands)
+                    {
+                        ImGuiHelpers.SafeTextWrapped($"{command.Key} → {command.Value.HelpMessage}");
+                    }
+                }
+            }
+
+            // Controls
+            this.DrawPluginControlButton(plugin, availablePluginUpdate);
+            this.DrawDevPluginButtons(plugin);
+            this.DrawDeletePluginButton(plugin);
+            this.DrawVisitRepoUrlButton(plugin.Manifest.RepoUrl);
+
+            if (canFeedback)
+            {
+                this.DrawSendFeedbackButton(plugin.Manifest, plugin.IsTesting);
+            }
+
+            if (availablePluginUpdate != default)
+                this.DrawUpdateSinglePluginButton(availablePluginUpdate);
+
+            ImGui.SameLine();
+            ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{plugin.Manifest.EffectiveVersion}");
+
+            ImGuiHelpers.ScaledDummy(5);
+
+            if (this.DrawPluginImages(plugin, manifest, isThirdParty, index))
+                ImGuiHelpers.ScaledDummy(5);
+
+            ImGui.Unindent();
+
+            if (hasChangelog)
+            {
+                if (ImGui.TreeNode(Locs.PluginBody_CurrentChangeLog(plugin.Manifest.EffectiveVersion)))
+                {
+                    this.DrawInstalledPluginChangelog(plugin.Manifest);
+                    ImGui.TreePop();
+                }
+            }
+
+            if (availablePluginUpdate != default && !availablePluginUpdate.UpdateManifest.Changelog.IsNullOrWhitespace())
+            {
+                var availablePluginUpdateVersion = availablePluginUpdate.UseTesting ? availablePluginUpdate.UpdateManifest.TestingAssemblyVersion : availablePluginUpdate.UpdateManifest.AssemblyVersion;
+                if (ImGui.TreeNode(Locs.PluginBody_UpdateChangeLog(availablePluginUpdateVersion)))
+                {
+                    this.DrawInstalledPluginChangelog(availablePluginUpdate.UpdateManifest);
+                    ImGui.TreePop();
+                }
+            }
+        }
+
+        if (thisWasUpdated && hasChangelog)
+        {
+            this.DrawInstalledPluginChangelog(plugin.Manifest);
+        }
+
+        ImGui.PopID();
+    }
+
+    private void DrawInstalledPluginChangelog(PluginManifest manifest)
+    {
+        ImGuiHelpers.ScaledDummy(5);
+
+        ImGui.PushStyleColor(ImGuiCol.ChildBg, this.changelogBgColor);
+        ImGui.PushStyleColor(ImGuiCol.Text, this.changelogTextColor);
+
+        ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(7, 5));
+
+        if (ImGui.BeginChild("##changelog", new Vector2(-1, 100), true, ImGuiWindowFlags.NoNavFocus | ImGuiWindowFlags.NoNavInputs | ImGuiWindowFlags.AlwaysAutoResize))
+        {
+            ImGui.Text("Changelog:");
+            ImGuiHelpers.ScaledDummy(2);
+            ImGuiHelpers.SafeTextWrapped(manifest.Changelog);
+        }
+
+        ImGui.EndChild();
+
+        ImGui.PopStyleVar();
+        ImGui.PopStyleColor(2);
+    }
+
+    private void DrawInstalledPluginContextMenu(LocalPlugin plugin, PluginTestingOptIn? optIn)
+    {
+        var pluginManager = Service<PluginManager>.Get();
+        var configuration = Service<DalamudConfiguration>.Get();
+
+        if (ImGui.BeginPopupContextItem("InstalledItemContextMenu"))
+        {
+            var repoManifest = this.pluginListAvailable.FirstOrDefault(x => x.InternalName == plugin.Manifest.InternalName);
+            if (repoManifest?.IsTestingExclusive == true)
+                ImGui.BeginDisabled();
+
+            if (ImGui.MenuItem(Locs.PluginContext_TestingOptIn, string.Empty, optIn != null))
+            {
+                if (optIn != null)
+                {
+                    configuration.PluginTestingOptIns!.Remove(optIn);
+                }
+                else
+                {
+                    configuration.PluginTestingOptIns!.Add(new PluginTestingOptIn(plugin.Manifest.InternalName));
+                }
+
+                configuration.Save();
+            }
+
+            if (repoManifest?.IsTestingExclusive == true)
+                ImGui.EndDisabled();
+
+            if (ImGui.MenuItem(Locs.PluginContext_DeletePluginConfigReload))
+            {
+                Log.Debug($"Deleting config for {plugin.Manifest.InternalName}");
+
+                this.installStatus = OperationStatus.InProgress;
+
+                Task.Run(() => pluginManager.DeleteConfigurationAsync(plugin))
+                    .ContinueWith(task =>
+                    {
+                        this.installStatus = OperationStatus.Idle;
+
+                        this.DisplayErrorContinuation(task, Locs.ErrorModal_DeleteConfigFail(plugin.Name));
+                    });
+            }
+
+            ImGui.EndPopup();
+        }
+    }
+
+    private void DrawPluginControlButton(LocalPlugin plugin, AvailablePluginUpdate? availableUpdate)
+    {
+        var notifications = Service<NotificationManager>.Get();
+        var pluginManager = Service<PluginManager>.Get();
+
+        // Disable everything if the updater is running or another plugin is operating
+        var disabled = this.updateStatus == OperationStatus.InProgress || this.installStatus == OperationStatus.InProgress;
+
+        // Disable everything if the plugin is outdated
+        disabled = disabled || (plugin.IsOutdated && !pluginManager.LoadAllApiLevels) || plugin.IsBanned;
+
+        // Disable everything if the plugin is orphaned
+        disabled = disabled || plugin.IsOrphaned;
+
+        // Disable everything if the plugin failed to load
+        disabled = disabled || plugin.State == PluginState.LoadError || plugin.State == PluginState.DependencyResolutionFailed;
+
+        // Disable everything if we're working
+        disabled = disabled || plugin.State == PluginState.Loading || plugin.State == PluginState.Unloading;
+
+        var toggleId = plugin.Manifest.InternalName;
+        var isLoadedAndUnloadable = plugin.State == PluginState.Loaded ||
+                                    plugin.State == PluginState.DependencyResolutionFailed;
+
+        StyleModelV1.DalamudStandard.Push();
+
+        if (plugin.State == PluginState.UnloadError)
+        {
+            ImGuiComponents.DisabledButton(FontAwesomeIcon.Frown);
+
+            if (ImGui.IsItemHovered())
+                ImGui.SetTooltip(Locs.PluginButtonToolTip_UnloadFailed);
+        }
+        else if (disabled)
+        {
+            ImGuiComponents.DisabledToggleButton(toggleId, isLoadedAndUnloadable);
+        }
+        else
+        {
+            if (ImGuiComponents.ToggleButton(toggleId, ref isLoadedAndUnloadable))
+            {
+                if (!isLoadedAndUnloadable)
+                {
+                    this.enableDisableStatus = OperationStatus.InProgress;
+                    this.loadingIndicatorKind = LoadingIndicatorKind.DisablingSingle;
+
+                    Task.Run(() =>
+                    {
+                        if (plugin.IsDev)
+                        {
+                            plugin.ReloadManifest();
+                        }
+
+                        var unloadTask = Task.Run(() => plugin.UnloadAsync())
+                                             .ContinueWith(this.DisplayErrorContinuation, Locs.ErrorModal_UnloadFail(plugin.Name));
+
+                        unloadTask.Wait();
+                        if (!unloadTask.Result)
+                        {
+                            this.enableDisableStatus = OperationStatus.Complete;
+                            return;
+                        }
+
+                        var disableTask = Task.Run(() => plugin.Disable())
+                                              .ContinueWith(this.DisplayErrorContinuation, Locs.ErrorModal_DisableFail(plugin.Name));
+
+                        disableTask.Wait();
+                        this.enableDisableStatus = OperationStatus.Complete;
+
+                        if (!disableTask.Result)
+                            return;
+
+                        notifications.AddNotification(Locs.Notifications_PluginDisabled(plugin.Manifest.Name), Locs.Notifications_PluginDisabledTitle, NotificationType.Success);
+                    });
+                }
+                else
+                {
+                    var enabler = new Task(() =>
+                    {
+                        this.enableDisableStatus = OperationStatus.InProgress;
+                        this.loadingIndicatorKind = LoadingIndicatorKind.EnablingSingle;
+
+                        if (plugin.IsDev)
+                        {
+                            plugin.ReloadManifest();
+                        }
+
+                        var enableTask = Task.Run(plugin.Enable)
+                                             .ContinueWith(
+                                                 this.DisplayErrorContinuation,
+                                                 Locs.ErrorModal_EnableFail(plugin.Name));
+
+                        enableTask.Wait();
+                        if (!enableTask.Result)
+                        {
+                            this.enableDisableStatus = OperationStatus.Complete;
+                            return;
+                        }
+
+                        var loadTask = Task.Run(() => plugin.LoadAsync(PluginLoadReason.Installer))
+                                           .ContinueWith(
+                                               this.DisplayErrorContinuation,
+                                               Locs.ErrorModal_LoadFail(plugin.Name));
+
+                        loadTask.Wait();
+                        this.enableDisableStatus = OperationStatus.Complete;
+
+                        if (!loadTask.Result)
+                            return;
+
+                        notifications.AddNotification(
+                            Locs.Notifications_PluginEnabled(plugin.Manifest.Name),
+                            Locs.Notifications_PluginEnabledTitle,
+                            NotificationType.Success);
+                    });
+
+                    if (availableUpdate != default && !availableUpdate.InstalledPlugin.IsDev)
+                    {
+                        this.ShowUpdateModal(plugin).ContinueWith(async t =>
+                        {
+                            var shouldUpdate = t.Result;
+
+                            if (shouldUpdate)
+                            {
+                                await this.UpdateSinglePlugin(availableUpdate);
+                            }
+                            else
+                            {
+                                enabler.Start();
+                            }
+                        });
+                    }
+                    else
+                    {
+                        enabler.Start();
+                    }
+                }
+            }
+        }
+
+        StyleModelV1.DalamudStandard.Pop();
+
+        ImGui.SameLine();
+        ImGuiHelpers.ScaledDummy(15, 0);
+
+        if (plugin.State == PluginState.Loaded)
+        {
+            // Only if the plugin isn't broken.
+            this.DrawOpenPluginSettingsButton(plugin);
+        }
+    }
+
+    private async Task<bool> UpdateSinglePlugin(AvailablePluginUpdate update)
+    {
+        var pluginManager = Service<PluginManager>.Get();
+
+        this.installStatus = OperationStatus.InProgress;
+        this.loadingIndicatorKind = LoadingIndicatorKind.UpdatingSingle;
+
+        return await Task.Run(async () => await pluginManager.UpdateSinglePluginAsync(update, true, false))
+                         .ContinueWith(task =>
+                         {
+                             // There is no need to set as Complete for an individual plugin installation
+                             this.installStatus = OperationStatus.Idle;
+
+                             var errorMessage = Locs.ErrorModal_SingleUpdateFail(update.UpdateManifest.Name);
+                             return this.DisplayErrorContinuation(task, errorMessage);
+                         });
+    }
+
+    private void DrawUpdateSinglePluginButton(AvailablePluginUpdate update)
+    {
+        ImGui.SameLine();
+
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.Download))
+        {
+            Task.Run(() => this.UpdateSinglePlugin(update));
+        }
+
+        if (ImGui.IsItemHovered())
+        {
+            var updateVersion = update.UseTesting
+                                    ? update.UpdateManifest.TestingAssemblyVersion
+                                    : update.UpdateManifest.AssemblyVersion;
+            ImGui.SetTooltip(Locs.PluginButtonToolTip_UpdateSingle(updateVersion.ToString()));
+        }
+    }
+
+    private void DrawOpenPluginSettingsButton(LocalPlugin plugin)
+    {
+        if (plugin.DalamudInterface?.UiBuilder?.HasConfigUi ?? false)
+        {
+            ImGui.SameLine();
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Cog))
+            {
+                try
+                {
+                    plugin.DalamudInterface.UiBuilder.OpenConfig();
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex, $"Error during OpenConfigUi: {plugin.Name}");
+                }
+            }
+
+            if (ImGui.IsItemHovered())
+            {
+                ImGui.SetTooltip(Locs.PluginButtonToolTip_OpenConfiguration);
+            }
+        }
+    }
+
+    private void DrawSendFeedbackButton(PluginManifest manifest, bool isTesting)
+    {
+        ImGui.SameLine();
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.Comment))
+        {
+            this.feedbackPlugin = manifest;
+            this.feedbackModalOnNextFrame = true;
+            this.feedbackIsTesting = isTesting;
+        }
+
+        if (ImGui.IsItemHovered())
+        {
+            ImGui.SetTooltip(Locs.FeedbackModal_Title);
+        }
+    }
+
+    private void DrawDevPluginButtons(LocalPlugin localPlugin)
+    {
+        ImGui.SameLine();
+
+        var configuration = Service<DalamudConfiguration>.Get();
+
+        if (localPlugin is LocalDevPlugin plugin)
+        {
+            // https://colorswall.com/palette/2868/
+            var greenColor = new Vector4(0x5C, 0xB8, 0x5C, 0xFF) / 0xFF;
+            var redColor = new Vector4(0xD9, 0x53, 0x4F, 0xFF) / 0xFF;
+
+            // Load on boot
+            ImGui.PushStyleColor(ImGuiCol.Button, plugin.StartOnBoot ? greenColor : redColor);
+            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, plugin.StartOnBoot ? greenColor : redColor);
+
+            ImGui.SameLine();
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.PowerOff))
+            {
+                plugin.StartOnBoot ^= true;
+                configuration.Save();
+            }
+
+            ImGui.PopStyleColor(2);
+
+            if (ImGui.IsItemHovered())
+            {
+                ImGui.SetTooltip(Locs.PluginButtonToolTip_StartOnBoot);
+            }
+
+            // Automatic reload
+            ImGui.PushStyleColor(ImGuiCol.Button, plugin.AutomaticReload ? greenColor : redColor);
+            ImGui.PushStyleColor(ImGuiCol.ButtonHovered, plugin.AutomaticReload ? greenColor : redColor);
+
+            ImGui.SameLine();
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.SyncAlt))
+            {
+                plugin.AutomaticReload ^= true;
+                configuration.Save();
+            }
+
+            ImGui.PopStyleColor(2);
+
+            if (ImGui.IsItemHovered())
+            {
+                ImGui.SetTooltip(Locs.PluginButtonToolTip_AutomaticReloading);
+            }
+        }
+    }
+
+    private void DrawDeletePluginButton(LocalPlugin plugin)
+    {
+        /*var unloaded = plugin.State == PluginState.Unloaded || plugin.State == PluginState.LoadError;
+
+        // When policy check fails, the plugin is never loaded
+        var showButton = unloaded && (plugin.IsDev || plugin.IsOutdated || plugin.IsBanned || plugin.IsOrphaned || !plugin.CheckPolicy());
+
+        if (!showButton)
+            return;*/
+
+        var pluginManager = Service<PluginManager>.Get();
+
+        var devNotDeletable = plugin.IsDev && plugin.State != PluginState.Unloaded && plugin.State != PluginState.DependencyResolutionFailed;
+
+        ImGui.SameLine();
+        if (plugin.State == PluginState.Loaded || devNotDeletable)
+        {
+            ImGui.PushFont(InterfaceManager.IconFont);
+            ImGuiComponents.DisabledButton(FontAwesomeIcon.TrashAlt.ToIconString());
+            ImGui.PopFont();
+
+            if (ImGui.IsItemHovered())
+            {
+                ImGui.SetTooltip(plugin.State == PluginState.Loaded
+                                     ? Locs.PluginButtonToolTip_DeletePluginLoaded
+                                     : Locs.PluginButtonToolTip_DeletePluginRestricted);
+            }
+        }
+        else
+        {
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.TrashAlt))
+            {
+                try
+                {
+                    if (plugin.IsDev)
+                    {
+                        plugin.DllFile.Delete();
+                    }
+                    else
+                    {
+                        plugin.ScheduleDeletion(!plugin.Manifest.ScheduledForDeletion);
+                    }
+
+                    if (plugin.State is PluginState.Unloaded or PluginState.DependencyResolutionFailed)
+                    {
+                        pluginManager.RemovePlugin(plugin);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex, $"Plugin installer threw an error during removal of {plugin.Name}");
+
+                    this.ShowErrorModal(Locs.ErrorModal_DeleteFail(plugin.Name));
+                }
+            }
+
+            if (ImGui.IsItemHovered())
+            {
+                string tooltipMessage;
+                if (plugin.Manifest.ScheduledForDeletion)
+                {
+                    tooltipMessage = Locs.PluginButtonToolTip_DeletePluginScheduledCancel;
+                }
+                else if (plugin.State is PluginState.Unloaded or PluginState.DependencyResolutionFailed)
+                {
+                    tooltipMessage = Locs.PluginButtonToolTip_DeletePlugin;
+                }
+                else
+                {
+                    tooltipMessage = Locs.PluginButtonToolTip_DeletePluginScheduled;
+                }
+
+                ImGui.SetTooltip(tooltipMessage);
+            }
+        }
+    }
+
+    private void DrawVisitRepoUrlButton(string? repoUrl)
+    {
+        if (!string.IsNullOrEmpty(repoUrl) && repoUrl.StartsWith("https://"))
+        {
+            ImGui.SameLine();
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Globe))
+            {
+                try
+                {
+                    _ = Process.Start(new ProcessStartInfo()
+                    {
+                        FileName = repoUrl,
+                        UseShellExecute = true,
+                    });
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex, $"Could not open repoUrl: {repoUrl}");
+                }
+            }
+
+            if (ImGui.IsItemHovered())
+                ImGui.SetTooltip(Locs.PluginButtonToolTip_VisitPluginUrl);
+        }
+    }
+
+    private bool DrawPluginImages(LocalPlugin? plugin, PluginManifest manifest, bool isThirdParty, int index)
+    {
+        var hasImages = this.imageCache.TryGetImages(plugin, manifest, isThirdParty, out var imageTextures);
+        if (!hasImages || imageTextures.All(x => x == null))
+            return false;
+
+        const float thumbFactor = 2.7f;
+
+        var scrollBarSize = 15;
+        ImGui.PushStyleVar(ImGuiStyleVar.ScrollbarSize, scrollBarSize);
+        ImGui.PushStyleColor(ImGuiCol.ScrollbarBg, Vector4.Zero);
+
+        var width = ImGui.GetWindowWidth();
+
+        if (ImGui.BeginChild($"plugin{index}ImageScrolling", new Vector2(width - (70 * ImGuiHelpers.GlobalScale), (PluginImageCache.PluginImageHeight / thumbFactor) + scrollBarSize), false, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoScrollWithMouse | ImGuiWindowFlags.NoBackground))
+        {
+            for (var i = 0; i < imageTextures.Length; i++)
+            {
+                var image = imageTextures[i];
+                if (image == null)
+                    continue;
+
+                ImGui.PushStyleVar(ImGuiStyleVar.PopupBorderSize, 0);
+                ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
+                ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
+
+                var popupId = $"plugin{index}image{i}";
+                if (ImGui.BeginPopup(popupId))
+                {
+                    if (ImGui.ImageButton(image.ImGuiHandle, new Vector2(image.Width, image.Height)))
+                        ImGui.CloseCurrentPopup();
+
+                    ImGui.EndPopup();
+                }
+
+                ImGui.PopStyleVar(3);
+
+                ImGui.PushStyleVar(ImGuiStyleVar.FramePadding, Vector2.Zero);
+
+                float xAct = image.Width;
+                float yAct = image.Height;
+                float xMax = PluginImageCache.PluginImageWidth;
+                float yMax = PluginImageCache.PluginImageHeight;
+
+                // scale image if undersized
+                if (xAct < xMax && yAct < yMax)
+                {
+                    var scale = Math.Min(xMax / xAct, yMax / yAct);
+                    xAct *= scale;
+                    yAct *= scale;
+                }
+
+                var size = ImGuiHelpers.ScaledVector2(xAct / thumbFactor, yAct / thumbFactor);
+                if (ImGui.ImageButton(image.ImGuiHandle, size))
+                    ImGui.OpenPopup(popupId);
+
+                ImGui.PopStyleVar();
+
+                if (i < imageTextures.Length - 1)
+                {
+                    ImGui.SameLine();
+                    ImGuiHelpers.ScaledDummy(5);
+                    ImGui.SameLine();
+                }
+            }
+        }
+
+        ImGui.EndChild();
+
+        ImGui.PopStyleVar();
+        ImGui.PopStyleColor();
+
+        return true;
+    }
+
+    private bool IsManifestFiltered(PluginManifest manifest)
+    {
+        var searchString = this.searchText.ToLowerInvariant();
+        var hasSearchString = !string.IsNullOrWhiteSpace(searchString);
+        var oldApi = manifest.DalamudApiLevel < PluginManager.DalamudApiLevel;
+        var installed = this.IsManifestInstalled(manifest).IsInstalled;
+
+        if (oldApi && !hasSearchString && !installed)
+            return true;
+
+        return hasSearchString && !(
+                                       manifest.Name.ToLowerInvariant().Contains(searchString) ||
+                                       manifest.InternalName.ToLowerInvariant().Contains(searchString) ||
+                                       (!manifest.Author.IsNullOrEmpty() && manifest.Author.Equals(this.searchText, StringComparison.InvariantCultureIgnoreCase)) ||
+                                       (!manifest.Punchline.IsNullOrEmpty() && manifest.Punchline.ToLowerInvariant().Contains(searchString)) ||
+                                       (manifest.Tags != null && manifest.Tags.Contains(searchString, StringComparer.InvariantCultureIgnoreCase)));
+    }
+
+    private (bool IsInstalled, LocalPlugin Plugin) IsManifestInstalled(PluginManifest? manifest)
+    {
+        if (manifest == null) return (false, default);
+
+        var plugin = this.pluginListInstalled.FirstOrDefault(plugin => plugin.Manifest.InternalName == manifest.InternalName);
+        var isInstalled = plugin != default;
+
+        return (isInstalled, plugin);
+    }
+
+    private void OnAvailablePluginsChanged()
+    {
+        var pluginManager = Service<PluginManager>.Get();
+
+        // By removing installed plugins only when the available plugin list changes (basically when the window is
+        // opened), plugins that have been newly installed remain in the available plugin list as installed.
+        this.pluginListAvailable = pluginManager.AvailablePlugins.ToList();
+        this.pluginListUpdatable = pluginManager.UpdatablePlugins.ToList();
+        this.ResortPlugins();
+
+        this.UpdateCategoriesOnPluginsChange();
+    }
+
+    private void OnInstalledPluginsChanged()
+    {
+        var pluginManager = Service<PluginManager>.Get();
+
+        this.pluginListInstalled = pluginManager.InstalledPlugins.ToList();
+        this.pluginListUpdatable = pluginManager.UpdatablePlugins.ToList();
+        this.hasDevPlugins = this.pluginListInstalled.Any(plugin => plugin.IsDev);
+        this.ResortPlugins();
+
+        this.UpdateCategoriesOnPluginsChange();
+    }
+
+    private void ResortPlugins()
+    {
+        switch (this.sortKind)
+        {
+            case PluginSortKind.Alphabetical:
+                this.pluginListAvailable.Sort((p1, p2) => p1.Name.CompareTo(p2.Name));
+                this.pluginListInstalled.Sort((p1, p2) => p1.Manifest.Name.CompareTo(p2.Manifest.Name));
+                break;
+            case PluginSortKind.DownloadCount:
+                this.pluginListAvailable.Sort((p1, p2) => p2.DownloadCount.CompareTo(p1.DownloadCount));
+                this.pluginListInstalled.Sort((p1, p2) => p2.Manifest.DownloadCount.CompareTo(p1.Manifest.DownloadCount));
+                break;
+            case PluginSortKind.LastUpdate:
+                this.pluginListAvailable.Sort((p1, p2) => p2.LastUpdate.CompareTo(p1.LastUpdate));
+                this.pluginListInstalled.Sort((p1, p2) => p2.Manifest.LastUpdate.CompareTo(p1.Manifest.LastUpdate));
+                break;
+            case PluginSortKind.NewOrNot:
+                this.pluginListAvailable.Sort((p1, p2) => this.WasPluginSeen(p1.InternalName)
+                                                              .CompareTo(this.WasPluginSeen(p2.InternalName)));
+                this.pluginListInstalled.Sort((p1, p2) => this.WasPluginSeen(p1.Manifest.InternalName)
+                                                              .CompareTo(this.WasPluginSeen(p2.Manifest.InternalName)));
+                break;
+            case PluginSortKind.NotInstalled:
+                this.pluginListAvailable.Sort((p1, p2) => this.pluginListInstalled.Any(x => x.Manifest.InternalName == p1.InternalName)
+                                                              .CompareTo(this.pluginListInstalled.Any(x => x.Manifest.InternalName == p2.InternalName)));
+                this.pluginListInstalled.Sort((p1, p2) => p1.Manifest.Name.CompareTo(p2.Manifest.Name)); // Makes no sense for installed plugins
+                break;
+            default:
+                throw new InvalidEnumArgumentException("Unknown plugin sort type.");
+        }
+    }
+
+    private bool WasPluginSeen(string internalName) =>
+        Service<DalamudConfiguration>.Get().SeenPluginInternalName.Contains(internalName);
+
+    /// <summary>
+    /// A continuation task that displays any errors received into the error modal.
+    /// </summary>
+    /// <param name="task">The previous task.</param>
+    /// <param name="state">An error message to be displayed.</param>
+    /// <returns>A value indicating whether to continue with the next task.</returns>
+    private bool DisplayErrorContinuation(Task task, object state)
+    {
+        if (task.IsFaulted)
+        {
+            var errorModalMessage = state as string;
+
+            foreach (var ex in task.Exception.InnerExceptions)
+            {
+                if (ex is PluginException)
+                {
+                    Log.Error(ex, "Plugin installer threw an error");
+#if DEBUG
+                        if (!string.IsNullOrEmpty(ex.Message))
+                            errorModalMessage += $"\n\n{ex.Message}";
+#endif
+                }
+                else
+                {
+                    Log.Error(ex, "Plugin installer threw an unexpected error");
+#if DEBUG
+                        if (!string.IsNullOrEmpty(ex.Message))
+                            errorModalMessage += $"\n\n{ex.Message}";
+#endif
+                }
+            }
+
+            this.ShowErrorModal(errorModalMessage);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    private Task ShowErrorModal(string message)
+    {
+        this.errorModalMessage = message;
+        this.errorModalDrawing = true;
+        this.errorModalOnNextFrame = true;
+        this.errorModalTaskCompletionSource = new TaskCompletionSource();
+        return this.errorModalTaskCompletionSource.Task;
+    }
+
+    private Task<bool> ShowUpdateModal(LocalPlugin plugin)
+    {
+        this.updateModalOnNextFrame = true;
+        this.updateModalPlugin = plugin;
+        this.updateModalTaskCompletionSource = new TaskCompletionSource<bool>();
+        return this.updateModalTaskCompletionSource.Task;
+    }
+
+    private void UpdateCategoriesOnSearchChange()
+    {
+        if (string.IsNullOrEmpty(this.searchText))
+        {
+            this.categoryManager.SetCategoryHighlightsForPlugins(null);
+        }
+        else
+        {
+            var pluginsMatchingSearch = this.pluginListAvailable.Where(rm => !this.IsManifestFiltered(rm));
+            this.categoryManager.SetCategoryHighlightsForPlugins(pluginsMatchingSearch);
+        }
+    }
+
+    private void UpdateCategoriesOnPluginsChange()
+    {
+        this.categoryManager.BuildCategories(this.pluginListAvailable);
+        this.UpdateCategoriesOnSearchChange();
+    }
+
+    [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "Disregard here")]
+    private static class Locs
+    {
+        #region Window Title
+
+        public static string WindowTitle => Loc.Localize("InstallerHeader", "Plugin Installer");
+
+        public static string WindowTitleMod_Testing => Loc.Localize("InstallerHeaderTesting", " (TESTING)");
+
+        #endregion
+
+        #region Header
+
+        public static string Header_Hint => Loc.Localize("InstallerHint", "This window allows you to install and remove in-game plugins.\nThey are made by third-party developers.");
+
+        public static string Header_SearchPlaceholder => Loc.Localize("InstallerSearch", "Search");
+
+        #endregion
+
+        #region SortBy
+
+        public static string SortBy_Alphabetical => Loc.Localize("InstallerAlphabetical", "Alphabetical");
+
+        public static string SortBy_DownloadCounts => Loc.Localize("InstallerDownloadCount", "Download Count");
+
+        public static string SortBy_LastUpdate => Loc.Localize("InstallerLastUpdate", "Last Update");
+
+        public static string SortBy_NewOrNot => Loc.Localize("InstallerNewOrNot", "New or not");
+
+        public static string SortBy_NotInstalled => Loc.Localize("InstallerNotInstalled", "Not Installed");
+
+        public static string SortBy_Label => Loc.Localize("InstallerSortBy", "Sort By");
+
+        #endregion
+
+        #region Tab body
+
+        public static string TabBody_LoadingPlugins => Loc.Localize("InstallerLoading", "Loading plugins...");
+
+        public static string TabBody_DownloadFailed => Loc.Localize("InstallerDownloadFailed", "Download failed.");
+
+        public static string TabBody_SafeMode => Loc.Localize("InstallerSafeMode", "Dalamud is running in Plugin Safe Mode, restart to activate plugins.");
+
+        #endregion
+
+        #region Search text
+
+        public static string TabBody_SearchNoMatching => Loc.Localize("InstallerNoMatching", "No plugins were found matching your search.");
+
+        public static string TabBody_SearchNoCompatible => Loc.Localize("InstallerNoCompatible", "No compatible plugins were found :( Please restart your game and try again.");
+
+        public static string TabBody_SearchNoInstalled => Loc.Localize("InstallerNoInstalled", "No plugins are currently installed. You can install them from the \"All Plugins\" tab.");
+
+        public static string TabBody_ChangelogNone => Loc.Localize("InstallerNoChangelog", "None of your installed plugins have a changelog.");
+
+        #endregion
+
+        #region Plugin title text
+
+        public static string PluginTitleMod_Installed => Loc.Localize("InstallerInstalled", " (installed)");
+
+        public static string PluginTitleMod_Disabled => Loc.Localize("InstallerDisabled", " (disabled)");
+
+        public static string PluginTitleMod_Unloaded => Loc.Localize("InstallerUnloaded", " (unloaded)");
+
+        public static string PluginTitleMod_HasUpdate => Loc.Localize("InstallerHasUpdate", " (has update)");
+
+        public static string PluginTitleMod_Updated => Loc.Localize("InstallerUpdated", " (updated)");
+
+        public static string PluginTitleMod_TestingVersion => Loc.Localize("InstallerTestingVersion", " (testing version)");
+
+        public static string PluginTitleMod_TestingAvailable => Loc.Localize("InstallerTestingAvailable", " (available for testing)");
+
+        public static string PluginTitleMod_DevPlugin => Loc.Localize("InstallerDevPlugin", " (dev plugin)");
+
+        public static string PluginTitleMod_UpdateFailed => Loc.Localize("InstallerUpdateFailed", " (update failed)");
+
+        public static string PluginTitleMod_LoadError => Loc.Localize("InstallerLoadError", " (load error)");
+
+        public static string PluginTitleMod_UnloadError => Loc.Localize("InstallerUnloadError", " (unload error)");
+
+        public static string PluginTitleMod_OutdatedError => Loc.Localize("InstallerOutdatedError", " (outdated)");
+
+        public static string PluginTitleMod_BannedError => Loc.Localize("InstallerBannedError", " (automatically disabled)");
+
+        public static string PluginTitleMod_OrphanedError => Loc.Localize("InstallerOrphanedError", " (unknown repository)");
+
+        public static string PluginTitleMod_ScheduledForDeletion => Loc.Localize("InstallerScheduledForDeletion", " (scheduled for deletion)");
+
+        public static string PluginTitleMod_New => Loc.Localize("InstallerNewPlugin ", " New!");
+
+        #endregion
+
+        #region Plugin context menu
+
+        public static string PluginContext_TestingOptIn => Loc.Localize("InstallerTestingOptIn", "Receive plugin testing versions");
+
+        public static string PluginContext_MarkAllSeen => Loc.Localize("InstallerMarkAllSeen", "Mark all as seen");
+
+        public static string PluginContext_HidePlugin => Loc.Localize("InstallerHidePlugin", "Hide from installer");
+
+        public static string PluginContext_DeletePluginConfig => Loc.Localize("InstallerDeletePluginConfig", "Reset plugin configuration");
+
+        public static string PluginContext_DeletePluginConfigReload => Loc.Localize("InstallerDeletePluginConfigReload", "Reset plugin configuration and reload");
+
+        #endregion
+
+        #region Plugin body
+
+        public static string PluginBody_AuthorWithoutDownloadCount(string author) => Loc.Localize("InstallerAuthorWithoutDownloadCount", " by {0}").Format(author);
+
+        public static string PluginBody_AuthorWithDownloadCount(string author, long count) => Loc.Localize("InstallerAuthorWithDownloadCount", " by {0} ({1} downloads)").Format(author, count.ToString("N0"));
+
+        public static string PluginBody_AuthorWithDownloadCountUnavailable(string author) => Loc.Localize("InstallerAuthorWithDownloadCountUnavailable", " by {0}").Format(author);
+
+        public static string PluginBody_CurrentChangeLog(Version version) => Loc.Localize("InstallerCurrentChangeLog", "Changelog (v{0})").Format(version);
+
+        public static string PluginBody_UpdateChangeLog(Version version) => Loc.Localize("InstallerUpdateChangeLog", "Available update changelog (v{0})").Format(version);
+
+        public static string PluginBody_DevPluginPath(string path) => Loc.Localize("InstallerDevPluginPath", "From {0}").Format(path);
+
+        public static string PluginBody_Plugin3rdPartyRepo(string url) => Loc.Localize("InstallerPlugin3rdPartyRepo", "From custom plugin repository {0}").Format(url);
+
+        public static string PluginBody_AvailableDevPlugin => Loc.Localize("InstallerDevPlugin", " This plugin is available in one of your repos, please remove it from the devPlugins folder.");
+
+        public static string PluginBody_Outdated => Loc.Localize("InstallerOutdatedPluginBody ", "This plugin is outdated and incompatible at the moment. Please wait for it to be updated by its author.");
+
+        public static string PluginBody_Orphaned => Loc.Localize("InstallerOrphanedPluginBody ", "This plugin's source repository is no longer available. You may need to reinstall it from its repository, or re-add the repository.");
+
+        public static string PluginBody_LoadFailed => Loc.Localize("InstallerLoadFailedPluginBody ", "This plugin failed to load. Please contact the author for more information.");
+
+        public static string PluginBody_Banned => Loc.Localize("InstallerBannedPluginBody ", "This plugin was automatically disabled due to incompatibilities and is not available at the moment. Please wait for it to be updated by its author.");
+
+        public static string PluginBody_Policy => Loc.Localize("InstallerPolicyPluginBody ", "Plugin loads for this type of plugin were manually disabled.");
+
+        public static string PluginBody_BannedReason(string message) =>
+            Loc.Localize("InstallerBannedPluginBodyReason ", "This plugin was automatically disabled: {0}").Format(message);
+
+        #endregion
+
+        #region Plugin buttons
+
+        public static string PluginButton_InstallVersion(string version) => Loc.Localize("InstallerInstall", "Install v{0}").Format(version);
+
+        public static string PluginButton_Working => Loc.Localize("InstallerWorking", "Working");
+
+        public static string PluginButton_Disable => Loc.Localize("InstallerDisable", "Disable");
+
+        public static string PluginButton_Load => Loc.Localize("InstallerLoad", "Load");
+
+        public static string PluginButton_Unload => Loc.Localize("InstallerUnload", "Unload");
+
+        public static string PluginButton_SafeMode => Loc.Localize("InstallerSafeModeButton", "Can't change in safe mode");
+
+        #endregion
+
+        #region Plugin button tooltips
+
+        public static string PluginButtonToolTip_OpenConfiguration => Loc.Localize("InstallerOpenConfig", "Open Configuration");
+
+        public static string PluginButtonToolTip_StartOnBoot => Loc.Localize("InstallerStartOnBoot", "Start on boot");
+
+        public static string PluginButtonToolTip_AutomaticReloading => Loc.Localize("InstallerAutomaticReloading", "Automatic reloading");
+
+        public static string PluginButtonToolTip_DeletePlugin => Loc.Localize("InstallerDeletePlugin ", "Delete plugin");
+
+        public static string PluginButtonToolTip_DeletePluginRestricted => Loc.Localize("InstallerDeletePluginRestricted", "Cannot delete right now - please restart the game.");
+
+        public static string PluginButtonToolTip_DeletePluginScheduled => Loc.Localize("InstallerDeletePluginScheduled", "Delete plugin on next restart");
+
+        public static string PluginButtonToolTip_DeletePluginScheduledCancel => Loc.Localize("InstallerDeletePluginScheduledCancel", "Cancel scheduled deletion");
+
+        public static string PluginButtonToolTip_DeletePluginLoaded => Loc.Localize("InstallerDeletePluginLoaded", "Disable this plugin before deleting it.");
+
+        public static string PluginButtonToolTip_VisitPluginUrl => Loc.Localize("InstallerVisitPluginUrl", "Visit plugin URL");
+
+        public static string PluginButtonToolTip_UpdateSingle(string version) => Loc.Localize("InstallerUpdateSingle", "Update to {0}").Format(version);
+
+        public static string PluginButtonToolTip_UnloadFailed => Loc.Localize("InstallerUnloadFailedTooltip", "Plugin unload failed, please restart your game and try again.");
+
+        #endregion
+
+        #region Notifications
+
+        public static string Notifications_PluginInstalledTitle => Loc.Localize("NotificationsPluginInstalledTitle", "Plugin installed!");
+
+        public static string Notifications_PluginInstalled(string name) => Loc.Localize("NotificationsPluginInstalled", "'{0}' was successfully installed.").Format(name);
+
+        public static string Notifications_PluginNotInstalledTitle => Loc.Localize("NotificationsPluginNotInstalledTitle", "Plugin not installed!");
+
+        public static string Notifications_PluginNotInstalled(string name) => Loc.Localize("NotificationsPluginNotInstalled", "'{0}' failed to install.").Format(name);
+
+        public static string Notifications_NoUpdatesFoundTitle => Loc.Localize("NotificationsNoUpdatesFoundTitle", "No updates found!");
+
+        public static string Notifications_NoUpdatesFound => Loc.Localize("NotificationsNoUpdatesFound", "No updates were found.");
+
+        public static string Notifications_UpdatesInstalledTitle => Loc.Localize("NotificationsUpdatesInstalledTitle", "Updates installed!");
+
+        public static string Notifications_UpdatesInstalled(int count) => Loc.Localize("NotificationsUpdatesInstalled", "Updates for {0} of your plugins were installed.").Format(count);
+
+        public static string Notifications_PluginDisabledTitle => Loc.Localize("NotificationsPluginDisabledTitle", "Plugin disabled!");
+
+        public static string Notifications_PluginDisabled(string name) => Loc.Localize("NotificationsPluginDisabled", "'{0}' was disabled.").Format(name);
+
+        public static string Notifications_PluginEnabledTitle => Loc.Localize("NotificationsPluginEnabledTitle", "Plugin enabled!");
+
+        public static string Notifications_PluginEnabled(string name) => Loc.Localize("NotificationsPluginEnabled", "'{0}' was enabled.").Format(name);
+
+        #endregion
+
+        #region Footer
+
+        public static string FooterButton_UpdatePlugins => Loc.Localize("InstallerUpdatePlugins", "Update plugins");
+
+        public static string FooterButton_UpdateSafeMode => Loc.Localize("InstallerUpdateSafeMode", "Can't update in safe mode");
+
+        public static string FooterButton_InProgress => Loc.Localize("InstallerInProgress", "Install in progress...");
+
+        public static string FooterButton_NoUpdates => Loc.Localize("InstallerNoUpdates", "No updates found!");
+
+        public static string FooterButton_UpdateComplete(int count) => Loc.Localize("InstallerUpdateComplete", "{0} plugins updated!").Format(count);
+
+        public static string FooterButton_Settings => Loc.Localize("InstallerSettings", "Settings");
+
+        public static string FooterButton_ScanDevPlugins => Loc.Localize("InstallerScanDevPlugins", "Scan Dev Plugins");
+
+        public static string FooterButton_Close => Loc.Localize("InstallerClose", "Close");
+
+        #endregion
+
+        #region Update modal
+
+        public static string UpdateModal_Title => Loc.Localize("UpdateQuestionModal", "Update Available");
+
+        public static string UpdateModal_UpdateAvailable(string name) => Loc.Localize("UpdateModalUpdateAvailable", "An update for \"{0}\" is available.\nDo you want to update it before enabling?\nUpdates will fix bugs and incompatibilities, and may add new features.").Format(name);
+
+        public static string UpdateModal_Yes => Loc.Localize("UpdateModalYes", "Update plugin");
+
+        public static string UpdateModal_No => Loc.Localize("UpdateModalNo", "Just enable");
+
+        #endregion
+
+        #region Error modal
+
+        public static string ErrorModal_Title => Loc.Localize("InstallerError", "Installer Error");
+
+        public static string ErrorModal_InstallContactAuthor => Loc.Localize(
+            "InstallerContactAuthor",
+            "Please restart your game and try again. If this error occurs again, please contact the plugin author.");
+
+        public static string ErrorModal_InstallFail(string name) => Loc.Localize("InstallerInstallFail", "Failed to install plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
+
+        public static string ErrorModal_SingleUpdateFail(string name) => Loc.Localize("InstallerSingleUpdateFail", "Failed to update plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
+
+        public static string ErrorModal_DeleteConfigFail(string name) => Loc.Localize("InstallerDeleteConfigFail", "Failed to reset the plugin {0}.\n\nThe plugin may not support this action. You can try deleting the configuration manually while the game is shut down - please see the FAQ.").Format(name);
+
+        public static string ErrorModal_EnableFail(string name) => Loc.Localize("InstallerEnableFail", "Failed to enable plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
+
+        public static string ErrorModal_DisableFail(string name) => Loc.Localize("InstallerDisableFail", "Failed to disable plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
+
+        public static string ErrorModal_UnloadFail(string name) => Loc.Localize("InstallerUnloadFail", "Failed to unload plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
+
+        public static string ErrorModal_LoadFail(string name) => Loc.Localize("InstallerLoadFail", "Failed to load plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
+
+        public static string ErrorModal_DeleteFail(string name) => Loc.Localize("InstallerDeleteFail", "Failed to delete plugin {0}.\n{1}").Format(name, ErrorModal_InstallContactAuthor);
+
+        public static string ErrorModal_UpdaterFatal => Loc.Localize("InstallerUpdaterFatal", "Failed to update plugins.\nPlease restart your game and try again. If this error occurs again, please complain.");
+
+        public static string ErrorModal_UpdaterFail(int failCount) => Loc.Localize("InstallerUpdaterFail", "Failed to update {0} plugins.\nPlease restart your game and try again. If this error occurs again, please complain.").Format(failCount);
+
+        public static string ErrorModal_UpdaterFailPartial(int successCount, int failCount) => Loc.Localize("InstallerUpdaterFailPartial", "Updated {0} plugins, failed to update {1}.\nPlease restart your game and try again. If this error occurs again, please complain.").Format(successCount, failCount);
+
+        public static string ErrorModal_HintBlame(string plugins) => Loc.Localize("InstallerErrorPluginInfo", "\n\nThe following plugins caused these issues:\n\n{0}\nYou may try removing these plugins manually and reinstalling them.").Format(plugins);
+
+        // public static string ErrorModal_Hint => Loc.Localize("InstallerErrorHint", "The plugin installer ran into an issue or the plugin is incompatible.\nPlease restart the game and report this error on our discord.");
+
+        #endregion
+
+        #region Feedback Modal
+
+        public static string FeedbackModal_Title => Loc.Localize("InstallerFeedback", "Send Feedback");
+
+        public static string FeedbackModal_Text(string pluginName) => Loc.Localize("InstallerFeedbackInfo", "You can send feedback to the developer of \"{0}\" here.").Format(pluginName);
+
+        public static string FeedbackModal_HasUpdate => Loc.Localize("InstallerFeedbackHasUpdate", "A new version of this plugin is available, please update before reporting bugs.");
+
+        public static string FeedbackModal_ContactAnonymous => Loc.Localize("InstallerFeedbackContactAnonymous", "Submit feedback anonymously");
+
+        public static string FeedbackModal_ContactAnonymousWarning => Loc.Localize("InstallerFeedbackContactAnonymousWarning", "No response will be forthcoming.\nUntick \"{0}\" and provide contact information if you need help.").Format(FeedbackModal_ContactAnonymous);
+
+        public static string FeedbackModal_ContactInformation => Loc.Localize("InstallerFeedbackContactInfo", "Contact information");
+
+        public static string FeedbackModal_ContactInformationHelp => Loc.Localize("InstallerFeedbackContactInfoHelp", "Discord usernames and e-mail addresses are accepted.\nIf you submit a Discord username, please join our discord server so that we can reach out to you easier.");
+
+        public static string FeedbackModal_ContactInformationWarning => Loc.Localize("InstallerFeedbackContactInfoWarning", "Do not submit in-game character names.");
+
+        public static string FeedbackModal_ContactInformationRequired => Loc.Localize("InstallerFeedbackContactInfoRequired", "Contact information has not been provided. If you do not want to provide contact information, tick on \"{0}\" above.").Format(FeedbackModal_ContactAnonymous);
+
+        public static string FeedbackModal_ContactInformationDiscordButton => Loc.Localize("ContactInformationDiscordButton", "Join Goat Place Discord");
+
+        public static string FeedbackModal_ContactInformationDiscordUrl => Loc.Localize("ContactInformationDiscordUrl", "https://goat.place/");
+
+        public static string FeedbackModal_IncludeLastError => Loc.Localize("InstallerFeedbackIncludeLastError", "Include last error message");
+
+        public static string FeedbackModal_IncludeLastErrorHint => Loc.Localize("InstallerFeedbackIncludeLastErrorHint", "This option can give the plugin developer useful feedback on what exactly went wrong.");
+
+        public static string FeedbackModal_Hint => Loc.Localize("InstallerFeedbackHint", "All plugin developers will be able to see your feedback.\nPlease never include any personal or revealing information.\nIf you chose to include the last error message, information like your Windows username may be included.\n\nThe collected feedback is not stored on our end and immediately relayed to Discord.");
+
+        public static string FeedbackModal_NotificationSuccess => Loc.Localize("InstallerFeedbackNotificationSuccess", "Your feedback was sent successfully!");
+
+        public static string FeedbackModal_NotificationError => Loc.Localize("InstallerFeedbackNotificationError", "Your feedback could not be sent.");
+
+        #endregion
+
+        #region Plugin Update chatbox
+
+        public static string PluginUpdateHeader_Chatbox => Loc.Localize("DalamudPluginUpdates", "Updates:");
+
+        #endregion
+
+        #region Error modal buttons
+
+        public static string ErrorModalButton_Ok => Loc.Localize("OK", "OK");
+
+        #endregion
+
+        #region Other
+
+        public static string SafeModeDisclaimer => Loc.Localize("SafeModeDisclaimer", "You enabled safe mode, no plugins will be loaded.\nYou may delete plugins from the \"Installed plugins\" tab.\nSimply restart your game to disable safe mode.");
+
+        #endregion
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs b/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
index 4ae3655b2..5ea7f3db6 100644
--- a/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
@@ -12,276 +12,113 @@ using Dalamud.Plugin.Internal;
 using Dalamud.Plugin.Internal.Types;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// This window displays plugin statistics for troubleshooting.
+/// </summary>
+internal class PluginStatWindow : Window
 {
+    private bool showDalamudHooks;
+
     /// <summary>
-    /// This window displays plugin statistics for troubleshooting.
+    /// Initializes a new instance of the <see cref="PluginStatWindow"/> class.
     /// </summary>
-    internal class PluginStatWindow : Window
+    public PluginStatWindow()
+        : base("Plugin Statistics###DalamudPluginStatWindow")
     {
-        private bool showDalamudHooks;
+        this.RespectCloseHotkey = false;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PluginStatWindow"/> class.
-        /// </summary>
-        public PluginStatWindow()
-            : base("Plugin Statistics###DalamudPluginStatWindow")
+        this.Size = new Vector2(810, 520);
+        this.SizeCondition = ImGuiCond.FirstUseEver;
+    }
+
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        var pluginManager = Service<PluginManager>.Get();
+
+        ImGui.BeginTabBar("Stat Tabs");
+
+        if (ImGui.BeginTabItem("Draw times"))
         {
-            this.RespectCloseHotkey = false;
+            var doStats = UiBuilder.DoStats;
 
-            this.Size = new Vector2(810, 520);
-            this.SizeCondition = ImGuiCond.FirstUseEver;
-        }
-
-        /// <inheritdoc/>
-        public override void Draw()
-        {
-            var pluginManager = Service<PluginManager>.Get();
-
-            ImGui.BeginTabBar("Stat Tabs");
-
-            if (ImGui.BeginTabItem("Draw times"))
+            if (ImGui.Checkbox("Enable Draw Time Tracking", ref doStats))
             {
-                var doStats = UiBuilder.DoStats;
-
-                if (ImGui.Checkbox("Enable Draw Time Tracking", ref doStats))
-                {
-                    UiBuilder.DoStats = doStats;
-                }
-
-                if (doStats)
-                {
-                    ImGui.SameLine();
-                    if (ImGui.Button("Reset"))
-                    {
-                        foreach (var plugin in pluginManager.InstalledPlugins)
-                        {
-                            if (plugin.DalamudInterface != null)
-                            {
-                                plugin.DalamudInterface.UiBuilder.LastDrawTime = -1;
-                                plugin.DalamudInterface.UiBuilder.MaxDrawTime = -1;
-                                plugin.DalamudInterface.UiBuilder.DrawTimeHistory.Clear();
-                            }
-                        }
-                    }
-
-                    if (ImGui.BeginTable(
-                            "##PluginStatsDrawTimes",
-                            4,
-                            ImGuiTableFlags.RowBg
-                            | ImGuiTableFlags.SizingStretchProp
-                            | ImGuiTableFlags.Sortable
-                            | ImGuiTableFlags.Resizable
-                            | ImGuiTableFlags.ScrollY
-                            | ImGuiTableFlags.Reorderable
-                            | ImGuiTableFlags.Hideable))
-                    {
-                        ImGui.TableSetupScrollFreeze(0, 1);
-                        ImGui.TableSetupColumn("Plugin");
-                        ImGui.TableSetupColumn("Last", ImGuiTableColumnFlags.NoSort); // Changes too fast to sort
-                        ImGui.TableSetupColumn("Longest");
-                        ImGui.TableSetupColumn("Average");
-                        ImGui.TableHeadersRow();
-
-                        var loadedPlugins = pluginManager.InstalledPlugins.Where(plugin => plugin.State == PluginState.Loaded);
-
-                        var sortSpecs = ImGui.TableGetSortSpecs();
-                        loadedPlugins = sortSpecs.Specs.ColumnIndex switch
-                        {
-                            0 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
-                                     ? loadedPlugins.OrderBy(plugin => plugin.Name)
-                                     : loadedPlugins.OrderByDescending(plugin => plugin.Name),
-                            2 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
-                                     ? loadedPlugins.OrderBy(plugin => plugin.DalamudInterface?.UiBuilder.MaxDrawTime)
-                                     : loadedPlugins.OrderByDescending(plugin => plugin.DalamudInterface?.UiBuilder.MaxDrawTime),
-                            3 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
-                                     ? loadedPlugins.OrderBy(plugin => plugin.DalamudInterface?.UiBuilder.DrawTimeHistory.Average())
-                                     : loadedPlugins.OrderByDescending(plugin => plugin.DalamudInterface?.UiBuilder.DrawTimeHistory.Average()),
-                            _ => loadedPlugins,
-                        };
-
-                        foreach (var plugin in loadedPlugins)
-                        {
-                            ImGui.TableNextRow();
-
-                            ImGui.TableNextColumn();
-                            ImGui.Text(plugin.Manifest.Name);
-
-                            if (plugin.DalamudInterface != null)
-                            {
-                                ImGui.TableNextColumn();
-                                ImGui.Text($"{plugin.DalamudInterface.UiBuilder.LastDrawTime / 10000f:F4}ms");
-
-                                ImGui.TableNextColumn();
-                                ImGui.Text($"{plugin.DalamudInterface.UiBuilder.MaxDrawTime / 10000f:F4}ms");
-
-                                ImGui.TableNextColumn();
-                                ImGui.Text(plugin.DalamudInterface.UiBuilder.DrawTimeHistory.Count > 0
-                                               ? $"{plugin.DalamudInterface.UiBuilder.DrawTimeHistory.Average() / 10000f:F4}ms"
-                                               : "-");
-                            }
-                        }
-
-                        ImGui.EndTable();
-                    }
-                }
-
-                ImGui.EndTabItem();
+                UiBuilder.DoStats = doStats;
             }
 
-            if (ImGui.BeginTabItem("Framework times"))
+            if (doStats)
             {
-                var doStats = Framework.StatsEnabled;
-
-                if (ImGui.Checkbox("Enable Framework Update Tracking", ref doStats))
+                ImGui.SameLine();
+                if (ImGui.Button("Reset"))
                 {
-                    Framework.StatsEnabled = doStats;
-                }
-
-                if (doStats)
-                {
-                    ImGui.SameLine();
-                    if (ImGui.Button("Reset"))
+                    foreach (var plugin in pluginManager.InstalledPlugins)
                     {
-                        Framework.StatsHistory.Clear();
-                    }
-
-                    if (ImGui.BeginTable(
-                            "##PluginStatsFrameworkTimes",
-                            4,
-                            ImGuiTableFlags.RowBg
-                            | ImGuiTableFlags.SizingStretchProp
-                            | ImGuiTableFlags.Sortable
-                            | ImGuiTableFlags.Resizable
-                            | ImGuiTableFlags.ScrollY
-                            | ImGuiTableFlags.Reorderable
-                            | ImGuiTableFlags.Hideable))
-                    {
-                        ImGui.TableSetupScrollFreeze(0, 1);
-                        ImGui.TableSetupColumn("Method", ImGuiTableColumnFlags.None, 250);
-                        ImGui.TableSetupColumn("Last", ImGuiTableColumnFlags.NoSort, 50); // Changes too fast to sort
-                        ImGui.TableSetupColumn("Longest", ImGuiTableColumnFlags.None, 50);
-                        ImGui.TableSetupColumn("Average", ImGuiTableColumnFlags.None, 50);
-                        ImGui.TableHeadersRow();
-
-                        var statsHistory = Framework.StatsHistory.ToArray();
-
-                        var sortSpecs = ImGui.TableGetSortSpecs();
-                        statsHistory = sortSpecs.Specs.ColumnIndex switch
+                        if (plugin.DalamudInterface != null)
                         {
-                            0 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
-                                     ? statsHistory.OrderBy(handler => handler.Key).ToArray()
-                                     : statsHistory.OrderByDescending(handler => handler.Key).ToArray(),
-                            2 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
-                                     ? statsHistory.OrderBy(handler => handler.Value.Max()).ToArray()
-                                     : statsHistory.OrderByDescending(handler => handler.Value.Max()).ToArray(),
-                            3 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
-                                     ? statsHistory.OrderBy(handler => handler.Value.Average()).ToArray()
-                                     : statsHistory.OrderByDescending(handler => handler.Value.Average()).ToArray(),
-                            _ => statsHistory,
-                        };
-
-                        foreach (var handlerHistory in statsHistory)
-                        {
-                            ImGui.TableNextRow();
-
-                            ImGui.TableNextColumn();
-                            ImGui.Text($"{handlerHistory.Key}");
-
-                            ImGui.TableNextColumn();
-                            ImGui.Text($"{handlerHistory.Value.Last():F4}ms");
-
-                            ImGui.TableNextColumn();
-                            ImGui.Text($"{handlerHistory.Value.Max():F4}ms");
-
-                            ImGui.TableNextColumn();
-                            ImGui.Text($"{handlerHistory.Value.Average():F4}ms");
+                            plugin.DalamudInterface.UiBuilder.LastDrawTime = -1;
+                            plugin.DalamudInterface.UiBuilder.MaxDrawTime = -1;
+                            plugin.DalamudInterface.UiBuilder.DrawTimeHistory.Clear();
                         }
-
-                        ImGui.EndTable();
                     }
                 }
 
-                ImGui.EndTabItem();
-            }
-
-            var toRemove = new List<Guid>();
-
-            if (ImGui.BeginTabItem("Hooks"))
-            {
-                ImGui.Checkbox("Show Dalamud Hooks", ref this.showDalamudHooks);
-
                 if (ImGui.BeginTable(
-                      "##PluginStatsHooks",
-                      4,
-                      ImGuiTableFlags.RowBg
-                      | ImGuiTableFlags.SizingStretchProp
-                      | ImGuiTableFlags.Resizable
-                      | ImGuiTableFlags.ScrollY
-                      | ImGuiTableFlags.Reorderable
-                      | ImGuiTableFlags.Hideable))
+                        "##PluginStatsDrawTimes",
+                        4,
+                        ImGuiTableFlags.RowBg
+                        | ImGuiTableFlags.SizingStretchProp
+                        | ImGuiTableFlags.Sortable
+                        | ImGuiTableFlags.Resizable
+                        | ImGuiTableFlags.ScrollY
+                        | ImGuiTableFlags.Reorderable
+                        | ImGuiTableFlags.Hideable))
                 {
                     ImGui.TableSetupScrollFreeze(0, 1);
-                    ImGui.TableSetupColumn("Detour Method", ImGuiTableColumnFlags.None, 250);
-                    ImGui.TableSetupColumn("Address", ImGuiTableColumnFlags.None, 100);
-                    ImGui.TableSetupColumn("Status", ImGuiTableColumnFlags.None, 40);
-                    ImGui.TableSetupColumn("Backend", ImGuiTableColumnFlags.None, 40);
+                    ImGui.TableSetupColumn("Plugin");
+                    ImGui.TableSetupColumn("Last", ImGuiTableColumnFlags.NoSort); // Changes too fast to sort
+                    ImGui.TableSetupColumn("Longest");
+                    ImGui.TableSetupColumn("Average");
                     ImGui.TableHeadersRow();
 
-                    foreach (var (guid, trackedHook) in HookManager.TrackedHooks)
+                    var loadedPlugins = pluginManager.InstalledPlugins.Where(plugin => plugin.State == PluginState.Loaded);
+
+                    var sortSpecs = ImGui.TableGetSortSpecs();
+                    loadedPlugins = sortSpecs.Specs.ColumnIndex switch
                     {
-                        try
+                        0 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
+                                 ? loadedPlugins.OrderBy(plugin => plugin.Name)
+                                 : loadedPlugins.OrderByDescending(plugin => plugin.Name),
+                        2 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
+                                 ? loadedPlugins.OrderBy(plugin => plugin.DalamudInterface?.UiBuilder.MaxDrawTime)
+                                 : loadedPlugins.OrderByDescending(plugin => plugin.DalamudInterface?.UiBuilder.MaxDrawTime),
+                        3 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
+                                 ? loadedPlugins.OrderBy(plugin => plugin.DalamudInterface?.UiBuilder.DrawTimeHistory.Average())
+                                 : loadedPlugins.OrderByDescending(plugin => plugin.DalamudInterface?.UiBuilder.DrawTimeHistory.Average()),
+                        _ => loadedPlugins,
+                    };
+
+                    foreach (var plugin in loadedPlugins)
+                    {
+                        ImGui.TableNextRow();
+
+                        ImGui.TableNextColumn();
+                        ImGui.Text(plugin.Manifest.Name);
+
+                        if (plugin.DalamudInterface != null)
                         {
-                            if (trackedHook.Hook.IsDisposed)
-                                toRemove.Add(guid);
-
-                            if (!this.showDalamudHooks && trackedHook.Assembly == Assembly.GetExecutingAssembly())
-                                continue;
-
-                            ImGui.TableNextRow();
+                            ImGui.TableNextColumn();
+                            ImGui.Text($"{plugin.DalamudInterface.UiBuilder.LastDrawTime / 10000f:F4}ms");
 
                             ImGui.TableNextColumn();
-
-                            ImGui.Text($"{trackedHook.Delegate.Target} :: {trackedHook.Delegate.Method.Name}");
-                            ImGui.TextDisabled(trackedHook.Assembly.FullName);
-                            ImGui.TableNextColumn();
-                            if (!trackedHook.Hook.IsDisposed)
-                            {
-                                if (ImGui.Selectable($"{trackedHook.Hook.Address.ToInt64():X}"))
-                                {
-                                    ImGui.SetClipboardText($"{trackedHook.Hook.Address.ToInt64():X}");
-                                    Service<NotificationManager>.Get().AddNotification($"{trackedHook.Hook.Address.ToInt64():X}", "Copied to clipboard", NotificationType.Success);
-                                }
-
-                                var processMemoryOffset = trackedHook.InProcessMemory;
-                                if (processMemoryOffset.HasValue)
-                                {
-                                    if (ImGui.Selectable($"ffxiv_dx11.exe+{processMemoryOffset:X}"))
-                                    {
-                                        ImGui.SetClipboardText($"ffxiv_dx11.exe+{processMemoryOffset:X}");
-                                        Service<NotificationManager>.Get().AddNotification($"ffxiv_dx11.exe+{processMemoryOffset:X}", "Copied to clipboard", NotificationType.Success);
-                                    }
-                                }
-                            }
+                            ImGui.Text($"{plugin.DalamudInterface.UiBuilder.MaxDrawTime / 10000f:F4}ms");
 
                             ImGui.TableNextColumn();
-
-                            if (trackedHook.Hook.IsDisposed)
-                            {
-                                ImGui.Text("Disposed");
-                            }
-                            else
-                            {
-                                ImGui.Text(trackedHook.Hook.IsEnabled ? "Enabled" : "Disabled");
-                            }
-
-                            ImGui.TableNextColumn();
-
-                            ImGui.Text(trackedHook.Hook.BackendName);
-                        }
-                        catch (Exception ex)
-                        {
-                            ImGui.Text(ex.Message);
+                            ImGui.Text(plugin.DalamudInterface.UiBuilder.DrawTimeHistory.Count > 0
+                                           ? $"{plugin.DalamudInterface.UiBuilder.DrawTimeHistory.Average() / 10000f:F4}ms"
+                                           : "-");
                         }
                     }
 
@@ -289,15 +126,177 @@ namespace Dalamud.Interface.Internal.Windows
                 }
             }
 
-            if (ImGui.IsWindowAppearing())
+            ImGui.EndTabItem();
+        }
+
+        if (ImGui.BeginTabItem("Framework times"))
+        {
+            var doStats = Framework.StatsEnabled;
+
+            if (ImGui.Checkbox("Enable Framework Update Tracking", ref doStats))
             {
-                foreach (var guid in toRemove)
+                Framework.StatsEnabled = doStats;
+            }
+
+            if (doStats)
+            {
+                ImGui.SameLine();
+                if (ImGui.Button("Reset"))
                 {
-                    HookManager.TrackedHooks.TryRemove(guid, out _);
+                    Framework.StatsHistory.Clear();
+                }
+
+                if (ImGui.BeginTable(
+                        "##PluginStatsFrameworkTimes",
+                        4,
+                        ImGuiTableFlags.RowBg
+                        | ImGuiTableFlags.SizingStretchProp
+                        | ImGuiTableFlags.Sortable
+                        | ImGuiTableFlags.Resizable
+                        | ImGuiTableFlags.ScrollY
+                        | ImGuiTableFlags.Reorderable
+                        | ImGuiTableFlags.Hideable))
+                {
+                    ImGui.TableSetupScrollFreeze(0, 1);
+                    ImGui.TableSetupColumn("Method", ImGuiTableColumnFlags.None, 250);
+                    ImGui.TableSetupColumn("Last", ImGuiTableColumnFlags.NoSort, 50); // Changes too fast to sort
+                    ImGui.TableSetupColumn("Longest", ImGuiTableColumnFlags.None, 50);
+                    ImGui.TableSetupColumn("Average", ImGuiTableColumnFlags.None, 50);
+                    ImGui.TableHeadersRow();
+
+                    var statsHistory = Framework.StatsHistory.ToArray();
+
+                    var sortSpecs = ImGui.TableGetSortSpecs();
+                    statsHistory = sortSpecs.Specs.ColumnIndex switch
+                    {
+                        0 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
+                                 ? statsHistory.OrderBy(handler => handler.Key).ToArray()
+                                 : statsHistory.OrderByDescending(handler => handler.Key).ToArray(),
+                        2 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
+                                 ? statsHistory.OrderBy(handler => handler.Value.Max()).ToArray()
+                                 : statsHistory.OrderByDescending(handler => handler.Value.Max()).ToArray(),
+                        3 => sortSpecs.Specs.SortDirection == ImGuiSortDirection.Ascending
+                                 ? statsHistory.OrderBy(handler => handler.Value.Average()).ToArray()
+                                 : statsHistory.OrderByDescending(handler => handler.Value.Average()).ToArray(),
+                        _ => statsHistory,
+                    };
+
+                    foreach (var handlerHistory in statsHistory)
+                    {
+                        ImGui.TableNextRow();
+
+                        ImGui.TableNextColumn();
+                        ImGui.Text($"{handlerHistory.Key}");
+
+                        ImGui.TableNextColumn();
+                        ImGui.Text($"{handlerHistory.Value.Last():F4}ms");
+
+                        ImGui.TableNextColumn();
+                        ImGui.Text($"{handlerHistory.Value.Max():F4}ms");
+
+                        ImGui.TableNextColumn();
+                        ImGui.Text($"{handlerHistory.Value.Average():F4}ms");
+                    }
+
+                    ImGui.EndTable();
                 }
             }
 
-            ImGui.EndTabBar();
+            ImGui.EndTabItem();
         }
+
+        var toRemove = new List<Guid>();
+
+        if (ImGui.BeginTabItem("Hooks"))
+        {
+            ImGui.Checkbox("Show Dalamud Hooks", ref this.showDalamudHooks);
+
+            if (ImGui.BeginTable(
+                    "##PluginStatsHooks",
+                    4,
+                    ImGuiTableFlags.RowBg
+                    | ImGuiTableFlags.SizingStretchProp
+                    | ImGuiTableFlags.Resizable
+                    | ImGuiTableFlags.ScrollY
+                    | ImGuiTableFlags.Reorderable
+                    | ImGuiTableFlags.Hideable))
+            {
+                ImGui.TableSetupScrollFreeze(0, 1);
+                ImGui.TableSetupColumn("Detour Method", ImGuiTableColumnFlags.None, 250);
+                ImGui.TableSetupColumn("Address", ImGuiTableColumnFlags.None, 100);
+                ImGui.TableSetupColumn("Status", ImGuiTableColumnFlags.None, 40);
+                ImGui.TableSetupColumn("Backend", ImGuiTableColumnFlags.None, 40);
+                ImGui.TableHeadersRow();
+
+                foreach (var (guid, trackedHook) in HookManager.TrackedHooks)
+                {
+                    try
+                    {
+                        if (trackedHook.Hook.IsDisposed)
+                            toRemove.Add(guid);
+
+                        if (!this.showDalamudHooks && trackedHook.Assembly == Assembly.GetExecutingAssembly())
+                            continue;
+
+                        ImGui.TableNextRow();
+
+                        ImGui.TableNextColumn();
+
+                        ImGui.Text($"{trackedHook.Delegate.Target} :: {trackedHook.Delegate.Method.Name}");
+                        ImGui.TextDisabled(trackedHook.Assembly.FullName);
+                        ImGui.TableNextColumn();
+                        if (!trackedHook.Hook.IsDisposed)
+                        {
+                            if (ImGui.Selectable($"{trackedHook.Hook.Address.ToInt64():X}"))
+                            {
+                                ImGui.SetClipboardText($"{trackedHook.Hook.Address.ToInt64():X}");
+                                Service<NotificationManager>.Get().AddNotification($"{trackedHook.Hook.Address.ToInt64():X}", "Copied to clipboard", NotificationType.Success);
+                            }
+
+                            var processMemoryOffset = trackedHook.InProcessMemory;
+                            if (processMemoryOffset.HasValue)
+                            {
+                                if (ImGui.Selectable($"ffxiv_dx11.exe+{processMemoryOffset:X}"))
+                                {
+                                    ImGui.SetClipboardText($"ffxiv_dx11.exe+{processMemoryOffset:X}");
+                                    Service<NotificationManager>.Get().AddNotification($"ffxiv_dx11.exe+{processMemoryOffset:X}", "Copied to clipboard", NotificationType.Success);
+                                }
+                            }
+                        }
+
+                        ImGui.TableNextColumn();
+
+                        if (trackedHook.Hook.IsDisposed)
+                        {
+                            ImGui.Text("Disposed");
+                        }
+                        else
+                        {
+                            ImGui.Text(trackedHook.Hook.IsEnabled ? "Enabled" : "Disabled");
+                        }
+
+                        ImGui.TableNextColumn();
+
+                        ImGui.Text(trackedHook.Hook.BackendName);
+                    }
+                    catch (Exception ex)
+                    {
+                        ImGui.Text(ex.Message);
+                    }
+                }
+
+                ImGui.EndTable();
+            }
+        }
+
+        if (ImGui.IsWindowAppearing())
+        {
+            foreach (var guid in toRemove)
+            {
+                HookManager.TrackedHooks.TryRemove(guid, out _);
+            }
+        }
+
+        ImGui.EndTabBar();
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs
index a8cb3e4a1..242e93a49 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ActorTableAgingStep.cs
@@ -2,47 +2,46 @@ using Dalamud.Game.ClientState.Objects;
 using Dalamud.Utility;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for the Actor Table.
+/// </summary>
+internal class ActorTableAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for the Actor Table.
-    /// </summary>
-    internal class ActorTableAgingStep : IAgingStep
+    private int index = 0;
+
+    /// <inheritdoc/>
+    public string Name => "Test ActorTable";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        private int index = 0;
+        var objectTable = Service<ObjectTable>.Get();
 
-        /// <inheritdoc/>
-        public string Name => "Test ActorTable";
+        ImGui.Text("Checking actor table...");
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        if (this.index == objectTable.Length - 1)
         {
-            var objectTable = Service<ObjectTable>.Get();
+            return SelfTestStepResult.Pass;
+        }
 
-            ImGui.Text("Checking actor table...");
-
-            if (this.index == objectTable.Length - 1)
-            {
-                return SelfTestStepResult.Pass;
-            }
-
-            var actor = objectTable[this.index];
-            this.index++;
-
-            if (actor == null)
-            {
-                return SelfTestStepResult.Waiting;
-            }
-
-            Util.ShowObject(actor);
+        var actor = objectTable[this.index];
+        this.index++;
 
+        if (actor == null)
+        {
             return SelfTestStepResult.Waiting;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            // ignored
-        }
+        Util.ShowObject(actor);
+
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AetheryteListAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AetheryteListAgingStep.cs
index 4035f860b..6a4519eab 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AetheryteListAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/AetheryteListAgingStep.cs
@@ -2,52 +2,51 @@ using Dalamud.Game.ClientState.Aetherytes;
 using Dalamud.Utility;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for the Aetheryte List.
+/// </summary>
+internal class AetheryteListAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for the Aetheryte List.
-    /// </summary>
-    internal class AetheryteListAgingStep : IAgingStep
+    private int index = 0;
+
+    /// <inheritdoc/>
+    public string Name => "Test AetheryteList";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        private int index = 0;
+        var list = Service<AetheryteList>.Get();
 
-        /// <inheritdoc/>
-        public string Name => "Test AetheryteList";
+        ImGui.Text("Checking aetheryte list...");
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        if (this.index == list.Length - 1)
         {
-            var list = Service<AetheryteList>.Get();
+            return SelfTestStepResult.Pass;
+        }
 
-            ImGui.Text("Checking aetheryte list...");
-
-            if (this.index == list.Length - 1)
-            {
-                return SelfTestStepResult.Pass;
-            }
-
-            var aetheryte = list[this.index];
-            this.index++;
-
-            if (aetheryte == null)
-            {
-                return SelfTestStepResult.Waiting;
-            }
-
-            if (aetheryte.AetheryteId == 0)
-            {
-                return SelfTestStepResult.Fail;
-            }
-
-            Util.ShowObject(aetheryte);
+        var aetheryte = list[this.index];
+        this.index++;
 
+        if (aetheryte == null)
+        {
             return SelfTestStepResult.Waiting;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
+        if (aetheryte.AetheryteId == 0)
         {
-            // ignored
+            return SelfTestStepResult.Fail;
         }
+
+        Util.ShowObject(aetheryte);
+
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs
index 02613dee2..c7b6213d4 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs
@@ -3,71 +3,70 @@ using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for Chat.
+/// </summary>
+internal class ChatAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for Chat.
-    /// </summary>
-    internal class ChatAgingStep : IAgingStep
+    private int step = 0;
+    private bool subscribed = false;
+    private bool hasPassed = false;
+
+    /// <inheritdoc/>
+    public string Name => "Test Chat";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        private int step = 0;
-        private bool subscribed = false;
-        private bool hasPassed = false;
+        var chatGui = Service<ChatGui>.Get();
 
-        /// <inheritdoc/>
-        public string Name => "Test Chat";
-
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        switch (this.step)
         {
-            var chatGui = Service<ChatGui>.Get();
+            case 0:
+                chatGui.Print("Testing!");
+                this.step++;
 
-            switch (this.step)
-            {
-                case 0:
-                    chatGui.Print("Testing!");
-                    this.step++;
+                break;
 
-                    break;
+            case 1:
+                ImGui.Text("Type \"/e DALAMUD\" in chat...");
 
-                case 1:
-                    ImGui.Text("Type \"/e DALAMUD\" in chat...");
+                if (!this.subscribed)
+                {
+                    this.subscribed = true;
+                    chatGui.ChatMessage += this.ChatOnOnChatMessage;
+                }
 
-                    if (!this.subscribed)
-                    {
-                        this.subscribed = true;
-                        chatGui.ChatMessage += this.ChatOnOnChatMessage;
-                    }
+                if (this.hasPassed)
+                {
+                    chatGui.ChatMessage -= this.ChatOnOnChatMessage;
+                    this.subscribed = false;
+                    return SelfTestStepResult.Pass;
+                }
 
-                    if (this.hasPassed)
-                    {
-                        chatGui.ChatMessage -= this.ChatOnOnChatMessage;
-                        this.subscribed = false;
-                        return SelfTestStepResult.Pass;
-                    }
-
-                    break;
-            }
-
-            return SelfTestStepResult.Waiting;
+                break;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            var chatGui = Service<ChatGui>.Get();
+        return SelfTestStepResult.Waiting;
+    }
 
-            chatGui.ChatMessage -= this.ChatOnOnChatMessage;
-            this.subscribed = false;
-        }
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        var chatGui = Service<ChatGui>.Get();
 
-        private void ChatOnOnChatMessage(
-            XivChatType type, uint senderid, ref SeString sender, ref SeString message, ref bool ishandled)
+        chatGui.ChatMessage -= this.ChatOnOnChatMessage;
+        this.subscribed = false;
+    }
+
+    private void ChatOnOnChatMessage(
+        XivChatType type, uint senderid, ref SeString sender, ref SeString message, ref bool ishandled)
+    {
+        if (type == XivChatType.Echo && message.TextValue == "DALAMUD")
         {
-            if (type == XivChatType.Echo && message.TextValue == "DALAMUD")
-            {
-                this.hasPassed = true;
-            }
+            this.hasPassed = true;
         }
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ConditionAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ConditionAgingStep.cs
index 501920343..fee692ab8 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ConditionAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ConditionAgingStep.cs
@@ -2,36 +2,35 @@ using Dalamud.Game.ClientState.Conditions;
 using ImGuiNET;
 using Serilog;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for Condition.
+/// </summary>
+internal class ConditionAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for Condition.
-    /// </summary>
-    internal class ConditionAgingStep : IAgingStep
+    /// <inheritdoc/>
+    public string Name => "Test Condition";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        /// <inheritdoc/>
-        public string Name => "Test Condition";
+        var condition = Service<Condition>.Get();
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        if (!condition.Any())
         {
-            var condition = Service<Condition>.Get();
-
-            if (!condition.Any())
-            {
-                Log.Error("No condition flags present.");
-                return SelfTestStepResult.Fail;
-            }
-
-            ImGui.Text("Please jump...");
-
-            return condition[ConditionFlag.Jumping] ? SelfTestStepResult.Pass : SelfTestStepResult.Waiting;
+            Log.Error("No condition flags present.");
+            return SelfTestStepResult.Fail;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            // ignored
-        }
+        ImGui.Text("Please jump...");
+
+        return condition[ConditionFlag.Jumping] ? SelfTestStepResult.Pass : SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs
index 1931be5dc..570e362ef 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ContextMenuAgingStep.cs
@@ -6,247 +6,246 @@ using ImGuiNET;
 using Lumina.Excel.GeneratedSheets;
 using Serilog;*/
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Tests for context menu.
+/// </summary>
+internal class ContextMenuAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Tests for context menu.
-    /// </summary>
-    internal class ContextMenuAgingStep : IAgingStep
+    /*
+    private SubStep currentSubStep;
+
+    private uint clickedItemId;
+    private bool clickedItemHq;
+    private uint clickedItemCount;
+
+    private string? clickedPlayerName;
+    private ushort? clickedPlayerWorld;
+    private ulong? clickedPlayerCid;
+    private uint? clickedPlayerId;
+
+    private bool multipleTriggerOne;
+    private bool multipleTriggerTwo;
+
+    private enum SubStep
+    {
+        Start,
+        TestItem,
+        TestGameObject,
+        TestSubMenu,
+        TestMultiple,
+        Finish,
+    }
+    */
+
+    /// <inheritdoc/>
+    public string Name => "Test Context Menu";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
         /*
-        private SubStep currentSubStep;
+        var contextMenu = Service<ContextMenu>.Get();
+        var dataMgr = Service<DataManager>.Get();
 
-        private uint clickedItemId;
-        private bool clickedItemHq;
-        private uint clickedItemCount;
+        ImGui.Text(this.currentSubStep.ToString());
 
-        private string? clickedPlayerName;
-        private ushort? clickedPlayerWorld;
-        private ulong? clickedPlayerCid;
-        private uint? clickedPlayerId;
-
-        private bool multipleTriggerOne;
-        private bool multipleTriggerTwo;
-
-        private enum SubStep
+        switch (this.currentSubStep)
         {
-            Start,
-            TestItem,
-            TestGameObject,
-            TestSubMenu,
-            TestMultiple,
-            Finish,
-        }
-        */
+            case SubStep.Start:
+                contextMenu.ContextMenuOpened += this.ContextMenuOnContextMenuOpened;
+                this.currentSubStep++;
+                break;
+            case SubStep.TestItem:
+                if (this.clickedItemId != 0)
+                {
+                    var item = dataMgr.GetExcelSheet<Item>()!.GetRow(this.clickedItemId);
+                    ImGui.Text($"Did you click \"{item!.Name.RawString}\", hq:{this.clickedItemHq}, count:{this.clickedItemCount}?");
 
-        /// <inheritdoc/>
-        public string Name => "Test Context Menu";
-
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
-        {
-            /*
-            var contextMenu = Service<ContextMenu>.Get();
-            var dataMgr = Service<DataManager>.Get();
-
-            ImGui.Text(this.currentSubStep.ToString());
-
-            switch (this.currentSubStep)
-            {
-                case SubStep.Start:
-                    contextMenu.ContextMenuOpened += this.ContextMenuOnContextMenuOpened;
-                    this.currentSubStep++;
-                    break;
-                case SubStep.TestItem:
-                    if (this.clickedItemId != 0)
-                    {
-                        var item = dataMgr.GetExcelSheet<Item>()!.GetRow(this.clickedItemId);
-                        ImGui.Text($"Did you click \"{item!.Name.RawString}\", hq:{this.clickedItemHq}, count:{this.clickedItemCount}?");
-
-                        if (ImGui.Button("Yes"))
-                            this.currentSubStep++;
-
-                        ImGui.SameLine();
-
-                        if (ImGui.Button("No"))
-                            return SelfTestStepResult.Fail;
-                    }
-                    else
-                    {
-                        ImGui.Text("Right-click an item.");
-
-                        if (ImGui.Button("Skip"))
-                            this.currentSubStep++;
-                    }
-
-                    break;
-
-                case SubStep.TestGameObject:
-                    if (!this.clickedPlayerName.IsNullOrEmpty())
-                    {
-                        ImGui.Text($"Did you click \"{this.clickedPlayerName}\", world:{this.clickedPlayerWorld}, cid:{this.clickedPlayerCid}, id:{this.clickedPlayerId}?");
-
-                        if (ImGui.Button("Yes"))
-                            this.currentSubStep++;
-
-                        ImGui.SameLine();
-
-                        if (ImGui.Button("No"))
-                            return SelfTestStepResult.Fail;
-                    }
-                    else
-                    {
-                        ImGui.Text("Right-click a character.");
-
-                        if (ImGui.Button("Skip"))
-                            this.currentSubStep++;
-                    }
-
-                    break;
-                case SubStep.TestSubMenu:
-                    if (this.multipleTriggerOne && this.multipleTriggerTwo)
-                    {
+                    if (ImGui.Button("Yes"))
                         this.currentSubStep++;
-                        this.multipleTriggerOne = this.multipleTriggerTwo = false;
-                    }
-                    else
-                    {
-                        ImGui.Text("Right-click a character and select both options in the submenu.");
 
-                        if (ImGui.Button("Skip"))
-                            this.currentSubStep++;
-                    }
+                    ImGui.SameLine();
 
-                    break;
+                    if (ImGui.Button("No"))
+                        return SelfTestStepResult.Fail;
+                }
+                else
+                {
+                    ImGui.Text("Right-click an item.");
 
-                case SubStep.TestMultiple:
-                    if (this.multipleTriggerOne && this.multipleTriggerTwo)
-                    {
-                        this.currentSubStep = SubStep.Finish;
-                        return SelfTestStepResult.Pass;
-                    }
-
-                    ImGui.Text("Select both options on any context menu.");
                     if (ImGui.Button("Skip"))
                         this.currentSubStep++;
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
+                }
 
-            return SelfTestStepResult.Waiting;
-            */
+                break;
 
-            return SelfTestStepResult.Pass;
+            case SubStep.TestGameObject:
+                if (!this.clickedPlayerName.IsNullOrEmpty())
+                {
+                    ImGui.Text($"Did you click \"{this.clickedPlayerName}\", world:{this.clickedPlayerWorld}, cid:{this.clickedPlayerCid}, id:{this.clickedPlayerId}?");
+
+                    if (ImGui.Button("Yes"))
+                        this.currentSubStep++;
+
+                    ImGui.SameLine();
+
+                    if (ImGui.Button("No"))
+                        return SelfTestStepResult.Fail;
+                }
+                else
+                {
+                    ImGui.Text("Right-click a character.");
+
+                    if (ImGui.Button("Skip"))
+                        this.currentSubStep++;
+                }
+
+                break;
+            case SubStep.TestSubMenu:
+                if (this.multipleTriggerOne && this.multipleTriggerTwo)
+                {
+                    this.currentSubStep++;
+                    this.multipleTriggerOne = this.multipleTriggerTwo = false;
+                }
+                else
+                {
+                    ImGui.Text("Right-click a character and select both options in the submenu.");
+
+                    if (ImGui.Button("Skip"))
+                        this.currentSubStep++;
+                }
+
+                break;
+
+            case SubStep.TestMultiple:
+                if (this.multipleTriggerOne && this.multipleTriggerTwo)
+                {
+                    this.currentSubStep = SubStep.Finish;
+                    return SelfTestStepResult.Pass;
+                }
+
+                ImGui.Text("Select both options on any context menu.");
+                if (ImGui.Button("Skip"))
+                    this.currentSubStep++;
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            /*
-            var contextMenu = Service<ContextMenu>.Get();
-            contextMenu.ContextMenuOpened -= this.ContextMenuOnContextMenuOpened;
+        return SelfTestStepResult.Waiting;
+        */
 
-            this.currentSubStep = SubStep.Start;
-            this.clickedItemId = 0;
-            this.clickedPlayerName = null;
-            this.multipleTriggerOne = this.multipleTriggerTwo = false;
-            */
-        }
+        return SelfTestStepResult.Pass;
+    }
 
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
         /*
-        private void ContextMenuOnContextMenuOpened(ContextMenuOpenedArgs args)
+        var contextMenu = Service<ContextMenu>.Get();
+        contextMenu.ContextMenuOpened -= this.ContextMenuOnContextMenuOpened;
+
+        this.currentSubStep = SubStep.Start;
+        this.clickedItemId = 0;
+        this.clickedPlayerName = null;
+        this.multipleTriggerOne = this.multipleTriggerTwo = false;
+        */
+    }
+
+    /*
+    private void ContextMenuOnContextMenuOpened(ContextMenuOpenedArgs args)
+    {
+        Log.Information("Got context menu with parent addon: {ParentAddonName}, title:{Title}, itemcnt:{ItemCount}", args.ParentAddonName, args.Title, args.Items.Count);
+        if (args.GameObjectContext != null)
         {
-            Log.Information("Got context menu with parent addon: {ParentAddonName}, title:{Title}, itemcnt:{ItemCount}", args.ParentAddonName, args.Title, args.Items.Count);
-            if (args.GameObjectContext != null)
-            {
-                Log.Information("   => GameObject:{GameObjectName} world:{World} cid:{Cid} id:{Id}", args.GameObjectContext.Name, args.GameObjectContext.WorldId, args.GameObjectContext.ContentId, args.GameObjectContext.Id);
-            }
+            Log.Information("   => GameObject:{GameObjectName} world:{World} cid:{Cid} id:{Id}", args.GameObjectContext.Name, args.GameObjectContext.WorldId, args.GameObjectContext.ContentId, args.GameObjectContext.Id);
+        }
 
-            if (args.InventoryItemContext != null)
-            {
-                Log.Information("   => Inventory:{ItemId} hq:{Hq} count:{Count}", args.InventoryItemContext.Id, args.InventoryItemContext.IsHighQuality, args.InventoryItemContext.Count);
-            }
+        if (args.InventoryItemContext != null)
+        {
+            Log.Information("   => Inventory:{ItemId} hq:{Hq} count:{Count}", args.InventoryItemContext.Id, args.InventoryItemContext.IsHighQuality, args.InventoryItemContext.Count);
+        }
 
-            switch (this.currentSubStep)
-            {
-                case SubStep.TestSubMenu:
-                    args.AddCustomSubMenu("Aging Submenu", openedArgs =>
-                    {
-                        openedArgs.AddCustomItem("Submenu Item 1", _ =>
-                        {
-                            this.multipleTriggerOne = true;
-                        });
-
-                        openedArgs.AddCustomItem("Submenu Item 2", _ =>
-                        {
-                            this.multipleTriggerTwo = true;
-                        });
-                    });
-
-                    return;
-                case SubStep.TestMultiple:
-                    args.AddCustomItem("Aging Item 1", _ =>
+        switch (this.currentSubStep)
+        {
+            case SubStep.TestSubMenu:
+                args.AddCustomSubMenu("Aging Submenu", openedArgs =>
+                {
+                    openedArgs.AddCustomItem("Submenu Item 1", _ =>
                     {
                         this.multipleTriggerOne = true;
                     });
 
-                    args.AddCustomItem("Aging Item 2", _ =>
+                    openedArgs.AddCustomItem("Submenu Item 2", _ =>
                     {
                         this.multipleTriggerTwo = true;
                     });
+                });
 
-                    return;
-                case SubStep.Finish:
-                    return;
+                return;
+            case SubStep.TestMultiple:
+                args.AddCustomItem("Aging Item 1", _ =>
+                {
+                    this.multipleTriggerOne = true;
+                });
 
-                default:
-                    switch (args.ParentAddonName)
-                    {
-                        case "Inventory":
-                            if (this.currentSubStep != SubStep.TestItem)
-                                return;
+                args.AddCustomItem("Aging Item 2", _ =>
+                {
+                    this.multipleTriggerTwo = true;
+                });
 
-                            args.AddCustomItem("Aging Item", _ =>
-                            {
-                                this.clickedItemId = args.InventoryItemContext!.Id;
-                                this.clickedItemHq = args.InventoryItemContext!.IsHighQuality;
-                                this.clickedItemCount = args.InventoryItemContext!.Count;
-                                Log.Warning("Clicked item: {Id} hq:{Hq} count:{Count}", this.clickedItemId, this.clickedItemHq, this.clickedItemCount);
-                            });
-                            break;
+                return;
+            case SubStep.Finish:
+                return;
 
-                        case null:
-                        case "_PartyList":
-                        case "ChatLog":
-                        case "ContactList":
-                        case "ContentMemberList":
-                        case "CrossWorldLinkshell":
-                        case "FreeCompany":
-                        case "FriendList":
-                        case "LookingForGroup":
-                        case "LinkShell":
-                        case "PartyMemberList":
-                        case "SocialList":
-                            if (this.currentSubStep != SubStep.TestGameObject || args.GameObjectContext == null || args.GameObjectContext.Name.IsNullOrEmpty())
-                                return;
+            default:
+                switch (args.ParentAddonName)
+                {
+                    case "Inventory":
+                        if (this.currentSubStep != SubStep.TestItem)
+                            return;
 
-                            args.AddCustomItem("Aging Character", _ =>
-                            {
-                                this.clickedPlayerName = args.GameObjectContext.Name!;
-                                this.clickedPlayerWorld = args.GameObjectContext.WorldId;
-                                this.clickedPlayerCid = args.GameObjectContext.ContentId;
-                                this.clickedPlayerId = args.GameObjectContext.Id;
+                        args.AddCustomItem("Aging Item", _ =>
+                        {
+                            this.clickedItemId = args.InventoryItemContext!.Id;
+                            this.clickedItemHq = args.InventoryItemContext!.IsHighQuality;
+                            this.clickedItemCount = args.InventoryItemContext!.Count;
+                            Log.Warning("Clicked item: {Id} hq:{Hq} count:{Count}", this.clickedItemId, this.clickedItemHq, this.clickedItemCount);
+                        });
+                        break;
 
-                                Log.Warning("Clicked player: {Name} world:{World} cid:{Cid} id:{Id}", this.clickedPlayerName, this.clickedPlayerWorld, this.clickedPlayerCid, this.clickedPlayerId);
-                            });
+                    case null:
+                    case "_PartyList":
+                    case "ChatLog":
+                    case "ContactList":
+                    case "ContentMemberList":
+                    case "CrossWorldLinkshell":
+                    case "FreeCompany":
+                    case "FriendList":
+                    case "LookingForGroup":
+                    case "LinkShell":
+                    case "PartyMemberList":
+                    case "SocialList":
+                        if (this.currentSubStep != SubStep.TestGameObject || args.GameObjectContext == null || args.GameObjectContext.Name.IsNullOrEmpty())
+                            return;
 
-                            break;
-                    }
+                        args.AddCustomItem("Aging Character", _ =>
+                        {
+                            this.clickedPlayerName = args.GameObjectContext.Name!;
+                            this.clickedPlayerWorld = args.GameObjectContext.WorldId;
+                            this.clickedPlayerCid = args.GameObjectContext.ContentId;
+                            this.clickedPlayerId = args.GameObjectContext.Id;
 
-                    break;
-            }
+                            Log.Warning("Clicked player: {Name} world:{World} cid:{Cid} id:{Id}", this.clickedPlayerName, this.clickedPlayerWorld, this.clickedPlayerCid, this.clickedPlayerId);
+                        });
+
+                        break;
+                }
+
+                break;
         }
-        */
     }
+    */
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/EnterTerritoryAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/EnterTerritoryAgingStep.cs
index 487a6e572..d301cb1ff 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/EnterTerritoryAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/EnterTerritoryAgingStep.cs
@@ -1,70 +1,69 @@
 using Dalamud.Game.ClientState;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for Territory Change.
+/// </summary>
+internal class EnterTerritoryAgingStep : IAgingStep
 {
+    private readonly ushort territory;
+    private readonly string terriName;
+    private bool subscribed = false;
+    private bool hasPassed = false;
+
     /// <summary>
-    /// Test setup for Territory Change.
+    /// Initializes a new instance of the <see cref="EnterTerritoryAgingStep"/> class.
     /// </summary>
-    internal class EnterTerritoryAgingStep : IAgingStep
+    /// <param name="terri">The territory to check for.</param>
+    /// <param name="name">Name to show.</param>
+    public EnterTerritoryAgingStep(ushort terri, string name)
     {
-        private readonly ushort territory;
-        private readonly string terriName;
-        private bool subscribed = false;
-        private bool hasPassed = false;
+        this.terriName = name;
+        this.territory = terri;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnterTerritoryAgingStep"/> class.
-        /// </summary>
-        /// <param name="terri">The territory to check for.</param>
-        /// <param name="name">Name to show.</param>
-        public EnterTerritoryAgingStep(ushort terri, string name)
+    /// <inheritdoc/>
+    public string Name => $"Enter Terri: {this.terriName}";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
+    {
+        var clientState = Service<ClientState>.Get();
+
+        ImGui.TextUnformatted(this.Name);
+
+        if (!this.subscribed)
         {
-            this.terriName = name;
-            this.territory = terri;
+            clientState.TerritoryChanged += this.ClientStateOnTerritoryChanged;
+            this.subscribed = true;
         }
 
-        /// <inheritdoc/>
-        public string Name => $"Enter Terri: {this.terriName}";
-
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        if (this.hasPassed)
         {
-            var clientState = Service<ClientState>.Get();
-
-            ImGui.TextUnformatted(this.Name);
-
-            if (!this.subscribed)
-            {
-                clientState.TerritoryChanged += this.ClientStateOnTerritoryChanged;
-                this.subscribed = true;
-            }
-
-            if (this.hasPassed)
-            {
-                clientState.TerritoryChanged -= this.ClientStateOnTerritoryChanged;
-                this.subscribed = false;
-                return SelfTestStepResult.Pass;
-            }
-
-            return SelfTestStepResult.Waiting;
-        }
-
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            var clientState = Service<ClientState>.Get();
-
             clientState.TerritoryChanged -= this.ClientStateOnTerritoryChanged;
             this.subscribed = false;
+            return SelfTestStepResult.Pass;
         }
 
-        private void ClientStateOnTerritoryChanged(object sender, ushort e)
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        var clientState = Service<ClientState>.Get();
+
+        clientState.TerritoryChanged -= this.ClientStateOnTerritoryChanged;
+        this.subscribed = false;
+    }
+
+    private void ClientStateOnTerritoryChanged(object sender, ushort e)
+    {
+        if (e == this.territory)
         {
-            if (e == this.territory)
-            {
-                this.hasPassed = true;
-            }
+            this.hasPassed = true;
         }
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/FateTableAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/FateTableAgingStep.cs
index b037d06ca..a8fe60aa9 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/FateTableAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/FateTableAgingStep.cs
@@ -2,47 +2,46 @@ using Dalamud.Game.ClientState.Fates;
 using Dalamud.Utility;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for the Fate Table.
+/// </summary>
+internal class FateTableAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for the Fate Table.
-    /// </summary>
-    internal class FateTableAgingStep : IAgingStep
+    private int index = 0;
+
+    /// <inheritdoc/>
+    public string Name => "Test FateTable";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        private int index = 0;
+        var fateTable = Service<FateTable>.Get();
 
-        /// <inheritdoc/>
-        public string Name => "Test FateTable";
+        ImGui.Text("Checking fate table...");
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        if (this.index == fateTable.Length - 1)
         {
-            var fateTable = Service<FateTable>.Get();
+            return SelfTestStepResult.Pass;
+        }
 
-            ImGui.Text("Checking fate table...");
-
-            if (this.index == fateTable.Length - 1)
-            {
-                return SelfTestStepResult.Pass;
-            }
-
-            var actor = fateTable[this.index];
-            this.index++;
-
-            if (actor == null)
-            {
-                return SelfTestStepResult.Waiting;
-            }
-
-            Util.ShowObject(actor);
+        var actor = fateTable[this.index];
+        this.index++;
 
+        if (actor == null)
+        {
             return SelfTestStepResult.Waiting;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            // ignored
-        }
+        Util.ShowObject(actor);
+
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/GamepadStateAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/GamepadStateAgingStep.cs
index 1b451b73f..55e836dfb 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/GamepadStateAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/GamepadStateAgingStep.cs
@@ -1,37 +1,36 @@
 using Dalamud.Game.ClientState.GamePad;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for the Gamepad State.
+/// </summary>
+internal class GamepadStateAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for the Gamepad State.
-    /// </summary>
-    internal class GamepadStateAgingStep : IAgingStep
+    /// <inheritdoc/>
+    public string Name => "Test GamePadState";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        /// <inheritdoc/>
-        public string Name => "Test GamePadState";
+        var gamepadState = Service<GamepadState>.Get();
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        ImGui.Text("Hold down North, East, L1");
+
+        if (gamepadState.Raw(GamepadButtons.North) == 1
+            && gamepadState.Raw(GamepadButtons.East) == 1
+            && gamepadState.Raw(GamepadButtons.L1) == 1)
         {
-            var gamepadState = Service<GamepadState>.Get();
-
-            ImGui.Text("Hold down North, East, L1");
-
-            if (gamepadState.Raw(GamepadButtons.North) == 1
-                && gamepadState.Raw(GamepadButtons.East) == 1
-                && gamepadState.Raw(GamepadButtons.L1) == 1)
-            {
-                return SelfTestStepResult.Pass;
-            }
-
-            return SelfTestStepResult.Waiting;
+            return SelfTestStepResult.Pass;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            // ignored
-        }
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HandledExceptionAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HandledExceptionAgingStep.cs
index 7a63d6ba7..43798968e 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HandledExceptionAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HandledExceptionAgingStep.cs
@@ -1,35 +1,34 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test dedicated to handling of Access Violations.
+/// </summary>
+internal class HandledExceptionAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test dedicated to handling of Access Violations.
-    /// </summary>
-    internal class HandledExceptionAgingStep : IAgingStep
+    /// <inheritdoc/>
+    public string Name => "Test Handled Exception";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        /// <inheritdoc/>
-        public string Name => "Test Handled Exception";
-
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        try
         {
-            try
-            {
-                Marshal.ReadByte(IntPtr.Zero);
-            }
-            catch (AccessViolationException)
-            {
-                return SelfTestStepResult.Pass;
-            }
-
-            return SelfTestStepResult.Fail;
+            Marshal.ReadByte(IntPtr.Zero);
+        }
+        catch (AccessViolationException)
+        {
+            return SelfTestStepResult.Pass;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            // ignored
-        }
+        return SelfTestStepResult.Fail;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HoverAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HoverAgingStep.cs
index 713d0ebc4..b4b069487 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HoverAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/HoverAgingStep.cs
@@ -1,58 +1,57 @@
 using Dalamud.Game.Gui;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for the Hover events.
+/// </summary>
+internal class HoverAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for the Hover events.
-    /// </summary>
-    internal class HoverAgingStep : IAgingStep
+    private bool clearedItem = false;
+    private bool clearedAction = false;
+
+    /// <inheritdoc/>
+    public string Name => "Test Hover";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        private bool clearedItem = false;
-        private bool clearedAction = false;
+        var gameGui = Service<GameGui>.Get();
 
-        /// <inheritdoc/>
-        public string Name => "Test Hover";
-
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        if (!this.clearedItem)
         {
-            var gameGui = Service<GameGui>.Get();
+            ImGui.Text("Hover WHM soul crystal...");
 
-            if (!this.clearedItem)
+            if (gameGui.HoveredItem == 4547)
             {
-                ImGui.Text("Hover WHM soul crystal...");
-
-                if (gameGui.HoveredItem == 4547)
-                {
-                    this.clearedItem = true;
-                }
+                this.clearedItem = true;
             }
-
-            if (!this.clearedAction)
-            {
-                ImGui.Text("Hover \"Open Linkshells\" action...");
-
-                if (gameGui.HoveredAction != null &&
-                    gameGui.HoveredAction.ActionKind == HoverActionKind.MainCommand &&
-                    gameGui.HoveredAction.ActionID == 28)
-                {
-                    this.clearedAction = true;
-                }
-            }
-
-            if (this.clearedItem && this.clearedAction)
-            {
-                return SelfTestStepResult.Pass;
-            }
-
-            return SelfTestStepResult.Waiting;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
+        if (!this.clearedAction)
         {
-            // ignored
+            ImGui.Text("Hover \"Open Linkshells\" action...");
+
+            if (gameGui.HoveredAction != null &&
+                gameGui.HoveredAction.ActionKind == HoverActionKind.MainCommand &&
+                gameGui.HoveredAction.ActionID == 28)
+            {
+                this.clearedAction = true;
+            }
         }
+
+        if (this.clearedItem && this.clearedAction)
+        {
+            return SelfTestStepResult.Pass;
+        }
+
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/IAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/IAgingStep.cs
index 6315f9d05..680961344 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/IAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/IAgingStep.cs
@@ -1,24 +1,23 @@
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Interface for test implementations.
+/// </summary>
+internal interface IAgingStep
 {
     /// <summary>
-    /// Interface for test implementations.
+    /// Gets the name of the test.
     /// </summary>
-    internal interface IAgingStep
-    {
-        /// <summary>
-        /// Gets the name of the test.
-        /// </summary>
-        public string Name { get; }
+    public string Name { get; }
 
-        /// <summary>
-        /// Run the test step, once per frame it is active.
-        /// </summary>
-        /// <returns>The result of this frame, test is discarded once a result other than <see cref="SelfTestStepResult.Waiting"/> is returned.</returns>
-        public SelfTestStepResult RunStep();
+    /// <summary>
+    /// Run the test step, once per frame it is active.
+    /// </summary>
+    /// <returns>The result of this frame, test is discarded once a result other than <see cref="SelfTestStepResult.Waiting"/> is returned.</returns>
+    public SelfTestStepResult RunStep();
 
-        /// <summary>
-        /// Clean up this test.
-        /// </summary>
-        public void CleanUp();
-    }
+    /// <summary>
+    /// Clean up this test.
+    /// </summary>
+    public void CleanUp();
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ItemPayloadAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ItemPayloadAgingStep.cs
index 3d876e6e1..3c7282188 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ItemPayloadAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ItemPayloadAgingStep.cs
@@ -5,116 +5,115 @@ using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for item payloads.
+/// </summary>
+internal class ItemPayloadAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for item payloads.
-    /// </summary>
-    internal class ItemPayloadAgingStep : IAgingStep
+    private SubStep currentSubStep;
+
+    private enum SubStep
     {
-        private SubStep currentSubStep;
+        PrintNormalItem,
+        HoverNormalItem,
+        PrintHqItem,
+        HoverHqItem,
+        PrintCollectable,
+        HoverCollectable,
+        PrintEventItem,
+        HoverEventItem,
+        PrintNormalWithText,
+        HoverNormalWithText,
+        Done,
+    }
 
-        private enum SubStep
+    /// <inheritdoc/>
+    public string Name => "Test Item Payloads";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
+    {
+        var gameGui = Service<GameGui>.Get();
+        var chatGui = Service<ChatGui>.Get();
+
+        const uint normalItemId = 24002;      // Capybara pup
+        const uint hqItemId = 31861;          // Exarchic circlets of healing
+        const uint collectableItemId = 36299; // Rarefied Annite
+        const uint eventItemId = 2003363;     // Speude bradeos figurine
+
+        SeString? toPrint = null;
+
+        ImGui.Text(this.currentSubStep.ToString());
+
+        switch (this.currentSubStep)
         {
-            PrintNormalItem,
-            HoverNormalItem,
-            PrintHqItem,
-            HoverHqItem,
-            PrintCollectable,
-            HoverCollectable,
-            PrintEventItem,
-            HoverEventItem,
-            PrintNormalWithText,
-            HoverNormalWithText,
-            Done,
+            case SubStep.PrintNormalItem:
+                toPrint = SeString.CreateItemLink(normalItemId);
+                this.currentSubStep++;
+                break;
+            case SubStep.HoverNormalItem:
+                ImGui.Text("Hover the item.");
+                if (gameGui.HoveredItem != normalItemId)
+                    return SelfTestStepResult.Waiting;
+                this.currentSubStep++;
+                break;
+            case SubStep.PrintHqItem:
+                toPrint = SeString.CreateItemLink(hqItemId, ItemPayload.ItemKind.Hq);
+                this.currentSubStep++;
+                break;
+            case SubStep.HoverHqItem:
+                ImGui.Text("Hover the item.");
+                if (gameGui.HoveredItem != 1_000_000 + hqItemId)
+                    return SelfTestStepResult.Waiting;
+                this.currentSubStep++;
+                break;
+            case SubStep.PrintCollectable:
+                toPrint = SeString.CreateItemLink(collectableItemId, ItemPayload.ItemKind.Collectible);
+                this.currentSubStep++;
+                break;
+            case SubStep.HoverCollectable:
+                ImGui.Text("Hover the item.");
+                if (gameGui.HoveredItem != 500_000 + collectableItemId)
+                    return SelfTestStepResult.Waiting;
+                this.currentSubStep++;
+                break;
+            case SubStep.PrintEventItem:
+                toPrint = SeString.CreateItemLink(eventItemId, ItemPayload.ItemKind.EventItem);
+                this.currentSubStep++;
+                break;
+            case SubStep.HoverEventItem:
+                ImGui.Text("Hover the item.");
+                if (gameGui.HoveredItem != eventItemId)
+                    return SelfTestStepResult.Waiting;
+                this.currentSubStep++;
+                break;
+            case SubStep.PrintNormalWithText:
+                toPrint = SeString.CreateItemLink(normalItemId, displayNameOverride: "Gort");
+                this.currentSubStep++;
+                break;
+            case SubStep.HoverNormalWithText:
+                ImGui.Text("Hover the item.");
+                if (gameGui.HoveredItem != normalItemId)
+                    return SelfTestStepResult.Waiting;
+                this.currentSubStep++;
+                break;
+            case SubStep.Done:
+                return SelfTestStepResult.Pass;
+            default:
+                throw new ArgumentOutOfRangeException();
         }
 
-        /// <inheritdoc/>
-        public string Name => "Test Item Payloads";
+        if (toPrint != null)
+            chatGui.Print(toPrint);
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
-        {
-            var gameGui = Service<GameGui>.Get();
-            var chatGui = Service<ChatGui>.Get();
+        return SelfTestStepResult.Waiting;
+    }
 
-            const uint normalItemId = 24002; // Capybara pup
-            const uint hqItemId = 31861; // Exarchic circlets of healing
-            const uint collectableItemId = 36299; // Rarefied Annite
-            const uint eventItemId = 2003363; // Speude bradeos figurine
-
-            SeString? toPrint = null;
-
-            ImGui.Text(this.currentSubStep.ToString());
-
-            switch (this.currentSubStep)
-            {
-                case SubStep.PrintNormalItem:
-                    toPrint = SeString.CreateItemLink(normalItemId);
-                    this.currentSubStep++;
-                    break;
-                case SubStep.HoverNormalItem:
-                    ImGui.Text("Hover the item.");
-                    if (gameGui.HoveredItem != normalItemId)
-                        return SelfTestStepResult.Waiting;
-                    this.currentSubStep++;
-                    break;
-                case SubStep.PrintHqItem:
-                    toPrint = SeString.CreateItemLink(hqItemId, ItemPayload.ItemKind.Hq);
-                    this.currentSubStep++;
-                    break;
-                case SubStep.HoverHqItem:
-                    ImGui.Text("Hover the item.");
-                    if (gameGui.HoveredItem != 1_000_000 + hqItemId)
-                        return SelfTestStepResult.Waiting;
-                    this.currentSubStep++;
-                    break;
-                case SubStep.PrintCollectable:
-                    toPrint = SeString.CreateItemLink(collectableItemId, ItemPayload.ItemKind.Collectible);
-                    this.currentSubStep++;
-                    break;
-                case SubStep.HoverCollectable:
-                    ImGui.Text("Hover the item.");
-                    if (gameGui.HoveredItem != 500_000 + collectableItemId)
-                        return SelfTestStepResult.Waiting;
-                    this.currentSubStep++;
-                    break;
-                case SubStep.PrintEventItem:
-                    toPrint = SeString.CreateItemLink(eventItemId, ItemPayload.ItemKind.EventItem);
-                    this.currentSubStep++;
-                    break;
-                case SubStep.HoverEventItem:
-                    ImGui.Text("Hover the item.");
-                    if (gameGui.HoveredItem != eventItemId)
-                        return SelfTestStepResult.Waiting;
-                    this.currentSubStep++;
-                    break;
-                case SubStep.PrintNormalWithText:
-                    toPrint = SeString.CreateItemLink(normalItemId, displayNameOverride: "Gort");
-                    this.currentSubStep++;
-                    break;
-                case SubStep.HoverNormalWithText:
-                    ImGui.Text("Hover the item.");
-                    if (gameGui.HoveredItem != normalItemId)
-                        return SelfTestStepResult.Waiting;
-                    this.currentSubStep++;
-                    break;
-                case SubStep.Done:
-                    return SelfTestStepResult.Pass;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-
-            if (toPrint != null)
-                chatGui.Print(toPrint);
-
-            return SelfTestStepResult.Waiting;
-        }
-
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            this.currentSubStep = SubStep.PrintNormalItem;
-        }
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        this.currentSubStep = SubStep.PrintNormalItem;
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/KeyStateAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/KeyStateAgingStep.cs
index 20b645b15..c1ae9289a 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/KeyStateAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/KeyStateAgingStep.cs
@@ -1,39 +1,38 @@
 using Dalamud.Game.ClientState.Keys;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for the Key State.
+/// </summary>
+internal class KeyStateAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for the Key State.
-    /// </summary>
-    internal class KeyStateAgingStep : IAgingStep
+    /// <inheritdoc/>
+    public string Name => "Test KeyState";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        /// <inheritdoc/>
-        public string Name => "Test KeyState";
+        var keyState = Service<KeyState>.Get();
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        ImGui.Text("Hold down D,A,L,M,U");
+
+        if (keyState[VirtualKey.D]
+            && keyState[VirtualKey.A]
+            && keyState[VirtualKey.L]
+            && keyState[VirtualKey.M]
+            && keyState[VirtualKey.U])
         {
-            var keyState = Service<KeyState>.Get();
-
-            ImGui.Text("Hold down D,A,L,M,U");
-
-            if (keyState[VirtualKey.D]
-                && keyState[VirtualKey.A]
-                && keyState[VirtualKey.L]
-                && keyState[VirtualKey.M]
-                && keyState[VirtualKey.U])
-            {
-                return SelfTestStepResult.Pass;
-            }
-
-            return SelfTestStepResult.Waiting;
+            return SelfTestStepResult.Pass;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            // ignored
-        }
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs
index 47a7f9bc9..c1dba389f 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs
@@ -3,57 +3,56 @@ using System;
 using Dalamud.Game.ClientState;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for the login events.
+/// </summary>
+internal class LoginEventAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for the login events.
-    /// </summary>
-    internal class LoginEventAgingStep : IAgingStep
+    private bool subscribed = false;
+    private bool hasPassed = false;
+
+    /// <inheritdoc/>
+    public string Name => "Test Log-In";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        private bool subscribed = false;
-        private bool hasPassed = false;
+        var clientState = Service<ClientState>.Get();
 
-        /// <inheritdoc/>
-        public string Name => "Test Log-In";
+        ImGui.Text("Log in now...");
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        if (!this.subscribed)
         {
-            var clientState = Service<ClientState>.Get();
-
-            ImGui.Text("Log in now...");
-
-            if (!this.subscribed)
-            {
-                clientState.Login += this.ClientStateOnOnLogin;
-                this.subscribed = true;
-            }
-
-            if (this.hasPassed)
-            {
-                clientState.Login -= this.ClientStateOnOnLogin;
-                this.subscribed = false;
-                return SelfTestStepResult.Pass;
-            }
-
-            return SelfTestStepResult.Waiting;
+            clientState.Login += this.ClientStateOnOnLogin;
+            this.subscribed = true;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
+        if (this.hasPassed)
         {
-            var clientState = Service<ClientState>.Get();
-
-            if (this.subscribed)
-            {
-                clientState.Login -= this.ClientStateOnOnLogin;
-                this.subscribed = false;
-            }
+            clientState.Login -= this.ClientStateOnOnLogin;
+            this.subscribed = false;
+            return SelfTestStepResult.Pass;
         }
 
-        private void ClientStateOnOnLogin(object sender, EventArgs e)
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        var clientState = Service<ClientState>.Get();
+
+        if (this.subscribed)
         {
-            this.hasPassed = true;
+            clientState.Login -= this.ClientStateOnOnLogin;
+            this.subscribed = false;
         }
     }
+
+    private void ClientStateOnOnLogin(object sender, EventArgs e)
+    {
+        this.hasPassed = true;
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs
index 5819a6356..060c0bcc8 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs
@@ -3,57 +3,56 @@ using System;
 using Dalamud.Game.ClientState;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for the login events.
+/// </summary>
+internal class LogoutEventAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for the login events.
-    /// </summary>
-    internal class LogoutEventAgingStep : IAgingStep
+    private bool subscribed = false;
+    private bool hasPassed = false;
+
+    /// <inheritdoc/>
+    public string Name => "Test Log-Out";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        private bool subscribed = false;
-        private bool hasPassed = false;
+        var clientState = Service<ClientState>.Get();
 
-        /// <inheritdoc/>
-        public string Name => "Test Log-Out";
+        ImGui.Text("Log out now...");
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        if (!this.subscribed)
         {
-            var clientState = Service<ClientState>.Get();
-
-            ImGui.Text("Log out now...");
-
-            if (!this.subscribed)
-            {
-                clientState.Logout += this.ClientStateOnOnLogout;
-                this.subscribed = true;
-            }
-
-            if (this.hasPassed)
-            {
-                clientState.Logout -= this.ClientStateOnOnLogout;
-                this.subscribed = false;
-                return SelfTestStepResult.Pass;
-            }
-
-            return SelfTestStepResult.Waiting;
+            clientState.Logout += this.ClientStateOnOnLogout;
+            this.subscribed = true;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
+        if (this.hasPassed)
         {
-            var clientState = Service<ClientState>.Get();
-
-            if (this.subscribed)
-            {
-                clientState.Logout -= this.ClientStateOnOnLogout;
-                this.subscribed = false;
-            }
+            clientState.Logout -= this.ClientStateOnOnLogout;
+            this.subscribed = false;
+            return SelfTestStepResult.Pass;
         }
 
-        private void ClientStateOnOnLogout(object sender, EventArgs e)
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        var clientState = Service<ClientState>.Get();
+
+        if (this.subscribed)
         {
-            this.hasPassed = true;
+            clientState.Logout -= this.ClientStateOnOnLogout;
+            this.subscribed = false;
         }
     }
+
+    private void ClientStateOnOnLogout(object sender, EventArgs e)
+    {
+        this.hasPassed = true;
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LuminaAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LuminaAgingStep.cs
index e1ab91978..a07b21e54 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LuminaAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LuminaAgingStep.cs
@@ -5,38 +5,37 @@ using Dalamud.Data;
 using Dalamud.Utility;
 using Lumina.Excel;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for Lumina.
+/// </summary>
+/// <typeparam name="T">ExcelRow to run test on.</typeparam>
+internal class LuminaAgingStep<T> : IAgingStep
+    where T : ExcelRow
 {
-    /// <summary>
-    /// Test setup for Lumina.
-    /// </summary>
-    /// <typeparam name="T">ExcelRow to run test on.</typeparam>
-    internal class LuminaAgingStep<T> : IAgingStep
-        where T : ExcelRow
+    private int step = 0;
+    private List<T> rows;
+
+    /// <inheritdoc/>
+    public string Name => "Test Lumina";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        private int step = 0;
-        private List<T> rows;
+        var dataManager = Service<DataManager>.Get();
 
-        /// <inheritdoc/>
-        public string Name => "Test Lumina";
+        this.rows ??= dataManager.GetExcelSheet<T>().ToList();
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
-        {
-            var dataManager = Service<DataManager>.Get();
+        Util.ShowObject(this.rows[this.step]);
 
-            this.rows ??= dataManager.GetExcelSheet<T>().ToList();
+        this.step++;
+        return this.step >= this.rows.Count ? SelfTestStepResult.Pass : SelfTestStepResult.Waiting;
+    }
 
-            Util.ShowObject(this.rows[this.step]);
-
-            this.step++;
-            return this.step >= this.rows.Count ? SelfTestStepResult.Pass : SelfTestStepResult.Waiting;
-        }
-
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            // ignored
-        }
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/PartyFinderAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/PartyFinderAgingStep.cs
index 6e8edbe29..eea015ad8 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/PartyFinderAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/PartyFinderAgingStep.cs
@@ -2,57 +2,56 @@ using Dalamud.Game.Gui.PartyFinder;
 using Dalamud.Game.Gui.PartyFinder.Types;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for Party Finder events.
+/// </summary>
+internal class PartyFinderAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for Party Finder events.
-    /// </summary>
-    internal class PartyFinderAgingStep : IAgingStep
+    private bool subscribed = false;
+    private bool hasPassed = false;
+
+    /// <inheritdoc/>
+    public string Name => "Test Party Finder";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        private bool subscribed = false;
-        private bool hasPassed = false;
+        var partyFinderGui = Service<PartyFinderGui>.Get();
 
-        /// <inheritdoc/>
-        public string Name => "Test Party Finder";
-
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        if (!this.subscribed)
         {
-            var partyFinderGui = Service<PartyFinderGui>.Get();
-
-            if (!this.subscribed)
-            {
-                partyFinderGui.ReceiveListing += this.PartyFinderOnReceiveListing;
-                this.subscribed = true;
-            }
-
-            if (this.hasPassed)
-            {
-                partyFinderGui.ReceiveListing -= this.PartyFinderOnReceiveListing;
-                this.subscribed = false;
-                return SelfTestStepResult.Pass;
-            }
-
-            ImGui.Text("Open Party Finder");
-
-            return SelfTestStepResult.Waiting;
+            partyFinderGui.ReceiveListing += this.PartyFinderOnReceiveListing;
+            this.subscribed = true;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
+        if (this.hasPassed)
         {
-            var partyFinderGui = Service<PartyFinderGui>.Get();
-
-            if (this.subscribed)
-            {
-                partyFinderGui.ReceiveListing -= this.PartyFinderOnReceiveListing;
-                this.subscribed = false;
-            }
+            partyFinderGui.ReceiveListing -= this.PartyFinderOnReceiveListing;
+            this.subscribed = false;
+            return SelfTestStepResult.Pass;
         }
 
-        private void PartyFinderOnReceiveListing(PartyFinderListing listing, PartyFinderListingEventArgs args)
+        ImGui.Text("Open Party Finder");
+
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        var partyFinderGui = Service<PartyFinderGui>.Get();
+
+        if (this.subscribed)
         {
-            this.hasPassed = true;
+            partyFinderGui.ReceiveListing -= this.PartyFinderOnReceiveListing;
+            this.subscribed = false;
         }
     }
+
+    private void PartyFinderOnReceiveListing(PartyFinderListing listing, PartyFinderListingEventArgs args)
+    {
+        this.hasPassed = true;
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs
index 48121abc3..1e66ac19e 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/TargetAgingStep.cs
@@ -3,74 +3,73 @@ using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.ClientState.Objects.Types;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for targets.
+/// </summary>
+internal class TargetAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for targets.
-    /// </summary>
-    internal class TargetAgingStep : IAgingStep
+    private int step = 0;
+
+    /// <inheritdoc/>
+    public string Name => "Test Target";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        private int step = 0;
+        var targetManager = Service<TargetManager>.Get();
 
-        /// <inheritdoc/>
-        public string Name => "Test Target";
-
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
+        switch (this.step)
         {
-            var targetManager = Service<TargetManager>.Get();
+            case 0:
+                targetManager.ClearTarget();
+                targetManager.ClearFocusTarget();
 
-            switch (this.step)
-            {
-                case 0:
-                    targetManager.ClearTarget();
-                    targetManager.ClearFocusTarget();
+                this.step++;
 
+                break;
+
+            case 1:
+                ImGui.Text("Target a player...");
+
+                var cTarget = targetManager.Target;
+                if (cTarget is PlayerCharacter)
+                {
                     this.step++;
+                }
 
-                    break;
+                break;
 
-                case 1:
-                    ImGui.Text("Target a player...");
+            case 2:
+                ImGui.Text("Focus-Target a Battle NPC...");
 
-                    var cTarget = targetManager.Target;
-                    if (cTarget is PlayerCharacter)
-                    {
-                        this.step++;
-                    }
+                var fTarget = targetManager.FocusTarget;
+                if (fTarget is BattleNpc)
+                {
+                    this.step++;
+                }
 
-                    break;
+                break;
 
-                case 2:
-                    ImGui.Text("Focus-Target a Battle NPC...");
+            case 3:
+                ImGui.Text("Soft-Target an EventObj...");
 
-                    var fTarget = targetManager.FocusTarget;
-                    if (fTarget is BattleNpc)
-                    {
-                        this.step++;
-                    }
+                var sTarget = targetManager.SoftTarget;
+                if (sTarget is EventObj)
+                {
+                    return SelfTestStepResult.Pass;
+                }
 
-                    break;
-
-                case 3:
-                    ImGui.Text("Soft-Target an EventObj...");
-
-                    var sTarget = targetManager.SoftTarget;
-                    if (sTarget is EventObj)
-                    {
-                        return SelfTestStepResult.Pass;
-                    }
-
-                    break;
-            }
-
-            return SelfTestStepResult.Waiting;
+                break;
         }
 
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            // ignored
-        }
+        return SelfTestStepResult.Waiting;
+    }
+
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ToastAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ToastAgingStep.cs
index 239f8650e..f02eafc99 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ToastAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ToastAgingStep.cs
@@ -1,30 +1,29 @@
 using Dalamud.Game.Gui.Toast;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test setup for toasts.
+/// </summary>
+internal class ToastAgingStep : IAgingStep
 {
-    /// <summary>
-    /// Test setup for toasts.
-    /// </summary>
-    internal class ToastAgingStep : IAgingStep
+    /// <inheritdoc/>
+    public string Name => "Test Toasts";
+
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
     {
-        /// <inheritdoc/>
-        public string Name => "Test Toasts";
+        var toastGui = Service<ToastGui>.Get();
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
-        {
-            var toastGui = Service<ToastGui>.Get();
+        toastGui.ShowNormal("Normal Toast");
+        toastGui.ShowError("Error Toast");
 
-            toastGui.ShowNormal("Normal Toast");
-            toastGui.ShowError("Error Toast");
+        return SelfTestStepResult.Pass;
+    }
 
-            return SelfTestStepResult.Pass;
-        }
-
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            // ignored
-        }
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        // ignored
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/WaitFramesAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/WaitFramesAgingStep.cs
index 57e7e99ac..54aeee145 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/WaitFramesAgingStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/WaitFramesAgingStep.cs
@@ -1,38 +1,37 @@
-namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
+namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps;
+
+/// <summary>
+/// Test that waits N frames.
+/// </summary>
+internal class WaitFramesAgingStep : IAgingStep
 {
+    private readonly int frames;
+    private int cFrames;
+
     /// <summary>
-    /// Test that waits N frames.
+    /// Initializes a new instance of the <see cref="WaitFramesAgingStep"/> class.
     /// </summary>
-    internal class WaitFramesAgingStep : IAgingStep
+    /// <param name="frames">Amount of frames to wait.</param>
+    public WaitFramesAgingStep(int frames)
     {
-        private readonly int frames;
-        private int cFrames;
+        this.frames = frames;
+        this.cFrames = frames;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WaitFramesAgingStep"/> class.
-        /// </summary>
-        /// <param name="frames">Amount of frames to wait.</param>
-        public WaitFramesAgingStep(int frames)
-        {
-            this.frames = frames;
-            this.cFrames = frames;
-        }
+    /// <inheritdoc/>
+    public string Name => $"Wait {this.cFrames} frames";
 
-        /// <inheritdoc/>
-        public string Name => $"Wait {this.cFrames} frames";
+    /// <inheritdoc/>
+    public SelfTestStepResult RunStep()
+    {
+        this.cFrames--;
 
-        /// <inheritdoc/>
-        public SelfTestStepResult RunStep()
-        {
-            this.cFrames--;
+        return this.cFrames <= 0 ? SelfTestStepResult.Pass : SelfTestStepResult.Waiting;
+    }
 
-            return this.cFrames <= 0 ? SelfTestStepResult.Pass : SelfTestStepResult.Waiting;
-        }
-
-        /// <inheritdoc/>
-        public void CleanUp()
-        {
-            this.cFrames = this.frames;
-        }
+    /// <inheritdoc/>
+    public void CleanUp()
+    {
+        this.cFrames = this.frames;
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestStepResult.cs b/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestStepResult.cs
index 70dddcab9..5abc8e2ed 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestStepResult.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestStepResult.cs
@@ -1,28 +1,27 @@
-namespace Dalamud.Interface.Internal.Windows.SelfTest
+namespace Dalamud.Interface.Internal.Windows.SelfTest;
+
+/// <summary>
+/// Enum declaring result states of tests.
+/// </summary>
+internal enum SelfTestStepResult
 {
     /// <summary>
-    /// Enum declaring result states of tests.
+    /// Test was not ran.
     /// </summary>
-    internal enum SelfTestStepResult
-    {
-        /// <summary>
-        /// Test was not ran.
-        /// </summary>
-        NotRan,
+    NotRan,
 
-        /// <summary>
-        /// Test is waiting for completion.
-        /// </summary>
-        Waiting,
+    /// <summary>
+    /// Test is waiting for completion.
+    /// </summary>
+    Waiting,
 
-        /// <summary>
-        /// Test has failed.
-        /// </summary>
-        Fail,
+    /// <summary>
+    /// Test has failed.
+    /// </summary>
+    Fail,
 
-        /// <summary>
-        /// Test has passed.
-        /// </summary>
-        Pass,
-    }
+    /// <summary>
+    /// Test has passed.
+    /// </summary>
+    Pass,
 }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs b/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
index 0af8bf1bb..352c5d322 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
@@ -11,249 +11,248 @@ using Dalamud.Logging.Internal;
 using ImGuiNET;
 using Lumina.Excel.GeneratedSheets;
 
-namespace Dalamud.Interface.Internal.Windows.SelfTest
+namespace Dalamud.Interface.Internal.Windows.SelfTest;
+
+/// <summary>
+/// Window for the Self-Test logic.
+/// </summary>
+internal class SelfTestWindow : Window
 {
+    private static readonly ModuleLog Log = new("AGING");
+
+    private readonly List<IAgingStep> steps =
+        new()
+        {
+            new LoginEventAgingStep(),
+            new WaitFramesAgingStep(1000),
+            new EnterTerritoryAgingStep(148, "Central Shroud"),
+            new ItemPayloadAgingStep(),
+            new ContextMenuAgingStep(),
+            new ActorTableAgingStep(),
+            new FateTableAgingStep(),
+            new AetheryteListAgingStep(),
+            new ConditionAgingStep(),
+            new ToastAgingStep(),
+            new TargetAgingStep(),
+            new KeyStateAgingStep(),
+            new GamepadStateAgingStep(),
+            new ChatAgingStep(),
+            new HoverAgingStep(),
+            new LuminaAgingStep<TerritoryType>(),
+            new PartyFinderAgingStep(),
+            new HandledExceptionAgingStep(),
+            new LogoutEventAgingStep(),
+        };
+
+    private readonly List<(SelfTestStepResult Result, TimeSpan? Duration)> stepResults = new();
+
+    private bool selfTestRunning = false;
+    private int currentStep = 0;
+
+    private DateTimeOffset lastTestStart;
+
     /// <summary>
-    /// Window for the Self-Test logic.
+    /// Initializes a new instance of the <see cref="SelfTestWindow"/> class.
     /// </summary>
-    internal class SelfTestWindow : Window
+    public SelfTestWindow()
+        : base("Dalamud Self-Test", ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse)
     {
-        private static readonly ModuleLog Log = new("AGING");
+        this.Size = new Vector2(800, 800);
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
-        private readonly List<IAgingStep> steps =
-            new()
-            {
-                new LoginEventAgingStep(),
-                new WaitFramesAgingStep(1000),
-                new EnterTerritoryAgingStep(148, "Central Shroud"),
-                new ItemPayloadAgingStep(),
-                new ContextMenuAgingStep(),
-                new ActorTableAgingStep(),
-                new FateTableAgingStep(),
-                new AetheryteListAgingStep(),
-                new ConditionAgingStep(),
-                new ToastAgingStep(),
-                new TargetAgingStep(),
-                new KeyStateAgingStep(),
-                new GamepadStateAgingStep(),
-                new ChatAgingStep(),
-                new HoverAgingStep(),
-                new LuminaAgingStep<TerritoryType>(),
-                new PartyFinderAgingStep(),
-                new HandledExceptionAgingStep(),
-                new LogoutEventAgingStep(),
-            };
+        this.RespectCloseHotkey = false;
+    }
 
-        private readonly List<(SelfTestStepResult Result, TimeSpan? Duration)> stepResults = new();
-
-        private bool selfTestRunning = false;
-        private int currentStep = 0;
-
-        private DateTimeOffset lastTestStart;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SelfTestWindow"/> class.
-        /// </summary>
-        public SelfTestWindow()
-            : base("Dalamud Self-Test", ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse)
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        if (this.selfTestRunning)
         {
-            this.Size = new Vector2(800, 800);
-            this.SizeCondition = ImGuiCond.FirstUseEver;
-
-            this.RespectCloseHotkey = false;
-        }
-
-        /// <inheritdoc/>
-        public override void Draw()
-        {
-            if (this.selfTestRunning)
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Stop))
             {
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.Stop))
-                {
-                    this.StopTests();
-                }
-
-                ImGui.SameLine();
-
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.StepForward))
-                {
-                    this.stepResults.Add((SelfTestStepResult.NotRan, null));
-                    this.currentStep++;
-                    this.lastTestStart = DateTimeOffset.Now;
-
-                    if (this.currentStep >= this.steps.Count)
-                    {
-                        this.StopTests();
-                    }
-                }
-            }
-            else
-            {
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.Play))
-                {
-                    this.selfTestRunning = true;
-                    this.currentStep = 0;
-                    this.stepResults.Clear();
-                    this.lastTestStart = DateTimeOffset.Now;
-                }
+                this.StopTests();
             }
 
             ImGui.SameLine();
 
-            ImGui.TextUnformatted($"Step: {this.currentStep} / {this.steps.Count}");
-
-            ImGuiHelpers.ScaledDummy(10);
-
-            this.DrawResultTable();
-
-            ImGuiHelpers.ScaledDummy(10);
-
-            if (this.currentStep >= this.steps.Count)
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.StepForward))
             {
-                if (this.selfTestRunning)
+                this.stepResults.Add((SelfTestStepResult.NotRan, null));
+                this.currentStep++;
+                this.lastTestStart = DateTimeOffset.Now;
+
+                if (this.currentStep >= this.steps.Count)
                 {
                     this.StopTests();
                 }
-
-                if (this.stepResults.Any(x => x.Result == SelfTestStepResult.Fail))
-                {
-                    ImGui.TextColored(ImGuiColors.DalamudRed, "One or more checks failed!");
-                }
-                else
-                {
-                    ImGui.TextColored(ImGuiColors.HealerGreen, "All checks passed!");
-                }
-
-                return;
             }
-
-            if (!this.selfTestRunning)
+        }
+        else
+        {
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Play))
             {
-                return;
-            }
-
-            ImGui.Separator();
-
-            var step = this.steps[this.currentStep];
-            ImGui.TextUnformatted($"Current: {step.Name}");
-
-            ImGuiHelpers.ScaledDummy(10);
-
-            SelfTestStepResult result;
-            try
-            {
-                result = step.RunStep();
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, $"Step failed: {step.Name}");
-                result = SelfTestStepResult.Fail;
-            }
-
-            ImGui.Separator();
-
-            if (result != SelfTestStepResult.Waiting)
-            {
-                var duration = DateTimeOffset.Now - this.lastTestStart;
-                this.currentStep++;
-                this.stepResults.Add((result, duration));
-
+                this.selfTestRunning = true;
+                this.currentStep = 0;
+                this.stepResults.Clear();
                 this.lastTestStart = DateTimeOffset.Now;
             }
         }
 
-        private void DrawResultTable()
+        ImGui.SameLine();
+
+        ImGui.TextUnformatted($"Step: {this.currentStep} / {this.steps.Count}");
+
+        ImGuiHelpers.ScaledDummy(10);
+
+        this.DrawResultTable();
+
+        ImGuiHelpers.ScaledDummy(10);
+
+        if (this.currentStep >= this.steps.Count)
         {
-            if (ImGui.BeginTable("agingResultTable", 4, ImGuiTableFlags.Borders))
+            if (this.selfTestRunning)
             {
-                ImGui.TableSetupColumn("###index", ImGuiTableColumnFlags.WidthFixed, 12f);
-                ImGui.TableSetupColumn("Name");
-                ImGui.TableSetupColumn("Result", ImGuiTableColumnFlags.WidthFixed, 40f);
-                ImGui.TableSetupColumn("Duration", ImGuiTableColumnFlags.WidthFixed, 90f);
-
-                ImGui.TableHeadersRow();
-
-                for (var i = 0; i < this.steps.Count; i++)
-                {
-                    var step = this.steps[i];
-                    ImGui.TableNextRow();
-
-                    ImGui.TableSetColumnIndex(0);
-                    ImGui.Text(i.ToString());
-
-                    ImGui.TableSetColumnIndex(1);
-                    ImGui.Text(step.Name);
-
-                    ImGui.TableSetColumnIndex(2);
-                    ImGui.PushFont(Interface.Internal.InterfaceManager.MonoFont);
-                    if (this.stepResults.Count > i)
-                    {
-                        var result = this.stepResults[i];
-
-                        switch (result.Result)
-                        {
-                            case SelfTestStepResult.Pass:
-                                ImGui.TextColored(ImGuiColors.HealerGreen, "PASS");
-                                break;
-                            case SelfTestStepResult.Fail:
-                                ImGui.TextColored(ImGuiColors.DalamudRed, "FAIL");
-                                break;
-                            default:
-                                ImGui.TextColored(ImGuiColors.DalamudGrey, "NR");
-                                break;
-                        }
-                    }
-                    else
-                    {
-                        if (this.selfTestRunning && this.currentStep == i)
-                        {
-                            ImGui.TextColored(ImGuiColors.DalamudGrey, "WAIT");
-                        }
-                        else
-                        {
-                            ImGui.TextColored(ImGuiColors.DalamudGrey, "NR");
-                        }
-                    }
-
-                    ImGui.PopFont();
-
-                    ImGui.TableSetColumnIndex(3);
-                    if (this.stepResults.Count > i)
-                    {
-                        var (_, duration) = this.stepResults[i];
-
-                        if (duration.HasValue)
-                        {
-                            ImGui.TextUnformatted(duration.Value.ToString("g"));
-                        }
-                    }
-                    else
-                    {
-                        if (this.selfTestRunning && this.currentStep == i)
-                        {
-                            ImGui.TextUnformatted((DateTimeOffset.Now - this.lastTestStart).ToString("g"));
-                        }
-                    }
-                }
-
-                ImGui.EndTable();
+                this.StopTests();
             }
+
+            if (this.stepResults.Any(x => x.Result == SelfTestStepResult.Fail))
+            {
+                ImGui.TextColored(ImGuiColors.DalamudRed, "One or more checks failed!");
+            }
+            else
+            {
+                ImGui.TextColored(ImGuiColors.HealerGreen, "All checks passed!");
+            }
+
+            return;
         }
 
-        private void StopTests()
+        if (!this.selfTestRunning)
         {
-            this.selfTestRunning = false;
+            return;
+        }
 
-            foreach (var agingStep in this.steps)
+        ImGui.Separator();
+
+        var step = this.steps[this.currentStep];
+        ImGui.TextUnformatted($"Current: {step.Name}");
+
+        ImGuiHelpers.ScaledDummy(10);
+
+        SelfTestStepResult result;
+        try
+        {
+            result = step.RunStep();
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, $"Step failed: {step.Name}");
+            result = SelfTestStepResult.Fail;
+        }
+
+        ImGui.Separator();
+
+        if (result != SelfTestStepResult.Waiting)
+        {
+            var duration = DateTimeOffset.Now - this.lastTestStart;
+            this.currentStep++;
+            this.stepResults.Add((result, duration));
+
+            this.lastTestStart = DateTimeOffset.Now;
+        }
+    }
+
+    private void DrawResultTable()
+    {
+        if (ImGui.BeginTable("agingResultTable", 4, ImGuiTableFlags.Borders))
+        {
+            ImGui.TableSetupColumn("###index", ImGuiTableColumnFlags.WidthFixed, 12f);
+            ImGui.TableSetupColumn("Name");
+            ImGui.TableSetupColumn("Result", ImGuiTableColumnFlags.WidthFixed, 40f);
+            ImGui.TableSetupColumn("Duration", ImGuiTableColumnFlags.WidthFixed, 90f);
+
+            ImGui.TableHeadersRow();
+
+            for (var i = 0; i < this.steps.Count; i++)
             {
-                try
+                var step = this.steps[i];
+                ImGui.TableNextRow();
+
+                ImGui.TableSetColumnIndex(0);
+                ImGui.Text(i.ToString());
+
+                ImGui.TableSetColumnIndex(1);
+                ImGui.Text(step.Name);
+
+                ImGui.TableSetColumnIndex(2);
+                ImGui.PushFont(Interface.Internal.InterfaceManager.MonoFont);
+                if (this.stepResults.Count > i)
                 {
-                    agingStep.CleanUp();
+                    var result = this.stepResults[i];
+
+                    switch (result.Result)
+                    {
+                        case SelfTestStepResult.Pass:
+                            ImGui.TextColored(ImGuiColors.HealerGreen, "PASS");
+                            break;
+                        case SelfTestStepResult.Fail:
+                            ImGui.TextColored(ImGuiColors.DalamudRed, "FAIL");
+                            break;
+                        default:
+                            ImGui.TextColored(ImGuiColors.DalamudGrey, "NR");
+                            break;
+                    }
                 }
-                catch (Exception ex)
+                else
                 {
-                    Log.Error(ex, $"Could not clean up AgingStep: {agingStep.Name}");
+                    if (this.selfTestRunning && this.currentStep == i)
+                    {
+                        ImGui.TextColored(ImGuiColors.DalamudGrey, "WAIT");
+                    }
+                    else
+                    {
+                        ImGui.TextColored(ImGuiColors.DalamudGrey, "NR");
+                    }
                 }
+
+                ImGui.PopFont();
+
+                ImGui.TableSetColumnIndex(3);
+                if (this.stepResults.Count > i)
+                {
+                    var (_, duration) = this.stepResults[i];
+
+                    if (duration.HasValue)
+                    {
+                        ImGui.TextUnformatted(duration.Value.ToString("g"));
+                    }
+                }
+                else
+                {
+                    if (this.selfTestRunning && this.currentStep == i)
+                    {
+                        ImGui.TextUnformatted((DateTimeOffset.Now - this.lastTestStart).ToString("g"));
+                    }
+                }
+            }
+
+            ImGui.EndTable();
+        }
+    }
+
+    private void StopTests()
+    {
+        this.selfTestRunning = false;
+
+        foreach (var agingStep in this.steps)
+        {
+            try
+            {
+                agingStep.CleanUp();
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, $"Could not clean up AgingStep: {agingStep.Name}");
             }
         }
     }
diff --git a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
index a088f449e..3fb666af2 100644
--- a/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/SettingsWindow.cs
@@ -17,961 +17,960 @@ using Dalamud.Plugin.Internal;
 using Dalamud.Utility;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// The window that allows for general configuration of Dalamud itself.
+/// </summary>
+internal class SettingsWindow : Window
 {
+    private readonly string[] languages;
+    private readonly string[] locLanguages;
+
+    private int langIndex;
+
+    private XivChatType dalamudMessagesChatType;
+
+    private bool doWaitForPluginsOnStartup;
+    private bool doCfTaskBarFlash;
+    private bool doCfChatMessage;
+    private bool doMbCollect;
+
+    private float globalUiScale;
+    private bool doUseAxisFontsFromGame;
+    private float fontGamma;
+    private bool doToggleUiHide;
+    private bool doToggleUiHideDuringCutscenes;
+    private bool doToggleUiHideDuringGpose;
+    private bool doDocking;
+    private bool doViewport;
+    private bool doGamepad;
+    private bool doFocus;
+    private bool doTsm;
+
+    private List<string>? dtrOrder;
+    private List<string>? dtrIgnore;
+    private int dtrSpacing;
+    private bool dtrSwapDirection;
+
+    private int? pluginWaitBeforeFree;
+
+    private List<ThirdPartyRepoSettings> thirdRepoList;
+    private bool thirdRepoListChanged;
+    private string thirdRepoTempUrl = string.Empty;
+    private string thirdRepoAddError = string.Empty;
+
+    private List<DevPluginLocationSettings> devPluginLocations;
+    private bool devPluginLocationsChanged;
+    private string devPluginTempLocation = string.Empty;
+    private string devPluginLocationAddError = string.Empty;
+
+    private bool printPluginsWelcomeMsg;
+    private bool autoUpdatePlugins;
+    private bool doButtonsSystemMenu;
+    private bool disableRmtFiltering;
+
+    #region Experimental
+
+    private bool doPluginTest;
+
+    #endregion
+
     /// <summary>
-    /// The window that allows for general configuration of Dalamud itself.
+    /// Initializes a new instance of the <see cref="SettingsWindow"/> class.
     /// </summary>
-    internal class SettingsWindow : Window
+    public SettingsWindow()
+        : base(Loc.Localize("DalamudSettingsHeader", "Dalamud Settings") + "###XlSettings2", ImGuiWindowFlags.NoCollapse)
     {
-        private readonly string[] languages;
-        private readonly string[] locLanguages;
+        var configuration = Service<DalamudConfiguration>.Get();
 
-        private int langIndex;
+        this.Size = new Vector2(740, 550);
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
-        private XivChatType dalamudMessagesChatType;
+        this.dalamudMessagesChatType = configuration.GeneralChatType;
 
-        private bool doWaitForPluginsOnStartup;
-        private bool doCfTaskBarFlash;
-        private bool doCfChatMessage;
-        private bool doMbCollect;
+        this.doWaitForPluginsOnStartup = configuration.IsResumeGameAfterPluginLoad;
+        this.doCfTaskBarFlash = configuration.DutyFinderTaskbarFlash;
+        this.doCfChatMessage = configuration.DutyFinderChatMessage;
+        this.doMbCollect = configuration.IsMbCollect;
 
-        private float globalUiScale;
-        private bool doUseAxisFontsFromGame;
-        private float fontGamma;
-        private bool doToggleUiHide;
-        private bool doToggleUiHideDuringCutscenes;
-        private bool doToggleUiHideDuringGpose;
-        private bool doDocking;
-        private bool doViewport;
-        private bool doGamepad;
-        private bool doFocus;
-        private bool doTsm;
+        this.globalUiScale = configuration.GlobalUiScale;
+        this.fontGamma = configuration.FontGammaLevel;
+        this.doUseAxisFontsFromGame = configuration.UseAxisFontsFromGame;
+        this.doToggleUiHide = configuration.ToggleUiHide;
+        this.doToggleUiHideDuringCutscenes = configuration.ToggleUiHideDuringCutscenes;
+        this.doToggleUiHideDuringGpose = configuration.ToggleUiHideDuringGpose;
 
-        private List<string>? dtrOrder;
-        private List<string>? dtrIgnore;
-        private int dtrSpacing;
-        private bool dtrSwapDirection;
+        this.doDocking = configuration.IsDocking;
+        this.doViewport = !configuration.IsDisableViewport;
+        this.doGamepad = configuration.IsGamepadNavigationEnabled;
+        this.doFocus = configuration.IsFocusManagementEnabled;
+        this.doTsm = configuration.ShowTsm;
 
-        private int? pluginWaitBeforeFree;
+        this.dtrSpacing = configuration.DtrSpacing;
+        this.dtrSwapDirection = configuration.DtrSwapDirection;
 
-        private List<ThirdPartyRepoSettings> thirdRepoList;
-        private bool thirdRepoListChanged;
-        private string thirdRepoTempUrl = string.Empty;
-        private string thirdRepoAddError = string.Empty;
+        this.pluginWaitBeforeFree = configuration.PluginWaitBeforeFree;
 
-        private List<DevPluginLocationSettings> devPluginLocations;
-        private bool devPluginLocationsChanged;
-        private string devPluginTempLocation = string.Empty;
-        private string devPluginLocationAddError = string.Empty;
+        this.doPluginTest = configuration.DoPluginTest;
+        this.thirdRepoList = configuration.ThirdRepoList.Select(x => x.Clone()).ToList();
+        this.devPluginLocations = configuration.DevPluginLoadLocations.Select(x => x.Clone()).ToList();
 
-        private bool printPluginsWelcomeMsg;
-        private bool autoUpdatePlugins;
-        private bool doButtonsSystemMenu;
-        private bool disableRmtFiltering;
+        this.printPluginsWelcomeMsg = configuration.PrintPluginsWelcomeMsg;
+        this.autoUpdatePlugins = configuration.AutoUpdatePlugins;
+        this.doButtonsSystemMenu = configuration.DoButtonsSystemMenu;
+        this.disableRmtFiltering = configuration.DisableRmtFiltering;
 
-        #region Experimental
+        this.languages = Localization.ApplicableLangCodes.Prepend("en").ToArray();
+        this.langIndex = Array.IndexOf(this.languages, configuration.EffectiveLanguage);
+        if (this.langIndex == -1)
+            this.langIndex = 0;
 
-        private bool doPluginTest;
+        try
+        {
+            var locLanguagesList = new List<string>();
+            string locLanguage;
+            foreach (var language in this.languages)
+            {
+                if (language != "ko")
+                {
+                    locLanguage = CultureInfo.GetCultureInfo(language).NativeName;
+                    locLanguagesList.Add(char.ToUpper(locLanguage[0]) + locLanguage[1..]);
+                }
+                else
+                {
+                    locLanguagesList.Add("Korean");
+                }
+            }
+
+            this.locLanguages = locLanguagesList.ToArray();
+        }
+        catch (Exception)
+        {
+            this.locLanguages = this.languages; // Languages not localized, only codes.
+        }
+    }
+
+    /// <inheritdoc/>
+    public override void OnOpen()
+    {
+        this.thirdRepoListChanged = false;
+        this.devPluginLocationsChanged = false;
+
+        var configuration = Service<DalamudConfiguration>.Get();
+        this.dtrOrder = configuration.DtrOrder;
+        this.dtrIgnore = configuration.DtrIgnore;
+    }
+
+    /// <inheritdoc/>
+    public override void OnClose()
+    {
+        var configuration = Service<DalamudConfiguration>.Get();
+        var interfaceManager = Service<InterfaceManager>.Get();
+
+        var rebuildFont = ImGui.GetIO().FontGlobalScale != configuration.GlobalUiScale
+                          || interfaceManager.FontGamma != configuration.FontGammaLevel
+                          || interfaceManager.UseAxis != configuration.UseAxisFontsFromGame;
+
+        ImGui.GetIO().FontGlobalScale = configuration.GlobalUiScale;
+        interfaceManager.FontGammaOverride = null;
+        interfaceManager.UseAxisOverride = null;
+        this.thirdRepoList = configuration.ThirdRepoList.Select(x => x.Clone()).ToList();
+        this.devPluginLocations = configuration.DevPluginLoadLocations.Select(x => x.Clone()).ToList();
+
+        configuration.DtrOrder = this.dtrOrder;
+        configuration.DtrIgnore = this.dtrIgnore;
+
+        if (rebuildFont)
+            interfaceManager.RebuildFonts();
+    }
+
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        var windowSize = ImGui.GetWindowSize();
+        ImGui.BeginChild("scrolling", new Vector2(windowSize.X - 5 - (5 * ImGuiHelpers.GlobalScale), windowSize.Y - 35 - (35 * ImGuiHelpers.GlobalScale)), false);
+
+        if (ImGui.BeginTabBar("SetTabBar"))
+        {
+            if (ImGui.BeginTabItem(Loc.Localize("DalamudSettingsGeneral", "General") + "###settingsTabGeneral"))
+            {
+                this.DrawGeneralTab();
+                ImGui.EndTabItem();
+            }
+
+            if (ImGui.BeginTabItem(Loc.Localize("DalamudSettingsVisual", "Look & Feel") + "###settingsTabVisual"))
+            {
+                this.DrawLookAndFeelTab();
+                ImGui.EndTabItem();
+            }
+
+            if (ImGui.BeginTabItem(Loc.Localize("DalamudSettingsServerInfoBar", "Server Info Bar") + "###settingsTabInfoBar"))
+            {
+                this.DrawServerInfoBarTab();
+                ImGui.EndTabItem();
+            }
+
+            if (ImGui.BeginTabItem(Loc.Localize("DalamudSettingsExperimental", "Experimental") + "###settingsTabExperimental"))
+            {
+                this.DrawExperimentalTab();
+                ImGui.EndTabItem();
+            }
+
+            ImGui.EndTabBar();
+        }
+
+        ImGui.EndChild();
+
+        this.DrawSaveCloseButtons();
+    }
+
+    private void DrawGeneralTab()
+    {
+        ImGui.Text(Loc.Localize("DalamudSettingsLanguage", "Language"));
+        ImGui.Combo("##XlLangCombo", ref this.langIndex, this.locLanguages, this.locLanguages.Length);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsLanguageHint", "Select the language Dalamud will be displayed in."));
+
+        ImGuiHelpers.ScaledDummy(5);
+
+        ImGui.Text(Loc.Localize("DalamudSettingsChannel", "General Chat Channel"));
+        if (ImGui.BeginCombo("##XlChatTypeCombo", this.dalamudMessagesChatType.ToString()))
+        {
+            foreach (var type in Enum.GetValues(typeof(XivChatType)).Cast<XivChatType>())
+            {
+                if (ImGui.Selectable(type.ToString(), type == this.dalamudMessagesChatType))
+                {
+                    this.dalamudMessagesChatType = type;
+                }
+            }
+
+            ImGui.EndCombo();
+        }
+
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsChannelHint", "Select the chat channel that is to be used for general Dalamud messages."));
+
+        ImGuiHelpers.ScaledDummy(5);
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingsWaitForPluginsOnStartup", "Wait for plugins before game loads"), ref this.doWaitForPluginsOnStartup);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsWaitForPluginsOnStartupHint", "Do not let the game load, until plugins are loaded."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingsFlash", "Flash FFXIV window on duty pop"), ref this.doCfTaskBarFlash);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsFlashHint", "Flash the FFXIV window in your task bar when a duty is ready."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingsDutyFinderMessage", "Chatlog message on duty pop"), ref this.doCfChatMessage);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsDutyFinderMessageHint", "Send a message in FFXIV chat when a duty is ready."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingsPrintPluginsWelcomeMsg", "Display loaded plugins in the welcome message"), ref this.printPluginsWelcomeMsg);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsPrintPluginsWelcomeMsgHint", "Display loaded plugins in FFXIV chat when logging in with a character."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingsAutoUpdatePlugins", "Auto-update plugins"), ref this.autoUpdatePlugins);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsAutoUpdatePluginsMsgHint", "Automatically update plugins when logging in with a character."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingsSystemMenu", "Dalamud buttons in system menu"), ref this.doButtonsSystemMenu);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsSystemMenuMsgHint", "Add buttons for Dalamud plugins and settings to the system menu."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingsDisableRmtFiltering", "Disable RMT Filtering"), ref this.disableRmtFiltering);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsDisableRmtFilteringMsgHint", "Disable Dalamud's built-in RMT ad filtering."));
+
+        ImGuiHelpers.ScaledDummy(5);
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingDoMbCollect", "Anonymously upload market board data"), ref this.doMbCollect);
+
+        ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudGrey);
+        ImGui.TextWrapped(Loc.Localize("DalamudSettingDoMbCollectHint", "Anonymously provide data about in-game economics to Universalis when browsing the market board. This data can't be tied to you in any way and everyone benefits!"));
+        ImGui.PopStyleColor();
+    }
+
+    private void DrawLookAndFeelTab()
+    {
+        var interfaceManager = Service<InterfaceManager>.Get();
+
+        ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 3);
+        ImGui.Text(Loc.Localize("DalamudSettingsGlobalUiScale", "Global Font Scale"));
+        ImGui.SameLine();
+        ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 3);
+        if (ImGui.Button("9.6pt##DalamudSettingsGlobalUiScaleReset96"))
+        {
+            this.globalUiScale = 9.6f / 12.0f;
+            ImGui.GetIO().FontGlobalScale = this.globalUiScale;
+            interfaceManager.RebuildFonts();
+        }
+
+        ImGui.SameLine();
+        if (ImGui.Button("12pt##DalamudSettingsGlobalUiScaleReset12"))
+        {
+            this.globalUiScale = 1.0f;
+            ImGui.GetIO().FontGlobalScale = this.globalUiScale;
+            interfaceManager.RebuildFonts();
+        }
+
+        ImGui.SameLine();
+        if (ImGui.Button("14pt##DalamudSettingsGlobalUiScaleReset14"))
+        {
+            this.globalUiScale = 14.0f / 12.0f;
+            ImGui.GetIO().FontGlobalScale = this.globalUiScale;
+            interfaceManager.RebuildFonts();
+        }
+
+        ImGui.SameLine();
+        if (ImGui.Button("18pt##DalamudSettingsGlobalUiScaleReset18"))
+        {
+            this.globalUiScale = 18.0f / 12.0f;
+            ImGui.GetIO().FontGlobalScale = this.globalUiScale;
+            interfaceManager.RebuildFonts();
+        }
+
+        ImGui.SameLine();
+        if (ImGui.Button("36pt##DalamudSettingsGlobalUiScaleReset36"))
+        {
+            this.globalUiScale = 36.0f / 12.0f;
+            ImGui.GetIO().FontGlobalScale = this.globalUiScale;
+            interfaceManager.RebuildFonts();
+        }
+
+        var globalUiScaleInPt = 12f * this.globalUiScale;
+        if (ImGui.DragFloat("##DalamudSettingsGlobalUiScaleDrag", ref globalUiScaleInPt, 0.1f, 9.6f, 36f, "%.1fpt", ImGuiSliderFlags.AlwaysClamp))
+        {
+            this.globalUiScale = globalUiScaleInPt / 12f;
+            ImGui.GetIO().FontGlobalScale = this.globalUiScale;
+            interfaceManager.RebuildFonts();
+        }
+
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsGlobalUiScaleHint", "Scale text in all XIVLauncher UI elements - this is useful for 4K displays."));
+
+        ImGuiHelpers.ScaledDummy(10, 16);
+
+        if (ImGui.Button(Loc.Localize("DalamudSettingsOpenStyleEditor", "Open Style Editor")))
+        {
+            Service<DalamudInterface>.Get().OpenStyleEditor();
+        }
+
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsStyleEditorHint", "Modify the look & feel of Dalamud windows."));
+
+        ImGuiHelpers.ScaledDummy(10);
+
+        if (ImGui.Checkbox(Loc.Localize("DalamudSettingToggleAxisFonts", "Use AXIS fonts as default Dalamud font"), ref this.doUseAxisFontsFromGame))
+        {
+            interfaceManager.UseAxisOverride = this.doUseAxisFontsFromGame;
+            interfaceManager.RebuildFonts();
+        }
+
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleUiAxisFontsHint", "Use AXIS fonts (the game's main UI fonts) as default Dalamud font."));
+
+        ImGuiHelpers.ScaledDummy(10);
+
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleUiHideOptOutNote", "Plugins may independently opt out of the settings below."));
+
+        ImGuiHelpers.ScaledDummy(3);
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingToggleUiHide", "Hide plugin UI when the game UI is toggled off"), ref this.doToggleUiHide);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleUiHideHint", "Hide any open windows by plugins when toggling the game overlay."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingToggleUiHideDuringCutscenes", "Hide plugin UI during cutscenes"), ref this.doToggleUiHideDuringCutscenes);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleUiHideDuringCutscenesHint", "Hide any open windows by plugins during cutscenes."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingToggleUiHideDuringGpose", "Hide plugin UI while gpose is active"), ref this.doToggleUiHideDuringGpose);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleUiHideDuringGposeHint", "Hide any open windows by plugins while gpose is active."));
+
+        ImGuiHelpers.ScaledDummy(10, 16);
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingToggleFocusManagement", "Use escape to close Dalamud windows"), ref this.doFocus);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleFocusManagementHint", "This will cause Dalamud windows to behave like in-game windows when pressing escape.\nThey will close one after another until all are closed. May not work for all plugins."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingToggleViewports", "Enable multi-monitor windows"), ref this.doViewport);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleViewportsHint", "This will allow you move plugin windows onto other monitors.\nWill only work in Borderless Window or Windowed mode."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingToggleDocking", "Enable window docking"), ref this.doDocking);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleDockingHint", "This will allow you to fuse and tab plugin windows."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingToggleGamepadNavigation", "Control plugins via gamepad"), ref this.doGamepad);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleGamepadNavigationHint", "This will allow you to toggle between game and plugin navigation via L1+L3.\nToggle the PluginInstaller window via R3 if ImGui navigation is enabled."));
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingToggleTsm", "Show title screen menu"), ref this.doTsm);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleTsmHint", "This will allow you to access certain Dalamud and Plugin functionality from the title screen."));
+
+        ImGuiHelpers.ScaledDummy(10, 16);
+        ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 3);
+        ImGui.Text(Loc.Localize("DalamudSettingsFontGamma", "Font Gamma"));
+        ImGui.SameLine();
+        ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 3);
+        if (ImGui.Button(Loc.Localize("DalamudSettingsIndividualConfigResetToDefaultValue", "Reset") + "##DalamudSettingsFontGammaReset"))
+        {
+            this.fontGamma = 1.4f;
+            interfaceManager.FontGammaOverride = this.fontGamma;
+            interfaceManager.RebuildFonts();
+        }
+
+        if (ImGui.DragFloat("##DalamudSettingsFontGammaDrag", ref this.fontGamma, 0.005f, 0.3f, 3f, "%.2f", ImGuiSliderFlags.AlwaysClamp))
+        {
+            interfaceManager.FontGammaOverride = this.fontGamma;
+            interfaceManager.RebuildFonts();
+        }
+
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsFontGammaHint", "Changes the thickness of text."));
+
+        ImGuiHelpers.ScaledDummy(10, 16);
+    }
+
+    private void DrawServerInfoBarTab()
+    {
+        ImGui.Text(Loc.Localize("DalamudSettingServerInfoBar", "Server Info Bar configuration"));
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarHint", "Plugins can put additional information into your server information bar(where world & time can be seen).\nYou can reorder and disable these here."));
+
+        ImGuiHelpers.ScaledDummy(10);
+
+        var configuration = Service<DalamudConfiguration>.Get();
+        var dtrBar = Service<DtrBar>.Get();
+
+        var order = configuration.DtrOrder!.Where(x => dtrBar.HasEntry(x)).ToList();
+        var ignore = configuration.DtrIgnore!.Where(x => dtrBar.HasEntry(x)).ToList();
+        var orderLeft = configuration.DtrOrder!.Where(x => !order.Contains(x)).ToList();
+        var ignoreLeft = configuration.DtrIgnore!.Where(x => !ignore.Contains(x)).ToList();
+
+        if (order.Count == 0)
+        {
+            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarDidNone", "You have no plugins that use this feature."));
+        }
+
+        var isOrderChange = false;
+        for (var i = 0; i < order.Count; i++)
+        {
+            var title = order[i];
+
+            // TODO: Maybe we can also resort the rest of the bar in the future?
+            // var isRequired = search is Configuration.SearchSetting.Internal or Configuration.SearchSetting.MacroLinks;
+
+            ImGui.PushFont(UiBuilder.IconFont);
+
+            var arrowUpText = $"{FontAwesomeIcon.ArrowUp.ToIconString()}##{title}";
+            if (i == 0)
+            {
+                ImGuiComponents.DisabledButton(arrowUpText);
+            }
+            else
+            {
+                if (ImGui.Button(arrowUpText))
+                {
+                    (order[i], order[i - 1]) = (order[i - 1], order[i]);
+                    isOrderChange = true;
+                }
+            }
+
+            ImGui.SameLine();
+
+            var arrowDownText = $"{FontAwesomeIcon.ArrowDown.ToIconString()}##{title}";
+            if (i == order.Count - 1)
+            {
+                ImGuiComponents.DisabledButton(arrowDownText);
+            }
+            else
+            {
+                if (ImGui.Button(arrowDownText) && i != order.Count - 1)
+                {
+                    (order[i], order[i + 1]) = (order[i + 1], order[i]);
+                    isOrderChange = true;
+                }
+            }
+
+            ImGui.PopFont();
+
+            ImGui.SameLine();
+
+            // if (isRequired) {
+            //     ImGui.TextUnformatted($"Search in {name}");
+            // } else {
+
+            var isShown = ignore.All(x => x != title);
+            var nextIsShow = isShown;
+            if (ImGui.Checkbox($"{title}###dtrEntry{i}", ref nextIsShow) && nextIsShow != isShown)
+            {
+                if (nextIsShow)
+                    ignore.Remove(title);
+                else
+                    ignore.Add(title);
+
+                dtrBar.MakeDirty(title);
+            }
+
+            // }
+        }
+
+        configuration.DtrOrder = order.Concat(orderLeft).ToList();
+        configuration.DtrIgnore = ignore.Concat(ignoreLeft).ToList();
+
+        if (isOrderChange)
+            dtrBar.ApplySort();
+
+        ImGuiHelpers.ScaledDummy(10);
+
+        ImGui.Text(Loc.Localize("DalamudSettingServerInfoBarSpacing", "Server Info Bar spacing"));
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarSpacingHint", "Configure the amount of space between entries in the server info bar here."));
+        ImGui.SliderInt("Spacing", ref this.dtrSpacing, 0, 40);
+
+        ImGui.Text(Loc.Localize("DalamudSettingServerInfoBarDirection", "Server Info Bar direction"));
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarDirectionHint", "If checked, the Server Info Bar elements will expand to the right instead of the left."));
+        ImGui.Checkbox("Swap Direction", ref this.dtrSwapDirection);
+    }
+
+    private void DrawExperimentalTab()
+    {
+        var configuration = Service<DalamudConfiguration>.Get();
+        var pluginManager = Service<PluginManager>.Get();
+
+        var useCustomPluginWaitBeforeFree = this.pluginWaitBeforeFree.HasValue;
+        if (ImGui.Checkbox(
+                Loc.Localize("DalamudSettingsPluginCustomizeWaitTime", "Customize wait time for plugin unload"),
+                ref useCustomPluginWaitBeforeFree))
+        {
+            if (!useCustomPluginWaitBeforeFree)
+                this.pluginWaitBeforeFree = null;
+            else
+                this.pluginWaitBeforeFree = PluginManager.PluginWaitBeforeFreeDefault;
+        }
+
+        if (useCustomPluginWaitBeforeFree)
+        {
+            var waitTime = this.pluginWaitBeforeFree ?? PluginManager.PluginWaitBeforeFreeDefault;
+            if (ImGui.SliderInt(
+                    "Wait time###DalamudSettingsPluginCustomizeWaitTimeSlider",
+                    ref waitTime,
+                    0,
+                    5000))
+            {
+                this.pluginWaitBeforeFree = waitTime;
+            }
+        }
+
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsPluginCustomizeWaitTimeHint", "Configure the wait time between stopping plugin and completely unloading plugin. If you are experiencing crashes when exiting the game, try increasing this value."));
+
+        ImGuiHelpers.ScaledDummy(12);
+
+        #region Plugin testing
+
+        ImGui.Checkbox(Loc.Localize("DalamudSettingsPluginTest", "Get plugin testing builds"), ref this.doPluginTest);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsPluginTestHint", "Receive testing prereleases for plugins."));
+        ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingsPluginTestWarning", "Testing plugins may not have been vetted before being published. Please only enable this if you are aware of the risks."));
 
         #endregion
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SettingsWindow"/> class.
-        /// </summary>
-        public SettingsWindow()
-            : base(Loc.Localize("DalamudSettingsHeader", "Dalamud Settings") + "###XlSettings2", ImGuiWindowFlags.NoCollapse)
+        ImGuiHelpers.ScaledDummy(12);
+
+        #region Hidden plugins
+
+        if (ImGui.Button(Loc.Localize("DalamudSettingsClearHidden", "Clear hidden plugins")))
         {
-            var configuration = Service<DalamudConfiguration>.Get();
-
-            this.Size = new Vector2(740, 550);
-            this.SizeCondition = ImGuiCond.FirstUseEver;
-
-            this.dalamudMessagesChatType = configuration.GeneralChatType;
-
-            this.doWaitForPluginsOnStartup = configuration.IsResumeGameAfterPluginLoad;
-            this.doCfTaskBarFlash = configuration.DutyFinderTaskbarFlash;
-            this.doCfChatMessage = configuration.DutyFinderChatMessage;
-            this.doMbCollect = configuration.IsMbCollect;
-
-            this.globalUiScale = configuration.GlobalUiScale;
-            this.fontGamma = configuration.FontGammaLevel;
-            this.doUseAxisFontsFromGame = configuration.UseAxisFontsFromGame;
-            this.doToggleUiHide = configuration.ToggleUiHide;
-            this.doToggleUiHideDuringCutscenes = configuration.ToggleUiHideDuringCutscenes;
-            this.doToggleUiHideDuringGpose = configuration.ToggleUiHideDuringGpose;
-
-            this.doDocking = configuration.IsDocking;
-            this.doViewport = !configuration.IsDisableViewport;
-            this.doGamepad = configuration.IsGamepadNavigationEnabled;
-            this.doFocus = configuration.IsFocusManagementEnabled;
-            this.doTsm = configuration.ShowTsm;
-
-            this.dtrSpacing = configuration.DtrSpacing;
-            this.dtrSwapDirection = configuration.DtrSwapDirection;
-
-            this.pluginWaitBeforeFree = configuration.PluginWaitBeforeFree;
-
-            this.doPluginTest = configuration.DoPluginTest;
-            this.thirdRepoList = configuration.ThirdRepoList.Select(x => x.Clone()).ToList();
-            this.devPluginLocations = configuration.DevPluginLoadLocations.Select(x => x.Clone()).ToList();
-
-            this.printPluginsWelcomeMsg = configuration.PrintPluginsWelcomeMsg;
-            this.autoUpdatePlugins = configuration.AutoUpdatePlugins;
-            this.doButtonsSystemMenu = configuration.DoButtonsSystemMenu;
-            this.disableRmtFiltering = configuration.DisableRmtFiltering;
-
-            this.languages = Localization.ApplicableLangCodes.Prepend("en").ToArray();
-            this.langIndex = Array.IndexOf(this.languages, configuration.EffectiveLanguage);
-            if (this.langIndex == -1)
-                this.langIndex = 0;
-
-            try
-            {
-                var locLanguagesList = new List<string>();
-                string locLanguage;
-                foreach (var language in this.languages)
-                {
-                    if (language != "ko")
-                    {
-                        locLanguage = CultureInfo.GetCultureInfo(language).NativeName;
-                        locLanguagesList.Add(char.ToUpper(locLanguage[0]) + locLanguage[1..]);
-                    }
-                    else
-                    {
-                        locLanguagesList.Add("Korean");
-                    }
-                }
-
-                this.locLanguages = locLanguagesList.ToArray();
-            }
-            catch (Exception)
-            {
-                this.locLanguages = this.languages; // Languages not localized, only codes.
-            }
+            configuration.HiddenPluginInternalName.Clear();
+            pluginManager.RefilterPluginMasters();
         }
 
-        /// <inheritdoc/>
-        public override void OnOpen()
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsClearHiddenHint", "Restore plugins you have previously hidden from the plugin installer."));
+
+        #endregion
+
+        ImGuiHelpers.ScaledDummy(12);
+
+        this.DrawCustomReposSection();
+
+        ImGuiHelpers.ScaledDummy(12);
+
+        this.DrawDevPluginLocationsSection();
+
+        ImGuiHelpers.ScaledDummy(12);
+
+        ImGui.TextColored(ImGuiColors.DalamudGrey, "Total memory used by Dalamud & Plugins: " + Util.FormatBytes(GC.GetTotalMemory(false)));
+    }
+
+    private void DrawCustomReposSection()
+    {
+        ImGui.Text(Loc.Localize("DalamudSettingsCustomRepo", "Custom Plugin Repositories"));
+        if (this.thirdRepoListChanged)
         {
-            this.thirdRepoListChanged = false;
-            this.devPluginLocationsChanged = false;
-
-            var configuration = Service<DalamudConfiguration>.Get();
-            this.dtrOrder = configuration.DtrOrder;
-            this.dtrIgnore = configuration.DtrIgnore;
-        }
-
-        /// <inheritdoc/>
-        public override void OnClose()
-        {
-            var configuration = Service<DalamudConfiguration>.Get();
-            var interfaceManager = Service<InterfaceManager>.Get();
-
-            var rebuildFont = ImGui.GetIO().FontGlobalScale != configuration.GlobalUiScale
-                || interfaceManager.FontGamma != configuration.FontGammaLevel
-                || interfaceManager.UseAxis != configuration.UseAxisFontsFromGame;
-
-            ImGui.GetIO().FontGlobalScale = configuration.GlobalUiScale;
-            interfaceManager.FontGammaOverride = null;
-            interfaceManager.UseAxisOverride = null;
-            this.thirdRepoList = configuration.ThirdRepoList.Select(x => x.Clone()).ToList();
-            this.devPluginLocations = configuration.DevPluginLoadLocations.Select(x => x.Clone()).ToList();
-
-            configuration.DtrOrder = this.dtrOrder;
-            configuration.DtrIgnore = this.dtrIgnore;
-
-            if (rebuildFont)
-                interfaceManager.RebuildFonts();
-        }
-
-        /// <inheritdoc/>
-        public override void Draw()
-        {
-            var windowSize = ImGui.GetWindowSize();
-            ImGui.BeginChild("scrolling", new Vector2(windowSize.X - 5 - (5 * ImGuiHelpers.GlobalScale), windowSize.Y - 35 - (35 * ImGuiHelpers.GlobalScale)), false);
-
-            if (ImGui.BeginTabBar("SetTabBar"))
-            {
-                if (ImGui.BeginTabItem(Loc.Localize("DalamudSettingsGeneral", "General") + "###settingsTabGeneral"))
-                {
-                    this.DrawGeneralTab();
-                    ImGui.EndTabItem();
-                }
-
-                if (ImGui.BeginTabItem(Loc.Localize("DalamudSettingsVisual", "Look & Feel") + "###settingsTabVisual"))
-                {
-                    this.DrawLookAndFeelTab();
-                    ImGui.EndTabItem();
-                }
-
-                if (ImGui.BeginTabItem(Loc.Localize("DalamudSettingsServerInfoBar", "Server Info Bar") + "###settingsTabInfoBar"))
-                {
-                    this.DrawServerInfoBarTab();
-                    ImGui.EndTabItem();
-                }
-
-                if (ImGui.BeginTabItem(Loc.Localize("DalamudSettingsExperimental", "Experimental") + "###settingsTabExperimental"))
-                {
-                    this.DrawExperimentalTab();
-                    ImGui.EndTabItem();
-                }
-
-                ImGui.EndTabBar();
-            }
-
-            ImGui.EndChild();
-
-            this.DrawSaveCloseButtons();
-        }
-
-        private void DrawGeneralTab()
-        {
-            ImGui.Text(Loc.Localize("DalamudSettingsLanguage", "Language"));
-            ImGui.Combo("##XlLangCombo", ref this.langIndex, this.locLanguages, this.locLanguages.Length);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsLanguageHint", "Select the language Dalamud will be displayed in."));
-
-            ImGuiHelpers.ScaledDummy(5);
-
-            ImGui.Text(Loc.Localize("DalamudSettingsChannel", "General Chat Channel"));
-            if (ImGui.BeginCombo("##XlChatTypeCombo", this.dalamudMessagesChatType.ToString()))
-            {
-                foreach (var type in Enum.GetValues(typeof(XivChatType)).Cast<XivChatType>())
-                {
-                    if (ImGui.Selectable(type.ToString(), type == this.dalamudMessagesChatType))
-                    {
-                        this.dalamudMessagesChatType = type;
-                    }
-                }
-
-                ImGui.EndCombo();
-            }
-
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsChannelHint", "Select the chat channel that is to be used for general Dalamud messages."));
-
-            ImGuiHelpers.ScaledDummy(5);
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingsWaitForPluginsOnStartup", "Wait for plugins before game loads"), ref this.doWaitForPluginsOnStartup);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsWaitForPluginsOnStartupHint", "Do not let the game load, until plugins are loaded."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingsFlash", "Flash FFXIV window on duty pop"), ref this.doCfTaskBarFlash);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsFlashHint", "Flash the FFXIV window in your task bar when a duty is ready."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingsDutyFinderMessage", "Chatlog message on duty pop"), ref this.doCfChatMessage);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsDutyFinderMessageHint", "Send a message in FFXIV chat when a duty is ready."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingsPrintPluginsWelcomeMsg", "Display loaded plugins in the welcome message"), ref this.printPluginsWelcomeMsg);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsPrintPluginsWelcomeMsgHint", "Display loaded plugins in FFXIV chat when logging in with a character."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingsAutoUpdatePlugins", "Auto-update plugins"), ref this.autoUpdatePlugins);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsAutoUpdatePluginsMsgHint", "Automatically update plugins when logging in with a character."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingsSystemMenu", "Dalamud buttons in system menu"), ref this.doButtonsSystemMenu);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsSystemMenuMsgHint", "Add buttons for Dalamud plugins and settings to the system menu."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingsDisableRmtFiltering", "Disable RMT Filtering"), ref this.disableRmtFiltering);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsDisableRmtFilteringMsgHint", "Disable Dalamud's built-in RMT ad filtering."));
-
-            ImGuiHelpers.ScaledDummy(5);
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingDoMbCollect", "Anonymously upload market board data"), ref this.doMbCollect);
-
-            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudGrey);
-            ImGui.TextWrapped(Loc.Localize("DalamudSettingDoMbCollectHint", "Anonymously provide data about in-game economics to Universalis when browsing the market board. This data can't be tied to you in any way and everyone benefits!"));
+            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.HealerGreen);
+            ImGui.SameLine();
+            ImGui.Text(Loc.Localize("DalamudSettingsChanged", "(Changed)"));
             ImGui.PopStyleColor();
         }
 
-        private void DrawLookAndFeelTab()
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingCustomRepoHint", "Add custom plugin repositories."));
+        ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingCustomRepoWarning", "We cannot take any responsibility for third-party plugins and repositories."));
+        ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingCustomRepoWarning2", "Plugins have full control over your PC, like any other program, and may cause harm or crashes."));
+        ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingCustomRepoWarning3", "Please make absolutely sure that you only install third-party plugins from developers you trust."));
+
+        ImGuiHelpers.ScaledDummy(5);
+
+        ImGui.Columns(4);
+        ImGui.SetColumnWidth(0, 18 + (5 * ImGuiHelpers.GlobalScale));
+        ImGui.SetColumnWidth(1, ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - (18 + 16 + 14) - ((5 + 45 + 26) * ImGuiHelpers.GlobalScale));
+        ImGui.SetColumnWidth(2, 16 + (45 * ImGuiHelpers.GlobalScale));
+        ImGui.SetColumnWidth(3, 14 + (26 * ImGuiHelpers.GlobalScale));
+
+        ImGui.Separator();
+
+        ImGui.Text("#");
+        ImGui.NextColumn();
+        ImGui.Text("URL");
+        ImGui.NextColumn();
+        ImGui.Text("Enabled");
+        ImGui.NextColumn();
+        ImGui.Text(string.Empty);
+        ImGui.NextColumn();
+
+        ImGui.Separator();
+
+        ImGui.Text("0");
+        ImGui.NextColumn();
+        ImGui.Text("XIVLauncher");
+        ImGui.NextColumn();
+        ImGui.NextColumn();
+        ImGui.NextColumn();
+        ImGui.Separator();
+
+        ThirdPartyRepoSettings repoToRemove = null;
+
+        var repoNumber = 1;
+        foreach (var thirdRepoSetting in this.thirdRepoList)
         {
-            var interfaceManager = Service<InterfaceManager>.Get();
+            var isEnabled = thirdRepoSetting.IsEnabled;
 
-            ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 3);
-            ImGui.Text(Loc.Localize("DalamudSettingsGlobalUiScale", "Global Font Scale"));
-            ImGui.SameLine();
-            ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 3);
-            if (ImGui.Button("9.6pt##DalamudSettingsGlobalUiScaleReset96"))
-            {
-                this.globalUiScale = 9.6f / 12.0f;
-                ImGui.GetIO().FontGlobalScale = this.globalUiScale;
-                interfaceManager.RebuildFonts();
-            }
-
-            ImGui.SameLine();
-            if (ImGui.Button("12pt##DalamudSettingsGlobalUiScaleReset12"))
-            {
-                this.globalUiScale = 1.0f;
-                ImGui.GetIO().FontGlobalScale = this.globalUiScale;
-                interfaceManager.RebuildFonts();
-            }
-
-            ImGui.SameLine();
-            if (ImGui.Button("14pt##DalamudSettingsGlobalUiScaleReset14"))
-            {
-                this.globalUiScale = 14.0f / 12.0f;
-                ImGui.GetIO().FontGlobalScale = this.globalUiScale;
-                interfaceManager.RebuildFonts();
-            }
-
-            ImGui.SameLine();
-            if (ImGui.Button("18pt##DalamudSettingsGlobalUiScaleReset18"))
-            {
-                this.globalUiScale = 18.0f / 12.0f;
-                ImGui.GetIO().FontGlobalScale = this.globalUiScale;
-                interfaceManager.RebuildFonts();
-            }
-
-            ImGui.SameLine();
-            if (ImGui.Button("36pt##DalamudSettingsGlobalUiScaleReset36"))
-            {
-                this.globalUiScale = 36.0f / 12.0f;
-                ImGui.GetIO().FontGlobalScale = this.globalUiScale;
-                interfaceManager.RebuildFonts();
-            }
-
-            var globalUiScaleInPt = 12f * this.globalUiScale;
-            if (ImGui.DragFloat("##DalamudSettingsGlobalUiScaleDrag", ref globalUiScaleInPt, 0.1f, 9.6f, 36f, "%.1fpt", ImGuiSliderFlags.AlwaysClamp))
-            {
-                this.globalUiScale = globalUiScaleInPt / 12f;
-                ImGui.GetIO().FontGlobalScale = this.globalUiScale;
-                interfaceManager.RebuildFonts();
-            }
-
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsGlobalUiScaleHint", "Scale text in all XIVLauncher UI elements - this is useful for 4K displays."));
-
-            ImGuiHelpers.ScaledDummy(10, 16);
-
-            if (ImGui.Button(Loc.Localize("DalamudSettingsOpenStyleEditor", "Open Style Editor")))
-            {
-                Service<DalamudInterface>.Get().OpenStyleEditor();
-            }
-
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsStyleEditorHint", "Modify the look & feel of Dalamud windows."));
-
-            ImGuiHelpers.ScaledDummy(10);
-
-            if (ImGui.Checkbox(Loc.Localize("DalamudSettingToggleAxisFonts", "Use AXIS fonts as default Dalamud font"), ref this.doUseAxisFontsFromGame))
-            {
-                interfaceManager.UseAxisOverride = this.doUseAxisFontsFromGame;
-                interfaceManager.RebuildFonts();
-            }
-
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleUiAxisFontsHint", "Use AXIS fonts (the game's main UI fonts) as default Dalamud font."));
-
-            ImGuiHelpers.ScaledDummy(10);
-
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleUiHideOptOutNote", "Plugins may independently opt out of the settings below."));
-
-            ImGuiHelpers.ScaledDummy(3);
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingToggleUiHide", "Hide plugin UI when the game UI is toggled off"), ref this.doToggleUiHide);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleUiHideHint", "Hide any open windows by plugins when toggling the game overlay."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingToggleUiHideDuringCutscenes", "Hide plugin UI during cutscenes"), ref this.doToggleUiHideDuringCutscenes);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleUiHideDuringCutscenesHint", "Hide any open windows by plugins during cutscenes."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingToggleUiHideDuringGpose", "Hide plugin UI while gpose is active"), ref this.doToggleUiHideDuringGpose);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleUiHideDuringGposeHint", "Hide any open windows by plugins while gpose is active."));
-
-            ImGuiHelpers.ScaledDummy(10, 16);
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingToggleFocusManagement", "Use escape to close Dalamud windows"), ref this.doFocus);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleFocusManagementHint", "This will cause Dalamud windows to behave like in-game windows when pressing escape.\nThey will close one after another until all are closed. May not work for all plugins."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingToggleViewports", "Enable multi-monitor windows"), ref this.doViewport);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleViewportsHint", "This will allow you move plugin windows onto other monitors.\nWill only work in Borderless Window or Windowed mode."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingToggleDocking", "Enable window docking"), ref this.doDocking);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleDockingHint", "This will allow you to fuse and tab plugin windows."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingToggleGamepadNavigation", "Control plugins via gamepad"), ref this.doGamepad);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleGamepadNavigationHint", "This will allow you to toggle between game and plugin navigation via L1+L3.\nToggle the PluginInstaller window via R3 if ImGui navigation is enabled."));
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingToggleTsm", "Show title screen menu"), ref this.doTsm);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingToggleTsmHint", "This will allow you to access certain Dalamud and Plugin functionality from the title screen."));
-
-            ImGuiHelpers.ScaledDummy(10, 16);
-            ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 3);
-            ImGui.Text(Loc.Localize("DalamudSettingsFontGamma", "Font Gamma"));
-            ImGui.SameLine();
-            ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 3);
-            if (ImGui.Button(Loc.Localize("DalamudSettingsIndividualConfigResetToDefaultValue", "Reset") + "##DalamudSettingsFontGammaReset"))
-            {
-                this.fontGamma = 1.4f;
-                interfaceManager.FontGammaOverride = this.fontGamma;
-                interfaceManager.RebuildFonts();
-            }
-
-            if (ImGui.DragFloat("##DalamudSettingsFontGammaDrag", ref this.fontGamma, 0.005f, 0.3f, 3f, "%.2f", ImGuiSliderFlags.AlwaysClamp))
-            {
-                interfaceManager.FontGammaOverride = this.fontGamma;
-                interfaceManager.RebuildFonts();
-            }
-
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsFontGammaHint", "Changes the thickness of text."));
-
-            ImGuiHelpers.ScaledDummy(10, 16);
-        }
-
-        private void DrawServerInfoBarTab()
-        {
-            ImGui.Text(Loc.Localize("DalamudSettingServerInfoBar", "Server Info Bar configuration"));
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarHint", "Plugins can put additional information into your server information bar(where world & time can be seen).\nYou can reorder and disable these here."));
-
-            ImGuiHelpers.ScaledDummy(10);
-
-            var configuration = Service<DalamudConfiguration>.Get();
-            var dtrBar = Service<DtrBar>.Get();
-
-            var order = configuration.DtrOrder!.Where(x => dtrBar.HasEntry(x)).ToList();
-            var ignore = configuration.DtrIgnore!.Where(x => dtrBar.HasEntry(x)).ToList();
-            var orderLeft = configuration.DtrOrder!.Where(x => !order.Contains(x)).ToList();
-            var ignoreLeft = configuration.DtrIgnore!.Where(x => !ignore.Contains(x)).ToList();
-
-            if (order.Count == 0)
-            {
-                ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarDidNone", "You have no plugins that use this feature."));
-            }
-
-            var isOrderChange = false;
-            for (var i = 0; i < order.Count; i++)
-            {
-                var title = order[i];
-
-                // TODO: Maybe we can also resort the rest of the bar in the future?
-                // var isRequired = search is Configuration.SearchSetting.Internal or Configuration.SearchSetting.MacroLinks;
-
-                ImGui.PushFont(UiBuilder.IconFont);
-
-                var arrowUpText = $"{FontAwesomeIcon.ArrowUp.ToIconString()}##{title}";
-                if (i == 0)
-                {
-                    ImGuiComponents.DisabledButton(arrowUpText);
-                }
-                else
-                {
-                    if (ImGui.Button(arrowUpText))
-                    {
-                        (order[i], order[i - 1]) = (order[i - 1], order[i]);
-                        isOrderChange = true;
-                    }
-                }
-
-                ImGui.SameLine();
-
-                var arrowDownText = $"{FontAwesomeIcon.ArrowDown.ToIconString()}##{title}";
-                if (i == order.Count - 1)
-                {
-                    ImGuiComponents.DisabledButton(arrowDownText);
-                }
-                else
-                {
-                    if (ImGui.Button(arrowDownText) && i != order.Count - 1)
-                    {
-                        (order[i], order[i + 1]) = (order[i + 1], order[i]);
-                        isOrderChange = true;
-                    }
-                }
-
-                ImGui.PopFont();
-
-                ImGui.SameLine();
-
-                // if (isRequired) {
-                //     ImGui.TextUnformatted($"Search in {name}");
-                // } else {
-
-                var isShown = ignore.All(x => x != title);
-                var nextIsShow = isShown;
-                if (ImGui.Checkbox($"{title}###dtrEntry{i}", ref nextIsShow) && nextIsShow != isShown)
-                {
-                    if (nextIsShow)
-                        ignore.Remove(title);
-                    else
-                        ignore.Add(title);
-
-                    dtrBar.MakeDirty(title);
-                }
-
-                // }
-            }
-
-            configuration.DtrOrder = order.Concat(orderLeft).ToList();
-            configuration.DtrIgnore = ignore.Concat(ignoreLeft).ToList();
-
-            if (isOrderChange)
-                dtrBar.ApplySort();
-
-            ImGuiHelpers.ScaledDummy(10);
-
-            ImGui.Text(Loc.Localize("DalamudSettingServerInfoBarSpacing", "Server Info Bar spacing"));
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarSpacingHint", "Configure the amount of space between entries in the server info bar here."));
-            ImGui.SliderInt("Spacing", ref this.dtrSpacing, 0, 40);
-
-            ImGui.Text(Loc.Localize("DalamudSettingServerInfoBarDirection", "Server Info Bar direction"));
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingServerInfoBarDirectionHint", "If checked, the Server Info Bar elements will expand to the right instead of the left."));
-            ImGui.Checkbox("Swap Direction", ref this.dtrSwapDirection);
-        }
-
-        private void DrawExperimentalTab()
-        {
-            var configuration = Service<DalamudConfiguration>.Get();
-            var pluginManager = Service<PluginManager>.Get();
-
-            var useCustomPluginWaitBeforeFree = this.pluginWaitBeforeFree.HasValue;
-            if (ImGui.Checkbox(
-                    Loc.Localize("DalamudSettingsPluginCustomizeWaitTime", "Customize wait time for plugin unload"),
-                    ref useCustomPluginWaitBeforeFree))
-            {
-                if (!useCustomPluginWaitBeforeFree)
-                    this.pluginWaitBeforeFree = null;
-                else
-                    this.pluginWaitBeforeFree = PluginManager.PluginWaitBeforeFreeDefault;
-            }
-
-            if (useCustomPluginWaitBeforeFree)
-            {
-                var waitTime = this.pluginWaitBeforeFree ?? PluginManager.PluginWaitBeforeFreeDefault;
-                if (ImGui.SliderInt(
-                        "Wait time###DalamudSettingsPluginCustomizeWaitTimeSlider",
-                        ref waitTime,
-                        0,
-                        5000))
-                {
-                    this.pluginWaitBeforeFree = waitTime;
-                }
-            }
-
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsPluginCustomizeWaitTimeHint", "Configure the wait time between stopping plugin and completely unloading plugin. If you are experiencing crashes when exiting the game, try increasing this value."));
-
-            ImGuiHelpers.ScaledDummy(12);
-
-            #region Plugin testing
-
-            ImGui.Checkbox(Loc.Localize("DalamudSettingsPluginTest", "Get plugin testing builds"), ref this.doPluginTest);
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsPluginTestHint", "Receive testing prereleases for plugins."));
-            ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingsPluginTestWarning", "Testing plugins may not have been vetted before being published. Please only enable this if you are aware of the risks."));
-
-            #endregion
-
-            ImGuiHelpers.ScaledDummy(12);
-
-            #region Hidden plugins
-
-            if (ImGui.Button(Loc.Localize("DalamudSettingsClearHidden", "Clear hidden plugins")))
-            {
-                configuration.HiddenPluginInternalName.Clear();
-                pluginManager.RefilterPluginMasters();
-            }
-
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsClearHiddenHint", "Restore plugins you have previously hidden from the plugin installer."));
-
-            #endregion
-
-            ImGuiHelpers.ScaledDummy(12);
-
-            this.DrawCustomReposSection();
-
-            ImGuiHelpers.ScaledDummy(12);
-
-            this.DrawDevPluginLocationsSection();
-
-            ImGuiHelpers.ScaledDummy(12);
-
-            ImGui.TextColored(ImGuiColors.DalamudGrey, "Total memory used by Dalamud & Plugins: " + Util.FormatBytes(GC.GetTotalMemory(false)));
-        }
-
-        private void DrawCustomReposSection()
-        {
-            ImGui.Text(Loc.Localize("DalamudSettingsCustomRepo", "Custom Plugin Repositories"));
-            if (this.thirdRepoListChanged)
-            {
-                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.HealerGreen);
-                ImGui.SameLine();
-                ImGui.Text(Loc.Localize("DalamudSettingsChanged", "(Changed)"));
-                ImGui.PopStyleColor();
-            }
-
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingCustomRepoHint", "Add custom plugin repositories."));
-            ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingCustomRepoWarning", "We cannot take any responsibility for third-party plugins and repositories."));
-            ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingCustomRepoWarning2", "Plugins have full control over your PC, like any other program, and may cause harm or crashes."));
-            ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("DalamudSettingCustomRepoWarning3", "Please make absolutely sure that you only install third-party plugins from developers you trust."));
-
-            ImGuiHelpers.ScaledDummy(5);
-
-            ImGui.Columns(4);
-            ImGui.SetColumnWidth(0, 18 + (5 * ImGuiHelpers.GlobalScale));
-            ImGui.SetColumnWidth(1, ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - (18 + 16 + 14) - ((5 + 45 + 26) * ImGuiHelpers.GlobalScale));
-            ImGui.SetColumnWidth(2, 16 + (45 * ImGuiHelpers.GlobalScale));
-            ImGui.SetColumnWidth(3, 14 + (26 * ImGuiHelpers.GlobalScale));
-
-            ImGui.Separator();
-
-            ImGui.Text("#");
-            ImGui.NextColumn();
-            ImGui.Text("URL");
-            ImGui.NextColumn();
-            ImGui.Text("Enabled");
-            ImGui.NextColumn();
-            ImGui.Text(string.Empty);
-            ImGui.NextColumn();
-
-            ImGui.Separator();
-
-            ImGui.Text("0");
-            ImGui.NextColumn();
-            ImGui.Text("XIVLauncher");
-            ImGui.NextColumn();
-            ImGui.NextColumn();
-            ImGui.NextColumn();
-            ImGui.Separator();
-
-            ThirdPartyRepoSettings repoToRemove = null;
-
-            var repoNumber = 1;
-            foreach (var thirdRepoSetting in this.thirdRepoList)
-            {
-                var isEnabled = thirdRepoSetting.IsEnabled;
-
-                ImGui.PushID($"thirdRepo_{thirdRepoSetting.Url}");
-
-                ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 8 - (ImGui.CalcTextSize(repoNumber.ToString()).X / 2));
-                ImGui.Text(repoNumber.ToString());
-                ImGui.NextColumn();
-
-                ImGui.SetNextItemWidth(-1);
-                var url = thirdRepoSetting.Url;
-                if (ImGui.InputText($"##thirdRepoInput", ref url, 65535, ImGuiInputTextFlags.EnterReturnsTrue))
-                {
-                    var contains = this.thirdRepoList.Select(repo => repo.Url).Contains(url);
-                    if (thirdRepoSetting.Url == url)
-                    {
-                        // no change.
-                    }
-                    else if (contains && thirdRepoSetting.Url != url)
-                    {
-                        this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoExists", "Repo already exists.");
-                        Task.Delay(5000).ContinueWith(t => this.thirdRepoAddError = string.Empty);
-                    }
-                    else
-                    {
-                        thirdRepoSetting.Url = url;
-                        this.thirdRepoListChanged = url != thirdRepoSetting.Url;
-                    }
-                }
-
-                ImGui.NextColumn();
-
-                ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 7 - (12 * ImGuiHelpers.GlobalScale));
-                ImGui.Checkbox("##thirdRepoCheck", ref isEnabled);
-                ImGui.NextColumn();
-
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.Trash))
-                {
-                    repoToRemove = thirdRepoSetting;
-                }
-
-                ImGui.PopID();
-
-                ImGui.NextColumn();
-                ImGui.Separator();
-
-                thirdRepoSetting.IsEnabled = isEnabled;
-
-                repoNumber++;
-            }
-
-            if (repoToRemove != null)
-            {
-                this.thirdRepoList.Remove(repoToRemove);
-                this.thirdRepoListChanged = true;
-            }
+            ImGui.PushID($"thirdRepo_{thirdRepoSetting.Url}");
 
             ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 8 - (ImGui.CalcTextSize(repoNumber.ToString()).X / 2));
             ImGui.Text(repoNumber.ToString());
             ImGui.NextColumn();
+
             ImGui.SetNextItemWidth(-1);
-            ImGui.InputText("##thirdRepoUrlInput", ref this.thirdRepoTempUrl, 300);
-            ImGui.NextColumn();
-            // Enabled button
-            ImGui.NextColumn();
-            if (!string.IsNullOrEmpty(this.thirdRepoTempUrl) && ImGuiComponents.IconButton(FontAwesomeIcon.Plus))
+            var url = thirdRepoSetting.Url;
+            if (ImGui.InputText($"##thirdRepoInput", ref url, 65535, ImGuiInputTextFlags.EnterReturnsTrue))
             {
-                this.thirdRepoTempUrl = this.thirdRepoTempUrl.TrimEnd();
-                if (this.thirdRepoList.Any(r => string.Equals(r.Url, this.thirdRepoTempUrl, StringComparison.InvariantCultureIgnoreCase)))
+                var contains = this.thirdRepoList.Select(repo => repo.Url).Contains(url);
+                if (thirdRepoSetting.Url == url)
+                {
+                    // no change.
+                }
+                else if (contains && thirdRepoSetting.Url != url)
                 {
                     this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoExists", "Repo already exists.");
                     Task.Delay(5000).ContinueWith(t => this.thirdRepoAddError = string.Empty);
                 }
                 else
                 {
-                    this.thirdRepoList.Add(new ThirdPartyRepoSettings
-                    {
-                        Url = this.thirdRepoTempUrl,
-                        IsEnabled = true,
-                    });
-                    this.thirdRepoListChanged = true;
-                    this.thirdRepoTempUrl = string.Empty;
+                    thirdRepoSetting.Url = url;
+                    this.thirdRepoListChanged = url != thirdRepoSetting.Url;
                 }
             }
 
-            ImGui.Columns(1);
+            ImGui.NextColumn();
 
-            if (!string.IsNullOrEmpty(this.thirdRepoAddError))
+            ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 7 - (12 * ImGuiHelpers.GlobalScale));
+            ImGui.Checkbox("##thirdRepoCheck", ref isEnabled);
+            ImGui.NextColumn();
+
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Trash))
             {
-                ImGui.TextColored(new Vector4(1, 0, 0, 1), this.thirdRepoAddError);
+                repoToRemove = thirdRepoSetting;
+            }
+
+            ImGui.PopID();
+
+            ImGui.NextColumn();
+            ImGui.Separator();
+
+            thirdRepoSetting.IsEnabled = isEnabled;
+
+            repoNumber++;
+        }
+
+        if (repoToRemove != null)
+        {
+            this.thirdRepoList.Remove(repoToRemove);
+            this.thirdRepoListChanged = true;
+        }
+
+        ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 8 - (ImGui.CalcTextSize(repoNumber.ToString()).X / 2));
+        ImGui.Text(repoNumber.ToString());
+        ImGui.NextColumn();
+        ImGui.SetNextItemWidth(-1);
+        ImGui.InputText("##thirdRepoUrlInput", ref this.thirdRepoTempUrl, 300);
+        ImGui.NextColumn();
+        // Enabled button
+        ImGui.NextColumn();
+        if (!string.IsNullOrEmpty(this.thirdRepoTempUrl) && ImGuiComponents.IconButton(FontAwesomeIcon.Plus))
+        {
+            this.thirdRepoTempUrl = this.thirdRepoTempUrl.TrimEnd();
+            if (this.thirdRepoList.Any(r => string.Equals(r.Url, this.thirdRepoTempUrl, StringComparison.InvariantCultureIgnoreCase)))
+            {
+                this.thirdRepoAddError = Loc.Localize("DalamudThirdRepoExists", "Repo already exists.");
+                Task.Delay(5000).ContinueWith(t => this.thirdRepoAddError = string.Empty);
+            }
+            else
+            {
+                this.thirdRepoList.Add(new ThirdPartyRepoSettings
+                {
+                    Url = this.thirdRepoTempUrl,
+                    IsEnabled = true,
+                });
+                this.thirdRepoListChanged = true;
+                this.thirdRepoTempUrl = string.Empty;
             }
         }
 
-        private void DrawDevPluginLocationsSection()
+        ImGui.Columns(1);
+
+        if (!string.IsNullOrEmpty(this.thirdRepoAddError))
         {
-            ImGui.Text(Loc.Localize("DalamudSettingsDevPluginLocation", "Dev Plugin Locations"));
-            if (this.devPluginLocationsChanged)
-            {
-                ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.HealerGreen);
-                ImGui.SameLine();
-                ImGui.Text(Loc.Localize("DalamudSettingsChanged", "(Changed)"));
-                ImGui.PopStyleColor();
-            }
+            ImGui.TextColored(new Vector4(1, 0, 0, 1), this.thirdRepoAddError);
+        }
+    }
 
-            ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsDevPluginLocationsHint", "Add additional dev plugin load locations.\nThese can be either the directory or DLL path."));
+    private void DrawDevPluginLocationsSection()
+    {
+        ImGui.Text(Loc.Localize("DalamudSettingsDevPluginLocation", "Dev Plugin Locations"));
+        if (this.devPluginLocationsChanged)
+        {
+            ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.HealerGreen);
+            ImGui.SameLine();
+            ImGui.Text(Loc.Localize("DalamudSettingsChanged", "(Changed)"));
+            ImGui.PopStyleColor();
+        }
 
-            ImGuiHelpers.ScaledDummy(5);
+        ImGui.TextColored(ImGuiColors.DalamudGrey, Loc.Localize("DalamudSettingsDevPluginLocationsHint", "Add additional dev plugin load locations.\nThese can be either the directory or DLL path."));
 
-            ImGui.Columns(4);
-            ImGui.SetColumnWidth(0, 18 + (5 * ImGuiHelpers.GlobalScale));
-            ImGui.SetColumnWidth(1, ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - (18 + 16 + 14) - ((5 + 45 + 26) * ImGuiHelpers.GlobalScale));
-            ImGui.SetColumnWidth(2, 16 + (45 * ImGuiHelpers.GlobalScale));
-            ImGui.SetColumnWidth(3, 14 + (26 * ImGuiHelpers.GlobalScale));
+        ImGuiHelpers.ScaledDummy(5);
 
-            ImGui.Separator();
+        ImGui.Columns(4);
+        ImGui.SetColumnWidth(0, 18 + (5 * ImGuiHelpers.GlobalScale));
+        ImGui.SetColumnWidth(1, ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - (18 + 16 + 14) - ((5 + 45 + 26) * ImGuiHelpers.GlobalScale));
+        ImGui.SetColumnWidth(2, 16 + (45 * ImGuiHelpers.GlobalScale));
+        ImGui.SetColumnWidth(3, 14 + (26 * ImGuiHelpers.GlobalScale));
 
-            ImGui.Text("#");
-            ImGui.NextColumn();
-            ImGui.Text("Path");
-            ImGui.NextColumn();
-            ImGui.Text("Enabled");
-            ImGui.NextColumn();
-            ImGui.Text(string.Empty);
-            ImGui.NextColumn();
+        ImGui.Separator();
 
-            ImGui.Separator();
+        ImGui.Text("#");
+        ImGui.NextColumn();
+        ImGui.Text("Path");
+        ImGui.NextColumn();
+        ImGui.Text("Enabled");
+        ImGui.NextColumn();
+        ImGui.Text(string.Empty);
+        ImGui.NextColumn();
 
-            DevPluginLocationSettings locationToRemove = null;
+        ImGui.Separator();
 
-            var locNumber = 1;
-            foreach (var devPluginLocationSetting in this.devPluginLocations)
-            {
-                var isEnabled = devPluginLocationSetting.IsEnabled;
+        DevPluginLocationSettings locationToRemove = null;
 
-                ImGui.PushID($"devPluginLocation_{devPluginLocationSetting.Path}");
+        var locNumber = 1;
+        foreach (var devPluginLocationSetting in this.devPluginLocations)
+        {
+            var isEnabled = devPluginLocationSetting.IsEnabled;
 
-                ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 8 - (ImGui.CalcTextSize(locNumber.ToString()).X / 2));
-                ImGui.Text(locNumber.ToString());
-                ImGui.NextColumn();
-
-                ImGui.SetNextItemWidth(-1);
-                var path = devPluginLocationSetting.Path;
-                if (ImGui.InputText($"##devPluginLocationInput", ref path, 65535, ImGuiInputTextFlags.EnterReturnsTrue))
-                {
-                    var contains = this.devPluginLocations.Select(loc => loc.Path).Contains(path);
-                    if (devPluginLocationSetting.Path == path)
-                    {
-                        // no change.
-                    }
-                    else if (contains && devPluginLocationSetting.Path != path)
-                    {
-                        this.devPluginLocationAddError = Loc.Localize("DalamudDevPluginLocationExists", "Location already exists.");
-                        Task.Delay(5000).ContinueWith(t => this.devPluginLocationAddError = string.Empty);
-                    }
-                    else
-                    {
-                        devPluginLocationSetting.Path = path;
-                        this.devPluginLocationsChanged = path != devPluginLocationSetting.Path;
-                    }
-                }
-
-                ImGui.NextColumn();
-
-                ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 7 - (12 * ImGuiHelpers.GlobalScale));
-                ImGui.Checkbox("##devPluginLocationCheck", ref isEnabled);
-                ImGui.NextColumn();
-
-                if (ImGuiComponents.IconButton(FontAwesomeIcon.Trash))
-                {
-                    locationToRemove = devPluginLocationSetting;
-                }
-
-                ImGui.PopID();
-
-                ImGui.NextColumn();
-                ImGui.Separator();
-
-                devPluginLocationSetting.IsEnabled = isEnabled;
-
-                locNumber++;
-            }
-
-            if (locationToRemove != null)
-            {
-                this.devPluginLocations.Remove(locationToRemove);
-                this.devPluginLocationsChanged = true;
-            }
+            ImGui.PushID($"devPluginLocation_{devPluginLocationSetting.Path}");
 
             ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 8 - (ImGui.CalcTextSize(locNumber.ToString()).X / 2));
             ImGui.Text(locNumber.ToString());
             ImGui.NextColumn();
+
             ImGui.SetNextItemWidth(-1);
-            ImGui.InputText("##devPluginLocationInput", ref this.devPluginTempLocation, 300);
-            ImGui.NextColumn();
-            // Enabled button
-            ImGui.NextColumn();
-            if (!string.IsNullOrEmpty(this.devPluginTempLocation) && ImGuiComponents.IconButton(FontAwesomeIcon.Plus))
+            var path = devPluginLocationSetting.Path;
+            if (ImGui.InputText($"##devPluginLocationInput", ref path, 65535, ImGuiInputTextFlags.EnterReturnsTrue))
             {
-                if (this.devPluginLocations.Any(r => string.Equals(r.Path, this.devPluginTempLocation, StringComparison.InvariantCultureIgnoreCase)))
+                var contains = this.devPluginLocations.Select(loc => loc.Path).Contains(path);
+                if (devPluginLocationSetting.Path == path)
+                {
+                    // no change.
+                }
+                else if (contains && devPluginLocationSetting.Path != path)
                 {
                     this.devPluginLocationAddError = Loc.Localize("DalamudDevPluginLocationExists", "Location already exists.");
                     Task.Delay(5000).ContinueWith(t => this.devPluginLocationAddError = string.Empty);
                 }
                 else
                 {
-                    this.devPluginLocations.Add(new DevPluginLocationSettings
-                    {
-                        Path = this.devPluginTempLocation.Replace("\"", string.Empty),
-                        IsEnabled = true,
-                    });
-                    this.devPluginLocationsChanged = true;
-                    this.devPluginTempLocation = string.Empty;
+                    devPluginLocationSetting.Path = path;
+                    this.devPluginLocationsChanged = path != devPluginLocationSetting.Path;
                 }
             }
 
-            ImGui.Columns(1);
+            ImGui.NextColumn();
 
-            if (!string.IsNullOrEmpty(this.devPluginLocationAddError))
+            ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 7 - (12 * ImGuiHelpers.GlobalScale));
+            ImGui.Checkbox("##devPluginLocationCheck", ref isEnabled);
+            ImGui.NextColumn();
+
+            if (ImGuiComponents.IconButton(FontAwesomeIcon.Trash))
             {
-                ImGui.TextColored(new Vector4(1, 0, 0, 1), this.devPluginLocationAddError);
+                locationToRemove = devPluginLocationSetting;
             }
+
+            ImGui.PopID();
+
+            ImGui.NextColumn();
+            ImGui.Separator();
+
+            devPluginLocationSetting.IsEnabled = isEnabled;
+
+            locNumber++;
         }
 
-        private void DrawSaveCloseButtons()
+        if (locationToRemove != null)
         {
-            var buttonSave = false;
-            var buttonClose = false;
-
-            var pluginManager = Service<PluginManager>.Get();
-
-            if (ImGui.Button(Loc.Localize("Save", "Save")))
-                buttonSave = true;
-
-            ImGui.SameLine();
-
-            if (ImGui.Button(Loc.Localize("Close", "Close")))
-                buttonClose = true;
-
-            ImGui.SameLine();
-
-            if (ImGui.Button(Loc.Localize("SaveAndClose", "Save and Close")))
-                buttonSave = buttonClose = true;
-
-            if (buttonSave)
-            {
-                this.Save();
-
-                if (this.thirdRepoListChanged)
-                {
-                    _ = pluginManager.SetPluginReposFromConfigAsync(true);
-                    this.thirdRepoListChanged = false;
-                }
-
-                if (this.devPluginLocationsChanged)
-                {
-                    pluginManager.ScanDevPlugins();
-                    this.devPluginLocationsChanged = false;
-                }
-            }
-
-            if (buttonClose)
-            {
-                this.IsOpen = false;
-            }
+            this.devPluginLocations.Remove(locationToRemove);
+            this.devPluginLocationsChanged = true;
         }
 
-        private void Save()
+        ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (ImGui.GetColumnWidth() / 2) - 8 - (ImGui.CalcTextSize(locNumber.ToString()).X / 2));
+        ImGui.Text(locNumber.ToString());
+        ImGui.NextColumn();
+        ImGui.SetNextItemWidth(-1);
+        ImGui.InputText("##devPluginLocationInput", ref this.devPluginTempLocation, 300);
+        ImGui.NextColumn();
+        // Enabled button
+        ImGui.NextColumn();
+        if (!string.IsNullOrEmpty(this.devPluginTempLocation) && ImGuiComponents.IconButton(FontAwesomeIcon.Plus))
         {
-            var configuration = Service<DalamudConfiguration>.Get();
-            var localization = Service<Localization>.Get();
-
-            localization.SetupWithLangCode(this.languages[this.langIndex]);
-            configuration.LanguageOverride = this.languages[this.langIndex];
-
-            configuration.GeneralChatType = this.dalamudMessagesChatType;
-
-            configuration.IsResumeGameAfterPluginLoad = this.doWaitForPluginsOnStartup;
-            configuration.DutyFinderTaskbarFlash = this.doCfTaskBarFlash;
-            configuration.DutyFinderChatMessage = this.doCfChatMessage;
-            configuration.IsMbCollect = this.doMbCollect;
-
-            configuration.GlobalUiScale = this.globalUiScale;
-            configuration.ToggleUiHide = this.doToggleUiHide;
-            configuration.ToggleUiHideDuringCutscenes = this.doToggleUiHideDuringCutscenes;
-            configuration.ToggleUiHideDuringGpose = this.doToggleUiHideDuringGpose;
-
-            configuration.IsDocking = this.doDocking;
-            configuration.IsGamepadNavigationEnabled = this.doGamepad;
-            configuration.IsFocusManagementEnabled = this.doFocus;
-            configuration.ShowTsm = this.doTsm;
-
-            configuration.UseAxisFontsFromGame = this.doUseAxisFontsFromGame;
-            configuration.FontGammaLevel = this.fontGamma;
-
-            // This is applied every frame in InterfaceManager::CheckViewportState()
-            configuration.IsDisableViewport = !this.doViewport;
-
-            // Apply docking flag
-            if (!configuration.IsDocking)
+            if (this.devPluginLocations.Any(r => string.Equals(r.Path, this.devPluginTempLocation, StringComparison.InvariantCultureIgnoreCase)))
             {
-                ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.DockingEnable;
+                this.devPluginLocationAddError = Loc.Localize("DalamudDevPluginLocationExists", "Location already exists.");
+                Task.Delay(5000).ContinueWith(t => this.devPluginLocationAddError = string.Empty);
             }
             else
             {
-                ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.DockingEnable;
+                this.devPluginLocations.Add(new DevPluginLocationSettings
+                {
+                    Path = this.devPluginTempLocation.Replace("\"", string.Empty),
+                    IsEnabled = true,
+                });
+                this.devPluginLocationsChanged = true;
+                this.devPluginTempLocation = string.Empty;
             }
+        }
 
-            // NOTE (Chiv) Toggle gamepad navigation via setting
-            if (!configuration.IsGamepadNavigationEnabled)
-            {
-                ImGui.GetIO().BackendFlags &= ~ImGuiBackendFlags.HasGamepad;
-                ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableSetMousePos;
+        ImGui.Columns(1);
 
-                var di = Service<DalamudInterface>.Get();
-                di.CloseGamepadModeNotifierWindow();
-            }
-            else
-            {
-                ImGui.GetIO().BackendFlags |= ImGuiBackendFlags.HasGamepad;
-                ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.NavEnableSetMousePos;
-            }
-
-            this.dtrOrder = configuration.DtrOrder;
-            this.dtrIgnore = configuration.DtrIgnore;
-
-            configuration.DtrSpacing = this.dtrSpacing;
-            configuration.DtrSwapDirection = this.dtrSwapDirection;
-
-            configuration.PluginWaitBeforeFree = this.pluginWaitBeforeFree;
-
-            configuration.DoPluginTest = this.doPluginTest;
-            configuration.ThirdRepoList = this.thirdRepoList.Select(x => x.Clone()).ToList();
-            configuration.DevPluginLoadLocations = this.devPluginLocations.Select(x => x.Clone()).ToList();
-
-            configuration.PrintPluginsWelcomeMsg = this.printPluginsWelcomeMsg;
-            configuration.AutoUpdatePlugins = this.autoUpdatePlugins;
-            configuration.DoButtonsSystemMenu = this.doButtonsSystemMenu;
-            configuration.DisableRmtFiltering = this.disableRmtFiltering;
-
-            configuration.Save();
-
-            _ = Service<PluginManager>.Get().ReloadPluginMastersAsync();
-            Service<InterfaceManager>.Get().RebuildFonts();
+        if (!string.IsNullOrEmpty(this.devPluginLocationAddError))
+        {
+            ImGui.TextColored(new Vector4(1, 0, 0, 1), this.devPluginLocationAddError);
         }
     }
+
+    private void DrawSaveCloseButtons()
+    {
+        var buttonSave = false;
+        var buttonClose = false;
+
+        var pluginManager = Service<PluginManager>.Get();
+
+        if (ImGui.Button(Loc.Localize("Save", "Save")))
+            buttonSave = true;
+
+        ImGui.SameLine();
+
+        if (ImGui.Button(Loc.Localize("Close", "Close")))
+            buttonClose = true;
+
+        ImGui.SameLine();
+
+        if (ImGui.Button(Loc.Localize("SaveAndClose", "Save and Close")))
+            buttonSave = buttonClose = true;
+
+        if (buttonSave)
+        {
+            this.Save();
+
+            if (this.thirdRepoListChanged)
+            {
+                _ = pluginManager.SetPluginReposFromConfigAsync(true);
+                this.thirdRepoListChanged = false;
+            }
+
+            if (this.devPluginLocationsChanged)
+            {
+                pluginManager.ScanDevPlugins();
+                this.devPluginLocationsChanged = false;
+            }
+        }
+
+        if (buttonClose)
+        {
+            this.IsOpen = false;
+        }
+    }
+
+    private void Save()
+    {
+        var configuration = Service<DalamudConfiguration>.Get();
+        var localization = Service<Localization>.Get();
+
+        localization.SetupWithLangCode(this.languages[this.langIndex]);
+        configuration.LanguageOverride = this.languages[this.langIndex];
+
+        configuration.GeneralChatType = this.dalamudMessagesChatType;
+
+        configuration.IsResumeGameAfterPluginLoad = this.doWaitForPluginsOnStartup;
+        configuration.DutyFinderTaskbarFlash = this.doCfTaskBarFlash;
+        configuration.DutyFinderChatMessage = this.doCfChatMessage;
+        configuration.IsMbCollect = this.doMbCollect;
+
+        configuration.GlobalUiScale = this.globalUiScale;
+        configuration.ToggleUiHide = this.doToggleUiHide;
+        configuration.ToggleUiHideDuringCutscenes = this.doToggleUiHideDuringCutscenes;
+        configuration.ToggleUiHideDuringGpose = this.doToggleUiHideDuringGpose;
+
+        configuration.IsDocking = this.doDocking;
+        configuration.IsGamepadNavigationEnabled = this.doGamepad;
+        configuration.IsFocusManagementEnabled = this.doFocus;
+        configuration.ShowTsm = this.doTsm;
+
+        configuration.UseAxisFontsFromGame = this.doUseAxisFontsFromGame;
+        configuration.FontGammaLevel = this.fontGamma;
+
+        // This is applied every frame in InterfaceManager::CheckViewportState()
+        configuration.IsDisableViewport = !this.doViewport;
+
+        // Apply docking flag
+        if (!configuration.IsDocking)
+        {
+            ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.DockingEnable;
+        }
+        else
+        {
+            ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.DockingEnable;
+        }
+
+        // NOTE (Chiv) Toggle gamepad navigation via setting
+        if (!configuration.IsGamepadNavigationEnabled)
+        {
+            ImGui.GetIO().BackendFlags &= ~ImGuiBackendFlags.HasGamepad;
+            ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableSetMousePos;
+
+            var di = Service<DalamudInterface>.Get();
+            di.CloseGamepadModeNotifierWindow();
+        }
+        else
+        {
+            ImGui.GetIO().BackendFlags |= ImGuiBackendFlags.HasGamepad;
+            ImGui.GetIO().ConfigFlags |= ImGuiConfigFlags.NavEnableSetMousePos;
+        }
+
+        this.dtrOrder = configuration.DtrOrder;
+        this.dtrIgnore = configuration.DtrIgnore;
+
+        configuration.DtrSpacing = this.dtrSpacing;
+        configuration.DtrSwapDirection = this.dtrSwapDirection;
+
+        configuration.PluginWaitBeforeFree = this.pluginWaitBeforeFree;
+
+        configuration.DoPluginTest = this.doPluginTest;
+        configuration.ThirdRepoList = this.thirdRepoList.Select(x => x.Clone()).ToList();
+        configuration.DevPluginLoadLocations = this.devPluginLocations.Select(x => x.Clone()).ToList();
+
+        configuration.PrintPluginsWelcomeMsg = this.printPluginsWelcomeMsg;
+        configuration.AutoUpdatePlugins = this.autoUpdatePlugins;
+        configuration.DoButtonsSystemMenu = this.doButtonsSystemMenu;
+        configuration.DisableRmtFiltering = this.disableRmtFiltering;
+
+        configuration.Save();
+
+        _ = Service<PluginManager>.Get().ReloadPluginMastersAsync();
+        Service<InterfaceManager>.Get().RebuildFonts();
+    }
 }
diff --git a/Dalamud/Interface/Internal/Windows/StyleEditor/StyleEditorWindow.cs b/Dalamud/Interface/Internal/Windows/StyleEditor/StyleEditorWindow.cs
index 5b2c3d90c..8ad4e98e6 100644
--- a/Dalamud/Interface/Internal/Windows/StyleEditor/StyleEditorWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/StyleEditor/StyleEditorWindow.cs
@@ -15,388 +15,387 @@ using ImGuiNET;
 using Lumina.Excel.GeneratedSheets;
 using Serilog;
 
-namespace Dalamud.Interface.Internal.Windows.StyleEditor
+namespace Dalamud.Interface.Internal.Windows.StyleEditor;
+
+/// <summary>
+/// Window for the Dalamud style editor.
+/// </summary>
+public class StyleEditorWindow : Window
 {
+    private ImGuiColorEditFlags alphaFlags = ImGuiColorEditFlags.AlphaPreviewHalf;
+
+    private int currentSel = 0;
+    private string initialStyle = string.Empty;
+    private bool didSave = false;
+
+    private string renameText = string.Empty;
+    private bool renameModalDrawing = false;
+
     /// <summary>
-    /// Window for the Dalamud style editor.
+    /// Initializes a new instance of the <see cref="StyleEditorWindow"/> class.
     /// </summary>
-    public class StyleEditorWindow : Window
+    public StyleEditorWindow()
+        : base("Dalamud Style Editor")
     {
-        private ImGuiColorEditFlags alphaFlags = ImGuiColorEditFlags.AlphaPreviewHalf;
-
-        private int currentSel = 0;
-        private string initialStyle = string.Empty;
-        private bool didSave = false;
-
-        private string renameText = string.Empty;
-        private bool renameModalDrawing = false;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StyleEditorWindow"/> class.
-        /// </summary>
-        public StyleEditorWindow()
-            : base("Dalamud Style Editor")
+        this.IsOpen = true;
+        this.SizeConstraints = new WindowSizeConstraints
         {
-            this.IsOpen = true;
-            this.SizeConstraints = new WindowSizeConstraints
-            {
-                MinimumSize = new Vector2(890, 560),
-                MaximumSize = new Vector2(10000, 10000),
-            };
-        }
+            MinimumSize = new Vector2(890, 560),
+            MaximumSize = new Vector2(10000, 10000),
+        };
+    }
 
-        /// <inheritdoc />
-        public override void OnOpen()
-        {
-            this.didSave = false;
+    /// <inheritdoc />
+    public override void OnOpen()
+    {
+        this.didSave = false;
 
-            var config = Service<DalamudConfiguration>.Get();
-            config.SavedStyles ??= new List<StyleModel>();
-            this.currentSel = config.SavedStyles.FindIndex(x => x.Name == config.ChosenStyle);
+        var config = Service<DalamudConfiguration>.Get();
+        config.SavedStyles ??= new List<StyleModel>();
+        this.currentSel = config.SavedStyles.FindIndex(x => x.Name == config.ChosenStyle);
 
-            this.initialStyle = config.ChosenStyle;
+        this.initialStyle = config.ChosenStyle;
 
-            base.OnOpen();
-        }
+        base.OnOpen();
+    }
 
-        /// <inheritdoc />
-        public override void OnClose()
-        {
-            if (!this.didSave)
-            {
-                var config = Service<DalamudConfiguration>.Get();
-                var newStyle = config.SavedStyles.FirstOrDefault(x => x.Name == this.initialStyle);
-                newStyle?.Apply();
-            }
-
-            base.OnClose();
-        }
-
-        /// <inheritdoc />
-        public override void Draw()
+    /// <inheritdoc />
+    public override void OnClose()
+    {
+        if (!this.didSave)
         {
             var config = Service<DalamudConfiguration>.Get();
-            var renameModalTitle = Loc.Localize("RenameStyleModalTitle", "Rename Style");
-
-            var workStyle = config.SavedStyles[this.currentSel];
-            workStyle.BuiltInColors ??= StyleModelV1.DalamudStandard.BuiltInColors;
-
-            var appliedThisFrame = false;
-
-            var styleAry = config.SavedStyles.Select(x => x.Name).ToArray();
-            ImGui.Text(Loc.Localize("StyleEditorChooseStyle", "Choose Style:"));
-            if (ImGui.Combo("###styleChooserCombo", ref this.currentSel, styleAry, styleAry.Length))
-            {
-                var newStyle = config.SavedStyles[this.currentSel];
-                newStyle.Apply();
-                appliedThisFrame = true;
-            }
-
-            if (ImGui.Button(Loc.Localize("StyleEditorAddNew", "Add new style")))
-            {
-                this.SaveStyle();
-
-                var newStyle = StyleModelV1.DalamudStandard;
-                newStyle.Name = GetRandomName();
-                config.SavedStyles.Add(newStyle);
-
-                this.currentSel = config.SavedStyles.Count - 1;
-
-                newStyle.Apply();
-                appliedThisFrame = true;
-
-                config.Save();
-            }
-
-            ImGui.SameLine();
-
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.Trash) && this.currentSel != 0)
-            {
-                this.currentSel--;
-                var newStyle = config.SavedStyles[this.currentSel];
-                newStyle.Apply();
-                appliedThisFrame = true;
-
-                config.SavedStyles.RemoveAt(this.currentSel + 1);
-
-                config.Save();
-            }
-
-            if (ImGui.IsItemHovered())
-                ImGui.SetTooltip(Loc.Localize("StyleEditorDeleteStyle", "Delete current style"));
-
-            ImGui.SameLine();
-
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.Pen) && this.currentSel != 0)
-            {
-                var newStyle = config.SavedStyles[this.currentSel];
-                this.renameText = newStyle.Name;
-
-                this.renameModalDrawing = true;
-                ImGui.OpenPopup(renameModalTitle);
-            }
-
-            if (ImGui.IsItemHovered())
-                ImGui.SetTooltip(Loc.Localize("StyleEditorRenameStyle", "Rename style"));
-
-            ImGui.SameLine();
-
-            ImGuiHelpers.ScaledDummy(5);
-            ImGui.SameLine();
-
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.FileExport))
-            {
-                var selectedStyle = config.SavedStyles[this.currentSel];
-                var newStyle = StyleModelV1.Get();
-                newStyle.Name = selectedStyle.Name;
-                ImGui.SetClipboardText(newStyle.Serialize());
-            }
-
-            if (ImGui.IsItemHovered())
-                ImGui.SetTooltip(Loc.Localize("StyleEditorCopy", "Copy style to clipboard for sharing"));
-
-            ImGui.SameLine();
-
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.FileImport))
-            {
-                this.SaveStyle();
-
-                var styleJson = ImGui.GetClipboardText();
-
-                try
-                {
-                    var newStyle = StyleModel.Deserialize(styleJson);
-
-                    newStyle.Name ??= GetRandomName();
-
-                    if (config.SavedStyles.Any(x => x.Name == newStyle.Name))
-                    {
-                        newStyle.Name = $"{newStyle.Name} ({GetRandomName()} Mix)";
-                    }
-
-                    config.SavedStyles.Add(newStyle);
-                    newStyle.Apply();
-                    appliedThisFrame = true;
-
-                    this.currentSel = config.SavedStyles.Count - 1;
-
-                    config.Save();
-                }
-                catch (Exception ex)
-                {
-                    Log.Error(ex, "Could not import style");
-                }
-            }
-
-            if (ImGui.IsItemHovered())
-                ImGui.SetTooltip(Loc.Localize("StyleEditorImport", "Import style from clipboard"));
-
-            ImGui.Separator();
-
-            ImGui.PushItemWidth(ImGui.GetWindowWidth() * 0.50f);
-
-            if (this.currentSel < 2)
-            {
-                ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("StyleEditorNotAllowed", "You cannot edit built-in styles. Please add a new style first."));
-            }
-            else if (appliedThisFrame)
-            {
-                ImGui.Text(Loc.Localize("StyleEditorApplying", "Applying style..."));
-            }
-            else if (ImGui.BeginTabBar("StyleEditorTabs"))
-            {
-                var style = ImGui.GetStyle();
-
-                if (ImGui.BeginTabItem(Loc.Localize("StyleEditorVariables", "Variables")))
-                {
-                    ImGui.BeginChild($"ScrollingVars", ImGuiHelpers.ScaledVector2(0, -32), true, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground);
-
-                    ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 5);
-
-                    ImGui.SliderFloat2("WindowPadding", ref style.WindowPadding, 0.0f, 20.0f, "%.0f");
-                    ImGui.SliderFloat2("FramePadding", ref style.FramePadding, 0.0f, 20.0f, "%.0f");
-                    ImGui.SliderFloat2("CellPadding", ref style.CellPadding, 0.0f, 20.0f, "%.0f");
-                    ImGui.SliderFloat2("ItemSpacing", ref style.ItemSpacing, 0.0f, 20.0f, "%.0f");
-                    ImGui.SliderFloat2("ItemInnerSpacing", ref style.ItemInnerSpacing, 0.0f, 20.0f, "%.0f");
-                    ImGui.SliderFloat2("TouchExtraPadding", ref style.TouchExtraPadding, 0.0f, 10.0f, "%.0f");
-                    ImGui.SliderFloat("IndentSpacing", ref style.IndentSpacing, 0.0f, 30.0f, "%.0f");
-                    ImGui.SliderFloat("ScrollbarSize", ref style.ScrollbarSize, 1.0f, 20.0f, "%.0f");
-                    ImGui.SliderFloat("GrabMinSize", ref style.GrabMinSize, 1.0f, 20.0f, "%.0f");
-                    ImGui.Text("Borders");
-                    ImGui.SliderFloat("WindowBorderSize", ref style.WindowBorderSize, 0.0f, 1.0f, "%.0f");
-                    ImGui.SliderFloat("ChildBorderSize", ref style.ChildBorderSize, 0.0f, 1.0f, "%.0f");
-                    ImGui.SliderFloat("PopupBorderSize", ref style.PopupBorderSize, 0.0f, 1.0f, "%.0f");
-                    ImGui.SliderFloat("FrameBorderSize", ref style.FrameBorderSize, 0.0f, 1.0f, "%.0f");
-                    ImGui.SliderFloat("TabBorderSize", ref style.TabBorderSize, 0.0f, 1.0f, "%.0f");
-                    ImGui.Text("Rounding");
-                    ImGui.SliderFloat("WindowRounding", ref style.WindowRounding, 0.0f, 12.0f, "%.0f");
-                    ImGui.SliderFloat("ChildRounding", ref style.ChildRounding, 0.0f, 12.0f, "%.0f");
-                    ImGui.SliderFloat("FrameRounding", ref style.FrameRounding, 0.0f, 12.0f, "%.0f");
-                    ImGui.SliderFloat("PopupRounding", ref style.PopupRounding, 0.0f, 12.0f, "%.0f");
-                    ImGui.SliderFloat("ScrollbarRounding", ref style.ScrollbarRounding, 0.0f, 12.0f, "%.0f");
-                    ImGui.SliderFloat("GrabRounding", ref style.GrabRounding, 0.0f, 12.0f, "%.0f");
-                    ImGui.SliderFloat("LogSliderDeadzone", ref style.LogSliderDeadzone, 0.0f, 12.0f, "%.0f");
-                    ImGui.SliderFloat("TabRounding", ref style.TabRounding, 0.0f, 12.0f, "%.0f");
-                    ImGui.Text("Alignment");
-                    ImGui.SliderFloat2("WindowTitleAlign", ref style.WindowTitleAlign, 0.0f, 1.0f, "%.2f");
-                    var windowMenuButtonPosition = (int)style.WindowMenuButtonPosition + 1;
-                    if (ImGui.Combo("WindowMenuButtonPosition", ref windowMenuButtonPosition, "None\0Left\0Right\0"))
-                        style.WindowMenuButtonPosition = (ImGuiDir)(windowMenuButtonPosition - 1);
-                    ImGui.SliderFloat2("ButtonTextAlign", ref style.ButtonTextAlign, 0.0f, 1.0f, "%.2f");
-                    ImGui.SameLine();
-                    ImGuiComponents.HelpMarker("Alignment applies when a button is larger than its text content.");
-                    ImGui.SliderFloat2("SelectableTextAlign", ref style.SelectableTextAlign, 0.0f, 1.0f, "%.2f");
-                    ImGui.SameLine();
-                    ImGuiComponents.HelpMarker("Alignment applies when a selectable is larger than its text content.");
-                    ImGui.SliderFloat2("DisplaySafeAreaPadding", ref style.DisplaySafeAreaPadding, 0.0f, 30.0f, "%.0f");
-                    ImGui.SameLine();
-                    ImGuiComponents.HelpMarker(
-                        "Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured).");
-                    ImGui.EndTabItem();
-
-                    ImGui.EndChild();
-
-                    ImGui.EndTabItem();
-                }
-
-                if (ImGui.BeginTabItem(Loc.Localize("StyleEditorColors", "Colors")))
-                {
-                    ImGui.BeginChild("ScrollingColors", ImGuiHelpers.ScaledVector2(0, -30), true, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground);
-
-                    ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 5);
-
-                    if (ImGui.RadioButton("Opaque", this.alphaFlags == ImGuiColorEditFlags.None))
-                        this.alphaFlags = ImGuiColorEditFlags.None;
-                    ImGui.SameLine();
-                    if (ImGui.RadioButton("Alpha", this.alphaFlags == ImGuiColorEditFlags.AlphaPreview))
-                        this.alphaFlags = ImGuiColorEditFlags.AlphaPreview;
-                    ImGui.SameLine();
-                    if (ImGui.RadioButton("Both", this.alphaFlags == ImGuiColorEditFlags.AlphaPreviewHalf))
-                        this.alphaFlags = ImGuiColorEditFlags.AlphaPreviewHalf;
-                    ImGui.SameLine();
-
-                    ImGuiComponents.HelpMarker(
-                        "In the color list:\n" +
-                        "Left-click on color square to open color picker,\n" +
-                        "Right-click to open edit options menu.");
-
-                    foreach (var imGuiCol in Enum.GetValues<ImGuiCol>())
-                    {
-                        if (imGuiCol == ImGuiCol.COUNT)
-                            continue;
-
-                        ImGui.PushID(imGuiCol.ToString());
-
-                        ImGui.ColorEdit4("##color", ref style.Colors[(int)imGuiCol], ImGuiColorEditFlags.AlphaBar | this.alphaFlags);
-
-                        ImGui.SameLine(0.0f, style.ItemInnerSpacing.X);
-                        ImGui.TextUnformatted(imGuiCol.ToString());
-
-                        ImGui.PopID();
-                    }
-
-                    ImGui.Separator();
-
-                    foreach (var property in typeof(DalamudColors).GetProperties(BindingFlags.Public | BindingFlags.Instance))
-                    {
-                        ImGui.PushID(property.Name);
-
-                        var colorVal = property.GetValue(workStyle.BuiltInColors);
-                        if (colorVal == null)
-                        {
-                            colorVal = property.GetValue(StyleModelV1.DalamudStandard.BuiltInColors);
-                            property.SetValue(workStyle.BuiltInColors, colorVal);
-                        }
-
-                        var color = (Vector4)colorVal;
-
-                        if (ImGui.ColorEdit4("##color", ref color, ImGuiColorEditFlags.AlphaBar | this.alphaFlags))
-                        {
-                            property.SetValue(workStyle.BuiltInColors, color);
-                            workStyle.BuiltInColors?.Apply();
-                        }
-
-                        ImGui.SameLine(0.0f, style.ItemInnerSpacing.X);
-                        ImGui.TextUnformatted(property.Name);
-
-                        ImGui.PopID();
-                    }
-
-                    ImGui.EndChild();
-
-                    ImGui.EndTabItem();
-                }
-
-                ImGui.EndTabBar();
-            }
-
-            ImGui.PopItemWidth();
-
-            ImGui.Separator();
-
-            if (ImGui.Button(Loc.Localize("Close", "Close")))
-            {
-                this.IsOpen = false;
-            }
-
-            ImGui.SameLine();
-
-            if (ImGui.Button(Loc.Localize("SaveAndClose", "Save and Close")))
-            {
-                this.SaveStyle();
-
-                config.ChosenStyle = config.SavedStyles[this.currentSel].Name;
-                Log.Verbose("ChosenStyle = {ChosenStyle}", config.ChosenStyle);
-
-                this.didSave = true;
-
-                this.IsOpen = false;
-            }
-
-            if (ImGui.BeginPopupModal(renameModalTitle, ref this.renameModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
-            {
-                ImGui.Text(Loc.Localize("StyleEditorEnterName", "Please enter the new name for this style."));
-                ImGui.Spacing();
-
-                ImGui.InputText("###renameModalInput", ref this.renameText, 255);
-
-                const float buttonWidth = 120f;
-                ImGui.SetCursorPosX((ImGui.GetWindowWidth() - buttonWidth) / 2);
-
-                if (ImGui.Button("OK", new Vector2(buttonWidth, 40)))
-                {
-                    config.SavedStyles[this.currentSel].Name = this.renameText;
-                    config.Save();
-
-                    ImGui.CloseCurrentPopup();
-                }
-
-                ImGui.EndPopup();
-            }
+            var newStyle = config.SavedStyles.FirstOrDefault(x => x.Name == this.initialStyle);
+            newStyle?.Apply();
         }
 
-        private static string GetRandomName()
+        base.OnClose();
+    }
+
+    /// <inheritdoc />
+    public override void Draw()
+    {
+        var config = Service<DalamudConfiguration>.Get();
+        var renameModalTitle = Loc.Localize("RenameStyleModalTitle", "Rename Style");
+
+        var workStyle = config.SavedStyles[this.currentSel];
+        workStyle.BuiltInColors ??= StyleModelV1.DalamudStandard.BuiltInColors;
+
+        var appliedThisFrame = false;
+
+        var styleAry = config.SavedStyles.Select(x => x.Name).ToArray();
+        ImGui.Text(Loc.Localize("StyleEditorChooseStyle", "Choose Style:"));
+        if (ImGui.Combo("###styleChooserCombo", ref this.currentSel, styleAry, styleAry.Length))
         {
-            var data = Service<DataManager>.Get();
-            var names = data.GetExcelSheet<BNpcName>(ClientLanguage.English);
-            var rng = new Random();
-
-            return names.ElementAt(rng.Next(0, names.Count() - 1)).Singular.RawString;
-        }
-
-        private void SaveStyle()
-        {
-            if (this.currentSel < 2)
-                return;
-
-            var config = Service<DalamudConfiguration>.Get();
-
-            var newStyle = StyleModelV1.Get();
-            newStyle.Name = config.SavedStyles[this.currentSel].Name;
-            config.SavedStyles[this.currentSel] = newStyle;
+            var newStyle = config.SavedStyles[this.currentSel];
             newStyle.Apply();
+            appliedThisFrame = true;
+        }
+
+        if (ImGui.Button(Loc.Localize("StyleEditorAddNew", "Add new style")))
+        {
+            this.SaveStyle();
+
+            var newStyle = StyleModelV1.DalamudStandard;
+            newStyle.Name = GetRandomName();
+            config.SavedStyles.Add(newStyle);
+
+            this.currentSel = config.SavedStyles.Count - 1;
+
+            newStyle.Apply();
+            appliedThisFrame = true;
 
             config.Save();
         }
+
+        ImGui.SameLine();
+
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.Trash) && this.currentSel != 0)
+        {
+            this.currentSel--;
+            var newStyle = config.SavedStyles[this.currentSel];
+            newStyle.Apply();
+            appliedThisFrame = true;
+
+            config.SavedStyles.RemoveAt(this.currentSel + 1);
+
+            config.Save();
+        }
+
+        if (ImGui.IsItemHovered())
+            ImGui.SetTooltip(Loc.Localize("StyleEditorDeleteStyle", "Delete current style"));
+
+        ImGui.SameLine();
+
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.Pen) && this.currentSel != 0)
+        {
+            var newStyle = config.SavedStyles[this.currentSel];
+            this.renameText = newStyle.Name;
+
+            this.renameModalDrawing = true;
+            ImGui.OpenPopup(renameModalTitle);
+        }
+
+        if (ImGui.IsItemHovered())
+            ImGui.SetTooltip(Loc.Localize("StyleEditorRenameStyle", "Rename style"));
+
+        ImGui.SameLine();
+
+        ImGuiHelpers.ScaledDummy(5);
+        ImGui.SameLine();
+
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.FileExport))
+        {
+            var selectedStyle = config.SavedStyles[this.currentSel];
+            var newStyle = StyleModelV1.Get();
+            newStyle.Name = selectedStyle.Name;
+            ImGui.SetClipboardText(newStyle.Serialize());
+        }
+
+        if (ImGui.IsItemHovered())
+            ImGui.SetTooltip(Loc.Localize("StyleEditorCopy", "Copy style to clipboard for sharing"));
+
+        ImGui.SameLine();
+
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.FileImport))
+        {
+            this.SaveStyle();
+
+            var styleJson = ImGui.GetClipboardText();
+
+            try
+            {
+                var newStyle = StyleModel.Deserialize(styleJson);
+
+                newStyle.Name ??= GetRandomName();
+
+                if (config.SavedStyles.Any(x => x.Name == newStyle.Name))
+                {
+                    newStyle.Name = $"{newStyle.Name} ({GetRandomName()} Mix)";
+                }
+
+                config.SavedStyles.Add(newStyle);
+                newStyle.Apply();
+                appliedThisFrame = true;
+
+                this.currentSel = config.SavedStyles.Count - 1;
+
+                config.Save();
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Could not import style");
+            }
+        }
+
+        if (ImGui.IsItemHovered())
+            ImGui.SetTooltip(Loc.Localize("StyleEditorImport", "Import style from clipboard"));
+
+        ImGui.Separator();
+
+        ImGui.PushItemWidth(ImGui.GetWindowWidth() * 0.50f);
+
+        if (this.currentSel < 2)
+        {
+            ImGui.TextColored(ImGuiColors.DalamudRed, Loc.Localize("StyleEditorNotAllowed", "You cannot edit built-in styles. Please add a new style first."));
+        }
+        else if (appliedThisFrame)
+        {
+            ImGui.Text(Loc.Localize("StyleEditorApplying", "Applying style..."));
+        }
+        else if (ImGui.BeginTabBar("StyleEditorTabs"))
+        {
+            var style = ImGui.GetStyle();
+
+            if (ImGui.BeginTabItem(Loc.Localize("StyleEditorVariables", "Variables")))
+            {
+                ImGui.BeginChild($"ScrollingVars", ImGuiHelpers.ScaledVector2(0, -32), true, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground);
+
+                ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 5);
+
+                ImGui.SliderFloat2("WindowPadding", ref style.WindowPadding, 0.0f, 20.0f, "%.0f");
+                ImGui.SliderFloat2("FramePadding", ref style.FramePadding, 0.0f, 20.0f, "%.0f");
+                ImGui.SliderFloat2("CellPadding", ref style.CellPadding, 0.0f, 20.0f, "%.0f");
+                ImGui.SliderFloat2("ItemSpacing", ref style.ItemSpacing, 0.0f, 20.0f, "%.0f");
+                ImGui.SliderFloat2("ItemInnerSpacing", ref style.ItemInnerSpacing, 0.0f, 20.0f, "%.0f");
+                ImGui.SliderFloat2("TouchExtraPadding", ref style.TouchExtraPadding, 0.0f, 10.0f, "%.0f");
+                ImGui.SliderFloat("IndentSpacing", ref style.IndentSpacing, 0.0f, 30.0f, "%.0f");
+                ImGui.SliderFloat("ScrollbarSize", ref style.ScrollbarSize, 1.0f, 20.0f, "%.0f");
+                ImGui.SliderFloat("GrabMinSize", ref style.GrabMinSize, 1.0f, 20.0f, "%.0f");
+                ImGui.Text("Borders");
+                ImGui.SliderFloat("WindowBorderSize", ref style.WindowBorderSize, 0.0f, 1.0f, "%.0f");
+                ImGui.SliderFloat("ChildBorderSize", ref style.ChildBorderSize, 0.0f, 1.0f, "%.0f");
+                ImGui.SliderFloat("PopupBorderSize", ref style.PopupBorderSize, 0.0f, 1.0f, "%.0f");
+                ImGui.SliderFloat("FrameBorderSize", ref style.FrameBorderSize, 0.0f, 1.0f, "%.0f");
+                ImGui.SliderFloat("TabBorderSize", ref style.TabBorderSize, 0.0f, 1.0f, "%.0f");
+                ImGui.Text("Rounding");
+                ImGui.SliderFloat("WindowRounding", ref style.WindowRounding, 0.0f, 12.0f, "%.0f");
+                ImGui.SliderFloat("ChildRounding", ref style.ChildRounding, 0.0f, 12.0f, "%.0f");
+                ImGui.SliderFloat("FrameRounding", ref style.FrameRounding, 0.0f, 12.0f, "%.0f");
+                ImGui.SliderFloat("PopupRounding", ref style.PopupRounding, 0.0f, 12.0f, "%.0f");
+                ImGui.SliderFloat("ScrollbarRounding", ref style.ScrollbarRounding, 0.0f, 12.0f, "%.0f");
+                ImGui.SliderFloat("GrabRounding", ref style.GrabRounding, 0.0f, 12.0f, "%.0f");
+                ImGui.SliderFloat("LogSliderDeadzone", ref style.LogSliderDeadzone, 0.0f, 12.0f, "%.0f");
+                ImGui.SliderFloat("TabRounding", ref style.TabRounding, 0.0f, 12.0f, "%.0f");
+                ImGui.Text("Alignment");
+                ImGui.SliderFloat2("WindowTitleAlign", ref style.WindowTitleAlign, 0.0f, 1.0f, "%.2f");
+                var windowMenuButtonPosition = (int)style.WindowMenuButtonPosition + 1;
+                if (ImGui.Combo("WindowMenuButtonPosition", ref windowMenuButtonPosition, "None\0Left\0Right\0"))
+                    style.WindowMenuButtonPosition = (ImGuiDir)(windowMenuButtonPosition - 1);
+                ImGui.SliderFloat2("ButtonTextAlign", ref style.ButtonTextAlign, 0.0f, 1.0f, "%.2f");
+                ImGui.SameLine();
+                ImGuiComponents.HelpMarker("Alignment applies when a button is larger than its text content.");
+                ImGui.SliderFloat2("SelectableTextAlign", ref style.SelectableTextAlign, 0.0f, 1.0f, "%.2f");
+                ImGui.SameLine();
+                ImGuiComponents.HelpMarker("Alignment applies when a selectable is larger than its text content.");
+                ImGui.SliderFloat2("DisplaySafeAreaPadding", ref style.DisplaySafeAreaPadding, 0.0f, 30.0f, "%.0f");
+                ImGui.SameLine();
+                ImGuiComponents.HelpMarker(
+                    "Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured).");
+                ImGui.EndTabItem();
+
+                ImGui.EndChild();
+
+                ImGui.EndTabItem();
+            }
+
+            if (ImGui.BeginTabItem(Loc.Localize("StyleEditorColors", "Colors")))
+            {
+                ImGui.BeginChild("ScrollingColors", ImGuiHelpers.ScaledVector2(0, -30), true, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground);
+
+                ImGui.SetCursorPosY(ImGui.GetCursorPosY() - 5);
+
+                if (ImGui.RadioButton("Opaque", this.alphaFlags == ImGuiColorEditFlags.None))
+                    this.alphaFlags = ImGuiColorEditFlags.None;
+                ImGui.SameLine();
+                if (ImGui.RadioButton("Alpha", this.alphaFlags == ImGuiColorEditFlags.AlphaPreview))
+                    this.alphaFlags = ImGuiColorEditFlags.AlphaPreview;
+                ImGui.SameLine();
+                if (ImGui.RadioButton("Both", this.alphaFlags == ImGuiColorEditFlags.AlphaPreviewHalf))
+                    this.alphaFlags = ImGuiColorEditFlags.AlphaPreviewHalf;
+                ImGui.SameLine();
+
+                ImGuiComponents.HelpMarker(
+                    "In the color list:\n" +
+                    "Left-click on color square to open color picker,\n" +
+                    "Right-click to open edit options menu.");
+
+                foreach (var imGuiCol in Enum.GetValues<ImGuiCol>())
+                {
+                    if (imGuiCol == ImGuiCol.COUNT)
+                        continue;
+
+                    ImGui.PushID(imGuiCol.ToString());
+
+                    ImGui.ColorEdit4("##color", ref style.Colors[(int)imGuiCol], ImGuiColorEditFlags.AlphaBar | this.alphaFlags);
+
+                    ImGui.SameLine(0.0f, style.ItemInnerSpacing.X);
+                    ImGui.TextUnformatted(imGuiCol.ToString());
+
+                    ImGui.PopID();
+                }
+
+                ImGui.Separator();
+
+                foreach (var property in typeof(DalamudColors).GetProperties(BindingFlags.Public | BindingFlags.Instance))
+                {
+                    ImGui.PushID(property.Name);
+
+                    var colorVal = property.GetValue(workStyle.BuiltInColors);
+                    if (colorVal == null)
+                    {
+                        colorVal = property.GetValue(StyleModelV1.DalamudStandard.BuiltInColors);
+                        property.SetValue(workStyle.BuiltInColors, colorVal);
+                    }
+
+                    var color = (Vector4)colorVal;
+
+                    if (ImGui.ColorEdit4("##color", ref color, ImGuiColorEditFlags.AlphaBar | this.alphaFlags))
+                    {
+                        property.SetValue(workStyle.BuiltInColors, color);
+                        workStyle.BuiltInColors?.Apply();
+                    }
+
+                    ImGui.SameLine(0.0f, style.ItemInnerSpacing.X);
+                    ImGui.TextUnformatted(property.Name);
+
+                    ImGui.PopID();
+                }
+
+                ImGui.EndChild();
+
+                ImGui.EndTabItem();
+            }
+
+            ImGui.EndTabBar();
+        }
+
+        ImGui.PopItemWidth();
+
+        ImGui.Separator();
+
+        if (ImGui.Button(Loc.Localize("Close", "Close")))
+        {
+            this.IsOpen = false;
+        }
+
+        ImGui.SameLine();
+
+        if (ImGui.Button(Loc.Localize("SaveAndClose", "Save and Close")))
+        {
+            this.SaveStyle();
+
+            config.ChosenStyle = config.SavedStyles[this.currentSel].Name;
+            Log.Verbose("ChosenStyle = {ChosenStyle}", config.ChosenStyle);
+
+            this.didSave = true;
+
+            this.IsOpen = false;
+        }
+
+        if (ImGui.BeginPopupModal(renameModalTitle, ref this.renameModalDrawing, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar))
+        {
+            ImGui.Text(Loc.Localize("StyleEditorEnterName", "Please enter the new name for this style."));
+            ImGui.Spacing();
+
+            ImGui.InputText("###renameModalInput", ref this.renameText, 255);
+
+            const float buttonWidth = 120f;
+            ImGui.SetCursorPosX((ImGui.GetWindowWidth() - buttonWidth) / 2);
+
+            if (ImGui.Button("OK", new Vector2(buttonWidth, 40)))
+            {
+                config.SavedStyles[this.currentSel].Name = this.renameText;
+                config.Save();
+
+                ImGui.CloseCurrentPopup();
+            }
+
+            ImGui.EndPopup();
+        }
+    }
+
+    private static string GetRandomName()
+    {
+        var data = Service<DataManager>.Get();
+        var names = data.GetExcelSheet<BNpcName>(ClientLanguage.English);
+        var rng = new Random();
+
+        return names.ElementAt(rng.Next(0, names.Count() - 1)).Singular.RawString;
+    }
+
+    private void SaveStyle()
+    {
+        if (this.currentSel < 2)
+            return;
+
+        var config = Service<DalamudConfiguration>.Get();
+
+        var newStyle = StyleModelV1.Get();
+        newStyle.Name = config.SavedStyles[this.currentSel].Name;
+        config.SavedStyles[this.currentSel] = newStyle;
+        newStyle.Apply();
+
+        config.Save();
     }
 }
diff --git a/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs b/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
index 78581e624..3d8fadb53 100644
--- a/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
@@ -13,364 +13,363 @@ using Dalamud.Interface.Windowing;
 using ImGuiNET;
 using ImGuiScene;
 
-namespace Dalamud.Interface.Internal.Windows
+namespace Dalamud.Interface.Internal.Windows;
+
+/// <summary>
+/// Class responsible for drawing the main plugin window.
+/// </summary>
+internal class TitleScreenMenuWindow : Window, IDisposable
 {
+    private const float TargetFontSizePt = 18f;
+    private const float TargetFontSizePx = TargetFontSizePt * 4 / 3;
+
+    private readonly TextureWrap shadeTexture;
+
+    private readonly Dictionary<Guid, InOutCubic> shadeEasings = new();
+    private readonly Dictionary<Guid, InOutQuint> moveEasings = new();
+    private readonly Dictionary<Guid, InOutCubic> logoEasings = new();
+    private readonly Dictionary<string, InterfaceManager.SpecialGlyphRequest> specialGlyphRequests = new();
+
+    private InOutCubic? fadeOutEasing;
+
+    private State state = State.Hide;
+
     /// <summary>
-    /// Class responsible for drawing the main plugin window.
+    /// Initializes a new instance of the <see cref="TitleScreenMenuWindow"/> class.
     /// </summary>
-    internal class TitleScreenMenuWindow : Window, IDisposable
+    public TitleScreenMenuWindow()
+        : base(
+            "TitleScreenMenuOverlay",
+            ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar |
+            ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoNavFocus)
     {
-        private const float TargetFontSizePt = 18f;
-        private const float TargetFontSizePx = TargetFontSizePt * 4 / 3;
+        this.IsOpen = true;
 
-        private readonly TextureWrap shadeTexture;
+        this.ForceMainWindow = true;
 
-        private readonly Dictionary<Guid, InOutCubic> shadeEasings = new();
-        private readonly Dictionary<Guid, InOutQuint> moveEasings = new();
-        private readonly Dictionary<Guid, InOutCubic> logoEasings = new();
-        private readonly Dictionary<string, InterfaceManager.SpecialGlyphRequest> specialGlyphRequests = new();
+        this.Position = new Vector2(0, 200);
+        this.PositionCondition = ImGuiCond.Always;
+        this.RespectCloseHotkey = false;
 
-        private InOutCubic? fadeOutEasing;
+        var dalamud = Service<Dalamud>.Get();
+        var interfaceManager = Service<InterfaceManager>.Get();
 
-        private State state = State.Hide;
+        var shadeTex =
+            interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "tsmShade.png"));
+        this.shadeTexture = shadeTex ?? throw new Exception("Could not load TSM background texture.");
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TitleScreenMenuWindow"/> class.
-        /// </summary>
-        public TitleScreenMenuWindow()
-            : base(
-                "TitleScreenMenuOverlay",
-                ImGuiWindowFlags.NoTitleBar | ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoScrollbar |
-                   ImGuiWindowFlags.NoBackground | ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoNavFocus)
+        var framework = Service<Framework>.Get();
+        framework.Update += this.FrameworkOnUpdate;
+    }
+
+    private enum State
+    {
+        Hide,
+        Show,
+        FadeOut,
+    }
+
+    /// <inheritdoc/>
+    public override void PreDraw()
+    {
+        ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(0, 0));
+        ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(0, 0));
+        base.PreDraw();
+    }
+
+    /// <inheritdoc/>
+    public override void PostDraw()
+    {
+        ImGui.PopStyleVar(2);
+        base.PostDraw();
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        this.shadeTexture.Dispose();
+        var framework = Service<Framework>.Get();
+        framework.Update -= this.FrameworkOnUpdate;
+    }
+
+    /// <inheritdoc/>
+    public override void Draw()
+    {
+        var scale = ImGui.GetIO().FontGlobalScale;
+
+        var tsm = Service<TitleScreenMenu>.Get();
+
+        switch (this.state)
         {
-            this.IsOpen = true;
-
-            this.ForceMainWindow = true;
-
-            this.Position = new Vector2(0, 200);
-            this.PositionCondition = ImGuiCond.Always;
-            this.RespectCloseHotkey = false;
-
-            var dalamud = Service<Dalamud>.Get();
-            var interfaceManager = Service<InterfaceManager>.Get();
-
-            var shadeTex =
-                interfaceManager.LoadImage(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "tsmShade.png"));
-            this.shadeTexture = shadeTex ?? throw new Exception("Could not load TSM background texture.");
-
-            var framework = Service<Framework>.Get();
-            framework.Update += this.FrameworkOnUpdate;
-        }
-
-        private enum State
-        {
-            Hide,
-            Show,
-            FadeOut,
-        }
-
-        /// <inheritdoc/>
-        public override void PreDraw()
-        {
-            ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(0, 0));
-            ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(0, 0));
-            base.PreDraw();
-        }
-
-        /// <inheritdoc/>
-        public override void PostDraw()
-        {
-            ImGui.PopStyleVar(2);
-            base.PostDraw();
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            this.shadeTexture.Dispose();
-            var framework = Service<Framework>.Get();
-            framework.Update -= this.FrameworkOnUpdate;
-        }
-
-        /// <inheritdoc/>
-        public override void Draw()
-        {
-            var scale = ImGui.GetIO().FontGlobalScale;
-
-            var tsm = Service<TitleScreenMenu>.Get();
-
-            switch (this.state)
+            case State.Show:
             {
-                case State.Show:
+                for (var i = 0; i < tsm.Entries.Count; i++)
+                {
+                    var entry = tsm.Entries[i];
+
+                    if (!this.moveEasings.TryGetValue(entry.Id, out var moveEasing))
                     {
-                        for (var i = 0; i < tsm.Entries.Count; i++)
-                        {
-                            var entry = tsm.Entries[i];
-
-                            if (!this.moveEasings.TryGetValue(entry.Id, out var moveEasing))
-                            {
-                                moveEasing = new InOutQuint(TimeSpan.FromMilliseconds(400));
-                                this.moveEasings.Add(entry.Id, moveEasing);
-                            }
-
-                            if (!moveEasing.IsRunning && !moveEasing.IsDone)
-                            {
-                                moveEasing.Restart();
-                            }
-
-                            if (moveEasing.IsDone)
-                            {
-                                moveEasing.Stop();
-                            }
-
-                            moveEasing.Update();
-
-                            var finalPos = (i + 1) * this.shadeTexture.Height * scale;
-                            var pos = moveEasing.Value * finalPos;
-
-                            // FIXME(goat): Sometimes, easings can overshoot and bring things out of alignment.
-                            if (moveEasing.IsDone)
-                            {
-                                pos = finalPos;
-                            }
-
-                            this.DrawEntry(entry, moveEasing.IsRunning && i != 0, true, i == 0, true);
-
-                            var cursor = ImGui.GetCursorPos();
-                            cursor.Y = (float)pos;
-                            ImGui.SetCursorPos(cursor);
-                        }
-
-                        if (!ImGui.IsWindowHovered(ImGuiHoveredFlags.RootAndChildWindows |
-                                                   ImGuiHoveredFlags.AllowWhenBlockedByActiveItem))
-                        {
-                            this.state = State.FadeOut;
-                        }
-
-                        break;
+                        moveEasing = new InOutQuint(TimeSpan.FromMilliseconds(400));
+                        this.moveEasings.Add(entry.Id, moveEasing);
                     }
 
-                case State.FadeOut:
+                    if (!moveEasing.IsRunning && !moveEasing.IsDone)
                     {
-                        this.fadeOutEasing ??= new InOutCubic(TimeSpan.FromMilliseconds(400))
-                        {
-                            IsInverse = true,
-                        };
-
-                        if (!this.fadeOutEasing.IsRunning && !this.fadeOutEasing.IsDone)
-                        {
-                            this.fadeOutEasing.Restart();
-                        }
-
-                        if (this.fadeOutEasing.IsDone)
-                        {
-                            this.fadeOutEasing.Stop();
-                        }
-
-                        this.fadeOutEasing.Update();
-
-                        ImGui.PushStyleVar(ImGuiStyleVar.Alpha, (float)this.fadeOutEasing.Value);
-
-                        for (var i = 0; i < tsm.Entries.Count; i++)
-                        {
-                            var entry = tsm.Entries[i];
-
-                            var finalPos = (i + 1) * this.shadeTexture.Height * scale;
-
-                            this.DrawEntry(entry, i != 0, true, i == 0, false);
-
-                            var cursor = ImGui.GetCursorPos();
-                            cursor.Y = finalPos;
-                            ImGui.SetCursorPos(cursor);
-                        }
-
-                        ImGui.PopStyleVar();
-
-                        var isHover = ImGui.IsWindowHovered(ImGuiHoveredFlags.RootAndChildWindows |
-                                                            ImGuiHoveredFlags.AllowWhenBlockedByActiveItem);
-
-                        if (!isHover && this.fadeOutEasing!.IsDone)
-                        {
-                            this.state = State.Hide;
-                            this.fadeOutEasing = null;
-                        }
-                        else if (isHover)
-                        {
-                            this.state = State.Show;
-                            this.fadeOutEasing = null;
-                        }
-
-                        break;
+                        moveEasing.Restart();
                     }
 
-                case State.Hide:
+                    if (moveEasing.IsDone)
                     {
-                        if (this.DrawEntry(tsm.Entries[0], true, false, true, true))
-                        {
-                            this.state = State.Show;
-                        }
-
-                        this.moveEasings.Clear();
-                        this.logoEasings.Clear();
-                        this.shadeEasings.Clear();
-                        break;
+                        moveEasing.Stop();
                     }
+
+                    moveEasing.Update();
+
+                    var finalPos = (i + 1) * this.shadeTexture.Height * scale;
+                    var pos = moveEasing.Value * finalPos;
+
+                    // FIXME(goat): Sometimes, easings can overshoot and bring things out of alignment.
+                    if (moveEasing.IsDone)
+                    {
+                        pos = finalPos;
+                    }
+
+                    this.DrawEntry(entry, moveEasing.IsRunning && i != 0, true, i == 0, true);
+
+                    var cursor = ImGui.GetCursorPos();
+                    cursor.Y = (float)pos;
+                    ImGui.SetCursorPos(cursor);
+                }
+
+                if (!ImGui.IsWindowHovered(ImGuiHoveredFlags.RootAndChildWindows |
+                                           ImGuiHoveredFlags.AllowWhenBlockedByActiveItem))
+                {
+                    this.state = State.FadeOut;
+                }
+
+                break;
             }
 
-            var srcText = tsm.Entries.Select(e => e.Name).ToHashSet();
-            var keys = this.specialGlyphRequests.Keys.ToHashSet();
-            keys.RemoveWhere(x => srcText.Contains(x));
-            foreach (var key in keys)
+            case State.FadeOut:
             {
-                this.specialGlyphRequests[key].Dispose();
-                this.specialGlyphRequests.Remove(key);
-            }
-        }
+                this.fadeOutEasing ??= new InOutCubic(TimeSpan.FromMilliseconds(400))
+                {
+                    IsInverse = true,
+                };
 
-        private bool DrawEntry(
-            TitleScreenMenu.TitleScreenMenuEntry entry, bool inhibitFadeout, bool showText, bool isFirst, bool overrideAlpha)
-        {
-            InterfaceManager.SpecialGlyphRequest fontHandle;
-            if (this.specialGlyphRequests.TryGetValue(entry.Name, out fontHandle) && fontHandle.Size != TargetFontSizePx)
-            {
-                fontHandle.Dispose();
-                this.specialGlyphRequests.Remove(entry.Name);
-                fontHandle = null;
-            }
+                if (!this.fadeOutEasing.IsRunning && !this.fadeOutEasing.IsDone)
+                {
+                    this.fadeOutEasing.Restart();
+                }
 
-            if (fontHandle == null)
-                this.specialGlyphRequests[entry.Name] = fontHandle = Service<InterfaceManager>.Get().NewFontSizeRef(TargetFontSizePx, entry.Name);
+                if (this.fadeOutEasing.IsDone)
+                {
+                    this.fadeOutEasing.Stop();
+                }
 
-            ImGui.PushFont(fontHandle.Font);
-            ImGui.SetWindowFontScale(TargetFontSizePx / fontHandle.Size);
+                this.fadeOutEasing.Update();
 
-            var scale = ImGui.GetIO().FontGlobalScale;
+                ImGui.PushStyleVar(ImGuiStyleVar.Alpha, (float)this.fadeOutEasing.Value);
 
-            if (!this.shadeEasings.TryGetValue(entry.Id, out var shadeEasing))
-            {
-                shadeEasing = new InOutCubic(TimeSpan.FromMilliseconds(350));
-                this.shadeEasings.Add(entry.Id, shadeEasing);
-            }
+                for (var i = 0; i < tsm.Entries.Count; i++)
+                {
+                    var entry = tsm.Entries[i];
 
-            var initialCursor = ImGui.GetCursorPos();
+                    var finalPos = (i + 1) * this.shadeTexture.Height * scale;
 
-            ImGui.PushStyleVar(ImGuiStyleVar.Alpha, (float)shadeEasing.Value);
-            ImGui.Image(this.shadeTexture.ImGuiHandle, new Vector2(this.shadeTexture.Width * scale, this.shadeTexture.Height * scale));
-            ImGui.PopStyleVar();
+                    this.DrawEntry(entry, i != 0, true, i == 0, false);
 
-            var isHover = ImGui.IsItemHovered();
-            if (isHover && (!shadeEasing.IsRunning || (shadeEasing.IsDone && shadeEasing.IsInverse)) && !inhibitFadeout)
-            {
-                shadeEasing.IsInverse = false;
-                shadeEasing.Restart();
-            }
-            else if (!isHover && !shadeEasing.IsInverse && shadeEasing.IsRunning && !inhibitFadeout)
-            {
-                shadeEasing.IsInverse = true;
-                shadeEasing.Restart();
-            }
+                    var cursor = ImGui.GetCursorPos();
+                    cursor.Y = finalPos;
+                    ImGui.SetCursorPos(cursor);
+                }
 
-            var isClick = ImGui.IsItemClicked();
-            if (isClick)
-            {
-                entry.Trigger();
-            }
-
-            shadeEasing.Update();
-
-            if (!this.logoEasings.TryGetValue(entry.Id, out var logoEasing))
-            {
-                logoEasing = new InOutCubic(TimeSpan.FromMilliseconds(350));
-                this.logoEasings.Add(entry.Id, logoEasing);
-            }
-
-            if (!logoEasing.IsRunning && !logoEasing.IsDone)
-            {
-                logoEasing.Restart();
-            }
-
-            if (logoEasing.IsDone)
-            {
-                logoEasing.Stop();
-            }
-
-            logoEasing.Update();
-
-            ImGui.SetCursorPos(initialCursor);
-            ImGuiHelpers.ScaledDummy(5);
-            ImGui.SameLine();
-
-            if (overrideAlpha)
-            {
-                ImGui.PushStyleVar(ImGuiStyleVar.Alpha, isFirst ? 1f : (float)logoEasing.Value);
-            }
-            else if (isFirst)
-            {
-                ImGui.PushStyleVar(ImGuiStyleVar.Alpha, 1f);
-            }
-
-            ImGui.Image(entry.Texture.ImGuiHandle, new Vector2(TitleScreenMenu.TextureSize * scale));
-            if (overrideAlpha || isFirst)
-            {
                 ImGui.PopStyleVar();
+
+                var isHover = ImGui.IsWindowHovered(ImGuiHoveredFlags.RootAndChildWindows |
+                                                    ImGuiHoveredFlags.AllowWhenBlockedByActiveItem);
+
+                if (!isHover && this.fadeOutEasing!.IsDone)
+                {
+                    this.state = State.Hide;
+                    this.fadeOutEasing = null;
+                }
+                else if (isHover)
+                {
+                    this.state = State.Show;
+                    this.fadeOutEasing = null;
+                }
+
+                break;
             }
 
-            ImGui.SameLine();
-
-            ImGuiHelpers.ScaledDummy(10);
-            ImGui.SameLine();
-
-            var textHeight = ImGui.GetTextLineHeightWithSpacing();
-            var cursor = ImGui.GetCursorPos();
-
-            cursor.Y += (entry.Texture.Height * scale / 2) - (textHeight / 2);
-
-            if (overrideAlpha)
+            case State.Hide:
             {
-                ImGui.PushStyleVar(ImGuiStyleVar.Alpha, showText ? (float)logoEasing.Value : 0f);
+                if (this.DrawEntry(tsm.Entries[0], true, false, true, true))
+                {
+                    this.state = State.Show;
+                }
+
+                this.moveEasings.Clear();
+                this.logoEasings.Clear();
+                this.shadeEasings.Clear();
+                break;
             }
-
-            // Drop shadow
-            ImGui.PushStyleColor(ImGuiCol.Text, 0xFF000000);
-            for (int i = 0, i_ = (int)Math.Ceiling(1 * scale); i < i_; i++)
-            {
-                ImGui.SetCursorPos(new Vector2(cursor.X, cursor.Y + i));
-                ImGui.Text(entry.Name);
-            }
-
-            ImGui.PopStyleColor();
-
-            ImGui.SetCursorPos(cursor);
-            ImGui.Text(entry.Name);
-
-            if (overrideAlpha)
-            {
-                ImGui.PopStyleVar();
-            }
-
-            initialCursor.Y += entry.Texture.Height * scale;
-            ImGui.SetCursorPos(initialCursor);
-
-            ImGui.PopFont();
-
-            return isHover;
         }
 
-        private void FrameworkOnUpdate(Framework framework)
+        var srcText = tsm.Entries.Select(e => e.Name).ToHashSet();
+        var keys = this.specialGlyphRequests.Keys.ToHashSet();
+        keys.RemoveWhere(x => srcText.Contains(x));
+        foreach (var key in keys)
         {
-            var clientState = Service<ClientState>.Get();
-            this.IsOpen = !clientState.IsLoggedIn;
-
-            var configuration = Service<DalamudConfiguration>.Get();
-            if (!configuration.ShowTsm)
-                this.IsOpen = false;
-
-            var gameGui = Service<GameGui>.Get();
-            var charaSelect = gameGui.GetAddonByName("CharaSelect", 1);
-            var charaMake = gameGui.GetAddonByName("CharaMake", 1);
-            var titleDcWorldMap = gameGui.GetAddonByName("TitleDCWorldMap", 1);
-            if (charaMake != IntPtr.Zero || charaSelect != IntPtr.Zero || titleDcWorldMap != IntPtr.Zero)
-                this.IsOpen = false;
+            this.specialGlyphRequests[key].Dispose();
+            this.specialGlyphRequests.Remove(key);
         }
     }
+
+    private bool DrawEntry(
+        TitleScreenMenu.TitleScreenMenuEntry entry, bool inhibitFadeout, bool showText, bool isFirst, bool overrideAlpha)
+    {
+        InterfaceManager.SpecialGlyphRequest fontHandle;
+        if (this.specialGlyphRequests.TryGetValue(entry.Name, out fontHandle) && fontHandle.Size != TargetFontSizePx)
+        {
+            fontHandle.Dispose();
+            this.specialGlyphRequests.Remove(entry.Name);
+            fontHandle = null;
+        }
+
+        if (fontHandle == null)
+            this.specialGlyphRequests[entry.Name] = fontHandle = Service<InterfaceManager>.Get().NewFontSizeRef(TargetFontSizePx, entry.Name);
+
+        ImGui.PushFont(fontHandle.Font);
+        ImGui.SetWindowFontScale(TargetFontSizePx / fontHandle.Size);
+
+        var scale = ImGui.GetIO().FontGlobalScale;
+
+        if (!this.shadeEasings.TryGetValue(entry.Id, out var shadeEasing))
+        {
+            shadeEasing = new InOutCubic(TimeSpan.FromMilliseconds(350));
+            this.shadeEasings.Add(entry.Id, shadeEasing);
+        }
+
+        var initialCursor = ImGui.GetCursorPos();
+
+        ImGui.PushStyleVar(ImGuiStyleVar.Alpha, (float)shadeEasing.Value);
+        ImGui.Image(this.shadeTexture.ImGuiHandle, new Vector2(this.shadeTexture.Width * scale, this.shadeTexture.Height * scale));
+        ImGui.PopStyleVar();
+
+        var isHover = ImGui.IsItemHovered();
+        if (isHover && (!shadeEasing.IsRunning || (shadeEasing.IsDone && shadeEasing.IsInverse)) && !inhibitFadeout)
+        {
+            shadeEasing.IsInverse = false;
+            shadeEasing.Restart();
+        }
+        else if (!isHover && !shadeEasing.IsInverse && shadeEasing.IsRunning && !inhibitFadeout)
+        {
+            shadeEasing.IsInverse = true;
+            shadeEasing.Restart();
+        }
+
+        var isClick = ImGui.IsItemClicked();
+        if (isClick)
+        {
+            entry.Trigger();
+        }
+
+        shadeEasing.Update();
+
+        if (!this.logoEasings.TryGetValue(entry.Id, out var logoEasing))
+        {
+            logoEasing = new InOutCubic(TimeSpan.FromMilliseconds(350));
+            this.logoEasings.Add(entry.Id, logoEasing);
+        }
+
+        if (!logoEasing.IsRunning && !logoEasing.IsDone)
+        {
+            logoEasing.Restart();
+        }
+
+        if (logoEasing.IsDone)
+        {
+            logoEasing.Stop();
+        }
+
+        logoEasing.Update();
+
+        ImGui.SetCursorPos(initialCursor);
+        ImGuiHelpers.ScaledDummy(5);
+        ImGui.SameLine();
+
+        if (overrideAlpha)
+        {
+            ImGui.PushStyleVar(ImGuiStyleVar.Alpha, isFirst ? 1f : (float)logoEasing.Value);
+        }
+        else if (isFirst)
+        {
+            ImGui.PushStyleVar(ImGuiStyleVar.Alpha, 1f);
+        }
+
+        ImGui.Image(entry.Texture.ImGuiHandle, new Vector2(TitleScreenMenu.TextureSize * scale));
+        if (overrideAlpha || isFirst)
+        {
+            ImGui.PopStyleVar();
+        }
+
+        ImGui.SameLine();
+
+        ImGuiHelpers.ScaledDummy(10);
+        ImGui.SameLine();
+
+        var textHeight = ImGui.GetTextLineHeightWithSpacing();
+        var cursor = ImGui.GetCursorPos();
+
+        cursor.Y += (entry.Texture.Height * scale / 2) - (textHeight / 2);
+
+        if (overrideAlpha)
+        {
+            ImGui.PushStyleVar(ImGuiStyleVar.Alpha, showText ? (float)logoEasing.Value : 0f);
+        }
+
+        // Drop shadow
+        ImGui.PushStyleColor(ImGuiCol.Text, 0xFF000000);
+        for (int i = 0, i_ = (int)Math.Ceiling(1 * scale); i < i_; i++)
+        {
+            ImGui.SetCursorPos(new Vector2(cursor.X, cursor.Y + i));
+            ImGui.Text(entry.Name);
+        }
+
+        ImGui.PopStyleColor();
+
+        ImGui.SetCursorPos(cursor);
+        ImGui.Text(entry.Name);
+
+        if (overrideAlpha)
+        {
+            ImGui.PopStyleVar();
+        }
+
+        initialCursor.Y += entry.Texture.Height * scale;
+        ImGui.SetCursorPos(initialCursor);
+
+        ImGui.PopFont();
+
+        return isHover;
+    }
+
+    private void FrameworkOnUpdate(Framework framework)
+    {
+        var clientState = Service<ClientState>.Get();
+        this.IsOpen = !clientState.IsLoggedIn;
+
+        var configuration = Service<DalamudConfiguration>.Get();
+        if (!configuration.ShowTsm)
+            this.IsOpen = false;
+
+        var gameGui = Service<GameGui>.Get();
+        var charaSelect = gameGui.GetAddonByName("CharaSelect", 1);
+        var charaMake = gameGui.GetAddonByName("CharaMake", 1);
+        var titleDcWorldMap = gameGui.GetAddonByName("TitleDCWorldMap", 1);
+        if (charaMake != IntPtr.Zero || charaSelect != IntPtr.Zero || titleDcWorldMap != IntPtr.Zero)
+            this.IsOpen = false;
+    }
 }
diff --git a/Dalamud/Interface/Style/DalamudColors.cs b/Dalamud/Interface/Style/DalamudColors.cs
index e74097936..aa3339c19 100644
--- a/Dalamud/Interface/Style/DalamudColors.cs
+++ b/Dalamud/Interface/Style/DalamudColors.cs
@@ -3,167 +3,165 @@
 using Dalamud.Interface.Colors;
 using Newtonsoft.Json;
 
-namespace Dalamud.Interface.Style
+namespace Dalamud.Interface.Style;
+#pragma warning disable SA1600
+
+public class DalamudColors
 {
-    #pragma warning disable SA1600
+    [JsonProperty("a")]
+    public Vector4? DalamudRed { get; set; }
 
-        public class DalamudColors
+    [JsonProperty("b")]
+    public Vector4? DalamudGrey { get; set; }
+
+    [JsonProperty("c")]
+    public Vector4? DalamudGrey2 { get; set; }
+
+    [JsonProperty("d")]
+    public Vector4? DalamudGrey3 { get; set; }
+
+    [JsonProperty("e")]
+    public Vector4? DalamudWhite { get; set; }
+
+    [JsonProperty("f")]
+    public Vector4? DalamudWhite2 { get; set; }
+
+    [JsonProperty("g")]
+    public Vector4? DalamudOrange { get; set; }
+
+    [JsonProperty("h")]
+    public Vector4? TankBlue { get; set; }
+
+    [JsonProperty("i")]
+    public Vector4? HealerGreen { get; set; }
+
+    [JsonProperty("j")]
+    public Vector4? DPSRed { get; set; }
+
+    [JsonProperty("k")]
+    public Vector4? DalamudYellow { get; set; }
+
+    [JsonProperty("l")]
+    public Vector4? DalamudViolet { get; set; }
+
+    [JsonProperty("m")]
+    public Vector4? ParsedGrey { get; set; }
+
+    [JsonProperty("n")]
+    public Vector4? ParsedGreen { get; set; }
+
+    [JsonProperty("o")]
+    public Vector4? ParsedBlue { get; set; }
+
+    [JsonProperty("p")]
+    public Vector4? ParsedPurple { get; set; }
+
+    [JsonProperty("q")]
+    public Vector4? ParsedOrange { get; set; }
+
+    [JsonProperty("r")]
+    public Vector4? ParsedPink { get; set; }
+
+    [JsonProperty("s")]
+    public Vector4? ParsedGold { get; set; }
+
+    public void Apply()
+    {
+        if (this.DalamudRed.HasValue)
         {
-            [JsonProperty("a")]
-            public Vector4? DalamudRed { get; set; }
-
-            [JsonProperty("b")]
-            public Vector4? DalamudGrey { get; set; }
-
-            [JsonProperty("c")]
-            public Vector4? DalamudGrey2 { get; set; }
-
-            [JsonProperty("d")]
-            public Vector4? DalamudGrey3 { get; set; }
-
-            [JsonProperty("e")]
-            public Vector4? DalamudWhite { get; set; }
-
-            [JsonProperty("f")]
-            public Vector4? DalamudWhite2 { get; set; }
-
-            [JsonProperty("g")]
-            public Vector4? DalamudOrange { get; set; }
-
-            [JsonProperty("h")]
-            public Vector4? TankBlue { get; set; }
-
-            [JsonProperty("i")]
-            public Vector4? HealerGreen { get; set; }
-
-            [JsonProperty("j")]
-            public Vector4? DPSRed { get; set; }
-
-            [JsonProperty("k")]
-            public Vector4? DalamudYellow { get; set; }
-
-            [JsonProperty("l")]
-            public Vector4? DalamudViolet { get; set; }
-
-            [JsonProperty("m")]
-            public Vector4? ParsedGrey { get; set; }
-
-            [JsonProperty("n")]
-            public Vector4? ParsedGreen { get; set; }
-
-            [JsonProperty("o")]
-            public Vector4? ParsedBlue { get; set; }
-
-            [JsonProperty("p")]
-            public Vector4? ParsedPurple { get; set; }
-
-            [JsonProperty("q")]
-            public Vector4? ParsedOrange { get; set; }
-
-            [JsonProperty("r")]
-            public Vector4? ParsedPink { get; set; }
-
-            [JsonProperty("s")]
-            public Vector4? ParsedGold { get; set; }
-
-            public void Apply()
-            {
-                if (this.DalamudRed.HasValue)
-                {
-                    ImGuiColors.DalamudRed = this.DalamudRed.Value;
-                }
-
-                if (this.DalamudGrey.HasValue)
-                {
-                    ImGuiColors.DalamudGrey = this.DalamudGrey.Value;
-                }
-
-                if (this.DalamudGrey2.HasValue)
-                {
-                    ImGuiColors.DalamudGrey2 = this.DalamudGrey2.Value;
-                }
-
-                if (this.DalamudGrey3.HasValue)
-                {
-                    ImGuiColors.DalamudGrey3 = this.DalamudGrey3.Value;
-                }
-
-                if (this.DalamudWhite.HasValue)
-                {
-                    ImGuiColors.DalamudWhite = this.DalamudWhite.Value;
-                }
-
-                if (this.DalamudWhite2.HasValue)
-                {
-                    ImGuiColors.DalamudWhite2 = this.DalamudWhite2.Value;
-                }
-
-                if (this.DalamudOrange.HasValue)
-                {
-                    ImGuiColors.DalamudOrange = this.DalamudOrange.Value;
-                }
-
-                if (this.TankBlue.HasValue)
-                {
-                    ImGuiColors.TankBlue = this.TankBlue.Value;
-                }
-
-                if (this.HealerGreen.HasValue)
-                {
-                    ImGuiColors.HealerGreen = this.HealerGreen.Value;
-                }
-
-                if (this.DPSRed.HasValue)
-                {
-                    ImGuiColors.DPSRed = this.DPSRed.Value;
-                }
-
-                if (this.DalamudYellow.HasValue)
-                {
-                    ImGuiColors.DalamudYellow = this.DalamudYellow.Value;
-                }
-
-                if (this.DalamudViolet.HasValue)
-                {
-                    ImGuiColors.DalamudViolet = this.DalamudViolet.Value;
-                }
-
-                if (this.ParsedGrey.HasValue)
-                {
-                    ImGuiColors.ParsedGrey = this.ParsedGrey.Value;
-                }
-
-                if (this.ParsedGreen.HasValue)
-                {
-                    ImGuiColors.ParsedGreen = this.ParsedGreen.Value;
-                }
-
-                if (this.ParsedBlue.HasValue)
-                {
-                    ImGuiColors.ParsedBlue = this.ParsedBlue.Value;
-                }
-
-                if (this.ParsedPurple.HasValue)
-                {
-                    ImGuiColors.ParsedPurple = this.ParsedPurple.Value;
-                }
-
-                if (this.ParsedOrange.HasValue)
-                {
-                    ImGuiColors.ParsedOrange = this.ParsedOrange.Value;
-                }
-
-                if (this.ParsedPink.HasValue)
-                {
-                    ImGuiColors.ParsedPink = this.ParsedPink.Value;
-                }
-
-                if (this.ParsedGold.HasValue)
-                {
-                    ImGuiColors.ParsedGold = this.ParsedGold.Value;
-                }
-            }
+            ImGuiColors.DalamudRed = this.DalamudRed.Value;
         }
 
-#pragma warning restore SA1600
+        if (this.DalamudGrey.HasValue)
+        {
+            ImGuiColors.DalamudGrey = this.DalamudGrey.Value;
+        }
+
+        if (this.DalamudGrey2.HasValue)
+        {
+            ImGuiColors.DalamudGrey2 = this.DalamudGrey2.Value;
+        }
+
+        if (this.DalamudGrey3.HasValue)
+        {
+            ImGuiColors.DalamudGrey3 = this.DalamudGrey3.Value;
+        }
+
+        if (this.DalamudWhite.HasValue)
+        {
+            ImGuiColors.DalamudWhite = this.DalamudWhite.Value;
+        }
+
+        if (this.DalamudWhite2.HasValue)
+        {
+            ImGuiColors.DalamudWhite2 = this.DalamudWhite2.Value;
+        }
+
+        if (this.DalamudOrange.HasValue)
+        {
+            ImGuiColors.DalamudOrange = this.DalamudOrange.Value;
+        }
+
+        if (this.TankBlue.HasValue)
+        {
+            ImGuiColors.TankBlue = this.TankBlue.Value;
+        }
+
+        if (this.HealerGreen.HasValue)
+        {
+            ImGuiColors.HealerGreen = this.HealerGreen.Value;
+        }
+
+        if (this.DPSRed.HasValue)
+        {
+            ImGuiColors.DPSRed = this.DPSRed.Value;
+        }
+
+        if (this.DalamudYellow.HasValue)
+        {
+            ImGuiColors.DalamudYellow = this.DalamudYellow.Value;
+        }
+
+        if (this.DalamudViolet.HasValue)
+        {
+            ImGuiColors.DalamudViolet = this.DalamudViolet.Value;
+        }
+
+        if (this.ParsedGrey.HasValue)
+        {
+            ImGuiColors.ParsedGrey = this.ParsedGrey.Value;
+        }
+
+        if (this.ParsedGreen.HasValue)
+        {
+            ImGuiColors.ParsedGreen = this.ParsedGreen.Value;
+        }
+
+        if (this.ParsedBlue.HasValue)
+        {
+            ImGuiColors.ParsedBlue = this.ParsedBlue.Value;
+        }
+
+        if (this.ParsedPurple.HasValue)
+        {
+            ImGuiColors.ParsedPurple = this.ParsedPurple.Value;
+        }
+
+        if (this.ParsedOrange.HasValue)
+        {
+            ImGuiColors.ParsedOrange = this.ParsedOrange.Value;
+        }
+
+        if (this.ParsedPink.HasValue)
+        {
+            ImGuiColors.ParsedPink = this.ParsedPink.Value;
+        }
+
+        if (this.ParsedGold.HasValue)
+        {
+            ImGuiColors.ParsedGold = this.ParsedGold.Value;
+        }
+    }
 }
+
+#pragma warning restore SA1600
diff --git a/Dalamud/Interface/Style/StyleModel.cs b/Dalamud/Interface/Style/StyleModel.cs
index 339ce52ea..89f5c39a6 100644
--- a/Dalamud/Interface/Style/StyleModel.cs
+++ b/Dalamud/Interface/Style/StyleModel.cs
@@ -10,179 +10,178 @@ using ImGuiNET;
 using Newtonsoft.Json;
 using Serilog;
 
-namespace Dalamud.Interface.Style
+namespace Dalamud.Interface.Style;
+
+/// <summary>
+/// Superclass for all versions of the Dalamud style model.
+/// </summary>
+public abstract class StyleModel
 {
+    private static int numPushedStyles = 0;
+    private static int numPushedColors = 0;
+    private static bool hasPushedOnce = false;
+
     /// <summary>
-    /// Superclass for all versions of the Dalamud style model.
+    /// Gets or sets the name of the style model.
     /// </summary>
-    public abstract class StyleModel
+    [JsonProperty("name")]
+    public string Name { get; set; } = "Unknown";
+
+    /// <summary>
+    /// Gets or sets class representing Dalamud-builtin <see cref="ImGuiColors"/>.
+    /// </summary>
+    [JsonProperty("dol")]
+    public DalamudColors? BuiltInColors { get; set; }
+
+    /// <summary>
+    /// Gets or sets version number of this model.
+    /// </summary>
+    [JsonProperty("ver")]
+    public int Version { get; set; }
+
+    /// <summary>
+    /// Get a StyleModel based on the current Dalamud style, with the current version.
+    /// </summary>
+    /// <returns>The current style.</returns>
+    public static StyleModel GetFromCurrent() => StyleModelV1.Get();
+
+    /// <summary>
+    /// Get the current style model, as per configuration.
+    /// </summary>
+    /// <returns>The current style, as per configuration.</returns>
+    public static StyleModel? GetConfiguredStyle()
     {
-        private static int numPushedStyles = 0;
-        private static int numPushedColors = 0;
-        private static bool hasPushedOnce = false;
+        var configuration = Service<DalamudConfiguration>.Get();
+        return configuration.SavedStyles?.FirstOrDefault(x => x.Name == configuration.ChosenStyle);
+    }
 
-        /// <summary>
-        /// Gets or sets the name of the style model.
-        /// </summary>
-        [JsonProperty("name")]
-        public string Name { get; set; } = "Unknown";
+    /// <summary>
+    /// Get an enumerable of all saved styles.
+    /// </summary>
+    /// <returns>Enumerable of saved styles.</returns>
+    public static IEnumerable<StyleModel>? GetConfiguredStyles() => Service<DalamudConfiguration>.Get().SavedStyles;
 
-        /// <summary>
-        /// Gets or sets class representing Dalamud-builtin <see cref="ImGuiColors"/>.
-        /// </summary>
-        [JsonProperty("dol")]
-        public DalamudColors? BuiltInColors { get; set; }
+    /// <summary>
+    /// Deserialize a style model.
+    /// </summary>
+    /// <param name="model">The serialized model.</param>
+    /// <returns>The deserialized model.</returns>
+    /// <exception cref="ArgumentException">Thrown in case the version of the model is not known.</exception>
+    public static StyleModel? Deserialize(string model)
+    {
+        var json = Util.DecompressString(Convert.FromBase64String(model.Substring(3)));
 
-        /// <summary>
-        /// Gets or sets version number of this model.
-        /// </summary>
-        [JsonProperty("ver")]
-        public int Version { get; set; }
+        if (model.StartsWith(StyleModelV1.SerializedPrefix))
+            return JsonConvert.DeserializeObject<StyleModelV1>(json);
 
-        /// <summary>
-        /// Get a StyleModel based on the current Dalamud style, with the current version.
-        /// </summary>
-        /// <returns>The current style.</returns>
-        public static StyleModel GetFromCurrent() => StyleModelV1.Get();
+        throw new ArgumentException("Was not a compressed style model.");
+    }
 
-        /// <summary>
-        /// Get the current style model, as per configuration.
-        /// </summary>
-        /// <returns>The current style, as per configuration.</returns>
-        public static StyleModel? GetConfiguredStyle()
+    /// <summary>
+    /// [TEMPORARY] Transfer old non-polymorphic style models to the new format.
+    /// </summary>
+    public static void TransferOldModels()
+    {
+        var configuration = Service<DalamudConfiguration>.Get();
+
+        if (configuration.SavedStylesOld == null)
+            return;
+
+        configuration.SavedStyles = new List<StyleModel>();
+        configuration.SavedStyles.AddRange(configuration.SavedStylesOld);
+
+        Log.Information("Transferred {NumStyles} styles", configuration.SavedStyles.Count);
+
+        configuration.SavedStylesOld = null;
+        configuration.Save();
+    }
+
+    /// <summary>
+    /// Serialize this style model.
+    /// </summary>
+    /// <returns>Serialized style model as string.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when the version of the style model is unknown.</exception>
+    public string Serialize()
+    {
+        string prefix;
+        switch (this)
         {
-            var configuration = Service<DalamudConfiguration>.Get();
-            return configuration.SavedStyles?.FirstOrDefault(x => x.Name == configuration.ChosenStyle);
+            case StyleModelV1:
+                prefix = StyleModelV1.SerializedPrefix;
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
         }
 
-        /// <summary>
-        /// Get an enumerable of all saved styles.
-        /// </summary>
-        /// <returns>Enumerable of saved styles.</returns>
-        public static IEnumerable<StyleModel>? GetConfiguredStyles() => Service<DalamudConfiguration>.Get().SavedStyles;
+        return prefix + Convert.ToBase64String(Util.CompressString(JsonConvert.SerializeObject(this)));
+    }
 
-        /// <summary>
-        /// Deserialize a style model.
-        /// </summary>
-        /// <param name="model">The serialized model.</param>
-        /// <returns>The deserialized model.</returns>
-        /// <exception cref="ArgumentException">Thrown in case the version of the model is not known.</exception>
-        public static StyleModel? Deserialize(string model)
-        {
-            var json = Util.DecompressString(Convert.FromBase64String(model.Substring(3)));
+    /// <summary>
+    /// Apply this style model to ImGui.
+    /// </summary>
+    public abstract void Apply();
 
-            if (model.StartsWith(StyleModelV1.SerializedPrefix))
-                return JsonConvert.DeserializeObject<StyleModelV1>(json);
+    /// <summary>
+    /// Push this StyleModel into the ImGui style/color stack.
+    /// </summary>
+    public abstract void Push();
 
-            throw new ArgumentException("Was not a compressed style model.");
-        }
+    /// <summary>
+    /// Pop this style model from the ImGui style/color stack.
+    /// </summary>
+    public void Pop()
+    {
+        if (!hasPushedOnce)
+            throw new InvalidOperationException("Wasn't pushed at least once.");
 
-        /// <summary>
-        /// [TEMPORARY] Transfer old non-polymorphic style models to the new format.
-        /// </summary>
-        public static void TransferOldModels()
-        {
-            var configuration = Service<DalamudConfiguration>.Get();
+        ImGui.PopStyleVar(numPushedStyles);
+        ImGui.PopStyleColor(numPushedColors);
+    }
 
-            if (configuration.SavedStylesOld == null)
-                return;
+    /// <summary>
+    /// Push a style var.
+    /// </summary>
+    /// <param name="style">Style kind.</param>
+    /// <param name="arg">Style var.</param>
+    protected void PushStyleHelper(ImGuiStyleVar style, float arg)
+    {
+        ImGui.PushStyleVar(style, arg);
 
-            configuration.SavedStyles = new List<StyleModel>();
-            configuration.SavedStyles.AddRange(configuration.SavedStylesOld);
+        if (!hasPushedOnce)
+            numPushedStyles++;
+    }
 
-            Log.Information("Transferred {NumStyles} styles", configuration.SavedStyles.Count);
+    /// <summary>
+    /// Push a style var.
+    /// </summary>
+    /// <param name="style">Style kind.</param>
+    /// <param name="arg">Style var.</param>
+    protected void PushStyleHelper(ImGuiStyleVar style, Vector2 arg)
+    {
+        ImGui.PushStyleVar(style, arg);
 
-            configuration.SavedStylesOld = null;
-            configuration.Save();
-        }
+        if (!hasPushedOnce)
+            numPushedStyles++;
+    }
 
-        /// <summary>
-        /// Serialize this style model.
-        /// </summary>
-        /// <returns>Serialized style model as string.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when the version of the style model is unknown.</exception>
-        public string Serialize()
-        {
-            string prefix;
-            switch (this)
-            {
-                case StyleModelV1:
-                    prefix = StyleModelV1.SerializedPrefix;
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
+    /// <summary>
+    /// Push a style color.
+    /// </summary>
+    /// <param name="color">Color kind.</param>
+    /// <param name="value">Color value.</param>
+    protected void PushColorHelper(ImGuiCol color, Vector4 value)
+    {
+        ImGui.PushStyleColor(color, value);
 
-            return prefix + Convert.ToBase64String(Util.CompressString(JsonConvert.SerializeObject(this)));
-        }
+        if (!hasPushedOnce)
+            numPushedColors++;
+    }
 
-        /// <summary>
-        /// Apply this style model to ImGui.
-        /// </summary>
-        public abstract void Apply();
-
-        /// <summary>
-        /// Push this StyleModel into the ImGui style/color stack.
-        /// </summary>
-        public abstract void Push();
-
-        /// <summary>
-        /// Pop this style model from the ImGui style/color stack.
-        /// </summary>
-        public void Pop()
-        {
-            if (!hasPushedOnce)
-                throw new InvalidOperationException("Wasn't pushed at least once.");
-
-            ImGui.PopStyleVar(numPushedStyles);
-            ImGui.PopStyleColor(numPushedColors);
-        }
-
-        /// <summary>
-        /// Push a style var.
-        /// </summary>
-        /// <param name="style">Style kind.</param>
-        /// <param name="arg">Style var.</param>
-        protected void PushStyleHelper(ImGuiStyleVar style, float arg)
-        {
-            ImGui.PushStyleVar(style, arg);
-
-            if (!hasPushedOnce)
-                numPushedStyles++;
-        }
-
-        /// <summary>
-        /// Push a style var.
-        /// </summary>
-        /// <param name="style">Style kind.</param>
-        /// <param name="arg">Style var.</param>
-        protected void PushStyleHelper(ImGuiStyleVar style, Vector2 arg)
-        {
-            ImGui.PushStyleVar(style, arg);
-
-            if (!hasPushedOnce)
-                numPushedStyles++;
-        }
-
-        /// <summary>
-        /// Push a style color.
-        /// </summary>
-        /// <param name="color">Color kind.</param>
-        /// <param name="value">Color value.</param>
-        protected void PushColorHelper(ImGuiCol color, Vector4 value)
-        {
-            ImGui.PushStyleColor(color, value);
-
-            if (!hasPushedOnce)
-                numPushedColors++;
-        }
-
-        /// <summary>
-        /// Indicate that you have pushed.
-        /// </summary>
-        protected void DonePushing()
-        {
-            hasPushedOnce = true;
-        }
+    /// <summary>
+    /// Indicate that you have pushed.
+    /// </summary>
+    protected void DonePushing()
+    {
+        hasPushedOnce = true;
     }
 }
diff --git a/Dalamud/Interface/Style/StyleModelV1.cs b/Dalamud/Interface/Style/StyleModelV1.cs
index 54aff8f84..ee6bb06a4 100644
--- a/Dalamud/Interface/Style/StyleModelV1.cs
+++ b/Dalamud/Interface/Style/StyleModelV1.cs
@@ -6,522 +6,521 @@ using Dalamud.Interface.Colors;
 using ImGuiNET;
 using Newtonsoft.Json;
 
-namespace Dalamud.Interface.Style
+namespace Dalamud.Interface.Style;
+
+/// <summary>
+/// Version one of the Dalamud style model.
+/// </summary>
+public class StyleModelV1 : StyleModel
 {
     /// <summary>
-    /// Version one of the Dalamud style model.
+    /// Initializes a new instance of the <see cref="StyleModelV1"/> class.
     /// </summary>
-    public class StyleModelV1 : StyleModel
+    private StyleModelV1()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StyleModelV1"/> class.
-        /// </summary>
-        private StyleModelV1()
+        this.Colors = new Dictionary<string, Vector4>();
+        this.Name = "Unknown";
+    }
+
+    /// <summary>
+    /// Gets the standard Dalamud look.
+    /// </summary>
+    public static StyleModelV1 DalamudStandard => new()
+    {
+        Name = "Dalamud Standard",
+
+        Alpha = 1,
+        WindowPadding = new Vector2(8, 8),
+        WindowRounding = 4,
+        WindowBorderSize = 0,
+        WindowTitleAlign = new Vector2(0, 0.5f),
+        WindowMenuButtonPosition = ImGuiDir.Right,
+        ChildRounding = 0,
+        ChildBorderSize = 1,
+        PopupRounding = 0,
+        PopupBorderSize = 0,
+        FramePadding = new Vector2(4, 3),
+        FrameRounding = 4,
+        FrameBorderSize = 0,
+        ItemSpacing = new Vector2(8, 4),
+        ItemInnerSpacing = new Vector2(4, 4),
+        CellPadding = new Vector2(4, 2),
+        TouchExtraPadding = new Vector2(0, 0),
+        IndentSpacing = 21,
+        ScrollbarSize = 16,
+        ScrollbarRounding = 9,
+        GrabMinSize = 13,
+        GrabRounding = 3,
+        LogSliderDeadzone = 4,
+        TabRounding = 4,
+        TabBorderSize = 0,
+        ButtonTextAlign = new Vector2(0.5f, 0.5f),
+        SelectableTextAlign = new Vector2(0, 0),
+        DisplaySafeAreaPadding = new Vector2(3, 3),
+
+        Colors = new Dictionary<string, Vector4>
         {
-            this.Colors = new Dictionary<string, Vector4>();
-            this.Name = "Unknown";
-        }
+            { "Text", new Vector4(1, 1, 1, 1) },
+            { "TextDisabled", new Vector4(0.5f, 0.5f, 0.5f, 1) },
+            { "WindowBg", new Vector4(0.06f, 0.06f, 0.06f, 0.93f) },
+            { "ChildBg", new Vector4(0, 0, 0, 0) },
+            { "PopupBg", new Vector4(0.08f, 0.08f, 0.08f, 0.94f) },
+            { "Border", new Vector4(0.43f, 0.43f, 0.5f, 0.5f) },
+            { "BorderShadow", new Vector4(0, 0, 0, 0) },
+            { "FrameBg", new Vector4(0.29f, 0.29f, 0.29f, 0.54f) },
+            { "FrameBgHovered", new Vector4(0.54f, 0.54f, 0.54f, 0.4f) },
+            { "FrameBgActive", new Vector4(0.64f, 0.64f, 0.64f, 0.67f) },
+            { "TitleBg", new Vector4(0.022624433f, 0.022624206f, 0.022624206f, 0.85067874f) },
+            { "TitleBgActive", new Vector4(0.38914025f, 0.10917056f, 0.10917056f, 0.8280543f) },
+            { "TitleBgCollapsed", new Vector4(0, 0, 0, 0.51f) },
+            { "MenuBarBg", new Vector4(0.14f, 0.14f, 0.14f, 1) },
+            { "ScrollbarBg", new Vector4(0, 0, 0, 0) },
+            { "ScrollbarGrab", new Vector4(0.31f, 0.31f, 0.31f, 1) },
+            { "ScrollbarGrabHovered", new Vector4(0.41f, 0.41f, 0.41f, 1) },
+            { "ScrollbarGrabActive", new Vector4(0.51f, 0.51f, 0.51f, 1) },
+            { "CheckMark", new Vector4(0.86f, 0.86f, 0.86f, 1) },
+            { "SliderGrab", new Vector4(0.54f, 0.54f, 0.54f, 1) },
+            { "SliderGrabActive", new Vector4(0.67f, 0.67f, 0.67f, 1) },
+            { "Button", new Vector4(0.71f, 0.71f, 0.71f, 0.4f) },
+            { "ButtonHovered", new Vector4(0.3647059f, 0.078431375f, 0.078431375f, 0.94509804f) },
+            { "ButtonActive", new Vector4(0.48416287f, 0.10077597f, 0.10077597f, 0.94509804f) },
+            { "Header", new Vector4(0.59f, 0.59f, 0.59f, 0.31f) },
+            { "HeaderHovered", new Vector4(0.5f, 0.5f, 0.5f, 0.8f) },
+            { "HeaderActive", new Vector4(0.6f, 0.6f, 0.6f, 1) },
+            { "Separator", new Vector4(0.43f, 0.43f, 0.5f, 0.5f) },
+            { "SeparatorHovered", new Vector4(0.3647059f, 0.078431375f, 0.078431375f, 0.78280544f) },
+            { "SeparatorActive", new Vector4(0.3647059f, 0.078431375f, 0.078431375f, 0.94509804f) },
+            { "ResizeGrip", new Vector4(0.79f, 0.79f, 0.79f, 0.25f) },
+            { "ResizeGripHovered", new Vector4(0.78f, 0.78f, 0.78f, 0.67f) },
+            { "ResizeGripActive", new Vector4(0.3647059f, 0.078431375f, 0.078431375f, 0.94509804f) },
+            { "Tab", new Vector4(0.23f, 0.23f, 0.23f, 0.86f) },
+            { "TabHovered", new Vector4(0.58371043f, 0.30374074f, 0.30374074f, 0.7647059f) },
+            { "TabActive", new Vector4(0.47963798f, 0.15843244f, 0.15843244f, 0.7647059f) },
+            { "TabUnfocused", new Vector4(0.068f, 0.10199998f, 0.14800003f, 0.9724f) },
+            { "TabUnfocusedActive", new Vector4(0.13599998f, 0.26199996f, 0.424f, 1) },
+            { "DockingPreview", new Vector4(0.26f, 0.59f, 0.98f, 0.7f) },
+            { "DockingEmptyBg", new Vector4(0.2f, 0.2f, 0.2f, 1) },
+            { "PlotLines", new Vector4(0.61f, 0.61f, 0.61f, 1) },
+            { "PlotLinesHovered", new Vector4(1, 0.43f, 0.35f, 1) },
+            { "PlotHistogram", new Vector4(0.9f, 0.7f, 0, 1) },
+            { "PlotHistogramHovered", new Vector4(1, 0.6f, 0, 1) },
+            { "TableHeaderBg", new Vector4(0.19f, 0.19f, 0.2f, 1) },
+            { "TableBorderStrong", new Vector4(0.31f, 0.31f, 0.35f, 1) },
+            { "TableBorderLight", new Vector4(0.23f, 0.23f, 0.25f, 1) },
+            { "TableRowBg", new Vector4(0, 0, 0, 0) },
+            { "TableRowBgAlt", new Vector4(1, 1, 1, 0.06f) },
+            { "TextSelectedBg", new Vector4(0.26f, 0.59f, 0.98f, 0.35f) },
+            { "DragDropTarget", new Vector4(1, 1, 0, 0.9f) },
+            { "NavHighlight", new Vector4(0.26f, 0.59f, 0.98f, 1) },
+            { "NavWindowingHighlight", new Vector4(1, 1, 1, 0.7f) },
+            { "NavWindowingDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.2f) },
+            { "ModalWindowDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.35f) },
+        },
 
-        /// <summary>
-        /// Gets the standard Dalamud look.
-        /// </summary>
-        public static StyleModelV1 DalamudStandard => new()
+        BuiltInColors = new DalamudColors
         {
-            Name = "Dalamud Standard",
+            DalamudRed = new Vector4(1f, 0f, 0f, 1f),
+            DalamudGrey = new Vector4(0.7f, 0.7f, 0.7f, 1f),
+            DalamudGrey2 = new Vector4(0.7f, 0.7f, 0.7f, 1f),
+            DalamudGrey3 = new Vector4(0.5f, 0.5f, 0.5f, 1f),
+            DalamudWhite = new Vector4(1f, 1f, 1f, 1f),
+            DalamudWhite2 = new Vector4(0.878f, 0.878f, 0.878f, 1f),
+            DalamudOrange = new Vector4(1f, 0.709f, 0f, 1f),
+            DalamudYellow = new Vector4(1f, 1f, .4f, 1f),
+            DalamudViolet = new Vector4(0.770f, 0.700f, 0.965f, 1.000f),
+            TankBlue = new Vector4(0f, 0.6f, 1f, 1f),
+            HealerGreen = new Vector4(0f, 0.8f, 0.1333333f, 1f),
+            DPSRed = new Vector4(0.7058824f, 0f, 0f, 1f),
+            ParsedGrey = new Vector4(0.4f, 0.4f, 0.4f, 1f),
+            ParsedGreen = new Vector4(0.117f, 1f, 0f, 1f),
+            ParsedBlue = new Vector4(0f, 0.439f, 1f, 1f),
+            ParsedPurple = new Vector4(0.639f, 0.207f, 0.933f, 1f),
+            ParsedOrange = new Vector4(1f, 0.501f, 0f, 1f),
+            ParsedPink = new Vector4(0.886f, 0.407f, 0.658f, 1f),
+            ParsedGold = new Vector4(0.898f, 0.8f, 0.501f, 1f),
+        },
+    };
 
-            Alpha = 1,
-            WindowPadding = new Vector2(8, 8),
-            WindowRounding = 4,
-            WindowBorderSize = 0,
-            WindowTitleAlign = new Vector2(0, 0.5f),
-            WindowMenuButtonPosition = ImGuiDir.Right,
-            ChildRounding = 0,
-            ChildBorderSize = 1,
-            PopupRounding = 0,
-            PopupBorderSize = 0,
-            FramePadding = new Vector2(4, 3),
-            FrameRounding = 4,
-            FrameBorderSize = 0,
-            ItemSpacing = new Vector2(8, 4),
-            ItemInnerSpacing = new Vector2(4, 4),
-            CellPadding = new Vector2(4, 2),
-            TouchExtraPadding = new Vector2(0, 0),
-            IndentSpacing = 21,
-            ScrollbarSize = 16,
-            ScrollbarRounding = 9,
-            GrabMinSize = 13,
-            GrabRounding = 3,
-            LogSliderDeadzone = 4,
-            TabRounding = 4,
-            TabBorderSize = 0,
-            ButtonTextAlign = new Vector2(0.5f, 0.5f),
-            SelectableTextAlign = new Vector2(0, 0),
-            DisplaySafeAreaPadding = new Vector2(3, 3),
+    /// <summary>
+    /// Gets the standard Dalamud look.
+    /// </summary>
+    public static StyleModelV1 DalamudClassic => new()
+    {
+        Name = "Dalamud Classic",
 
-            Colors = new Dictionary<string, Vector4>
-            {
-                { "Text", new Vector4(1, 1, 1, 1) },
-                { "TextDisabled", new Vector4(0.5f, 0.5f, 0.5f, 1) },
-                { "WindowBg", new Vector4(0.06f, 0.06f, 0.06f, 0.93f) },
-                { "ChildBg", new Vector4(0, 0, 0, 0) },
-                { "PopupBg", new Vector4(0.08f, 0.08f, 0.08f, 0.94f) },
-                { "Border", new Vector4(0.43f, 0.43f, 0.5f, 0.5f) },
-                { "BorderShadow", new Vector4(0, 0, 0, 0) },
-                { "FrameBg", new Vector4(0.29f, 0.29f, 0.29f, 0.54f) },
-                { "FrameBgHovered", new Vector4(0.54f, 0.54f, 0.54f, 0.4f) },
-                { "FrameBgActive", new Vector4(0.64f, 0.64f, 0.64f, 0.67f) },
-                { "TitleBg", new Vector4(0.022624433f, 0.022624206f, 0.022624206f, 0.85067874f) },
-                { "TitleBgActive", new Vector4(0.38914025f, 0.10917056f, 0.10917056f, 0.8280543f) },
-                { "TitleBgCollapsed", new Vector4(0, 0, 0, 0.51f) },
-                { "MenuBarBg", new Vector4(0.14f, 0.14f, 0.14f, 1) },
-                { "ScrollbarBg", new Vector4(0, 0, 0, 0) },
-                { "ScrollbarGrab", new Vector4(0.31f, 0.31f, 0.31f, 1) },
-                { "ScrollbarGrabHovered", new Vector4(0.41f, 0.41f, 0.41f, 1) },
-                { "ScrollbarGrabActive", new Vector4(0.51f, 0.51f, 0.51f, 1) },
-                { "CheckMark", new Vector4(0.86f, 0.86f, 0.86f, 1) },
-                { "SliderGrab", new Vector4(0.54f, 0.54f, 0.54f, 1) },
-                { "SliderGrabActive", new Vector4(0.67f, 0.67f, 0.67f, 1) },
-                { "Button", new Vector4(0.71f, 0.71f, 0.71f, 0.4f) },
-                { "ButtonHovered", new Vector4(0.3647059f, 0.078431375f, 0.078431375f, 0.94509804f) },
-                { "ButtonActive", new Vector4(0.48416287f, 0.10077597f, 0.10077597f, 0.94509804f) },
-                { "Header", new Vector4(0.59f, 0.59f, 0.59f, 0.31f) },
-                { "HeaderHovered", new Vector4(0.5f, 0.5f, 0.5f, 0.8f) },
-                { "HeaderActive", new Vector4(0.6f, 0.6f, 0.6f, 1) },
-                { "Separator", new Vector4(0.43f, 0.43f, 0.5f, 0.5f) },
-                { "SeparatorHovered", new Vector4(0.3647059f, 0.078431375f, 0.078431375f, 0.78280544f) },
-                { "SeparatorActive", new Vector4(0.3647059f, 0.078431375f, 0.078431375f, 0.94509804f) },
-                { "ResizeGrip", new Vector4(0.79f, 0.79f, 0.79f, 0.25f) },
-                { "ResizeGripHovered", new Vector4(0.78f, 0.78f, 0.78f, 0.67f) },
-                { "ResizeGripActive", new Vector4(0.3647059f, 0.078431375f, 0.078431375f, 0.94509804f) },
-                { "Tab", new Vector4(0.23f, 0.23f, 0.23f, 0.86f) },
-                { "TabHovered", new Vector4(0.58371043f, 0.30374074f, 0.30374074f, 0.7647059f) },
-                { "TabActive", new Vector4(0.47963798f, 0.15843244f, 0.15843244f, 0.7647059f) },
-                { "TabUnfocused", new Vector4(0.068f, 0.10199998f, 0.14800003f, 0.9724f) },
-                { "TabUnfocusedActive", new Vector4(0.13599998f, 0.26199996f, 0.424f, 1) },
-                { "DockingPreview", new Vector4(0.26f, 0.59f, 0.98f, 0.7f) },
-                { "DockingEmptyBg", new Vector4(0.2f, 0.2f, 0.2f, 1) },
-                { "PlotLines", new Vector4(0.61f, 0.61f, 0.61f, 1) },
-                { "PlotLinesHovered", new Vector4(1, 0.43f, 0.35f, 1) },
-                { "PlotHistogram", new Vector4(0.9f, 0.7f, 0, 1) },
-                { "PlotHistogramHovered", new Vector4(1, 0.6f, 0, 1) },
-                { "TableHeaderBg", new Vector4(0.19f, 0.19f, 0.2f, 1) },
-                { "TableBorderStrong", new Vector4(0.31f, 0.31f, 0.35f, 1) },
-                { "TableBorderLight", new Vector4(0.23f, 0.23f, 0.25f, 1) },
-                { "TableRowBg", new Vector4(0, 0, 0, 0) },
-                { "TableRowBgAlt", new Vector4(1, 1, 1, 0.06f) },
-                { "TextSelectedBg", new Vector4(0.26f, 0.59f, 0.98f, 0.35f) },
-                { "DragDropTarget", new Vector4(1, 1, 0, 0.9f) },
-                { "NavHighlight", new Vector4(0.26f, 0.59f, 0.98f, 1) },
-                { "NavWindowingHighlight", new Vector4(1, 1, 1, 0.7f) },
-                { "NavWindowingDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.2f) },
-                { "ModalWindowDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.35f) },
-            },
+        Alpha = 1,
+        WindowPadding = new Vector2(8, 8),
+        WindowRounding = 4,
+        WindowBorderSize = 0,
+        WindowTitleAlign = new Vector2(0, 0.5f),
+        WindowMenuButtonPosition = ImGuiDir.Right,
+        ChildRounding = 0,
+        ChildBorderSize = 1,
+        PopupRounding = 0,
+        PopupBorderSize = 0,
+        FramePadding = new Vector2(4, 3),
+        FrameRounding = 4,
+        FrameBorderSize = 0,
+        ItemSpacing = new Vector2(8, 4),
+        ItemInnerSpacing = new Vector2(4, 4),
+        CellPadding = new Vector2(4, 2),
+        TouchExtraPadding = new Vector2(0, 0),
+        IndentSpacing = 21,
+        ScrollbarSize = 16,
+        ScrollbarRounding = 9,
+        GrabMinSize = 10,
+        GrabRounding = 3,
+        LogSliderDeadzone = 4,
+        TabRounding = 4,
+        TabBorderSize = 0,
+        ButtonTextAlign = new Vector2(0.5f, 0.5f),
+        SelectableTextAlign = new Vector2(0, 0),
+        DisplaySafeAreaPadding = new Vector2(3, 3),
 
-            BuiltInColors = new DalamudColors
-            {
-                DalamudRed = new Vector4(1f, 0f, 0f, 1f),
-                DalamudGrey = new Vector4(0.7f, 0.7f, 0.7f, 1f),
-                DalamudGrey2 = new Vector4(0.7f, 0.7f, 0.7f, 1f),
-                DalamudGrey3 = new Vector4(0.5f, 0.5f, 0.5f, 1f),
-                DalamudWhite = new Vector4(1f, 1f, 1f, 1f),
-                DalamudWhite2 = new Vector4(0.878f, 0.878f, 0.878f, 1f),
-                DalamudOrange = new Vector4(1f, 0.709f, 0f, 1f),
-                DalamudYellow = new Vector4(1f, 1f, .4f, 1f),
-                DalamudViolet = new Vector4(0.770f, 0.700f, 0.965f, 1.000f),
-                TankBlue = new Vector4(0f, 0.6f, 1f, 1f),
-                HealerGreen = new Vector4(0f, 0.8f, 0.1333333f, 1f),
-                DPSRed = new Vector4(0.7058824f, 0f, 0f, 1f),
-                ParsedGrey = new Vector4(0.4f, 0.4f, 0.4f, 1f),
-                ParsedGreen = new Vector4(0.117f, 1f, 0f, 1f),
-                ParsedBlue = new Vector4(0f, 0.439f, 1f, 1f),
-                ParsedPurple = new Vector4(0.639f, 0.207f, 0.933f, 1f),
-                ParsedOrange = new Vector4(1f, 0.501f, 0f, 1f),
-                ParsedPink = new Vector4(0.886f, 0.407f, 0.658f, 1f),
-                ParsedGold = new Vector4(0.898f, 0.8f, 0.501f, 1f),
-            },
-        };
-
-        /// <summary>
-        /// Gets the standard Dalamud look.
-        /// </summary>
-        public static StyleModelV1 DalamudClassic => new()
+        Colors = new Dictionary<string, Vector4>
         {
-            Name = "Dalamud Classic",
+            { "Text", new Vector4(1f, 1f, 1f, 1f) },
+            { "TextDisabled", new Vector4(0.5f, 0.5f, 0.5f, 1f) },
+            { "WindowBg", new Vector4(0.06f, 0.06f, 0.06f, 0.87f) },
+            { "ChildBg", new Vector4(0f, 0f, 0f, 0f) },
+            { "PopupBg", new Vector4(0.08f, 0.08f, 0.08f, 0.94f) },
+            { "Border", new Vector4(0.43f, 0.43f, 0.5f, 0.5f) },
+            { "BorderShadow", new Vector4(0f, 0f, 0f, 0f) },
+            { "FrameBg", new Vector4(0.29f, 0.29f, 0.29f, 0.54f) },
+            { "FrameBgHovered", new Vector4(0.54f, 0.54f, 0.54f, 0.4f) },
+            { "FrameBgActive", new Vector4(0.64f, 0.64f, 0.64f, 0.67f) },
+            { "TitleBg", new Vector4(0.04f, 0.04f, 0.04f, 1f) },
+            { "TitleBgActive", new Vector4(0.29f, 0.29f, 0.29f, 1f) },
+            { "TitleBgCollapsed", new Vector4(0f, 0f, 0f, 0.51f) },
+            { "MenuBarBg", new Vector4(0.14f, 0.14f, 0.14f, 1f) },
+            { "ScrollbarBg", new Vector4(0f, 0f, 0f, 0f) },
+            { "ScrollbarGrab", new Vector4(0.31f, 0.31f, 0.31f, 1f) },
+            { "ScrollbarGrabHovered", new Vector4(0.41f, 0.41f, 0.41f, 1f) },
+            { "ScrollbarGrabActive", new Vector4(0.51f, 0.51f, 0.51f, 1f) },
+            { "CheckMark", new Vector4(0.86f, 0.86f, 0.86f, 1f) },
+            { "SliderGrab", new Vector4(0.54f, 0.54f, 0.54f, 1f) },
+            { "SliderGrabActive", new Vector4(0.67f, 0.67f, 0.67f, 1f) },
+            { "Button", new Vector4(0.71f, 0.71f, 0.71f, 0.4f) },
+            { "ButtonHovered", new Vector4(0.47f, 0.47f, 0.47f, 1f) },
+            { "ButtonActive", new Vector4(0.74f, 0.74f, 0.74f, 1f) },
+            { "Header", new Vector4(0.59f, 0.59f, 0.59f, 0.31f) },
+            { "HeaderHovered", new Vector4(0.5f, 0.5f, 0.5f, 0.8f) },
+            { "HeaderActive", new Vector4(0.6f, 0.6f, 0.6f, 1f) },
+            { "Separator", new Vector4(0.43f, 0.43f, 0.5f, 0.5f) },
+            { "SeparatorHovered", new Vector4(0.1f, 0.4f, 0.75f, 0.78f) },
+            { "SeparatorActive", new Vector4(0.1f, 0.4f, 0.75f, 1f) },
+            { "ResizeGrip", new Vector4(0.79f, 0.79f, 0.79f, 0.25f) },
+            { "ResizeGripHovered", new Vector4(0.78f, 0.78f, 0.78f, 0.67f) },
+            { "ResizeGripActive", new Vector4(0.88f, 0.88f, 0.88f, 0.95f) },
+            { "Tab", new Vector4(0.23f, 0.23f, 0.23f, 0.86f) },
+            { "TabHovered", new Vector4(0.71f, 0.71f, 0.71f, 0.8f) },
+            { "TabActive", new Vector4(0.36f, 0.36f, 0.36f, 1f) },
+            { "TabUnfocused", new Vector4(0.068f, 0.10199998f, 0.14800003f, 0.9724f) },
+            { "TabUnfocusedActive", new Vector4(0.13599998f, 0.26199996f, 0.424f, 1f) },
+            { "DockingPreview", new Vector4(0.26f, 0.59f, 0.98f, 0.7f) },
+            { "DockingEmptyBg", new Vector4(0.2f, 0.2f, 0.2f, 1f) },
+            { "PlotLines", new Vector4(0.61f, 0.61f, 0.61f, 1f) },
+            { "PlotLinesHovered", new Vector4(1f, 0.43f, 0.35f, 1f) },
+            { "PlotHistogram", new Vector4(0.9f, 0.7f, 0f, 1f) },
+            { "PlotHistogramHovered", new Vector4(1f, 0.6f, 0f, 1f) },
+            { "TableHeaderBg", new Vector4(0.19f, 0.19f, 0.2f, 1f) },
+            { "TableBorderStrong", new Vector4(0.31f, 0.31f, 0.35f, 1f) },
+            { "TableBorderLight", new Vector4(0.23f, 0.23f, 0.25f, 1f) },
+            { "TableRowBg", new Vector4(0f, 0f, 0f, 0f) },
+            { "TableRowBgAlt", new Vector4(1f, 1f, 1f, 0.06f) },
+            { "TextSelectedBg", new Vector4(0.26f, 0.59f, 0.98f, 0.35f) },
+            { "DragDropTarget", new Vector4(1f, 1f, 0f, 0.9f) },
+            { "NavHighlight", new Vector4(0.26f, 0.59f, 0.98f, 1f) },
+            { "NavWindowingHighlight", new Vector4(1f, 1f, 1f, 0.7f) },
+            { "NavWindowingDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.2f) },
+            { "ModalWindowDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.35f) },
+        },
 
-            Alpha = 1,
-            WindowPadding = new Vector2(8, 8),
-            WindowRounding = 4,
-            WindowBorderSize = 0,
-            WindowTitleAlign = new Vector2(0, 0.5f),
-            WindowMenuButtonPosition = ImGuiDir.Right,
-            ChildRounding = 0,
-            ChildBorderSize = 1,
-            PopupRounding = 0,
-            PopupBorderSize = 0,
-            FramePadding = new Vector2(4, 3),
-            FrameRounding = 4,
-            FrameBorderSize = 0,
-            ItemSpacing = new Vector2(8, 4),
-            ItemInnerSpacing = new Vector2(4, 4),
-            CellPadding = new Vector2(4, 2),
-            TouchExtraPadding = new Vector2(0, 0),
-            IndentSpacing = 21,
-            ScrollbarSize = 16,
-            ScrollbarRounding = 9,
-            GrabMinSize = 10,
-            GrabRounding = 3,
-            LogSliderDeadzone = 4,
-            TabRounding = 4,
-            TabBorderSize = 0,
-            ButtonTextAlign = new Vector2(0.5f, 0.5f),
-            SelectableTextAlign = new Vector2(0, 0),
-            DisplaySafeAreaPadding = new Vector2(3, 3),
+        BuiltInColors = new DalamudColors
+        {
+            DalamudRed = new Vector4(1f, 0f, 0f, 1f),
+            DalamudGrey = new Vector4(0.7f, 0.7f, 0.7f, 1f),
+            DalamudGrey2 = new Vector4(0.7f, 0.7f, 0.7f, 1f),
+            DalamudGrey3 = new Vector4(0.5f, 0.5f, 0.5f, 1f),
+            DalamudWhite = new Vector4(1f, 1f, 1f, 1f),
+            DalamudWhite2 = new Vector4(0.878f, 0.878f, 0.878f, 1f),
+            DalamudOrange = new Vector4(1f, 0.709f, 0f, 1f),
+            DalamudYellow = new Vector4(1f, 1f, .4f, 1f),
+            DalamudViolet = new Vector4(0.770f, 0.700f, 0.965f, 1.000f),
+            TankBlue = new Vector4(0f, 0.6f, 1f, 1f),
+            HealerGreen = new Vector4(0f, 0.8f, 0.1333333f, 1f),
+            DPSRed = new Vector4(0.7058824f, 0f, 0f, 1f),
+            ParsedGrey = new Vector4(0.4f, 0.4f, 0.4f, 1f),
+            ParsedGreen = new Vector4(0.117f, 1f, 0f, 1f),
+            ParsedBlue = new Vector4(0f, 0.439f, 1f, 1f),
+            ParsedPurple = new Vector4(0.639f, 0.207f, 0.933f, 1f),
+            ParsedOrange = new Vector4(1f, 0.501f, 0f, 1f),
+            ParsedPink = new Vector4(0.886f, 0.407f, 0.658f, 1f),
+            ParsedGold = new Vector4(0.898f, 0.8f, 0.501f, 1f),
+        },
+    };
 
-            Colors = new Dictionary<string, Vector4>
-            {
-                { "Text", new Vector4(1f, 1f, 1f, 1f) },
-                { "TextDisabled", new Vector4(0.5f, 0.5f, 0.5f, 1f) },
-                { "WindowBg", new Vector4(0.06f, 0.06f, 0.06f, 0.87f) },
-                { "ChildBg", new Vector4(0f, 0f, 0f, 0f) },
-                { "PopupBg", new Vector4(0.08f, 0.08f, 0.08f, 0.94f) },
-                { "Border", new Vector4(0.43f, 0.43f, 0.5f, 0.5f) },
-                { "BorderShadow", new Vector4(0f, 0f, 0f, 0f) },
-                { "FrameBg", new Vector4(0.29f, 0.29f, 0.29f, 0.54f) },
-                { "FrameBgHovered", new Vector4(0.54f, 0.54f, 0.54f, 0.4f) },
-                { "FrameBgActive", new Vector4(0.64f, 0.64f, 0.64f, 0.67f) },
-                { "TitleBg", new Vector4(0.04f, 0.04f, 0.04f, 1f) },
-                { "TitleBgActive", new Vector4(0.29f, 0.29f, 0.29f, 1f) },
-                { "TitleBgCollapsed", new Vector4(0f, 0f, 0f, 0.51f) },
-                { "MenuBarBg", new Vector4(0.14f, 0.14f, 0.14f, 1f) },
-                { "ScrollbarBg", new Vector4(0f, 0f, 0f, 0f) },
-                { "ScrollbarGrab", new Vector4(0.31f, 0.31f, 0.31f, 1f) },
-                { "ScrollbarGrabHovered", new Vector4(0.41f, 0.41f, 0.41f, 1f) },
-                { "ScrollbarGrabActive", new Vector4(0.51f, 0.51f, 0.51f, 1f) },
-                { "CheckMark", new Vector4(0.86f, 0.86f, 0.86f, 1f) },
-                { "SliderGrab", new Vector4(0.54f, 0.54f, 0.54f, 1f) },
-                { "SliderGrabActive", new Vector4(0.67f, 0.67f, 0.67f, 1f) },
-                { "Button", new Vector4(0.71f, 0.71f, 0.71f, 0.4f) },
-                { "ButtonHovered", new Vector4(0.47f, 0.47f, 0.47f, 1f) },
-                { "ButtonActive", new Vector4(0.74f, 0.74f, 0.74f, 1f) },
-                { "Header", new Vector4(0.59f, 0.59f, 0.59f, 0.31f) },
-                { "HeaderHovered", new Vector4(0.5f, 0.5f, 0.5f, 0.8f) },
-                { "HeaderActive", new Vector4(0.6f, 0.6f, 0.6f, 1f) },
-                { "Separator", new Vector4(0.43f, 0.43f, 0.5f, 0.5f) },
-                { "SeparatorHovered", new Vector4(0.1f, 0.4f, 0.75f, 0.78f) },
-                { "SeparatorActive", new Vector4(0.1f, 0.4f, 0.75f, 1f) },
-                { "ResizeGrip", new Vector4(0.79f, 0.79f, 0.79f, 0.25f) },
-                { "ResizeGripHovered", new Vector4(0.78f, 0.78f, 0.78f, 0.67f) },
-                { "ResizeGripActive", new Vector4(0.88f, 0.88f, 0.88f, 0.95f) },
-                { "Tab", new Vector4(0.23f, 0.23f, 0.23f, 0.86f) },
-                { "TabHovered", new Vector4(0.71f, 0.71f, 0.71f, 0.8f) },
-                { "TabActive", new Vector4(0.36f, 0.36f, 0.36f, 1f) },
-                { "TabUnfocused", new Vector4(0.068f, 0.10199998f, 0.14800003f, 0.9724f) },
-                { "TabUnfocusedActive", new Vector4(0.13599998f, 0.26199996f, 0.424f, 1f) },
-                { "DockingPreview", new Vector4(0.26f, 0.59f, 0.98f, 0.7f) },
-                { "DockingEmptyBg", new Vector4(0.2f, 0.2f, 0.2f, 1f) },
-                { "PlotLines", new Vector4(0.61f, 0.61f, 0.61f, 1f) },
-                { "PlotLinesHovered", new Vector4(1f, 0.43f, 0.35f, 1f) },
-                { "PlotHistogram", new Vector4(0.9f, 0.7f, 0f, 1f) },
-                { "PlotHistogramHovered", new Vector4(1f, 0.6f, 0f, 1f) },
-                { "TableHeaderBg", new Vector4(0.19f, 0.19f, 0.2f, 1f) },
-                { "TableBorderStrong", new Vector4(0.31f, 0.31f, 0.35f, 1f) },
-                { "TableBorderLight", new Vector4(0.23f, 0.23f, 0.25f, 1f) },
-                { "TableRowBg", new Vector4(0f, 0f, 0f, 0f) },
-                { "TableRowBgAlt", new Vector4(1f, 1f, 1f, 0.06f) },
-                { "TextSelectedBg", new Vector4(0.26f, 0.59f, 0.98f, 0.35f) },
-                { "DragDropTarget", new Vector4(1f, 1f, 0f, 0.9f) },
-                { "NavHighlight", new Vector4(0.26f, 0.59f, 0.98f, 1f) },
-                { "NavWindowingHighlight", new Vector4(1f, 1f, 1f, 0.7f) },
-                { "NavWindowingDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.2f) },
-                { "ModalWindowDimBg", new Vector4(0.8f, 0.8f, 0.8f, 0.35f) },
-            },
-
-            BuiltInColors = new DalamudColors
-            {
-                DalamudRed = new Vector4(1f, 0f, 0f, 1f),
-                DalamudGrey = new Vector4(0.7f, 0.7f, 0.7f, 1f),
-                DalamudGrey2 = new Vector4(0.7f, 0.7f, 0.7f, 1f),
-                DalamudGrey3 = new Vector4(0.5f, 0.5f, 0.5f, 1f),
-                DalamudWhite = new Vector4(1f, 1f, 1f, 1f),
-                DalamudWhite2 = new Vector4(0.878f, 0.878f, 0.878f, 1f),
-                DalamudOrange = new Vector4(1f, 0.709f, 0f, 1f),
-                DalamudYellow = new Vector4(1f, 1f, .4f, 1f),
-                DalamudViolet = new Vector4(0.770f, 0.700f, 0.965f, 1.000f),
-                TankBlue = new Vector4(0f, 0.6f, 1f, 1f),
-                HealerGreen = new Vector4(0f, 0.8f, 0.1333333f, 1f),
-                DPSRed = new Vector4(0.7058824f, 0f, 0f, 1f),
-                ParsedGrey = new Vector4(0.4f, 0.4f, 0.4f, 1f),
-                ParsedGreen = new Vector4(0.117f, 1f, 0f, 1f),
-                ParsedBlue = new Vector4(0f, 0.439f, 1f, 1f),
-                ParsedPurple = new Vector4(0.639f, 0.207f, 0.933f, 1f),
-                ParsedOrange = new Vector4(1f, 0.501f, 0f, 1f),
-                ParsedPink = new Vector4(0.886f, 0.407f, 0.658f, 1f),
-                ParsedGold = new Vector4(0.898f, 0.8f, 0.501f, 1f),
-            },
-        };
-
-        /// <summary>
-        /// Gets the version prefix for this version.
-        /// </summary>
-        public static string SerializedPrefix => "DS1";
+    /// <summary>
+    /// Gets the version prefix for this version.
+    /// </summary>
+    public static string SerializedPrefix => "DS1";
 
 #pragma warning disable SA1600
 
-        [JsonProperty("a")]
-        public float Alpha { get; set; }
+    [JsonProperty("a")]
+    public float Alpha { get; set; }
 
-        [JsonProperty("b")]
-        public Vector2 WindowPadding { get; set; }
+    [JsonProperty("b")]
+    public Vector2 WindowPadding { get; set; }
 
-        [JsonProperty("c")]
-        public float WindowRounding { get; set; }
+    [JsonProperty("c")]
+    public float WindowRounding { get; set; }
 
-        [JsonProperty("d")]
-        public float WindowBorderSize { get; set; }
+    [JsonProperty("d")]
+    public float WindowBorderSize { get; set; }
 
-        [JsonProperty("e")]
-        public Vector2 WindowTitleAlign { get; set; }
+    [JsonProperty("e")]
+    public Vector2 WindowTitleAlign { get; set; }
 
-        [JsonProperty("f")]
-        public ImGuiDir WindowMenuButtonPosition { get; set; }
+    [JsonProperty("f")]
+    public ImGuiDir WindowMenuButtonPosition { get; set; }
 
-        [JsonProperty("g")]
-        public float ChildRounding { get; set; }
+    [JsonProperty("g")]
+    public float ChildRounding { get; set; }
 
-        [JsonProperty("h")]
-        public float ChildBorderSize { get; set; }
+    [JsonProperty("h")]
+    public float ChildBorderSize { get; set; }
 
-        [JsonProperty("i")]
-        public float PopupRounding { get; set; }
+    [JsonProperty("i")]
+    public float PopupRounding { get; set; }
 
-        [JsonProperty("ab")]
-        public float PopupBorderSize { get; set; }
+    [JsonProperty("ab")]
+    public float PopupBorderSize { get; set; }
 
-        [JsonProperty("j")]
-        public Vector2 FramePadding { get; set; }
+    [JsonProperty("j")]
+    public Vector2 FramePadding { get; set; }
 
-        [JsonProperty("k")]
-        public float FrameRounding { get; set; }
+    [JsonProperty("k")]
+    public float FrameRounding { get; set; }
 
-        [JsonProperty("l")]
-        public float FrameBorderSize { get; set; }
+    [JsonProperty("l")]
+    public float FrameBorderSize { get; set; }
 
-        [JsonProperty("m")]
-        public Vector2 ItemSpacing { get; set; }
+    [JsonProperty("m")]
+    public Vector2 ItemSpacing { get; set; }
 
-        [JsonProperty("n")]
-        public Vector2 ItemInnerSpacing { get; set; }
+    [JsonProperty("n")]
+    public Vector2 ItemInnerSpacing { get; set; }
 
-        [JsonProperty("o")]
-        public Vector2 CellPadding { get; set; }
+    [JsonProperty("o")]
+    public Vector2 CellPadding { get; set; }
 
-        [JsonProperty("p")]
-        public Vector2 TouchExtraPadding { get; set; }
+    [JsonProperty("p")]
+    public Vector2 TouchExtraPadding { get; set; }
 
-        [JsonProperty("q")]
-        public float IndentSpacing { get; set; }
+    [JsonProperty("q")]
+    public float IndentSpacing { get; set; }
 
-        [JsonProperty("r")]
-        public float ScrollbarSize { get; set; }
+    [JsonProperty("r")]
+    public float ScrollbarSize { get; set; }
 
-        [JsonProperty("s")]
-        public float ScrollbarRounding { get; set; }
+    [JsonProperty("s")]
+    public float ScrollbarRounding { get; set; }
 
-        [JsonProperty("t")]
-        public float GrabMinSize { get; set; }
+    [JsonProperty("t")]
+    public float GrabMinSize { get; set; }
 
-        [JsonProperty("u")]
-        public float GrabRounding { get; set; }
+    [JsonProperty("u")]
+    public float GrabRounding { get; set; }
 
-        [JsonProperty("v")]
-        public float LogSliderDeadzone { get; set; }
+    [JsonProperty("v")]
+    public float LogSliderDeadzone { get; set; }
 
-        [JsonProperty("w")]
-        public float TabRounding { get; set; }
+    [JsonProperty("w")]
+    public float TabRounding { get; set; }
 
-        [JsonProperty("x")]
-        public float TabBorderSize { get; set; }
+    [JsonProperty("x")]
+    public float TabBorderSize { get; set; }
 
-        [JsonProperty("y")]
-        public Vector2 ButtonTextAlign { get; set; }
+    [JsonProperty("y")]
+    public Vector2 ButtonTextAlign { get; set; }
 
-        [JsonProperty("z")]
-        public Vector2 SelectableTextAlign { get; set; }
+    [JsonProperty("z")]
+    public Vector2 SelectableTextAlign { get; set; }
 
-        [JsonProperty("aa")]
-        public Vector2 DisplaySafeAreaPadding { get; set; }
+    [JsonProperty("aa")]
+    public Vector2 DisplaySafeAreaPadding { get; set; }
 
 #pragma warning restore SA1600
 
-        /// <summary>
-        /// Gets or sets a dictionary mapping ImGui color names to colors.
-        /// </summary>
-        [JsonProperty("col")]
-        public Dictionary<string, Vector4> Colors { get; set; }
+    /// <summary>
+    /// Gets or sets a dictionary mapping ImGui color names to colors.
+    /// </summary>
+    [JsonProperty("col")]
+    public Dictionary<string, Vector4> Colors { get; set; }
 
-        /// <summary>
-        /// Get a <see cref="StyleModel"/> instance via ImGui.
-        /// </summary>
-        /// <returns>The newly created <see cref="StyleModel"/> instance.</returns>
-        public static StyleModelV1 Get()
+    /// <summary>
+    /// Get a <see cref="StyleModel"/> instance via ImGui.
+    /// </summary>
+    /// <returns>The newly created <see cref="StyleModel"/> instance.</returns>
+    public static StyleModelV1 Get()
+    {
+        var model = new StyleModelV1();
+        var style = ImGui.GetStyle();
+
+        model.Alpha = style.Alpha;
+        model.WindowPadding = style.WindowPadding;
+        model.WindowRounding = style.WindowRounding;
+        model.WindowBorderSize = style.WindowBorderSize;
+        model.WindowTitleAlign = style.WindowTitleAlign;
+        model.WindowMenuButtonPosition = style.WindowMenuButtonPosition;
+        model.ChildRounding = style.ChildRounding;
+        model.ChildBorderSize = style.ChildBorderSize;
+        model.PopupRounding = style.PopupRounding;
+        model.PopupBorderSize = style.PopupBorderSize;
+        model.FramePadding = style.FramePadding;
+        model.FrameRounding = style.FrameRounding;
+        model.FrameBorderSize = style.FrameBorderSize;
+        model.ItemSpacing = style.ItemSpacing;
+        model.ItemInnerSpacing = style.ItemInnerSpacing;
+        model.CellPadding = style.CellPadding;
+        model.TouchExtraPadding = style.TouchExtraPadding;
+        model.IndentSpacing = style.IndentSpacing;
+        model.ScrollbarSize = style.ScrollbarSize;
+        model.ScrollbarRounding = style.ScrollbarRounding;
+        model.GrabMinSize = style.GrabMinSize;
+        model.GrabRounding = style.GrabRounding;
+        model.LogSliderDeadzone = style.LogSliderDeadzone;
+        model.TabRounding = style.TabRounding;
+        model.TabBorderSize = style.TabBorderSize;
+        model.ButtonTextAlign = style.ButtonTextAlign;
+        model.SelectableTextAlign = style.SelectableTextAlign;
+        model.DisplaySafeAreaPadding = style.DisplaySafeAreaPadding;
+
+        model.Colors = new Dictionary<string, Vector4>();
+
+        foreach (var imGuiCol in Enum.GetValues<ImGuiCol>())
         {
-            var model = new StyleModelV1();
-            var style = ImGui.GetStyle();
-
-            model.Alpha = style.Alpha;
-            model.WindowPadding = style.WindowPadding;
-            model.WindowRounding = style.WindowRounding;
-            model.WindowBorderSize = style.WindowBorderSize;
-            model.WindowTitleAlign = style.WindowTitleAlign;
-            model.WindowMenuButtonPosition = style.WindowMenuButtonPosition;
-            model.ChildRounding = style.ChildRounding;
-            model.ChildBorderSize = style.ChildBorderSize;
-            model.PopupRounding = style.PopupRounding;
-            model.PopupBorderSize = style.PopupBorderSize;
-            model.FramePadding = style.FramePadding;
-            model.FrameRounding = style.FrameRounding;
-            model.FrameBorderSize = style.FrameBorderSize;
-            model.ItemSpacing = style.ItemSpacing;
-            model.ItemInnerSpacing = style.ItemInnerSpacing;
-            model.CellPadding = style.CellPadding;
-            model.TouchExtraPadding = style.TouchExtraPadding;
-            model.IndentSpacing = style.IndentSpacing;
-            model.ScrollbarSize = style.ScrollbarSize;
-            model.ScrollbarRounding = style.ScrollbarRounding;
-            model.GrabMinSize = style.GrabMinSize;
-            model.GrabRounding = style.GrabRounding;
-            model.LogSliderDeadzone = style.LogSliderDeadzone;
-            model.TabRounding = style.TabRounding;
-            model.TabBorderSize = style.TabBorderSize;
-            model.ButtonTextAlign = style.ButtonTextAlign;
-            model.SelectableTextAlign = style.SelectableTextAlign;
-            model.DisplaySafeAreaPadding = style.DisplaySafeAreaPadding;
-
-            model.Colors = new Dictionary<string, Vector4>();
-
-            foreach (var imGuiCol in Enum.GetValues<ImGuiCol>())
+            if (imGuiCol == ImGuiCol.COUNT)
             {
-                if (imGuiCol == ImGuiCol.COUNT)
-                {
-                    continue;
-                }
-
-                model.Colors[imGuiCol.ToString()] = style.Colors[(int)imGuiCol];
+                continue;
             }
 
-            model.BuiltInColors = new DalamudColors
-            {
-                DalamudRed = ImGuiColors.DalamudRed,
-                DalamudGrey = ImGuiColors.DalamudGrey,
-                DalamudGrey2 = ImGuiColors.DalamudGrey2,
-                DalamudGrey3 = ImGuiColors.DalamudGrey3,
-                DalamudWhite = ImGuiColors.DalamudWhite,
-                DalamudWhite2 = ImGuiColors.DalamudWhite2,
-                DalamudOrange = ImGuiColors.DalamudOrange,
-                DalamudYellow = ImGuiColors.DalamudYellow,
-                DalamudViolet = ImGuiColors.DalamudViolet,
-                TankBlue = ImGuiColors.TankBlue,
-                HealerGreen = ImGuiColors.HealerGreen,
-                DPSRed = ImGuiColors.DPSRed,
-                ParsedGrey = ImGuiColors.ParsedGrey,
-                ParsedGreen = ImGuiColors.ParsedGreen,
-                ParsedBlue = ImGuiColors.ParsedBlue,
-                ParsedPurple = ImGuiColors.ParsedPurple,
-                ParsedOrange = ImGuiColors.ParsedOrange,
-                ParsedPink = ImGuiColors.ParsedPink,
-                ParsedGold = ImGuiColors.ParsedGold,
-            };
-
-            return model;
+            model.Colors[imGuiCol.ToString()] = style.Colors[(int)imGuiCol];
         }
 
-        /// <summary>
-        /// Apply this StyleModel via ImGui.
-        /// </summary>
-        public override void Apply()
+        model.BuiltInColors = new DalamudColors
         {
-            var style = ImGui.GetStyle();
+            DalamudRed = ImGuiColors.DalamudRed,
+            DalamudGrey = ImGuiColors.DalamudGrey,
+            DalamudGrey2 = ImGuiColors.DalamudGrey2,
+            DalamudGrey3 = ImGuiColors.DalamudGrey3,
+            DalamudWhite = ImGuiColors.DalamudWhite,
+            DalamudWhite2 = ImGuiColors.DalamudWhite2,
+            DalamudOrange = ImGuiColors.DalamudOrange,
+            DalamudYellow = ImGuiColors.DalamudYellow,
+            DalamudViolet = ImGuiColors.DalamudViolet,
+            TankBlue = ImGuiColors.TankBlue,
+            HealerGreen = ImGuiColors.HealerGreen,
+            DPSRed = ImGuiColors.DPSRed,
+            ParsedGrey = ImGuiColors.ParsedGrey,
+            ParsedGreen = ImGuiColors.ParsedGreen,
+            ParsedBlue = ImGuiColors.ParsedBlue,
+            ParsedPurple = ImGuiColors.ParsedPurple,
+            ParsedOrange = ImGuiColors.ParsedOrange,
+            ParsedPink = ImGuiColors.ParsedPink,
+            ParsedGold = ImGuiColors.ParsedGold,
+        };
 
-            style.Alpha = this.Alpha;
-            style.WindowPadding = this.WindowPadding;
-            style.WindowRounding = this.WindowRounding;
-            style.WindowBorderSize = this.WindowBorderSize;
-            style.WindowTitleAlign = this.WindowTitleAlign;
-            style.WindowMenuButtonPosition = this.WindowMenuButtonPosition;
-            style.ChildRounding = this.ChildRounding;
-            style.ChildBorderSize = this.ChildBorderSize;
-            style.PopupRounding = this.PopupRounding;
-            style.PopupBorderSize = this.PopupBorderSize;
-            style.FramePadding = this.FramePadding;
-            style.FrameRounding = this.FrameRounding;
-            style.FrameBorderSize = this.FrameBorderSize;
-            style.ItemSpacing = this.ItemSpacing;
-            style.ItemInnerSpacing = this.ItemInnerSpacing;
-            style.CellPadding = this.CellPadding;
-            style.TouchExtraPadding = this.TouchExtraPadding;
-            style.IndentSpacing = this.IndentSpacing;
-            style.ScrollbarSize = this.ScrollbarSize;
-            style.ScrollbarRounding = this.ScrollbarRounding;
-            style.GrabMinSize = this.GrabMinSize;
-            style.GrabRounding = this.GrabRounding;
-            style.LogSliderDeadzone = this.LogSliderDeadzone;
-            style.TabRounding = this.TabRounding;
-            style.TabBorderSize = this.TabBorderSize;
-            style.ButtonTextAlign = this.ButtonTextAlign;
-            style.SelectableTextAlign = this.SelectableTextAlign;
-            style.DisplaySafeAreaPadding = this.DisplaySafeAreaPadding;
+        return model;
+    }
 
-            foreach (var imGuiCol in Enum.GetValues<ImGuiCol>())
+    /// <summary>
+    /// Apply this StyleModel via ImGui.
+    /// </summary>
+    public override void Apply()
+    {
+        var style = ImGui.GetStyle();
+
+        style.Alpha = this.Alpha;
+        style.WindowPadding = this.WindowPadding;
+        style.WindowRounding = this.WindowRounding;
+        style.WindowBorderSize = this.WindowBorderSize;
+        style.WindowTitleAlign = this.WindowTitleAlign;
+        style.WindowMenuButtonPosition = this.WindowMenuButtonPosition;
+        style.ChildRounding = this.ChildRounding;
+        style.ChildBorderSize = this.ChildBorderSize;
+        style.PopupRounding = this.PopupRounding;
+        style.PopupBorderSize = this.PopupBorderSize;
+        style.FramePadding = this.FramePadding;
+        style.FrameRounding = this.FrameRounding;
+        style.FrameBorderSize = this.FrameBorderSize;
+        style.ItemSpacing = this.ItemSpacing;
+        style.ItemInnerSpacing = this.ItemInnerSpacing;
+        style.CellPadding = this.CellPadding;
+        style.TouchExtraPadding = this.TouchExtraPadding;
+        style.IndentSpacing = this.IndentSpacing;
+        style.ScrollbarSize = this.ScrollbarSize;
+        style.ScrollbarRounding = this.ScrollbarRounding;
+        style.GrabMinSize = this.GrabMinSize;
+        style.GrabRounding = this.GrabRounding;
+        style.LogSliderDeadzone = this.LogSliderDeadzone;
+        style.TabRounding = this.TabRounding;
+        style.TabBorderSize = this.TabBorderSize;
+        style.ButtonTextAlign = this.ButtonTextAlign;
+        style.SelectableTextAlign = this.SelectableTextAlign;
+        style.DisplaySafeAreaPadding = this.DisplaySafeAreaPadding;
+
+        foreach (var imGuiCol in Enum.GetValues<ImGuiCol>())
+        {
+            if (imGuiCol == ImGuiCol.COUNT)
             {
-                if (imGuiCol == ImGuiCol.COUNT)
-                {
-                    continue;
-                }
-
-                style.Colors[(int)imGuiCol] = this.Colors[imGuiCol.ToString()];
+                continue;
             }
 
-            this.BuiltInColors?.Apply();
+            style.Colors[(int)imGuiCol] = this.Colors[imGuiCol.ToString()];
         }
 
-        /// <inheritdoc/>
-        public override void Push()
+        this.BuiltInColors?.Apply();
+    }
+
+    /// <inheritdoc/>
+    public override void Push()
+    {
+        this.PushStyleHelper(ImGuiStyleVar.Alpha, this.Alpha);
+        this.PushStyleHelper(ImGuiStyleVar.WindowPadding, this.WindowPadding);
+        this.PushStyleHelper(ImGuiStyleVar.WindowRounding, this.WindowRounding);
+        this.PushStyleHelper(ImGuiStyleVar.WindowBorderSize, this.WindowBorderSize);
+        this.PushStyleHelper(ImGuiStyleVar.WindowTitleAlign, this.WindowTitleAlign);
+        this.PushStyleHelper(ImGuiStyleVar.ChildRounding, this.ChildRounding);
+        this.PushStyleHelper(ImGuiStyleVar.ChildBorderSize, this.ChildBorderSize);
+        this.PushStyleHelper(ImGuiStyleVar.PopupRounding, this.PopupRounding);
+        this.PushStyleHelper(ImGuiStyleVar.PopupBorderSize, this.PopupBorderSize);
+        this.PushStyleHelper(ImGuiStyleVar.FramePadding, this.FramePadding);
+        this.PushStyleHelper(ImGuiStyleVar.FrameRounding, this.FrameRounding);
+        this.PushStyleHelper(ImGuiStyleVar.FrameBorderSize, this.FrameBorderSize);
+        this.PushStyleHelper(ImGuiStyleVar.ItemSpacing, this.ItemSpacing);
+        this.PushStyleHelper(ImGuiStyleVar.ItemInnerSpacing, this.ItemInnerSpacing);
+        this.PushStyleHelper(ImGuiStyleVar.CellPadding, this.CellPadding);
+        this.PushStyleHelper(ImGuiStyleVar.IndentSpacing, this.IndentSpacing);
+        this.PushStyleHelper(ImGuiStyleVar.ScrollbarSize, this.ScrollbarSize);
+        this.PushStyleHelper(ImGuiStyleVar.ScrollbarRounding, this.ScrollbarRounding);
+        this.PushStyleHelper(ImGuiStyleVar.GrabMinSize, this.GrabMinSize);
+        this.PushStyleHelper(ImGuiStyleVar.GrabRounding, this.GrabRounding);
+        this.PushStyleHelper(ImGuiStyleVar.TabRounding, this.TabRounding);
+        this.PushStyleHelper(ImGuiStyleVar.ButtonTextAlign, this.ButtonTextAlign);
+        this.PushStyleHelper(ImGuiStyleVar.SelectableTextAlign, this.SelectableTextAlign);
+
+        foreach (var imGuiCol in Enum.GetValues<ImGuiCol>())
         {
-            this.PushStyleHelper(ImGuiStyleVar.Alpha, this.Alpha);
-            this.PushStyleHelper(ImGuiStyleVar.WindowPadding, this.WindowPadding);
-            this.PushStyleHelper(ImGuiStyleVar.WindowRounding, this.WindowRounding);
-            this.PushStyleHelper(ImGuiStyleVar.WindowBorderSize, this.WindowBorderSize);
-            this.PushStyleHelper(ImGuiStyleVar.WindowTitleAlign, this.WindowTitleAlign);
-            this.PushStyleHelper(ImGuiStyleVar.ChildRounding, this.ChildRounding);
-            this.PushStyleHelper(ImGuiStyleVar.ChildBorderSize, this.ChildBorderSize);
-            this.PushStyleHelper(ImGuiStyleVar.PopupRounding, this.PopupRounding);
-            this.PushStyleHelper(ImGuiStyleVar.PopupBorderSize, this.PopupBorderSize);
-            this.PushStyleHelper(ImGuiStyleVar.FramePadding, this.FramePadding);
-            this.PushStyleHelper(ImGuiStyleVar.FrameRounding, this.FrameRounding);
-            this.PushStyleHelper(ImGuiStyleVar.FrameBorderSize, this.FrameBorderSize);
-            this.PushStyleHelper(ImGuiStyleVar.ItemSpacing, this.ItemSpacing);
-            this.PushStyleHelper(ImGuiStyleVar.ItemInnerSpacing, this.ItemInnerSpacing);
-            this.PushStyleHelper(ImGuiStyleVar.CellPadding, this.CellPadding);
-            this.PushStyleHelper(ImGuiStyleVar.IndentSpacing, this.IndentSpacing);
-            this.PushStyleHelper(ImGuiStyleVar.ScrollbarSize, this.ScrollbarSize);
-            this.PushStyleHelper(ImGuiStyleVar.ScrollbarRounding, this.ScrollbarRounding);
-            this.PushStyleHelper(ImGuiStyleVar.GrabMinSize, this.GrabMinSize);
-            this.PushStyleHelper(ImGuiStyleVar.GrabRounding, this.GrabRounding);
-            this.PushStyleHelper(ImGuiStyleVar.TabRounding, this.TabRounding);
-            this.PushStyleHelper(ImGuiStyleVar.ButtonTextAlign, this.ButtonTextAlign);
-            this.PushStyleHelper(ImGuiStyleVar.SelectableTextAlign, this.SelectableTextAlign);
-
-            foreach (var imGuiCol in Enum.GetValues<ImGuiCol>())
+            if (imGuiCol == ImGuiCol.COUNT)
             {
-                if (imGuiCol == ImGuiCol.COUNT)
-                {
-                    continue;
-                }
-
-                this.PushColorHelper(imGuiCol, this.Colors[imGuiCol.ToString()]);
+                continue;
             }
 
-            this.DonePushing();
+            this.PushColorHelper(imGuiCol, this.Colors[imGuiCol.ToString()]);
         }
+
+        this.DonePushing();
     }
 }
diff --git a/Dalamud/Interface/TitleScreenMenu.cs b/Dalamud/Interface/TitleScreenMenu.cs
index 60ab5253e..7b3897fdb 100644
--- a/Dalamud/Interface/TitleScreenMenu.cs
+++ b/Dalamud/Interface/TitleScreenMenu.cs
@@ -7,235 +7,234 @@ using Dalamud.IoC;
 using Dalamud.IoC.Internal;
 using ImGuiScene;
 
-namespace Dalamud.Interface
+namespace Dalamud.Interface;
+
+/// <summary>
+/// Class responsible for managing elements in the title screen menu.
+/// </summary>
+[PluginInterface]
+[InterfaceVersion("1.0")]
+[ServiceManager.BlockingEarlyLoadedService]
+public class TitleScreenMenu : IServiceType
 {
     /// <summary>
-    /// Class responsible for managing elements in the title screen menu.
+    /// Gets the texture size needed for title screen menu logos.
     /// </summary>
-    [PluginInterface]
-    [InterfaceVersion("1.0")]
-    [ServiceManager.BlockingEarlyLoadedService]
-    public class TitleScreenMenu : IServiceType
+    internal const uint TextureSize = 64;
+
+    private readonly List<TitleScreenMenuEntry> entries = new();
+
+    [ServiceManager.ServiceConstructor]
+    private TitleScreenMenu()
     {
-        /// <summary>
-        /// Gets the texture size needed for title screen menu logos.
-        /// </summary>
-        internal const uint TextureSize = 64;
+    }
 
-        private readonly List<TitleScreenMenuEntry> entries = new();
+    /// <summary>
+    /// Gets the list of entries in the title screen menu.
+    /// </summary>
+    public IReadOnlyList<TitleScreenMenuEntry> Entries => this.entries;
 
-        [ServiceManager.ServiceConstructor]
-        private TitleScreenMenu()
+    /// <summary>
+    /// Adds a new entry to the title screen menu.
+    /// </summary>
+    /// <param name="text">The text to show.</param>
+    /// <param name="texture">The texture to show.</param>
+    /// <param name="onTriggered">The action to execute when the option is selected.</param>
+    /// <returns>A <see cref="TitleScreenMenu"/> object that can be used to manage the entry.</returns>
+    /// <exception cref="ArgumentException">Thrown when the texture provided does not match the required resolution(64x64).</exception>
+    public TitleScreenMenuEntry AddEntry(string text, TextureWrap texture, Action onTriggered)
+    {
+        if (texture.Height != TextureSize || texture.Width != TextureSize)
         {
+            throw new ArgumentException("Texture must be 64x64");
         }
 
-        /// <summary>
-        /// Gets the list of entries in the title screen menu.
-        /// </summary>
-        public IReadOnlyList<TitleScreenMenuEntry> Entries => this.entries;
+        lock (this.entries)
+        {
+            var entriesOfAssembly = this.entries.Where(x => x.CallingAssembly == Assembly.GetCallingAssembly()).ToList();
+            var priority = entriesOfAssembly.Any()
+                               ? unchecked(entriesOfAssembly.Select(x => x.Priority).Max() + 1)
+                               : 0;
+            var entry = new TitleScreenMenuEntry(Assembly.GetCallingAssembly(), priority, text, texture, onTriggered);
+            var i = this.entries.BinarySearch(entry);
+            if (i < 0)
+                i = ~i;
+            this.entries.Insert(i, entry);
+            return entry;
+        }
+    }
+
+    /// <summary>
+    /// Adds a new entry to the title screen menu.
+    /// </summary>
+    /// <param name="priority">Priority of the entry.</param>
+    /// <param name="text">The text to show.</param>
+    /// <param name="texture">The texture to show.</param>
+    /// <param name="onTriggered">The action to execute when the option is selected.</param>
+    /// <returns>A <see cref="TitleScreenMenu"/> object that can be used to manage the entry.</returns>
+    /// <exception cref="ArgumentException">Thrown when the texture provided does not match the required resolution(64x64).</exception>
+    public TitleScreenMenuEntry AddEntry(ulong priority, string text, TextureWrap texture, Action onTriggered)
+    {
+        if (texture.Height != TextureSize || texture.Width != TextureSize)
+        {
+            throw new ArgumentException("Texture must be 64x64");
+        }
+
+        lock (this.entries)
+        {
+            var entry = new TitleScreenMenuEntry(Assembly.GetCallingAssembly(), priority, text, texture, onTriggered);
+            var i = this.entries.BinarySearch(entry);
+            if (i < 0)
+                i = ~i;
+            this.entries.Insert(i, entry);
+            return entry;
+        }
+    }
+
+    /// <summary>
+    /// Remove an entry from the title screen menu.
+    /// </summary>
+    /// <param name="entry">The entry to remove.</param>
+    public void RemoveEntry(TitleScreenMenuEntry entry)
+    {
+        lock (this.entries)
+        {
+            this.entries.Remove(entry);
+        }
+    }
+
+    /// <summary>
+    /// Adds a new entry to the title screen menu.
+    /// </summary>
+    /// <param name="priority">Priority of the entry.</param>
+    /// <param name="text">The text to show.</param>
+    /// <param name="texture">The texture to show.</param>
+    /// <param name="onTriggered">The action to execute when the option is selected.</param>
+    /// <returns>A <see cref="TitleScreenMenu"/> object that can be used to manage the entry.</returns>
+    /// <exception cref="ArgumentException">Thrown when the texture provided does not match the required resolution(64x64).</exception>
+    internal TitleScreenMenuEntry AddEntryCore(ulong priority, string text, TextureWrap texture, Action onTriggered)
+    {
+        if (texture.Height != TextureSize || texture.Width != TextureSize)
+        {
+            throw new ArgumentException("Texture must be 64x64");
+        }
+
+        lock (this.entries)
+        {
+            var entry = new TitleScreenMenuEntry(null, priority, text, texture, onTriggered);
+            this.entries.Add(entry);
+            return entry;
+        }
+    }
+
+    /// <summary>
+    /// Adds a new entry to the title screen menu.
+    /// </summary>
+    /// <param name="text">The text to show.</param>
+    /// <param name="texture">The texture to show.</param>
+    /// <param name="onTriggered">The action to execute when the option is selected.</param>
+    /// <returns>A <see cref="TitleScreenMenu"/> object that can be used to manage the entry.</returns>
+    /// <exception cref="ArgumentException">Thrown when the texture provided does not match the required resolution(64x64).</exception>
+    internal TitleScreenMenuEntry AddEntryCore(string text, TextureWrap texture, Action onTriggered)
+    {
+        if (texture.Height != TextureSize || texture.Width != TextureSize)
+        {
+            throw new ArgumentException("Texture must be 64x64");
+        }
+
+        lock (this.entries)
+        {
+            var entriesOfAssembly = this.entries.Where(x => x.CallingAssembly == null).ToList();
+            var priority = entriesOfAssembly.Any()
+                               ? unchecked(entriesOfAssembly.Select(x => x.Priority).Max() + 1)
+                               : 0;
+            var entry = new TitleScreenMenuEntry(null, priority, text, texture, onTriggered);
+            this.entries.Add(entry);
+            return entry;
+        }
+    }
+
+    /// <summary>
+    /// Class representing an entry in the title screen menu.
+    /// </summary>
+    public class TitleScreenMenuEntry : IComparable<TitleScreenMenuEntry>
+    {
+        private readonly Action onTriggered;
 
         /// <summary>
-        /// Adds a new entry to the title screen menu.
+        /// Initializes a new instance of the <see cref="TitleScreenMenuEntry"/> class.
         /// </summary>
+        /// <param name="callingAssembly">The calling assembly.</param>
+        /// <param name="priority">The priority of this entry.</param>
         /// <param name="text">The text to show.</param>
         /// <param name="texture">The texture to show.</param>
         /// <param name="onTriggered">The action to execute when the option is selected.</param>
-        /// <returns>A <see cref="TitleScreenMenu"/> object that can be used to manage the entry.</returns>
-        /// <exception cref="ArgumentException">Thrown when the texture provided does not match the required resolution(64x64).</exception>
-        public TitleScreenMenuEntry AddEntry(string text, TextureWrap texture, Action onTriggered)
+        internal TitleScreenMenuEntry(Assembly? callingAssembly, ulong priority, string text, TextureWrap texture, Action onTriggered)
         {
-            if (texture.Height != TextureSize || texture.Width != TextureSize)
-            {
-                throw new ArgumentException("Texture must be 64x64");
-            }
-
-            lock (this.entries)
-            {
-                var entriesOfAssembly = this.entries.Where(x => x.CallingAssembly == Assembly.GetCallingAssembly()).ToList();
-                var priority = entriesOfAssembly.Any()
-                                   ? unchecked(entriesOfAssembly.Select(x => x.Priority).Max() + 1)
-                                   : 0;
-                var entry = new TitleScreenMenuEntry(Assembly.GetCallingAssembly(), priority, text, texture, onTriggered);
-                var i = this.entries.BinarySearch(entry);
-                if (i < 0)
-                    i = ~i;
-                this.entries.Insert(i, entry);
-                return entry;
-            }
+            this.CallingAssembly = callingAssembly;
+            this.Priority = priority;
+            this.Name = text;
+            this.Texture = texture;
+            this.onTriggered = onTriggered;
         }
 
         /// <summary>
-        /// Adds a new entry to the title screen menu.
+        /// Gets the priority of this entry.
         /// </summary>
-        /// <param name="priority">Priority of the entry.</param>
-        /// <param name="text">The text to show.</param>
-        /// <param name="texture">The texture to show.</param>
-        /// <param name="onTriggered">The action to execute when the option is selected.</param>
-        /// <returns>A <see cref="TitleScreenMenu"/> object that can be used to manage the entry.</returns>
-        /// <exception cref="ArgumentException">Thrown when the texture provided does not match the required resolution(64x64).</exception>
-        public TitleScreenMenuEntry AddEntry(ulong priority, string text, TextureWrap texture, Action onTriggered)
-        {
-            if (texture.Height != TextureSize || texture.Width != TextureSize)
-            {
-                throw new ArgumentException("Texture must be 64x64");
-            }
-
-            lock (this.entries)
-            {
-                var entry = new TitleScreenMenuEntry(Assembly.GetCallingAssembly(), priority, text, texture, onTriggered);
-                var i = this.entries.BinarySearch(entry);
-                if (i < 0)
-                    i = ~i;
-                this.entries.Insert(i, entry);
-                return entry;
-            }
-        }
+        public ulong Priority { get; init; }
 
         /// <summary>
-        /// Remove an entry from the title screen menu.
+        /// Gets or sets the name of this entry.
         /// </summary>
-        /// <param name="entry">The entry to remove.</param>
-        public void RemoveEntry(TitleScreenMenuEntry entry)
-        {
-            lock (this.entries)
-            {
-                this.entries.Remove(entry);
-            }
-        }
+        public string Name { get; set; }
 
         /// <summary>
-        /// Adds a new entry to the title screen menu.
+        /// Gets or sets the texture of this entry.
         /// </summary>
-        /// <param name="priority">Priority of the entry.</param>
-        /// <param name="text">The text to show.</param>
-        /// <param name="texture">The texture to show.</param>
-        /// <param name="onTriggered">The action to execute when the option is selected.</param>
-        /// <returns>A <see cref="TitleScreenMenu"/> object that can be used to manage the entry.</returns>
-        /// <exception cref="ArgumentException">Thrown when the texture provided does not match the required resolution(64x64).</exception>
-        internal TitleScreenMenuEntry AddEntryCore(ulong priority, string text, TextureWrap texture, Action onTriggered)
-        {
-            if (texture.Height != TextureSize || texture.Width != TextureSize)
-            {
-                throw new ArgumentException("Texture must be 64x64");
-            }
-
-            lock (this.entries)
-            {
-                var entry = new TitleScreenMenuEntry(null, priority, text, texture, onTriggered);
-                this.entries.Add(entry);
-                return entry;
-            }
-        }
+        public TextureWrap Texture { get; set; }
 
         /// <summary>
-        /// Adds a new entry to the title screen menu.
+        /// Gets the calling assembly of this entry.
         /// </summary>
-        /// <param name="text">The text to show.</param>
-        /// <param name="texture">The texture to show.</param>
-        /// <param name="onTriggered">The action to execute when the option is selected.</param>
-        /// <returns>A <see cref="TitleScreenMenu"/> object that can be used to manage the entry.</returns>
-        /// <exception cref="ArgumentException">Thrown when the texture provided does not match the required resolution(64x64).</exception>
-        internal TitleScreenMenuEntry AddEntryCore(string text, TextureWrap texture, Action onTriggered)
-        {
-            if (texture.Height != TextureSize || texture.Width != TextureSize)
-            {
-                throw new ArgumentException("Texture must be 64x64");
-            }
-
-            lock (this.entries)
-            {
-                var entriesOfAssembly = this.entries.Where(x => x.CallingAssembly == null).ToList();
-                var priority = entriesOfAssembly.Any()
-                                   ? unchecked(entriesOfAssembly.Select(x => x.Priority).Max() + 1)
-                                   : 0;
-                var entry = new TitleScreenMenuEntry(null, priority, text, texture, onTriggered);
-                this.entries.Add(entry);
-                return entry;
-            }
-        }
+        internal Assembly? CallingAssembly { get; init; }
 
         /// <summary>
-        /// Class representing an entry in the title screen menu.
+        /// Gets the internal ID of this entry.
         /// </summary>
-        public class TitleScreenMenuEntry : IComparable<TitleScreenMenuEntry>
+        internal Guid Id { get; init; } = Guid.NewGuid();
+
+        /// <inheritdoc/>
+        public int CompareTo(TitleScreenMenuEntry? other)
         {
-            private readonly Action onTriggered;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="TitleScreenMenuEntry"/> class.
-            /// </summary>
-            /// <param name="callingAssembly">The calling assembly.</param>
-            /// <param name="priority">The priority of this entry.</param>
-            /// <param name="text">The text to show.</param>
-            /// <param name="texture">The texture to show.</param>
-            /// <param name="onTriggered">The action to execute when the option is selected.</param>
-            internal TitleScreenMenuEntry(Assembly? callingAssembly, ulong priority, string text, TextureWrap texture, Action onTriggered)
+            if (other == null)
+                return 1;
+            if (this.CallingAssembly != other.CallingAssembly)
             {
-                this.CallingAssembly = callingAssembly;
-                this.Priority = priority;
-                this.Name = text;
-                this.Texture = texture;
-                this.onTriggered = onTriggered;
-            }
-
-            /// <summary>
-            /// Gets the priority of this entry.
-            /// </summary>
-            public ulong Priority { get; init; }
-
-            /// <summary>
-            /// Gets or sets the name of this entry.
-            /// </summary>
-            public string Name { get; set; }
-
-            /// <summary>
-            /// Gets or sets the texture of this entry.
-            /// </summary>
-            public TextureWrap Texture { get; set; }
-
-            /// <summary>
-            /// Gets the calling assembly of this entry.
-            /// </summary>
-            internal Assembly? CallingAssembly { get; init; }
-
-            /// <summary>
-            /// Gets the internal ID of this entry.
-            /// </summary>
-            internal Guid Id { get; init; } = Guid.NewGuid();
-
-            /// <inheritdoc/>
-            public int CompareTo(TitleScreenMenuEntry? other)
-            {
-                if (other == null)
+                if (this.CallingAssembly == null && other.CallingAssembly == null)
+                    return 0;
+                if (this.CallingAssembly == null && other.CallingAssembly != null)
+                    return -1;
+                if (this.CallingAssembly != null && other.CallingAssembly == null)
                     return 1;
-                if (this.CallingAssembly != other.CallingAssembly)
-                {
-                    if (this.CallingAssembly == null && other.CallingAssembly == null)
-                        return 0;
-                    if (this.CallingAssembly == null && other.CallingAssembly != null)
-                        return -1;
-                    if (this.CallingAssembly != null && other.CallingAssembly == null)
-                        return 1;
-                    return string.Compare(
-                        this.CallingAssembly!.FullName!,
-                        other.CallingAssembly!.FullName!,
-                        StringComparison.CurrentCultureIgnoreCase);
-                }
-
-                if (this.Priority != other.Priority)
-                    return this.Priority.CompareTo(other.Priority);
-                if (this.Name != other.Name)
-                    return string.Compare(this.Name, other.Name, StringComparison.InvariantCultureIgnoreCase);
-                return string.Compare(this.Name, other.Name, StringComparison.InvariantCulture);
+                return string.Compare(
+                    this.CallingAssembly!.FullName!,
+                    other.CallingAssembly!.FullName!,
+                    StringComparison.CurrentCultureIgnoreCase);
             }
 
-            /// <summary>
-            /// Trigger the action associated with this entry.
-            /// </summary>
-            internal void Trigger()
-            {
-                this.onTriggered();
-            }
+            if (this.Priority != other.Priority)
+                return this.Priority.CompareTo(other.Priority);
+            if (this.Name != other.Name)
+                return string.Compare(this.Name, other.Name, StringComparison.InvariantCultureIgnoreCase);
+            return string.Compare(this.Name, other.Name, StringComparison.InvariantCulture);
+        }
+
+        /// <summary>
+        /// Trigger the action associated with this entry.
+        /// </summary>
+        internal void Trigger()
+        {
+            this.onTriggered();
         }
     }
 }
diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs
index 73a5c1f79..e0818337b 100644
--- a/Dalamud/Interface/UiBuilder.cs
+++ b/Dalamud/Interface/UiBuilder.cs
@@ -17,505 +17,504 @@ using ImGuiScene;
 using Serilog;
 using SharpDX.Direct3D11;
 
-namespace Dalamud.Interface
+namespace Dalamud.Interface;
+
+/// <summary>
+/// This class represents the Dalamud UI that is drawn on top of the game.
+/// It can be used to draw custom windows and overlays.
+/// </summary>
+public sealed class UiBuilder : IDisposable
 {
+    private readonly Stopwatch stopwatch;
+    private readonly string namespaceName;
+    private readonly InterfaceManager interfaceManager = Service<InterfaceManager>.Get();
+    private readonly GameFontManager gameFontManager = Service<GameFontManager>.Get();
+
+    private bool hasErrorWindow = false;
+    private bool lastFrameUiHideState = false;
+
     /// <summary>
-    /// This class represents the Dalamud UI that is drawn on top of the game.
-    /// It can be used to draw custom windows and overlays.
+    /// Initializes a new instance of the <see cref="UiBuilder"/> class and registers it.
+    /// You do not have to call this manually.
     /// </summary>
-    public sealed class UiBuilder : IDisposable
+    /// <param name="namespaceName">The plugin namespace.</param>
+    internal UiBuilder(string namespaceName)
     {
-        private readonly Stopwatch stopwatch;
-        private readonly string namespaceName;
-        private readonly InterfaceManager interfaceManager = Service<InterfaceManager>.Get();
-        private readonly GameFontManager gameFontManager = Service<GameFontManager>.Get();
+        this.stopwatch = new Stopwatch();
+        this.namespaceName = namespaceName;
 
-        private bool hasErrorWindow = false;
-        private bool lastFrameUiHideState = false;
+        this.interfaceManager.Draw += this.OnDraw;
+        this.interfaceManager.BuildFonts += this.OnBuildFonts;
+        this.interfaceManager.AfterBuildFonts += this.OnAfterBuildFonts;
+        this.interfaceManager.ResizeBuffers += this.OnResizeBuffers;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UiBuilder"/> class and registers it.
-        /// You do not have to call this manually.
-        /// </summary>
-        /// <param name="namespaceName">The plugin namespace.</param>
-        internal UiBuilder(string namespaceName)
+    /// <summary>
+    /// The event that gets called when Dalamud is ready to draw your windows or overlays.
+    /// When it is called, you can use static ImGui calls.
+    /// </summary>
+    public event Action Draw;
+
+    /// <summary>
+    /// The event that is called when the game's DirectX device is requesting you to resize your buffers.
+    /// </summary>
+    public event Action ResizeBuffers;
+
+    /// <summary>
+    /// Event that is fired when the plugin should open its configuration interface.
+    /// </summary>
+    public event Action OpenConfigUi;
+
+    /// <summary>
+    /// Gets or sets an action that is called any time ImGui fonts need to be rebuilt.<br/>
+    /// Any ImFontPtr objects that you store <strong>can be invalidated</strong> when fonts are rebuilt
+    /// (at any time), so you should both reload your custom fonts and restore those
+    /// pointers inside this handler.<br/>
+    /// <strong>PLEASE remove this handler inside Dispose, or when you no longer need your fonts!</strong>
+    /// </summary>
+    public event Action BuildFonts;
+
+    /// <summary>
+    /// Gets or sets an action that is called any time right after ImGui fonts are rebuilt.<br/>
+    /// Any ImFontPtr objects that you store <strong>can be invalidated</strong> when fonts are rebuilt
+    /// (at any time), so you should both reload your custom fonts and restore those
+    /// pointers inside this handler.<br/>
+    /// <strong>PLEASE remove this handler inside Dispose, or when you no longer need your fonts!</strong>
+    /// </summary>
+    public event Action AfterBuildFonts;
+
+    /// <summary>
+    /// Gets or sets an action that is called when plugin UI or interface modifications are supposed to be hidden.
+    /// These may be fired consecutively.
+    /// </summary>
+    public event Action ShowUi;
+
+    /// <summary>
+    /// Gets or sets an action that is called when plugin UI or interface modifications are supposed to be shown.
+    /// These may be fired consecutively.
+    /// </summary>
+    public event Action HideUi;
+
+    /// <summary>
+    /// Gets the default Dalamud font based on Noto Sans CJK Medium in 17pt - supporting all game languages and icons.
+    /// </summary>
+    public static ImFontPtr DefaultFont => InterfaceManager.DefaultFont;
+
+    /// <summary>
+    /// Gets the default Dalamud icon font based on FontAwesome 5 Free solid in 17pt.
+    /// </summary>
+    public static ImFontPtr IconFont => InterfaceManager.IconFont;
+
+    /// <summary>
+    /// Gets the default Dalamud monospaced font based on Inconsolata Regular in 16pt.
+    /// </summary>
+    public static ImFontPtr MonoFont => InterfaceManager.MonoFont;
+
+    /// <summary>
+    /// Gets the game's active Direct3D device.
+    /// </summary>
+    public Device Device => this.InterfaceManagerWithScene.Device!;
+
+    /// <summary>
+    /// Gets the game's main window handle.
+    /// </summary>
+    public IntPtr WindowHandlePtr => this.InterfaceManagerWithScene.WindowHandlePtr;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this plugin should hide its UI automatically when the game's UI is hidden.
+    /// </summary>
+    public bool DisableAutomaticUiHide { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this plugin should hide its UI automatically when the user toggles the UI.
+    /// </summary>
+    public bool DisableUserUiHide { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this plugin should hide its UI automatically during cutscenes.
+    /// </summary>
+    public bool DisableCutsceneUiHide { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this plugin should hide its UI automatically while gpose is active.
+    /// </summary>
+    public bool DisableGposeUiHide { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not the game's cursor should be overridden with the ImGui cursor.
+    /// </summary>
+    public bool OverrideGameCursor
+    {
+        get => this.interfaceManager.OverrideGameCursor;
+        set => this.interfaceManager.OverrideGameCursor = value;
+    }
+
+    /// <summary>
+    /// Gets the count of Draw calls made since plugin creation.
+    /// </summary>
+    public ulong FrameCount { get; private set; } = 0;
+
+    /// <summary>
+    /// Gets a value indicating whether or not a cutscene is playing.
+    /// </summary>
+    public bool CutsceneActive
+    {
+        get
         {
-            this.stopwatch = new Stopwatch();
-            this.namespaceName = namespaceName;
-
-            this.interfaceManager.Draw += this.OnDraw;
-            this.interfaceManager.BuildFonts += this.OnBuildFonts;
-            this.interfaceManager.AfterBuildFonts += this.OnAfterBuildFonts;
-            this.interfaceManager.ResizeBuffers += this.OnResizeBuffers;
+            var condition = Service<Condition>.GetNullable();
+            if (condition == null)
+                return false;
+            return condition[ConditionFlag.OccupiedInCutSceneEvent]
+                   || condition[ConditionFlag.WatchingCutscene78];
         }
+    }
 
-        /// <summary>
-        /// The event that gets called when Dalamud is ready to draw your windows or overlays.
-        /// When it is called, you can use static ImGui calls.
-        /// </summary>
-        public event Action Draw;
-
-        /// <summary>
-        /// The event that is called when the game's DirectX device is requesting you to resize your buffers.
-        /// </summary>
-        public event Action ResizeBuffers;
-
-        /// <summary>
-        /// Event that is fired when the plugin should open its configuration interface.
-        /// </summary>
-        public event Action OpenConfigUi;
-
-        /// <summary>
-        /// Gets or sets an action that is called any time ImGui fonts need to be rebuilt.<br/>
-        /// Any ImFontPtr objects that you store <strong>can be invalidated</strong> when fonts are rebuilt
-        /// (at any time), so you should both reload your custom fonts and restore those
-        /// pointers inside this handler.<br/>
-        /// <strong>PLEASE remove this handler inside Dispose, or when you no longer need your fonts!</strong>
-        /// </summary>
-        public event Action BuildFonts;
-
-        /// <summary>
-        /// Gets or sets an action that is called any time right after ImGui fonts are rebuilt.<br/>
-        /// Any ImFontPtr objects that you store <strong>can be invalidated</strong> when fonts are rebuilt
-        /// (at any time), so you should both reload your custom fonts and restore those
-        /// pointers inside this handler.<br/>
-        /// <strong>PLEASE remove this handler inside Dispose, or when you no longer need your fonts!</strong>
-        /// </summary>
-        public event Action AfterBuildFonts;
-
-        /// <summary>
-        /// Gets or sets an action that is called when plugin UI or interface modifications are supposed to be hidden.
-        /// These may be fired consecutively.
-        /// </summary>
-        public event Action ShowUi;
-
-        /// <summary>
-        /// Gets or sets an action that is called when plugin UI or interface modifications are supposed to be shown.
-        /// These may be fired consecutively.
-        /// </summary>
-        public event Action HideUi;
-
-        /// <summary>
-        /// Gets the default Dalamud font based on Noto Sans CJK Medium in 17pt - supporting all game languages and icons.
-        /// </summary>
-        public static ImFontPtr DefaultFont => InterfaceManager.DefaultFont;
-
-        /// <summary>
-        /// Gets the default Dalamud icon font based on FontAwesome 5 Free solid in 17pt.
-        /// </summary>
-        public static ImFontPtr IconFont => InterfaceManager.IconFont;
-
-        /// <summary>
-        /// Gets the default Dalamud monospaced font based on Inconsolata Regular in 16pt.
-        /// </summary>
-        public static ImFontPtr MonoFont => InterfaceManager.MonoFont;
-
-        /// <summary>
-        /// Gets the game's active Direct3D device.
-        /// </summary>
-        public Device Device => this.InterfaceManagerWithScene.Device!;
-
-        /// <summary>
-        /// Gets the game's main window handle.
-        /// </summary>
-        public IntPtr WindowHandlePtr => this.InterfaceManagerWithScene.WindowHandlePtr;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this plugin should hide its UI automatically when the game's UI is hidden.
-        /// </summary>
-        public bool DisableAutomaticUiHide { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this plugin should hide its UI automatically when the user toggles the UI.
-        /// </summary>
-        public bool DisableUserUiHide { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this plugin should hide its UI automatically during cutscenes.
-        /// </summary>
-        public bool DisableCutsceneUiHide { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this plugin should hide its UI automatically while gpose is active.
-        /// </summary>
-        public bool DisableGposeUiHide { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not the game's cursor should be overridden with the ImGui cursor.
-        /// </summary>
-        public bool OverrideGameCursor
+    /// <summary>
+    /// Gets a value indicating whether or not gpose is active.
+    /// </summary>
+    public bool GposeActive
+    {
+        get
         {
-            get => this.interfaceManager.OverrideGameCursor;
-            set => this.interfaceManager.OverrideGameCursor = value;
+            var condition = Service<Condition>.GetNullable();
+            if (condition == null)
+                return false;
+            return condition[ConditionFlag.WatchingCutscene];
         }
+    }
 
-        /// <summary>
-        /// Gets the count of Draw calls made since plugin creation.
-        /// </summary>
-        public ulong FrameCount { get; private set; } = 0;
+    /// <summary>
+    /// Gets a value indicating whether this plugin should modify the game's interface at this time.
+    /// </summary>
+    public bool ShouldModifyUi => this.interfaceManager.IsDispatchingEvents;
 
-        /// <summary>
-        /// Gets a value indicating whether or not a cutscene is playing.
-        /// </summary>
-        public bool CutsceneActive
-        {
-            get
-            {
-                var condition = Service<Condition>.GetNullable();
-                if (condition == null)
-                    return false;
-                return condition[ConditionFlag.OccupiedInCutSceneEvent]
-                       || condition[ConditionFlag.WatchingCutscene78];
-            }
-        }
+    /// <summary>
+    /// Gets a value indicating whether UI functions can be used.
+    /// </summary>
+    public bool UiPrepared => Service<InterfaceManager.InterfaceManagerWithScene>.GetNullable() != null;
 
-        /// <summary>
-        /// Gets a value indicating whether or not gpose is active.
-        /// </summary>
-        public bool GposeActive
-        {
-            get
-            {
-                var condition = Service<Condition>.GetNullable();
-                if (condition == null)
-                    return false;
-                return condition[ConditionFlag.WatchingCutscene];
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this plugin should modify the game's interface at this time.
-        /// </summary>
-        public bool ShouldModifyUi => this.interfaceManager.IsDispatchingEvents;
-
-        /// <summary>
-        /// Gets a value indicating whether UI functions can be used.
-        /// </summary>
-        public bool UiPrepared => Service<InterfaceManager.InterfaceManagerWithScene>.GetNullable() != null;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether statistics about UI draw time should be collected.
-        /// </summary>
+    /// <summary>
+    /// Gets or sets a value indicating whether statistics about UI draw time should be collected.
+    /// </summary>
 #if DEBUG
         internal static bool DoStats { get; set; } = true;
 #else
-        internal static bool DoStats { get; set; } = false;
+    internal static bool DoStats { get; set; } = false;
 #endif
 
-        /// <summary>
-        /// Gets a value indicating whether this UiBuilder has a configuration UI registered.
-        /// </summary>
-        internal bool HasConfigUi => this.OpenConfigUi != null;
+    /// <summary>
+    /// Gets a value indicating whether this UiBuilder has a configuration UI registered.
+    /// </summary>
+    internal bool HasConfigUi => this.OpenConfigUi != null;
 
-        /// <summary>
-        /// Gets or sets the time this plugin took to draw on the last frame.
-        /// </summary>
-        internal long LastDrawTime { get; set; } = -1;
+    /// <summary>
+    /// Gets or sets the time this plugin took to draw on the last frame.
+    /// </summary>
+    internal long LastDrawTime { get; set; } = -1;
 
-        /// <summary>
-        /// Gets or sets the longest amount of time this plugin ever took to draw.
-        /// </summary>
-        internal long MaxDrawTime { get; set; } = -1;
+    /// <summary>
+    /// Gets or sets the longest amount of time this plugin ever took to draw.
+    /// </summary>
+    internal long MaxDrawTime { get; set; } = -1;
 
-        /// <summary>
-        /// Gets or sets a history of the last draw times, used to calculate an average.
-        /// </summary>
-        internal List<long> DrawTimeHistory { get; set; } = new List<long>();
+    /// <summary>
+    /// Gets or sets a history of the last draw times, used to calculate an average.
+    /// </summary>
+    internal List<long> DrawTimeHistory { get; set; } = new List<long>();
 
-        private InterfaceManager? InterfaceManagerWithScene =>
-            Service<InterfaceManager.InterfaceManagerWithScene>.GetNullable()?.Manager;
+    private InterfaceManager? InterfaceManagerWithScene =>
+        Service<InterfaceManager.InterfaceManagerWithScene>.GetNullable()?.Manager;
 
-        private Task<InterfaceManager> InterfaceManagerWithSceneAsync =>
-            Service<InterfaceManager.InterfaceManagerWithScene>.GetAsync().ContinueWith(task => task.Result.Manager);
+    private Task<InterfaceManager> InterfaceManagerWithSceneAsync =>
+        Service<InterfaceManager.InterfaceManagerWithScene>.GetAsync().ContinueWith(task => task.Result.Manager);
 
-        /// <summary>
-        /// Loads an image from the specified file.
-        /// </summary>
-        /// <param name="filePath">The full filepath to the image.</param>
-        /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
-        public TextureWrap LoadImage(string filePath)
-            => this.InterfaceManagerWithScene?.LoadImage(filePath)
-               ?? throw new InvalidOperationException("Load failed.");
+    /// <summary>
+    /// Loads an image from the specified file.
+    /// </summary>
+    /// <param name="filePath">The full filepath to the image.</param>
+    /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
+    public TextureWrap LoadImage(string filePath)
+        => this.InterfaceManagerWithScene?.LoadImage(filePath)
+           ?? throw new InvalidOperationException("Load failed.");
 
-        /// <summary>
-        /// Loads an image from a byte stream, such as a png downloaded into memory.
-        /// </summary>
-        /// <param name="imageData">A byte array containing the raw image data.</param>
-        /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
-        public TextureWrap LoadImage(byte[] imageData)
-            => this.InterfaceManagerWithScene?.LoadImage(imageData)
-               ?? throw new InvalidOperationException("Load failed.");
+    /// <summary>
+    /// Loads an image from a byte stream, such as a png downloaded into memory.
+    /// </summary>
+    /// <param name="imageData">A byte array containing the raw image data.</param>
+    /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
+    public TextureWrap LoadImage(byte[] imageData)
+        => this.InterfaceManagerWithScene?.LoadImage(imageData)
+           ?? throw new InvalidOperationException("Load failed.");
 
-        /// <summary>
-        /// Loads an image from raw unformatted pixel data, with no type or header information.  To load formatted data, use <see cref="LoadImage(byte[])"/>.
-        /// </summary>
-        /// <param name="imageData">A byte array containing the raw pixel data.</param>
-        /// <param name="width">The width of the image contained in <paramref name="imageData"/>.</param>
-        /// <param name="height">The height of the image contained in <paramref name="imageData"/>.</param>
-        /// <param name="numChannels">The number of channels (bytes per pixel) of the image contained in <paramref name="imageData"/>.  This should usually be 4.</param>
-        /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
-        public TextureWrap LoadImageRaw(byte[] imageData, int width, int height, int numChannels)
-            => this.InterfaceManagerWithScene?.LoadImageRaw(imageData, width, height, numChannels)
-               ?? throw new InvalidOperationException("Load failed.");
+    /// <summary>
+    /// Loads an image from raw unformatted pixel data, with no type or header information.  To load formatted data, use <see cref="LoadImage(byte[])"/>.
+    /// </summary>
+    /// <param name="imageData">A byte array containing the raw pixel data.</param>
+    /// <param name="width">The width of the image contained in <paramref name="imageData"/>.</param>
+    /// <param name="height">The height of the image contained in <paramref name="imageData"/>.</param>
+    /// <param name="numChannels">The number of channels (bytes per pixel) of the image contained in <paramref name="imageData"/>.  This should usually be 4.</param>
+    /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
+    public TextureWrap LoadImageRaw(byte[] imageData, int width, int height, int numChannels)
+        => this.InterfaceManagerWithScene?.LoadImageRaw(imageData, width, height, numChannels)
+           ?? throw new InvalidOperationException("Load failed.");
 
-        /// <summary>
-        /// Asynchronously loads an image from the specified file, when it's possible to do so.
-        /// </summary>
-        /// <param name="filePath">The full filepath to the image.</param>
-        /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
-        public Task<TextureWrap> LoadImageAsync(string filePath) => Task.Run(
-            async () =>
-                (await this.InterfaceManagerWithSceneAsync).LoadImage(filePath)
-                ?? throw new InvalidOperationException("Load failed."));
+    /// <summary>
+    /// Asynchronously loads an image from the specified file, when it's possible to do so.
+    /// </summary>
+    /// <param name="filePath">The full filepath to the image.</param>
+    /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
+    public Task<TextureWrap> LoadImageAsync(string filePath) => Task.Run(
+        async () =>
+            (await this.InterfaceManagerWithSceneAsync).LoadImage(filePath)
+            ?? throw new InvalidOperationException("Load failed."));
 
-        /// <summary>
-        /// Asynchronously loads an image from a byte stream, such as a png downloaded into memory, when it's possible to do so.
-        /// </summary>
-        /// <param name="imageData">A byte array containing the raw image data.</param>
-        /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
-        public Task<TextureWrap> LoadImageAsync(byte[] imageData) => Task.Run(
-            async () =>
-                (await this.InterfaceManagerWithSceneAsync).LoadImage(imageData)
-                ?? throw new InvalidOperationException("Load failed."));
+    /// <summary>
+    /// Asynchronously loads an image from a byte stream, such as a png downloaded into memory, when it's possible to do so.
+    /// </summary>
+    /// <param name="imageData">A byte array containing the raw image data.</param>
+    /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
+    public Task<TextureWrap> LoadImageAsync(byte[] imageData) => Task.Run(
+        async () =>
+            (await this.InterfaceManagerWithSceneAsync).LoadImage(imageData)
+            ?? throw new InvalidOperationException("Load failed."));
 
-        /// <summary>
-        /// Asynchronously loads an image from raw unformatted pixel data, with no type or header information, when it's possible to do so.  To load formatted data, use <see cref="LoadImage(byte[])"/>.
-        /// </summary>
-        /// <param name="imageData">A byte array containing the raw pixel data.</param>
-        /// <param name="width">The width of the image contained in <paramref name="imageData"/>.</param>
-        /// <param name="height">The height of the image contained in <paramref name="imageData"/>.</param>
-        /// <param name="numChannels">The number of channels (bytes per pixel) of the image contained in <paramref name="imageData"/>.  This should usually be 4.</param>
-        /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
-        public Task<TextureWrap> LoadImageRawAsync(byte[] imageData, int width, int height, int numChannels) => Task.Run(
-            async () =>
-                (await this.InterfaceManagerWithSceneAsync).LoadImageRaw(imageData, width, height, numChannels)
-                ?? throw new InvalidOperationException("Load failed."));
+    /// <summary>
+    /// Asynchronously loads an image from raw unformatted pixel data, with no type or header information, when it's possible to do so.  To load formatted data, use <see cref="LoadImage(byte[])"/>.
+    /// </summary>
+    /// <param name="imageData">A byte array containing the raw pixel data.</param>
+    /// <param name="width">The width of the image contained in <paramref name="imageData"/>.</param>
+    /// <param name="height">The height of the image contained in <paramref name="imageData"/>.</param>
+    /// <param name="numChannels">The number of channels (bytes per pixel) of the image contained in <paramref name="imageData"/>.  This should usually be 4.</param>
+    /// <returns>A <see cref="TextureWrap"/> object wrapping the created image.  Use <see cref="TextureWrap.ImGuiHandle"/> inside ImGui.Image().</returns>
+    public Task<TextureWrap> LoadImageRawAsync(byte[] imageData, int width, int height, int numChannels) => Task.Run(
+        async () =>
+            (await this.InterfaceManagerWithSceneAsync).LoadImageRaw(imageData, width, height, numChannels)
+            ?? throw new InvalidOperationException("Load failed."));
 
-        /// <summary>
-        /// Waits for UI to become available for use.
-        /// </summary>
-        /// <returns>A task that completes when the game's Present has been called at least once.</returns>
-        public Task WaitForUi() => this.InterfaceManagerWithSceneAsync;
+    /// <summary>
+    /// Waits for UI to become available for use.
+    /// </summary>
+    /// <returns>A task that completes when the game's Present has been called at least once.</returns>
+    public Task WaitForUi() => this.InterfaceManagerWithSceneAsync;
 
-        /// <summary>
-        /// Waits for UI to become available for use.
-        /// </summary>
-        /// <param name="func">Function to call.</param>
-        /// <param name="runInFrameworkThread">Specifies whether to call the function from the framework thread.</param>
-        /// <returns>A task that completes when the game's Present has been called at least once.</returns>
-        /// <typeparam name="T">Return type.</typeparam>
-        public Task<T> RunWhenUiPrepared<T>(Func<T> func, bool runInFrameworkThread = false)
+    /// <summary>
+    /// Waits for UI to become available for use.
+    /// </summary>
+    /// <param name="func">Function to call.</param>
+    /// <param name="runInFrameworkThread">Specifies whether to call the function from the framework thread.</param>
+    /// <returns>A task that completes when the game's Present has been called at least once.</returns>
+    /// <typeparam name="T">Return type.</typeparam>
+    public Task<T> RunWhenUiPrepared<T>(Func<T> func, bool runInFrameworkThread = false)
+    {
+        if (runInFrameworkThread)
         {
-            if (runInFrameworkThread)
+            return this.InterfaceManagerWithSceneAsync
+                       .ContinueWith(_ => Service<Framework>.Get().RunOnFrameworkThread(func))
+                       .Unwrap();
+        }
+        else
+        {
+            return this.InterfaceManagerWithSceneAsync
+                       .ContinueWith(_ => func());
+        }
+    }
+
+    /// <summary>
+    /// Waits for UI to become available for use.
+    /// </summary>
+    /// <param name="func">Function to call.</param>
+    /// <param name="runInFrameworkThread">Specifies whether to call the function from the framework thread.</param>
+    /// <returns>A task that completes when the game's Present has been called at least once.</returns>
+    /// <typeparam name="T">Return type.</typeparam>
+    public Task<T> RunWhenUiPrepared<T>(Func<Task<T>> func, bool runInFrameworkThread = false)
+    {
+        if (runInFrameworkThread)
+        {
+            return this.InterfaceManagerWithSceneAsync
+                       .ContinueWith(_ => Service<Framework>.Get().RunOnFrameworkThread(func))
+                       .Unwrap();
+        }
+        else
+        {
+            return this.InterfaceManagerWithSceneAsync
+                       .ContinueWith(_ => func())
+                       .Unwrap();
+        }
+    }
+
+    /// <summary>
+    /// Gets a game font.
+    /// </summary>
+    /// <param name="style">Font to get.</param>
+    /// <returns>Handle to the game font which may or may not be available for use yet.</returns>
+    public GameFontHandle GetGameFontHandle(GameFontStyle style) => this.gameFontManager.NewFontRef(style);
+
+    /// <summary>
+    /// Call this to queue a rebuild of the font atlas.<br/>
+    /// This will invoke any <see cref="OnBuildFonts"/> handlers and ensure that any loaded fonts are
+    /// ready to be used on the next UI frame.
+    /// </summary>
+    public void RebuildFonts()
+    {
+        Log.Verbose("[FONT] {0} plugin is initiating FONT REBUILD", this.namespaceName);
+        this.interfaceManager.RebuildFonts();
+    }
+
+    /// <summary>
+    /// Add a notification to the notification queue.
+    /// </summary>
+    /// <param name="content">The content of the notification.</param>
+    /// <param name="title">The title of the notification.</param>
+    /// <param name="type">The type of the notification.</param>
+    /// <param name="msDelay">The time the notification should be displayed for.</param>
+    public void AddNotification(
+        string content, string? title = null, NotificationType type = NotificationType.None, uint msDelay = 3000)
+    {
+        Service<NotificationManager>
+            .GetAsync()
+            .ContinueWith(task =>
             {
-                return this.InterfaceManagerWithSceneAsync
-                           .ContinueWith(_ => Service<Framework>.Get().RunOnFrameworkThread(func))
-                           .Unwrap();
-            }
-            else
+                if (task.IsCompletedSuccessfully)
+                    task.Result.AddNotification(content, title, type, msDelay);
+            });
+    }
+
+    /// <summary>
+    /// Unregister the UiBuilder. Do not call this in plugin code.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.interfaceManager.Draw -= this.OnDraw;
+        this.interfaceManager.BuildFonts -= this.OnBuildFonts;
+        this.interfaceManager.ResizeBuffers -= this.OnResizeBuffers;
+    }
+
+    /// <summary>
+    /// Open the registered configuration UI, if it exists.
+    /// </summary>
+    internal void OpenConfig()
+    {
+        this.OpenConfigUi?.InvokeSafely();
+    }
+
+    /// <summary>
+    /// Notify this UiBuilder about plugin UI being hidden.
+    /// </summary>
+    internal void NotifyHideUi()
+    {
+        this.HideUi?.InvokeSafely();
+    }
+
+    /// <summary>
+    /// Notify this UiBuilder about plugin UI being shown.
+    /// </summary>
+    internal void NotifyShowUi()
+    {
+        this.ShowUi?.InvokeSafely();
+    }
+
+    private void OnDraw()
+    {
+        var configuration = Service<DalamudConfiguration>.Get();
+        var gameGui = Service<GameGui>.GetNullable();
+        if (gameGui == null)
+            return;
+
+        if ((gameGui.GameUiHidden && configuration.ToggleUiHide &&
+             !(this.DisableUserUiHide || this.DisableAutomaticUiHide)) ||
+            (this.CutsceneActive && configuration.ToggleUiHideDuringCutscenes &&
+             !(this.DisableCutsceneUiHide || this.DisableAutomaticUiHide)) ||
+            (this.GposeActive && configuration.ToggleUiHideDuringGpose &&
+             !(this.DisableGposeUiHide || this.DisableAutomaticUiHide)))
+        {
+            if (!this.lastFrameUiHideState)
             {
-                return this.InterfaceManagerWithSceneAsync
-                           .ContinueWith(_ => func());
+                this.lastFrameUiHideState = true;
+                this.HideUi?.InvokeSafely();
             }
+
+            return;
         }
 
-        /// <summary>
-        /// Waits for UI to become available for use.
-        /// </summary>
-        /// <param name="func">Function to call.</param>
-        /// <param name="runInFrameworkThread">Specifies whether to call the function from the framework thread.</param>
-        /// <returns>A task that completes when the game's Present has been called at least once.</returns>
-        /// <typeparam name="T">Return type.</typeparam>
-        public Task<T> RunWhenUiPrepared<T>(Func<Task<T>> func, bool runInFrameworkThread = false)
-        {
-            if (runInFrameworkThread)
-            {
-                return this.InterfaceManagerWithSceneAsync
-                           .ContinueWith(_ => Service<Framework>.Get().RunOnFrameworkThread(func))
-                           .Unwrap();
-            }
-            else
-            {
-                return this.InterfaceManagerWithSceneAsync
-                           .ContinueWith(_ => func())
-                           .Unwrap();
-            }
-        }
-
-        /// <summary>
-        /// Gets a game font.
-        /// </summary>
-        /// <param name="style">Font to get.</param>
-        /// <returns>Handle to the game font which may or may not be available for use yet.</returns>
-        public GameFontHandle GetGameFontHandle(GameFontStyle style) => this.gameFontManager.NewFontRef(style);
-
-        /// <summary>
-        /// Call this to queue a rebuild of the font atlas.<br/>
-        /// This will invoke any <see cref="OnBuildFonts"/> handlers and ensure that any loaded fonts are
-        /// ready to be used on the next UI frame.
-        /// </summary>
-        public void RebuildFonts()
-        {
-            Log.Verbose("[FONT] {0} plugin is initiating FONT REBUILD", this.namespaceName);
-            this.interfaceManager.RebuildFonts();
-        }
-
-        /// <summary>
-        /// Add a notification to the notification queue.
-        /// </summary>
-        /// <param name="content">The content of the notification.</param>
-        /// <param name="title">The title of the notification.</param>
-        /// <param name="type">The type of the notification.</param>
-        /// <param name="msDelay">The time the notification should be displayed for.</param>
-        public void AddNotification(
-            string content, string? title = null, NotificationType type = NotificationType.None, uint msDelay = 3000)
-        {
-            Service<NotificationManager>
-                .GetAsync()
-                .ContinueWith(task =>
-                {
-                    if (task.IsCompletedSuccessfully)
-                        task.Result.AddNotification(content, title, type, msDelay);
-                });
-        }
-
-        /// <summary>
-        /// Unregister the UiBuilder. Do not call this in plugin code.
-        /// </summary>
-        void IDisposable.Dispose()
-        {
-            this.interfaceManager.Draw -= this.OnDraw;
-            this.interfaceManager.BuildFonts -= this.OnBuildFonts;
-            this.interfaceManager.ResizeBuffers -= this.OnResizeBuffers;
-        }
-
-        /// <summary>
-        /// Open the registered configuration UI, if it exists.
-        /// </summary>
-        internal void OpenConfig()
-        {
-            this.OpenConfigUi?.InvokeSafely();
-        }
-
-        /// <summary>
-        /// Notify this UiBuilder about plugin UI being hidden.
-        /// </summary>
-        internal void NotifyHideUi()
-        {
-            this.HideUi?.InvokeSafely();
-        }
-
-        /// <summary>
-        /// Notify this UiBuilder about plugin UI being shown.
-        /// </summary>
-        internal void NotifyShowUi()
+        if (this.lastFrameUiHideState)
         {
+            this.lastFrameUiHideState = false;
             this.ShowUi?.InvokeSafely();
         }
 
-        private void OnDraw()
+        if (!this.interfaceManager.FontsReady)
+            return;
+
+        ImGui.PushID(this.namespaceName);
+        if (DoStats)
         {
-            var configuration = Service<DalamudConfiguration>.Get();
-            var gameGui = Service<GameGui>.GetNullable();
-            if (gameGui == null)
-                return;
-
-            if ((gameGui.GameUiHidden && configuration.ToggleUiHide &&
-                 !(this.DisableUserUiHide || this.DisableAutomaticUiHide)) ||
-                (this.CutsceneActive && configuration.ToggleUiHideDuringCutscenes &&
-                 !(this.DisableCutsceneUiHide || this.DisableAutomaticUiHide)) ||
-                (this.GposeActive && configuration.ToggleUiHideDuringGpose &&
-                 !(this.DisableGposeUiHide || this.DisableAutomaticUiHide)))
-            {
-                if (!this.lastFrameUiHideState)
-                {
-                    this.lastFrameUiHideState = true;
-                    this.HideUi?.InvokeSafely();
-                }
-
-                return;
-            }
-
-            if (this.lastFrameUiHideState)
-            {
-                this.lastFrameUiHideState = false;
-                this.ShowUi?.InvokeSafely();
-            }
-
-            if (!this.interfaceManager.FontsReady)
-                return;
-
-            ImGui.PushID(this.namespaceName);
-            if (DoStats)
-            {
-                this.stopwatch.Restart();
-            }
-
-            if (this.hasErrorWindow && ImGui.Begin($"{this.namespaceName} Error", ref this.hasErrorWindow, ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoResize))
-            {
-                ImGui.Text($"The plugin {this.namespaceName} ran into an error.\nContact the plugin developer for support.\n\nPlease try restarting your game.");
-                ImGui.Spacing();
-
-                if (ImGui.Button("OK"))
-                {
-                    this.hasErrorWindow = false;
-                }
-
-                ImGui.End();
-            }
-
-            ImGuiManagedAsserts.ImGuiContextSnapshot snapshot = null;
-            if (this.Draw != null)
-            {
-                snapshot = ImGuiManagedAsserts.GetSnapshot();
-            }
-
-            try
-            {
-                this.Draw?.InvokeSafely();
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "[{0}] UiBuilder OnBuildUi caught exception", this.namespaceName);
-                this.Draw = null;
-                this.OpenConfigUi = null;
-
-                this.hasErrorWindow = true;
-            }
-
-            // Only if Draw was successful
-            if (this.Draw != null)
-            {
-                ImGuiManagedAsserts.ReportProblems(this.namespaceName, snapshot);
-            }
-
-            this.FrameCount++;
-
-            if (DoStats)
-            {
-                this.stopwatch.Stop();
-                this.LastDrawTime = this.stopwatch.ElapsedTicks;
-                this.MaxDrawTime = Math.Max(this.LastDrawTime, this.MaxDrawTime);
-                this.DrawTimeHistory.Add(this.LastDrawTime);
-                while (this.DrawTimeHistory.Count > 100) this.DrawTimeHistory.RemoveAt(0);
-            }
-
-            ImGui.PopID();
+            this.stopwatch.Restart();
         }
 
-        private void OnBuildFonts()
+        if (this.hasErrorWindow && ImGui.Begin($"{this.namespaceName} Error", ref this.hasErrorWindow, ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoResize))
         {
-            this.BuildFonts?.InvokeSafely();
+            ImGui.Text($"The plugin {this.namespaceName} ran into an error.\nContact the plugin developer for support.\n\nPlease try restarting your game.");
+            ImGui.Spacing();
+
+            if (ImGui.Button("OK"))
+            {
+                this.hasErrorWindow = false;
+            }
+
+            ImGui.End();
         }
 
-        private void OnAfterBuildFonts()
+        ImGuiManagedAsserts.ImGuiContextSnapshot snapshot = null;
+        if (this.Draw != null)
         {
-            this.AfterBuildFonts?.InvokeSafely();
+            snapshot = ImGuiManagedAsserts.GetSnapshot();
         }
 
-        private void OnResizeBuffers()
+        try
         {
-            this.ResizeBuffers?.InvokeSafely();
+            this.Draw?.InvokeSafely();
         }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "[{0}] UiBuilder OnBuildUi caught exception", this.namespaceName);
+            this.Draw = null;
+            this.OpenConfigUi = null;
+
+            this.hasErrorWindow = true;
+        }
+
+        // Only if Draw was successful
+        if (this.Draw != null)
+        {
+            ImGuiManagedAsserts.ReportProblems(this.namespaceName, snapshot);
+        }
+
+        this.FrameCount++;
+
+        if (DoStats)
+        {
+            this.stopwatch.Stop();
+            this.LastDrawTime = this.stopwatch.ElapsedTicks;
+            this.MaxDrawTime = Math.Max(this.LastDrawTime, this.MaxDrawTime);
+            this.DrawTimeHistory.Add(this.LastDrawTime);
+            while (this.DrawTimeHistory.Count > 100) this.DrawTimeHistory.RemoveAt(0);
+        }
+
+        ImGui.PopID();
+    }
+
+    private void OnBuildFonts()
+    {
+        this.BuildFonts?.InvokeSafely();
+    }
+
+    private void OnAfterBuildFonts()
+    {
+        this.AfterBuildFonts?.InvokeSafely();
+    }
+
+    private void OnResizeBuffers()
+    {
+        this.ResizeBuffers?.InvokeSafely();
     }
 }
diff --git a/Dalamud/Interface/Windowing/Window.cs b/Dalamud/Interface/Windowing/Window.cs
index fc7777d42..5b186439d 100644
--- a/Dalamud/Interface/Windowing/Window.cs
+++ b/Dalamud/Interface/Windowing/Window.cs
@@ -4,338 +4,337 @@ using Dalamud.Configuration.Internal;
 using Dalamud.Game.ClientState.Keys;
 using ImGuiNET;
 
-namespace Dalamud.Interface.Windowing
+namespace Dalamud.Interface.Windowing;
+
+/// <summary>
+/// Base class you can use to implement an ImGui window for use with the built-in <see cref="WindowSystem"/>.
+/// </summary>
+public abstract class Window
 {
+    private static bool wasEscPressedLastFrame = false;
+
+    private bool internalLastIsOpen = false;
+    private bool internalIsOpen = false;
+
     /// <summary>
-    /// Base class you can use to implement an ImGui window for use with the built-in <see cref="WindowSystem"/>.
+    /// Initializes a new instance of the <see cref="Window"/> class.
     /// </summary>
-    public abstract class Window
+    /// <param name="name">The name/ID of this window.
+    /// If you have multiple windows with the same name, you will need to
+    /// append an unique ID to it by specifying it after "###" behind the window title.
+    /// </param>
+    /// <param name="flags">The <see cref="ImGuiWindowFlags"/> of this window.</param>
+    /// <param name="forceMainWindow">Whether or not this window should be limited to the main game window.</param>
+    protected Window(string name, ImGuiWindowFlags flags = ImGuiWindowFlags.None, bool forceMainWindow = false)
     {
-        private static bool wasEscPressedLastFrame = false;
+        this.WindowName = name;
+        this.Flags = flags;
+        this.ForceMainWindow = forceMainWindow;
+    }
 
-        private bool internalLastIsOpen = false;
-        private bool internalIsOpen = false;
+    /// <summary>
+    /// Gets or sets the namespace of the window.
+    /// </summary>
+    public string? Namespace { get; set; }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Window"/> class.
-        /// </summary>
-        /// <param name="name">The name/ID of this window.
-        /// If you have multiple windows with the same name, you will need to
-        /// append an unique ID to it by specifying it after "###" behind the window title.
-        /// </param>
-        /// <param name="flags">The <see cref="ImGuiWindowFlags"/> of this window.</param>
-        /// <param name="forceMainWindow">Whether or not this window should be limited to the main game window.</param>
-        protected Window(string name, ImGuiWindowFlags flags = ImGuiWindowFlags.None, bool forceMainWindow = false)
+    /// <summary>
+    /// Gets or sets the name of the window.
+    /// If you have multiple windows with the same name, you will need to
+    /// append an unique ID to it by specifying it after "###" behind the window title.
+    /// </summary>
+    public string WindowName { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the window is focused.
+    /// </summary>
+    public bool IsFocused { get; private set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this window is to be closed with a hotkey, like Escape, and keep game addons open in turn if it is closed.
+    /// </summary>
+    public bool RespectCloseHotkey { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the position of this window.
+    /// </summary>
+    public Vector2? Position { get; set; }
+
+    /// <summary>
+    /// Gets or sets the condition that defines when the position of this window is set.
+    /// </summary>
+    public ImGuiCond PositionCondition { get; set; }
+
+    /// <summary>
+    /// Gets or sets the size of the window. The size provided will be scaled by the global scale.
+    /// </summary>
+    public Vector2? Size { get; set; }
+
+    /// <summary>
+    /// Gets or sets the condition that defines when the size of this window is set.
+    /// </summary>
+    public ImGuiCond SizeCondition { get; set; }
+
+    /// <summary>
+    /// Gets or sets the size constraints of the window. The size constraints provided will be scaled by the global scale.
+    /// </summary>
+    public WindowSizeConstraints? SizeConstraints { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not this window is collapsed.
+    /// </summary>
+    public bool? Collapsed { get; set; }
+
+    /// <summary>
+    /// Gets or sets the condition that defines when the collapsed state of this window is set.
+    /// </summary>
+    public ImGuiCond CollapsedCondition { get; set; }
+
+    /// <summary>
+    /// Gets or sets the window flags.
+    /// </summary>
+    public ImGuiWindowFlags Flags { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not this ImGui window will be forced to stay inside the main game window.
+    /// </summary>
+    public bool ForceMainWindow { get; set; }
+
+    /// <summary>
+    /// Gets or sets this window's background alpha value.
+    /// </summary>
+    public float? BgAlpha { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not this ImGui window should display a close button in the title bar.
+    /// </summary>
+    public bool ShowCloseButton { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether or not this window will stay open.
+    /// </summary>
+    public bool IsOpen
+    {
+        get => this.internalIsOpen;
+        set => this.internalIsOpen = value;
+    }
+
+    /// <summary>
+    /// Toggle window is open state.
+    /// </summary>
+    public void Toggle()
+    {
+        this.IsOpen ^= true;
+    }
+
+    /// <summary>
+    /// Code to always be executed before the open-state of the window is checked.
+    /// </summary>
+    public virtual void PreOpenCheck()
+    {
+    }
+
+    /// <summary>
+    /// Additional conditions for the window to be drawn, regardless of its open-state.
+    /// </summary>
+    /// <returns>
+    /// True if the window should be drawn, false otherwise.
+    /// </returns>
+    /// <remarks>
+    /// Not being drawn due to failing this condition will not change focus or trigger OnClose.
+    /// This is checked before PreDraw, but after Update.
+    /// </remarks>
+    public virtual bool DrawConditions()
+    {
+        return true;
+    }
+
+    /// <summary>
+    /// Code to be executed before conditionals are applied and the window is drawn.
+    /// </summary>
+    public virtual void PreDraw()
+    {
+    }
+
+    /// <summary>
+    /// Code to be executed after the window is drawn.
+    /// </summary>
+    public virtual void PostDraw()
+    {
+    }
+
+    /// <summary>
+    /// Code to be executed every time the window renders.
+    /// </summary>
+    /// <remarks>
+    /// In this method, implement your drawing code.
+    /// You do NOT need to ImGui.Begin your window.
+    /// </remarks>
+    public abstract void Draw();
+
+    /// <summary>
+    /// Code to be executed when the window is opened.
+    /// </summary>
+    public virtual void OnOpen()
+    {
+    }
+
+    /// <summary>
+    /// Code to be executed when the window is closed.
+    /// </summary>
+    public virtual void OnClose()
+    {
+    }
+
+    /// <summary>
+    /// Code to be executed every frame, even when the window is collapsed.
+    /// </summary>
+    public virtual void Update()
+    {
+    }
+
+    /// <summary>
+    /// Draw the window via ImGui.
+    /// </summary>
+    internal void DrawInternal()
+    {
+        this.PreOpenCheck();
+
+        if (!this.IsOpen)
         {
-            this.WindowName = name;
-            this.Flags = flags;
-            this.ForceMainWindow = forceMainWindow;
-        }
-
-        /// <summary>
-        /// Gets or sets the namespace of the window.
-        /// </summary>
-        public string? Namespace { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the window.
-        /// If you have multiple windows with the same name, you will need to
-        /// append an unique ID to it by specifying it after "###" behind the window title.
-        /// </summary>
-        public string WindowName { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether the window is focused.
-        /// </summary>
-        public bool IsFocused { get; private set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this window is to be closed with a hotkey, like Escape, and keep game addons open in turn if it is closed.
-        /// </summary>
-        public bool RespectCloseHotkey { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the position of this window.
-        /// </summary>
-        public Vector2? Position { get; set; }
-
-        /// <summary>
-        /// Gets or sets the condition that defines when the position of this window is set.
-        /// </summary>
-        public ImGuiCond PositionCondition { get; set; }
-
-        /// <summary>
-        /// Gets or sets the size of the window. The size provided will be scaled by the global scale.
-        /// </summary>
-        public Vector2? Size { get; set; }
-
-        /// <summary>
-        /// Gets or sets the condition that defines when the size of this window is set.
-        /// </summary>
-        public ImGuiCond SizeCondition { get; set; }
-
-        /// <summary>
-        /// Gets or sets the size constraints of the window. The size constraints provided will be scaled by the global scale.
-        /// </summary>
-        public WindowSizeConstraints? SizeConstraints { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not this window is collapsed.
-        /// </summary>
-        public bool? Collapsed { get; set; }
-
-        /// <summary>
-        /// Gets or sets the condition that defines when the collapsed state of this window is set.
-        /// </summary>
-        public ImGuiCond CollapsedCondition { get; set; }
-
-        /// <summary>
-        /// Gets or sets the window flags.
-        /// </summary>
-        public ImGuiWindowFlags Flags { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not this ImGui window will be forced to stay inside the main game window.
-        /// </summary>
-        public bool ForceMainWindow { get; set; }
-
-        /// <summary>
-        /// Gets or sets this window's background alpha value.
-        /// </summary>
-        public float? BgAlpha { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not this ImGui window should display a close button in the title bar.
-        /// </summary>
-        public bool ShowCloseButton { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether or not this window will stay open.
-        /// </summary>
-        public bool IsOpen
-        {
-            get => this.internalIsOpen;
-            set => this.internalIsOpen = value;
-        }
-
-        /// <summary>
-        /// Toggle window is open state.
-        /// </summary>
-        public void Toggle()
-        {
-            this.IsOpen ^= true;
-        }
-
-        /// <summary>
-        /// Code to always be executed before the open-state of the window is checked.
-        /// </summary>
-        public virtual void PreOpenCheck()
-        {
-        }
-
-        /// <summary>
-        /// Additional conditions for the window to be drawn, regardless of its open-state.
-        /// </summary>
-        /// <returns>
-        /// True if the window should be drawn, false otherwise.
-        /// </returns>
-        /// <remarks>
-        /// Not being drawn due to failing this condition will not change focus or trigger OnClose.
-        /// This is checked before PreDraw, but after Update.
-        /// </remarks>
-        public virtual bool DrawConditions()
-        {
-            return true;
-        }
-
-        /// <summary>
-        /// Code to be executed before conditionals are applied and the window is drawn.
-        /// </summary>
-        public virtual void PreDraw()
-        {
-        }
-
-        /// <summary>
-        /// Code to be executed after the window is drawn.
-        /// </summary>
-        public virtual void PostDraw()
-        {
-        }
-
-        /// <summary>
-        /// Code to be executed every time the window renders.
-        /// </summary>
-        /// <remarks>
-        /// In this method, implement your drawing code.
-        /// You do NOT need to ImGui.Begin your window.
-        /// </remarks>
-        public abstract void Draw();
-
-        /// <summary>
-        /// Code to be executed when the window is opened.
-        /// </summary>
-        public virtual void OnOpen()
-        {
-        }
-
-        /// <summary>
-        /// Code to be executed when the window is closed.
-        /// </summary>
-        public virtual void OnClose()
-        {
-        }
-
-        /// <summary>
-        /// Code to be executed every frame, even when the window is collapsed.
-        /// </summary>
-        public virtual void Update()
-        {
-        }
-
-        /// <summary>
-        /// Draw the window via ImGui.
-        /// </summary>
-        internal void DrawInternal()
-        {
-            this.PreOpenCheck();
-
-            if (!this.IsOpen)
-            {
-                if (this.internalIsOpen != this.internalLastIsOpen)
-                {
-                    this.internalLastIsOpen = this.internalIsOpen;
-                    this.OnClose();
-
-                    this.IsFocused = false;
-                }
-
-                return;
-            }
-
-            this.Update();
-            if (!this.DrawConditions())
-                return;
-
-            var hasNamespace = !string.IsNullOrEmpty(this.Namespace);
-
-            if (hasNamespace)
-                ImGui.PushID(this.Namespace);
-
-            this.PreDraw();
-            this.ApplyConditionals();
-
-            if (this.ForceMainWindow)
-                ImGuiHelpers.ForceNextWindowMainViewport();
-
-            if (this.internalLastIsOpen != this.internalIsOpen && this.internalIsOpen)
+            if (this.internalIsOpen != this.internalLastIsOpen)
             {
                 this.internalLastIsOpen = this.internalIsOpen;
-                this.OnOpen();
+                this.OnClose();
+
+                this.IsFocused = false;
             }
 
-            var wasFocused = this.IsFocused;
-            if (wasFocused)
-            {
-                var style = ImGui.GetStyle();
-                var focusedHeaderColor = style.Colors[(int)ImGuiCol.TitleBgActive];
-                ImGui.PushStyleColor(ImGuiCol.TitleBgCollapsed, focusedHeaderColor);
-            }
-
-            if (this.ShowCloseButton ? ImGui.Begin(this.WindowName, ref this.internalIsOpen, this.Flags) : ImGui.Begin(this.WindowName, this.Flags))
-            {
-                // Draw the actual window contents
-                this.Draw();
-            }
-
-            if (wasFocused)
-            {
-                ImGui.PopStyleColor();
-            }
-
-            this.IsFocused = ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows);
-
-            var escapeDown = Service<KeyState>.Get()[VirtualKey.ESCAPE];
-            var isAllowed = Service<DalamudConfiguration>.Get().IsFocusManagementEnabled;
-            if (escapeDown && this.IsFocused && isAllowed && !wasEscPressedLastFrame && this.RespectCloseHotkey)
-            {
-                this.IsOpen = false;
-                wasEscPressedLastFrame = true;
-            }
-            else if (!escapeDown && wasEscPressedLastFrame)
-            {
-                wasEscPressedLastFrame = false;
-            }
-
-            ImGui.End();
-
-            this.PostDraw();
-
-            if (hasNamespace)
-                ImGui.PopID();
+            return;
         }
 
-        // private void CheckState()
-        // {
-        //     if (this.internalLastIsOpen != this.internalIsOpen)
-        //     {
-        //         if (this.internalIsOpen)
-        //         {
-        //             this.OnOpen();
-        //         }
-        //         else
-        //         {
-        //             this.OnClose();
-        //         }
-        //     }
-        // }
+        this.Update();
+        if (!this.DrawConditions())
+            return;
 
-        private void ApplyConditionals()
+        var hasNamespace = !string.IsNullOrEmpty(this.Namespace);
+
+        if (hasNamespace)
+            ImGui.PushID(this.Namespace);
+
+        this.PreDraw();
+        this.ApplyConditionals();
+
+        if (this.ForceMainWindow)
+            ImGuiHelpers.ForceNextWindowMainViewport();
+
+        if (this.internalLastIsOpen != this.internalIsOpen && this.internalIsOpen)
         {
-            if (this.Position.HasValue)
-            {
-                var pos = this.Position.Value;
-
-                if (this.ForceMainWindow)
-                    pos += ImGuiHelpers.MainViewport.Pos;
-
-                ImGui.SetNextWindowPos(pos, this.PositionCondition);
-            }
-
-            if (this.Size.HasValue)
-            {
-                ImGui.SetNextWindowSize(this.Size.Value * ImGuiHelpers.GlobalScale, this.SizeCondition);
-            }
-
-            if (this.Collapsed.HasValue)
-            {
-                ImGui.SetNextWindowCollapsed(this.Collapsed.Value, this.CollapsedCondition);
-            }
-
-            if (this.SizeConstraints.HasValue)
-            {
-                ImGui.SetNextWindowSizeConstraints(this.SizeConstraints.Value.MinimumSize * ImGuiHelpers.GlobalScale, this.SizeConstraints.Value.MaximumSize * ImGuiHelpers.GlobalScale);
-            }
-
-            if (this.BgAlpha.HasValue)
-            {
-                ImGui.SetNextWindowBgAlpha(this.BgAlpha.Value);
-            }
+            this.internalLastIsOpen = this.internalIsOpen;
+            this.OnOpen();
         }
 
-        /// <summary>
-        /// Structure detailing the size constraints of a window.
-        /// </summary>
-        public struct WindowSizeConstraints
+        var wasFocused = this.IsFocused;
+        if (wasFocused)
         {
-            /// <summary>
-            /// Gets or sets the minimum size of the window.
-            /// </summary>
-            public Vector2 MinimumSize { get; set; }
+            var style = ImGui.GetStyle();
+            var focusedHeaderColor = style.Colors[(int)ImGuiCol.TitleBgActive];
+            ImGui.PushStyleColor(ImGuiCol.TitleBgCollapsed, focusedHeaderColor);
+        }
 
-            /// <summary>
-            /// Gets or sets the maximum size of the window.
-            /// </summary>
-            public Vector2 MaximumSize { get; set; }
+        if (this.ShowCloseButton ? ImGui.Begin(this.WindowName, ref this.internalIsOpen, this.Flags) : ImGui.Begin(this.WindowName, this.Flags))
+        {
+            // Draw the actual window contents
+            this.Draw();
+        }
+
+        if (wasFocused)
+        {
+            ImGui.PopStyleColor();
+        }
+
+        this.IsFocused = ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows);
+
+        var escapeDown = Service<KeyState>.Get()[VirtualKey.ESCAPE];
+        var isAllowed = Service<DalamudConfiguration>.Get().IsFocusManagementEnabled;
+        if (escapeDown && this.IsFocused && isAllowed && !wasEscPressedLastFrame && this.RespectCloseHotkey)
+        {
+            this.IsOpen = false;
+            wasEscPressedLastFrame = true;
+        }
+        else if (!escapeDown && wasEscPressedLastFrame)
+        {
+            wasEscPressedLastFrame = false;
+        }
+
+        ImGui.End();
+
+        this.PostDraw();
+
+        if (hasNamespace)
+            ImGui.PopID();
+    }
+
+    // private void CheckState()
+    // {
+    //     if (this.internalLastIsOpen != this.internalIsOpen)
+    //     {
+    //         if (this.internalIsOpen)
+    //         {
+    //             this.OnOpen();
+    //         }
+    //         else
+    //         {
+    //             this.OnClose();
+    //         }
+    //     }
+    // }
+
+    private void ApplyConditionals()
+    {
+        if (this.Position.HasValue)
+        {
+            var pos = this.Position.Value;
+
+            if (this.ForceMainWindow)
+                pos += ImGuiHelpers.MainViewport.Pos;
+
+            ImGui.SetNextWindowPos(pos, this.PositionCondition);
+        }
+
+        if (this.Size.HasValue)
+        {
+            ImGui.SetNextWindowSize(this.Size.Value * ImGuiHelpers.GlobalScale, this.SizeCondition);
+        }
+
+        if (this.Collapsed.HasValue)
+        {
+            ImGui.SetNextWindowCollapsed(this.Collapsed.Value, this.CollapsedCondition);
+        }
+
+        if (this.SizeConstraints.HasValue)
+        {
+            ImGui.SetNextWindowSizeConstraints(this.SizeConstraints.Value.MinimumSize * ImGuiHelpers.GlobalScale, this.SizeConstraints.Value.MaximumSize * ImGuiHelpers.GlobalScale);
+        }
+
+        if (this.BgAlpha.HasValue)
+        {
+            ImGui.SetNextWindowBgAlpha(this.BgAlpha.Value);
         }
     }
+
+    /// <summary>
+    /// Structure detailing the size constraints of a window.
+    /// </summary>
+    public struct WindowSizeConstraints
+    {
+        /// <summary>
+        /// Gets or sets the minimum size of the window.
+        /// </summary>
+        public Vector2 MinimumSize { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum size of the window.
+        /// </summary>
+        public Vector2 MaximumSize { get; set; }
+    }
 }
diff --git a/Dalamud/Interface/Windowing/WindowSystem.cs b/Dalamud/Interface/Windowing/WindowSystem.cs
index b43194b22..3d53d974e 100644
--- a/Dalamud/Interface/Windowing/WindowSystem.cs
+++ b/Dalamud/Interface/Windowing/WindowSystem.cs
@@ -6,147 +6,146 @@ using Dalamud.Interface.Internal.ManagedAsserts;
 using ImGuiNET;
 using Serilog;
 
-namespace Dalamud.Interface.Windowing
+namespace Dalamud.Interface.Windowing;
+
+/// <summary>
+/// Class running a WindowSystem using <see cref="Window"/> implementations to simplify ImGui windowing.
+/// </summary>
+public class WindowSystem
 {
+    private static DateTimeOffset lastAnyFocus;
+
+    private readonly List<Window> windows = new();
+
+    private string lastFocusedWindowName = string.Empty;
+
     /// <summary>
-    /// Class running a WindowSystem using <see cref="Window"/> implementations to simplify ImGui windowing.
+    /// Initializes a new instance of the <see cref="WindowSystem"/> class.
     /// </summary>
-    public class WindowSystem
+    /// <param name="imNamespace">The name/ID-space of this <see cref="WindowSystem"/>.</param>
+    public WindowSystem(string? imNamespace = null)
     {
-        private static DateTimeOffset lastAnyFocus;
+        this.Namespace = imNamespace;
+    }
 
-        private readonly List<Window> windows = new();
+    /// <summary>
+    /// Gets a value indicating whether any <see cref="WindowSystem"/> contains any <see cref="Window"/>
+    /// that has focus and is not marked to be excluded from consideration.
+    /// </summary>
+    public static bool HasAnyWindowSystemFocus { get; internal set; } = false;
 
-        private string lastFocusedWindowName = string.Empty;
+    /// <summary>
+    /// Gets the name of the currently focused window system that is redirecting normal escape functionality.
+    /// </summary>
+    public static string FocusedWindowSystemNamespace { get; internal set; } = string.Empty;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WindowSystem"/> class.
-        /// </summary>
-        /// <param name="imNamespace">The name/ID-space of this <see cref="WindowSystem"/>.</param>
-        public WindowSystem(string? imNamespace = null)
+    /// <summary>
+    /// Gets the timespan since the last time any window was focused.
+    /// </summary>
+    public static TimeSpan TimeSinceLastAnyFocus => DateTimeOffset.Now - lastAnyFocus;
+
+    /// <summary>
+    /// Gets a read-only list of all <see cref="Window"/>s in this <see cref="WindowSystem"/>.
+    /// </summary>
+    public IReadOnlyList<Window> Windows => this.windows;
+
+    /// <summary>
+    /// Gets a value indicating whether any window in this <see cref="WindowSystem"/> has focus and is
+    /// not marked to be excluded from consideration.
+    /// </summary>
+    public bool HasAnyFocus { get; private set; }
+
+    /// <summary>
+    /// Gets or sets the name/ID-space of this <see cref="WindowSystem"/>.
+    /// </summary>
+    public string? Namespace { get; set; }
+
+    /// <summary>
+    /// Add a window to this <see cref="WindowSystem"/>.
+    /// </summary>
+    /// <param name="window">The window to add.</param>
+    public void AddWindow(Window window)
+    {
+        if (this.windows.Any(x => x.WindowName == window.WindowName))
+            throw new ArgumentException("A window with this name/ID already exists.");
+
+        this.windows.Add(window);
+    }
+
+    /// <summary>
+    /// Remove a window from this <see cref="WindowSystem"/>.
+    /// </summary>
+    /// <param name="window">The window to remove.</param>
+    public void RemoveWindow(Window window)
+    {
+        if (!this.windows.Contains(window))
+            throw new ArgumentException("This window is not registered on this WindowSystem.");
+
+        this.windows.Remove(window);
+    }
+
+    /// <summary>
+    /// Remove all windows from this <see cref="WindowSystem"/>.
+    /// </summary>
+    public void RemoveAllWindows() => this.windows.Clear();
+
+    /// <summary>
+    /// Get a window by name.
+    /// </summary>
+    /// <param name="windowName">The name of the <see cref="Window"/>.</param>
+    /// <returns>The <see cref="Window"/> object with matching name or null.</returns>
+    public Window? GetWindow(string windowName) => this.windows.FirstOrDefault(w => w.WindowName == windowName);
+
+    /// <summary>
+    /// Draw all registered windows using ImGui.
+    /// </summary>
+    public void Draw()
+    {
+        var hasNamespace = !string.IsNullOrEmpty(this.Namespace);
+
+        if (hasNamespace)
+            ImGui.PushID(this.Namespace);
+
+        // Shallow clone the list of windows so that we can edit it without modifying it while the loop is iterating
+        foreach (var window in this.windows.ToArray())
         {
-            this.Namespace = imNamespace;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether any <see cref="WindowSystem"/> contains any <see cref="Window"/>
-        /// that has focus and is not marked to be excluded from consideration.
-        /// </summary>
-        public static bool HasAnyWindowSystemFocus { get; internal set; } = false;
-
-        /// <summary>
-        /// Gets the name of the currently focused window system that is redirecting normal escape functionality.
-        /// </summary>
-        public static string FocusedWindowSystemNamespace { get; internal set; } = string.Empty;
-
-        /// <summary>
-        /// Gets the timespan since the last time any window was focused.
-        /// </summary>
-        public static TimeSpan TimeSinceLastAnyFocus => DateTimeOffset.Now - lastAnyFocus;
-
-        /// <summary>
-        /// Gets a read-only list of all <see cref="Window"/>s in this <see cref="WindowSystem"/>.
-        /// </summary>
-        public IReadOnlyList<Window> Windows => this.windows;
-
-        /// <summary>
-        /// Gets a value indicating whether any window in this <see cref="WindowSystem"/> has focus and is
-        /// not marked to be excluded from consideration.
-        /// </summary>
-        public bool HasAnyFocus { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the name/ID-space of this <see cref="WindowSystem"/>.
-        /// </summary>
-        public string? Namespace { get; set; }
-
-        /// <summary>
-        /// Add a window to this <see cref="WindowSystem"/>.
-        /// </summary>
-        /// <param name="window">The window to add.</param>
-        public void AddWindow(Window window)
-        {
-            if (this.windows.Any(x => x.WindowName == window.WindowName))
-                throw new ArgumentException("A window with this name/ID already exists.");
-
-            this.windows.Add(window);
-        }
-
-        /// <summary>
-        /// Remove a window from this <see cref="WindowSystem"/>.
-        /// </summary>
-        /// <param name="window">The window to remove.</param>
-        public void RemoveWindow(Window window)
-        {
-            if (!this.windows.Contains(window))
-                throw new ArgumentException("This window is not registered on this WindowSystem.");
-
-            this.windows.Remove(window);
-        }
-
-        /// <summary>
-        /// Remove all windows from this <see cref="WindowSystem"/>.
-        /// </summary>
-        public void RemoveAllWindows() => this.windows.Clear();
-
-        /// <summary>
-        /// Get a window by name.
-        /// </summary>
-        /// <param name="windowName">The name of the <see cref="Window"/>.</param>
-        /// <returns>The <see cref="Window"/> object with matching name or null.</returns>
-        public Window? GetWindow(string windowName) => this.windows.FirstOrDefault(w => w.WindowName == windowName);
-
-        /// <summary>
-        /// Draw all registered windows using ImGui.
-        /// </summary>
-        public void Draw()
-        {
-            var hasNamespace = !string.IsNullOrEmpty(this.Namespace);
-
-            if (hasNamespace)
-                ImGui.PushID(this.Namespace);
-
-            // Shallow clone the list of windows so that we can edit it without modifying it while the loop is iterating
-            foreach (var window in this.windows.ToArray())
-            {
 #if DEBUG
                 // Log.Verbose($"[WS{(hasNamespace ? "/" + this.Namespace : string.Empty)}] Drawing {window.WindowName}");
 #endif
-                var snapshot = ImGuiManagedAsserts.GetSnapshot();
+            var snapshot = ImGuiManagedAsserts.GetSnapshot();
 
-                window.DrawInternal();
+            window.DrawInternal();
 
-                var source = ($"{this.Namespace}::" ?? string.Empty) + window.WindowName;
-                ImGuiManagedAsserts.ReportProblems(source, snapshot);
-            }
-
-            var focusedWindow = this.windows.FirstOrDefault(window => window.IsFocused && window.RespectCloseHotkey);
-            this.HasAnyFocus = focusedWindow != default;
-
-            if (this.HasAnyFocus)
-            {
-                if (this.lastFocusedWindowName != focusedWindow.WindowName)
-                {
-                    Log.Verbose($"WindowSystem \"{this.Namespace}\" Window \"{focusedWindow.WindowName}\" has focus now");
-                    this.lastFocusedWindowName = focusedWindow.WindowName;
-                }
-
-                HasAnyWindowSystemFocus = true;
-                FocusedWindowSystemNamespace = this.Namespace;
-
-                lastAnyFocus = DateTimeOffset.Now;
-            }
-            else
-            {
-                if (this.lastFocusedWindowName != string.Empty)
-                {
-                    Log.Verbose($"WindowSystem \"{this.Namespace}\" Window \"{this.lastFocusedWindowName}\" lost focus");
-                    this.lastFocusedWindowName = string.Empty;
-                }
-            }
-
-            if (hasNamespace)
-                ImGui.PopID();
+            var source = ($"{this.Namespace}::" ?? string.Empty) + window.WindowName;
+            ImGuiManagedAsserts.ReportProblems(source, snapshot);
         }
+
+        var focusedWindow = this.windows.FirstOrDefault(window => window.IsFocused && window.RespectCloseHotkey);
+        this.HasAnyFocus = focusedWindow != default;
+
+        if (this.HasAnyFocus)
+        {
+            if (this.lastFocusedWindowName != focusedWindow.WindowName)
+            {
+                Log.Verbose($"WindowSystem \"{this.Namespace}\" Window \"{focusedWindow.WindowName}\" has focus now");
+                this.lastFocusedWindowName = focusedWindow.WindowName;
+            }
+
+            HasAnyWindowSystemFocus = true;
+            FocusedWindowSystemNamespace = this.Namespace;
+
+            lastAnyFocus = DateTimeOffset.Now;
+        }
+        else
+        {
+            if (this.lastFocusedWindowName != string.Empty)
+            {
+                Log.Verbose($"WindowSystem \"{this.Namespace}\" Window \"{this.lastFocusedWindowName}\" lost focus");
+                this.lastFocusedWindowName = string.Empty;
+            }
+        }
+
+        if (hasNamespace)
+            ImGui.PopID();
     }
 }
diff --git a/Dalamud/IoC/Internal/InterfaceVersionAttribute.cs b/Dalamud/IoC/Internal/InterfaceVersionAttribute.cs
index f6e6c1001..db69e17aa 100644
--- a/Dalamud/IoC/Internal/InterfaceVersionAttribute.cs
+++ b/Dalamud/IoC/Internal/InterfaceVersionAttribute.cs
@@ -1,25 +1,24 @@
 using System;
 
-namespace Dalamud.IoC.Internal
+namespace Dalamud.IoC.Internal;
+
+/// <summary>
+/// This attribute represents the current version of a module that is loaded in the Service Locator.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface)]
+internal class InterfaceVersionAttribute : Attribute
 {
     /// <summary>
-    /// This attribute represents the current version of a module that is loaded in the Service Locator.
+    /// Initializes a new instance of the <see cref="InterfaceVersionAttribute"/> class.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface)]
-    internal class InterfaceVersionAttribute : Attribute
+    /// <param name="version">The current version.</param>
+    public InterfaceVersionAttribute(string version)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InterfaceVersionAttribute"/> class.
-        /// </summary>
-        /// <param name="version">The current version.</param>
-        public InterfaceVersionAttribute(string version)
-        {
-            this.Version = new(version);
-        }
-
-        /// <summary>
-        /// Gets the service version.
-        /// </summary>
-        public Version Version { get; }
+        this.Version = new(version);
     }
+
+    /// <summary>
+    /// Gets the service version.
+    /// </summary>
+    public Version Version { get; }
 }
diff --git a/Dalamud/IoC/Internal/ObjectInstance.cs b/Dalamud/IoC/Internal/ObjectInstance.cs
index e92af8c5b..857a5b682 100644
--- a/Dalamud/IoC/Internal/ObjectInstance.cs
+++ b/Dalamud/IoC/Internal/ObjectInstance.cs
@@ -2,33 +2,32 @@ using System;
 using System.Reflection;
 using System.Threading.Tasks;
 
-namespace Dalamud.IoC.Internal
+namespace Dalamud.IoC.Internal;
+
+/// <summary>
+/// An object instance registered in the <see cref="ServiceContainer"/>.
+/// </summary>
+internal class ObjectInstance
 {
     /// <summary>
-    /// An object instance registered in the <see cref="ServiceContainer"/>.
+    /// Initializes a new instance of the <see cref="ObjectInstance"/> class.
     /// </summary>
-    internal class ObjectInstance
+    /// <param name="instanceTask">Weak reference to the underlying instance.</param>
+    /// <param name="type">Type of the underlying instance.</param>
+    public ObjectInstance(Task<WeakReference> instanceTask, Type type)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObjectInstance"/> class.
-        /// </summary>
-        /// <param name="instanceTask">Weak reference to the underlying instance.</param>
-        /// <param name="type">Type of the underlying instance.</param>
-        public ObjectInstance(Task<WeakReference> instanceTask, Type type)
-        {
-            this.InstanceTask = instanceTask;
-            this.Version = type.GetCustomAttribute<InterfaceVersionAttribute>();
-        }
-
-        /// <summary>
-        /// Gets the current version of the instance, if it exists.
-        /// </summary>
-        public InterfaceVersionAttribute? Version { get; }
-
-        /// <summary>
-        /// Gets a reference to the underlying instance.
-        /// </summary>
-        /// <returns>The underlying instance.</returns>
-        public Task<WeakReference> InstanceTask { get; }
+        this.InstanceTask = instanceTask;
+        this.Version = type.GetCustomAttribute<InterfaceVersionAttribute>();
     }
+
+    /// <summary>
+    /// Gets the current version of the instance, if it exists.
+    /// </summary>
+    public InterfaceVersionAttribute? Version { get; }
+
+    /// <summary>
+    /// Gets a reference to the underlying instance.
+    /// </summary>
+    /// <returns>The underlying instance.</returns>
+    public Task<WeakReference> InstanceTask { get; }
 }
diff --git a/Dalamud/IoC/Internal/ServiceContainer.cs b/Dalamud/IoC/Internal/ServiceContainer.cs
index a04756851..041049643 100644
--- a/Dalamud/IoC/Internal/ServiceContainer.cs
+++ b/Dalamud/IoC/Internal/ServiceContainer.cs
@@ -7,236 +7,235 @@ using System.Threading.Tasks;
 
 using Dalamud.Logging.Internal;
 
-namespace Dalamud.IoC.Internal
+namespace Dalamud.IoC.Internal;
+
+/// <summary>
+/// A simple singleton-only IOC container that provides (optional) version-based dependency resolution.
+/// </summary>
+internal class ServiceContainer : IServiceProvider, IServiceType
 {
+    private static readonly ModuleLog Log = new("SERVICECONTAINER");
+
+    private readonly Dictionary<Type, ObjectInstance> instances = new();
+
     /// <summary>
-    /// A simple singleton-only IOC container that provides (optional) version-based dependency resolution.
+    /// Initializes a new instance of the <see cref="ServiceContainer"/> class.
     /// </summary>
-    internal class ServiceContainer : IServiceProvider, IServiceType
+    public ServiceContainer()
     {
-        private static readonly ModuleLog Log = new("SERVICECONTAINER");
+    }
 
-        private readonly Dictionary<Type, ObjectInstance> instances = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceContainer"/> class.
-        /// </summary>
-        public ServiceContainer()
+    /// <summary>
+    /// Register a singleton object of any type into the current IOC container.
+    /// </summary>
+    /// <param name="instance">The existing instance to register in the container.</param>
+    /// <typeparam name="T">The interface to register.</typeparam>
+    public void RegisterSingleton<T>(Task<T> instance)
+    {
+        if (instance == null)
         {
+            throw new ArgumentNullException(nameof(instance));
         }
 
-        /// <summary>
-        /// Register a singleton object of any type into the current IOC container.
-        /// </summary>
-        /// <param name="instance">The existing instance to register in the container.</param>
-        /// <typeparam name="T">The interface to register.</typeparam>
-        public void RegisterSingleton<T>(Task<T> instance)
+        this.instances[typeof(T)] = new(instance.ContinueWith(x => new WeakReference(x.Result)), typeof(T));
+    }
+
+    /// <summary>
+    /// Create an object.
+    /// </summary>
+    /// <param name="objectType">The type of object to create.</param>
+    /// <param name="scopedObjects">Scoped objects to be included in the constructor.</param>
+    /// <returns>The created object.</returns>
+    public async Task<object?> CreateAsync(Type objectType, params object[] scopedObjects)
+    {
+        var ctor = this.FindApplicableCtor(objectType, scopedObjects);
+        if (ctor == null)
         {
-            if (instance == null)
-            {
-                throw new ArgumentNullException(nameof(instance));
-            }
-
-            this.instances[typeof(T)] = new(instance.ContinueWith(x => new WeakReference(x.Result)), typeof(T));
-        }
-
-        /// <summary>
-        /// Create an object.
-        /// </summary>
-        /// <param name="objectType">The type of object to create.</param>
-        /// <param name="scopedObjects">Scoped objects to be included in the constructor.</param>
-        /// <returns>The created object.</returns>
-        public async Task<object?> CreateAsync(Type objectType, params object[] scopedObjects)
-        {
-            var ctor = this.FindApplicableCtor(objectType, scopedObjects);
-            if (ctor == null)
-            {
-                Log.Error("Failed to create {TypeName}, an eligible ctor with satisfiable services could not be found", objectType.FullName!);
-                return null;
-            }
-
-            // validate dependency versions (if they exist)
-            var parameters = ctor.GetParameters().Select(p =>
-            {
-                var parameterType = p.ParameterType;
-                var requiredVersion = p.GetCustomAttribute(typeof(RequiredVersionAttribute)) as RequiredVersionAttribute;
-                return (parameterType, requiredVersion);
-            }).ToList();
-
-            var versionCheck = parameters.All(p => CheckInterfaceVersion(p.requiredVersion, p.parameterType));
-
-            if (!versionCheck)
-            {
-                Log.Error("Failed to create {TypeName}, a RequestedVersion could not be satisfied", objectType.FullName!);
-                return null;
-            }
-
-            var resolvedParams =
-                await Task.WhenAll(
-                    parameters
-                        .Select(async p =>
-                        {
-                            var service = await this.GetService(p.parameterType, scopedObjects);
-
-                            if (service == null)
-                            {
-                                Log.Error("Requested service type {TypeName} was not available (null)", p.parameterType.FullName!);
-                            }
-
-                            return service;
-                        }));
-
-            var hasNull = resolvedParams.Any(p => p == null);
-            if (hasNull)
-            {
-                Log.Error("Failed to create {TypeName}, a requested service type could not be satisfied", objectType.FullName!);
-                return null;
-            }
-
-            var instance = FormatterServices.GetUninitializedObject(objectType);
-
-            if (!await this.InjectProperties(instance, scopedObjects))
-            {
-                Log.Error("Failed to create {TypeName}, a requested property service type could not be satisfied", objectType.FullName!);
-                return null;
-            }
-
-            ctor.Invoke(instance, resolvedParams);
-
-            return instance;
-        }
-
-        /// <summary>
-        /// Inject <see cref="PluginInterfaceAttribute"/> interfaces into public or static properties on the provided object.
-        /// The properties have to be marked with the <see cref="PluginServiceAttribute"/>.
-        /// The properties can be marked with the <see cref="RequiredVersionAttribute"/> to lock down versions.
-        /// </summary>
-        /// <param name="instance">The object instance.</param>
-        /// <param name="scopedObjects">Scoped objects.</param>
-        /// <returns>Whether or not the injection was successful.</returns>
-        public async Task<bool> InjectProperties(object instance, params object[] scopedObjects)
-        {
-            var objectType = instance.GetType();
-
-            var props = objectType.GetProperties(BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public |
-                                                 BindingFlags.NonPublic).Where(x => x.GetCustomAttributes(typeof(PluginServiceAttribute)).Any()).Select(
-                propertyInfo =>
-                {
-                    var requiredVersion = propertyInfo.GetCustomAttribute(typeof(RequiredVersionAttribute)) as RequiredVersionAttribute;
-                    return (propertyInfo, requiredVersion);
-                }).ToArray();
-
-            var versionCheck = props.All(x => CheckInterfaceVersion(x.requiredVersion, x.propertyInfo.PropertyType));
-
-            if (!versionCheck)
-            {
-                Log.Error("Failed to create {TypeName}, a RequestedVersion could not be satisfied", objectType.FullName!);
-                return false;
-            }
-
-            foreach (var prop in props)
-            {
-                var service = await this.GetService(prop.propertyInfo.PropertyType, scopedObjects);
-
-                if (service == null)
-                {
-                    Log.Error("Requested service type {TypeName} was not available (null)", prop.propertyInfo.PropertyType.FullName!);
-                    return false;
-                }
-
-                prop.propertyInfo.SetValue(instance, service);
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc/>
-        object? IServiceProvider.GetService(Type serviceType) => this.GetService(serviceType);
-
-        private static bool CheckInterfaceVersion(RequiredVersionAttribute? requiredVersion, Type parameterType)
-        {
-            // if there's no required version, ignore it
-            if (requiredVersion == null)
-                return true;
-
-            // if there's no requested version, ignore it
-            var declVersion = parameterType.GetCustomAttribute<InterfaceVersionAttribute>();
-            if (declVersion == null)
-                return true;
-
-            if (declVersion.Version == requiredVersion.Version)
-                return true;
-
-            Log.Error(
-                "Requested version {ReqVersion} does not match the implemented version {ImplVersion} for param type {ParamType}",
-                requiredVersion.Version,
-                declVersion.Version,
-                parameterType.FullName!);
-
-            return false;
-        }
-
-        private async Task<object?> GetService(Type serviceType, object[] scopedObjects)
-        {
-            var singletonService = await this.GetService(serviceType);
-            if (singletonService != null)
-            {
-                return singletonService;
-            }
-
-            // resolve dependency from scoped objects
-            var scoped = scopedObjects.FirstOrDefault(o => o.GetType() == serviceType);
-            if (scoped == default)
-            {
-                return null;
-            }
-
-            return scoped;
-        }
-
-        private async Task<object?> GetService(Type serviceType)
-        {
-            if (!this.instances.TryGetValue(serviceType, out var service))
-                return null;
-
-            var instance = await service.InstanceTask;
-            return instance.Target;
-        }
-
-        private ConstructorInfo? FindApplicableCtor(Type type, object[] scopedObjects)
-        {
-            // get a list of all the available types: scoped and singleton
-            var types = scopedObjects
-                .Select(o => o.GetType())
-                .Union(this.instances.Keys)
-                .ToArray();
-
-            var ctors = type.GetConstructors(BindingFlags.Public | BindingFlags.Instance);
-            foreach (var ctor in ctors)
-            {
-                if (this.ValidateCtor(ctor, types))
-                {
-                    return ctor;
-                }
-            }
-
+            Log.Error("Failed to create {TypeName}, an eligible ctor with satisfiable services could not be found", objectType.FullName!);
             return null;
         }
 
-        private bool ValidateCtor(ConstructorInfo ctor, Type[] types)
+        // validate dependency versions (if they exist)
+        var parameters = ctor.GetParameters().Select(p =>
         {
-            var parameters = ctor.GetParameters();
-            foreach (var parameter in parameters)
+            var parameterType = p.ParameterType;
+            var requiredVersion = p.GetCustomAttribute(typeof(RequiredVersionAttribute)) as RequiredVersionAttribute;
+            return (parameterType, requiredVersion);
+        }).ToList();
+
+        var versionCheck = parameters.All(p => CheckInterfaceVersion(p.requiredVersion, p.parameterType));
+
+        if (!versionCheck)
+        {
+            Log.Error("Failed to create {TypeName}, a RequestedVersion could not be satisfied", objectType.FullName!);
+            return null;
+        }
+
+        var resolvedParams =
+            await Task.WhenAll(
+                parameters
+                    .Select(async p =>
+                    {
+                        var service = await this.GetService(p.parameterType, scopedObjects);
+
+                        if (service == null)
+                        {
+                            Log.Error("Requested service type {TypeName} was not available (null)", p.parameterType.FullName!);
+                        }
+
+                        return service;
+                    }));
+
+        var hasNull = resolvedParams.Any(p => p == null);
+        if (hasNull)
+        {
+            Log.Error("Failed to create {TypeName}, a requested service type could not be satisfied", objectType.FullName!);
+            return null;
+        }
+
+        var instance = FormatterServices.GetUninitializedObject(objectType);
+
+        if (!await this.InjectProperties(instance, scopedObjects))
+        {
+            Log.Error("Failed to create {TypeName}, a requested property service type could not be satisfied", objectType.FullName!);
+            return null;
+        }
+
+        ctor.Invoke(instance, resolvedParams);
+
+        return instance;
+    }
+
+    /// <summary>
+    /// Inject <see cref="PluginInterfaceAttribute"/> interfaces into public or static properties on the provided object.
+    /// The properties have to be marked with the <see cref="PluginServiceAttribute"/>.
+    /// The properties can be marked with the <see cref="RequiredVersionAttribute"/> to lock down versions.
+    /// </summary>
+    /// <param name="instance">The object instance.</param>
+    /// <param name="scopedObjects">Scoped objects.</param>
+    /// <returns>Whether or not the injection was successful.</returns>
+    public async Task<bool> InjectProperties(object instance, params object[] scopedObjects)
+    {
+        var objectType = instance.GetType();
+
+        var props = objectType.GetProperties(BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public |
+                                             BindingFlags.NonPublic).Where(x => x.GetCustomAttributes(typeof(PluginServiceAttribute)).Any()).Select(
+            propertyInfo =>
             {
-                var contains = types.Contains(parameter.ParameterType);
-                if (!contains)
-                {
-                    Log.Error("Failed to validate {TypeName}, unable to find any services that satisfy the type", parameter.ParameterType.FullName!);
-                    return false;
-                }
+                var requiredVersion = propertyInfo.GetCustomAttribute(typeof(RequiredVersionAttribute)) as RequiredVersionAttribute;
+                return (propertyInfo, requiredVersion);
+            }).ToArray();
+
+        var versionCheck = props.All(x => CheckInterfaceVersion(x.requiredVersion, x.propertyInfo.PropertyType));
+
+        if (!versionCheck)
+        {
+            Log.Error("Failed to create {TypeName}, a RequestedVersion could not be satisfied", objectType.FullName!);
+            return false;
+        }
+
+        foreach (var prop in props)
+        {
+            var service = await this.GetService(prop.propertyInfo.PropertyType, scopedObjects);
+
+            if (service == null)
+            {
+                Log.Error("Requested service type {TypeName} was not available (null)", prop.propertyInfo.PropertyType.FullName!);
+                return false;
             }
 
-            return true;
+            prop.propertyInfo.SetValue(instance, service);
         }
+
+        return true;
+    }
+
+    /// <inheritdoc/>
+    object? IServiceProvider.GetService(Type serviceType) => this.GetService(serviceType);
+
+    private static bool CheckInterfaceVersion(RequiredVersionAttribute? requiredVersion, Type parameterType)
+    {
+        // if there's no required version, ignore it
+        if (requiredVersion == null)
+            return true;
+
+        // if there's no requested version, ignore it
+        var declVersion = parameterType.GetCustomAttribute<InterfaceVersionAttribute>();
+        if (declVersion == null)
+            return true;
+
+        if (declVersion.Version == requiredVersion.Version)
+            return true;
+
+        Log.Error(
+            "Requested version {ReqVersion} does not match the implemented version {ImplVersion} for param type {ParamType}",
+            requiredVersion.Version,
+            declVersion.Version,
+            parameterType.FullName!);
+
+        return false;
+    }
+
+    private async Task<object?> GetService(Type serviceType, object[] scopedObjects)
+    {
+        var singletonService = await this.GetService(serviceType);
+        if (singletonService != null)
+        {
+            return singletonService;
+        }
+
+        // resolve dependency from scoped objects
+        var scoped = scopedObjects.FirstOrDefault(o => o.GetType() == serviceType);
+        if (scoped == default)
+        {
+            return null;
+        }
+
+        return scoped;
+    }
+
+    private async Task<object?> GetService(Type serviceType)
+    {
+        if (!this.instances.TryGetValue(serviceType, out var service))
+            return null;
+
+        var instance = await service.InstanceTask;
+        return instance.Target;
+    }
+
+    private ConstructorInfo? FindApplicableCtor(Type type, object[] scopedObjects)
+    {
+        // get a list of all the available types: scoped and singleton
+        var types = scopedObjects
+                    .Select(o => o.GetType())
+                    .Union(this.instances.Keys)
+                    .ToArray();
+
+        var ctors = type.GetConstructors(BindingFlags.Public | BindingFlags.Instance);
+        foreach (var ctor in ctors)
+        {
+            if (this.ValidateCtor(ctor, types))
+            {
+                return ctor;
+            }
+        }
+
+        return null;
+    }
+
+    private bool ValidateCtor(ConstructorInfo ctor, Type[] types)
+    {
+        var parameters = ctor.GetParameters();
+        foreach (var parameter in parameters)
+        {
+            var contains = types.Contains(parameter.ParameterType);
+            if (!contains)
+            {
+                Log.Error("Failed to validate {TypeName}, unable to find any services that satisfy the type", parameter.ParameterType.FullName!);
+                return false;
+            }
+        }
+
+        return true;
     }
 }
diff --git a/Dalamud/IoC/PluginInterfaceAttribute.cs b/Dalamud/IoC/PluginInterfaceAttribute.cs
index 98d330117..1711a5e84 100644
--- a/Dalamud/IoC/PluginInterfaceAttribute.cs
+++ b/Dalamud/IoC/PluginInterfaceAttribute.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace Dalamud.IoC
+namespace Dalamud.IoC;
+
+/// <summary>
+/// This attribute indicates whether the decorated class should be exposed to plugins via IoC.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public class PluginInterfaceAttribute : Attribute
 {
-    /// <summary>
-    /// This attribute indicates whether the decorated class should be exposed to plugins via IoC.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class)]
-    public class PluginInterfaceAttribute : Attribute
-    {
-    }
 }
diff --git a/Dalamud/IoC/PluginServiceAttribute.cs b/Dalamud/IoC/PluginServiceAttribute.cs
index 0cf107677..84d500cb3 100644
--- a/Dalamud/IoC/PluginServiceAttribute.cs
+++ b/Dalamud/IoC/PluginServiceAttribute.cs
@@ -2,14 +2,13 @@
 
 using JetBrains.Annotations;
 
-namespace Dalamud.IoC
+namespace Dalamud.IoC;
+
+/// <summary>
+/// This attribute indicates whether an applicable service should be injected into the plugin.
+/// </summary>
+[AttributeUsage(AttributeTargets.Property)]
+[MeansImplicitUse(ImplicitUseKindFlags.Assign)]
+public class PluginServiceAttribute : Attribute
 {
-    /// <summary>
-    /// This attribute indicates whether an applicable service should be injected into the plugin.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Property)]
-    [MeansImplicitUse(ImplicitUseKindFlags.Assign)]
-    public class PluginServiceAttribute : Attribute
-    {
-    }
 }
diff --git a/Dalamud/IoC/RequiredVersionAttribute.cs b/Dalamud/IoC/RequiredVersionAttribute.cs
index a456ef783..97aca56bb 100644
--- a/Dalamud/IoC/RequiredVersionAttribute.cs
+++ b/Dalamud/IoC/RequiredVersionAttribute.cs
@@ -1,25 +1,24 @@
 using System;
 
-namespace Dalamud.IoC
+namespace Dalamud.IoC;
+
+/// <summary>
+/// This attribute indicates the version of a service module that is required for the plugin to load.
+/// </summary>
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
+public class RequiredVersionAttribute : Attribute
 {
     /// <summary>
-    /// This attribute indicates the version of a service module that is required for the plugin to load.
+    /// Initializes a new instance of the <see cref="RequiredVersionAttribute"/> class.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
-    public class RequiredVersionAttribute : Attribute
+    /// <param name="version">The required version.</param>
+    public RequiredVersionAttribute(string version)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequiredVersionAttribute"/> class.
-        /// </summary>
-        /// <param name="version">The required version.</param>
-        public RequiredVersionAttribute(string version)
-        {
-            this.Version = new(version);
-        }
-
-        /// <summary>
-        /// Gets the required version.
-        /// </summary>
-        public Version Version { get; }
+        this.Version = new(version);
     }
+
+    /// <summary>
+    /// Gets the required version.
+    /// </summary>
+    public Version Version { get; }
 }
diff --git a/Dalamud/Localization.cs b/Dalamud/Localization.cs
index a050b71a0..51918a004 100644
--- a/Dalamud/Localization.cs
+++ b/Dalamud/Localization.cs
@@ -8,156 +8,155 @@ using CheapLoc;
 using Dalamud.Configuration.Internal;
 using Serilog;
 
-namespace Dalamud
+namespace Dalamud;
+
+/// <summary>
+/// Class handling localization.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+public class Localization : IServiceType
 {
     /// <summary>
-    /// Class handling localization.
+    /// Array of language codes which have a valid translation in Dalamud.
     /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    public class Localization : IServiceType
+    public static readonly string[] ApplicableLangCodes = { "de", "ja", "fr", "it", "es", "ko", "no", "ru", "zh", "tw" };
+
+    private const string FallbackLangCode = "en";
+
+    private readonly string locResourceDirectory;
+    private readonly string locResourcePrefix;
+    private readonly bool useEmbedded;
+    private readonly Assembly assembly;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Localization"/> class.
+    /// </summary>
+    /// <param name="locResourceDirectory">The working directory to load language files from.</param>
+    /// <param name="locResourcePrefix">The prefix on the loc resource file name (e.g. dalamud_).</param>
+    /// <param name="useEmbedded">Use embedded loc resource files.</param>
+    public Localization(string locResourceDirectory, string locResourcePrefix = "", bool useEmbedded = false)
     {
-        /// <summary>
-        /// Array of language codes which have a valid translation in Dalamud.
-        /// </summary>
-        public static readonly string[] ApplicableLangCodes = { "de", "ja", "fr", "it", "es", "ko", "no", "ru", "zh", "tw" };
+        this.locResourceDirectory = locResourceDirectory;
+        this.locResourcePrefix = locResourcePrefix;
+        this.useEmbedded = useEmbedded;
+        this.assembly = Assembly.GetCallingAssembly();
+    }
 
-        private const string FallbackLangCode = "en";
+    [ServiceManager.ServiceConstructor]
+    private Localization(Dalamud dalamud, DalamudConfiguration configuration)
+        : this(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "loc", "dalamud"), "dalamud_")
+    {
+        if (!string.IsNullOrEmpty(configuration.LanguageOverride))
+            this.SetupWithLangCode(configuration.LanguageOverride);
+        else
+            this.SetupWithUiCulture();
+    }
 
-        private readonly string locResourceDirectory;
-        private readonly string locResourcePrefix;
-        private readonly bool useEmbedded;
-        private readonly Assembly assembly;
+    /// <summary>
+    /// Delegate for the <see cref="Localization.LocalizationChanged"/> event that occurs when the language is changed.
+    /// </summary>
+    /// <param name="langCode">The language code of the new language.</param>
+    public delegate void LocalizationChangedDelegate(string langCode);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Localization"/> class.
-        /// </summary>
-        /// <param name="locResourceDirectory">The working directory to load language files from.</param>
-        /// <param name="locResourcePrefix">The prefix on the loc resource file name (e.g. dalamud_).</param>
-        /// <param name="useEmbedded">Use embedded loc resource files.</param>
-        public Localization(string locResourceDirectory, string locResourcePrefix = "", bool useEmbedded = false)
+    /// <summary>
+    /// Event that occurs when the language is changed.
+    /// </summary>
+    public event LocalizationChangedDelegate LocalizationChanged;
+
+    /// <summary>
+    /// Search the set-up localization data for the provided assembly for the given string key and return it.
+    /// If the key is not present, the fallback is shown.
+    /// The fallback is also required to create the string files to be localized.
+    /// </summary>
+    /// <param name="key">The string key to be returned.</param>
+    /// <param name="fallBack">The fallback string, usually your source language.</param>
+    /// <returns>The localized string, fallback or string key if not found.</returns>
+    // TODO: This breaks loc export, since it's being called without string args. Fix in CheapLoc.
+    public static string Localize(string key, string fallBack)
+    {
+        return Loc.Localize(key, fallBack, Assembly.GetCallingAssembly());
+    }
+
+    /// <summary>
+    /// Set up the UI language with the users' local UI culture.
+    /// </summary>
+    public void SetupWithUiCulture()
+    {
+        try
         {
-            this.locResourceDirectory = locResourceDirectory;
-            this.locResourcePrefix = locResourcePrefix;
-            this.useEmbedded = useEmbedded;
-            this.assembly = Assembly.GetCallingAssembly();
-        }
+            var currentUiLang = CultureInfo.CurrentUICulture;
+            Log.Information("Trying to set up Loc for culture {0}", currentUiLang.TwoLetterISOLanguageName);
 
-        [ServiceManager.ServiceConstructor]
-        private Localization(Dalamud dalamud, DalamudConfiguration configuration)
-            : this(Path.Combine(dalamud.AssetDirectory.FullName, "UIRes", "loc", "dalamud"), "dalamud_")
-        {
-            if (!string.IsNullOrEmpty(configuration.LanguageOverride))
-                this.SetupWithLangCode(configuration.LanguageOverride);
+            if (ApplicableLangCodes.Any(langCode => currentUiLang.TwoLetterISOLanguageName == langCode))
+            {
+                this.SetupWithLangCode(currentUiLang.TwoLetterISOLanguageName);
+            }
             else
-                this.SetupWithUiCulture();
-        }
-
-        /// <summary>
-        /// Delegate for the <see cref="Localization.LocalizationChanged"/> event that occurs when the language is changed.
-        /// </summary>
-        /// <param name="langCode">The language code of the new language.</param>
-        public delegate void LocalizationChangedDelegate(string langCode);
-
-        /// <summary>
-        /// Event that occurs when the language is changed.
-        /// </summary>
-        public event LocalizationChangedDelegate LocalizationChanged;
-
-        /// <summary>
-        /// Search the set-up localization data for the provided assembly for the given string key and return it.
-        /// If the key is not present, the fallback is shown.
-        /// The fallback is also required to create the string files to be localized.
-        /// </summary>
-        /// <param name="key">The string key to be returned.</param>
-        /// <param name="fallBack">The fallback string, usually your source language.</param>
-        /// <returns>The localized string, fallback or string key if not found.</returns>
-        // TODO: This breaks loc export, since it's being called without string args. Fix in CheapLoc.
-        public static string Localize(string key, string fallBack)
-        {
-            return Loc.Localize(key, fallBack, Assembly.GetCallingAssembly());
-        }
-
-        /// <summary>
-        /// Set up the UI language with the users' local UI culture.
-        /// </summary>
-        public void SetupWithUiCulture()
-        {
-            try
-            {
-                var currentUiLang = CultureInfo.CurrentUICulture;
-                Log.Information("Trying to set up Loc for culture {0}", currentUiLang.TwoLetterISOLanguageName);
-
-                if (ApplicableLangCodes.Any(langCode => currentUiLang.TwoLetterISOLanguageName == langCode))
-                {
-                    this.SetupWithLangCode(currentUiLang.TwoLetterISOLanguageName);
-                }
-                else
-                {
-                    this.SetupWithFallbacks();
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Could not get language information. Setting up fallbacks.");
-                this.SetupWithFallbacks();
-            }
-        }
-
-        /// <summary>
-        /// Set up the UI language with "fallbacks"(original English text).
-        /// </summary>
-        public void SetupWithFallbacks()
-        {
-            this.LocalizationChanged?.Invoke(FallbackLangCode);
-            Loc.SetupWithFallbacks(this.assembly);
-        }
-
-        /// <summary>
-        /// Set up the UI language with the provided language code.
-        /// </summary>
-        /// <param name="langCode">The language code to set up the UI language with.</param>
-        public void SetupWithLangCode(string langCode)
-        {
-            if (langCode.ToLower() == FallbackLangCode)
             {
                 this.SetupWithFallbacks();
-                return;
-            }
-
-            this.LocalizationChanged?.Invoke(langCode);
-
-            try
-            {
-                Loc.Setup(this.ReadLocData(langCode), this.assembly);
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Could not load loc {0}. Setting up fallbacks.", langCode);
-                this.SetupWithFallbacks();
             }
         }
-
-        /// <summary>
-        /// Saves localizable JSON data in the current working directory for the provided assembly.
-        /// </summary>
-        public void ExportLocalizable()
+        catch (Exception ex)
         {
-            Loc.ExportLocalizableForAssembly(this.assembly);
-        }
-
-        private string ReadLocData(string langCode)
-        {
-            if (this.useEmbedded)
-            {
-                var resourceStream = this.assembly.GetManifestResourceStream($"{this.locResourceDirectory}{this.locResourcePrefix}{langCode}.json");
-                if (resourceStream == null)
-                    return null;
-
-                using var reader = new StreamReader(resourceStream);
-                return reader.ReadToEnd();
-            }
-
-            return File.ReadAllText(Path.Combine(this.locResourceDirectory, $"{this.locResourcePrefix}{langCode}.json"));
+            Log.Error(ex, "Could not get language information. Setting up fallbacks.");
+            this.SetupWithFallbacks();
         }
     }
+
+    /// <summary>
+    /// Set up the UI language with "fallbacks"(original English text).
+    /// </summary>
+    public void SetupWithFallbacks()
+    {
+        this.LocalizationChanged?.Invoke(FallbackLangCode);
+        Loc.SetupWithFallbacks(this.assembly);
+    }
+
+    /// <summary>
+    /// Set up the UI language with the provided language code.
+    /// </summary>
+    /// <param name="langCode">The language code to set up the UI language with.</param>
+    public void SetupWithLangCode(string langCode)
+    {
+        if (langCode.ToLower() == FallbackLangCode)
+        {
+            this.SetupWithFallbacks();
+            return;
+        }
+
+        this.LocalizationChanged?.Invoke(langCode);
+
+        try
+        {
+            Loc.Setup(this.ReadLocData(langCode), this.assembly);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Could not load loc {0}. Setting up fallbacks.", langCode);
+            this.SetupWithFallbacks();
+        }
+    }
+
+    /// <summary>
+    /// Saves localizable JSON data in the current working directory for the provided assembly.
+    /// </summary>
+    public void ExportLocalizable()
+    {
+        Loc.ExportLocalizableForAssembly(this.assembly);
+    }
+
+    private string ReadLocData(string langCode)
+    {
+        if (this.useEmbedded)
+        {
+            var resourceStream = this.assembly.GetManifestResourceStream($"{this.locResourceDirectory}{this.locResourcePrefix}{langCode}.json");
+            if (resourceStream == null)
+                return null;
+
+            using var reader = new StreamReader(resourceStream);
+            return reader.ReadToEnd();
+        }
+
+        return File.ReadAllText(Path.Combine(this.locResourceDirectory, $"{this.locResourcePrefix}{langCode}.json"));
+    }
 }
diff --git a/Dalamud/Logging/Internal/ModuleLog.cs b/Dalamud/Logging/Internal/ModuleLog.cs
index 60afbef35..d93730f36 100644
--- a/Dalamud/Logging/Internal/ModuleLog.cs
+++ b/Dalamud/Logging/Internal/ModuleLog.cs
@@ -3,140 +3,139 @@ using System;
 using Serilog;
 using Serilog.Events;
 
-namespace Dalamud.Logging.Internal
+namespace Dalamud.Logging.Internal;
+
+/// <summary>
+/// Class offering various methods to allow for logging in Dalamud modules.
+/// </summary>
+public class ModuleLog
 {
+    private readonly string moduleName;
+    private readonly ILogger moduleLogger;
+
     /// <summary>
-    /// Class offering various methods to allow for logging in Dalamud modules.
+    /// Initializes a new instance of the <see cref="ModuleLog"/> class.
+    /// This class can be used to prefix logging messages with a Dalamud module name prefix. For example, "[PLUGINR] ...".
     /// </summary>
-    public class ModuleLog
+    /// <param name="moduleName">The module name.</param>
+    public ModuleLog(string? moduleName)
     {
-        private readonly string moduleName;
-        private readonly ILogger moduleLogger;
+        // FIXME: Should be namespaced better, e.g. `Dalamud.PluginLoader`, but that becomes a relatively large
+        //        change.
+        this.moduleName = moduleName ?? "DalamudInternal";
+        this.moduleLogger = Log.ForContext("SourceContext", this.moduleName);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ModuleLog"/> class.
-        /// This class can be used to prefix logging messages with a Dalamud module name prefix. For example, "[PLUGINR] ...".
-        /// </summary>
-        /// <param name="moduleName">The module name.</param>
-        public ModuleLog(string? moduleName)
-        {
-            // FIXME: Should be namespaced better, e.g. `Dalamud.PluginLoader`, but that becomes a relatively large
-            //        change.
-            this.moduleName = moduleName ?? "DalamudInternal";
-            this.moduleLogger = Log.ForContext("SourceContext", this.moduleName);
-        }
+    /// <summary>
+    /// Log a templated verbose message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Verbose(string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Verbose, messageTemplate, null, values);
 
-        /// <summary>
-        /// Log a templated verbose message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Verbose(string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Verbose, messageTemplate, null, values);
+    /// <summary>
+    /// Log a templated verbose message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Verbose(Exception exception, string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Verbose, messageTemplate, exception, values);
 
-        /// <summary>
-        /// Log a templated verbose message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Verbose(Exception exception, string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Verbose, messageTemplate, exception, values);
+    /// <summary>
+    /// Log a templated debug message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Debug(string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Debug, messageTemplate, null, values);
 
-        /// <summary>
-        /// Log a templated debug message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Debug(string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Debug, messageTemplate, null, values);
+    /// <summary>
+    /// Log a templated debug message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Debug(Exception exception, string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Debug, messageTemplate, exception, values);
 
-        /// <summary>
-        /// Log a templated debug message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Debug(Exception exception, string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Debug, messageTemplate, exception, values);
+    /// <summary>
+    /// Log a templated information message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Information(string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Information, messageTemplate, null, values);
 
-        /// <summary>
-        /// Log a templated information message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Information(string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Information, messageTemplate, null, values);
+    /// <summary>
+    /// Log a templated information message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Information(Exception exception, string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Information, messageTemplate, exception, values);
 
-        /// <summary>
-        /// Log a templated information message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Information(Exception exception, string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Information, messageTemplate, exception, values);
+    /// <summary>
+    /// Log a templated warning message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Warning(string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Warning, messageTemplate, null, values);
 
-        /// <summary>
-        /// Log a templated warning message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Warning(string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Warning, messageTemplate, null, values);
+    /// <summary>
+    /// Log a templated warning message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Warning(Exception exception, string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Warning, messageTemplate, exception, values);
 
-        /// <summary>
-        /// Log a templated warning message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Warning(Exception exception, string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Warning, messageTemplate, exception, values);
+    /// <summary>
+    /// Log a templated error message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Error(string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Error, messageTemplate, null, values);
 
-        /// <summary>
-        /// Log a templated error message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Error(string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Error, messageTemplate, null, values);
+    /// <summary>
+    /// Log a templated error message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Error(Exception exception, string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Error, messageTemplate, exception, values);
 
-        /// <summary>
-        /// Log a templated error message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Error(Exception exception, string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Error, messageTemplate, exception, values);
+    /// <summary>
+    /// Log a templated fatal message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Fatal(string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Fatal, messageTemplate, null, values);
 
-        /// <summary>
-        /// Log a templated fatal message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Fatal(string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Fatal, messageTemplate, null, values);
+    /// <summary>
+    /// Log a templated fatal message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public void Fatal(Exception exception, string messageTemplate, params object[] values)
+        => this.WriteLog(LogEventLevel.Fatal, messageTemplate, exception, values);
 
-        /// <summary>
-        /// Log a templated fatal message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public void Fatal(Exception exception, string messageTemplate, params object[] values)
-            => this.WriteLog(LogEventLevel.Fatal, messageTemplate, exception, values);
-
-        private void WriteLog(LogEventLevel level, string messageTemplate, Exception? exception = null, params object[] values)
-        {
-            // FIXME: Eventually, the `pluginName` tag should be removed from here and moved over to the actual log
-            //        formatter.
-            this.moduleLogger.Write(
-                level,
-                exception: exception,
-                messageTemplate: $"[{this.moduleName}] {messageTemplate}",
-                values);
-        }
+    private void WriteLog(LogEventLevel level, string messageTemplate, Exception? exception = null, params object[] values)
+    {
+        // FIXME: Eventually, the `pluginName` tag should be removed from here and moved over to the actual log
+        //        formatter.
+        this.moduleLogger.Write(
+            level,
+            exception: exception,
+            messageTemplate: $"[{this.moduleName}] {messageTemplate}",
+            values);
     }
 }
diff --git a/Dalamud/Logging/Internal/SerilogEventSink.cs b/Dalamud/Logging/Internal/SerilogEventSink.cs
index eda1a0cb3..14baca456 100644
--- a/Dalamud/Logging/Internal/SerilogEventSink.cs
+++ b/Dalamud/Logging/Internal/SerilogEventSink.cs
@@ -3,49 +3,48 @@ using System;
 using Serilog.Core;
 using Serilog.Events;
 
-namespace Dalamud.Logging.Internal
+namespace Dalamud.Logging.Internal;
+
+/// <summary>
+/// Serilog event sink.
+/// </summary>
+internal class SerilogEventSink : ILogEventSink
 {
+    private static SerilogEventSink instance;
+    private readonly IFormatProvider formatProvider;
+
     /// <summary>
-    /// Serilog event sink.
+    /// Initializes a new instance of the <see cref="SerilogEventSink"/> class.
     /// </summary>
-    internal class SerilogEventSink : ILogEventSink
+    /// <param name="formatProvider">Logging format provider.</param>
+    private SerilogEventSink(IFormatProvider formatProvider)
     {
-        private static SerilogEventSink instance;
-        private readonly IFormatProvider formatProvider;
+        this.formatProvider = formatProvider;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SerilogEventSink"/> class.
-        /// </summary>
-        /// <param name="formatProvider">Logging format provider.</param>
-        private SerilogEventSink(IFormatProvider formatProvider)
+    /// <summary>
+    /// Event on a log line being emitted.
+    /// </summary>
+    public event EventHandler<(string Line, LogEvent LogEvent)>? LogLine;
+
+    /// <summary>
+    /// Gets the default instance.
+    /// </summary>
+    public static SerilogEventSink Instance => instance ??= new SerilogEventSink(null);
+
+    /// <summary>
+    /// Emit a log event.
+    /// </summary>
+    /// <param name="logEvent">Log event to be emitted.</param>
+    public void Emit(LogEvent logEvent)
+    {
+        var message = logEvent.RenderMessage(this.formatProvider);
+
+        if (logEvent.Exception != null)
         {
-            this.formatProvider = formatProvider;
+            message += "\n" + logEvent.Exception;
         }
 
-        /// <summary>
-        /// Event on a log line being emitted.
-        /// </summary>
-        public event EventHandler<(string Line, LogEvent LogEvent)>? LogLine;
-
-        /// <summary>
-        /// Gets the default instance.
-        /// </summary>
-        public static SerilogEventSink Instance => instance ??= new SerilogEventSink(null);
-
-        /// <summary>
-        /// Emit a log event.
-        /// </summary>
-        /// <param name="logEvent">Log event to be emitted.</param>
-        public void Emit(LogEvent logEvent)
-        {
-            var message = logEvent.RenderMessage(this.formatProvider);
-
-            if (logEvent.Exception != null)
-            {
-                message += "\n" + logEvent.Exception;
-            }
-
-            this.LogLine?.Invoke(this, (message, logEvent));
-        }
+        this.LogLine?.Invoke(this, (message, logEvent));
     }
 }
diff --git a/Dalamud/Logging/Internal/TaskTracker.cs b/Dalamud/Logging/Internal/TaskTracker.cs
index f4a02892e..a8729893f 100644
--- a/Dalamud/Logging/Internal/TaskTracker.cs
+++ b/Dalamud/Logging/Internal/TaskTracker.cs
@@ -7,238 +7,237 @@ using System.Threading.Tasks;
 
 using Dalamud.Game;
 
-namespace Dalamud.Logging.Internal
+namespace Dalamud.Logging.Internal;
+
+/// <summary>
+/// Class responsible for tracking asynchronous tasks.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class TaskTracker : IDisposable, IServiceType
 {
-    /// <summary>
-    /// Class responsible for tracking asynchronous tasks.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal class TaskTracker : IDisposable, IServiceType
+    private static readonly ModuleLog Log = new("TT");
+    private static readonly List<TaskInfo> TrackedTasksInternal = new();
+    private static readonly ConcurrentQueue<TaskInfo> NewlyCreatedTasks = new();
+    private static bool clearRequested = false;
+
+    [ServiceManager.ServiceDependency]
+    private readonly Framework framework = Service<Framework>.Get();
+
+    private MonoMod.RuntimeDetour.Hook? scheduleAndStartHook;
+    private bool enabled = false;
+
+    [ServiceManager.ServiceConstructor]
+    private TaskTracker()
     {
-        private static readonly ModuleLog Log = new("TT");
-        private static readonly List<TaskInfo> TrackedTasksInternal = new();
-        private static readonly ConcurrentQueue<TaskInfo> NewlyCreatedTasks = new();
-        private static bool clearRequested = false;
-
-        [ServiceManager.ServiceDependency]
-        private readonly Framework framework = Service<Framework>.Get();
-
-        private MonoMod.RuntimeDetour.Hook? scheduleAndStartHook;
-        private bool enabled = false;
-
-        [ServiceManager.ServiceConstructor]
-        private TaskTracker()
-        {
 #if DEBUG
             this.Enable();
 #endif
+    }
+
+    /// <summary>
+    /// Gets a read-only list of tracked tasks.
+    /// </summary>
+    public static IReadOnlyList<TaskInfo> Tasks => TrackedTasksInternal.ToArray();
+
+    /// <summary>
+    /// Clear the list of tracked tasks.
+    /// </summary>
+    public static void Clear() => clearRequested = true;
+
+    /// <summary>
+    /// Update the tracked data.
+    /// </summary>
+    public static void UpdateData()
+    {
+        if (clearRequested)
+        {
+            TrackedTasksInternal.Clear();
+            clearRequested = false;
         }
 
-        /// <summary>
-        /// Gets a read-only list of tracked tasks.
-        /// </summary>
-        public static IReadOnlyList<TaskInfo> Tasks => TrackedTasksInternal.ToArray();
-
-        /// <summary>
-        /// Clear the list of tracked tasks.
-        /// </summary>
-        public static void Clear() => clearRequested = true;
-
-        /// <summary>
-        /// Update the tracked data.
-        /// </summary>
-        public static void UpdateData()
+        var i = 0;
+        var pruned = 0;
+        // Prune old tasks. Technically a memory "leak" that grows infinitely otherwise.
+        while (i < TrackedTasksInternal.Count)
         {
-            if (clearRequested)
+            var taskInfo = TrackedTasksInternal[i];
+            if (taskInfo.IsCompleted && !taskInfo.IsBeingViewed && TrackedTasksInternal.Count > 1000)
             {
-                TrackedTasksInternal.Clear();
-                clearRequested = false;
+                TrackedTasksInternal.RemoveAt(i);
+                pruned++;
+                continue;
             }
 
-            var i = 0;
-            var pruned = 0;
-            // Prune old tasks. Technically a memory "leak" that grows infinitely otherwise.
-            while (i < TrackedTasksInternal.Count)
-            {
-                var taskInfo = TrackedTasksInternal[i];
-                if (taskInfo.IsCompleted && !taskInfo.IsBeingViewed && TrackedTasksInternal.Count > 1000)
-                {
-                    TrackedTasksInternal.RemoveAt(i);
-                    pruned++;
-                    continue;
-                }
+            i++;
+        }
 
-                i++;
+        // if (pruned > 0)
+        //     Log.Debug($"Pruned {pruned} tasks");
+
+        // Consume from a queue to prevent iteration errors
+        while (NewlyCreatedTasks.TryDequeue(out var newTask))
+        {
+            TrackedTasksInternal.Add(newTask);
+        }
+
+        // Update each task
+        for (i = 0; i < TrackedTasksInternal.Count; i++)
+        {
+            var taskInfo = TrackedTasksInternal[i];
+            if (taskInfo.Task == null)
+                continue;
+
+            taskInfo.IsCompleted = taskInfo.Task.IsCompleted;
+            taskInfo.IsFaulted = taskInfo.Task.IsFaulted;
+            taskInfo.IsCanceled = taskInfo.Task.IsCanceled;
+            taskInfo.IsCompletedSuccessfully = taskInfo.Task.IsCompletedSuccessfully;
+            taskInfo.Status = taskInfo.Task.Status;
+
+            if (taskInfo.IsCompleted || taskInfo.IsFaulted || taskInfo.IsCanceled ||
+                taskInfo.IsCompletedSuccessfully)
+            {
+                taskInfo.Exception = taskInfo.Task.Exception;
+
+                taskInfo.Task = null;
+                taskInfo.FinishTime = DateTime.Now;
             }
-
-            // if (pruned > 0)
-            //     Log.Debug($"Pruned {pruned} tasks");
-
-            // Consume from a queue to prevent iteration errors
-            while (NewlyCreatedTasks.TryDequeue(out var newTask))
-            {
-                TrackedTasksInternal.Add(newTask);
-            }
-
-            // Update each task
-            for (i = 0; i < TrackedTasksInternal.Count; i++)
-            {
-                var taskInfo = TrackedTasksInternal[i];
-                if (taskInfo.Task == null)
-                    continue;
-
-                taskInfo.IsCompleted = taskInfo.Task.IsCompleted;
-                taskInfo.IsFaulted = taskInfo.Task.IsFaulted;
-                taskInfo.IsCanceled = taskInfo.Task.IsCanceled;
-                taskInfo.IsCompletedSuccessfully = taskInfo.Task.IsCompletedSuccessfully;
-                taskInfo.Status = taskInfo.Task.Status;
-
-                if (taskInfo.IsCompleted || taskInfo.IsFaulted || taskInfo.IsCanceled ||
-                    taskInfo.IsCompletedSuccessfully)
-                {
-                    taskInfo.Exception = taskInfo.Task.Exception;
-
-                    taskInfo.Task = null;
-                    taskInfo.FinishTime = DateTime.Now;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Enables TaskTracker.
-        /// </summary>
-        public void Enable()
-        {
-            if (this.enabled)
-                return;
-
-            this.ApplyPatch();
-
-            this.framework.Update += this.FrameworkOnUpdate;
-            this.enabled = true;
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            this.scheduleAndStartHook?.Dispose();
-
-            this.framework.Update -= this.FrameworkOnUpdate;
-        }
-
-        private static bool AddToActiveTasksHook(Func<Task, bool> orig, Task self)
-        {
-            orig(self);
-
-            var trace = new StackTrace();
-            NewlyCreatedTasks.Enqueue(new TaskInfo
-            {
-                Task = self,
-                Id = self.Id,
-                StackTrace = trace,
-            });
-
-            return true;
-        }
-
-        private void FrameworkOnUpdate(Framework framework)
-        {
-            UpdateData();
-        }
-
-        private void ApplyPatch()
-        {
-            var targetType = typeof(Task);
-
-            var debugField = targetType.GetField("s_asyncDebuggingEnabled", BindingFlags.Static | BindingFlags.NonPublic);
-            debugField.SetValue(null, true);
-
-            Log.Information("s_asyncDebuggingEnabled: {0}", debugField.GetValue(null));
-
-            var targetMethod = targetType.GetMethod("AddToActiveTasks", BindingFlags.Static | BindingFlags.NonPublic);
-            var patchMethod = typeof(TaskTracker).GetMethod(nameof(AddToActiveTasksHook), BindingFlags.NonPublic | BindingFlags.Static);
-
-            if (targetMethod == null)
-            {
-                Log.Error("AddToActiveTasks TargetMethod null!");
-                return;
-            }
-
-            if (patchMethod == null)
-            {
-                Log.Error("AddToActiveTasks PatchMethod null!");
-                return;
-            }
-
-            this.scheduleAndStartHook = new MonoMod.RuntimeDetour.Hook(targetMethod, patchMethod);
-
-            Log.Information("AddToActiveTasks Hooked!");
-        }
-
-        /// <summary>
-        /// Class representing a tracked task.
-        /// </summary>
-        internal class TaskInfo
-        {
-            /// <summary>
-            /// Gets or sets the tracked task.
-            /// </summary>
-            public Task? Task { get; set; }
-
-            /// <summary>
-            /// Gets or sets the ID of the task.
-            /// </summary>
-            public int Id { get; set; }
-
-            /// <summary>
-            /// Gets or sets the stack trace of where the task was started.
-            /// </summary>
-            public StackTrace? StackTrace { get; set; }
-
-            /// <summary>
-            /// Gets or sets a value indicating whether or not the task was completed.
-            /// </summary>
-            public bool IsCompleted { get; set; }
-
-            /// <summary>
-            /// Gets or sets a value indicating whether or not the task faulted.
-            /// </summary>
-            public bool IsFaulted { get; set; }
-
-            /// <summary>
-            /// Gets or sets a value indicating whether or not the task was canceled.
-            /// </summary>
-            public bool IsCanceled { get; set; }
-
-            /// <summary>
-            /// Gets or sets a value indicating whether or not the task was completed successfully.
-            /// </summary>
-            public bool IsCompletedSuccessfully { get; set; }
-
-            /// <summary>
-            /// Gets or sets a value indicating whether this task is being viewed.
-            /// </summary>
-            public bool IsBeingViewed { get; set; }
-
-            /// <summary>
-            /// Gets or sets the status of the task.
-            /// </summary>
-            public TaskStatus Status { get; set; }
-
-            /// <summary>
-            /// Gets the start time of the task.
-            /// </summary>
-            public DateTime StartTime { get; } = DateTime.Now;
-
-            /// <summary>
-            /// Gets or sets the end time of the task.
-            /// </summary>
-            public DateTime FinishTime { get; set; }
-
-            /// <summary>
-            /// Gets or sets the exception that occurred within the task.
-            /// </summary>
-            public AggregateException? Exception { get; set; }
         }
     }
+
+    /// <summary>
+    /// Enables TaskTracker.
+    /// </summary>
+    public void Enable()
+    {
+        if (this.enabled)
+            return;
+
+        this.ApplyPatch();
+
+        this.framework.Update += this.FrameworkOnUpdate;
+        this.enabled = true;
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        this.scheduleAndStartHook?.Dispose();
+
+        this.framework.Update -= this.FrameworkOnUpdate;
+    }
+
+    private static bool AddToActiveTasksHook(Func<Task, bool> orig, Task self)
+    {
+        orig(self);
+
+        var trace = new StackTrace();
+        NewlyCreatedTasks.Enqueue(new TaskInfo
+        {
+            Task = self,
+            Id = self.Id,
+            StackTrace = trace,
+        });
+
+        return true;
+    }
+
+    private void FrameworkOnUpdate(Framework framework)
+    {
+        UpdateData();
+    }
+
+    private void ApplyPatch()
+    {
+        var targetType = typeof(Task);
+
+        var debugField = targetType.GetField("s_asyncDebuggingEnabled", BindingFlags.Static | BindingFlags.NonPublic);
+        debugField.SetValue(null, true);
+
+        Log.Information("s_asyncDebuggingEnabled: {0}", debugField.GetValue(null));
+
+        var targetMethod = targetType.GetMethod("AddToActiveTasks", BindingFlags.Static | BindingFlags.NonPublic);
+        var patchMethod = typeof(TaskTracker).GetMethod(nameof(AddToActiveTasksHook), BindingFlags.NonPublic | BindingFlags.Static);
+
+        if (targetMethod == null)
+        {
+            Log.Error("AddToActiveTasks TargetMethod null!");
+            return;
+        }
+
+        if (patchMethod == null)
+        {
+            Log.Error("AddToActiveTasks PatchMethod null!");
+            return;
+        }
+
+        this.scheduleAndStartHook = new MonoMod.RuntimeDetour.Hook(targetMethod, patchMethod);
+
+        Log.Information("AddToActiveTasks Hooked!");
+    }
+
+    /// <summary>
+    /// Class representing a tracked task.
+    /// </summary>
+    internal class TaskInfo
+    {
+        /// <summary>
+        /// Gets or sets the tracked task.
+        /// </summary>
+        public Task? Task { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ID of the task.
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the stack trace of where the task was started.
+        /// </summary>
+        public StackTrace? StackTrace { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the task was completed.
+        /// </summary>
+        public bool IsCompleted { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the task faulted.
+        /// </summary>
+        public bool IsFaulted { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the task was canceled.
+        /// </summary>
+        public bool IsCanceled { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether or not the task was completed successfully.
+        /// </summary>
+        public bool IsCompletedSuccessfully { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this task is being viewed.
+        /// </summary>
+        public bool IsBeingViewed { get; set; }
+
+        /// <summary>
+        /// Gets or sets the status of the task.
+        /// </summary>
+        public TaskStatus Status { get; set; }
+
+        /// <summary>
+        /// Gets the start time of the task.
+        /// </summary>
+        public DateTime StartTime { get; } = DateTime.Now;
+
+        /// <summary>
+        /// Gets or sets the end time of the task.
+        /// </summary>
+        public DateTime FinishTime { get; set; }
+
+        /// <summary>
+        /// Gets or sets the exception that occurred within the task.
+        /// </summary>
+        public AggregateException? Exception { get; set; }
+    }
 }
diff --git a/Dalamud/Logging/PluginLog.cs b/Dalamud/Logging/PluginLog.cs
index bad839c25..a5aad330f 100644
--- a/Dalamud/Logging/PluginLog.cs
+++ b/Dalamud/Logging/PluginLog.cs
@@ -4,258 +4,257 @@ using System.Reflection;
 using Serilog;
 using Serilog.Events;
 
-namespace Dalamud.Logging
+namespace Dalamud.Logging;
+
+/// <summary>
+/// Class offering various static methods to allow for logging in plugins.
+/// </summary>
+public static class PluginLog
 {
+    #region "Log" prefixed Serilog style methods
+
     /// <summary>
-    /// Class offering various static methods to allow for logging in plugins.
+    /// Log a templated message to the in-game debug log.
     /// </summary>
-    public static class PluginLog
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Log(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Log(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated verbose message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogVerbose(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Verbose, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated verbose message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogVerbose(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Verbose, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated debug message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogDebug(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Debug, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated debug message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogDebug(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Debug, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated information message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogInformation(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated information message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogInformation(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated warning message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogWarning(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Warning, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated warning message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogWarning(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Warning, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated error message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogError(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Error, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated error message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogError(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Error, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated fatal message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogFatal(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Fatal, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated fatal message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void LogFatal(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Fatal, messageTemplate, exception, values);
+
+    #endregion
+
+    #region Serilog style methods
+
+    /// <summary>
+    /// Log a templated verbose message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Verbose(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Verbose, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated verbose message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Verbose(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Verbose, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated debug message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Debug(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Debug, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated debug message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Debug(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Debug, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated information message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Information(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated information message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Information(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated warning message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Warning(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Warning, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated warning message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Warning(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Warning, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated error message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Error(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Error, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated error message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Error(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Error, messageTemplate, exception, values);
+
+    /// <summary>
+    /// Log a templated fatal message to the in-game debug log.
+    /// </summary>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Fatal(string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Fatal, messageTemplate, null, values);
+
+    /// <summary>
+    /// Log a templated fatal message to the in-game debug log.
+    /// </summary>
+    /// <param name="exception">The exception that caused the error.</param>
+    /// <param name="messageTemplate">The message template.</param>
+    /// <param name="values">Values to log.</param>
+    public static void Fatal(Exception exception, string messageTemplate, params object[] values)
+        => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Fatal, messageTemplate, exception, values);
+
+    #endregion
+
+    private static ILogger GetPluginLogger(string? pluginName)
     {
-        #region "Log" prefixed Serilog style methods
+        return Serilog.Log.ForContext("SourceContext", pluginName ?? string.Empty);
+    }
 
-        /// <summary>
-        /// Log a templated message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Log(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, null, values);
+    private static void WriteLog(string? pluginName, LogEventLevel level, string messageTemplate, Exception? exception = null, params object[] values)
+    {
+        var pluginLogger = GetPluginLogger(pluginName);
 
-        /// <summary>
-        /// Log a templated message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Log(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated verbose message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogVerbose(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Verbose, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated verbose message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogVerbose(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Verbose, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated debug message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogDebug(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Debug, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated debug message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogDebug(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Debug, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated information message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogInformation(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated information message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogInformation(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated warning message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogWarning(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Warning, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated warning message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogWarning(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Warning, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated error message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogError(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Error, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated error message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogError(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Error, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated fatal message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogFatal(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Fatal, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated fatal message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void LogFatal(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Fatal, messageTemplate, exception, values);
-
-        #endregion
-
-        #region Serilog style methods
-
-        /// <summary>
-        /// Log a templated verbose message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Verbose(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Verbose, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated verbose message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Verbose(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Verbose, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated debug message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Debug(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Debug, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated debug message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Debug(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Debug, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated information message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Information(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated information message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Information(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Information, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated warning message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Warning(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Warning, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated warning message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Warning(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Warning, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated error message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Error(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Error, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated error message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Error(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Error, messageTemplate, exception, values);
-
-        /// <summary>
-        /// Log a templated fatal message to the in-game debug log.
-        /// </summary>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Fatal(string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Fatal, messageTemplate, null, values);
-
-        /// <summary>
-        /// Log a templated fatal message to the in-game debug log.
-        /// </summary>
-        /// <param name="exception">The exception that caused the error.</param>
-        /// <param name="messageTemplate">The message template.</param>
-        /// <param name="values">Values to log.</param>
-        public static void Fatal(Exception exception, string messageTemplate, params object[] values)
-            => WriteLog(Assembly.GetCallingAssembly().GetName().Name, LogEventLevel.Fatal, messageTemplate, exception, values);
-
-        #endregion
-
-        private static ILogger GetPluginLogger(string? pluginName)
-        {
-            return Serilog.Log.ForContext("SourceContext", pluginName ?? string.Empty);
-        }
-
-        private static void WriteLog(string? pluginName, LogEventLevel level, string messageTemplate, Exception? exception = null, params object[] values)
-        {
-            var pluginLogger = GetPluginLogger(pluginName);
-
-            // FIXME: Eventually, the `pluginName` tag should be removed from here and moved over to the actual log
-            //        formatter.
-            pluginLogger.Write(
-                level,
-                exception: exception,
-                messageTemplate: $"[{pluginName}] {messageTemplate}",
-                values);
-        }
+        // FIXME: Eventually, the `pluginName` tag should be removed from here and moved over to the actual log
+        //        formatter.
+        pluginLogger.Write(
+            level,
+            exception: exception,
+            messageTemplate: $"[{pluginName}] {messageTemplate}",
+            values);
     }
 }
diff --git a/Dalamud/Memory/Exceptions/MemoryAllocationException.cs b/Dalamud/Memory/Exceptions/MemoryAllocationException.cs
index e289c8782..61f124bad 100644
--- a/Dalamud/Memory/Exceptions/MemoryAllocationException.cs
+++ b/Dalamud/Memory/Exceptions/MemoryAllocationException.cs
@@ -1,47 +1,46 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Dalamud.Memory.Exceptions
+namespace Dalamud.Memory.Exceptions;
+
+/// <summary>
+/// An exception thrown when VirtualAlloc fails.
+/// </summary>
+public class MemoryAllocationException : MemoryException
 {
     /// <summary>
-    /// An exception thrown when VirtualAlloc fails.
+    /// Initializes a new instance of the <see cref="MemoryAllocationException"/> class.
     /// </summary>
-    public class MemoryAllocationException : MemoryException
+    public MemoryAllocationException()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryAllocationException"/> class.
-        /// </summary>
-        public MemoryAllocationException()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryAllocationException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public MemoryAllocationException(string message)
-            : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryAllocationException"/> class.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public MemoryAllocationException(string message)
+        : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryAllocationException"/> class.
-        /// </summary>
-        /// <param name="message">The error message that explains the reason for the exception.</param>
-        /// <param name="innerException">The exception that is the cause of the current exception.</param>
-        public MemoryAllocationException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryAllocationException"/> class.
+    /// </summary>
+    /// <param name="message">The error message that explains the reason for the exception.</param>
+    /// <param name="innerException">The exception that is the cause of the current exception.</param>
+    public MemoryAllocationException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryAllocationException"/> class.
-        /// </summary>
-        /// <param name="info">The object that holds the serialized data about the exception being thrown.</param>
-        /// <param name="context">The object that contains contextual information about the source or destination.</param>
-        protected MemoryAllocationException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryAllocationException"/> class.
+    /// </summary>
+    /// <param name="info">The object that holds the serialized data about the exception being thrown.</param>
+    /// <param name="context">The object that contains contextual information about the source or destination.</param>
+    protected MemoryAllocationException(SerializationInfo info, StreamingContext context)
+        : base(info, context)
+    {
     }
 }
diff --git a/Dalamud/Memory/Exceptions/MemoryException.cs b/Dalamud/Memory/Exceptions/MemoryException.cs
index 810e76404..6cb1b887c 100644
--- a/Dalamud/Memory/Exceptions/MemoryException.cs
+++ b/Dalamud/Memory/Exceptions/MemoryException.cs
@@ -1,47 +1,46 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Dalamud.Memory.Exceptions
+namespace Dalamud.Memory.Exceptions;
+
+/// <summary>
+/// The base exception when thrown from Dalamud.Memory.
+/// </summary>
+public abstract class MemoryException : Exception
 {
     /// <summary>
-    /// The base exception when thrown from Dalamud.Memory.
+    /// Initializes a new instance of the <see cref="MemoryException"/> class.
     /// </summary>
-    public abstract class MemoryException : Exception
+    public MemoryException()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryException"/> class.
-        /// </summary>
-        public MemoryException()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public MemoryException(string message)
-            : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryException"/> class.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public MemoryException(string message)
+        : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryException"/> class.
-        /// </summary>
-        /// <param name="message">The error message that explains the reason for the exception.</param>
-        /// <param name="innerException">The exception that is the cause of the current exception.</param>
-        public MemoryException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryException"/> class.
+    /// </summary>
+    /// <param name="message">The error message that explains the reason for the exception.</param>
+    /// <param name="innerException">The exception that is the cause of the current exception.</param>
+    public MemoryException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryException"/> class.
-        /// </summary>
-        /// <param name="info">The object that holds the serialized data about the exception being thrown.</param>
-        /// <param name="context">The object that contains contextual information about the source or destination.</param>
-        protected MemoryException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryException"/> class.
+    /// </summary>
+    /// <param name="info">The object that holds the serialized data about the exception being thrown.</param>
+    /// <param name="context">The object that contains contextual information about the source or destination.</param>
+    protected MemoryException(SerializationInfo info, StreamingContext context)
+        : base(info, context)
+    {
     }
 }
diff --git a/Dalamud/Memory/Exceptions/MemoryPermissionException.cs b/Dalamud/Memory/Exceptions/MemoryPermissionException.cs
index e94ccc0ce..b4dddfc5f 100644
--- a/Dalamud/Memory/Exceptions/MemoryPermissionException.cs
+++ b/Dalamud/Memory/Exceptions/MemoryPermissionException.cs
@@ -1,47 +1,46 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Dalamud.Memory.Exceptions
+namespace Dalamud.Memory.Exceptions;
+
+/// <summary>
+/// An exception thrown when VirtualProtect fails.
+/// </summary>
+public class MemoryPermissionException : MemoryException
 {
     /// <summary>
-    /// An exception thrown when VirtualProtect fails.
+    /// Initializes a new instance of the <see cref="MemoryPermissionException"/> class.
     /// </summary>
-    public class MemoryPermissionException : MemoryException
+    public MemoryPermissionException()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryPermissionException"/> class.
-        /// </summary>
-        public MemoryPermissionException()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryPermissionException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public MemoryPermissionException(string message)
-            : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryPermissionException"/> class.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public MemoryPermissionException(string message)
+        : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryPermissionException"/> class.
-        /// </summary>
-        /// <param name="message">The error message that explains the reason for the exception.</param>
-        /// <param name="innerException">The exception that is the cause of the current exception.</param>
-        public MemoryPermissionException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryPermissionException"/> class.
+    /// </summary>
+    /// <param name="message">The error message that explains the reason for the exception.</param>
+    /// <param name="innerException">The exception that is the cause of the current exception.</param>
+    public MemoryPermissionException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryPermissionException"/> class.
-        /// </summary>
-        /// <param name="info">The object that holds the serialized data about the exception being thrown.</param>
-        /// <param name="context">The object that contains contextual information about the source or destination.</param>
-        protected MemoryPermissionException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryPermissionException"/> class.
+    /// </summary>
+    /// <param name="info">The object that holds the serialized data about the exception being thrown.</param>
+    /// <param name="context">The object that contains contextual information about the source or destination.</param>
+    protected MemoryPermissionException(SerializationInfo info, StreamingContext context)
+        : base(info, context)
+    {
     }
 }
diff --git a/Dalamud/Memory/Exceptions/MemoryReadException.cs b/Dalamud/Memory/Exceptions/MemoryReadException.cs
index 7f3f4b1f2..ee02c5473 100644
--- a/Dalamud/Memory/Exceptions/MemoryReadException.cs
+++ b/Dalamud/Memory/Exceptions/MemoryReadException.cs
@@ -1,47 +1,46 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Dalamud.Memory.Exceptions
+namespace Dalamud.Memory.Exceptions;
+
+/// <summary>
+/// An exception thrown when ReadProcessMemory fails.
+/// </summary>
+public class MemoryReadException : MemoryException
 {
     /// <summary>
-    /// An exception thrown when ReadProcessMemory fails.
+    /// Initializes a new instance of the <see cref="MemoryReadException"/> class.
     /// </summary>
-    public class MemoryReadException : MemoryException
+    public MemoryReadException()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryReadException"/> class.
-        /// </summary>
-        public MemoryReadException()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryReadException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public MemoryReadException(string message)
-            : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryReadException"/> class.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public MemoryReadException(string message)
+        : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryReadException"/> class.
-        /// </summary>
-        /// <param name="message">The error message that explains the reason for the exception.</param>
-        /// <param name="innerException">The exception that is the cause of the current exception.</param>
-        public MemoryReadException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryReadException"/> class.
+    /// </summary>
+    /// <param name="message">The error message that explains the reason for the exception.</param>
+    /// <param name="innerException">The exception that is the cause of the current exception.</param>
+    public MemoryReadException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryReadException"/> class.
-        /// </summary>
-        /// <param name="info">The object that holds the serialized data about the exception being thrown.</param>
-        /// <param name="context">The object that contains contextual information about the source or destination.</param>
-        protected MemoryReadException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryReadException"/> class.
+    /// </summary>
+    /// <param name="info">The object that holds the serialized data about the exception being thrown.</param>
+    /// <param name="context">The object that contains contextual information about the source or destination.</param>
+    protected MemoryReadException(SerializationInfo info, StreamingContext context)
+        : base(info, context)
+    {
     }
 }
diff --git a/Dalamud/Memory/Exceptions/MemoryWriteException.cs b/Dalamud/Memory/Exceptions/MemoryWriteException.cs
index 5aadcee53..edbf06fdc 100644
--- a/Dalamud/Memory/Exceptions/MemoryWriteException.cs
+++ b/Dalamud/Memory/Exceptions/MemoryWriteException.cs
@@ -1,47 +1,46 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace Dalamud.Memory.Exceptions
+namespace Dalamud.Memory.Exceptions;
+
+/// <summary>
+/// An exception thrown when WriteProcessMemory fails.
+/// </summary>
+public class MemoryWriteException : MemoryException
 {
     /// <summary>
-    /// An exception thrown when WriteProcessMemory fails.
+    /// Initializes a new instance of the <see cref="MemoryWriteException"/> class.
     /// </summary>
-    public class MemoryWriteException : MemoryException
+    public MemoryWriteException()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryWriteException"/> class.
-        /// </summary>
-        public MemoryWriteException()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryWriteException"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public MemoryWriteException(string message)
-            : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryWriteException"/> class.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public MemoryWriteException(string message)
+        : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryWriteException"/> class.
-        /// </summary>
-        /// <param name="message">The error message that explains the reason for the exception.</param>
-        /// <param name="innerException">The exception that is the cause of the current exception.</param>
-        public MemoryWriteException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryWriteException"/> class.
+    /// </summary>
+    /// <param name="message">The error message that explains the reason for the exception.</param>
+    /// <param name="innerException">The exception that is the cause of the current exception.</param>
+    public MemoryWriteException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryWriteException"/> class.
-        /// </summary>
-        /// <param name="info">The object that holds the serialized data about the exception being thrown.</param>
-        /// <param name="context">The object that contains contextual information about the source or destination.</param>
-        protected MemoryWriteException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MemoryWriteException"/> class.
+    /// </summary>
+    /// <param name="info">The object that holds the serialized data about the exception being thrown.</param>
+    /// <param name="context">The object that contains contextual information about the source or destination.</param>
+    protected MemoryWriteException(SerializationInfo info, StreamingContext context)
+        : base(info, context)
+    {
     }
 }
diff --git a/Dalamud/Memory/MemoryHelper.cs b/Dalamud/Memory/MemoryHelper.cs
index 5563f0599..f97461e66 100644
--- a/Dalamud/Memory/MemoryHelper.cs
+++ b/Dalamud/Memory/MemoryHelper.cs
@@ -12,746 +12,745 @@ using static Dalamud.NativeFunctions;
 
 // Heavily inspired from Reloaded (https://github.com/Reloaded-Project/Reloaded.Memory)
 
-namespace Dalamud.Memory
+namespace Dalamud.Memory;
+
+/// <summary>
+/// A simple class that provides read/write access to arbitrary memory.
+/// </summary>
+public static unsafe class MemoryHelper
 {
+    #region Read
+
     /// <summary>
-    /// A simple class that provides read/write access to arbitrary memory.
+    /// Reads a generic type from a specified memory address.
     /// </summary>
-    public static unsafe class MemoryHelper
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <returns>The read in struct.</returns>
+    public static T Read<T>(IntPtr memoryAddress) where T : unmanaged
+        => Read<T>(memoryAddress, false);
+
+    /// <summary>
+    /// Reads a generic type from a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="marshal">Set this to true to enable struct marshalling.</param>
+    /// <returns>The read in struct.</returns>
+    public static T Read<T>(IntPtr memoryAddress, bool marshal)
     {
-        #region Read
+        return marshal
+                   ? Marshal.PtrToStructure<T>(memoryAddress)
+                   : Unsafe.Read<T>((void*)memoryAddress);
+    }
 
-        /// <summary>
-        /// Reads a generic type from a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <returns>The read in struct.</returns>
-        public static T Read<T>(IntPtr memoryAddress) where T : unmanaged
-            => Read<T>(memoryAddress, false);
+    /// <summary>
+    /// Reads a byte array from a specified memory address.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="length">The amount of bytes to read starting from the memoryAddress.</param>
+    /// <returns>The read in byte array.</returns>
+    public static byte[] ReadRaw(IntPtr memoryAddress, int length)
+    {
+        var value = new byte[length];
+        Marshal.Copy(memoryAddress, value, 0, value.Length);
+        return value;
+    }
 
-        /// <summary>
-        /// Reads a generic type from a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="marshal">Set this to true to enable struct marshalling.</param>
-        /// <returns>The read in struct.</returns>
-        public static T Read<T>(IntPtr memoryAddress, bool marshal)
+    /// <summary>
+    /// Reads a generic type array from a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="arrayLength">The amount of array items to read.</param>
+    /// <returns>The read in struct array.</returns>
+    public static T[] Read<T>(IntPtr memoryAddress, int arrayLength) where T : unmanaged
+        => Read<T>(memoryAddress, arrayLength, false);
+
+    /// <summary>
+    /// Reads a generic type array from a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="arrayLength">The amount of array items to read.</param>
+    /// <param name="marshal">Set this to true to enable struct marshalling.</param>
+    /// <returns>The read in struct array.</returns>
+    public static T[] Read<T>(IntPtr memoryAddress, int arrayLength, bool marshal)
+    {
+        var structSize = SizeOf<T>(marshal);
+        var value = new T[arrayLength];
+
+        for (var i = 0; i < arrayLength; i++)
         {
-            return marshal
-                ? Marshal.PtrToStructure<T>(memoryAddress)
-                : Unsafe.Read<T>((void*)memoryAddress);
+            var address = memoryAddress + (structSize * i);
+            Read(address, out T result, marshal);
+            value[i] = result;
         }
 
-        /// <summary>
-        /// Reads a byte array from a specified memory address.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="length">The amount of bytes to read starting from the memoryAddress.</param>
-        /// <returns>The read in byte array.</returns>
-        public static byte[] ReadRaw(IntPtr memoryAddress, int length)
+        return value;
+    }
+
+    /// <summary>
+    /// Reads a null-terminated byte array from a specified memory address.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <returns>The read in byte array.</returns>
+    public static unsafe byte[] ReadRawNullTerminated(IntPtr memoryAddress)
+    {
+        var byteCount = 0;
+        while (*(byte*)(memoryAddress + byteCount) != 0x00)
         {
-            var value = new byte[length];
-            Marshal.Copy(memoryAddress, value, 0, value.Length);
-            return value;
+            byteCount++;
         }
 
-        /// <summary>
-        /// Reads a generic type array from a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="arrayLength">The amount of array items to read.</param>
-        /// <returns>The read in struct array.</returns>
-        public static T[] Read<T>(IntPtr memoryAddress, int arrayLength) where T : unmanaged
-            => Read<T>(memoryAddress, arrayLength, false);
+        return ReadRaw(memoryAddress, byteCount);
+    }
 
-        /// <summary>
-        /// Reads a generic type array from a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="arrayLength">The amount of array items to read.</param>
-        /// <param name="marshal">Set this to true to enable struct marshalling.</param>
-        /// <returns>The read in struct array.</returns>
-        public static T[] Read<T>(IntPtr memoryAddress, int arrayLength, bool marshal)
+    #endregion
+
+    #region Read(out)
+
+    /// <summary>
+    /// Reads a generic type from a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="value">Local variable to receive the read in struct.</param>
+    public static void Read<T>(IntPtr memoryAddress, out T value) where T : unmanaged
+        => value = Read<T>(memoryAddress);
+
+    /// <summary>
+    /// Reads a generic type from a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="value">Local variable to receive the read in struct.</param>
+    /// <param name="marshal">Set this to true to enable struct marshalling.</param>
+    public static void Read<T>(IntPtr memoryAddress, out T value, bool marshal)
+        => value = Read<T>(memoryAddress, marshal);
+
+    /// <summary>
+    /// Reads raw data from a specified memory address.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="length">The amount of bytes to read starting from the memoryAddress.</param>
+    /// <param name="value">Local variable to receive the read in bytes.</param>
+    public static void ReadRaw(IntPtr memoryAddress, int length, out byte[] value)
+        => value = ReadRaw(memoryAddress, length);
+
+    /// <summary>
+    /// Reads a generic type array from a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="arrayLength">The amount of array items to read.</param>
+    /// <param name="value">The read in struct array.</param>
+    public static void Read<T>(IntPtr memoryAddress, int arrayLength, out T[] value) where T : unmanaged
+        => value = Read<T>(memoryAddress, arrayLength);
+
+    /// <summary>
+    /// Reads a generic type array from a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="arrayLength">The amount of array items to read.</param>
+    /// <param name="marshal">Set this to true to enable struct marshalling.</param>
+    /// <param name="value">The read in struct array.</param>
+    public static void Read<T>(IntPtr memoryAddress, int arrayLength, bool marshal, out T[] value)
+        => value = Read<T>(memoryAddress, arrayLength, marshal);
+
+    #endregion
+
+    #region ReadString
+
+    /// <summary>
+    /// Read a UTF-8 encoded string from a specified memory address.
+    /// </summary>
+    /// <remarks>
+    /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
+    /// </remarks>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <returns>The read in string.</returns>
+    public static string ReadStringNullTerminated(IntPtr memoryAddress)
+        => ReadStringNullTerminated(memoryAddress, Encoding.UTF8);
+
+    /// <summary>
+    /// Read a string with the given encoding from a specified memory address.
+    /// </summary>
+    /// <remarks>
+    /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
+    /// </remarks>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="encoding">The encoding to use to decode the string.</param>
+    /// <returns>The read in string.</returns>
+    public static string ReadStringNullTerminated(IntPtr memoryAddress, Encoding encoding)
+    {
+        var buffer = ReadRawNullTerminated(memoryAddress);
+        return encoding.GetString(buffer);
+    }
+
+    /// <summary>
+    /// Read a UTF-8 encoded string from a specified memory address.
+    /// </summary>
+    /// <remarks>
+    /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
+    /// </remarks>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="maxLength">The maximum length of the string.</param>
+    /// <returns>The read in string.</returns>
+    public static string ReadString(IntPtr memoryAddress, int maxLength)
+        => ReadString(memoryAddress, Encoding.UTF8, maxLength);
+
+    /// <summary>
+    /// Read a string with the given encoding from a specified memory address.
+    /// </summary>
+    /// <remarks>
+    /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
+    /// </remarks>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="encoding">The encoding to use to decode the string.</param>
+    /// <param name="maxLength">The maximum length of the string.</param>
+    /// <returns>The read in string.</returns>
+    public static string ReadString(IntPtr memoryAddress, Encoding encoding, int maxLength)
+    {
+        if (maxLength <= 0)
+            return string.Empty;
+
+        ReadRaw(memoryAddress, maxLength, out var buffer);
+
+        var data = encoding.GetString(buffer);
+        var eosPos = data.IndexOf('\0');
+        return eosPos >= 0 ? data.Substring(0, eosPos) : data;
+    }
+
+    /// <summary>
+    /// Read a null-terminated SeString from a specified memory address.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <returns>The read in string.</returns>
+    public static SeString ReadSeStringNullTerminated(IntPtr memoryAddress)
+    {
+        var buffer = ReadRawNullTerminated(memoryAddress);
+        return SeString.Parse(buffer);
+    }
+
+    /// <summary>
+    /// Read an SeString from a specified memory address.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="maxLength">The maximum length of the string.</param>
+    /// <returns>The read in string.</returns>
+    public static SeString ReadSeString(IntPtr memoryAddress, int maxLength)
+    {
+        ReadRaw(memoryAddress, maxLength, out var buffer);
+
+        var eos = Array.IndexOf(buffer, (byte)0);
+        if (eos < 0)
         {
-            var structSize = SizeOf<T>(marshal);
-            var value = new T[arrayLength];
-
-            for (var i = 0; i < arrayLength; i++)
-            {
-                var address = memoryAddress + (structSize * i);
-                Read(address, out T result, marshal);
-                value[i] = result;
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// Reads a null-terminated byte array from a specified memory address.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <returns>The read in byte array.</returns>
-        public static unsafe byte[] ReadRawNullTerminated(IntPtr memoryAddress)
-        {
-            var byteCount = 0;
-            while (*(byte*)(memoryAddress + byteCount) != 0x00)
-            {
-                byteCount++;
-            }
-
-            return ReadRaw(memoryAddress, byteCount);
-        }
-
-        #endregion
-
-        #region Read(out)
-
-        /// <summary>
-        /// Reads a generic type from a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="value">Local variable to receive the read in struct.</param>
-        public static void Read<T>(IntPtr memoryAddress, out T value) where T : unmanaged
-            => value = Read<T>(memoryAddress);
-
-        /// <summary>
-        /// Reads a generic type from a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="value">Local variable to receive the read in struct.</param>
-        /// <param name="marshal">Set this to true to enable struct marshalling.</param>
-        public static void Read<T>(IntPtr memoryAddress, out T value, bool marshal)
-            => value = Read<T>(memoryAddress, marshal);
-
-        /// <summary>
-        /// Reads raw data from a specified memory address.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="length">The amount of bytes to read starting from the memoryAddress.</param>
-        /// <param name="value">Local variable to receive the read in bytes.</param>
-        public static void ReadRaw(IntPtr memoryAddress, int length, out byte[] value)
-            => value = ReadRaw(memoryAddress, length);
-
-        /// <summary>
-        /// Reads a generic type array from a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="arrayLength">The amount of array items to read.</param>
-        /// <param name="value">The read in struct array.</param>
-        public static void Read<T>(IntPtr memoryAddress, int arrayLength, out T[] value) where T : unmanaged
-            => value = Read<T>(memoryAddress, arrayLength);
-
-        /// <summary>
-        /// Reads a generic type array from a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="arrayLength">The amount of array items to read.</param>
-        /// <param name="marshal">Set this to true to enable struct marshalling.</param>
-        /// <param name="value">The read in struct array.</param>
-        public static void Read<T>(IntPtr memoryAddress, int arrayLength, bool marshal, out T[] value)
-            => value = Read<T>(memoryAddress, arrayLength, marshal);
-
-        #endregion
-
-        #region ReadString
-
-        /// <summary>
-        /// Read a UTF-8 encoded string from a specified memory address.
-        /// </summary>
-        /// <remarks>
-        /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
-        /// </remarks>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <returns>The read in string.</returns>
-        public static string ReadStringNullTerminated(IntPtr memoryAddress)
-            => ReadStringNullTerminated(memoryAddress, Encoding.UTF8);
-
-        /// <summary>
-        /// Read a string with the given encoding from a specified memory address.
-        /// </summary>
-        /// <remarks>
-        /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
-        /// </remarks>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="encoding">The encoding to use to decode the string.</param>
-        /// <returns>The read in string.</returns>
-        public static string ReadStringNullTerminated(IntPtr memoryAddress, Encoding encoding)
-        {
-            var buffer = ReadRawNullTerminated(memoryAddress);
-            return encoding.GetString(buffer);
-        }
-
-        /// <summary>
-        /// Read a UTF-8 encoded string from a specified memory address.
-        /// </summary>
-        /// <remarks>
-        /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
-        /// </remarks>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="maxLength">The maximum length of the string.</param>
-        /// <returns>The read in string.</returns>
-        public static string ReadString(IntPtr memoryAddress, int maxLength)
-            => ReadString(memoryAddress, Encoding.UTF8, maxLength);
-
-        /// <summary>
-        /// Read a string with the given encoding from a specified memory address.
-        /// </summary>
-        /// <remarks>
-        /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
-        /// </remarks>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="encoding">The encoding to use to decode the string.</param>
-        /// <param name="maxLength">The maximum length of the string.</param>
-        /// <returns>The read in string.</returns>
-        public static string ReadString(IntPtr memoryAddress, Encoding encoding, int maxLength)
-        {
-            if (maxLength <= 0)
-                return string.Empty;
-
-            ReadRaw(memoryAddress, maxLength, out var buffer);
-
-            var data = encoding.GetString(buffer);
-            var eosPos = data.IndexOf('\0');
-            return eosPos >= 0 ? data.Substring(0, eosPos) : data;
-        }
-
-        /// <summary>
-        /// Read a null-terminated SeString from a specified memory address.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <returns>The read in string.</returns>
-        public static SeString ReadSeStringNullTerminated(IntPtr memoryAddress)
-        {
-            var buffer = ReadRawNullTerminated(memoryAddress);
             return SeString.Parse(buffer);
         }
-
-        /// <summary>
-        /// Read an SeString from a specified memory address.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="maxLength">The maximum length of the string.</param>
-        /// <returns>The read in string.</returns>
-        public static SeString ReadSeString(IntPtr memoryAddress, int maxLength)
+        else
         {
-            ReadRaw(memoryAddress, maxLength, out var buffer);
-
-            var eos = Array.IndexOf(buffer, (byte)0);
-            if (eos < 0)
-            {
-                return SeString.Parse(buffer);
-            }
-            else
-            {
-                var newBuffer = new byte[eos];
-                Buffer.BlockCopy(buffer, 0, newBuffer, 0, eos);
-                return SeString.Parse(newBuffer);
-            }
+            var newBuffer = new byte[eos];
+            Buffer.BlockCopy(buffer, 0, newBuffer, 0, eos);
+            return SeString.Parse(newBuffer);
         }
-
-        /// <summary>
-        /// Read an SeString from a specified Utf8String structure.
-        /// </summary>
-        /// <param name="utf8String">The memory address to read from.</param>
-        /// <returns>The read in string.</returns>
-        public static unsafe SeString ReadSeString(Utf8String* utf8String)
-        {
-            if (utf8String == null)
-                return string.Empty;
-
-            var ptr = utf8String->StringPtr;
-            if (ptr == null)
-                return string.Empty;
-
-            var len = Math.Max(utf8String->BufUsed, utf8String->StringLength);
-
-            return ReadSeString((IntPtr)ptr, (int)len);
-        }
-
-        #endregion
-
-        #region ReadString(out)
-
-        /// <summary>
-        /// Read a UTF-8 encoded string from a specified memory address.
-        /// </summary>
-        /// <remarks>
-        /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
-        /// </remarks>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="value">The read in string.</param>
-        public static void ReadStringNullTerminated(IntPtr memoryAddress, out string value)
-            => value = ReadStringNullTerminated(memoryAddress);
-
-        /// <summary>
-        /// Read a string with the given encoding from a specified memory address.
-        /// </summary>
-        /// <remarks>
-        /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
-        /// </remarks>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="encoding">The encoding to use to decode the string.</param>
-        /// <param name="value">The read in string.</param>
-        public static void ReadStringNullTerminated(IntPtr memoryAddress, Encoding encoding, out string value)
-            => value = ReadStringNullTerminated(memoryAddress, encoding);
-
-        /// <summary>
-        /// Read a UTF-8 encoded string from a specified memory address.
-        /// </summary>
-        /// <remarks>
-        /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
-        /// </remarks>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="value">The read in string.</param>
-        /// <param name="maxLength">The maximum length of the string.</param>
-        public static void ReadString(IntPtr memoryAddress, out string value, int maxLength)
-            => value = ReadString(memoryAddress, maxLength);
-
-        /// <summary>
-        /// Read a string with the given encoding from a specified memory address.
-        /// </summary>
-        /// <remarks>
-        /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
-        /// </remarks>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="encoding">The encoding to use to decode the string.</param>
-        /// <param name="maxLength">The maximum length of the string.</param>
-        /// <param name="value">The read in string.</param>
-        public static void ReadString(IntPtr memoryAddress, Encoding encoding, int maxLength, out string value)
-            => value = ReadString(memoryAddress, encoding, maxLength);
-
-        /// <summary>
-        /// Read a null-terminated SeString from a specified memory address.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="value">The read in SeString.</param>
-        public static void ReadSeStringNullTerminated(IntPtr memoryAddress, out SeString value)
-            => value = ReadSeStringNullTerminated(memoryAddress);
-
-        /// <summary>
-        /// Read an SeString from a specified memory address.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="maxLength">The maximum length of the string.</param>
-        /// <param name="value">The read in SeString.</param>
-        public static void ReadSeString(IntPtr memoryAddress, int maxLength, out SeString value)
-            => value = ReadSeString(memoryAddress, maxLength);
-
-        /// <summary>
-        /// Read an SeString from a specified Utf8String structure.
-        /// </summary>
-        /// <param name="utf8String">The memory address to read from.</param>
-        /// <param name="value">The read in string.</param>
-        public static unsafe void ReadSeString(Utf8String* utf8String, out SeString value)
-            => value = ReadSeString(utf8String);
-
-        #endregion
-
-        #region Write
-
-        /// <summary>
-        /// Writes a generic type to a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="item">The item to write to the address.</param>
-        public static void Write<T>(IntPtr memoryAddress, T item) where T : unmanaged
-            => Write(memoryAddress, item, false);
-
-        /// <summary>
-        /// Writes a generic type to a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="item">The item to write to the address.</param>
-        /// <param name="marshal">Set this to true to enable struct marshalling.</param>
-        public static void Write<T>(IntPtr memoryAddress, T item, bool marshal)
-        {
-            if (marshal)
-                Marshal.StructureToPtr(item, memoryAddress, false);
-            else
-                Unsafe.Write((void*)memoryAddress, item);
-        }
-
-        /// <summary>
-        /// Writes raw data to a specified memory address.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="data">The bytes to write to memoryAddress.</param>
-        public static void WriteRaw(IntPtr memoryAddress, byte[] data)
-        {
-            Marshal.Copy(data, 0, memoryAddress, data.Length);
-        }
-
-        /// <summary>
-        /// Writes a generic type array to a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to write to.</param>
-        /// <param name="items">The array of items to write to the address.</param>
-        public static void Write<T>(IntPtr memoryAddress, T[] items) where T : unmanaged
-            => Write(memoryAddress, items, false);
-
-        /// <summary>
-        /// Writes a generic type array to a specified memory address.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address to write to.</param>
-        /// <param name="items">The array of items to write to the address.</param>
-        /// <param name="marshal">Set this to true to enable struct marshalling.</param>
-        public static void Write<T>(IntPtr memoryAddress, T[] items, bool marshal)
-        {
-            var structSize = SizeOf<T>(marshal);
-
-            for (var i = 0; i < items.Length; i++)
-            {
-                var address = memoryAddress + (structSize * i);
-                Write(address, items[i], marshal);
-            }
-        }
-
-        #endregion
-
-        #region WriteString
-
-        /// <summary>
-        /// Write a UTF-8 encoded string to a specified memory address.
-        /// </summary>
-        /// <remarks>
-        /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to encode or the applicable helper method.
-        /// </remarks>
-        /// <param name="memoryAddress">The memory address to write to.</param>
-        /// <param name="value">The string to write.</param>
-        public static void WriteString(IntPtr memoryAddress, string value)
-            => WriteString(memoryAddress, value, Encoding.UTF8);
-
-        /// <summary>
-        /// Write a string with the given encoding to a specified memory address.
-        /// </summary>
-        /// <remarks>
-        /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to encode or the applicable helper method.
-        /// </remarks>
-        /// <param name="memoryAddress">The memory address to write to.</param>
-        /// <param name="value">The string to write.</param>
-        /// <param name="encoding">The encoding to use.</param>
-        public static void WriteString(IntPtr memoryAddress, string value, Encoding encoding)
-        {
-            if (string.IsNullOrEmpty(value))
-                return;
-
-            var bytes = encoding.GetBytes(value + '\0');
-
-            WriteRaw(memoryAddress, bytes);
-        }
-
-        /// <summary>
-        /// Write an SeString to a specified memory address.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to write to.</param>
-        /// <param name="value">The SeString to write.</param>
-        public static void WriteSeString(IntPtr memoryAddress, SeString value)
-        {
-            if (value is null)
-                return;
-
-            WriteRaw(memoryAddress, value.Encode());
-        }
-
-        #endregion
-
-        #region ApiWrappers
-
-        /// <summary>
-        /// Allocates fixed size of memory inside the target memory source via Windows API calls.
-        /// Returns the address of newly allocated memory.
-        /// </summary>
-        /// <param name="length">Amount of bytes to be allocated.</param>
-        /// <returns>Address to the newly allocated memory.</returns>
-        public static IntPtr Allocate(int length)
-        {
-            var address = VirtualAlloc(
-                IntPtr.Zero,
-                (UIntPtr)length,
-                AllocationType.Commit | AllocationType.Reserve,
-                MemoryProtection.ExecuteReadWrite);
-
-            if (address == IntPtr.Zero)
-                throw new MemoryAllocationException($"Unable to allocate {length} bytes.");
-
-            return address;
-        }
-
-        /// <summary>
-        /// Allocates fixed size of memory inside the target memory source via Windows API calls.
-        /// Returns the address of newly allocated memory.
-        /// </summary>
-        /// <param name="length">Amount of bytes to be allocated.</param>
-        /// <param name="memoryAddress">Address to the newly allocated memory.</param>
-        public static void Allocate(int length, out IntPtr memoryAddress)
-            => memoryAddress = Allocate(length);
-
-        /// <summary>
-        /// Frees memory previously allocated with Allocate via Windows API calls.
-        /// </summary>
-        /// <param name="memoryAddress">The address of the memory to free.</param>
-        /// <returns>True if the operation is successful.</returns>
-        public static bool Free(IntPtr memoryAddress)
-        {
-            return VirtualFree(memoryAddress, UIntPtr.Zero, AllocationType.Release);
-        }
-
-        /// <summary>
-        /// Changes the page permissions for a specified combination of address and length via Windows API calls.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address for which to change page permissions for.</param>
-        /// <param name="length">The region size for which to change permissions for.</param>
-        /// <param name="newPermissions">The new permissions to set.</param>
-        /// <returns>The old page permissions.</returns>
-        public static MemoryProtection ChangePermission(IntPtr memoryAddress, int length, MemoryProtection newPermissions)
-        {
-            var result = VirtualProtect(memoryAddress, (UIntPtr)length, newPermissions, out var oldPermissions);
-
-            if (!result)
-                throw new MemoryPermissionException($"Unable to change permissions at 0x{memoryAddress.ToInt64():X} of length {length} and permission {newPermissions} (result={result})");
-
-            var last = Marshal.GetLastWin32Error();
-            if (last > 0)
-                throw new MemoryPermissionException($"Unable to change permissions at 0x{memoryAddress.ToInt64():X} of length {length} and permission {newPermissions} (error={last})");
-
-            return oldPermissions;
-        }
-
-        /// <summary>
-        /// Changes the page permissions for a specified combination of address and length via Windows API calls.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address for which to change page permissions for.</param>
-        /// <param name="length">The region size for which to change permissions for.</param>
-        /// <param name="newPermissions">The new permissions to set.</param>
-        /// <param name="oldPermissions">The old page permissions.</param>
-        public static void ChangePermission(IntPtr memoryAddress, int length, MemoryProtection newPermissions, out MemoryProtection oldPermissions)
-            => oldPermissions = ChangePermission(memoryAddress, length, newPermissions);
-
-        /// <summary>
-        /// Changes the page permissions for a specified combination of address and element from which to deduce size via Windows API calls.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="memoryAddress">The memory address for which to change page permissions for.</param>
-        /// <param name="baseElement">The struct element from which the region size to change permissions for will be calculated.</param>
-        /// <param name="newPermissions">The new permissions to set.</param>
-        /// <param name="marshal">Set to true to calculate the size of the struct after marshalling instead of before.</param>
-        /// <returns>The old page permissions.</returns>
-        public static MemoryProtection ChangePermission<T>(IntPtr memoryAddress, ref T baseElement, MemoryProtection newPermissions, bool marshal)
-            => ChangePermission(memoryAddress, SizeOf<T>(marshal), newPermissions);
-
-        /// <summary>
-        /// Reads raw data from a specified memory address via Windows API calls.
-        /// This is noticably slower than Unsafe or Marshal.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="length">The amount of bytes to read starting from the memoryAddress.</param>
-        /// <returns>The read in bytes.</returns>
-        public static byte[] ReadProcessMemory(IntPtr memoryAddress, int length)
-        {
-            var value = new byte[length];
-            ReadProcessMemory(memoryAddress, ref value);
-            return value;
-        }
-
-        /// <summary>
-        /// Reads raw data from a specified memory address via Windows API calls.
-        /// This is noticably slower than Unsafe or Marshal.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="length">The amount of bytes to read starting from the memoryAddress.</param>
-        /// <param name="value">The read in bytes.</param>
-        public static void ReadProcessMemory(IntPtr memoryAddress, int length, out byte[] value)
-            => value = ReadProcessMemory(memoryAddress, length);
-
-        /// <summary>
-        /// Reads raw data from a specified memory address via Windows API calls.
-        /// This is noticably slower than Unsafe or Marshal.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to read from.</param>
-        /// <param name="value">The read in bytes.</param>
-        public static void ReadProcessMemory(IntPtr memoryAddress, ref byte[] value)
-        {
-            var length = value.Length;
-            var result = NativeFunctions.ReadProcessMemory((IntPtr)0xFFFFFFFF, memoryAddress, value, length, out _);
-
-            if (!result)
-                throw new MemoryReadException($"Unable to read memory at 0x{memoryAddress.ToInt64():X} of length {length} (result={result})");
-
-            var last = Marshal.GetLastWin32Error();
-            if (last > 0)
-                throw new MemoryReadException($"Unable to read memory at 0x{memoryAddress.ToInt64():X} of length {length} (error={last})");
-        }
-
-        /// <summary>
-        /// Writes raw data to a specified memory address via Windows API calls.
-        /// This is noticably slower than Unsafe or Marshal.
-        /// </summary>
-        /// <param name="memoryAddress">The memory address to write to.</param>
-        /// <param name="data">The bytes to write to memoryAddress.</param>
-        public static void WriteProcessMemory(IntPtr memoryAddress, byte[] data)
-        {
-            var length = data.Length;
-            var result = NativeFunctions.WriteProcessMemory((IntPtr)0xFFFFFFFF, memoryAddress, data, length, out _);
-
-            if (!result)
-                throw new MemoryWriteException($"Unable to write memory at 0x{memoryAddress.ToInt64():X} of length {length} (result={result})");
-
-            var last = Marshal.GetLastWin32Error();
-            if (last > 0)
-                throw new MemoryWriteException($"Unable to write memory at 0x{memoryAddress.ToInt64():X} of length {length} (error={last})");
-        }
-
-        #endregion
-
-        #region Sizing
-
-        /// <summary>
-        /// Returns the size of a specific primitive or struct type.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <returns>The size of the primitive or struct.</returns>
-        public static int SizeOf<T>()
-            => SizeOf<T>(false);
-
-        /// <summary>
-        /// Returns the size of a specific primitive or struct type.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="marshal">If set to true; will return the size of an element after marshalling.</param>
-        /// <returns>The size of the primitive or struct.</returns>
-        public static int SizeOf<T>(bool marshal)
-            => marshal ? Marshal.SizeOf<T>() : Unsafe.SizeOf<T>();
-
-        /// <summary>
-        /// Returns the size of a specific primitive or struct type.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="elementCount">The number of array elements present.</param>
-        /// <returns>The size of the primitive or struct array.</returns>
-        public static int SizeOf<T>(int elementCount) where T : unmanaged
-            => SizeOf<T>() * elementCount;
-
-        /// <summary>
-        /// Returns the size of a specific primitive or struct type.
-        /// </summary>
-        /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
-        /// <param name="elementCount">The number of array elements present.</param>
-        /// <param name="marshal">If set to true; will return the size of an element after marshalling.</param>
-        /// <returns>The size of the primitive or struct array.</returns>
-        public static int SizeOf<T>(int elementCount, bool marshal)
-            => SizeOf<T>(marshal) * elementCount;
-
-        #endregion
-
-        #region Game
-
-        /// <summary>
-        /// Allocate memory in the game's UI memory space.
-        /// </summary>
-        /// <param name="size">Amount of bytes to allocate.</param>
-        /// <param name="alignment">The alignment of the allocation.</param>
-        /// <returns>Pointer to the allocated region.</returns>
-        public static IntPtr GameAllocateUi(ulong size, ulong alignment = 0)
-        {
-            return new IntPtr(IMemorySpace.GetUISpace()->Malloc(size, alignment));
-        }
-
-        /// <summary>
-        /// Allocate memory in the game's default memory space.
-        /// </summary>
-        /// <param name="size">Amount of bytes to allocate.</param>
-        /// <param name="alignment">The alignment of the allocation.</param>
-        /// <returns>Pointer to the allocated region.</returns>
-        public static IntPtr GameAllocateDefault(ulong size, ulong alignment = 0)
-        {
-            return new IntPtr(IMemorySpace.GetDefaultSpace()->Malloc(size, alignment));
-        }
-
-        /// <summary>
-        /// Allocate memory in the game's animation memory space.
-        /// </summary>
-        /// <param name="size">Amount of bytes to allocate.</param>
-        /// <param name="alignment">The alignment of the allocation.</param>
-        /// <returns>Pointer to the allocated region.</returns>
-        public static IntPtr GameAllocateAnimation(ulong size, ulong alignment = 0)
-        {
-            return new IntPtr(IMemorySpace.GetAnimationSpace()->Malloc(size, alignment));
-        }
-
-        /// <summary>
-        /// Allocate memory in the game's apricot memory space.
-        /// </summary>
-        /// <param name="size">Amount of bytes to allocate.</param>
-        /// <param name="alignment">The alignment of the allocation.</param>
-        /// <returns>Pointer to the allocated region.</returns>
-        public static IntPtr GameAllocateApricot(ulong size, ulong alignment = 0)
-        {
-            return new IntPtr(IMemorySpace.GetApricotSpace()->Malloc(size, alignment));
-        }
-
-        /// <summary>
-        /// Allocate memory in the game's sound memory space.
-        /// </summary>
-        /// <param name="size">Amount of bytes to allocate.</param>
-        /// <param name="alignment">The alignment of the allocation.</param>
-        /// <returns>Pointer to the allocated region.</returns>
-        public static IntPtr GameAllocateSound(ulong size, ulong alignment = 0)
-        {
-            return new IntPtr(IMemorySpace.GetSoundSpace()->Malloc(size, alignment));
-        }
-
-        /// <summary>
-        /// Free memory in the game's memory space.
-        /// </summary>
-        /// <remarks>The memory you are freeing must be allocated with game allocators.</remarks>
-        /// <param name="ptr">Position at which the memory to be freed is located.</param>
-        /// <param name="size">Amount of bytes to free.</param>
-        public static void GameFree(ref IntPtr ptr, ulong size)
-        {
-            if (ptr == IntPtr.Zero)
-            {
-                return;
-            }
-
-            IMemorySpace.Free((void*)ptr, size);
-            ptr = IntPtr.Zero;
-        }
-
-        #endregion
-
-        #region Utility
-
-        /// <summary>
-        /// Null-terminate a byte array.
-        /// </summary>
-        /// <param name="bytes">The byte array to terminate.</param>
-        /// <returns>The terminated byte array.</returns>
-        public static byte[] NullTerminate(this byte[] bytes)
-        {
-            if (bytes.Length == 0 || bytes[^1] != 0)
-            {
-                var newBytes = new byte[bytes.Length + 1];
-                Array.Copy(bytes, newBytes, bytes.Length);
-                newBytes[^1] = 0;
-
-                return newBytes;
-            }
-
-            return bytes;
-        }
-
-        #endregion
     }
+
+    /// <summary>
+    /// Read an SeString from a specified Utf8String structure.
+    /// </summary>
+    /// <param name="utf8String">The memory address to read from.</param>
+    /// <returns>The read in string.</returns>
+    public static unsafe SeString ReadSeString(Utf8String* utf8String)
+    {
+        if (utf8String == null)
+            return string.Empty;
+
+        var ptr = utf8String->StringPtr;
+        if (ptr == null)
+            return string.Empty;
+
+        var len = Math.Max(utf8String->BufUsed, utf8String->StringLength);
+
+        return ReadSeString((IntPtr)ptr, (int)len);
+    }
+
+    #endregion
+
+    #region ReadString(out)
+
+    /// <summary>
+    /// Read a UTF-8 encoded string from a specified memory address.
+    /// </summary>
+    /// <remarks>
+    /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
+    /// </remarks>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="value">The read in string.</param>
+    public static void ReadStringNullTerminated(IntPtr memoryAddress, out string value)
+        => value = ReadStringNullTerminated(memoryAddress);
+
+    /// <summary>
+    /// Read a string with the given encoding from a specified memory address.
+    /// </summary>
+    /// <remarks>
+    /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
+    /// </remarks>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="encoding">The encoding to use to decode the string.</param>
+    /// <param name="value">The read in string.</param>
+    public static void ReadStringNullTerminated(IntPtr memoryAddress, Encoding encoding, out string value)
+        => value = ReadStringNullTerminated(memoryAddress, encoding);
+
+    /// <summary>
+    /// Read a UTF-8 encoded string from a specified memory address.
+    /// </summary>
+    /// <remarks>
+    /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
+    /// </remarks>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="value">The read in string.</param>
+    /// <param name="maxLength">The maximum length of the string.</param>
+    public static void ReadString(IntPtr memoryAddress, out string value, int maxLength)
+        => value = ReadString(memoryAddress, maxLength);
+
+    /// <summary>
+    /// Read a string with the given encoding from a specified memory address.
+    /// </summary>
+    /// <remarks>
+    /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to decode or the applicable helper method.
+    /// </remarks>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="encoding">The encoding to use to decode the string.</param>
+    /// <param name="maxLength">The maximum length of the string.</param>
+    /// <param name="value">The read in string.</param>
+    public static void ReadString(IntPtr memoryAddress, Encoding encoding, int maxLength, out string value)
+        => value = ReadString(memoryAddress, encoding, maxLength);
+
+    /// <summary>
+    /// Read a null-terminated SeString from a specified memory address.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="value">The read in SeString.</param>
+    public static void ReadSeStringNullTerminated(IntPtr memoryAddress, out SeString value)
+        => value = ReadSeStringNullTerminated(memoryAddress);
+
+    /// <summary>
+    /// Read an SeString from a specified memory address.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="maxLength">The maximum length of the string.</param>
+    /// <param name="value">The read in SeString.</param>
+    public static void ReadSeString(IntPtr memoryAddress, int maxLength, out SeString value)
+        => value = ReadSeString(memoryAddress, maxLength);
+
+    /// <summary>
+    /// Read an SeString from a specified Utf8String structure.
+    /// </summary>
+    /// <param name="utf8String">The memory address to read from.</param>
+    /// <param name="value">The read in string.</param>
+    public static unsafe void ReadSeString(Utf8String* utf8String, out SeString value)
+        => value = ReadSeString(utf8String);
+
+    #endregion
+
+    #region Write
+
+    /// <summary>
+    /// Writes a generic type to a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="item">The item to write to the address.</param>
+    public static void Write<T>(IntPtr memoryAddress, T item) where T : unmanaged
+        => Write(memoryAddress, item, false);
+
+    /// <summary>
+    /// Writes a generic type to a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="item">The item to write to the address.</param>
+    /// <param name="marshal">Set this to true to enable struct marshalling.</param>
+    public static void Write<T>(IntPtr memoryAddress, T item, bool marshal)
+    {
+        if (marshal)
+            Marshal.StructureToPtr(item, memoryAddress, false);
+        else
+            Unsafe.Write((void*)memoryAddress, item);
+    }
+
+    /// <summary>
+    /// Writes raw data to a specified memory address.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="data">The bytes to write to memoryAddress.</param>
+    public static void WriteRaw(IntPtr memoryAddress, byte[] data)
+    {
+        Marshal.Copy(data, 0, memoryAddress, data.Length);
+    }
+
+    /// <summary>
+    /// Writes a generic type array to a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to write to.</param>
+    /// <param name="items">The array of items to write to the address.</param>
+    public static void Write<T>(IntPtr memoryAddress, T[] items) where T : unmanaged
+        => Write(memoryAddress, items, false);
+
+    /// <summary>
+    /// Writes a generic type array to a specified memory address.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address to write to.</param>
+    /// <param name="items">The array of items to write to the address.</param>
+    /// <param name="marshal">Set this to true to enable struct marshalling.</param>
+    public static void Write<T>(IntPtr memoryAddress, T[] items, bool marshal)
+    {
+        var structSize = SizeOf<T>(marshal);
+
+        for (var i = 0; i < items.Length; i++)
+        {
+            var address = memoryAddress + (structSize * i);
+            Write(address, items[i], marshal);
+        }
+    }
+
+    #endregion
+
+    #region WriteString
+
+    /// <summary>
+    /// Write a UTF-8 encoded string to a specified memory address.
+    /// </summary>
+    /// <remarks>
+    /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to encode or the applicable helper method.
+    /// </remarks>
+    /// <param name="memoryAddress">The memory address to write to.</param>
+    /// <param name="value">The string to write.</param>
+    public static void WriteString(IntPtr memoryAddress, string value)
+        => WriteString(memoryAddress, value, Encoding.UTF8);
+
+    /// <summary>
+    /// Write a string with the given encoding to a specified memory address.
+    /// </summary>
+    /// <remarks>
+    /// Attention! If this is an SeString, use the <see cref="SeStringManager"/> to encode or the applicable helper method.
+    /// </remarks>
+    /// <param name="memoryAddress">The memory address to write to.</param>
+    /// <param name="value">The string to write.</param>
+    /// <param name="encoding">The encoding to use.</param>
+    public static void WriteString(IntPtr memoryAddress, string value, Encoding encoding)
+    {
+        if (string.IsNullOrEmpty(value))
+            return;
+
+        var bytes = encoding.GetBytes(value + '\0');
+
+        WriteRaw(memoryAddress, bytes);
+    }
+
+    /// <summary>
+    /// Write an SeString to a specified memory address.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to write to.</param>
+    /// <param name="value">The SeString to write.</param>
+    public static void WriteSeString(IntPtr memoryAddress, SeString value)
+    {
+        if (value is null)
+            return;
+
+        WriteRaw(memoryAddress, value.Encode());
+    }
+
+    #endregion
+
+    #region ApiWrappers
+
+    /// <summary>
+    /// Allocates fixed size of memory inside the target memory source via Windows API calls.
+    /// Returns the address of newly allocated memory.
+    /// </summary>
+    /// <param name="length">Amount of bytes to be allocated.</param>
+    /// <returns>Address to the newly allocated memory.</returns>
+    public static IntPtr Allocate(int length)
+    {
+        var address = VirtualAlloc(
+            IntPtr.Zero,
+            (UIntPtr)length,
+            AllocationType.Commit | AllocationType.Reserve,
+            MemoryProtection.ExecuteReadWrite);
+
+        if (address == IntPtr.Zero)
+            throw new MemoryAllocationException($"Unable to allocate {length} bytes.");
+
+        return address;
+    }
+
+    /// <summary>
+    /// Allocates fixed size of memory inside the target memory source via Windows API calls.
+    /// Returns the address of newly allocated memory.
+    /// </summary>
+    /// <param name="length">Amount of bytes to be allocated.</param>
+    /// <param name="memoryAddress">Address to the newly allocated memory.</param>
+    public static void Allocate(int length, out IntPtr memoryAddress)
+        => memoryAddress = Allocate(length);
+
+    /// <summary>
+    /// Frees memory previously allocated with Allocate via Windows API calls.
+    /// </summary>
+    /// <param name="memoryAddress">The address of the memory to free.</param>
+    /// <returns>True if the operation is successful.</returns>
+    public static bool Free(IntPtr memoryAddress)
+    {
+        return VirtualFree(memoryAddress, UIntPtr.Zero, AllocationType.Release);
+    }
+
+    /// <summary>
+    /// Changes the page permissions for a specified combination of address and length via Windows API calls.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address for which to change page permissions for.</param>
+    /// <param name="length">The region size for which to change permissions for.</param>
+    /// <param name="newPermissions">The new permissions to set.</param>
+    /// <returns>The old page permissions.</returns>
+    public static MemoryProtection ChangePermission(IntPtr memoryAddress, int length, MemoryProtection newPermissions)
+    {
+        var result = VirtualProtect(memoryAddress, (UIntPtr)length, newPermissions, out var oldPermissions);
+
+        if (!result)
+            throw new MemoryPermissionException($"Unable to change permissions at 0x{memoryAddress.ToInt64():X} of length {length} and permission {newPermissions} (result={result})");
+
+        var last = Marshal.GetLastWin32Error();
+        if (last > 0)
+            throw new MemoryPermissionException($"Unable to change permissions at 0x{memoryAddress.ToInt64():X} of length {length} and permission {newPermissions} (error={last})");
+
+        return oldPermissions;
+    }
+
+    /// <summary>
+    /// Changes the page permissions for a specified combination of address and length via Windows API calls.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address for which to change page permissions for.</param>
+    /// <param name="length">The region size for which to change permissions for.</param>
+    /// <param name="newPermissions">The new permissions to set.</param>
+    /// <param name="oldPermissions">The old page permissions.</param>
+    public static void ChangePermission(IntPtr memoryAddress, int length, MemoryProtection newPermissions, out MemoryProtection oldPermissions)
+        => oldPermissions = ChangePermission(memoryAddress, length, newPermissions);
+
+    /// <summary>
+    /// Changes the page permissions for a specified combination of address and element from which to deduce size via Windows API calls.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="memoryAddress">The memory address for which to change page permissions for.</param>
+    /// <param name="baseElement">The struct element from which the region size to change permissions for will be calculated.</param>
+    /// <param name="newPermissions">The new permissions to set.</param>
+    /// <param name="marshal">Set to true to calculate the size of the struct after marshalling instead of before.</param>
+    /// <returns>The old page permissions.</returns>
+    public static MemoryProtection ChangePermission<T>(IntPtr memoryAddress, ref T baseElement, MemoryProtection newPermissions, bool marshal)
+        => ChangePermission(memoryAddress, SizeOf<T>(marshal), newPermissions);
+
+    /// <summary>
+    /// Reads raw data from a specified memory address via Windows API calls.
+    /// This is noticably slower than Unsafe or Marshal.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="length">The amount of bytes to read starting from the memoryAddress.</param>
+    /// <returns>The read in bytes.</returns>
+    public static byte[] ReadProcessMemory(IntPtr memoryAddress, int length)
+    {
+        var value = new byte[length];
+        ReadProcessMemory(memoryAddress, ref value);
+        return value;
+    }
+
+    /// <summary>
+    /// Reads raw data from a specified memory address via Windows API calls.
+    /// This is noticably slower than Unsafe or Marshal.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="length">The amount of bytes to read starting from the memoryAddress.</param>
+    /// <param name="value">The read in bytes.</param>
+    public static void ReadProcessMemory(IntPtr memoryAddress, int length, out byte[] value)
+        => value = ReadProcessMemory(memoryAddress, length);
+
+    /// <summary>
+    /// Reads raw data from a specified memory address via Windows API calls.
+    /// This is noticably slower than Unsafe or Marshal.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to read from.</param>
+    /// <param name="value">The read in bytes.</param>
+    public static void ReadProcessMemory(IntPtr memoryAddress, ref byte[] value)
+    {
+        var length = value.Length;
+        var result = NativeFunctions.ReadProcessMemory((IntPtr)0xFFFFFFFF, memoryAddress, value, length, out _);
+
+        if (!result)
+            throw new MemoryReadException($"Unable to read memory at 0x{memoryAddress.ToInt64():X} of length {length} (result={result})");
+
+        var last = Marshal.GetLastWin32Error();
+        if (last > 0)
+            throw new MemoryReadException($"Unable to read memory at 0x{memoryAddress.ToInt64():X} of length {length} (error={last})");
+    }
+
+    /// <summary>
+    /// Writes raw data to a specified memory address via Windows API calls.
+    /// This is noticably slower than Unsafe or Marshal.
+    /// </summary>
+    /// <param name="memoryAddress">The memory address to write to.</param>
+    /// <param name="data">The bytes to write to memoryAddress.</param>
+    public static void WriteProcessMemory(IntPtr memoryAddress, byte[] data)
+    {
+        var length = data.Length;
+        var result = NativeFunctions.WriteProcessMemory((IntPtr)0xFFFFFFFF, memoryAddress, data, length, out _);
+
+        if (!result)
+            throw new MemoryWriteException($"Unable to write memory at 0x{memoryAddress.ToInt64():X} of length {length} (result={result})");
+
+        var last = Marshal.GetLastWin32Error();
+        if (last > 0)
+            throw new MemoryWriteException($"Unable to write memory at 0x{memoryAddress.ToInt64():X} of length {length} (error={last})");
+    }
+
+    #endregion
+
+    #region Sizing
+
+    /// <summary>
+    /// Returns the size of a specific primitive or struct type.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <returns>The size of the primitive or struct.</returns>
+    public static int SizeOf<T>()
+        => SizeOf<T>(false);
+
+    /// <summary>
+    /// Returns the size of a specific primitive or struct type.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="marshal">If set to true; will return the size of an element after marshalling.</param>
+    /// <returns>The size of the primitive or struct.</returns>
+    public static int SizeOf<T>(bool marshal)
+        => marshal ? Marshal.SizeOf<T>() : Unsafe.SizeOf<T>();
+
+    /// <summary>
+    /// Returns the size of a specific primitive or struct type.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="elementCount">The number of array elements present.</param>
+    /// <returns>The size of the primitive or struct array.</returns>
+    public static int SizeOf<T>(int elementCount) where T : unmanaged
+        => SizeOf<T>() * elementCount;
+
+    /// <summary>
+    /// Returns the size of a specific primitive or struct type.
+    /// </summary>
+    /// <typeparam name="T">An individual struct type of a class with an explicit StructLayout.LayoutKind attribute.</typeparam>
+    /// <param name="elementCount">The number of array elements present.</param>
+    /// <param name="marshal">If set to true; will return the size of an element after marshalling.</param>
+    /// <returns>The size of the primitive or struct array.</returns>
+    public static int SizeOf<T>(int elementCount, bool marshal)
+        => SizeOf<T>(marshal) * elementCount;
+
+    #endregion
+
+    #region Game
+
+    /// <summary>
+    /// Allocate memory in the game's UI memory space.
+    /// </summary>
+    /// <param name="size">Amount of bytes to allocate.</param>
+    /// <param name="alignment">The alignment of the allocation.</param>
+    /// <returns>Pointer to the allocated region.</returns>
+    public static IntPtr GameAllocateUi(ulong size, ulong alignment = 0)
+    {
+        return new IntPtr(IMemorySpace.GetUISpace()->Malloc(size, alignment));
+    }
+
+    /// <summary>
+    /// Allocate memory in the game's default memory space.
+    /// </summary>
+    /// <param name="size">Amount of bytes to allocate.</param>
+    /// <param name="alignment">The alignment of the allocation.</param>
+    /// <returns>Pointer to the allocated region.</returns>
+    public static IntPtr GameAllocateDefault(ulong size, ulong alignment = 0)
+    {
+        return new IntPtr(IMemorySpace.GetDefaultSpace()->Malloc(size, alignment));
+    }
+
+    /// <summary>
+    /// Allocate memory in the game's animation memory space.
+    /// </summary>
+    /// <param name="size">Amount of bytes to allocate.</param>
+    /// <param name="alignment">The alignment of the allocation.</param>
+    /// <returns>Pointer to the allocated region.</returns>
+    public static IntPtr GameAllocateAnimation(ulong size, ulong alignment = 0)
+    {
+        return new IntPtr(IMemorySpace.GetAnimationSpace()->Malloc(size, alignment));
+    }
+
+    /// <summary>
+    /// Allocate memory in the game's apricot memory space.
+    /// </summary>
+    /// <param name="size">Amount of bytes to allocate.</param>
+    /// <param name="alignment">The alignment of the allocation.</param>
+    /// <returns>Pointer to the allocated region.</returns>
+    public static IntPtr GameAllocateApricot(ulong size, ulong alignment = 0)
+    {
+        return new IntPtr(IMemorySpace.GetApricotSpace()->Malloc(size, alignment));
+    }
+
+    /// <summary>
+    /// Allocate memory in the game's sound memory space.
+    /// </summary>
+    /// <param name="size">Amount of bytes to allocate.</param>
+    /// <param name="alignment">The alignment of the allocation.</param>
+    /// <returns>Pointer to the allocated region.</returns>
+    public static IntPtr GameAllocateSound(ulong size, ulong alignment = 0)
+    {
+        return new IntPtr(IMemorySpace.GetSoundSpace()->Malloc(size, alignment));
+    }
+
+    /// <summary>
+    /// Free memory in the game's memory space.
+    /// </summary>
+    /// <remarks>The memory you are freeing must be allocated with game allocators.</remarks>
+    /// <param name="ptr">Position at which the memory to be freed is located.</param>
+    /// <param name="size">Amount of bytes to free.</param>
+    public static void GameFree(ref IntPtr ptr, ulong size)
+    {
+        if (ptr == IntPtr.Zero)
+        {
+            return;
+        }
+
+        IMemorySpace.Free((void*)ptr, size);
+        ptr = IntPtr.Zero;
+    }
+
+    #endregion
+
+    #region Utility
+
+    /// <summary>
+    /// Null-terminate a byte array.
+    /// </summary>
+    /// <param name="bytes">The byte array to terminate.</param>
+    /// <returns>The terminated byte array.</returns>
+    public static byte[] NullTerminate(this byte[] bytes)
+    {
+        if (bytes.Length == 0 || bytes[^1] != 0)
+        {
+            var newBytes = new byte[bytes.Length + 1];
+            Array.Copy(bytes, newBytes, bytes.Length);
+            newBytes[^1] = 0;
+
+            return newBytes;
+        }
+
+        return bytes;
+    }
+
+    #endregion
 }
diff --git a/Dalamud/Memory/MemoryProtection.cs b/Dalamud/Memory/MemoryProtection.cs
index 289c5024d..019b656e8 100644
--- a/Dalamud/Memory/MemoryProtection.cs
+++ b/Dalamud/Memory/MemoryProtection.cs
@@ -2,116 +2,115 @@ using System;
 
 // This is a copy from NativeFunctions.MemoryProtection
 
-namespace Dalamud.Memory
+namespace Dalamud.Memory;
+
+/// <summary>
+/// PAGE_* from memoryapi.
+/// </summary>
+[Flags]
+public enum MemoryProtection
 {
+    // Copied from NativeFunctions to expose to the user.
+
     /// <summary>
-    /// PAGE_* from memoryapi.
+    /// Enables execute access to the committed region of pages. An attempt to write to the committed region results
+    /// in an access violation. This flag is not supported by the CreateFileMapping function.
     /// </summary>
-    [Flags]
-    public enum MemoryProtection
-    {
-        // Copied from NativeFunctions to expose to the user.
+    Execute = 0x10,
 
-        /// <summary>
-        /// Enables execute access to the committed region of pages. An attempt to write to the committed region results
-        /// in an access violation. This flag is not supported by the CreateFileMapping function.
-        /// </summary>
-        Execute = 0x10,
+    /// <summary>
+    /// Enables execute or read-only access to the committed region of pages. An attempt to write to the committed region
+    /// results in an access violation.
+    /// </summary>
+    ExecuteRead = 0x20,
 
-        /// <summary>
-        /// Enables execute or read-only access to the committed region of pages. An attempt to write to the committed region
-        /// results in an access violation.
-        /// </summary>
-        ExecuteRead = 0x20,
+    /// <summary>
+    /// Enables execute, read-only, or read/write access to the committed region of pages.
+    /// </summary>
+    ExecuteReadWrite = 0x40,
 
-        /// <summary>
-        /// Enables execute, read-only, or read/write access to the committed region of pages.
-        /// </summary>
-        ExecuteReadWrite = 0x40,
+    /// <summary>
+    /// Enables execute, read-only, or copy-on-write access to a mapped view of a file mapping object. An attempt to
+    /// write to a committed copy-on-write page results in a private copy of the page being made for the process. The
+    /// private page is marked as PAGE_EXECUTE_READWRITE, and the change is written to the new page. This flag is not
+    /// supported by the VirtualAlloc or VirtualAllocEx functions.
+    /// </summary>
+    ExecuteWriteCopy = 0x80,
 
-        /// <summary>
-        /// Enables execute, read-only, or copy-on-write access to a mapped view of a file mapping object. An attempt to
-        /// write to a committed copy-on-write page results in a private copy of the page being made for the process. The
-        /// private page is marked as PAGE_EXECUTE_READWRITE, and the change is written to the new page. This flag is not
-        /// supported by the VirtualAlloc or VirtualAllocEx functions.
-        /// </summary>
-        ExecuteWriteCopy = 0x80,
+    /// <summary>
+    /// Disables all access to the committed region of pages. An attempt to read from, write to, or execute the committed
+    /// region results in an access violation. This flag is not supported by the CreateFileMapping function.
+    /// </summary>
+    NoAccess = 0x01,
 
-        /// <summary>
-        /// Disables all access to the committed region of pages. An attempt to read from, write to, or execute the committed
-        /// region results in an access violation. This flag is not supported by the CreateFileMapping function.
-        /// </summary>
-        NoAccess = 0x01,
+    /// <summary>
+    /// Enables read-only access to the committed region of pages. An attempt to write to the committed region results
+    /// in an access violation. If Data Execution Prevention is enabled, an attempt to execute code in the committed
+    /// region results in an access violation.
+    /// </summary>
+    ReadOnly = 0x02,
 
-        /// <summary>
-        /// Enables read-only access to the committed region of pages. An attempt to write to the committed region results
-        /// in an access violation. If Data Execution Prevention is enabled, an attempt to execute code in the committed
-        /// region results in an access violation.
-        /// </summary>
-        ReadOnly = 0x02,
+    /// <summary>
+    /// Enables read-only or read/write access to the committed region of pages. If Data Execution Prevention is enabled,
+    /// attempting to execute code in the committed region results in an access violation.
+    /// </summary>
+    ReadWrite = 0x04,
 
-        /// <summary>
-        /// Enables read-only or read/write access to the committed region of pages. If Data Execution Prevention is enabled,
-        /// attempting to execute code in the committed region results in an access violation.
-        /// </summary>
-        ReadWrite = 0x04,
+    /// <summary>
+    /// Enables read-only or copy-on-write access to a mapped view of a file mapping object. An attempt to write to
+    /// a committed copy-on-write page results in a private copy of the page being made for the process. The private
+    /// page is marked as PAGE_READWRITE, and the change is written to the new page. If Data Execution Prevention is
+    /// enabled, attempting to execute code in the committed region results in an access violation. This flag is not
+    /// supported by the VirtualAlloc or VirtualAllocEx functions.
+    /// </summary>
+    WriteCopy = 0x08,
 
-        /// <summary>
-        /// Enables read-only or copy-on-write access to a mapped view of a file mapping object. An attempt to write to
-        /// a committed copy-on-write page results in a private copy of the page being made for the process. The private
-        /// page is marked as PAGE_READWRITE, and the change is written to the new page. If Data Execution Prevention is
-        /// enabled, attempting to execute code in the committed region results in an access violation. This flag is not
-        /// supported by the VirtualAlloc or VirtualAllocEx functions.
-        /// </summary>
-        WriteCopy = 0x08,
+    /// <summary>
+    /// Sets all locations in the pages as invalid targets for CFG. Used along with any execute page protection like
+    /// PAGE_EXECUTE, PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE and PAGE_EXECUTE_WRITECOPY. Any indirect call to locations
+    /// in those pages will fail CFG checks and the process will be terminated. The default behavior for executable
+    /// pages allocated is to be marked valid call targets for CFG. This flag is not supported by the VirtualProtect
+    /// or CreateFileMapping functions.
+    /// </summary>
+    TargetsInvalid = 0x40000000,
 
-        /// <summary>
-        /// Sets all locations in the pages as invalid targets for CFG. Used along with any execute page protection like
-        /// PAGE_EXECUTE, PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE and PAGE_EXECUTE_WRITECOPY. Any indirect call to locations
-        /// in those pages will fail CFG checks and the process will be terminated. The default behavior for executable
-        /// pages allocated is to be marked valid call targets for CFG. This flag is not supported by the VirtualProtect
-        /// or CreateFileMapping functions.
-        /// </summary>
-        TargetsInvalid = 0x40000000,
+    /// <summary>
+    /// Pages in the region will not have their CFG information updated while the protection changes for VirtualProtect.
+    /// For example, if the pages in the region was allocated using PAGE_TARGETS_INVALID, then the invalid information
+    /// will be maintained while the page protection changes. This flag is only valid when the protection changes to
+    /// an executable type like PAGE_EXECUTE, PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE and PAGE_EXECUTE_WRITECOPY.
+    /// The default behavior for VirtualProtect protection change to executable is to mark all locations as valid call
+    /// targets for CFG.
+    /// </summary>
+    TargetsNoUpdate = TargetsInvalid,
 
-        /// <summary>
-        /// Pages in the region will not have their CFG information updated while the protection changes for VirtualProtect.
-        /// For example, if the pages in the region was allocated using PAGE_TARGETS_INVALID, then the invalid information
-        /// will be maintained while the page protection changes. This flag is only valid when the protection changes to
-        /// an executable type like PAGE_EXECUTE, PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE and PAGE_EXECUTE_WRITECOPY.
-        /// The default behavior for VirtualProtect protection change to executable is to mark all locations as valid call
-        /// targets for CFG.
-        /// </summary>
-        TargetsNoUpdate = TargetsInvalid,
+    /// <summary>
+    /// Pages in the region become guard pages. Any attempt to access a guard page causes the system to raise a
+    /// STATUS_GUARD_PAGE_VIOLATION exception and turn off the guard page status. Guard pages thus act as a one-time
+    /// access alarm. For more information, see Creating Guard Pages. When an access attempt leads the system to turn
+    /// off guard page status, the underlying page protection takes over. If a guard page exception occurs during a
+    /// system service, the service typically returns a failure status indicator. This value cannot be used with
+    /// PAGE_NOACCESS. This flag is not supported by the CreateFileMapping function.
+    /// </summary>
+    Guard = 0x100,
 
-        /// <summary>
-        /// Pages in the region become guard pages. Any attempt to access a guard page causes the system to raise a
-        /// STATUS_GUARD_PAGE_VIOLATION exception and turn off the guard page status. Guard pages thus act as a one-time
-        /// access alarm. For more information, see Creating Guard Pages. When an access attempt leads the system to turn
-        /// off guard page status, the underlying page protection takes over. If a guard page exception occurs during a
-        /// system service, the service typically returns a failure status indicator. This value cannot be used with
-        /// PAGE_NOACCESS. This flag is not supported by the CreateFileMapping function.
-        /// </summary>
-        Guard = 0x100,
+    /// <summary>
+    /// Sets all pages to be non-cachable. Applications should not use this attribute except when explicitly required
+    /// for a device. Using the interlocked functions with memory that is mapped with SEC_NOCACHE can result in an
+    /// EXCEPTION_ILLEGAL_INSTRUCTION exception. The PAGE_NOCACHE flag cannot be used with the PAGE_GUARD, PAGE_NOACCESS,
+    /// or PAGE_WRITECOMBINE flags. The PAGE_NOCACHE flag can be used only when allocating private memory with the
+    /// VirtualAlloc, VirtualAllocEx, or VirtualAllocExNuma functions. To enable non-cached memory access for shared
+    /// memory, specify the SEC_NOCACHE flag when calling the CreateFileMapping function.
+    /// </summary>
+    NoCache = 0x200,
 
-        /// <summary>
-        /// Sets all pages to be non-cachable. Applications should not use this attribute except when explicitly required
-        /// for a device. Using the interlocked functions with memory that is mapped with SEC_NOCACHE can result in an
-        /// EXCEPTION_ILLEGAL_INSTRUCTION exception. The PAGE_NOCACHE flag cannot be used with the PAGE_GUARD, PAGE_NOACCESS,
-        /// or PAGE_WRITECOMBINE flags. The PAGE_NOCACHE flag can be used only when allocating private memory with the
-        /// VirtualAlloc, VirtualAllocEx, or VirtualAllocExNuma functions. To enable non-cached memory access for shared
-        /// memory, specify the SEC_NOCACHE flag when calling the CreateFileMapping function.
-        /// </summary>
-        NoCache = 0x200,
-
-        /// <summary>
-        /// Sets all pages to be write-combined. Applications should not use this attribute except when explicitly required
-        /// for a device. Using the interlocked functions with memory that is mapped as write-combined can result in an
-        /// EXCEPTION_ILLEGAL_INSTRUCTION exception. The PAGE_WRITECOMBINE flag cannot be specified with the PAGE_NOACCESS,
-        /// PAGE_GUARD, and PAGE_NOCACHE flags. The PAGE_WRITECOMBINE flag can be used only when allocating private memory
-        /// with the VirtualAlloc, VirtualAllocEx, or VirtualAllocExNuma functions. To enable write-combined memory access
-        /// for shared memory, specify the SEC_WRITECOMBINE flag when calling the CreateFileMapping function.
-        /// </summary>
-        WriteCombine = 0x400,
-    }
+    /// <summary>
+    /// Sets all pages to be write-combined. Applications should not use this attribute except when explicitly required
+    /// for a device. Using the interlocked functions with memory that is mapped as write-combined can result in an
+    /// EXCEPTION_ILLEGAL_INSTRUCTION exception. The PAGE_WRITECOMBINE flag cannot be specified with the PAGE_NOACCESS,
+    /// PAGE_GUARD, and PAGE_NOCACHE flags. The PAGE_WRITECOMBINE flag can be used only when allocating private memory
+    /// with the VirtualAlloc, VirtualAllocEx, or VirtualAllocExNuma functions. To enable write-combined memory access
+    /// for shared memory, specify the SEC_WRITECOMBINE flag when calling the CreateFileMapping function.
+    /// </summary>
+    WriteCombine = 0x400,
 }
diff --git a/Dalamud/NativeFunctions.cs b/Dalamud/NativeFunctions.cs
index ce46a69a6..b05aecc7a 100644
--- a/Dalamud/NativeFunctions.cs
+++ b/Dalamud/NativeFunctions.cs
@@ -4,1956 +4,1955 @@ using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Dalamud
+namespace Dalamud;
+
+/// <summary>
+/// Native user32 functions.
+/// </summary>
+internal static partial class NativeFunctions
 {
     /// <summary>
-    /// Native user32 functions.
+    /// FLASHW_* from winuser.
     /// </summary>
-    internal static partial class NativeFunctions
+    public enum FlashWindow : uint
     {
         /// <summary>
-        /// FLASHW_* from winuser.
+        /// Stop flashing. The system restores the window to its original state.
         /// </summary>
-        public enum FlashWindow : uint
-        {
-            /// <summary>
-            /// Stop flashing. The system restores the window to its original state.
-            /// </summary>
-            Stop = 0,
-
-            /// <summary>
-            /// Flash the window caption.
-            /// </summary>
-            Caption = 1,
-
-            /// <summary>
-            /// Flash the taskbar button.
-            /// </summary>
-            Tray = 2,
-
-            /// <summary>
-            /// Flash both the window caption and taskbar button.
-            /// This is equivalent to setting the FLASHW_CAPTION | FLASHW_TRAY flags.
-            /// </summary>
-            All = 3,
-
-            /// <summary>
-            /// Flash continuously, until the FLASHW_STOP flag is set.
-            /// </summary>
-            Timer = 4,
-
-            /// <summary>
-            /// Flash continuously until the window comes to the foreground.
-            /// </summary>
-            TimerNoFG = 12,
-        }
+        Stop = 0,
 
         /// <summary>
-        /// IDC_* from winuser.
+        /// Flash the window caption.
         /// </summary>
-        public enum CursorType
-        {
-            /// <summary>
-            /// Standard arrow and small hourglass.
-            /// </summary>
-            AppStarting = 32650,
-
-            /// <summary>
-            /// Standard arrow.
-            /// </summary>
-            Arrow = 32512,
-
-            /// <summary>
-            /// Crosshair.
-            /// </summary>
-            Cross = 32515,
-
-            /// <summary>
-            /// Hand.
-            /// </summary>
-            Hand = 32649,
-
-            /// <summary>
-            /// Arrow and question mark.
-            /// </summary>
-            Help = 32651,
-
-            /// <summary>
-            /// I-beam.
-            /// </summary>
-            IBeam = 32513,
-
-            /// <summary>
-            /// Obsolete for applications marked version 4.0 or later.
-            /// </summary>
-            Icon = 32641,
-
-            /// <summary>
-            /// Slashed circle.
-            /// </summary>
-            No = 32648,
-
-            /// <summary>
-            /// Obsolete for applications marked version 4.0 or later.Use IDC_SIZEALL.
-            /// </summary>
-            Size = 32640,
-
-            /// <summary>
-            /// Four-pointed arrow pointing north, south, east, and west.
-            /// </summary>
-            SizeAll = 32646,
-
-            /// <summary>
-            /// Double-pointed arrow pointing northeast and southwest.
-            /// </summary>
-            SizeNeSw = 32643,
-
-            /// <summary>
-            /// Double-pointed arrow pointing north and south.
-            /// </summary>
-            SizeNS = 32645,
-
-            /// <summary>
-            /// Double-pointed arrow pointing northwest and southeast.
-            /// </summary>
-            SizeNwSe = 32642,
-
-            /// <summary>
-            /// Double-pointed arrow pointing west and east.
-            /// </summary>
-            SizeWE = 32644,
-
-            /// <summary>
-            /// Vertical arrow.
-            /// </summary>
-            UpArrow = 32516,
-
-            /// <summary>
-            /// Hourglass.
-            /// </summary>
-            Wait = 32514,
-        }
+        Caption = 1,
 
         /// <summary>
-        /// MB_* from winuser.
+        /// Flash the taskbar button.
         /// </summary>
-        public enum MessageBoxType : uint
-        {
-            /// <summary>
-            /// The default value for any of the various subtypes.
-            /// </summary>
-            DefaultValue = 0x0,
-
-            // To indicate the buttons displayed in the message box, specify one of the following values.
-
-            /// <summary>
-            /// The message box contains three push buttons: Abort, Retry, and Ignore.
-            /// </summary>
-            AbortRetryIgnore = 0x2,
-
-            /// <summary>
-            /// The message box contains three push buttons: Cancel, Try Again, Continue. Use this message box type instead
-            /// of MB_ABORTRETRYIGNORE.
-            /// </summary>
-            CancelTryContinue = 0x6,
-
-            /// <summary>
-            /// Adds a Help button to the message box. When the user clicks the Help button or presses F1, the system sends
-            /// a WM_HELP message to the owner.
-            /// </summary>
-            Help = 0x4000,
-
-            /// <summary>
-            /// The message box contains one push button: OK. This is the default.
-            /// </summary>
-            Ok = DefaultValue,
-
-            /// <summary>
-            /// The message box contains two push buttons: OK and Cancel.
-            /// </summary>
-            OkCancel = 0x1,
-
-            /// <summary>
-            /// The message box contains two push buttons: Retry and Cancel.
-            /// </summary>
-            RetryCancel = 0x5,
-
-            /// <summary>
-            /// The message box contains two push buttons: Yes and No.
-            /// </summary>
-            YesNo = 0x4,
-
-            /// <summary>
-            /// The message box contains three push buttons: Yes, No, and Cancel.
-            /// </summary>
-            YesNoCancel = 0x3,
-
-            // To display an icon in the message box, specify one of the following values.
-
-            /// <summary>
-            /// An exclamation-point icon appears in the message box.
-            /// </summary>
-            IconExclamation = 0x30,
-
-            /// <summary>
-            /// An exclamation-point icon appears in the message box.
-            /// </summary>
-            IconWarning = IconExclamation,
-
-            /// <summary>
-            /// An icon consisting of a lowercase letter i in a circle appears in the message box.
-            /// </summary>
-            IconInformation = 0x40,
-
-            /// <summary>
-            /// An icon consisting of a lowercase letter i in a circle appears in the message box.
-            /// </summary>
-            IconAsterisk = IconInformation,
-
-            /// <summary>
-            /// A question-mark icon appears in the message box.
-            /// The question-mark message icon is no longer recommended because it does not clearly represent a specific type
-            /// of message and because the phrasing of a message as a question could apply to any message type. In addition,
-            /// users can confuse the message symbol question mark with Help information. Therefore, do not use this question
-            /// mark message symbol in your message boxes. The system continues to support its inclusion only for backward
-            /// compatibility.
-            /// </summary>
-            IconQuestion = 0x20,
-
-            /// <summary>
-            /// A stop-sign icon appears in the message box.
-            /// </summary>
-            IconStop = 0x10,
-
-            /// <summary>
-            /// A stop-sign icon appears in the message box.
-            /// </summary>
-            IconError = IconStop,
-
-            /// <summary>
-            /// A stop-sign icon appears in the message box.
-            /// </summary>
-            IconHand = IconStop,
-
-            // To indicate the default button, specify one of the following values.
-
-            /// <summary>
-            /// The first button is the default button.
-            /// MB_DEFBUTTON1 is the default unless MB_DEFBUTTON2, MB_DEFBUTTON3, or MB_DEFBUTTON4 is specified.
-            /// </summary>
-            DefButton1 = DefaultValue,
-
-            /// <summary>
-            /// The second button is the default button.
-            /// </summary>
-            DefButton2 = 0x100,
-
-            /// <summary>
-            /// The third button is the default button.
-            /// </summary>
-            DefButton3 = 0x200,
-
-            /// <summary>
-            /// The fourth button is the default button.
-            /// </summary>
-            DefButton4 = 0x300,
-
-            // To indicate the modality of the dialog box, specify one of the following values.
-
-            /// <summary>
-            /// The user must respond to the message box before continuing work in the window identified by the hWnd parameter.
-            /// However, the user can move to the windows of other threads and work in those windows. Depending on the hierarchy
-            /// of windows in the application, the user may be able to move to other windows within the thread. All child windows
-            /// of the parent of the message box are automatically disabled, but pop-up windows are not. MB_APPLMODAL is the
-            /// default if neither MB_SYSTEMMODAL nor MB_TASKMODAL is specified.
-            /// </summary>
-            ApplModal = DefaultValue,
-
-            /// <summary>
-            /// Same as MB_APPLMODAL except that the message box has the WS_EX_TOPMOST style.
-            /// Use system-modal message boxes to notify the user of serious, potentially damaging errors that require immediate
-            /// attention (for example, running out of memory). This flag has no effect on the user's ability to interact with
-            /// windows other than those associated with hWnd.
-            /// </summary>
-            SystemModal = 0x1000,
-
-            /// <summary>
-            /// Same as MB_APPLMODAL except that all the top-level windows belonging to the current thread are disabled if the
-            /// hWnd parameter is NULL. Use this flag when the calling application or library does not have a window handle
-            /// available but still needs to prevent input to other windows in the calling thread without suspending other threads.
-            /// </summary>
-            TaskModal = 0x2000,
-
-            // To specify other options, use one or more of the following values.
-
-            /// <summary>
-            /// Same as desktop of the interactive window station. For more information, see Window Stations. If the current
-            /// input desktop is not the default desktop, MessageBox does not return until the user switches to the default
-            /// desktop.
-            /// </summary>
-            DefaultDesktopOnly = 0x20000,
-
-            /// <summary>
-            /// The text is right-justified.
-            /// </summary>
-            Right = 0x80000,
-
-            /// <summary>
-            /// Displays message and caption text using right-to-left reading order on Hebrew and Arabic systems.
-            /// </summary>
-            RtlReading = 0x100000,
-
-            /// <summary>
-            /// The message box becomes the foreground window. Internally, the system calls the SetForegroundWindow function
-            /// for the message box.
-            /// </summary>
-            SetForeground = 0x10000,
-
-            /// <summary>
-            /// The message box is created with the WS_EX_TOPMOST window style.
-            /// </summary>
-            Topmost = 0x40000,
-
-            /// <summary>
-            /// The caller is a service notifying the user of an event. The function displays a message box on the current active
-            /// desktop, even if there is no user logged on to the computer.
-            /// </summary>
-            ServiceNotification = 0x200000,
-        }
+        Tray = 2,
 
         /// <summary>
-        /// GWL_* from winuser.
+        /// Flash both the window caption and taskbar button.
+        /// This is equivalent to setting the FLASHW_CAPTION | FLASHW_TRAY flags.
         /// </summary>
-        public enum WindowLongType
-        {
-            /// <summary>
-            /// Sets a new extended window style.
-            /// </summary>
-            ExStyle = -20,
-
-            /// <summary>
-            /// Sets a new application instance handle.
-            /// </summary>
-            HInstance = -6,
-
-            /// <summary>
-            /// Sets a new identifier of the child window.The window cannot be a top-level window.
-            /// </summary>
-            Id = -12,
-
-            /// <summary>
-            /// Sets a new window style.
-            /// </summary>
-            Style = -16,
-
-            /// <summary>
-            /// Sets the user data associated with the window. This data is intended for use by the application that created the window. Its value is initially zero.
-            /// </summary>
-            UserData = -21,
-
-            /// <summary>
-            /// Sets a new address for the window procedure.
-            /// </summary>
-            WndProc = -4,
-
-            // The following values are also available when the hWnd parameter identifies a dialog box.
-
-            // /// <summary>
-            // /// Sets the new pointer to the dialog box procedure.
-            // /// </summary>
-            // DWLP_DLGPROC = DWLP_MSGRESULT + sizeof(LRESULT),
-
-            /// <summary>
-            /// Sets the return value of a message processed in the dialog box procedure.
-            /// </summary>
-            MsgResult = 0,
-
-            // /// <summary>
-            // /// Sets new extra information that is private to the application, such as handles or pointers.
-            // /// </summary>
-            // DWLP_USER = DWLP_DLGPROC + sizeof(DLGPROC),
-        }
+        All = 3,
 
         /// <summary>
-        /// WM_* from winuser.
-        /// These are spread throughout multiple files, find the documentation manually if you need it.
-        /// https://gist.github.com/amgine/2395987.
+        /// Flash continuously, until the FLASHW_STOP flag is set.
         /// </summary>
-        [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1602:Enumeration items should be documented", Justification = "No documentation available.")]
-        public enum WindowsMessage
-        {
-            WM_NULL = 0x0000,
-            WM_CREATE = 0x0001,
-            WM_DESTROY = 0x0002,
-            WM_MOVE = 0x0003,
-            WM_SIZE = 0x0005,
-            WM_ACTIVATE = 0x0006,
-            WM_SETFOCUS = 0x0007,
-            WM_KILLFOCUS = 0x0008,
-            WM_ENABLE = 0x000A,
-            WM_SETREDRAW = 0x000B,
-            WM_SETTEXT = 0x000C,
-            WM_GETTEXT = 0x000D,
-            WM_GETTEXTLENGTH = 0x000E,
-            WM_PAINT = 0x000F,
-            WM_CLOSE = 0x0010,
-            WM_QUERYENDSESSION = 0x0011,
-            WM_QUERYOPEN = 0x0013,
-            WM_ENDSESSION = 0x0016,
-            WM_QUIT = 0x0012,
-            WM_ERASEBKGND = 0x0014,
-            WM_SYSCOLORCHANGE = 0x0015,
-            WM_SHOWWINDOW = 0x0018,
-            WM_WININICHANGE = 0x001A,
-            WM_SETTINGCHANGE = WM_WININICHANGE,
-            WM_DEVMODECHANGE = 0x001B,
-            WM_ACTIVATEAPP = 0x001C,
-            WM_FONTCHANGE = 0x001D,
-            WM_TIMECHANGE = 0x001E,
-            WM_CANCELMODE = 0x001F,
-            WM_SETCURSOR = 0x0020,
-            WM_MOUSEACTIVATE = 0x0021,
-            WM_CHILDACTIVATE = 0x0022,
-            WM_QUEUESYNC = 0x0023,
-            WM_GETMINMAXINFO = 0x0024,
-            WM_PAINTICON = 0x0026,
-            WM_ICONERASEBKGND = 0x0027,
-            WM_NEXTDLGCTL = 0x0028,
-            WM_SPOOLERSTATUS = 0x002A,
-            WM_DRAWITEM = 0x002B,
-            WM_MEASUREITEM = 0x002C,
-            WM_DELETEITEM = 0x002D,
-            WM_VKEYTOITEM = 0x002E,
-            WM_CHARTOITEM = 0x002F,
-            WM_SETFONT = 0x0030,
-            WM_GETFONT = 0x0031,
-            WM_SETHOTKEY = 0x0032,
-            WM_GETHOTKEY = 0x0033,
-            WM_QUERYDRAGICON = 0x0037,
-            WM_COMPAREITEM = 0x0039,
-            WM_GETOBJECT = 0x003D,
-            WM_COMPACTING = 0x0041,
-            WM_COMMNOTIFY = 0x0044,
-            WM_WINDOWPOSCHANGING = 0x0046,
-            WM_WINDOWPOSCHANGED = 0x0047,
-            WM_POWER = 0x0048,
-            WM_COPYDATA = 0x004A,
-            WM_CANCELJOURNAL = 0x004B,
-            WM_NOTIFY = 0x004E,
-            WM_INPUTLANGCHANGEREQUEST = 0x0050,
-            WM_INPUTLANGCHANGE = 0x0051,
-            WM_TCARD = 0x0052,
-            WM_HELP = 0x0053,
-            WM_USERCHANGED = 0x0054,
-            WM_NOTIFYFORMAT = 0x0055,
-            WM_CONTEXTMENU = 0x007B,
-            WM_STYLECHANGING = 0x007C,
-            WM_STYLECHANGED = 0x007D,
-            WM_DISPLAYCHANGE = 0x007E,
-            WM_GETICON = 0x007F,
-            WM_SETICON = 0x0080,
-            WM_NCCREATE = 0x0081,
-            WM_NCDESTROY = 0x0082,
-            WM_NCCALCSIZE = 0x0083,
-            WM_NCHITTEST = 0x0084,
-            WM_NCPAINT = 0x0085,
-            WM_NCACTIVATE = 0x0086,
-            WM_GETDLGCODE = 0x0087,
-            WM_SYNCPAINT = 0x0088,
-
-            WM_NCMOUSEMOVE = 0x00A0,
-            WM_NCLBUTTONDOWN = 0x00A1,
-            WM_NCLBUTTONUP = 0x00A2,
-            WM_NCLBUTTONDBLCLK = 0x00A3,
-            WM_NCRBUTTONDOWN = 0x00A4,
-            WM_NCRBUTTONUP = 0x00A5,
-            WM_NCRBUTTONDBLCLK = 0x00A6,
-            WM_NCMBUTTONDOWN = 0x00A7,
-            WM_NCMBUTTONUP = 0x00A8,
-            WM_NCMBUTTONDBLCLK = 0x00A9,
-            WM_NCXBUTTONDOWN = 0x00AB,
-            WM_NCXBUTTONUP = 0x00AC,
-            WM_NCXBUTTONDBLCLK = 0x00AD,
-
-            WM_INPUT_DEVICE_CHANGE = 0x00FE,
-            WM_INPUT = 0x00FF,
-
-            WM_KEYFIRST = 0x0100,
-            WM_KEYDOWN = WM_KEYFIRST,
-            WM_KEYUP = 0x0101,
-            WM_CHAR = 0x0102,
-            WM_DEADCHAR = 0x0103,
-            WM_SYSKEYDOWN = 0x0104,
-            WM_SYSKEYUP = 0x0105,
-            WM_SYSCHAR = 0x0106,
-            WM_SYSDEADCHAR = 0x0107,
-            WM_UNICHAR = 0x0109,
-            WM_KEYLAST = WM_UNICHAR,
-
-            WM_IME_STARTCOMPOSITION = 0x010D,
-            WM_IME_ENDCOMPOSITION = 0x010E,
-            WM_IME_COMPOSITION = 0x010F,
-            WM_IME_KEYLAST = WM_IME_COMPOSITION,
-
-            WM_INITDIALOG = 0x0110,
-            WM_COMMAND = 0x0111,
-            WM_SYSCOMMAND = 0x0112,
-            WM_TIMER = 0x0113,
-            WM_HSCROLL = 0x0114,
-            WM_VSCROLL = 0x0115,
-            WM_INITMENU = 0x0116,
-            WM_INITMENUPOPUP = 0x0117,
-            WM_MENUSELECT = 0x011F,
-            WM_MENUCHAR = 0x0120,
-            WM_ENTERIDLE = 0x0121,
-            WM_MENURBUTTONUP = 0x0122,
-            WM_MENUDRAG = 0x0123,
-            WM_MENUGETOBJECT = 0x0124,
-            WM_UNINITMENUPOPUP = 0x0125,
-            WM_MENUCOMMAND = 0x0126,
-
-            WM_CHANGEUISTATE = 0x0127,
-            WM_UPDATEUISTATE = 0x0128,
-            WM_QUERYUISTATE = 0x0129,
-
-            WM_CTLCOLORMSGBOX = 0x0132,
-            WM_CTLCOLOREDIT = 0x0133,
-            WM_CTLCOLORLISTBOX = 0x0134,
-            WM_CTLCOLORBTN = 0x0135,
-            WM_CTLCOLORDLG = 0x0136,
-            WM_CTLCOLORSCROLLBAR = 0x0137,
-            WM_CTLCOLORSTATIC = 0x0138,
-            MN_GETHMENU = 0x01E1,
-
-            WM_MOUSEFIRST = 0x0200,
-            WM_MOUSEMOVE = WM_MOUSEFIRST,
-            WM_LBUTTONDOWN = 0x0201,
-            WM_LBUTTONUP = 0x0202,
-            WM_LBUTTONDBLCLK = 0x0203,
-            WM_RBUTTONDOWN = 0x0204,
-            WM_RBUTTONUP = 0x0205,
-            WM_RBUTTONDBLCLK = 0x0206,
-            WM_MBUTTONDOWN = 0x0207,
-            WM_MBUTTONUP = 0x0208,
-            WM_MBUTTONDBLCLK = 0x0209,
-            WM_MOUSEWHEEL = 0x020A,
-            WM_XBUTTONDOWN = 0x020B,
-            WM_XBUTTONUP = 0x020C,
-            WM_XBUTTONDBLCLK = 0x020D,
-            WM_MOUSEHWHEEL = 0x020E,
-
-            WM_PARENTNOTIFY = 0x0210,
-            WM_ENTERMENULOOP = 0x0211,
-            WM_EXITMENULOOP = 0x0212,
-
-            WM_NEXTMENU = 0x0213,
-            WM_SIZING = 0x0214,
-            WM_CAPTURECHANGED = 0x0215,
-            WM_MOVING = 0x0216,
-
-            WM_POWERBROADCAST = 0x0218,
-
-            WM_DEVICECHANGE = 0x0219,
-
-            WM_MDICREATE = 0x0220,
-            WM_MDIDESTROY = 0x0221,
-            WM_MDIACTIVATE = 0x0222,
-            WM_MDIRESTORE = 0x0223,
-            WM_MDINEXT = 0x0224,
-            WM_MDIMAXIMIZE = 0x0225,
-            WM_MDITILE = 0x0226,
-            WM_MDICASCADE = 0x0227,
-            WM_MDIICONARRANGE = 0x0228,
-            WM_MDIGETACTIVE = 0x0229,
-
-            WM_MDISETMENU = 0x0230,
-            WM_ENTERSIZEMOVE = 0x0231,
-            WM_EXITSIZEMOVE = 0x0232,
-            WM_DROPFILES = 0x0233,
-            WM_MDIREFRESHMENU = 0x0234,
-
-            WM_IME_SETCONTEXT = 0x0281,
-            WM_IME_NOTIFY = 0x0282,
-            WM_IME_CONTROL = 0x0283,
-            WM_IME_COMPOSITIONFULL = 0x0284,
-            WM_IME_SELECT = 0x0285,
-            WM_IME_CHAR = 0x0286,
-            WM_IME_REQUEST = 0x0288,
-            WM_IME_KEYDOWN = 0x0290,
-            WM_IME_KEYUP = 0x0291,
-
-            WM_MOUSEHOVER = 0x02A1,
-            WM_MOUSELEAVE = 0x02A3,
-            WM_NCMOUSEHOVER = 0x02A0,
-            WM_NCMOUSELEAVE = 0x02A2,
-
-            WM_WTSSESSION_CHANGE = 0x02B1,
-
-            WM_TABLET_FIRST = 0x02c0,
-            WM_TABLET_LAST = 0x02df,
-
-            WM_CUT = 0x0300,
-            WM_COPY = 0x0301,
-            WM_PASTE = 0x0302,
-            WM_CLEAR = 0x0303,
-            WM_UNDO = 0x0304,
-            WM_RENDERFORMAT = 0x0305,
-            WM_RENDERALLFORMATS = 0x0306,
-            WM_DESTROYCLIPBOARD = 0x0307,
-            WM_DRAWCLIPBOARD = 0x0308,
-            WM_PAINTCLIPBOARD = 0x0309,
-            WM_VSCROLLCLIPBOARD = 0x030A,
-            WM_SIZECLIPBOARD = 0x030B,
-            WM_ASKCBFORMATNAME = 0x030C,
-            WM_CHANGECBCHAIN = 0x030D,
-            WM_HSCROLLCLIPBOARD = 0x030E,
-            WM_QUERYNEWPALETTE = 0x030F,
-            WM_PALETTEISCHANGING = 0x0310,
-            WM_PALETTECHANGED = 0x0311,
-            WM_HOTKEY = 0x0312,
-
-            WM_PRINT = 0x0317,
-            WM_PRINTCLIENT = 0x0318,
-
-            WM_APPCOMMAND = 0x0319,
-
-            WM_THEMECHANGED = 0x031A,
-
-            WM_CLIPBOARDUPDATE = 0x031D,
-
-            WM_DWMCOMPOSITIONCHANGED = 0x031E,
-            WM_DWMNCRENDERINGCHANGED = 0x031F,
-            WM_DWMCOLORIZATIONCOLORCHANGED = 0x0320,
-            WM_DWMWINDOWMAXIMIZEDCHANGE = 0x0321,
-
-            WM_GETTITLEBARINFOEX = 0x033F,
-
-            WM_HANDHELDFIRST = 0x0358,
-            WM_HANDHELDLAST = 0x035F,
-
-            WM_AFXFIRST = 0x0360,
-            WM_AFXLAST = 0x037F,
-
-            WM_PENWINFIRST = 0x0380,
-            WM_PENWINLAST = 0x038F,
-
-            WM_APP = 0x8000,
-
-            WM_USER = 0x0400,
-
-            WM_REFLECT = WM_USER + 0x1C00,
-        }
+        Timer = 4,
 
         /// <summary>
-        /// Returns true if the current application has focus, false otherwise.
+        /// Flash continuously until the window comes to the foreground.
         /// </summary>
-        /// <returns>
-        /// If the current application is focused.
-        /// </returns>
-        public static bool ApplicationIsActivated()
-        {
-            var activatedHandle = GetForegroundWindow();
-            if (activatedHandle == IntPtr.Zero)
-                return false; // No window is currently activated
-
-            _ = GetWindowThreadProcessId(activatedHandle, out var activeProcId);
-            if (Marshal.GetLastWin32Error() != 0)
-                return false;
-
-            return activeProcId == Environment.ProcessId;
-        }
-
-        /// <summary>
-        /// Passes message information to the specified window procedure.
-        /// </summary>
-        /// <param name="lpPrevWndFunc">
-        /// The previous window procedure. If this value is obtained by calling the GetWindowLong function with the nIndex parameter set to
-        /// GWL_WNDPROC or DWL_DLGPROC, it is actually either the address of a window or dialog box procedure, or a special internal value
-        /// meaningful only to CallWindowProc.
-        /// </param>
-        /// <param name="hWnd">
-        /// A handle to the window procedure to receive the message.
-        /// </param>
-        /// <param name="msg">
-        /// The message.
-        /// </param>
-        /// <param name="wParam">
-        /// Additional message-specific information. The contents of this parameter depend on the value of the Msg parameter.
-        /// </param>
-        /// <param name="lParam">
-        /// More additional message-specific information. The contents of this parameter depend on the value of the Msg parameter.
-        /// </param>
-        /// <returns>
-        /// Use the CallWindowProc function for window subclassing. Usually, all windows with the same class share one window procedure. A
-        /// subclass is a window or set of windows with the same class whose messages are intercepted and processed by another window procedure
-        /// (or procedures) before being passed to the window procedure of the class.
-        /// The SetWindowLong function creates the subclass by changing the window procedure associated with a particular window, causing the
-        /// system to call the new window procedure instead of the previous one.An application must pass any messages not processed by the new
-        /// window procedure to the previous window procedure by calling CallWindowProc.This allows the application to create a chain of window
-        /// procedures.
-        /// </returns>
-        [DllImport("user32.dll")]
-        public static extern long CallWindowProcW(IntPtr lpPrevWndFunc, IntPtr hWnd, uint msg, ulong wParam, long lParam);
-
-        /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-flashwindowex.
-        /// Flashes the specified window. It does not change the active state of the window.
-        /// </summary>
-        /// <param name="pwfi">
-        /// A pointer to a FLASHWINFO structure.
-        /// </param>
-        /// <returns>
-        /// The return value specifies the window's state before the call to the FlashWindowEx function. If the window caption
-        /// was drawn as active before the call, the return value is nonzero. Otherwise, the return value is zero.
-        /// </returns>
-        [DllImport("user32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool FlashWindowEx(ref FlashWindowInfo pwfi);
-
-        /// <summary>
-        /// Retrieves a handle to the foreground window (the window with which the user is currently working). The system assigns
-        /// a slightly higher priority to the thread that creates the foreground window than it does to other threads.
-        /// </summary>
-        /// <returns>
-        /// The return value is a handle to the foreground window. The foreground window can be NULL in certain circumstances,
-        /// such as when a window is losing activation.
-        /// </returns>
-        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
-        public static extern IntPtr GetForegroundWindow();
-
-        /// <summary>
-        /// Retrieves the identifier of the thread that created the specified window and, optionally, the identifier of the
-        /// process that created the window.
-        /// </summary>
-        /// <param name="handle">
-        /// A handle to the window.
-        /// </param>
-        /// <param name="processId">
-        /// A pointer to a variable that receives the process identifier. If this parameter is not NULL, GetWindowThreadProcessId
-        /// copies the identifier of the process to the variable; otherwise, it does not.
-        /// </param>
-        /// <returns>
-        /// The return value is the identifier of the thread that created the window.
-        /// </returns>
-        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern int GetWindowThreadProcessId(IntPtr handle, out int processId);
-
-        /// <summary>
-        /// Displays a modal dialog box that contains a system icon, a set of buttons, and a brief application-specific message,
-        /// such as status or error information. The message box returns an integer value that indicates which button the user
-        /// clicked.
-        /// </summary>
-        /// <param name="hWnd">
-        /// A handle to the owner window of the message box to be created. If this parameter is NULL, the message box has no
-        /// owner window.
-        /// </param>
-        /// <param name="text">
-        /// The message to be displayed. If the string consists of more than one line, you can separate the lines using a carriage
-        /// return and/or linefeed character between each line.
-        /// </param>
-        /// <param name="caption">
-        /// The dialog box title. If this parameter is NULL, the default title is Error.</param>
-        /// <param name="type">
-        /// The contents and behavior of the dialog box. This parameter can be a combination of flags from the following groups
-        /// of flags.
-        /// </param>
-        /// <returns>
-        /// If a message box has a Cancel button, the function returns the IDCANCEL value if either the ESC key is pressed or
-        /// the Cancel button is selected. If the message box has no Cancel button, pressing ESC will no effect - unless an
-        /// MB_OK button is present. If an MB_OK button is displayed and the user presses ESC, the return value will be IDOK.
-        /// If the function fails, the return value is zero.To get extended error information, call GetLastError. If the function
-        /// succeeds, the return value is one of the ID* enum values.
-        /// </returns>
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern int MessageBoxW(IntPtr hWnd, string text, string caption, MessageBoxType type);
-
-        /// <summary>
-        /// Changes an attribute of the specified window. The function also sets a value at the specified offset in the extra window memory.
-        /// </summary>
-        /// <param name="hWnd">
-        /// A handle to the window and, indirectly, the class to which the window belongs. The SetWindowLongPtr function fails if the
-        /// process that owns the window specified by the hWnd parameter is at a higher process privilege in the UIPI hierarchy than the
-        /// process the calling thread resides in.
-        /// </param>
-        /// <param name="nIndex">
-        /// The zero-based offset to the value to be set. Valid values are in the range zero through the number of bytes of extra window
-        /// memory, minus the size of a LONG_PTR. To set any other value, specify one of the values.
-        /// </param>
-        /// <param name="dwNewLong">
-        /// The replacement value.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is the previous value of the specified offset. If the function fails, the return
-        /// value is zero.To get extended error information, call GetLastError. If the previous value is zero and the function succeeds,
-        /// the return value is zero, but the function does not clear the last error information. To determine success or failure, clear
-        /// the last error information by calling SetLastError with 0, then call SetWindowLongPtr.Function failure will be indicated by
-        /// a return value of zero and a GetLastError result that is nonzero.
-        /// </returns>
-        [DllImport("user32.dll", SetLastError = true)]
-        public static extern IntPtr SetWindowLongPtrW(IntPtr hWnd, WindowLongType nIndex, IntPtr dwNewLong);
-
-        /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/winuser/ns-winuser-flashwinfo.
-        /// Contains the flash status for a window and the number of times the system should flash the window.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public struct FlashWindowInfo
-        {
-            /// <summary>
-            /// The size of the structure, in bytes.
-            /// </summary>
-            public uint Size;
-
-            /// <summary>
-            /// A handle to the window to be flashed. The window can be either opened or minimized.
-            /// </summary>
-            public IntPtr Hwnd;
-
-            /// <summary>
-            /// The flash status. This parameter can be one or more of the FlashWindow enum values.
-            /// </summary>
-            public FlashWindow Flags;
-
-            /// <summary>
-            /// The number of times to flash the window.
-            /// </summary>
-            public uint Count;
-
-            /// <summary>
-            /// The rate at which the window is to be flashed, in milliseconds. If dwTimeout is zero, the function uses the
-            /// default cursor blink rate.
-            /// </summary>
-            public uint Timeout;
-        }
+        TimerNoFG = 12,
     }
 
     /// <summary>
-    /// Native imm32 functions.
+    /// IDC_* from winuser.
     /// </summary>
-    internal static partial class NativeFunctions
+    public enum CursorType
     {
         /// <summary>
-        /// GCS_* from imm32.
-        /// These values are used with ImmGetCompositionString and WM_IME_COMPOSITION.
+        /// Standard arrow and small hourglass.
         /// </summary>
-        [Flags]
-        public enum IMEComposition
-        {
-            /// <summary>
-            /// Retrieve or update the attribute of the composition string.
-            /// </summary>
-            CompAttr = 0x0010,
-
-            /// <summary>
-            /// Retrieve or update clause information of the composition string.
-            /// </summary>
-            CompClause = 0x0020,
-
-            /// <summary>
-            /// Retrieve or update the attributes of the reading string of the current composition.
-            /// </summary>
-            CompReadAttr = 0x0002,
-
-            /// <summary>
-            /// Retrieve or update the clause information of the reading string of the composition string.
-            /// </summary>
-            CompReadClause = 0x0004,
-
-            /// <summary>
-            /// Retrieve or update the reading string of the current composition.
-            /// </summary>
-            CompReadStr = 0x0001,
-
-            /// <summary>
-            /// Retrieve or update the current composition string.
-            /// </summary>
-            CompStr = 0x0008,
-
-            /// <summary>
-            /// Retrieve or update the cursor position in composition string.
-            /// </summary>
-            CursorPos = 0x0080,
-
-            /// <summary>
-            /// Retrieve or update the starting position of any changes in composition string.
-            /// </summary>
-            DeltaStart = 0x0100,
-
-            /// <summary>
-            /// Retrieve or update clause information of the result string.
-            /// </summary>
-            ResultClause = 0x1000,
-
-            /// <summary>
-            /// Retrieve or update clause information of the reading string.
-            /// </summary>
-            ResultReadClause = 0x0400,
-
-            /// <summary>
-            /// Retrieve or update the reading string.
-            /// </summary>
-            ResultReadStr = 0x0200,
-
-            /// <summary>
-            /// Retrieve or update the string of the composition result.
-            /// </summary>
-            ResultStr = 0x0800,
-        }
+        AppStarting = 32650,
 
         /// <summary>
-        /// IMN_* from imm32.
-        /// Input Method Manager Commands, this enum is not exhaustive.
+        /// Standard arrow.
         /// </summary>
-        public enum IMECommand
-        {
-            /// <summary>
-            /// Notifies the application when an IME is about to change the content of the candidate window.
-            /// </summary>
-            ChangeCandidate = 0x0003,
-
-            /// <summary>
-            /// Notifies an application when an IME is about to close the candidates window.
-            /// </summary>
-            CloseCandidate = 0x0004,
-
-            /// <summary>
-            /// Notifies an application when an IME is about to open the candidate window.
-            /// </summary>
-            OpenCandidate = 0x0005,
-
-            /// <summary>
-            /// Notifies an application when the conversion mode of the input context is updated.
-            /// </summary>
-            SetConversionMode = 0x0006,
-        }
+        Arrow = 32512,
 
         /// <summary>
-        /// Returns the input context associated with the specified window.
+        /// Crosshair.
         /// </summary>
-        /// <param name="hWnd">Unnamed parameter 1.</param>
-        /// <returns>
-        /// Returns the handle to the input context.
-        /// </returns>
-        [DllImport("imm32.dll")]
-        public static extern IntPtr ImmGetContext(IntPtr hWnd);
+        Cross = 32515,
 
         /// <summary>
-        /// Retrieves information about the composition string.
+        /// Hand.
         /// </summary>
-        /// <param name="hImc">
-        /// Unnamed parameter 1.
-        /// </param>
-        /// <param name="arg2">
-        /// Unnamed parameter 2.
-        /// </param>
-        /// <param name="lpBuf">
-        /// Pointer to a buffer in which the function retrieves the composition string information.
-        /// </param>
-        /// <param name="dwBufLen">
-        /// Size, in bytes, of the output buffer, even if the output is a Unicode string. The application sets this parameter to 0
-        /// if the function is to return the size of the required output buffer.
-        /// </param>
-        /// <returns>
-        /// Returns the number of bytes copied to the output buffer. If dwBufLen is set to 0, the function returns the buffer size,
-        /// in bytes, required to receive all requested information, excluding the terminating null character. The return value is
-        /// always the size, in bytes, even if the requested data is a Unicode string.
-        /// This function returns one of the following negative error codes if it does not succeed:
-        /// - IMM_ERROR_NODATA.Composition data is not ready in the input context.
-        /// - IMM_ERROR_GENERAL.General error detected by IME.
-        /// </returns>
-        [DllImport("imm32.dll")]
-        public static extern long ImmGetCompositionStringW(IntPtr hImc, IMEComposition arg2, IntPtr lpBuf, uint dwBufLen);
+        Hand = 32649,
 
         /// <summary>
-        /// Retrieves a candidate list.
+        /// Arrow and question mark.
         /// </summary>
-        /// <param name="hImc">
-        /// Unnamed parameter 1.
-        /// </param>
-        /// <param name="deIndex">
-        /// Zero-based index of the candidate list.
-        /// </param>
-        /// <param name="lpCandList">
-        /// Pointer to a CANDIDATELIST structure in which the function retrieves the candidate list.
-        /// </param>
-        /// <param name="dwBufLen">
-        /// Size, in bytes, of the buffer to receive the candidate list. The application can specify 0 for this parameter if the
-        /// function is to return the required size of the output buffer only.
-        /// </param>
-        /// <returns>
-        /// Returns the number of bytes copied to the candidate list buffer if successful. If the application has supplied 0 for
-        /// the dwBufLen parameter, the function returns the size required for the candidate list buffer. The function returns 0
-        /// if it does not succeed.
-        /// </returns>
-        [DllImport("imm32.dll")]
-        public static extern long ImmGetCandidateListW(IntPtr hImc, uint deIndex, IntPtr lpCandList, uint dwBufLen);
+        Help = 32651,
 
         /// <summary>
-        /// Sets the position of the composition window.
+        /// I-beam.
         /// </summary>
-        /// <param name="hImc">
-        /// Unnamed parameter 1.
-        /// </param>
-        /// <param name="frm">
-        /// Pointer to a COMPOSITIONFORM structure that contains the new position and other related information about
-        /// the composition window.
-        /// </param>
-        /// <returns>
-        /// Returns a nonzero value if successful, or 0 otherwise.
-        /// </returns>
-        [DllImport("imm32.dll", CharSet = CharSet.Auto)]
-        public static extern bool ImmSetCompositionWindow(IntPtr hImc, ref CompositionForm frm);
+        IBeam = 32513,
 
         /// <summary>
-        /// Releases the input context and unlocks the memory associated in the input context. An application must call this
-        /// function for each call to the ImmGetContext function.
+        /// Obsolete for applications marked version 4.0 or later.
         /// </summary>
-        /// <param name="hwnd">
-        /// Unnamed parameter 1.
-        /// </param>
-        /// <param name="hImc">
-        /// Unnamed parameter 2.
-        /// </param>
-        /// <returns>
-        /// Returns a nonzero value if successful, or 0 otherwise.
-        /// </returns>
-        [DllImport("imm32.dll", CharSet = CharSet.Auto)]
-        public static extern bool ImmReleaseContext(IntPtr hwnd, IntPtr hImc);
+        Icon = 32641,
 
         /// <summary>
-        /// Contains information about a candidate list.
+        /// Slashed circle.
         /// </summary>
-        public struct CandidateList
-        {
-            /// <summary>
-            /// Size, in bytes, of the structure, the offset array, and all candidate strings.
-            /// </summary>
-            public int Size;
-
-            /// <summary>
-            /// Candidate style values. This member can have one or more of the IME_CAND_* values.
-            /// </summary>
-            public int Style;
-
-            /// <summary>
-            /// Number of candidate strings.
-            /// </summary>
-            public int Count;
-
-            /// <summary>
-            /// Index of the selected candidate string.
-            /// </summary>
-            public int Selection;
-
-            /// <summary>
-            /// Index of the first candidate string in the candidate window. This varies as the user presses the PAGE UP and PAGE DOWN keys.
-            /// </summary>
-            public int PageStart;
-
-            /// <summary>
-            /// Number of candidate strings to be shown in one page in the candidate window. The user can move to the next page by pressing IME-defined keys, such as the PAGE UP or PAGE DOWN key. If this number is 0, an application can define a proper value by itself.
-            /// </summary>
-            public int PageSize;
-
-            // /// <summary>
-            // /// Offset to the start of the first candidate string, relative to the start of this structure. The offsets
-            // /// for subsequent strings immediately follow this member, forming an array of 32-bit offsets.
-            // /// </summary>
-            // public IntPtr Offset; // manually handle
-        }
+        No = 32648,
 
         /// <summary>
-        /// Contains style and position information for a composition window.
+        /// Obsolete for applications marked version 4.0 or later.Use IDC_SIZEALL.
         /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public struct CompositionForm
-        {
-            /// <summary>
-            /// Position style. This member can be one of the CFS_* values.
-            /// </summary>
-            public int Style;
-
-            /// <summary>
-            /// A POINT structure containing the coordinates of the upper left corner of the composition window.
-            /// </summary>
-            public Point CurrentPos;
-
-            /// <summary>
-            /// A RECT structure containing the coordinates of the upper left and lower right corners of the composition window.
-            /// </summary>
-            public Rect Area;
-        }
+        Size = 32640,
 
         /// <summary>
-        /// Contains coordinates for a point.
+        /// Four-pointed arrow pointing north, south, east, and west.
         /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public struct Point
-        {
-            /// <summary>
-            /// The X position.
-            /// </summary>
-            public int X;
-
-            /// <summary>
-            /// The Y position.
-            /// </summary>
-            public int Y;
-        }
+        SizeAll = 32646,
 
         /// <summary>
-        /// Contains dimensions for a rectangle.
+        /// Double-pointed arrow pointing northeast and southwest.
         /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        public struct Rect
-        {
-            /// <summary>
-            /// The left position.
-            /// </summary>
-            public int Left;
+        SizeNeSw = 32643,
 
-            /// <summary>
-            /// The top position.
-            /// </summary>
-            public int Top;
+        /// <summary>
+        /// Double-pointed arrow pointing north and south.
+        /// </summary>
+        SizeNS = 32645,
 
-            /// <summary>
-            /// The right position.
-            /// </summary>
-            public int Right;
+        /// <summary>
+        /// Double-pointed arrow pointing northwest and southeast.
+        /// </summary>
+        SizeNwSe = 32642,
 
-            /// <summary>
-            /// The bottom position.
-            /// </summary>
-            public int Bottom;
-        }
+        /// <summary>
+        /// Double-pointed arrow pointing west and east.
+        /// </summary>
+        SizeWE = 32644,
+
+        /// <summary>
+        /// Vertical arrow.
+        /// </summary>
+        UpArrow = 32516,
+
+        /// <summary>
+        /// Hourglass.
+        /// </summary>
+        Wait = 32514,
     }
 
     /// <summary>
-    /// Native kernel32 functions.
+    /// MB_* from winuser.
     /// </summary>
-    internal static partial class NativeFunctions
+    public enum MessageBoxType : uint
     {
         /// <summary>
-        /// MEM_* from memoryapi.
+        /// The default value for any of the various subtypes.
         /// </summary>
-        [Flags]
-        public enum AllocationType
-        {
-            /// <summary>
-            /// To coalesce two adjacent placeholders, specify MEM_RELEASE | MEM_COALESCE_PLACEHOLDERS. When you coalesce
-            /// placeholders, lpAddress and dwSize must exactly match those of the placeholder.
-            /// </summary>
-            CoalescePlaceholders = 0x1,
+        DefaultValue = 0x0,
 
-            /// <summary>
-            /// Frees an allocation back to a placeholder (after you've replaced a placeholder with a private allocation using
-            /// VirtualAlloc2 or Virtual2AllocFromApp). To split a placeholder into two placeholders, specify
-            /// MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER.
-            /// </summary>
-            PreservePlaceholder = 0x2,
-
-            /// <summary>
-            /// Allocates memory charges (from the overall size of memory and the paging files on disk) for the specified reserved
-            /// memory pages. The function also guarantees that when the caller later initially accesses the memory, the contents
-            /// will be zero. Actual physical pages are not allocated unless/until the virtual addresses are actually accessed.
-            /// To reserve and commit pages in one step, call VirtualAllocEx with MEM_COMMIT | MEM_RESERVE. Attempting to commit
-            /// a specific address range by specifying MEM_COMMIT without MEM_RESERVE and a non-NULL lpAddress fails unless the
-            /// entire range has already been reserved. The resulting error code is ERROR_INVALID_ADDRESS. An attempt to commit
-            /// a page that is already committed does not cause the function to fail. This means that you can commit pages without
-            /// first determining the current commitment state of each page. If lpAddress specifies an address within an enclave,
-            /// flAllocationType must be MEM_COMMIT.
-            /// </summary>
-            Commit = 0x1000,
-
-            /// <summary>
-            /// Reserves a range of the process's virtual address space without allocating any actual physical storage in memory
-            /// or in the paging file on disk. You commit reserved pages by calling VirtualAllocEx again with MEM_COMMIT. To
-            /// reserve and commit pages in one step, call VirtualAllocEx with MEM_COMMIT | MEM_RESERVE. Other memory allocation
-            /// functions, such as malloc and LocalAlloc, cannot use reserved memory until it has been released.
-            /// </summary>
-            Reserve = 0x2000,
-
-            /// <summary>
-            /// Decommits the specified region of committed pages. After the operation, the pages are in the reserved state.
-            /// The function does not fail if you attempt to decommit an uncommitted page. This means that you can decommit
-            /// a range of pages without first determining the current commitment state. The MEM_DECOMMIT value is not supported
-            /// when the lpAddress parameter provides the base address for an enclave.
-            /// </summary>
-            Decommit = 0x4000,
-
-            /// <summary>
-            /// Releases the specified region of pages, or placeholder (for a placeholder, the address space is released and
-            /// available for other allocations). After this operation, the pages are in the free state. If you specify this
-            /// value, dwSize must be 0 (zero), and lpAddress must point to the base address returned by the VirtualAlloc function
-            /// when the region is reserved. The function fails if either of these conditions is not met. If any pages in the
-            /// region are committed currently, the function first decommits, and then releases them. The function does not
-            /// fail if you attempt to release pages that are in different states, some reserved and some committed. This means
-            /// that you can release a range of pages without first determining the current commitment state.
-            /// </summary>
-            Release = 0x8000,
-
-            /// <summary>
-            /// Indicates that data in the memory range specified by lpAddress and dwSize is no longer of interest. The pages
-            /// should not be read from or written to the paging file. However, the memory block will be used again later, so
-            /// it should not be decommitted. This value cannot be used with any other value. Using this value does not guarantee
-            /// that the range operated on with MEM_RESET will contain zeros. If you want the range to contain zeros, decommit
-            /// the memory and then recommit it. When you use MEM_RESET, the VirtualAllocEx function ignores the value of fProtect.
-            /// However, you must still set fProtect to a valid protection value, such as PAGE_NOACCESS. VirtualAllocEx returns
-            /// an error if you use MEM_RESET and the range of memory is mapped to a file. A shared view is only acceptable
-            /// if it is mapped to a paging file.
-            /// </summary>
-            Reset = 0x80000,
-
-            /// <summary>
-            /// MEM_RESET_UNDO should only be called on an address range to which MEM_RESET was successfully applied earlier.
-            /// It indicates that the data in the specified memory range specified by lpAddress and dwSize is of interest to
-            /// the caller and attempts to reverse the effects of MEM_RESET. If the function succeeds, that means all data in
-            /// the specified address range is intact. If the function fails, at least some of the data in the address range
-            /// has been replaced with zeroes. This value cannot be used with any other value. If MEM_RESET_UNDO is called on
-            /// an address range which was not MEM_RESET earlier, the behavior is undefined. When you specify MEM_RESET, the
-            /// VirtualAllocEx function ignores the value of flProtect. However, you must still set flProtect to a valid
-            /// protection value, such as PAGE_NOACCESS.
-            /// </summary>
-            ResetUndo = 0x1000000,
-
-            /// <summary>
-            /// Reserves an address range that can be used to map Address Windowing Extensions (AWE) pages. This value must
-            /// be used with MEM_RESERVE and no other values.
-            /// </summary>
-            Physical = 0x400000,
-
-            /// <summary>
-            /// Allocates memory at the highest possible address. This can be slower than regular allocations, especially when
-            /// there are many allocations.
-            /// </summary>
-            TopDown = 0x100000,
-
-            /// <summary>
-            /// Causes the system to track pages that are written to in the allocated region. If you specify this value, you
-            /// must also specify MEM_RESERVE. To retrieve the addresses of the pages that have been written to since the region
-            /// was allocated or the write-tracking state was reset, call the GetWriteWatch function. To reset the write-tracking
-            /// state, call GetWriteWatch or ResetWriteWatch. The write-tracking feature remains enabled for the memory region
-            /// until the region is freed.
-            /// </summary>
-            WriteWatch = 0x200000,
-
-            /// <summary>
-            /// Allocates memory using large page support. The size and alignment must be a multiple of the large-page minimum.
-            /// To obtain this value, use the GetLargePageMinimum function. If you specify this value, you must also specify
-            /// MEM_RESERVE and MEM_COMMIT.
-            /// </summary>
-            LargePages = 0x20000000,
-        }
+        // To indicate the buttons displayed in the message box, specify one of the following values.
 
         /// <summary>
-        /// SEM_* from errhandlingapi.
+        /// The message box contains three push buttons: Abort, Retry, and Ignore.
         /// </summary>
-        [Flags]
-        public enum ErrorModes : uint
-        {
-            /// <summary>
-            /// Use the system default, which is to display all error dialog boxes.
-            /// </summary>
-            SystemDefault = 0x0,
-
-            /// <summary>
-            /// The system does not display the critical-error-handler message box. Instead, the system sends the error to the
-            /// calling process. Best practice is that all applications call the process-wide SetErrorMode function with a parameter
-            /// of SEM_FAILCRITICALERRORS at startup. This is to prevent error mode dialogs from hanging the application.
-            /// </summary>
-            FailCriticalErrors = 0x0001,
-
-            /// <summary>
-            /// The system automatically fixes memory alignment faults and makes them invisible to the application. It does
-            /// this for the calling process and any descendant processes. This feature is only supported by certain processor
-            /// architectures. For more information, see the Remarks section. After this value is set for a process, subsequent
-            /// attempts to clear the value are ignored.
-            /// </summary>
-            NoAlignmentFaultExcept = 0x0004,
-
-            /// <summary>
-            /// The system does not display the Windows Error Reporting dialog.
-            /// </summary>
-            NoGpFaultErrorBox = 0x0002,
-
-            /// <summary>
-            /// The OpenFile function does not display a message box when it fails to find a file. Instead, the error is returned
-            /// to the caller. This error mode overrides the OF_PROMPT flag.
-            /// </summary>
-            NoOpenFileErrorBox = 0x8000,
-        }
+        AbortRetryIgnore = 0x2,
 
         /// <summary>
-        /// PAGE_* from memoryapi.
+        /// The message box contains three push buttons: Cancel, Try Again, Continue. Use this message box type instead
+        /// of MB_ABORTRETRYIGNORE.
         /// </summary>
-        [Flags]
-        public enum MemoryProtection
-        {
-            /// <summary>
-            /// Enables execute access to the committed region of pages. An attempt to write to the committed region results
-            /// in an access violation. This flag is not supported by the CreateFileMapping function.
-            /// </summary>
-            Execute = 0x10,
-
-            /// <summary>
-            /// Enables execute or read-only access to the committed region of pages. An attempt to write to the committed region
-            /// results in an access violation.
-            /// </summary>
-            ExecuteRead = 0x20,
-
-            /// <summary>
-            /// Enables execute, read-only, or read/write access to the committed region of pages.
-            /// </summary>
-            ExecuteReadWrite = 0x40,
-
-            /// <summary>
-            /// Enables execute, read-only, or copy-on-write access to a mapped view of a file mapping object. An attempt to
-            /// write to a committed copy-on-write page results in a private copy of the page being made for the process. The
-            /// private page is marked as PAGE_EXECUTE_READWRITE, and the change is written to the new page. This flag is not
-            /// supported by the VirtualAlloc or VirtualAllocEx functions.
-            /// </summary>
-            ExecuteWriteCopy = 0x80,
-
-            /// <summary>
-            /// Disables all access to the committed region of pages. An attempt to read from, write to, or execute the committed
-            /// region results in an access violation. This flag is not supported by the CreateFileMapping function.
-            /// </summary>
-            NoAccess = 0x01,
-
-            /// <summary>
-            /// Enables read-only access to the committed region of pages. An attempt to write to the committed region results
-            /// in an access violation. If Data Execution Prevention is enabled, an attempt to execute code in the committed
-            /// region results in an access violation.
-            /// </summary>
-            ReadOnly = 0x02,
-
-            /// <summary>
-            /// Enables read-only or read/write access to the committed region of pages. If Data Execution Prevention is enabled,
-            /// attempting to execute code in the committed region results in an access violation.
-            /// </summary>
-            ReadWrite = 0x04,
-
-            /// <summary>
-            /// Enables read-only or copy-on-write access to a mapped view of a file mapping object. An attempt to write to
-            /// a committed copy-on-write page results in a private copy of the page being made for the process. The private
-            /// page is marked as PAGE_READWRITE, and the change is written to the new page. If Data Execution Prevention is
-            /// enabled, attempting to execute code in the committed region results in an access violation. This flag is not
-            /// supported by the VirtualAlloc or VirtualAllocEx functions.
-            /// </summary>
-            WriteCopy = 0x08,
-
-            /// <summary>
-            /// Sets all locations in the pages as invalid targets for CFG. Used along with any execute page protection like
-            /// PAGE_EXECUTE, PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE and PAGE_EXECUTE_WRITECOPY. Any indirect call to locations
-            /// in those pages will fail CFG checks and the process will be terminated. The default behavior for executable
-            /// pages allocated is to be marked valid call targets for CFG. This flag is not supported by the VirtualProtect
-            /// or CreateFileMapping functions.
-            /// </summary>
-            TargetsInvalid = 0x40000000,
-
-            /// <summary>
-            /// Pages in the region will not have their CFG information updated while the protection changes for VirtualProtect.
-            /// For example, if the pages in the region was allocated using PAGE_TARGETS_INVALID, then the invalid information
-            /// will be maintained while the page protection changes. This flag is only valid when the protection changes to
-            /// an executable type like PAGE_EXECUTE, PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE and PAGE_EXECUTE_WRITECOPY.
-            /// The default behavior for VirtualProtect protection change to executable is to mark all locations as valid call
-            /// targets for CFG.
-            /// </summary>
-            TargetsNoUpdate = TargetsInvalid,
-
-            /// <summary>
-            /// Pages in the region become guard pages. Any attempt to access a guard page causes the system to raise a
-            /// STATUS_GUARD_PAGE_VIOLATION exception and turn off the guard page status. Guard pages thus act as a one-time
-            /// access alarm. For more information, see Creating Guard Pages. When an access attempt leads the system to turn
-            /// off guard page status, the underlying page protection takes over. If a guard page exception occurs during a
-            /// system service, the service typically returns a failure status indicator. This value cannot be used with
-            /// PAGE_NOACCESS. This flag is not supported by the CreateFileMapping function.
-            /// </summary>
-            Guard = 0x100,
-
-            /// <summary>
-            /// Sets all pages to be non-cachable. Applications should not use this attribute except when explicitly required
-            /// for a device. Using the interlocked functions with memory that is mapped with SEC_NOCACHE can result in an
-            /// EXCEPTION_ILLEGAL_INSTRUCTION exception. The PAGE_NOCACHE flag cannot be used with the PAGE_GUARD, PAGE_NOACCESS,
-            /// or PAGE_WRITECOMBINE flags. The PAGE_NOCACHE flag can be used only when allocating private memory with the
-            /// VirtualAlloc, VirtualAllocEx, or VirtualAllocExNuma functions. To enable non-cached memory access for shared
-            /// memory, specify the SEC_NOCACHE flag when calling the CreateFileMapping function.
-            /// </summary>
-            NoCache = 0x200,
-
-            /// <summary>
-            /// Sets all pages to be write-combined. Applications should not use this attribute except when explicitly required
-            /// for a device. Using the interlocked functions with memory that is mapped as write-combined can result in an
-            /// EXCEPTION_ILLEGAL_INSTRUCTION exception. The PAGE_WRITECOMBINE flag cannot be specified with the PAGE_NOACCESS,
-            /// PAGE_GUARD, and PAGE_NOCACHE flags. The PAGE_WRITECOMBINE flag can be used only when allocating private memory
-            /// with the VirtualAlloc, VirtualAllocEx, or VirtualAllocExNuma functions. To enable write-combined memory access
-            /// for shared memory, specify the SEC_WRITECOMBINE flag when calling the CreateFileMapping function.
-            /// </summary>
-            WriteCombine = 0x400,
-        }
+        CancelTryContinue = 0x6,
 
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-setevent
-        /// Sets the specified event object to the signaled state.
+        /// Adds a Help button to the message box. When the user clicks the Help button or presses F1, the system sends
+        /// a WM_HELP message to the owner.
         /// </summary>
-        /// <param name="hEvent">A handle to the event object. The CreateEvent or OpenEvent function returns this handle.</param>
-        /// <returns>
-        /// If the function succeeds, the return value is nonzero.
-        /// If the function fails, the return value is zero. To get extended error information, call GetLastError.
-        /// </returns>
-        [DllImport("kernel32.dll")]
-        public static extern bool SetEvent(IntPtr hEvent);
+        Help = 0x4000,
 
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-freelibrary.
-        /// Frees the loaded dynamic-link library (DLL) module and, if necessary, decrements its reference count. When the reference
-        /// count reaches zero, the module is unloaded from the address space of the calling process and the handle is no longer
-        /// valid.
+        /// The message box contains one push button: OK. This is the default.
         /// </summary>
-        /// <param name="hModule">
-        /// A handle to the loaded library module. The LoadLibrary, LoadLibraryEx, GetModuleHandle, or GetModuleHandleEx function
-        /// returns this handle.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is nonzero. If the function fails, the return value is zero. To get extended
-        /// error information, call the GetLastError function.
-        /// </returns>
-        [DllImport("kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool FreeLibrary(IntPtr hModule);
+        Ok = DefaultValue,
 
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-getmodulefilenamew.
-        /// Retrieves the fully qualified path for the file that contains the specified module. The module must have been loaded
-        /// by the current process. To locate the file for a module that was loaded by another process, use the GetModuleFileNameEx
-        /// function.
+        /// The message box contains two push buttons: OK and Cancel.
         /// </summary>
-        /// <param name="hModule">
-        /// A handle to the loaded module whose path is being requested. If this parameter is NULL, GetModuleFileName retrieves
-        /// the path of the executable file of the current process. The GetModuleFileName function does not retrieve the path
-        /// for modules that were loaded using the LOAD_LIBRARY_AS_DATAFILE flag. For more information, see LoadLibraryEx.
-        /// </param>
-        /// <param name="lpFilename">
-        /// A pointer to a buffer that receives the fully qualified path of the module. If the length of the path is less than
-        /// the size that the nSize parameter specifies, the function succeeds and the path is returned as a null-terminated
-        /// string. If the length of the path exceeds the size that the nSize parameter specifies, the function succeeds and
-        /// the string is truncated to nSize characters including the terminating null character.
-        /// </param>
-        /// <param name="nSize">
-        /// The size of the lpFilename buffer, in TCHARs.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is the length of the string that is copied to the buffer, in characters,
-        /// not including the terminating null character. If the buffer is too small to hold the module name, the string is
-        /// truncated to nSize characters including the terminating null character, the function returns nSize, and the function
-        /// sets the last error to ERROR_INSUFFICIENT_BUFFER. If nSize is zero, the return value is zero and the last error
-        /// code is ERROR_SUCCESS. If the function fails, the return value is 0 (zero). To get extended error information, call
-        /// GetLastError.
-        /// </returns>
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        [PreserveSig]
-        public static extern uint GetModuleFileNameW(
-            [In] IntPtr hModule,
-            [Out] StringBuilder lpFilename,
-            [In][MarshalAs(UnmanagedType.U4)] int nSize);
+        OkCancel = 0x1,
 
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-getmodulehandlew.
-        /// Retrieves a module handle for the specified module. The module must have been loaded by the calling process. To
-        /// avoid the race conditions described in the Remarks section, use the GetModuleHandleEx function.
+        /// The message box contains two push buttons: Retry and Cancel.
         /// </summary>
-        /// <param name="lpModuleName">
-        /// The name of the loaded module (either a .dll or .exe file). If the file name extension is omitted, the default
-        /// library extension .dll is appended. The file name string can include a trailing point character (.) to indicate
-        /// that the module name has no extension. The string does not have to specify a path. When specifying a path, be sure
-        /// to use backslashes (\), not forward slashes (/). The name is compared (case independently) to the names of modules
-        /// currently mapped into the address space of the calling process. If this parameter is NULL, GetModuleHandle returns
-        /// a handle to the file used to create the calling process (.exe file). The GetModuleHandle function does not retrieve
-        /// handles for modules that were loaded using the LOAD_LIBRARY_AS_DATAFILE flag.For more information, see LoadLibraryEx.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is a handle to the specified module. If the function fails, the return
-        /// value is NULL.To get extended error information, call GetLastError.
-        /// </returns>
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true)]
-        public static extern IntPtr GetModuleHandleW(string lpModuleName);
+        RetryCancel = 0x5,
 
         /// <summary>
-        /// Retrieves the address of an exported function or variable from the specified dynamic-link library (DLL).
+        /// The message box contains two push buttons: Yes and No.
         /// </summary>
-        /// <param name="hModule">
-        /// A handle to the DLL module that contains the function or variable. The LoadLibrary, LoadLibraryEx, LoadPackagedLibrary,
-        /// or GetModuleHandle function returns this handle. The GetProcAddress function does not retrieve addresses from modules
-        /// that were loaded using the LOAD_LIBRARY_AS_DATAFILE flag.For more information, see LoadLibraryEx.
-        /// </param>
-        /// <param name="procName">
-        /// The function or variable name, or the function's ordinal value. If this parameter is an ordinal value, it must be
-        /// in the low-order word; the high-order word must be zero.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is the address of the exported function or variable. If the function
-        /// fails, the return value is NULL.To get extended error information, call GetLastError.
-        /// </returns>
-        [DllImport("kernel32", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
-        [SuppressMessage("Globalization", "CA2101:Specify marshaling for P/Invoke string arguments", Justification = "Ansi only")]
-        public static extern IntPtr GetProcAddress(IntPtr hModule, string procName);
+        YesNo = 0x4,
 
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-loadlibraryw.
-        /// Loads the specified module into the address space of the calling process. The specified module may cause other modules
-        /// to be loaded. For additional load options, use the LoadLibraryEx function.
+        /// The message box contains three push buttons: Yes, No, and Cancel.
         /// </summary>
-        /// <param name="lpFileName">
-        /// The name of the module. This can be either a library module (a .dll file) or an executable module (an .exe file).
-        /// The name specified is the file name of the module and is not related to the name stored in the library module itself,
-        /// as specified by the LIBRARY keyword in the module-definition (.def) file. If the string specifies a full path, the
-        /// function searches only that path for the module. If the string specifies a relative path or a module name without
-        /// a path, the function uses a standard search strategy to find the module; for more information, see the Remarks.
-        /// If the function cannot find the module, the function fails.When specifying a path, be sure to use backslashes (\),
-        /// not forward slashes(/). For more information about paths, see Naming a File or Directory. If the string specifies
-        /// a module name without a path and the file name extension is omitted, the function appends the default library extension
-        /// .dll to the module name. To prevent the function from appending .dll to the module name, include a trailing point
-        /// character (.) in the module name string.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is a handle to the module. If the function fails, the return value is
-        /// NULL.To get extended error information, call GetLastError.
-        /// </returns>
-        [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern IntPtr LoadLibraryW([MarshalAs(UnmanagedType.LPWStr)] string lpFileName);
+        YesNoCancel = 0x3,
+
+        // To display an icon in the message box, specify one of the following values.
 
         /// <summary>
-        /// ReadProcessMemory copies the data in the specified address range from the address space of the specified process
-        /// into the specified buffer of the current process. Any process that has a handle with PROCESS_VM_READ access can
-        /// call the function. The entire area to be read must be accessible, and if it is not accessible, the function fails.
+        /// An exclamation-point icon appears in the message box.
         /// </summary>
-        /// <param name="hProcess">
-        /// A handle to the process with memory that is being read. The handle must have PROCESS_VM_READ access to the process.
-        /// </param>
-        /// <param name="lpBaseAddress">
-        /// A pointer to the base address in the specified process from which to read. Before any data transfer occurs, the
-        /// system verifies that all data in the base address and memory of the specified size is accessible for read access,
-        /// and if it is not accessible the function fails.
-        /// </param>
-        /// <param name="lpBuffer">
-        /// A pointer to a buffer that receives the contents from the address space of the specified process.
-        /// </param>
-        /// <param name="dwSize">
-        /// The number of bytes to be read from the specified process.
-        /// </param>
-        /// <param name="lpNumberOfBytesRead">
-        /// A pointer to a variable that receives the number of bytes transferred into the specified buffer. If lpNumberOfBytesRead
-        /// is NULL, the parameter is ignored.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is nonzero. If the function fails, the return value is 0 (zero). To get
-        /// extended error information, call GetLastError. The function fails if the requested read operation crosses into an
-        /// area of the process that is inaccessible.
-        /// </returns>
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern bool ReadProcessMemory(
-            IntPtr hProcess,
-            IntPtr lpBaseAddress,
-            IntPtr lpBuffer,
-            int dwSize,
-            out IntPtr lpNumberOfBytesRead);
+        IconExclamation = 0x30,
 
         /// <summary>
-        /// ReadProcessMemory copies the data in the specified address range from the address space of the specified process
-        /// into the specified buffer of the current process. Any process that has a handle with PROCESS_VM_READ access can
-        /// call the function. The entire area to be read must be accessible, and if it is not accessible, the function fails.
+        /// An exclamation-point icon appears in the message box.
         /// </summary>
-        /// <param name="hProcess">
-        /// A handle to the process with memory that is being read. The handle must have PROCESS_VM_READ access to the process.
-        /// </param>
-        /// <param name="lpBaseAddress">
-        /// A pointer to the base address in the specified process from which to read. Before any data transfer occurs, the
-        /// system verifies that all data in the base address and memory of the specified size is accessible for read access,
-        /// and if it is not accessible the function fails.
-        /// </param>
-        /// <param name="lpBuffer">
-        /// A pointer to a buffer that receives the contents from the address space of the specified process.
-        /// </param>
-        /// <param name="dwSize">
-        /// The number of bytes to be read from the specified process.
-        /// </param>
-        /// <param name="lpNumberOfBytesRead">
-        /// A pointer to a variable that receives the number of bytes transferred into the specified buffer. If lpNumberOfBytesRead
-        /// is NULL, the parameter is ignored.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is nonzero. If the function fails, the return value is 0 (zero). To get
-        /// extended error information, call GetLastError. The function fails if the requested read operation crosses into an
-        /// area of the process that is inaccessible.
-        /// </returns>
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern bool ReadProcessMemory(
-            IntPtr hProcess,
-            IntPtr lpBaseAddress,
-            byte[] lpBuffer,
-            int dwSize,
-            out IntPtr lpNumberOfBytesRead);
+        IconWarning = IconExclamation,
 
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/errhandlingapi/nf-errhandlingapi-seterrormode.
-        /// Controls whether the system will handle the specified types of serious errors or whether the process will handle
-        /// them.
+        /// An icon consisting of a lowercase letter i in a circle appears in the message box.
         /// </summary>
-        /// <param name="uMode">
-        /// The process error mode. This parameter can be one or more of the ErrorMode enum values.
-        /// </param>
-        /// <returns>
-        /// The return value is the previous state of the error-mode bit flags.
-        /// </returns>
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern ErrorModes SetErrorMode(ErrorModes uMode);
+        IconInformation = 0x40,
 
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/errhandlingapi/nf-errhandlingapi-setunhandledexceptionfilter.
-        /// Enables an application to supersede the top-level exception handler of each thread of a process. After calling this
-        /// function, if an exception occurs in a process that is not being debugged, and the exception makes it to the unhandled
-        /// exception filter, that filter will call the exception filter function specified by the lpTopLevelExceptionFilter
-        /// parameter.
+        /// An icon consisting of a lowercase letter i in a circle appears in the message box.
         /// </summary>
-        /// <param name="lpTopLevelExceptionFilter">
-        /// A pointer to a top-level exception filter function that will be called whenever the UnhandledExceptionFilter function
-        /// gets control, and the process is not being debugged. A value of NULL for this parameter specifies default handling
-        /// within UnhandledExceptionFilter. The filter function has syntax similar to that of UnhandledExceptionFilter: It
-        /// takes a single parameter of type LPEXCEPTION_POINTERS, has a WINAPI calling convention, and returns a value of type
-        /// LONG. The filter function should return one of the EXCEPTION_* enum values.
-        /// </param>
-        /// <returns>
-        /// The SetUnhandledExceptionFilter function returns the address of the previous exception filter established with the
-        /// function. A NULL return value means that there is no current top-level exception handler.
-        /// </returns>
-        [DllImport("kernel32.dll")]
-        public static extern IntPtr SetUnhandledExceptionFilter(IntPtr lpTopLevelExceptionFilter);
+        IconAsterisk = IconInformation,
 
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-virtualalloc.
-        /// Reserves, commits, or changes the state of a region of pages in the virtual address space of the calling process.
-        /// Memory allocated by this function is automatically initialized to zero. To allocate memory in the address space
-        /// of another process, use the VirtualAllocEx function.
+        /// A question-mark icon appears in the message box.
+        /// The question-mark message icon is no longer recommended because it does not clearly represent a specific type
+        /// of message and because the phrasing of a message as a question could apply to any message type. In addition,
+        /// users can confuse the message symbol question mark with Help information. Therefore, do not use this question
+        /// mark message symbol in your message boxes. The system continues to support its inclusion only for backward
+        /// compatibility.
         /// </summary>
-        /// <param name="lpAddress">
-        /// The starting address of the region to allocate. If the memory is being reserved, the specified address is rounded
-        /// down to the nearest multiple of the allocation granularity. If the memory is already reserved and is being committed,
-        /// the address is rounded down to the next page boundary. To determine the size of a page and the allocation granularity
-        /// on the host computer, use the GetSystemInfo function. If this parameter is NULL, the system determines where to
-        /// allocate the region. If this address is within an enclave that you have not initialized by calling InitializeEnclave,
-        /// VirtualAlloc allocates a page of zeros for the enclave at that address. The page must be previously uncommitted,
-        /// and will not be measured with the EEXTEND instruction of the Intel Software Guard Extensions programming model.
-        /// If the address in within an enclave that you initialized, then the allocation operation fails with the
-        /// ERROR_INVALID_ADDRESS error.
-        /// </param>
-        /// <param name="dwSize">
-        /// The size of the region, in bytes. If the lpAddress parameter is NULL, this value is rounded up to the next page
-        /// boundary. Otherwise, the allocated pages include all pages containing one or more bytes in the range from lpAddress
-        /// to lpAddress+dwSize. This means that a 2-byte range straddling a page boundary causes both pages to be included
-        /// in the allocated region.
-        /// </param>
-        /// <param name="flAllocationType">
-        /// The type of memory allocation. This parameter must contain one of the MEM_* enum values.
-        /// </param>
-        /// <param name="flProtect">
-        /// The memory protection for the region of pages to be allocated. If the pages are being committed, you can specify
-        /// any one of the memory protection constants.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is the base address of the allocated region of pages. If the function
-        /// fails, the return value is NULL.To get extended error information, call GetLastError.
-        /// </returns>
-        [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
-        public static extern IntPtr VirtualAlloc(
-            IntPtr lpAddress,
-            UIntPtr dwSize,
-            AllocationType flAllocationType,
-            MemoryProtection flProtect);
-
-        /// <inheritdoc cref="VirtualAlloc(IntPtr, UIntPtr, AllocationType, MemoryProtection)"/>
-        [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
-        public static extern IntPtr VirtualAlloc(
-            IntPtr lpAddress,
-            UIntPtr dwSize,
-            AllocationType flAllocationType,
-            Memory.MemoryProtection flProtect);
+        IconQuestion = 0x20,
 
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-virtualfree.
-        /// Releases, decommits, or releases and decommits a region of pages within the virtual address space of the calling
-        /// process.
-        /// process.
+        /// A stop-sign icon appears in the message box.
         /// </summary>
-        /// <param name="lpAddress">
-        /// A pointer to the base address of the region of pages to be freed. If the dwFreeType parameter is MEM_RELEASE, this
-        /// parameter must be the base address returned by the VirtualAlloc function when the region of pages is reserved.
-        /// </param>
-        /// <param name="dwSize">
-        /// The size of the region of memory to be freed, in bytes. If the dwFreeType parameter is MEM_RELEASE, this parameter
-        /// must be 0 (zero). The function frees the entire region that is reserved in the initial allocation call to VirtualAlloc.
-        /// If the dwFreeType parameter is MEM_DECOMMIT, the function decommits all memory pages that contain one or more bytes
-        /// in the range from the lpAddress parameter to (lpAddress+dwSize). This means, for example, that a 2-byte region of
-        /// memory that straddles a page boundary causes both pages to be decommitted.If lpAddress is the base address returned
-        /// by VirtualAlloc and dwSize is 0 (zero), the function decommits the entire region that is allocated by VirtualAlloc.
-        /// After that, the entire region is in the reserved state.
-        /// </param>
-        /// <param name="dwFreeType">
-        /// The type of free operation. This parameter must be one of the MEM_* enum values.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is a nonzero value. If the function fails, the return value is 0 (zero).
-        /// To get extended error information, call GetLastError.
-        /// </returns>
-        [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
-        public static extern bool VirtualFree(
-            IntPtr lpAddress,
-            UIntPtr dwSize,
-            AllocationType dwFreeType);
+        IconStop = 0x10,
 
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-virtualprotect.
-        /// Changes the protection on a region of committed pages in the virtual address space of the calling process.
+        /// A stop-sign icon appears in the message box.
         /// </summary>
-        /// <param name="lpAddress">
-        /// The address of the starting page of the region of pages whose access protection attributes are to be changed. All
-        /// pages in the specified region must be within the same reserved region allocated when calling the VirtualAlloc or
-        /// VirtualAllocEx function using MEM_RESERVE. The pages cannot span adjacent reserved regions that were allocated by
-        /// separate calls to VirtualAlloc or VirtualAllocEx using MEM_RESERVE.
-        /// </param>
-        /// <param name="dwSize">
-        /// The size of the region whose access protection attributes are to be changed, in bytes. The region of affected pages
-        /// includes all pages containing one or more bytes in the range from the lpAddress parameter to (lpAddress+dwSize).
-        /// This means that a 2-byte range straddling a page boundary causes the protection attributes of both pages to be changed.
-        /// </param>
-        /// <param name="flNewProtection">
-        /// The memory protection option. This parameter can be one of the memory protection constants. For mapped views, this
-        /// value must be compatible with the access protection specified when the view was mapped (see MapViewOfFile,
-        /// MapViewOfFileEx, and MapViewOfFileExNuma).
-        /// </param>
-        /// <param name="lpflOldProtect">
-        /// A pointer to a variable that receives the previous access protection value of the first page in the specified region
-        /// of pages. If this parameter is NULL or does not point to a valid variable, the function fails.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is nonzero. If the function fails, the return value is zero.
-        /// To get extended error information, call GetLastError.
-        /// </returns>
-        [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
-        public static extern bool VirtualProtect(
-            IntPtr lpAddress,
-            UIntPtr dwSize,
-            MemoryProtection flNewProtection,
-            out MemoryProtection lpflOldProtect);
-
-        /// <inheritdoc cref="VirtualAlloc(IntPtr, UIntPtr, AllocationType, MemoryProtection)"/>
-        [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
-        public static extern bool VirtualProtect(
-            IntPtr lpAddress,
-            UIntPtr dwSize,
-            Memory.MemoryProtection flNewProtection,
-            out Memory.MemoryProtection lpflOldProtect);
+        IconError = IconStop,
 
         /// <summary>
-        /// Writes data to an area of memory in a specified process. The entire area to be written to must be accessible or
-        /// the operation fails.
+        /// A stop-sign icon appears in the message box.
         /// </summary>
-        /// <param name="hProcess">
-        /// A handle to the process memory to be modified. The handle must have PROCESS_VM_WRITE and PROCESS_VM_OPERATION access
-        /// to the process.
-        /// </param>
-        /// <param name="lpBaseAddress">
-        /// A pointer to the base address in the specified process to which data is written. Before data transfer occurs, the
-        /// system verifies that all data in the base address and memory of the specified size is accessible for write access,
-        /// and if it is not accessible, the function fails.
-        /// </param>
-        /// <param name="lpBuffer">
-        /// A pointer to the buffer that contains data to be written in the address space of the specified process.
-        /// </param>
-        /// <param name="dwSize">
-        /// The number of bytes to be written to the specified process.
-        /// </param>
-        /// <param name="lpNumberOfBytesWritten">
-        /// A pointer to a variable that receives the number of bytes transferred into the specified process. This parameter
-        /// is optional. If lpNumberOfBytesWritten is NULL, the parameter is ignored.
-        /// </param>
-        /// <returns>
-        /// If the function succeeds, the return value is nonzero. If the function fails, the return value is 0 (zero). To get
-        /// extended error information, call GetLastError.The function fails if the requested write operation crosses into an
-        /// area of the process that is inaccessible.
-        /// </returns>
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern bool WriteProcessMemory(
-            IntPtr hProcess,
-            IntPtr lpBaseAddress,
-            byte[] lpBuffer,
-            int dwSize,
-            out IntPtr lpNumberOfBytesWritten);
+        IconHand = IconStop,
+
+        // To indicate the default button, specify one of the following values.
 
         /// <summary>
-        /// Get a handle to the current process.
+        /// The first button is the default button.
+        /// MB_DEFBUTTON1 is the default unless MB_DEFBUTTON2, MB_DEFBUTTON3, or MB_DEFBUTTON4 is specified.
         /// </summary>
-        /// <returns>Handle to the process.</returns>
-        [DllImport("kernel32.dll")]
-        public static extern IntPtr GetCurrentProcess();
+        DefButton1 = DefaultValue,
 
         /// <summary>
-        /// Get the current process ID.
+        /// The second button is the default button.
         /// </summary>
-        /// <returns>The process ID.</returns>
-        [DllImport("kernel32.dll")]
-        public static extern uint GetCurrentProcessId();
+        DefButton2 = 0x100,
 
         /// <summary>
-        /// Get the current thread ID.
+        /// The third button is the default button.
         /// </summary>
-        /// <returns>The thread ID.</returns>
-        [DllImport("kernel32.dll")]
-        public static extern uint GetCurrentThreadId();
+        DefButton3 = 0x200,
+
+        /// <summary>
+        /// The fourth button is the default button.
+        /// </summary>
+        DefButton4 = 0x300,
+
+        // To indicate the modality of the dialog box, specify one of the following values.
+
+        /// <summary>
+        /// The user must respond to the message box before continuing work in the window identified by the hWnd parameter.
+        /// However, the user can move to the windows of other threads and work in those windows. Depending on the hierarchy
+        /// of windows in the application, the user may be able to move to other windows within the thread. All child windows
+        /// of the parent of the message box are automatically disabled, but pop-up windows are not. MB_APPLMODAL is the
+        /// default if neither MB_SYSTEMMODAL nor MB_TASKMODAL is specified.
+        /// </summary>
+        ApplModal = DefaultValue,
+
+        /// <summary>
+        /// Same as MB_APPLMODAL except that the message box has the WS_EX_TOPMOST style.
+        /// Use system-modal message boxes to notify the user of serious, potentially damaging errors that require immediate
+        /// attention (for example, running out of memory). This flag has no effect on the user's ability to interact with
+        /// windows other than those associated with hWnd.
+        /// </summary>
+        SystemModal = 0x1000,
+
+        /// <summary>
+        /// Same as MB_APPLMODAL except that all the top-level windows belonging to the current thread are disabled if the
+        /// hWnd parameter is NULL. Use this flag when the calling application or library does not have a window handle
+        /// available but still needs to prevent input to other windows in the calling thread without suspending other threads.
+        /// </summary>
+        TaskModal = 0x2000,
+
+        // To specify other options, use one or more of the following values.
+
+        /// <summary>
+        /// Same as desktop of the interactive window station. For more information, see Window Stations. If the current
+        /// input desktop is not the default desktop, MessageBox does not return until the user switches to the default
+        /// desktop.
+        /// </summary>
+        DefaultDesktopOnly = 0x20000,
+
+        /// <summary>
+        /// The text is right-justified.
+        /// </summary>
+        Right = 0x80000,
+
+        /// <summary>
+        /// Displays message and caption text using right-to-left reading order on Hebrew and Arabic systems.
+        /// </summary>
+        RtlReading = 0x100000,
+
+        /// <summary>
+        /// The message box becomes the foreground window. Internally, the system calls the SetForegroundWindow function
+        /// for the message box.
+        /// </summary>
+        SetForeground = 0x10000,
+
+        /// <summary>
+        /// The message box is created with the WS_EX_TOPMOST window style.
+        /// </summary>
+        Topmost = 0x40000,
+
+        /// <summary>
+        /// The caller is a service notifying the user of an event. The function displays a message box on the current active
+        /// desktop, even if there is no user logged on to the computer.
+        /// </summary>
+        ServiceNotification = 0x200000,
     }
 
     /// <summary>
-    /// Native dbghelp functions.
+    /// GWL_* from winuser.
     /// </summary>
-    [SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "Native funcs")]
-    internal static partial class NativeFunctions
+    public enum WindowLongType
     {
         /// <summary>
-        /// Type of minidump to create.
+        /// Sets a new extended window style.
         /// </summary>
-        public enum MiniDumpType : int
-        {
-            /// <summary>
-            /// Normal minidump.
-            /// </summary>
-            MiniDumpNormal,
-
-            /// <summary>
-            /// Minidump with data segments.
-            /// </summary>
-            MiniDumpWithDataSegs,
-
-            /// <summary>
-            /// Minidump with full memory.
-            /// </summary>
-            MiniDumpWithFullMemory,
-        }
+        ExStyle = -20,
 
         /// <summary>
-        /// Initializes the symbol handler for a process.
+        /// Sets a new application instance handle.
         /// </summary>
-        /// <param name="hProcess">
-        /// A handle that identifies the caller.
-        /// This value should be unique and nonzero, but need not be a process handle.
-        /// However, if you do use a process handle, be sure to use the correct handle.
-        /// If the application is a debugger, use the process handle for the process being debugged.
-        /// Do not use the handle returned by GetCurrentProcess when debugging another process, because calling functions like SymLoadModuleEx can have unexpected results.
-        /// This parameter cannot be NULL.</param>
-        /// <param name="userSearchPath">
-        /// The path, or series of paths separated by a semicolon (;), that is used to search for symbol files.
-        /// If this parameter is NULL, the library attempts to form a symbol path from the following sources:
-        ///    - The current working directory of the application
-        ///    - The _NT_SYMBOL_PATH environment variable
-        ///    - The _NT_ALTERNATE_SYMBOL_PATH environment variable
-        /// Note that the search path can also be set using the SymSetSearchPath function.
-        /// </param>
-        /// <param name="fInvadeProcess">
-        /// If this value is <see langword="true"/>, enumerates the loaded modules for the process and effectively calls the SymLoadModule64 function for each module.
-        /// </param>
-        /// <returns>Whether or not the function succeeded.</returns>
-        [DllImport("dbghelp.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool SymInitialize(IntPtr hProcess, string userSearchPath, bool fInvadeProcess);
+        HInstance = -6,
 
         /// <summary>
-        /// Deallocates all resources associated with the process handle.
+        /// Sets a new identifier of the child window.The window cannot be a top-level window.
         /// </summary>
-        /// <param name="hProcess">A handle to the process that was originally passed to the <seealso cref="SymInitialize"/> function.</param>
-        /// <returns>Whether or not the function succeeded.</returns>
-        [DllImport("dbghelp.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool SymCleanup(IntPtr hProcess);
+        Id = -12,
 
         /// <summary>
-        /// Creates a minidump.
+        /// Sets a new window style.
         /// </summary>
-        /// <param name="hProcess">Target process handle.</param>
-        /// <param name="processId">Target process ID.</param>
-        /// <param name="hFile">Output file handle.</param>
-        /// <param name="dumpType">Type of dump to take.</param>
-        /// <param name="exceptionInfo">Exception information.</param>
-        /// <param name="userStreamParam">User information.</param>
-        /// <param name="callback">Callback.</param>
-        /// <returns>Whether or not the minidump succeeded.</returns>
-        [DllImport("dbghelp.dll")]
-        public static extern bool MiniDumpWriteDump(IntPtr hProcess, uint processId, IntPtr hFile, int dumpType, ref MinidumpExceptionInformation exceptionInfo, IntPtr userStreamParam, IntPtr callback);
+        Style = -16,
 
         /// <summary>
-        /// Structure describing minidump exception information.
+        /// Sets the user data associated with the window. This data is intended for use by the application that created the window. Its value is initially zero.
         /// </summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 4)]
-        public struct MinidumpExceptionInformation
-        {
-            /// <summary>
-            /// ID of the thread that caused the exception.
-            /// </summary>
-            public uint ThreadId;
-
-            /// <summary>
-            /// Pointer to the exception record.
-            /// </summary>
-            public IntPtr ExceptionPointers;
-
-            /// <summary>
-            /// ClientPointers field.
-            /// </summary>
-            public int ClientPointers;
-        }
+        UserData = -21,
 
         /// <summary>
-        /// Finds window according to conditions.
+        /// Sets a new address for the window procedure.
         /// </summary>
-        /// <param name="parentHandle">Handle to parent window.</param>
-        /// <param name="childAfter">Window to search after.</param>
-        /// <param name="className">Name of class.</param>
-        /// <param name="windowTitle">Name of window.</param>
-        /// <returns>Found window, or null.</returns>
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern IntPtr FindWindowEx(
-            IntPtr parentHandle,
-            IntPtr childAfter,
-            string className,
-            IntPtr windowTitle);
+        WndProc = -4,
+
+        // The following values are also available when the hWnd parameter identifies a dialog box.
+
+        // /// <summary>
+        // /// Sets the new pointer to the dialog box procedure.
+        // /// </summary>
+        // DWLP_DLGPROC = DWLP_MSGRESULT + sizeof(LRESULT),
+
+        /// <summary>
+        /// Sets the return value of a message processed in the dialog box procedure.
+        /// </summary>
+        MsgResult = 0,
+
+        // /// <summary>
+        // /// Sets new extra information that is private to the application, such as handles or pointers.
+        // /// </summary>
+        // DWLP_USER = DWLP_DLGPROC + sizeof(DLGPROC),
     }
 
     /// <summary>
-    /// Native ws2_32 functions.
+    /// WM_* from winuser.
+    /// These are spread throughout multiple files, find the documentation manually if you need it.
+    /// https://gist.github.com/amgine/2395987.
     /// </summary>
-    internal static partial class NativeFunctions
+    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1602:Enumeration items should be documented", Justification = "No documentation available.")]
+    public enum WindowsMessage
+    {
+        WM_NULL = 0x0000,
+        WM_CREATE = 0x0001,
+        WM_DESTROY = 0x0002,
+        WM_MOVE = 0x0003,
+        WM_SIZE = 0x0005,
+        WM_ACTIVATE = 0x0006,
+        WM_SETFOCUS = 0x0007,
+        WM_KILLFOCUS = 0x0008,
+        WM_ENABLE = 0x000A,
+        WM_SETREDRAW = 0x000B,
+        WM_SETTEXT = 0x000C,
+        WM_GETTEXT = 0x000D,
+        WM_GETTEXTLENGTH = 0x000E,
+        WM_PAINT = 0x000F,
+        WM_CLOSE = 0x0010,
+        WM_QUERYENDSESSION = 0x0011,
+        WM_QUERYOPEN = 0x0013,
+        WM_ENDSESSION = 0x0016,
+        WM_QUIT = 0x0012,
+        WM_ERASEBKGND = 0x0014,
+        WM_SYSCOLORCHANGE = 0x0015,
+        WM_SHOWWINDOW = 0x0018,
+        WM_WININICHANGE = 0x001A,
+        WM_SETTINGCHANGE = WM_WININICHANGE,
+        WM_DEVMODECHANGE = 0x001B,
+        WM_ACTIVATEAPP = 0x001C,
+        WM_FONTCHANGE = 0x001D,
+        WM_TIMECHANGE = 0x001E,
+        WM_CANCELMODE = 0x001F,
+        WM_SETCURSOR = 0x0020,
+        WM_MOUSEACTIVATE = 0x0021,
+        WM_CHILDACTIVATE = 0x0022,
+        WM_QUEUESYNC = 0x0023,
+        WM_GETMINMAXINFO = 0x0024,
+        WM_PAINTICON = 0x0026,
+        WM_ICONERASEBKGND = 0x0027,
+        WM_NEXTDLGCTL = 0x0028,
+        WM_SPOOLERSTATUS = 0x002A,
+        WM_DRAWITEM = 0x002B,
+        WM_MEASUREITEM = 0x002C,
+        WM_DELETEITEM = 0x002D,
+        WM_VKEYTOITEM = 0x002E,
+        WM_CHARTOITEM = 0x002F,
+        WM_SETFONT = 0x0030,
+        WM_GETFONT = 0x0031,
+        WM_SETHOTKEY = 0x0032,
+        WM_GETHOTKEY = 0x0033,
+        WM_QUERYDRAGICON = 0x0037,
+        WM_COMPAREITEM = 0x0039,
+        WM_GETOBJECT = 0x003D,
+        WM_COMPACTING = 0x0041,
+        WM_COMMNOTIFY = 0x0044,
+        WM_WINDOWPOSCHANGING = 0x0046,
+        WM_WINDOWPOSCHANGED = 0x0047,
+        WM_POWER = 0x0048,
+        WM_COPYDATA = 0x004A,
+        WM_CANCELJOURNAL = 0x004B,
+        WM_NOTIFY = 0x004E,
+        WM_INPUTLANGCHANGEREQUEST = 0x0050,
+        WM_INPUTLANGCHANGE = 0x0051,
+        WM_TCARD = 0x0052,
+        WM_HELP = 0x0053,
+        WM_USERCHANGED = 0x0054,
+        WM_NOTIFYFORMAT = 0x0055,
+        WM_CONTEXTMENU = 0x007B,
+        WM_STYLECHANGING = 0x007C,
+        WM_STYLECHANGED = 0x007D,
+        WM_DISPLAYCHANGE = 0x007E,
+        WM_GETICON = 0x007F,
+        WM_SETICON = 0x0080,
+        WM_NCCREATE = 0x0081,
+        WM_NCDESTROY = 0x0082,
+        WM_NCCALCSIZE = 0x0083,
+        WM_NCHITTEST = 0x0084,
+        WM_NCPAINT = 0x0085,
+        WM_NCACTIVATE = 0x0086,
+        WM_GETDLGCODE = 0x0087,
+        WM_SYNCPAINT = 0x0088,
+
+        WM_NCMOUSEMOVE = 0x00A0,
+        WM_NCLBUTTONDOWN = 0x00A1,
+        WM_NCLBUTTONUP = 0x00A2,
+        WM_NCLBUTTONDBLCLK = 0x00A3,
+        WM_NCRBUTTONDOWN = 0x00A4,
+        WM_NCRBUTTONUP = 0x00A5,
+        WM_NCRBUTTONDBLCLK = 0x00A6,
+        WM_NCMBUTTONDOWN = 0x00A7,
+        WM_NCMBUTTONUP = 0x00A8,
+        WM_NCMBUTTONDBLCLK = 0x00A9,
+        WM_NCXBUTTONDOWN = 0x00AB,
+        WM_NCXBUTTONUP = 0x00AC,
+        WM_NCXBUTTONDBLCLK = 0x00AD,
+
+        WM_INPUT_DEVICE_CHANGE = 0x00FE,
+        WM_INPUT = 0x00FF,
+
+        WM_KEYFIRST = 0x0100,
+        WM_KEYDOWN = WM_KEYFIRST,
+        WM_KEYUP = 0x0101,
+        WM_CHAR = 0x0102,
+        WM_DEADCHAR = 0x0103,
+        WM_SYSKEYDOWN = 0x0104,
+        WM_SYSKEYUP = 0x0105,
+        WM_SYSCHAR = 0x0106,
+        WM_SYSDEADCHAR = 0x0107,
+        WM_UNICHAR = 0x0109,
+        WM_KEYLAST = WM_UNICHAR,
+
+        WM_IME_STARTCOMPOSITION = 0x010D,
+        WM_IME_ENDCOMPOSITION = 0x010E,
+        WM_IME_COMPOSITION = 0x010F,
+        WM_IME_KEYLAST = WM_IME_COMPOSITION,
+
+        WM_INITDIALOG = 0x0110,
+        WM_COMMAND = 0x0111,
+        WM_SYSCOMMAND = 0x0112,
+        WM_TIMER = 0x0113,
+        WM_HSCROLL = 0x0114,
+        WM_VSCROLL = 0x0115,
+        WM_INITMENU = 0x0116,
+        WM_INITMENUPOPUP = 0x0117,
+        WM_MENUSELECT = 0x011F,
+        WM_MENUCHAR = 0x0120,
+        WM_ENTERIDLE = 0x0121,
+        WM_MENURBUTTONUP = 0x0122,
+        WM_MENUDRAG = 0x0123,
+        WM_MENUGETOBJECT = 0x0124,
+        WM_UNINITMENUPOPUP = 0x0125,
+        WM_MENUCOMMAND = 0x0126,
+
+        WM_CHANGEUISTATE = 0x0127,
+        WM_UPDATEUISTATE = 0x0128,
+        WM_QUERYUISTATE = 0x0129,
+
+        WM_CTLCOLORMSGBOX = 0x0132,
+        WM_CTLCOLOREDIT = 0x0133,
+        WM_CTLCOLORLISTBOX = 0x0134,
+        WM_CTLCOLORBTN = 0x0135,
+        WM_CTLCOLORDLG = 0x0136,
+        WM_CTLCOLORSCROLLBAR = 0x0137,
+        WM_CTLCOLORSTATIC = 0x0138,
+        MN_GETHMENU = 0x01E1,
+
+        WM_MOUSEFIRST = 0x0200,
+        WM_MOUSEMOVE = WM_MOUSEFIRST,
+        WM_LBUTTONDOWN = 0x0201,
+        WM_LBUTTONUP = 0x0202,
+        WM_LBUTTONDBLCLK = 0x0203,
+        WM_RBUTTONDOWN = 0x0204,
+        WM_RBUTTONUP = 0x0205,
+        WM_RBUTTONDBLCLK = 0x0206,
+        WM_MBUTTONDOWN = 0x0207,
+        WM_MBUTTONUP = 0x0208,
+        WM_MBUTTONDBLCLK = 0x0209,
+        WM_MOUSEWHEEL = 0x020A,
+        WM_XBUTTONDOWN = 0x020B,
+        WM_XBUTTONUP = 0x020C,
+        WM_XBUTTONDBLCLK = 0x020D,
+        WM_MOUSEHWHEEL = 0x020E,
+
+        WM_PARENTNOTIFY = 0x0210,
+        WM_ENTERMENULOOP = 0x0211,
+        WM_EXITMENULOOP = 0x0212,
+
+        WM_NEXTMENU = 0x0213,
+        WM_SIZING = 0x0214,
+        WM_CAPTURECHANGED = 0x0215,
+        WM_MOVING = 0x0216,
+
+        WM_POWERBROADCAST = 0x0218,
+
+        WM_DEVICECHANGE = 0x0219,
+
+        WM_MDICREATE = 0x0220,
+        WM_MDIDESTROY = 0x0221,
+        WM_MDIACTIVATE = 0x0222,
+        WM_MDIRESTORE = 0x0223,
+        WM_MDINEXT = 0x0224,
+        WM_MDIMAXIMIZE = 0x0225,
+        WM_MDITILE = 0x0226,
+        WM_MDICASCADE = 0x0227,
+        WM_MDIICONARRANGE = 0x0228,
+        WM_MDIGETACTIVE = 0x0229,
+
+        WM_MDISETMENU = 0x0230,
+        WM_ENTERSIZEMOVE = 0x0231,
+        WM_EXITSIZEMOVE = 0x0232,
+        WM_DROPFILES = 0x0233,
+        WM_MDIREFRESHMENU = 0x0234,
+
+        WM_IME_SETCONTEXT = 0x0281,
+        WM_IME_NOTIFY = 0x0282,
+        WM_IME_CONTROL = 0x0283,
+        WM_IME_COMPOSITIONFULL = 0x0284,
+        WM_IME_SELECT = 0x0285,
+        WM_IME_CHAR = 0x0286,
+        WM_IME_REQUEST = 0x0288,
+        WM_IME_KEYDOWN = 0x0290,
+        WM_IME_KEYUP = 0x0291,
+
+        WM_MOUSEHOVER = 0x02A1,
+        WM_MOUSELEAVE = 0x02A3,
+        WM_NCMOUSEHOVER = 0x02A0,
+        WM_NCMOUSELEAVE = 0x02A2,
+
+        WM_WTSSESSION_CHANGE = 0x02B1,
+
+        WM_TABLET_FIRST = 0x02c0,
+        WM_TABLET_LAST = 0x02df,
+
+        WM_CUT = 0x0300,
+        WM_COPY = 0x0301,
+        WM_PASTE = 0x0302,
+        WM_CLEAR = 0x0303,
+        WM_UNDO = 0x0304,
+        WM_RENDERFORMAT = 0x0305,
+        WM_RENDERALLFORMATS = 0x0306,
+        WM_DESTROYCLIPBOARD = 0x0307,
+        WM_DRAWCLIPBOARD = 0x0308,
+        WM_PAINTCLIPBOARD = 0x0309,
+        WM_VSCROLLCLIPBOARD = 0x030A,
+        WM_SIZECLIPBOARD = 0x030B,
+        WM_ASKCBFORMATNAME = 0x030C,
+        WM_CHANGECBCHAIN = 0x030D,
+        WM_HSCROLLCLIPBOARD = 0x030E,
+        WM_QUERYNEWPALETTE = 0x030F,
+        WM_PALETTEISCHANGING = 0x0310,
+        WM_PALETTECHANGED = 0x0311,
+        WM_HOTKEY = 0x0312,
+
+        WM_PRINT = 0x0317,
+        WM_PRINTCLIENT = 0x0318,
+
+        WM_APPCOMMAND = 0x0319,
+
+        WM_THEMECHANGED = 0x031A,
+
+        WM_CLIPBOARDUPDATE = 0x031D,
+
+        WM_DWMCOMPOSITIONCHANGED = 0x031E,
+        WM_DWMNCRENDERINGCHANGED = 0x031F,
+        WM_DWMCOLORIZATIONCOLORCHANGED = 0x0320,
+        WM_DWMWINDOWMAXIMIZEDCHANGE = 0x0321,
+
+        WM_GETTITLEBARINFOEX = 0x033F,
+
+        WM_HANDHELDFIRST = 0x0358,
+        WM_HANDHELDLAST = 0x035F,
+
+        WM_AFXFIRST = 0x0360,
+        WM_AFXLAST = 0x037F,
+
+        WM_PENWINFIRST = 0x0380,
+        WM_PENWINLAST = 0x038F,
+
+        WM_APP = 0x8000,
+
+        WM_USER = 0x0400,
+
+        WM_REFLECT = WM_USER + 0x1C00,
+    }
+
+    /// <summary>
+    /// Returns true if the current application has focus, false otherwise.
+    /// </summary>
+    /// <returns>
+    /// If the current application is focused.
+    /// </returns>
+    public static bool ApplicationIsActivated()
+    {
+        var activatedHandle = GetForegroundWindow();
+        if (activatedHandle == IntPtr.Zero)
+            return false; // No window is currently activated
+
+        _ = GetWindowThreadProcessId(activatedHandle, out var activeProcId);
+        if (Marshal.GetLastWin32Error() != 0)
+            return false;
+
+        return activeProcId == Environment.ProcessId;
+    }
+
+    /// <summary>
+    /// Passes message information to the specified window procedure.
+    /// </summary>
+    /// <param name="lpPrevWndFunc">
+    /// The previous window procedure. If this value is obtained by calling the GetWindowLong function with the nIndex parameter set to
+    /// GWL_WNDPROC or DWL_DLGPROC, it is actually either the address of a window or dialog box procedure, or a special internal value
+    /// meaningful only to CallWindowProc.
+    /// </param>
+    /// <param name="hWnd">
+    /// A handle to the window procedure to receive the message.
+    /// </param>
+    /// <param name="msg">
+    /// The message.
+    /// </param>
+    /// <param name="wParam">
+    /// Additional message-specific information. The contents of this parameter depend on the value of the Msg parameter.
+    /// </param>
+    /// <param name="lParam">
+    /// More additional message-specific information. The contents of this parameter depend on the value of the Msg parameter.
+    /// </param>
+    /// <returns>
+    /// Use the CallWindowProc function for window subclassing. Usually, all windows with the same class share one window procedure. A
+    /// subclass is a window or set of windows with the same class whose messages are intercepted and processed by another window procedure
+    /// (or procedures) before being passed to the window procedure of the class.
+    /// The SetWindowLong function creates the subclass by changing the window procedure associated with a particular window, causing the
+    /// system to call the new window procedure instead of the previous one.An application must pass any messages not processed by the new
+    /// window procedure to the previous window procedure by calling CallWindowProc.This allows the application to create a chain of window
+    /// procedures.
+    /// </returns>
+    [DllImport("user32.dll")]
+    public static extern long CallWindowProcW(IntPtr lpPrevWndFunc, IntPtr hWnd, uint msg, ulong wParam, long lParam);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-flashwindowex.
+    /// Flashes the specified window. It does not change the active state of the window.
+    /// </summary>
+    /// <param name="pwfi">
+    /// A pointer to a FLASHWINFO structure.
+    /// </param>
+    /// <returns>
+    /// The return value specifies the window's state before the call to the FlashWindowEx function. If the window caption
+    /// was drawn as active before the call, the return value is nonzero. Otherwise, the return value is zero.
+    /// </returns>
+    [DllImport("user32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool FlashWindowEx(ref FlashWindowInfo pwfi);
+
+    /// <summary>
+    /// Retrieves a handle to the foreground window (the window with which the user is currently working). The system assigns
+    /// a slightly higher priority to the thread that creates the foreground window than it does to other threads.
+    /// </summary>
+    /// <returns>
+    /// The return value is a handle to the foreground window. The foreground window can be NULL in certain circumstances,
+    /// such as when a window is losing activation.
+    /// </returns>
+    [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+    public static extern IntPtr GetForegroundWindow();
+
+    /// <summary>
+    /// Retrieves the identifier of the thread that created the specified window and, optionally, the identifier of the
+    /// process that created the window.
+    /// </summary>
+    /// <param name="handle">
+    /// A handle to the window.
+    /// </param>
+    /// <param name="processId">
+    /// A pointer to a variable that receives the process identifier. If this parameter is not NULL, GetWindowThreadProcessId
+    /// copies the identifier of the process to the variable; otherwise, it does not.
+    /// </param>
+    /// <returns>
+    /// The return value is the identifier of the thread that created the window.
+    /// </returns>
+    [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    public static extern int GetWindowThreadProcessId(IntPtr handle, out int processId);
+
+    /// <summary>
+    /// Displays a modal dialog box that contains a system icon, a set of buttons, and a brief application-specific message,
+    /// such as status or error information. The message box returns an integer value that indicates which button the user
+    /// clicked.
+    /// </summary>
+    /// <param name="hWnd">
+    /// A handle to the owner window of the message box to be created. If this parameter is NULL, the message box has no
+    /// owner window.
+    /// </param>
+    /// <param name="text">
+    /// The message to be displayed. If the string consists of more than one line, you can separate the lines using a carriage
+    /// return and/or linefeed character between each line.
+    /// </param>
+    /// <param name="caption">
+    /// The dialog box title. If this parameter is NULL, the default title is Error.</param>
+    /// <param name="type">
+    /// The contents and behavior of the dialog box. This parameter can be a combination of flags from the following groups
+    /// of flags.
+    /// </param>
+    /// <returns>
+    /// If a message box has a Cancel button, the function returns the IDCANCEL value if either the ESC key is pressed or
+    /// the Cancel button is selected. If the message box has no Cancel button, pressing ESC will no effect - unless an
+    /// MB_OK button is present. If an MB_OK button is displayed and the user presses ESC, the return value will be IDOK.
+    /// If the function fails, the return value is zero.To get extended error information, call GetLastError. If the function
+    /// succeeds, the return value is one of the ID* enum values.
+    /// </returns>
+    [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    public static extern int MessageBoxW(IntPtr hWnd, string text, string caption, MessageBoxType type);
+
+    /// <summary>
+    /// Changes an attribute of the specified window. The function also sets a value at the specified offset in the extra window memory.
+    /// </summary>
+    /// <param name="hWnd">
+    /// A handle to the window and, indirectly, the class to which the window belongs. The SetWindowLongPtr function fails if the
+    /// process that owns the window specified by the hWnd parameter is at a higher process privilege in the UIPI hierarchy than the
+    /// process the calling thread resides in.
+    /// </param>
+    /// <param name="nIndex">
+    /// The zero-based offset to the value to be set. Valid values are in the range zero through the number of bytes of extra window
+    /// memory, minus the size of a LONG_PTR. To set any other value, specify one of the values.
+    /// </param>
+    /// <param name="dwNewLong">
+    /// The replacement value.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is the previous value of the specified offset. If the function fails, the return
+    /// value is zero.To get extended error information, call GetLastError. If the previous value is zero and the function succeeds,
+    /// the return value is zero, but the function does not clear the last error information. To determine success or failure, clear
+    /// the last error information by calling SetLastError with 0, then call SetWindowLongPtr.Function failure will be indicated by
+    /// a return value of zero and a GetLastError result that is nonzero.
+    /// </returns>
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern IntPtr SetWindowLongPtrW(IntPtr hWnd, WindowLongType nIndex, IntPtr dwNewLong);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/winuser/ns-winuser-flashwinfo.
+    /// Contains the flash status for a window and the number of times the system should flash the window.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct FlashWindowInfo
     {
         /// <summary>
-        /// See https://docs.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-setsockopt.
-        /// The setsockopt function sets a socket option.
+        /// The size of the structure, in bytes.
         /// </summary>
-        /// <param name="socket">
-        /// A descriptor that identifies a socket.
-        /// </param>
-        /// <param name="level">
-        /// The level at which the option is defined (for example, SOL_SOCKET).
-        /// </param>
-        /// <param name="optName">
-        /// The socket option for which the value is to be set (for example, SO_BROADCAST). The optname parameter must be a
-        /// socket option defined within the specified level, or behavior is undefined.
-        /// </param>
-        /// <param name="optVal">
-        /// A pointer to the buffer in which the value for the requested option is specified.
-        /// </param>
-        /// <param name="optLen">
-        /// The size, in bytes, of the buffer pointed to by the optval parameter.
-        /// </param>
-        /// <returns>
-        /// If no error occurs, setsockopt returns zero. Otherwise, a value of SOCKET_ERROR is returned, and a specific error
-        /// code can be retrieved by calling WSAGetLastError.
-        /// </returns>
-        [DllImport("ws2_32.dll", CallingConvention = CallingConvention.Winapi, EntryPoint = "setsockopt")]
-        public static extern int SetSockOpt(IntPtr socket, SocketOptionLevel level, SocketOptionName optName, ref IntPtr optVal, int optLen);
+        public uint Size;
+
+        /// <summary>
+        /// A handle to the window to be flashed. The window can be either opened or minimized.
+        /// </summary>
+        public IntPtr Hwnd;
+
+        /// <summary>
+        /// The flash status. This parameter can be one or more of the FlashWindow enum values.
+        /// </summary>
+        public FlashWindow Flags;
+
+        /// <summary>
+        /// The number of times to flash the window.
+        /// </summary>
+        public uint Count;
+
+        /// <summary>
+        /// The rate at which the window is to be flashed, in milliseconds. If dwTimeout is zero, the function uses the
+        /// default cursor blink rate.
+        /// </summary>
+        public uint Timeout;
     }
 }
+
+/// <summary>
+/// Native imm32 functions.
+/// </summary>
+internal static partial class NativeFunctions
+{
+    /// <summary>
+    /// GCS_* from imm32.
+    /// These values are used with ImmGetCompositionString and WM_IME_COMPOSITION.
+    /// </summary>
+    [Flags]
+    public enum IMEComposition
+    {
+        /// <summary>
+        /// Retrieve or update the attribute of the composition string.
+        /// </summary>
+        CompAttr = 0x0010,
+
+        /// <summary>
+        /// Retrieve or update clause information of the composition string.
+        /// </summary>
+        CompClause = 0x0020,
+
+        /// <summary>
+        /// Retrieve or update the attributes of the reading string of the current composition.
+        /// </summary>
+        CompReadAttr = 0x0002,
+
+        /// <summary>
+        /// Retrieve or update the clause information of the reading string of the composition string.
+        /// </summary>
+        CompReadClause = 0x0004,
+
+        /// <summary>
+        /// Retrieve or update the reading string of the current composition.
+        /// </summary>
+        CompReadStr = 0x0001,
+
+        /// <summary>
+        /// Retrieve or update the current composition string.
+        /// </summary>
+        CompStr = 0x0008,
+
+        /// <summary>
+        /// Retrieve or update the cursor position in composition string.
+        /// </summary>
+        CursorPos = 0x0080,
+
+        /// <summary>
+        /// Retrieve or update the starting position of any changes in composition string.
+        /// </summary>
+        DeltaStart = 0x0100,
+
+        /// <summary>
+        /// Retrieve or update clause information of the result string.
+        /// </summary>
+        ResultClause = 0x1000,
+
+        /// <summary>
+        /// Retrieve or update clause information of the reading string.
+        /// </summary>
+        ResultReadClause = 0x0400,
+
+        /// <summary>
+        /// Retrieve or update the reading string.
+        /// </summary>
+        ResultReadStr = 0x0200,
+
+        /// <summary>
+        /// Retrieve or update the string of the composition result.
+        /// </summary>
+        ResultStr = 0x0800,
+    }
+
+    /// <summary>
+    /// IMN_* from imm32.
+    /// Input Method Manager Commands, this enum is not exhaustive.
+    /// </summary>
+    public enum IMECommand
+    {
+        /// <summary>
+        /// Notifies the application when an IME is about to change the content of the candidate window.
+        /// </summary>
+        ChangeCandidate = 0x0003,
+
+        /// <summary>
+        /// Notifies an application when an IME is about to close the candidates window.
+        /// </summary>
+        CloseCandidate = 0x0004,
+
+        /// <summary>
+        /// Notifies an application when an IME is about to open the candidate window.
+        /// </summary>
+        OpenCandidate = 0x0005,
+
+        /// <summary>
+        /// Notifies an application when the conversion mode of the input context is updated.
+        /// </summary>
+        SetConversionMode = 0x0006,
+    }
+
+    /// <summary>
+    /// Returns the input context associated with the specified window.
+    /// </summary>
+    /// <param name="hWnd">Unnamed parameter 1.</param>
+    /// <returns>
+    /// Returns the handle to the input context.
+    /// </returns>
+    [DllImport("imm32.dll")]
+    public static extern IntPtr ImmGetContext(IntPtr hWnd);
+
+    /// <summary>
+    /// Retrieves information about the composition string.
+    /// </summary>
+    /// <param name="hImc">
+    /// Unnamed parameter 1.
+    /// </param>
+    /// <param name="arg2">
+    /// Unnamed parameter 2.
+    /// </param>
+    /// <param name="lpBuf">
+    /// Pointer to a buffer in which the function retrieves the composition string information.
+    /// </param>
+    /// <param name="dwBufLen">
+    /// Size, in bytes, of the output buffer, even if the output is a Unicode string. The application sets this parameter to 0
+    /// if the function is to return the size of the required output buffer.
+    /// </param>
+    /// <returns>
+    /// Returns the number of bytes copied to the output buffer. If dwBufLen is set to 0, the function returns the buffer size,
+    /// in bytes, required to receive all requested information, excluding the terminating null character. The return value is
+    /// always the size, in bytes, even if the requested data is a Unicode string.
+    /// This function returns one of the following negative error codes if it does not succeed:
+    /// - IMM_ERROR_NODATA.Composition data is not ready in the input context.
+    /// - IMM_ERROR_GENERAL.General error detected by IME.
+    /// </returns>
+    [DllImport("imm32.dll")]
+    public static extern long ImmGetCompositionStringW(IntPtr hImc, IMEComposition arg2, IntPtr lpBuf, uint dwBufLen);
+
+    /// <summary>
+    /// Retrieves a candidate list.
+    /// </summary>
+    /// <param name="hImc">
+    /// Unnamed parameter 1.
+    /// </param>
+    /// <param name="deIndex">
+    /// Zero-based index of the candidate list.
+    /// </param>
+    /// <param name="lpCandList">
+    /// Pointer to a CANDIDATELIST structure in which the function retrieves the candidate list.
+    /// </param>
+    /// <param name="dwBufLen">
+    /// Size, in bytes, of the buffer to receive the candidate list. The application can specify 0 for this parameter if the
+    /// function is to return the required size of the output buffer only.
+    /// </param>
+    /// <returns>
+    /// Returns the number of bytes copied to the candidate list buffer if successful. If the application has supplied 0 for
+    /// the dwBufLen parameter, the function returns the size required for the candidate list buffer. The function returns 0
+    /// if it does not succeed.
+    /// </returns>
+    [DllImport("imm32.dll")]
+    public static extern long ImmGetCandidateListW(IntPtr hImc, uint deIndex, IntPtr lpCandList, uint dwBufLen);
+
+    /// <summary>
+    /// Sets the position of the composition window.
+    /// </summary>
+    /// <param name="hImc">
+    /// Unnamed parameter 1.
+    /// </param>
+    /// <param name="frm">
+    /// Pointer to a COMPOSITIONFORM structure that contains the new position and other related information about
+    /// the composition window.
+    /// </param>
+    /// <returns>
+    /// Returns a nonzero value if successful, or 0 otherwise.
+    /// </returns>
+    [DllImport("imm32.dll", CharSet = CharSet.Auto)]
+    public static extern bool ImmSetCompositionWindow(IntPtr hImc, ref CompositionForm frm);
+
+    /// <summary>
+    /// Releases the input context and unlocks the memory associated in the input context. An application must call this
+    /// function for each call to the ImmGetContext function.
+    /// </summary>
+    /// <param name="hwnd">
+    /// Unnamed parameter 1.
+    /// </param>
+    /// <param name="hImc">
+    /// Unnamed parameter 2.
+    /// </param>
+    /// <returns>
+    /// Returns a nonzero value if successful, or 0 otherwise.
+    /// </returns>
+    [DllImport("imm32.dll", CharSet = CharSet.Auto)]
+    public static extern bool ImmReleaseContext(IntPtr hwnd, IntPtr hImc);
+
+    /// <summary>
+    /// Contains information about a candidate list.
+    /// </summary>
+    public struct CandidateList
+    {
+        /// <summary>
+        /// Size, in bytes, of the structure, the offset array, and all candidate strings.
+        /// </summary>
+        public int Size;
+
+        /// <summary>
+        /// Candidate style values. This member can have one or more of the IME_CAND_* values.
+        /// </summary>
+        public int Style;
+
+        /// <summary>
+        /// Number of candidate strings.
+        /// </summary>
+        public int Count;
+
+        /// <summary>
+        /// Index of the selected candidate string.
+        /// </summary>
+        public int Selection;
+
+        /// <summary>
+        /// Index of the first candidate string in the candidate window. This varies as the user presses the PAGE UP and PAGE DOWN keys.
+        /// </summary>
+        public int PageStart;
+
+        /// <summary>
+        /// Number of candidate strings to be shown in one page in the candidate window. The user can move to the next page by pressing IME-defined keys, such as the PAGE UP or PAGE DOWN key. If this number is 0, an application can define a proper value by itself.
+        /// </summary>
+        public int PageSize;
+
+        // /// <summary>
+        // /// Offset to the start of the first candidate string, relative to the start of this structure. The offsets
+        // /// for subsequent strings immediately follow this member, forming an array of 32-bit offsets.
+        // /// </summary>
+        // public IntPtr Offset; // manually handle
+    }
+
+    /// <summary>
+    /// Contains style and position information for a composition window.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct CompositionForm
+    {
+        /// <summary>
+        /// Position style. This member can be one of the CFS_* values.
+        /// </summary>
+        public int Style;
+
+        /// <summary>
+        /// A POINT structure containing the coordinates of the upper left corner of the composition window.
+        /// </summary>
+        public Point CurrentPos;
+
+        /// <summary>
+        /// A RECT structure containing the coordinates of the upper left and lower right corners of the composition window.
+        /// </summary>
+        public Rect Area;
+    }
+
+    /// <summary>
+    /// Contains coordinates for a point.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Point
+    {
+        /// <summary>
+        /// The X position.
+        /// </summary>
+        public int X;
+
+        /// <summary>
+        /// The Y position.
+        /// </summary>
+        public int Y;
+    }
+
+    /// <summary>
+    /// Contains dimensions for a rectangle.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct Rect
+    {
+        /// <summary>
+        /// The left position.
+        /// </summary>
+        public int Left;
+
+        /// <summary>
+        /// The top position.
+        /// </summary>
+        public int Top;
+
+        /// <summary>
+        /// The right position.
+        /// </summary>
+        public int Right;
+
+        /// <summary>
+        /// The bottom position.
+        /// </summary>
+        public int Bottom;
+    }
+}
+
+/// <summary>
+/// Native kernel32 functions.
+/// </summary>
+internal static partial class NativeFunctions
+{
+    /// <summary>
+    /// MEM_* from memoryapi.
+    /// </summary>
+    [Flags]
+    public enum AllocationType
+    {
+        /// <summary>
+        /// To coalesce two adjacent placeholders, specify MEM_RELEASE | MEM_COALESCE_PLACEHOLDERS. When you coalesce
+        /// placeholders, lpAddress and dwSize must exactly match those of the placeholder.
+        /// </summary>
+        CoalescePlaceholders = 0x1,
+
+        /// <summary>
+        /// Frees an allocation back to a placeholder (after you've replaced a placeholder with a private allocation using
+        /// VirtualAlloc2 or Virtual2AllocFromApp). To split a placeholder into two placeholders, specify
+        /// MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER.
+        /// </summary>
+        PreservePlaceholder = 0x2,
+
+        /// <summary>
+        /// Allocates memory charges (from the overall size of memory and the paging files on disk) for the specified reserved
+        /// memory pages. The function also guarantees that when the caller later initially accesses the memory, the contents
+        /// will be zero. Actual physical pages are not allocated unless/until the virtual addresses are actually accessed.
+        /// To reserve and commit pages in one step, call VirtualAllocEx with MEM_COMMIT | MEM_RESERVE. Attempting to commit
+        /// a specific address range by specifying MEM_COMMIT without MEM_RESERVE and a non-NULL lpAddress fails unless the
+        /// entire range has already been reserved. The resulting error code is ERROR_INVALID_ADDRESS. An attempt to commit
+        /// a page that is already committed does not cause the function to fail. This means that you can commit pages without
+        /// first determining the current commitment state of each page. If lpAddress specifies an address within an enclave,
+        /// flAllocationType must be MEM_COMMIT.
+        /// </summary>
+        Commit = 0x1000,
+
+        /// <summary>
+        /// Reserves a range of the process's virtual address space without allocating any actual physical storage in memory
+        /// or in the paging file on disk. You commit reserved pages by calling VirtualAllocEx again with MEM_COMMIT. To
+        /// reserve and commit pages in one step, call VirtualAllocEx with MEM_COMMIT | MEM_RESERVE. Other memory allocation
+        /// functions, such as malloc and LocalAlloc, cannot use reserved memory until it has been released.
+        /// </summary>
+        Reserve = 0x2000,
+
+        /// <summary>
+        /// Decommits the specified region of committed pages. After the operation, the pages are in the reserved state.
+        /// The function does not fail if you attempt to decommit an uncommitted page. This means that you can decommit
+        /// a range of pages without first determining the current commitment state. The MEM_DECOMMIT value is not supported
+        /// when the lpAddress parameter provides the base address for an enclave.
+        /// </summary>
+        Decommit = 0x4000,
+
+        /// <summary>
+        /// Releases the specified region of pages, or placeholder (for a placeholder, the address space is released and
+        /// available for other allocations). After this operation, the pages are in the free state. If you specify this
+        /// value, dwSize must be 0 (zero), and lpAddress must point to the base address returned by the VirtualAlloc function
+        /// when the region is reserved. The function fails if either of these conditions is not met. If any pages in the
+        /// region are committed currently, the function first decommits, and then releases them. The function does not
+        /// fail if you attempt to release pages that are in different states, some reserved and some committed. This means
+        /// that you can release a range of pages without first determining the current commitment state.
+        /// </summary>
+        Release = 0x8000,
+
+        /// <summary>
+        /// Indicates that data in the memory range specified by lpAddress and dwSize is no longer of interest. The pages
+        /// should not be read from or written to the paging file. However, the memory block will be used again later, so
+        /// it should not be decommitted. This value cannot be used with any other value. Using this value does not guarantee
+        /// that the range operated on with MEM_RESET will contain zeros. If you want the range to contain zeros, decommit
+        /// the memory and then recommit it. When you use MEM_RESET, the VirtualAllocEx function ignores the value of fProtect.
+        /// However, you must still set fProtect to a valid protection value, such as PAGE_NOACCESS. VirtualAllocEx returns
+        /// an error if you use MEM_RESET and the range of memory is mapped to a file. A shared view is only acceptable
+        /// if it is mapped to a paging file.
+        /// </summary>
+        Reset = 0x80000,
+
+        /// <summary>
+        /// MEM_RESET_UNDO should only be called on an address range to which MEM_RESET was successfully applied earlier.
+        /// It indicates that the data in the specified memory range specified by lpAddress and dwSize is of interest to
+        /// the caller and attempts to reverse the effects of MEM_RESET. If the function succeeds, that means all data in
+        /// the specified address range is intact. If the function fails, at least some of the data in the address range
+        /// has been replaced with zeroes. This value cannot be used with any other value. If MEM_RESET_UNDO is called on
+        /// an address range which was not MEM_RESET earlier, the behavior is undefined. When you specify MEM_RESET, the
+        /// VirtualAllocEx function ignores the value of flProtect. However, you must still set flProtect to a valid
+        /// protection value, such as PAGE_NOACCESS.
+        /// </summary>
+        ResetUndo = 0x1000000,
+
+        /// <summary>
+        /// Reserves an address range that can be used to map Address Windowing Extensions (AWE) pages. This value must
+        /// be used with MEM_RESERVE and no other values.
+        /// </summary>
+        Physical = 0x400000,
+
+        /// <summary>
+        /// Allocates memory at the highest possible address. This can be slower than regular allocations, especially when
+        /// there are many allocations.
+        /// </summary>
+        TopDown = 0x100000,
+
+        /// <summary>
+        /// Causes the system to track pages that are written to in the allocated region. If you specify this value, you
+        /// must also specify MEM_RESERVE. To retrieve the addresses of the pages that have been written to since the region
+        /// was allocated or the write-tracking state was reset, call the GetWriteWatch function. To reset the write-tracking
+        /// state, call GetWriteWatch or ResetWriteWatch. The write-tracking feature remains enabled for the memory region
+        /// until the region is freed.
+        /// </summary>
+        WriteWatch = 0x200000,
+
+        /// <summary>
+        /// Allocates memory using large page support. The size and alignment must be a multiple of the large-page minimum.
+        /// To obtain this value, use the GetLargePageMinimum function. If you specify this value, you must also specify
+        /// MEM_RESERVE and MEM_COMMIT.
+        /// </summary>
+        LargePages = 0x20000000,
+    }
+
+    /// <summary>
+    /// SEM_* from errhandlingapi.
+    /// </summary>
+    [Flags]
+    public enum ErrorModes : uint
+    {
+        /// <summary>
+        /// Use the system default, which is to display all error dialog boxes.
+        /// </summary>
+        SystemDefault = 0x0,
+
+        /// <summary>
+        /// The system does not display the critical-error-handler message box. Instead, the system sends the error to the
+        /// calling process. Best practice is that all applications call the process-wide SetErrorMode function with a parameter
+        /// of SEM_FAILCRITICALERRORS at startup. This is to prevent error mode dialogs from hanging the application.
+        /// </summary>
+        FailCriticalErrors = 0x0001,
+
+        /// <summary>
+        /// The system automatically fixes memory alignment faults and makes them invisible to the application. It does
+        /// this for the calling process and any descendant processes. This feature is only supported by certain processor
+        /// architectures. For more information, see the Remarks section. After this value is set for a process, subsequent
+        /// attempts to clear the value are ignored.
+        /// </summary>
+        NoAlignmentFaultExcept = 0x0004,
+
+        /// <summary>
+        /// The system does not display the Windows Error Reporting dialog.
+        /// </summary>
+        NoGpFaultErrorBox = 0x0002,
+
+        /// <summary>
+        /// The OpenFile function does not display a message box when it fails to find a file. Instead, the error is returned
+        /// to the caller. This error mode overrides the OF_PROMPT flag.
+        /// </summary>
+        NoOpenFileErrorBox = 0x8000,
+    }
+
+    /// <summary>
+    /// PAGE_* from memoryapi.
+    /// </summary>
+    [Flags]
+    public enum MemoryProtection
+    {
+        /// <summary>
+        /// Enables execute access to the committed region of pages. An attempt to write to the committed region results
+        /// in an access violation. This flag is not supported by the CreateFileMapping function.
+        /// </summary>
+        Execute = 0x10,
+
+        /// <summary>
+        /// Enables execute or read-only access to the committed region of pages. An attempt to write to the committed region
+        /// results in an access violation.
+        /// </summary>
+        ExecuteRead = 0x20,
+
+        /// <summary>
+        /// Enables execute, read-only, or read/write access to the committed region of pages.
+        /// </summary>
+        ExecuteReadWrite = 0x40,
+
+        /// <summary>
+        /// Enables execute, read-only, or copy-on-write access to a mapped view of a file mapping object. An attempt to
+        /// write to a committed copy-on-write page results in a private copy of the page being made for the process. The
+        /// private page is marked as PAGE_EXECUTE_READWRITE, and the change is written to the new page. This flag is not
+        /// supported by the VirtualAlloc or VirtualAllocEx functions.
+        /// </summary>
+        ExecuteWriteCopy = 0x80,
+
+        /// <summary>
+        /// Disables all access to the committed region of pages. An attempt to read from, write to, or execute the committed
+        /// region results in an access violation. This flag is not supported by the CreateFileMapping function.
+        /// </summary>
+        NoAccess = 0x01,
+
+        /// <summary>
+        /// Enables read-only access to the committed region of pages. An attempt to write to the committed region results
+        /// in an access violation. If Data Execution Prevention is enabled, an attempt to execute code in the committed
+        /// region results in an access violation.
+        /// </summary>
+        ReadOnly = 0x02,
+
+        /// <summary>
+        /// Enables read-only or read/write access to the committed region of pages. If Data Execution Prevention is enabled,
+        /// attempting to execute code in the committed region results in an access violation.
+        /// </summary>
+        ReadWrite = 0x04,
+
+        /// <summary>
+        /// Enables read-only or copy-on-write access to a mapped view of a file mapping object. An attempt to write to
+        /// a committed copy-on-write page results in a private copy of the page being made for the process. The private
+        /// page is marked as PAGE_READWRITE, and the change is written to the new page. If Data Execution Prevention is
+        /// enabled, attempting to execute code in the committed region results in an access violation. This flag is not
+        /// supported by the VirtualAlloc or VirtualAllocEx functions.
+        /// </summary>
+        WriteCopy = 0x08,
+
+        /// <summary>
+        /// Sets all locations in the pages as invalid targets for CFG. Used along with any execute page protection like
+        /// PAGE_EXECUTE, PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE and PAGE_EXECUTE_WRITECOPY. Any indirect call to locations
+        /// in those pages will fail CFG checks and the process will be terminated. The default behavior for executable
+        /// pages allocated is to be marked valid call targets for CFG. This flag is not supported by the VirtualProtect
+        /// or CreateFileMapping functions.
+        /// </summary>
+        TargetsInvalid = 0x40000000,
+
+        /// <summary>
+        /// Pages in the region will not have their CFG information updated while the protection changes for VirtualProtect.
+        /// For example, if the pages in the region was allocated using PAGE_TARGETS_INVALID, then the invalid information
+        /// will be maintained while the page protection changes. This flag is only valid when the protection changes to
+        /// an executable type like PAGE_EXECUTE, PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE and PAGE_EXECUTE_WRITECOPY.
+        /// The default behavior for VirtualProtect protection change to executable is to mark all locations as valid call
+        /// targets for CFG.
+        /// </summary>
+        TargetsNoUpdate = TargetsInvalid,
+
+        /// <summary>
+        /// Pages in the region become guard pages. Any attempt to access a guard page causes the system to raise a
+        /// STATUS_GUARD_PAGE_VIOLATION exception and turn off the guard page status. Guard pages thus act as a one-time
+        /// access alarm. For more information, see Creating Guard Pages. When an access attempt leads the system to turn
+        /// off guard page status, the underlying page protection takes over. If a guard page exception occurs during a
+        /// system service, the service typically returns a failure status indicator. This value cannot be used with
+        /// PAGE_NOACCESS. This flag is not supported by the CreateFileMapping function.
+        /// </summary>
+        Guard = 0x100,
+
+        /// <summary>
+        /// Sets all pages to be non-cachable. Applications should not use this attribute except when explicitly required
+        /// for a device. Using the interlocked functions with memory that is mapped with SEC_NOCACHE can result in an
+        /// EXCEPTION_ILLEGAL_INSTRUCTION exception. The PAGE_NOCACHE flag cannot be used with the PAGE_GUARD, PAGE_NOACCESS,
+        /// or PAGE_WRITECOMBINE flags. The PAGE_NOCACHE flag can be used only when allocating private memory with the
+        /// VirtualAlloc, VirtualAllocEx, or VirtualAllocExNuma functions. To enable non-cached memory access for shared
+        /// memory, specify the SEC_NOCACHE flag when calling the CreateFileMapping function.
+        /// </summary>
+        NoCache = 0x200,
+
+        /// <summary>
+        /// Sets all pages to be write-combined. Applications should not use this attribute except when explicitly required
+        /// for a device. Using the interlocked functions with memory that is mapped as write-combined can result in an
+        /// EXCEPTION_ILLEGAL_INSTRUCTION exception. The PAGE_WRITECOMBINE flag cannot be specified with the PAGE_NOACCESS,
+        /// PAGE_GUARD, and PAGE_NOCACHE flags. The PAGE_WRITECOMBINE flag can be used only when allocating private memory
+        /// with the VirtualAlloc, VirtualAllocEx, or VirtualAllocExNuma functions. To enable write-combined memory access
+        /// for shared memory, specify the SEC_WRITECOMBINE flag when calling the CreateFileMapping function.
+        /// </summary>
+        WriteCombine = 0x400,
+    }
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-setevent
+    /// Sets the specified event object to the signaled state.
+    /// </summary>
+    /// <param name="hEvent">A handle to the event object. The CreateEvent or OpenEvent function returns this handle.</param>
+    /// <returns>
+    /// If the function succeeds, the return value is nonzero.
+    /// If the function fails, the return value is zero. To get extended error information, call GetLastError.
+    /// </returns>
+    [DllImport("kernel32.dll")]
+    public static extern bool SetEvent(IntPtr hEvent);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-freelibrary.
+    /// Frees the loaded dynamic-link library (DLL) module and, if necessary, decrements its reference count. When the reference
+    /// count reaches zero, the module is unloaded from the address space of the calling process and the handle is no longer
+    /// valid.
+    /// </summary>
+    /// <param name="hModule">
+    /// A handle to the loaded library module. The LoadLibrary, LoadLibraryEx, GetModuleHandle, or GetModuleHandleEx function
+    /// returns this handle.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is nonzero. If the function fails, the return value is zero. To get extended
+    /// error information, call the GetLastError function.
+    /// </returns>
+    [DllImport("kernel32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool FreeLibrary(IntPtr hModule);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-getmodulefilenamew.
+    /// Retrieves the fully qualified path for the file that contains the specified module. The module must have been loaded
+    /// by the current process. To locate the file for a module that was loaded by another process, use the GetModuleFileNameEx
+    /// function.
+    /// </summary>
+    /// <param name="hModule">
+    /// A handle to the loaded module whose path is being requested. If this parameter is NULL, GetModuleFileName retrieves
+    /// the path of the executable file of the current process. The GetModuleFileName function does not retrieve the path
+    /// for modules that were loaded using the LOAD_LIBRARY_AS_DATAFILE flag. For more information, see LoadLibraryEx.
+    /// </param>
+    /// <param name="lpFilename">
+    /// A pointer to a buffer that receives the fully qualified path of the module. If the length of the path is less than
+    /// the size that the nSize parameter specifies, the function succeeds and the path is returned as a null-terminated
+    /// string. If the length of the path exceeds the size that the nSize parameter specifies, the function succeeds and
+    /// the string is truncated to nSize characters including the terminating null character.
+    /// </param>
+    /// <param name="nSize">
+    /// The size of the lpFilename buffer, in TCHARs.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is the length of the string that is copied to the buffer, in characters,
+    /// not including the terminating null character. If the buffer is too small to hold the module name, the string is
+    /// truncated to nSize characters including the terminating null character, the function returns nSize, and the function
+    /// sets the last error to ERROR_INSUFFICIENT_BUFFER. If nSize is zero, the return value is zero and the last error
+    /// code is ERROR_SUCCESS. If the function fails, the return value is 0 (zero). To get extended error information, call
+    /// GetLastError.
+    /// </returns>
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+    [PreserveSig]
+    public static extern uint GetModuleFileNameW(
+        [In] IntPtr hModule,
+        [Out] StringBuilder lpFilename,
+        [In][MarshalAs(UnmanagedType.U4)] int nSize);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-getmodulehandlew.
+    /// Retrieves a module handle for the specified module. The module must have been loaded by the calling process. To
+    /// avoid the race conditions described in the Remarks section, use the GetModuleHandleEx function.
+    /// </summary>
+    /// <param name="lpModuleName">
+    /// The name of the loaded module (either a .dll or .exe file). If the file name extension is omitted, the default
+    /// library extension .dll is appended. The file name string can include a trailing point character (.) to indicate
+    /// that the module name has no extension. The string does not have to specify a path. When specifying a path, be sure
+    /// to use backslashes (\), not forward slashes (/). The name is compared (case independently) to the names of modules
+    /// currently mapped into the address space of the calling process. If this parameter is NULL, GetModuleHandle returns
+    /// a handle to the file used to create the calling process (.exe file). The GetModuleHandle function does not retrieve
+    /// handles for modules that were loaded using the LOAD_LIBRARY_AS_DATAFILE flag.For more information, see LoadLibraryEx.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is a handle to the specified module. If the function fails, the return
+    /// value is NULL.To get extended error information, call GetLastError.
+    /// </returns>
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true)]
+    public static extern IntPtr GetModuleHandleW(string lpModuleName);
+
+    /// <summary>
+    /// Retrieves the address of an exported function or variable from the specified dynamic-link library (DLL).
+    /// </summary>
+    /// <param name="hModule">
+    /// A handle to the DLL module that contains the function or variable. The LoadLibrary, LoadLibraryEx, LoadPackagedLibrary,
+    /// or GetModuleHandle function returns this handle. The GetProcAddress function does not retrieve addresses from modules
+    /// that were loaded using the LOAD_LIBRARY_AS_DATAFILE flag.For more information, see LoadLibraryEx.
+    /// </param>
+    /// <param name="procName">
+    /// The function or variable name, or the function's ordinal value. If this parameter is an ordinal value, it must be
+    /// in the low-order word; the high-order word must be zero.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is the address of the exported function or variable. If the function
+    /// fails, the return value is NULL.To get extended error information, call GetLastError.
+    /// </returns>
+    [DllImport("kernel32", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
+    [SuppressMessage("Globalization", "CA2101:Specify marshaling for P/Invoke string arguments", Justification = "Ansi only")]
+    public static extern IntPtr GetProcAddress(IntPtr hModule, string procName);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/libloaderapi/nf-libloaderapi-loadlibraryw.
+    /// Loads the specified module into the address space of the calling process. The specified module may cause other modules
+    /// to be loaded. For additional load options, use the LoadLibraryEx function.
+    /// </summary>
+    /// <param name="lpFileName">
+    /// The name of the module. This can be either a library module (a .dll file) or an executable module (an .exe file).
+    /// The name specified is the file name of the module and is not related to the name stored in the library module itself,
+    /// as specified by the LIBRARY keyword in the module-definition (.def) file. If the string specifies a full path, the
+    /// function searches only that path for the module. If the string specifies a relative path or a module name without
+    /// a path, the function uses a standard search strategy to find the module; for more information, see the Remarks.
+    /// If the function cannot find the module, the function fails.When specifying a path, be sure to use backslashes (\),
+    /// not forward slashes(/). For more information about paths, see Naming a File or Directory. If the string specifies
+    /// a module name without a path and the file name extension is omitted, the function appends the default library extension
+    /// .dll to the module name. To prevent the function from appending .dll to the module name, include a trailing point
+    /// character (.) in the module name string.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is a handle to the module. If the function fails, the return value is
+    /// NULL.To get extended error information, call GetLastError.
+    /// </returns>
+    [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Unicode)]
+    public static extern IntPtr LoadLibraryW([MarshalAs(UnmanagedType.LPWStr)] string lpFileName);
+
+    /// <summary>
+    /// ReadProcessMemory copies the data in the specified address range from the address space of the specified process
+    /// into the specified buffer of the current process. Any process that has a handle with PROCESS_VM_READ access can
+    /// call the function. The entire area to be read must be accessible, and if it is not accessible, the function fails.
+    /// </summary>
+    /// <param name="hProcess">
+    /// A handle to the process with memory that is being read. The handle must have PROCESS_VM_READ access to the process.
+    /// </param>
+    /// <param name="lpBaseAddress">
+    /// A pointer to the base address in the specified process from which to read. Before any data transfer occurs, the
+    /// system verifies that all data in the base address and memory of the specified size is accessible for read access,
+    /// and if it is not accessible the function fails.
+    /// </param>
+    /// <param name="lpBuffer">
+    /// A pointer to a buffer that receives the contents from the address space of the specified process.
+    /// </param>
+    /// <param name="dwSize">
+    /// The number of bytes to be read from the specified process.
+    /// </param>
+    /// <param name="lpNumberOfBytesRead">
+    /// A pointer to a variable that receives the number of bytes transferred into the specified buffer. If lpNumberOfBytesRead
+    /// is NULL, the parameter is ignored.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is nonzero. If the function fails, the return value is 0 (zero). To get
+    /// extended error information, call GetLastError. The function fails if the requested read operation crosses into an
+    /// area of the process that is inaccessible.
+    /// </returns>
+    [DllImport("kernel32.dll", SetLastError = true)]
+    public static extern bool ReadProcessMemory(
+        IntPtr hProcess,
+        IntPtr lpBaseAddress,
+        IntPtr lpBuffer,
+        int dwSize,
+        out IntPtr lpNumberOfBytesRead);
+
+    /// <summary>
+    /// ReadProcessMemory copies the data in the specified address range from the address space of the specified process
+    /// into the specified buffer of the current process. Any process that has a handle with PROCESS_VM_READ access can
+    /// call the function. The entire area to be read must be accessible, and if it is not accessible, the function fails.
+    /// </summary>
+    /// <param name="hProcess">
+    /// A handle to the process with memory that is being read. The handle must have PROCESS_VM_READ access to the process.
+    /// </param>
+    /// <param name="lpBaseAddress">
+    /// A pointer to the base address in the specified process from which to read. Before any data transfer occurs, the
+    /// system verifies that all data in the base address and memory of the specified size is accessible for read access,
+    /// and if it is not accessible the function fails.
+    /// </param>
+    /// <param name="lpBuffer">
+    /// A pointer to a buffer that receives the contents from the address space of the specified process.
+    /// </param>
+    /// <param name="dwSize">
+    /// The number of bytes to be read from the specified process.
+    /// </param>
+    /// <param name="lpNumberOfBytesRead">
+    /// A pointer to a variable that receives the number of bytes transferred into the specified buffer. If lpNumberOfBytesRead
+    /// is NULL, the parameter is ignored.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is nonzero. If the function fails, the return value is 0 (zero). To get
+    /// extended error information, call GetLastError. The function fails if the requested read operation crosses into an
+    /// area of the process that is inaccessible.
+    /// </returns>
+    [DllImport("kernel32.dll", SetLastError = true)]
+    public static extern bool ReadProcessMemory(
+        IntPtr hProcess,
+        IntPtr lpBaseAddress,
+        byte[] lpBuffer,
+        int dwSize,
+        out IntPtr lpNumberOfBytesRead);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/errhandlingapi/nf-errhandlingapi-seterrormode.
+    /// Controls whether the system will handle the specified types of serious errors or whether the process will handle
+    /// them.
+    /// </summary>
+    /// <param name="uMode">
+    /// The process error mode. This parameter can be one or more of the ErrorMode enum values.
+    /// </param>
+    /// <returns>
+    /// The return value is the previous state of the error-mode bit flags.
+    /// </returns>
+    [DllImport("kernel32.dll", SetLastError = true)]
+    public static extern ErrorModes SetErrorMode(ErrorModes uMode);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/errhandlingapi/nf-errhandlingapi-setunhandledexceptionfilter.
+    /// Enables an application to supersede the top-level exception handler of each thread of a process. After calling this
+    /// function, if an exception occurs in a process that is not being debugged, and the exception makes it to the unhandled
+    /// exception filter, that filter will call the exception filter function specified by the lpTopLevelExceptionFilter
+    /// parameter.
+    /// </summary>
+    /// <param name="lpTopLevelExceptionFilter">
+    /// A pointer to a top-level exception filter function that will be called whenever the UnhandledExceptionFilter function
+    /// gets control, and the process is not being debugged. A value of NULL for this parameter specifies default handling
+    /// within UnhandledExceptionFilter. The filter function has syntax similar to that of UnhandledExceptionFilter: It
+    /// takes a single parameter of type LPEXCEPTION_POINTERS, has a WINAPI calling convention, and returns a value of type
+    /// LONG. The filter function should return one of the EXCEPTION_* enum values.
+    /// </param>
+    /// <returns>
+    /// The SetUnhandledExceptionFilter function returns the address of the previous exception filter established with the
+    /// function. A NULL return value means that there is no current top-level exception handler.
+    /// </returns>
+    [DllImport("kernel32.dll")]
+    public static extern IntPtr SetUnhandledExceptionFilter(IntPtr lpTopLevelExceptionFilter);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-virtualalloc.
+    /// Reserves, commits, or changes the state of a region of pages in the virtual address space of the calling process.
+    /// Memory allocated by this function is automatically initialized to zero. To allocate memory in the address space
+    /// of another process, use the VirtualAllocEx function.
+    /// </summary>
+    /// <param name="lpAddress">
+    /// The starting address of the region to allocate. If the memory is being reserved, the specified address is rounded
+    /// down to the nearest multiple of the allocation granularity. If the memory is already reserved and is being committed,
+    /// the address is rounded down to the next page boundary. To determine the size of a page and the allocation granularity
+    /// on the host computer, use the GetSystemInfo function. If this parameter is NULL, the system determines where to
+    /// allocate the region. If this address is within an enclave that you have not initialized by calling InitializeEnclave,
+    /// VirtualAlloc allocates a page of zeros for the enclave at that address. The page must be previously uncommitted,
+    /// and will not be measured with the EEXTEND instruction of the Intel Software Guard Extensions programming model.
+    /// If the address in within an enclave that you initialized, then the allocation operation fails with the
+    /// ERROR_INVALID_ADDRESS error.
+    /// </param>
+    /// <param name="dwSize">
+    /// The size of the region, in bytes. If the lpAddress parameter is NULL, this value is rounded up to the next page
+    /// boundary. Otherwise, the allocated pages include all pages containing one or more bytes in the range from lpAddress
+    /// to lpAddress+dwSize. This means that a 2-byte range straddling a page boundary causes both pages to be included
+    /// in the allocated region.
+    /// </param>
+    /// <param name="flAllocationType">
+    /// The type of memory allocation. This parameter must contain one of the MEM_* enum values.
+    /// </param>
+    /// <param name="flProtect">
+    /// The memory protection for the region of pages to be allocated. If the pages are being committed, you can specify
+    /// any one of the memory protection constants.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is the base address of the allocated region of pages. If the function
+    /// fails, the return value is NULL.To get extended error information, call GetLastError.
+    /// </returns>
+    [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
+    public static extern IntPtr VirtualAlloc(
+        IntPtr lpAddress,
+        UIntPtr dwSize,
+        AllocationType flAllocationType,
+        MemoryProtection flProtect);
+
+    /// <inheritdoc cref="VirtualAlloc(IntPtr, UIntPtr, AllocationType, MemoryProtection)"/>
+    [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
+    public static extern IntPtr VirtualAlloc(
+        IntPtr lpAddress,
+        UIntPtr dwSize,
+        AllocationType flAllocationType,
+        Memory.MemoryProtection flProtect);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-virtualfree.
+    /// Releases, decommits, or releases and decommits a region of pages within the virtual address space of the calling
+    /// process.
+    /// process.
+    /// </summary>
+    /// <param name="lpAddress">
+    /// A pointer to the base address of the region of pages to be freed. If the dwFreeType parameter is MEM_RELEASE, this
+    /// parameter must be the base address returned by the VirtualAlloc function when the region of pages is reserved.
+    /// </param>
+    /// <param name="dwSize">
+    /// The size of the region of memory to be freed, in bytes. If the dwFreeType parameter is MEM_RELEASE, this parameter
+    /// must be 0 (zero). The function frees the entire region that is reserved in the initial allocation call to VirtualAlloc.
+    /// If the dwFreeType parameter is MEM_DECOMMIT, the function decommits all memory pages that contain one or more bytes
+    /// in the range from the lpAddress parameter to (lpAddress+dwSize). This means, for example, that a 2-byte region of
+    /// memory that straddles a page boundary causes both pages to be decommitted.If lpAddress is the base address returned
+    /// by VirtualAlloc and dwSize is 0 (zero), the function decommits the entire region that is allocated by VirtualAlloc.
+    /// After that, the entire region is in the reserved state.
+    /// </param>
+    /// <param name="dwFreeType">
+    /// The type of free operation. This parameter must be one of the MEM_* enum values.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is a nonzero value. If the function fails, the return value is 0 (zero).
+    /// To get extended error information, call GetLastError.
+    /// </returns>
+    [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
+    public static extern bool VirtualFree(
+        IntPtr lpAddress,
+        UIntPtr dwSize,
+        AllocationType dwFreeType);
+
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/memoryapi/nf-memoryapi-virtualprotect.
+    /// Changes the protection on a region of committed pages in the virtual address space of the calling process.
+    /// </summary>
+    /// <param name="lpAddress">
+    /// The address of the starting page of the region of pages whose access protection attributes are to be changed. All
+    /// pages in the specified region must be within the same reserved region allocated when calling the VirtualAlloc or
+    /// VirtualAllocEx function using MEM_RESERVE. The pages cannot span adjacent reserved regions that were allocated by
+    /// separate calls to VirtualAlloc or VirtualAllocEx using MEM_RESERVE.
+    /// </param>
+    /// <param name="dwSize">
+    /// The size of the region whose access protection attributes are to be changed, in bytes. The region of affected pages
+    /// includes all pages containing one or more bytes in the range from the lpAddress parameter to (lpAddress+dwSize).
+    /// This means that a 2-byte range straddling a page boundary causes the protection attributes of both pages to be changed.
+    /// </param>
+    /// <param name="flNewProtection">
+    /// The memory protection option. This parameter can be one of the memory protection constants. For mapped views, this
+    /// value must be compatible with the access protection specified when the view was mapped (see MapViewOfFile,
+    /// MapViewOfFileEx, and MapViewOfFileExNuma).
+    /// </param>
+    /// <param name="lpflOldProtect">
+    /// A pointer to a variable that receives the previous access protection value of the first page in the specified region
+    /// of pages. If this parameter is NULL or does not point to a valid variable, the function fails.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is nonzero. If the function fails, the return value is zero.
+    /// To get extended error information, call GetLastError.
+    /// </returns>
+    [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
+    public static extern bool VirtualProtect(
+        IntPtr lpAddress,
+        UIntPtr dwSize,
+        MemoryProtection flNewProtection,
+        out MemoryProtection lpflOldProtect);
+
+    /// <inheritdoc cref="VirtualAlloc(IntPtr, UIntPtr, AllocationType, MemoryProtection)"/>
+    [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
+    public static extern bool VirtualProtect(
+        IntPtr lpAddress,
+        UIntPtr dwSize,
+        Memory.MemoryProtection flNewProtection,
+        out Memory.MemoryProtection lpflOldProtect);
+
+    /// <summary>
+    /// Writes data to an area of memory in a specified process. The entire area to be written to must be accessible or
+    /// the operation fails.
+    /// </summary>
+    /// <param name="hProcess">
+    /// A handle to the process memory to be modified. The handle must have PROCESS_VM_WRITE and PROCESS_VM_OPERATION access
+    /// to the process.
+    /// </param>
+    /// <param name="lpBaseAddress">
+    /// A pointer to the base address in the specified process to which data is written. Before data transfer occurs, the
+    /// system verifies that all data in the base address and memory of the specified size is accessible for write access,
+    /// and if it is not accessible, the function fails.
+    /// </param>
+    /// <param name="lpBuffer">
+    /// A pointer to the buffer that contains data to be written in the address space of the specified process.
+    /// </param>
+    /// <param name="dwSize">
+    /// The number of bytes to be written to the specified process.
+    /// </param>
+    /// <param name="lpNumberOfBytesWritten">
+    /// A pointer to a variable that receives the number of bytes transferred into the specified process. This parameter
+    /// is optional. If lpNumberOfBytesWritten is NULL, the parameter is ignored.
+    /// </param>
+    /// <returns>
+    /// If the function succeeds, the return value is nonzero. If the function fails, the return value is 0 (zero). To get
+    /// extended error information, call GetLastError.The function fails if the requested write operation crosses into an
+    /// area of the process that is inaccessible.
+    /// </returns>
+    [DllImport("kernel32.dll", SetLastError = true)]
+    public static extern bool WriteProcessMemory(
+        IntPtr hProcess,
+        IntPtr lpBaseAddress,
+        byte[] lpBuffer,
+        int dwSize,
+        out IntPtr lpNumberOfBytesWritten);
+
+    /// <summary>
+    /// Get a handle to the current process.
+    /// </summary>
+    /// <returns>Handle to the process.</returns>
+    [DllImport("kernel32.dll")]
+    public static extern IntPtr GetCurrentProcess();
+
+    /// <summary>
+    /// Get the current process ID.
+    /// </summary>
+    /// <returns>The process ID.</returns>
+    [DllImport("kernel32.dll")]
+    public static extern uint GetCurrentProcessId();
+
+    /// <summary>
+    /// Get the current thread ID.
+    /// </summary>
+    /// <returns>The thread ID.</returns>
+    [DllImport("kernel32.dll")]
+    public static extern uint GetCurrentThreadId();
+}
+
+/// <summary>
+/// Native dbghelp functions.
+/// </summary>
+[SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1201:Elements should appear in the correct order", Justification = "Native funcs")]
+internal static partial class NativeFunctions
+{
+    /// <summary>
+    /// Type of minidump to create.
+    /// </summary>
+    public enum MiniDumpType : int
+    {
+        /// <summary>
+        /// Normal minidump.
+        /// </summary>
+        MiniDumpNormal,
+
+        /// <summary>
+        /// Minidump with data segments.
+        /// </summary>
+        MiniDumpWithDataSegs,
+
+        /// <summary>
+        /// Minidump with full memory.
+        /// </summary>
+        MiniDumpWithFullMemory,
+    }
+
+    /// <summary>
+    /// Initializes the symbol handler for a process.
+    /// </summary>
+    /// <param name="hProcess">
+    /// A handle that identifies the caller.
+    /// This value should be unique and nonzero, but need not be a process handle.
+    /// However, if you do use a process handle, be sure to use the correct handle.
+    /// If the application is a debugger, use the process handle for the process being debugged.
+    /// Do not use the handle returned by GetCurrentProcess when debugging another process, because calling functions like SymLoadModuleEx can have unexpected results.
+    /// This parameter cannot be NULL.</param>
+    /// <param name="userSearchPath">
+    /// The path, or series of paths separated by a semicolon (;), that is used to search for symbol files.
+    /// If this parameter is NULL, the library attempts to form a symbol path from the following sources:
+    ///    - The current working directory of the application
+    ///    - The _NT_SYMBOL_PATH environment variable
+    ///    - The _NT_ALTERNATE_SYMBOL_PATH environment variable
+    /// Note that the search path can also be set using the SymSetSearchPath function.
+    /// </param>
+    /// <param name="fInvadeProcess">
+    /// If this value is <see langword="true"/>, enumerates the loaded modules for the process and effectively calls the SymLoadModule64 function for each module.
+    /// </param>
+    /// <returns>Whether or not the function succeeded.</returns>
+    [DllImport("dbghelp.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    public static extern bool SymInitialize(IntPtr hProcess, string userSearchPath, bool fInvadeProcess);
+
+    /// <summary>
+    /// Deallocates all resources associated with the process handle.
+    /// </summary>
+    /// <param name="hProcess">A handle to the process that was originally passed to the <seealso cref="SymInitialize"/> function.</param>
+    /// <returns>Whether or not the function succeeded.</returns>
+    [DllImport("dbghelp.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    public static extern bool SymCleanup(IntPtr hProcess);
+
+    /// <summary>
+    /// Creates a minidump.
+    /// </summary>
+    /// <param name="hProcess">Target process handle.</param>
+    /// <param name="processId">Target process ID.</param>
+    /// <param name="hFile">Output file handle.</param>
+    /// <param name="dumpType">Type of dump to take.</param>
+    /// <param name="exceptionInfo">Exception information.</param>
+    /// <param name="userStreamParam">User information.</param>
+    /// <param name="callback">Callback.</param>
+    /// <returns>Whether or not the minidump succeeded.</returns>
+    [DllImport("dbghelp.dll")]
+    public static extern bool MiniDumpWriteDump(IntPtr hProcess, uint processId, IntPtr hFile, int dumpType, ref MinidumpExceptionInformation exceptionInfo, IntPtr userStreamParam, IntPtr callback);
+
+    /// <summary>
+    /// Structure describing minidump exception information.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    public struct MinidumpExceptionInformation
+    {
+        /// <summary>
+        /// ID of the thread that caused the exception.
+        /// </summary>
+        public uint ThreadId;
+
+        /// <summary>
+        /// Pointer to the exception record.
+        /// </summary>
+        public IntPtr ExceptionPointers;
+
+        /// <summary>
+        /// ClientPointers field.
+        /// </summary>
+        public int ClientPointers;
+    }
+
+    /// <summary>
+    /// Finds window according to conditions.
+    /// </summary>
+    /// <param name="parentHandle">Handle to parent window.</param>
+    /// <param name="childAfter">Window to search after.</param>
+    /// <param name="className">Name of class.</param>
+    /// <param name="windowTitle">Name of window.</param>
+    /// <returns>Found window, or null.</returns>
+    [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    public static extern IntPtr FindWindowEx(
+        IntPtr parentHandle,
+        IntPtr childAfter,
+        string className,
+        IntPtr windowTitle);
+}
+
+/// <summary>
+/// Native ws2_32 functions.
+/// </summary>
+internal static partial class NativeFunctions
+{
+    /// <summary>
+    /// See https://docs.microsoft.com/en-us/windows/win32/api/winsock/nf-winsock-setsockopt.
+    /// The setsockopt function sets a socket option.
+    /// </summary>
+    /// <param name="socket">
+    /// A descriptor that identifies a socket.
+    /// </param>
+    /// <param name="level">
+    /// The level at which the option is defined (for example, SOL_SOCKET).
+    /// </param>
+    /// <param name="optName">
+    /// The socket option for which the value is to be set (for example, SO_BROADCAST). The optname parameter must be a
+    /// socket option defined within the specified level, or behavior is undefined.
+    /// </param>
+    /// <param name="optVal">
+    /// A pointer to the buffer in which the value for the requested option is specified.
+    /// </param>
+    /// <param name="optLen">
+    /// The size, in bytes, of the buffer pointed to by the optval parameter.
+    /// </param>
+    /// <returns>
+    /// If no error occurs, setsockopt returns zero. Otherwise, a value of SOCKET_ERROR is returned, and a specific error
+    /// code can be retrieved by calling WSAGetLastError.
+    /// </returns>
+    [DllImport("ws2_32.dll", CallingConvention = CallingConvention.Winapi, EntryPoint = "setsockopt")]
+    public static extern int SetSockOpt(IntPtr socket, SocketOptionLevel level, SocketOptionName optName, ref IntPtr optVal, int optLen);
+}
diff --git a/Dalamud/Plugin/DalamudPluginInterface.cs b/Dalamud/Plugin/DalamudPluginInterface.cs
index 055b34cb1..2a1e3227d 100644
--- a/Dalamud/Plugin/DalamudPluginInterface.cs
+++ b/Dalamud/Plugin/DalamudPluginInterface.cs
@@ -23,412 +23,411 @@ using Dalamud.Plugin.Ipc.Exceptions;
 using Dalamud.Plugin.Ipc.Internal;
 using Dalamud.Utility;
 
-namespace Dalamud.Plugin
+namespace Dalamud.Plugin;
+
+/// <summary>
+/// This class acts as an interface to various objects needed to interact with Dalamud and the game.
+/// </summary>
+public sealed class DalamudPluginInterface : IDisposable
 {
+    private readonly string pluginName;
+    private readonly PluginConfigurations configs;
+
     /// <summary>
-    /// This class acts as an interface to various objects needed to interact with Dalamud and the game.
+    /// Initializes a new instance of the <see cref="DalamudPluginInterface"/> class.
+    /// Set up the interface and populate all fields needed.
     /// </summary>
-    public sealed class DalamudPluginInterface : IDisposable
+    /// <param name="pluginName">The internal name of the plugin.</param>
+    /// <param name="assemblyLocation">Location of the assembly.</param>
+    /// <param name="reason">The reason the plugin was loaded.</param>
+    /// <param name="isDev">A value indicating whether this is a dev plugin.</param>
+    internal DalamudPluginInterface(string pluginName, FileInfo assemblyLocation, PluginLoadReason reason, bool isDev)
     {
-        private readonly string pluginName;
-        private readonly PluginConfigurations configs;
+        var configuration = Service<DalamudConfiguration>.Get();
+        var dataManager = Service<DataManager>.Get();
+        var localization = Service<Localization>.Get();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DalamudPluginInterface"/> class.
-        /// Set up the interface and populate all fields needed.
-        /// </summary>
-        /// <param name="pluginName">The internal name of the plugin.</param>
-        /// <param name="assemblyLocation">Location of the assembly.</param>
-        /// <param name="reason">The reason the plugin was loaded.</param>
-        /// <param name="isDev">A value indicating whether this is a dev plugin.</param>
-        internal DalamudPluginInterface(string pluginName, FileInfo assemblyLocation, PluginLoadReason reason, bool isDev)
+        this.UiBuilder = new UiBuilder(pluginName);
+
+        this.pluginName = pluginName;
+        this.AssemblyLocation = assemblyLocation;
+        this.configs = Service<PluginManager>.Get().PluginConfigs;
+        this.Reason = reason;
+        this.IsDev = isDev;
+
+        this.LoadTime = DateTime.Now;
+        this.LoadTimeUTC = DateTime.UtcNow;
+
+        this.GeneralChatType = configuration.GeneralChatType;
+        this.Sanitizer = new Sanitizer(dataManager.Language);
+        if (configuration.LanguageOverride != null)
         {
-            var configuration = Service<DalamudConfiguration>.Get();
-            var dataManager = Service<DataManager>.Get();
-            var localization = Service<Localization>.Get();
-
-            this.UiBuilder = new UiBuilder(pluginName);
-
-            this.pluginName = pluginName;
-            this.AssemblyLocation = assemblyLocation;
-            this.configs = Service<PluginManager>.Get().PluginConfigs;
-            this.Reason = reason;
-            this.IsDev = isDev;
-
-            this.LoadTime = DateTime.Now;
-            this.LoadTimeUTC = DateTime.UtcNow;
-
-            this.GeneralChatType = configuration.GeneralChatType;
-            this.Sanitizer = new Sanitizer(dataManager.Language);
-            if (configuration.LanguageOverride != null)
-            {
-                this.UiLanguage = configuration.LanguageOverride;
-            }
+            this.UiLanguage = configuration.LanguageOverride;
+        }
+        else
+        {
+            var currentUiLang = CultureInfo.CurrentUICulture;
+            if (Localization.ApplicableLangCodes.Any(langCode => currentUiLang.TwoLetterISOLanguageName == langCode))
+                this.UiLanguage = currentUiLang.TwoLetterISOLanguageName;
             else
+                this.UiLanguage = "en";
+        }
+
+        localization.LocalizationChanged += this.OnLocalizationChanged;
+        configuration.DalamudConfigurationSaved += this.OnDalamudConfigurationSaved;
+    }
+
+    /// <summary>
+    /// Delegate for localization change with two-letter iso lang code.
+    /// </summary>
+    /// <param name="langCode">The new language code.</param>
+    public delegate void LanguageChangedDelegate(string langCode);
+
+    /// <summary>
+    /// Event that gets fired when loc is changed
+    /// </summary>
+    public event LanguageChangedDelegate LanguageChanged;
+
+    /// <summary>
+    /// Gets the reason this plugin was loaded.
+    /// </summary>
+    public PluginLoadReason Reason { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether this is a dev plugin.
+    /// </summary>
+    public bool IsDev { get; }
+
+    /// <summary>
+    /// Gets the time that this plugin was loaded.
+    /// </summary>
+    public DateTime LoadTime { get; }
+
+    /// <summary>
+    /// Gets the UTC time that this plugin was loaded.
+    /// </summary>
+    public DateTime LoadTimeUTC { get; }
+
+    /// <summary>
+    /// Gets the timespan delta from when this plugin was loaded.
+    /// </summary>
+    public TimeSpan LoadTimeDelta => DateTime.Now - this.LoadTime;
+
+    /// <summary>
+    /// Gets the directory Dalamud assets are stored in.
+    /// </summary>
+    public DirectoryInfo DalamudAssetDirectory => Service<Dalamud>.Get().AssetDirectory;
+
+    /// <summary>
+    /// Gets the location of your plugin assembly.
+    /// </summary>
+    public FileInfo AssemblyLocation { get; }
+
+    /// <summary>
+    /// Gets the directory your plugin configurations are stored in.
+    /// </summary>
+    public DirectoryInfo ConfigDirectory => new(this.GetPluginConfigDirectory());
+
+    /// <summary>
+    /// Gets the config file of your plugin.
+    /// </summary>
+    public FileInfo ConfigFile => this.configs.GetConfigFile(this.pluginName);
+
+    /// <summary>
+    /// Gets the <see cref="UiBuilder"/> instance which allows you to draw UI into the game via ImGui draw calls.
+    /// </summary>
+    public UiBuilder UiBuilder { get; private set; }
+
+    /// <summary>
+    /// Gets a value indicating whether Dalamud is running in Debug mode or the /xldev menu is open. This can occur on release builds.
+    /// </summary>
+    public bool IsDevMenuOpen => Service<DalamudInterface>.GetNullable() is { IsDevMenuOpen: true }; // Can be null during boot
+
+    /// <summary>
+    /// Gets a value indicating whether a debugger is attached.
+    /// </summary>
+    public bool IsDebugging => Debugger.IsAttached;
+
+    /// <summary>
+    /// Gets the current UI language in two-letter iso format.
+    /// </summary>
+    public string UiLanguage { get; private set; }
+
+    /// <summary>
+    /// Gets serializer class with functions to remove special characters from strings.
+    /// </summary>
+    public ISanitizer Sanitizer { get; }
+
+    /// <summary>
+    /// Gets the chat type used by default for plugin messages.
+    /// </summary>
+    public XivChatType GeneralChatType { get; private set; }
+
+    /// <summary>
+    /// Gets a list of installed plugin names.
+    /// </summary>
+    public List<string> PluginNames => Service<PluginManager>.Get().InstalledPlugins.Select(p => p.Manifest.Name).ToList();
+
+    /// <summary>
+    /// Gets a list of installed plugin internal names.
+    /// </summary>
+    public List<string> PluginInternalNames => Service<PluginManager>.Get().InstalledPlugins.Select(p => p.Manifest.InternalName).ToList();
+
+    #region IPC
+
+    /// <inheritdoc cref="DataShare.GetOrCreateData{T}"/>
+    public T GetOrCreateData<T>(string tag, Func<T> dataGenerator) where T : class
+        => Service<DataShare>.Get().GetOrCreateData(tag, dataGenerator);
+
+    /// <inheritdoc cref="DataShare.RelinquishData"/>
+    public void RelinquishData(string tag)
+        => Service<DataShare>.Get().RelinquishData(tag);
+
+    /// <inheritdoc cref="DataShare.TryGetData{T}"/>
+    public bool TryGetData<T>(string tag, [NotNullWhen(true)] out T? data) where T : class
+        => Service<DataShare>.Get().TryGetData(tag, out data);
+
+    /// <inheritdoc cref="DataShare.GetData{T}"/>
+    public T? GetData<T>(string tag) where T : class
+        => Service<DataShare>.Get().GetData<T>(tag);
+
+    /// <summary>
+    /// Gets an IPC provider.
+    /// </summary>
+    /// <typeparam name="TRet">The return type for funcs. Use object if this is unused.</typeparam>
+    /// <param name="name">The name of the IPC registration.</param>
+    /// <returns>An IPC provider.</returns>
+    /// <exception cref="IpcTypeMismatchError">This is thrown when the requested types do not match the previously registered types are different.</exception>
+    public ICallGateProvider<TRet> GetIpcProvider<TRet>(string name)
+        => new CallGatePubSub<TRet>(name);
+
+    /// <inheritdoc cref="ICallGateProvider{TRet}"/>
+    public ICallGateProvider<T1, TRet> GetIpcProvider<T1, TRet>(string name)
+        => new CallGatePubSub<T1, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateProvider{TRet}"/>
+    public ICallGateProvider<T1, T2, TRet> GetIpcProvider<T1, T2, TRet>(string name)
+        => new CallGatePubSub<T1, T2, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateProvider{TRet}"/>
+    public ICallGateProvider<T1, T2, T3, TRet> GetIpcProvider<T1, T2, T3, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateProvider{TRet}"/>
+    public ICallGateProvider<T1, T2, T3, T4, TRet> GetIpcProvider<T1, T2, T3, T4, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, T4, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateProvider{TRet}"/>
+    public ICallGateProvider<T1, T2, T3, T4, T5, TRet> GetIpcProvider<T1, T2, T3, T4, T5, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, T4, T5, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateProvider{TRet}"/>
+    public ICallGateProvider<T1, T2, T3, T4, T5, T6, TRet> GetIpcProvider<T1, T2, T3, T4, T5, T6, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, T4, T5, T6, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateProvider{TRet}"/>
+    public ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, TRet> GetIpcProvider<T1, T2, T3, T4, T5, T6, T7, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateProvider{TRet}"/>
+    public ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, T8, TRet> GetIpcProvider<T1, T2, T3, T4, T5, T6, T7, T8, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, T8, TRet>(name);
+
+    /// <summary>
+    /// Gets an IPC subscriber.
+    /// </summary>
+    /// <typeparam name="TRet">The return type for funcs. Use object if this is unused.</typeparam>
+    /// <param name="name">The name of the IPC registration.</param>
+    /// <returns>An IPC subscriber.</returns>
+    public ICallGateSubscriber<TRet> GetIpcSubscriber<TRet>(string name)
+        => new CallGatePubSub<TRet>(name);
+
+    /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
+    public ICallGateSubscriber<T1, TRet> GetIpcSubscriber<T1, TRet>(string name)
+        => new CallGatePubSub<T1, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
+    public ICallGateSubscriber<T1, T2, TRet> GetIpcSubscriber<T1, T2, TRet>(string name)
+        => new CallGatePubSub<T1, T2, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
+    public ICallGateSubscriber<T1, T2, T3, TRet> GetIpcSubscriber<T1, T2, T3, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
+    public ICallGateSubscriber<T1, T2, T3, T4, TRet> GetIpcSubscriber<T1, T2, T3, T4, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, T4, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
+    public ICallGateSubscriber<T1, T2, T3, T4, T5, TRet> GetIpcSubscriber<T1, T2, T3, T4, T5, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, T4, T5, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
+    public ICallGateSubscriber<T1, T2, T3, T4, T5, T6, TRet> GetIpcSubscriber<T1, T2, T3, T4, T5, T6, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, T4, T5, T6, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
+    public ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, TRet> GetIpcSubscriber<T1, T2, T3, T4, T5, T6, T7, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, TRet>(name);
+
+    /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
+    public ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, T8, TRet> GetIpcSubscriber<T1, T2, T3, T4, T5, T6, T7, T8, TRet>(string name)
+        => new CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, T8, TRet>(name);
+
+    #endregion
+
+    #region Configuration
+
+    /// <summary>
+    /// Save a plugin configuration(inheriting IPluginConfiguration).
+    /// </summary>
+    /// <param name="currentConfig">The current configuration.</param>
+    public void SavePluginConfig(IPluginConfiguration? currentConfig)
+    {
+        if (currentConfig == null)
+            return;
+
+        this.configs.Save(currentConfig, this.pluginName);
+    }
+
+    /// <summary>
+    /// Get a previously saved plugin configuration or null if none was saved before.
+    /// </summary>
+    /// <returns>A previously saved config or null if none was saved before.</returns>
+    public IPluginConfiguration? GetPluginConfig()
+    {
+        // This is done to support json deserialization of plugin configurations
+        // even after running an in-game update of plugins, where the assembly version
+        // changes.
+        // Eventually it might make sense to have a separate method on this class
+        // T GetPluginConfig<T>() where T : IPluginConfiguration
+        // that can invoke LoadForType() directly instead of via reflection
+        // This is here for now to support the current plugin API
+        foreach (var type in Assembly.GetCallingAssembly().GetTypes())
+        {
+            if (type.IsAssignableTo(typeof(IPluginConfiguration)))
             {
-                var currentUiLang = CultureInfo.CurrentUICulture;
-                if (Localization.ApplicableLangCodes.Any(langCode => currentUiLang.TwoLetterISOLanguageName == langCode))
-                    this.UiLanguage = currentUiLang.TwoLetterISOLanguageName;
-                else
-                    this.UiLanguage = "en";
+                var mi = this.configs.GetType().GetMethod("LoadForType");
+                var fn = mi.MakeGenericMethod(type);
+                return (IPluginConfiguration)fn.Invoke(this.configs, new object[] { this.pluginName });
             }
-
-            localization.LocalizationChanged += this.OnLocalizationChanged;
-            configuration.DalamudConfigurationSaved += this.OnDalamudConfigurationSaved;
         }
 
-        /// <summary>
-        /// Delegate for localization change with two-letter iso lang code.
-        /// </summary>
-        /// <param name="langCode">The new language code.</param>
-        public delegate void LanguageChangedDelegate(string langCode);
-
-        /// <summary>
-        /// Event that gets fired when loc is changed
-        /// </summary>
-        public event LanguageChangedDelegate LanguageChanged;
-
-        /// <summary>
-        /// Gets the reason this plugin was loaded.
-        /// </summary>
-        public PluginLoadReason Reason { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether this is a dev plugin.
-        /// </summary>
-        public bool IsDev { get; }
-
-        /// <summary>
-        /// Gets the time that this plugin was loaded.
-        /// </summary>
-        public DateTime LoadTime { get; }
-
-        /// <summary>
-        /// Gets the UTC time that this plugin was loaded.
-        /// </summary>
-        public DateTime LoadTimeUTC { get; }
-
-        /// <summary>
-        /// Gets the timespan delta from when this plugin was loaded.
-        /// </summary>
-        public TimeSpan LoadTimeDelta => DateTime.Now - this.LoadTime;
-
-        /// <summary>
-        /// Gets the directory Dalamud assets are stored in.
-        /// </summary>
-        public DirectoryInfo DalamudAssetDirectory => Service<Dalamud>.Get().AssetDirectory;
-
-        /// <summary>
-        /// Gets the location of your plugin assembly.
-        /// </summary>
-        public FileInfo AssemblyLocation { get; }
-
-        /// <summary>
-        /// Gets the directory your plugin configurations are stored in.
-        /// </summary>
-        public DirectoryInfo ConfigDirectory => new(this.GetPluginConfigDirectory());
-
-        /// <summary>
-        /// Gets the config file of your plugin.
-        /// </summary>
-        public FileInfo ConfigFile => this.configs.GetConfigFile(this.pluginName);
-
-        /// <summary>
-        /// Gets the <see cref="UiBuilder"/> instance which allows you to draw UI into the game via ImGui draw calls.
-        /// </summary>
-        public UiBuilder UiBuilder { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether Dalamud is running in Debug mode or the /xldev menu is open. This can occur on release builds.
-        /// </summary>
-        public bool IsDevMenuOpen => Service<DalamudInterface>.GetNullable() is { IsDevMenuOpen: true }; // Can be null during boot
-
-        /// <summary>
-        /// Gets a value indicating whether a debugger is attached.
-        /// </summary>
-        public bool IsDebugging => Debugger.IsAttached;
-
-        /// <summary>
-        /// Gets the current UI language in two-letter iso format.
-        /// </summary>
-        public string UiLanguage { get; private set; }
-
-        /// <summary>
-        /// Gets serializer class with functions to remove special characters from strings.
-        /// </summary>
-        public ISanitizer Sanitizer { get; }
-
-        /// <summary>
-        /// Gets the chat type used by default for plugin messages.
-        /// </summary>
-        public XivChatType GeneralChatType { get; private set; }
-
-        /// <summary>
-        /// Gets a list of installed plugin names.
-        /// </summary>
-        public List<string> PluginNames => Service<PluginManager>.Get().InstalledPlugins.Select(p => p.Manifest.Name).ToList();
-
-        /// <summary>
-        /// Gets a list of installed plugin internal names.
-        /// </summary>
-        public List<string> PluginInternalNames => Service<PluginManager>.Get().InstalledPlugins.Select(p => p.Manifest.InternalName).ToList();
-
-        #region IPC
-
-        /// <inheritdoc cref="DataShare.GetOrCreateData{T}"/>
-        public T GetOrCreateData<T>(string tag, Func<T> dataGenerator) where T : class
-            => Service<DataShare>.Get().GetOrCreateData(tag, dataGenerator);
-
-        /// <inheritdoc cref="DataShare.RelinquishData"/>
-        public void RelinquishData(string tag)
-            => Service<DataShare>.Get().RelinquishData(tag);
-
-        /// <inheritdoc cref="DataShare.TryGetData{T}"/>
-        public bool TryGetData<T>(string tag, [NotNullWhen(true)] out T? data) where T : class
-            => Service<DataShare>.Get().TryGetData(tag, out data);
-
-        /// <inheritdoc cref="DataShare.GetData{T}"/>
-        public T? GetData<T>(string tag) where T : class
-            => Service<DataShare>.Get().GetData<T>(tag);
-
-        /// <summary>
-        /// Gets an IPC provider.
-        /// </summary>
-        /// <typeparam name="TRet">The return type for funcs. Use object if this is unused.</typeparam>
-        /// <param name="name">The name of the IPC registration.</param>
-        /// <returns>An IPC provider.</returns>
-        /// <exception cref="IpcTypeMismatchError">This is thrown when the requested types do not match the previously registered types are different.</exception>
-        public ICallGateProvider<TRet> GetIpcProvider<TRet>(string name)
-            => new CallGatePubSub<TRet>(name);
-
-        /// <inheritdoc cref="ICallGateProvider{TRet}"/>
-        public ICallGateProvider<T1, TRet> GetIpcProvider<T1, TRet>(string name)
-            => new CallGatePubSub<T1, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateProvider{TRet}"/>
-        public ICallGateProvider<T1, T2, TRet> GetIpcProvider<T1, T2, TRet>(string name)
-            => new CallGatePubSub<T1, T2, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateProvider{TRet}"/>
-        public ICallGateProvider<T1, T2, T3, TRet> GetIpcProvider<T1, T2, T3, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateProvider{TRet}"/>
-        public ICallGateProvider<T1, T2, T3, T4, TRet> GetIpcProvider<T1, T2, T3, T4, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, T4, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateProvider{TRet}"/>
-        public ICallGateProvider<T1, T2, T3, T4, T5, TRet> GetIpcProvider<T1, T2, T3, T4, T5, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, T4, T5, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateProvider{TRet}"/>
-        public ICallGateProvider<T1, T2, T3, T4, T5, T6, TRet> GetIpcProvider<T1, T2, T3, T4, T5, T6, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, T4, T5, T6, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateProvider{TRet}"/>
-        public ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, TRet> GetIpcProvider<T1, T2, T3, T4, T5, T6, T7, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateProvider{TRet}"/>
-        public ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, T8, TRet> GetIpcProvider<T1, T2, T3, T4, T5, T6, T7, T8, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, T8, TRet>(name);
-
-        /// <summary>
-        /// Gets an IPC subscriber.
-        /// </summary>
-        /// <typeparam name="TRet">The return type for funcs. Use object if this is unused.</typeparam>
-        /// <param name="name">The name of the IPC registration.</param>
-        /// <returns>An IPC subscriber.</returns>
-        public ICallGateSubscriber<TRet> GetIpcSubscriber<TRet>(string name)
-            => new CallGatePubSub<TRet>(name);
-
-        /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
-        public ICallGateSubscriber<T1, TRet> GetIpcSubscriber<T1, TRet>(string name)
-            => new CallGatePubSub<T1, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
-        public ICallGateSubscriber<T1, T2, TRet> GetIpcSubscriber<T1, T2, TRet>(string name)
-            => new CallGatePubSub<T1, T2, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
-        public ICallGateSubscriber<T1, T2, T3, TRet> GetIpcSubscriber<T1, T2, T3, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
-        public ICallGateSubscriber<T1, T2, T3, T4, TRet> GetIpcSubscriber<T1, T2, T3, T4, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, T4, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
-        public ICallGateSubscriber<T1, T2, T3, T4, T5, TRet> GetIpcSubscriber<T1, T2, T3, T4, T5, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, T4, T5, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
-        public ICallGateSubscriber<T1, T2, T3, T4, T5, T6, TRet> GetIpcSubscriber<T1, T2, T3, T4, T5, T6, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, T4, T5, T6, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
-        public ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, TRet> GetIpcSubscriber<T1, T2, T3, T4, T5, T6, T7, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, TRet>(name);
-
-        /// <inheritdoc cref="ICallGateSubscriber{TRet}"/>
-        public ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, T8, TRet> GetIpcSubscriber<T1, T2, T3, T4, T5, T6, T7, T8, TRet>(string name)
-            => new CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, T8, TRet>(name);
-
-        #endregion
-
-        #region Configuration
-
-        /// <summary>
-        /// Save a plugin configuration(inheriting IPluginConfiguration).
-        /// </summary>
-        /// <param name="currentConfig">The current configuration.</param>
-        public void SavePluginConfig(IPluginConfiguration? currentConfig)
-        {
-            if (currentConfig == null)
-                return;
-
-            this.configs.Save(currentConfig, this.pluginName);
-        }
-
-        /// <summary>
-        /// Get a previously saved plugin configuration or null if none was saved before.
-        /// </summary>
-        /// <returns>A previously saved config or null if none was saved before.</returns>
-        public IPluginConfiguration? GetPluginConfig()
-        {
-            // This is done to support json deserialization of plugin configurations
-            // even after running an in-game update of plugins, where the assembly version
-            // changes.
-            // Eventually it might make sense to have a separate method on this class
-            // T GetPluginConfig<T>() where T : IPluginConfiguration
-            // that can invoke LoadForType() directly instead of via reflection
-            // This is here for now to support the current plugin API
-            foreach (var type in Assembly.GetCallingAssembly().GetTypes())
-            {
-                if (type.IsAssignableTo(typeof(IPluginConfiguration)))
-                {
-                    var mi = this.configs.GetType().GetMethod("LoadForType");
-                    var fn = mi.MakeGenericMethod(type);
-                    return (IPluginConfiguration)fn.Invoke(this.configs, new object[] { this.pluginName });
-                }
-            }
-
-            // this shouldn't be a thing, I think, but just in case
-            return this.configs.Load(this.pluginName);
-        }
-
-        /// <summary>
-        /// Get the config directory.
-        /// </summary>
-        /// <returns>directory with path of AppData/XIVLauncher/pluginConfig/PluginInternalName.</returns>
-        public string GetPluginConfigDirectory() => this.configs.GetDirectory(this.pluginName);
-
-        /// <summary>
-        /// Get the loc directory.
-        /// </summary>
-        /// <returns>directory with path of AppData/XIVLauncher/pluginConfig/PluginInternalName/loc.</returns>
-        public string GetPluginLocDirectory() => this.configs.GetDirectory(Path.Combine(this.pluginName, "loc"));
-
-        #endregion
-
-        #region Chat Links
-
-        /// <summary>
-        /// Register a chat link handler.
-        /// </summary>
-        /// <param name="commandId">The ID of the command.</param>
-        /// <param name="commandAction">The action to be executed.</param>
-        /// <returns>Returns an SeString payload for the link.</returns>
-        public DalamudLinkPayload AddChatLinkHandler(uint commandId, Action<uint, SeString> commandAction)
-        {
-            return Service<ChatGui>.Get().AddChatLinkHandler(this.pluginName, commandId, commandAction);
-        }
-
-        /// <summary>
-        /// Remove a chat link handler.
-        /// </summary>
-        /// <param name="commandId">The ID of the command.</param>
-        public void RemoveChatLinkHandler(uint commandId)
-        {
-            Service<ChatGui>.Get().RemoveChatLinkHandler(this.pluginName, commandId);
-        }
-
-        /// <summary>
-        /// Removes all chat link handlers registered by the plugin.
-        /// </summary>
-        public void RemoveChatLinkHandler()
-        {
-            Service<ChatGui>.Get().RemoveChatLinkHandler(this.pluginName);
-        }
-        #endregion
-
-        #region Dependency Injection
-
-        /// <summary>
-        /// Create a new object of the provided type using its default constructor, then inject objects and properties.
-        /// </summary>
-        /// <param name="scopedObjects">Objects to inject additionally.</param>
-        /// <typeparam name="T">The type to create.</typeparam>
-        /// <returns>The created and initialized type.</returns>
-        public T? Create<T>(params object[] scopedObjects) where T : class
-        {
-            var svcContainer = Service<IoC.Internal.ServiceContainer>.Get();
-
-            var realScopedObjects = new object[scopedObjects.Length + 1];
-            realScopedObjects[0] = this;
-            Array.Copy(scopedObjects, 0, realScopedObjects, 1, scopedObjects.Length);
-
-            return (T)svcContainer.CreateAsync(typeof(T), realScopedObjects).GetAwaiter().GetResult();
-        }
-
-        /// <summary>
-        /// Inject services into properties on the provided object instance.
-        /// </summary>
-        /// <param name="instance">The instance to inject services into.</param>
-        /// <param name="scopedObjects">Objects to inject additionally.</param>
-        /// <returns>Whether or not the injection succeeded.</returns>
-        public bool Inject(object instance, params object[] scopedObjects)
-        {
-            var svcContainer = Service<IoC.Internal.ServiceContainer>.Get();
-
-            var realScopedObjects = new object[scopedObjects.Length + 1];
-            realScopedObjects[0] = this;
-            Array.Copy(scopedObjects, 0, realScopedObjects, 1, scopedObjects.Length);
-
-            return svcContainer.InjectProperties(instance, realScopedObjects).GetAwaiter().GetResult();
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Unregister your plugin and dispose all references.
-        /// </summary>
-        void IDisposable.Dispose()
-        {
-            this.UiBuilder.ExplicitDispose();
-            Service<ChatGui>.Get().RemoveChatLinkHandler(this.pluginName);
-            Service<Localization>.Get().LocalizationChanged -= this.OnLocalizationChanged;
-            Service<DalamudConfiguration>.Get().DalamudConfigurationSaved -= this.OnDalamudConfigurationSaved;
-        }
-
-        /// <summary>
-        /// Obsolete implicit dispose implementation. Should not be used.
-        /// </summary>
-        [Obsolete("Do not dispose \"DalamudPluginInterface\".", true)]
-        public void Dispose()
-        {
-            // ignored
-        }
-
-        private void OnLocalizationChanged(string langCode)
-        {
-            this.UiLanguage = langCode;
-            this.LanguageChanged?.Invoke(langCode);
-        }
-
-        private void OnDalamudConfigurationSaved(DalamudConfiguration dalamudConfiguration)
-        {
-            this.GeneralChatType = dalamudConfiguration.GeneralChatType;
-        }
+        // this shouldn't be a thing, I think, but just in case
+        return this.configs.Load(this.pluginName);
+    }
+
+    /// <summary>
+    /// Get the config directory.
+    /// </summary>
+    /// <returns>directory with path of AppData/XIVLauncher/pluginConfig/PluginInternalName.</returns>
+    public string GetPluginConfigDirectory() => this.configs.GetDirectory(this.pluginName);
+
+    /// <summary>
+    /// Get the loc directory.
+    /// </summary>
+    /// <returns>directory with path of AppData/XIVLauncher/pluginConfig/PluginInternalName/loc.</returns>
+    public string GetPluginLocDirectory() => this.configs.GetDirectory(Path.Combine(this.pluginName, "loc"));
+
+    #endregion
+
+    #region Chat Links
+
+    /// <summary>
+    /// Register a chat link handler.
+    /// </summary>
+    /// <param name="commandId">The ID of the command.</param>
+    /// <param name="commandAction">The action to be executed.</param>
+    /// <returns>Returns an SeString payload for the link.</returns>
+    public DalamudLinkPayload AddChatLinkHandler(uint commandId, Action<uint, SeString> commandAction)
+    {
+        return Service<ChatGui>.Get().AddChatLinkHandler(this.pluginName, commandId, commandAction);
+    }
+
+    /// <summary>
+    /// Remove a chat link handler.
+    /// </summary>
+    /// <param name="commandId">The ID of the command.</param>
+    public void RemoveChatLinkHandler(uint commandId)
+    {
+        Service<ChatGui>.Get().RemoveChatLinkHandler(this.pluginName, commandId);
+    }
+
+    /// <summary>
+    /// Removes all chat link handlers registered by the plugin.
+    /// </summary>
+    public void RemoveChatLinkHandler()
+    {
+        Service<ChatGui>.Get().RemoveChatLinkHandler(this.pluginName);
+    }
+    #endregion
+
+    #region Dependency Injection
+
+    /// <summary>
+    /// Create a new object of the provided type using its default constructor, then inject objects and properties.
+    /// </summary>
+    /// <param name="scopedObjects">Objects to inject additionally.</param>
+    /// <typeparam name="T">The type to create.</typeparam>
+    /// <returns>The created and initialized type.</returns>
+    public T? Create<T>(params object[] scopedObjects) where T : class
+    {
+        var svcContainer = Service<IoC.Internal.ServiceContainer>.Get();
+
+        var realScopedObjects = new object[scopedObjects.Length + 1];
+        realScopedObjects[0] = this;
+        Array.Copy(scopedObjects, 0, realScopedObjects, 1, scopedObjects.Length);
+
+        return (T)svcContainer.CreateAsync(typeof(T), realScopedObjects).GetAwaiter().GetResult();
+    }
+
+    /// <summary>
+    /// Inject services into properties on the provided object instance.
+    /// </summary>
+    /// <param name="instance">The instance to inject services into.</param>
+    /// <param name="scopedObjects">Objects to inject additionally.</param>
+    /// <returns>Whether or not the injection succeeded.</returns>
+    public bool Inject(object instance, params object[] scopedObjects)
+    {
+        var svcContainer = Service<IoC.Internal.ServiceContainer>.Get();
+
+        var realScopedObjects = new object[scopedObjects.Length + 1];
+        realScopedObjects[0] = this;
+        Array.Copy(scopedObjects, 0, realScopedObjects, 1, scopedObjects.Length);
+
+        return svcContainer.InjectProperties(instance, realScopedObjects).GetAwaiter().GetResult();
+    }
+
+    #endregion
+
+    /// <summary>
+    /// Unregister your plugin and dispose all references.
+    /// </summary>
+    void IDisposable.Dispose()
+    {
+        this.UiBuilder.ExplicitDispose();
+        Service<ChatGui>.Get().RemoveChatLinkHandler(this.pluginName);
+        Service<Localization>.Get().LocalizationChanged -= this.OnLocalizationChanged;
+        Service<DalamudConfiguration>.Get().DalamudConfigurationSaved -= this.OnDalamudConfigurationSaved;
+    }
+
+    /// <summary>
+    /// Obsolete implicit dispose implementation. Should not be used.
+    /// </summary>
+    [Obsolete("Do not dispose \"DalamudPluginInterface\".", true)]
+    public void Dispose()
+    {
+        // ignored
+    }
+
+    private void OnLocalizationChanged(string langCode)
+    {
+        this.UiLanguage = langCode;
+        this.LanguageChanged?.Invoke(langCode);
+    }
+
+    private void OnDalamudConfigurationSaved(DalamudConfiguration dalamudConfiguration)
+    {
+        this.GeneralChatType = dalamudConfiguration.GeneralChatType;
     }
 }
diff --git a/Dalamud/Plugin/IDalamudPlugin.cs b/Dalamud/Plugin/IDalamudPlugin.cs
index 51d67328d..c752df3d6 100644
--- a/Dalamud/Plugin/IDalamudPlugin.cs
+++ b/Dalamud/Plugin/IDalamudPlugin.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace Dalamud.Plugin
+namespace Dalamud.Plugin;
+
+/// <summary>
+/// This interface represents a basic Dalamud plugin. All plugins have to implement this interface.
+/// </summary>
+public interface IDalamudPlugin : IDisposable
 {
     /// <summary>
-    /// This interface represents a basic Dalamud plugin. All plugins have to implement this interface.
+    /// Gets the name of the plugin.
     /// </summary>
-    public interface IDalamudPlugin : IDisposable
-    {
-        /// <summary>
-        /// Gets the name of the plugin.
-        /// </summary>
-        string Name { get; }
-    }
+    string Name { get; }
 }
diff --git a/Dalamud/Plugin/Internal/Exceptions/BannedPluginException.cs b/Dalamud/Plugin/Internal/Exceptions/BannedPluginException.cs
index e4418b6d3..851e5be33 100644
--- a/Dalamud/Plugin/Internal/Exceptions/BannedPluginException.cs
+++ b/Dalamud/Plugin/Internal/Exceptions/BannedPluginException.cs
@@ -1,22 +1,21 @@
-namespace Dalamud.Plugin.Internal.Exceptions
+namespace Dalamud.Plugin.Internal.Exceptions;
+
+/// <summary>
+/// This represents a banned plugin that attempted an operation.
+/// </summary>
+internal class BannedPluginException : PluginException
 {
     /// <summary>
-    /// This represents a banned plugin that attempted an operation.
+    /// Initializes a new instance of the <see cref="BannedPluginException"/> class.
     /// </summary>
-    internal class BannedPluginException : PluginException
+    /// <param name="message">The message describing the invalid operation.</param>
+    public BannedPluginException(string message)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BannedPluginException"/> class.
-        /// </summary>
-        /// <param name="message">The message describing the invalid operation.</param>
-        public BannedPluginException(string message)
-        {
-            this.Message = message;
-        }
-
-        /// <summary>
-        /// Gets the message describing the invalid operation.
-        /// </summary>
-        public override string Message { get; }
+        this.Message = message;
     }
+
+    /// <summary>
+    /// Gets the message describing the invalid operation.
+    /// </summary>
+    public override string Message { get; }
 }
diff --git a/Dalamud/Plugin/Internal/Exceptions/DuplicatePluginException.cs b/Dalamud/Plugin/Internal/Exceptions/DuplicatePluginException.cs
index 093f97e69..79f855537 100644
--- a/Dalamud/Plugin/Internal/Exceptions/DuplicatePluginException.cs
+++ b/Dalamud/Plugin/Internal/Exceptions/DuplicatePluginException.cs
@@ -1,26 +1,25 @@
-namespace Dalamud.Plugin.Internal.Exceptions
+namespace Dalamud.Plugin.Internal.Exceptions;
+
+/// <summary>
+/// This exception that is thrown when a plugin is instructed to load while another plugin with the same
+/// assembly name is already present and loaded.
+/// </summary>
+internal class DuplicatePluginException : PluginException
 {
     /// <summary>
-    /// This exception that is thrown when a plugin is instructed to load while another plugin with the same
-    /// assembly name is already present and loaded.
+    /// Initializes a new instance of the <see cref="DuplicatePluginException"/> class.
     /// </summary>
-    internal class DuplicatePluginException : PluginException
+    /// <param name="assemblyName">Name of the conflicting assembly.</param>
+    public DuplicatePluginException(string assemblyName)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DuplicatePluginException"/> class.
-        /// </summary>
-        /// <param name="assemblyName">Name of the conflicting assembly.</param>
-        public DuplicatePluginException(string assemblyName)
-        {
-            this.AssemblyName = assemblyName;
-        }
-
-        /// <summary>
-        /// Gets the name of the conflicting assembly.
-        /// </summary>
-        public string AssemblyName { get; init; }
-
-        /// <inheritdoc/>
-        public override string Message => $"A plugin with the same assembly name of {this.AssemblyName} is already loaded";
+        this.AssemblyName = assemblyName;
     }
+
+    /// <summary>
+    /// Gets the name of the conflicting assembly.
+    /// </summary>
+    public string AssemblyName { get; init; }
+
+    /// <inheritdoc/>
+    public override string Message => $"A plugin with the same assembly name of {this.AssemblyName} is already loaded";
 }
diff --git a/Dalamud/Plugin/Internal/Exceptions/InvalidPluginException.cs b/Dalamud/Plugin/Internal/Exceptions/InvalidPluginException.cs
index 0488f5539..d158cb8b7 100644
--- a/Dalamud/Plugin/Internal/Exceptions/InvalidPluginException.cs
+++ b/Dalamud/Plugin/Internal/Exceptions/InvalidPluginException.cs
@@ -1,24 +1,23 @@
 using System.IO;
 
-namespace Dalamud.Plugin.Internal.Exceptions
+namespace Dalamud.Plugin.Internal.Exceptions;
+
+/// <summary>
+/// This exception represents a file that does not implement IDalamudPlugin.
+/// </summary>
+internal class InvalidPluginException : PluginException
 {
     /// <summary>
-    /// This exception represents a file that does not implement IDalamudPlugin.
+    /// Initializes a new instance of the <see cref="InvalidPluginException"/> class.
     /// </summary>
-    internal class InvalidPluginException : PluginException
+    /// <param name="dllFile">The invalid file.</param>
+    public InvalidPluginException(FileInfo dllFile)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvalidPluginException"/> class.
-        /// </summary>
-        /// <param name="dllFile">The invalid file.</param>
-        public InvalidPluginException(FileInfo dllFile)
-        {
-            this.DllFile = dllFile;
-        }
-
-        /// <summary>
-        /// Gets the invalid file.
-        /// </summary>
-        public FileInfo DllFile { get; init; }
+        this.DllFile = dllFile;
     }
+
+    /// <summary>
+    /// Gets the invalid file.
+    /// </summary>
+    public FileInfo DllFile { get; init; }
 }
diff --git a/Dalamud/Plugin/Internal/Exceptions/InvalidPluginOperationException.cs b/Dalamud/Plugin/Internal/Exceptions/InvalidPluginOperationException.cs
index a2d8e7361..90905cd6d 100644
--- a/Dalamud/Plugin/Internal/Exceptions/InvalidPluginOperationException.cs
+++ b/Dalamud/Plugin/Internal/Exceptions/InvalidPluginOperationException.cs
@@ -1,22 +1,21 @@
-namespace Dalamud.Plugin.Internal.Exceptions
+namespace Dalamud.Plugin.Internal.Exceptions;
+
+/// <summary>
+/// This represents an invalid plugin operation.
+/// </summary>
+internal class InvalidPluginOperationException : PluginException
 {
     /// <summary>
-    /// This represents an invalid plugin operation.
+    /// Initializes a new instance of the <see cref="InvalidPluginOperationException"/> class.
     /// </summary>
-    internal class InvalidPluginOperationException : PluginException
+    /// <param name="message">The message describing the invalid operation.</param>
+    public InvalidPluginOperationException(string message)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvalidPluginOperationException"/> class.
-        /// </summary>
-        /// <param name="message">The message describing the invalid operation.</param>
-        public InvalidPluginOperationException(string message)
-        {
-            this.Message = message;
-        }
-
-        /// <summary>
-        /// Gets the message describing the invalid operation.
-        /// </summary>
-        public override string Message { get; }
+        this.Message = message;
     }
+
+    /// <summary>
+    /// Gets the message describing the invalid operation.
+    /// </summary>
+    public override string Message { get; }
 }
diff --git a/Dalamud/Plugin/Internal/Exceptions/PluginException.cs b/Dalamud/Plugin/Internal/Exceptions/PluginException.cs
index e4b17b686..292be5431 100644
--- a/Dalamud/Plugin/Internal/Exceptions/PluginException.cs
+++ b/Dalamud/Plugin/Internal/Exceptions/PluginException.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Dalamud.Plugin.Internal.Exceptions
+namespace Dalamud.Plugin.Internal.Exceptions;
+
+/// <summary>
+/// This represents the base Dalamud plugin exception.
+/// </summary>
+internal abstract class PluginException : Exception
 {
-    /// <summary>
-    /// This represents the base Dalamud plugin exception.
-    /// </summary>
-    internal abstract class PluginException : Exception
-    {
-    }
 }
diff --git a/Dalamud/Plugin/Internal/Loader/AssemblyLoadContextBuilder.cs b/Dalamud/Plugin/Internal/Loader/AssemblyLoadContextBuilder.cs
index a4b75f7d3..b7a2ffe2e 100644
--- a/Dalamud/Plugin/Internal/Loader/AssemblyLoadContextBuilder.cs
+++ b/Dalamud/Plugin/Internal/Loader/AssemblyLoadContextBuilder.cs
@@ -9,308 +9,307 @@ using System.Runtime.Loader;
 
 using Dalamud.Plugin.Internal.Loader.LibraryModel;
 
-namespace Dalamud.Plugin.Internal.Loader
+namespace Dalamud.Plugin.Internal.Loader;
+
+/// <summary>
+/// A builder for creating an instance of <see cref="AssemblyLoadContext" />.
+/// </summary>
+internal class AssemblyLoadContextBuilder
 {
+    private readonly List<string> additionalProbingPaths = new();
+    private readonly List<string> resourceProbingPaths = new();
+    private readonly List<string> resourceProbingSubpaths = new();
+    private readonly Dictionary<string, ManagedLibrary> managedLibraries = new(StringComparer.Ordinal);
+    private readonly Dictionary<string, NativeLibrary> nativeLibraries = new(StringComparer.Ordinal);
+    private readonly HashSet<string> privateAssemblies = new(StringComparer.Ordinal);
+    private readonly HashSet<string> defaultAssemblies = new(StringComparer.Ordinal);
+    private AssemblyLoadContext defaultLoadContext = AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()) ?? AssemblyLoadContext.Default;
+    private string? mainAssemblyPath;
+    private bool preferDefaultLoadContext;
+
+    private bool isCollectible;
+    private bool loadInMemory;
+    private bool shadowCopyNativeLibraries;
+
     /// <summary>
-    /// A builder for creating an instance of <see cref="AssemblyLoadContext" />.
+    /// Creates an assembly load context using settings specified on the builder.
     /// </summary>
-    internal class AssemblyLoadContextBuilder
+    /// <returns>A new ManagedLoadContext.</returns>
+    public AssemblyLoadContext Build()
     {
-        private readonly List<string> additionalProbingPaths = new();
-        private readonly List<string> resourceProbingPaths = new();
-        private readonly List<string> resourceProbingSubpaths = new();
-        private readonly Dictionary<string, ManagedLibrary> managedLibraries = new(StringComparer.Ordinal);
-        private readonly Dictionary<string, NativeLibrary> nativeLibraries = new(StringComparer.Ordinal);
-        private readonly HashSet<string> privateAssemblies = new(StringComparer.Ordinal);
-        private readonly HashSet<string> defaultAssemblies = new(StringComparer.Ordinal);
-        private AssemblyLoadContext defaultLoadContext = AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()) ?? AssemblyLoadContext.Default;
-        private string? mainAssemblyPath;
-        private bool preferDefaultLoadContext;
-
-        private bool isCollectible;
-        private bool loadInMemory;
-        private bool shadowCopyNativeLibraries;
-
-        /// <summary>
-        /// Creates an assembly load context using settings specified on the builder.
-        /// </summary>
-        /// <returns>A new ManagedLoadContext.</returns>
-        public AssemblyLoadContext Build()
+        var resourceProbingPaths = new List<string>(this.resourceProbingPaths);
+        foreach (var additionalPath in this.additionalProbingPaths)
         {
-            var resourceProbingPaths = new List<string>(this.resourceProbingPaths);
-            foreach (var additionalPath in this.additionalProbingPaths)
+            foreach (var subPath in this.resourceProbingSubpaths)
             {
-                foreach (var subPath in this.resourceProbingSubpaths)
-                {
-                    resourceProbingPaths.Add(Path.Combine(additionalPath, subPath));
-                }
+                resourceProbingPaths.Add(Path.Combine(additionalPath, subPath));
+            }
+        }
+
+        if (this.mainAssemblyPath == null)
+            throw new InvalidOperationException($"Missing required property. You must call '{nameof(this.SetMainAssemblyPath)}' to configure the default assembly.");
+
+        return new ManagedLoadContext(
+            this.mainAssemblyPath,
+            this.managedLibraries,
+            this.nativeLibraries,
+            this.privateAssemblies,
+            this.defaultAssemblies,
+            this.additionalProbingPaths,
+            resourceProbingPaths,
+            this.defaultLoadContext,
+            this.preferDefaultLoadContext,
+            this.isCollectible,
+            this.loadInMemory,
+            this.shadowCopyNativeLibraries);
+    }
+
+    /// <summary>
+    /// Set the file path to the main assembly for the context. This is used as the starting point for loading
+    /// other assemblies. The directory that contains it is also known as the 'app local' directory.
+    /// </summary>
+    /// <param name="path">The file path. Must not be null or empty. Must be an absolute path.</param>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder SetMainAssemblyPath(string path)
+    {
+        if (string.IsNullOrEmpty(path))
+            throw new ArgumentException("Argument must not be null or empty.", nameof(path));
+
+        if (!Path.IsPathRooted(path))
+            throw new ArgumentException("Argument must be a full path.", nameof(path));
+
+        this.mainAssemblyPath = path;
+
+        return this;
+    }
+
+    /// <summary>
+    /// Replaces the default <see cref="AssemblyLoadContext"/> used by the <see cref="AssemblyLoadContextBuilder"/>.
+    /// Use this feature if the <see cref="AssemblyLoadContext"/> of the <see cref="Assembly"/> is not the Runtime's default load context.
+    /// i.e. (AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly) != <see cref="AssemblyLoadContext.Default"/>.
+    /// </summary>
+    /// <param name="context">The context to set.</param>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder SetDefaultContext(AssemblyLoadContext context)
+    {
+        this.defaultLoadContext = context ?? throw new ArgumentException($"Bad Argument: AssemblyLoadContext in {nameof(AssemblyLoadContextBuilder)}.{nameof(this.SetDefaultContext)} is null.");
+
+        return this;
+    }
+
+    /// <summary>
+    /// Instructs the load context to prefer a private version of this assembly, even if that version is
+    /// different from the version used by the host application.
+    /// Use this when you do not need to exchange types created from within the load context with other contexts
+    /// or the default app context.
+    /// <para>
+    /// This may mean the types loaded from
+    /// this assembly will not match the types from an assembly with the same name, but different version,
+    /// in the host application.
+    /// </para>
+    /// <para>
+    /// For example, if the host application has a type named <c>Foo</c> from assembly <c>Banana, Version=1.0.0.0</c>
+    /// and the load context prefers a private version of <c>Banan, Version=2.0.0.0</c>, when comparing two objects,
+    /// one created by the host (Foo1) and one created from within the load context (Foo2), they will not have the same
+    /// type. <c>Foo1.GetType() != Foo2.GetType()</c>.
+    /// </para>
+    /// </summary>
+    /// <param name="assemblyName">The name of the assembly.</param>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder PreferLoadContextAssembly(AssemblyName assemblyName)
+    {
+        if (assemblyName.Name != null)
+            this.privateAssemblies.Add(assemblyName.Name);
+
+        return this;
+    }
+
+    /// <summary>
+    /// Instructs the load context to first attempt to load assemblies by this name from the default app context, even
+    /// if other assemblies in this load context express a dependency on a higher or lower version.
+    /// Use this when you need to exchange types created from within the load context with other contexts
+    /// or the default app context.
+    /// </summary>
+    /// <param name="assemblyName">The name of the assembly.</param>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder PreferDefaultLoadContextAssembly(AssemblyName assemblyName)
+    {
+        var names = new Queue<AssemblyName>(new[] { assemblyName });
+
+        while (names.TryDequeue(out var name))
+        {
+            if (name.Name == null || this.defaultAssemblies.Contains(name.Name))
+            {
+                // base cases
+                continue;
             }
 
-            if (this.mainAssemblyPath == null)
-                throw new InvalidOperationException($"Missing required property. You must call '{nameof(this.SetMainAssemblyPath)}' to configure the default assembly.");
+            this.defaultAssemblies.Add(name.Name);
 
-            return new ManagedLoadContext(
-                this.mainAssemblyPath,
-                this.managedLibraries,
-                this.nativeLibraries,
-                this.privateAssemblies,
-                this.defaultAssemblies,
-                this.additionalProbingPaths,
-                resourceProbingPaths,
-                this.defaultLoadContext,
-                this.preferDefaultLoadContext,
-                this.isCollectible,
-                this.loadInMemory,
-                this.shadowCopyNativeLibraries);
-        }
+            // Load and find all dependencies of default assemblies.
+            // This sacrifices some performance for determinism in how transitive
+            // dependencies will be shared between host and plugin.
+            var assembly = this.defaultLoadContext.LoadFromAssemblyName(name);
 
-        /// <summary>
-        /// Set the file path to the main assembly for the context. This is used as the starting point for loading
-        /// other assemblies. The directory that contains it is also known as the 'app local' directory.
-        /// </summary>
-        /// <param name="path">The file path. Must not be null or empty. Must be an absolute path.</param>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder SetMainAssemblyPath(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-                throw new ArgumentException("Argument must not be null or empty.", nameof(path));
-
-            if (!Path.IsPathRooted(path))
-                throw new ArgumentException("Argument must be a full path.", nameof(path));
-
-            this.mainAssemblyPath = path;
-
-            return this;
-        }
-
-        /// <summary>
-        /// Replaces the default <see cref="AssemblyLoadContext"/> used by the <see cref="AssemblyLoadContextBuilder"/>.
-        /// Use this feature if the <see cref="AssemblyLoadContext"/> of the <see cref="Assembly"/> is not the Runtime's default load context.
-        /// i.e. (AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly) != <see cref="AssemblyLoadContext.Default"/>.
-        /// </summary>
-        /// <param name="context">The context to set.</param>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder SetDefaultContext(AssemblyLoadContext context)
-        {
-            this.defaultLoadContext = context ?? throw new ArgumentException($"Bad Argument: AssemblyLoadContext in {nameof(AssemblyLoadContextBuilder)}.{nameof(this.SetDefaultContext)} is null.");
-
-            return this;
-        }
-
-        /// <summary>
-        /// Instructs the load context to prefer a private version of this assembly, even if that version is
-        /// different from the version used by the host application.
-        /// Use this when you do not need to exchange types created from within the load context with other contexts
-        /// or the default app context.
-        /// <para>
-        /// This may mean the types loaded from
-        /// this assembly will not match the types from an assembly with the same name, but different version,
-        /// in the host application.
-        /// </para>
-        /// <para>
-        /// For example, if the host application has a type named <c>Foo</c> from assembly <c>Banana, Version=1.0.0.0</c>
-        /// and the load context prefers a private version of <c>Banan, Version=2.0.0.0</c>, when comparing two objects,
-        /// one created by the host (Foo1) and one created from within the load context (Foo2), they will not have the same
-        /// type. <c>Foo1.GetType() != Foo2.GetType()</c>.
-        /// </para>
-        /// </summary>
-        /// <param name="assemblyName">The name of the assembly.</param>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder PreferLoadContextAssembly(AssemblyName assemblyName)
-        {
-            if (assemblyName.Name != null)
-                this.privateAssemblies.Add(assemblyName.Name);
-
-            return this;
-        }
-
-        /// <summary>
-        /// Instructs the load context to first attempt to load assemblies by this name from the default app context, even
-        /// if other assemblies in this load context express a dependency on a higher or lower version.
-        /// Use this when you need to exchange types created from within the load context with other contexts
-        /// or the default app context.
-        /// </summary>
-        /// <param name="assemblyName">The name of the assembly.</param>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder PreferDefaultLoadContextAssembly(AssemblyName assemblyName)
-        {
-            var names = new Queue<AssemblyName>(new[] { assemblyName });
-
-            while (names.TryDequeue(out var name))
+            foreach (var reference in assembly.GetReferencedAssemblies())
             {
-                if (name.Name == null || this.defaultAssemblies.Contains(name.Name))
-                {
-                    // base cases
-                    continue;
-                }
-
-                this.defaultAssemblies.Add(name.Name);
-
-                // Load and find all dependencies of default assemblies.
-                // This sacrifices some performance for determinism in how transitive
-                // dependencies will be shared between host and plugin.
-                var assembly = this.defaultLoadContext.LoadFromAssemblyName(name);
-
-                foreach (var reference in assembly.GetReferencedAssemblies())
-                {
-                    names.Enqueue(reference);
-                }
+                names.Enqueue(reference);
             }
-
-            return this;
         }
 
-        /// <summary>
-        /// Instructs the load context to first search for binaries from the default app context, even
-        /// if other assemblies in this load context express a dependency on a higher or lower version.
-        /// Use this when you need to exchange types created from within the load context with other contexts
-        /// or the default app context.
-        /// <para>
-        /// This may mean the types loaded from within the context are force-downgraded to the version provided
-        /// by the host. <seealso cref="PreferLoadContextAssembly" /> can be used to selectively identify binaries
-        /// which should not be loaded from the default load context.
-        /// </para>
-        /// </summary>
-        /// <param name="preferDefaultLoadContext">When true, first attemp to load binaries from the default load context.</param>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder PreferDefaultLoadContext(bool preferDefaultLoadContext)
+        return this;
+    }
+
+    /// <summary>
+    /// Instructs the load context to first search for binaries from the default app context, even
+    /// if other assemblies in this load context express a dependency on a higher or lower version.
+    /// Use this when you need to exchange types created from within the load context with other contexts
+    /// or the default app context.
+    /// <para>
+    /// This may mean the types loaded from within the context are force-downgraded to the version provided
+    /// by the host. <seealso cref="PreferLoadContextAssembly" /> can be used to selectively identify binaries
+    /// which should not be loaded from the default load context.
+    /// </para>
+    /// </summary>
+    /// <param name="preferDefaultLoadContext">When true, first attemp to load binaries from the default load context.</param>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder PreferDefaultLoadContext(bool preferDefaultLoadContext)
+    {
+        this.preferDefaultLoadContext = preferDefaultLoadContext;
+
+        return this;
+    }
+
+    /// <summary>
+    /// Add a managed library to the load context.
+    /// </summary>
+    /// <param name="library">The managed library.</param>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder AddManagedLibrary(ManagedLibrary library)
+    {
+        ValidateRelativePath(library.AdditionalProbingPath);
+
+        if (library.Name.Name != null)
         {
-            this.preferDefaultLoadContext = preferDefaultLoadContext;
-
-            return this;
+            this.managedLibraries.Add(library.Name.Name, library);
         }
 
-        /// <summary>
-        /// Add a managed library to the load context.
-        /// </summary>
-        /// <param name="library">The managed library.</param>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder AddManagedLibrary(ManagedLibrary library)
-        {
-            ValidateRelativePath(library.AdditionalProbingPath);
+        return this;
+    }
 
-            if (library.Name.Name != null)
-            {
-                this.managedLibraries.Add(library.Name.Name, library);
-            }
+    /// <summary>
+    /// Add a native library to the load context.
+    /// </summary>
+    /// <param name="library">A native library.</param>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder AddNativeLibrary(NativeLibrary library)
+    {
+        ValidateRelativePath(library.AppLocalPath);
+        ValidateRelativePath(library.AdditionalProbingPath);
 
-            return this;
-        }
+        this.nativeLibraries.Add(library.Name, library);
 
-        /// <summary>
-        /// Add a native library to the load context.
-        /// </summary>
-        /// <param name="library">A native library.</param>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder AddNativeLibrary(NativeLibrary library)
-        {
-            ValidateRelativePath(library.AppLocalPath);
-            ValidateRelativePath(library.AdditionalProbingPath);
+        return this;
+    }
 
-            this.nativeLibraries.Add(library.Name, library);
+    /// <summary>
+    /// Add a <paramref name="path"/> that should be used to search for native and managed libraries.
+    /// </summary>
+    /// <param name="path">The file path. Must be a full file path.</param>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder AddProbingPath(string path)
+    {
+        if (string.IsNullOrEmpty(path))
+            throw new ArgumentException("Value must not be null or empty.", nameof(path));
 
-            return this;
-        }
+        if (!Path.IsPathRooted(path))
+            throw new ArgumentException("Argument must be a full path.", nameof(path));
 
-        /// <summary>
-        /// Add a <paramref name="path"/> that should be used to search for native and managed libraries.
-        /// </summary>
-        /// <param name="path">The file path. Must be a full file path.</param>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder AddProbingPath(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-                throw new ArgumentException("Value must not be null or empty.", nameof(path));
+        this.additionalProbingPaths.Add(path);
 
-            if (!Path.IsPathRooted(path))
-                throw new ArgumentException("Argument must be a full path.", nameof(path));
+        return this;
+    }
 
-            this.additionalProbingPaths.Add(path);
+    /// <summary>
+    /// Add a <paramref name="path"/> that should be use to search for resource assemblies (aka satellite assemblies).
+    /// </summary>
+    /// <param name="path">The file path. Must be a full file path.</param>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder AddResourceProbingPath(string path)
+    {
+        if (string.IsNullOrEmpty(path))
+            throw new ArgumentException("Value must not be null or empty.", nameof(path));
 
-            return this;
-        }
+        if (!Path.IsPathRooted(path))
+            throw new ArgumentException("Argument must be a full path.", nameof(path));
 
-        /// <summary>
-        /// Add a <paramref name="path"/> that should be use to search for resource assemblies (aka satellite assemblies).
-        /// </summary>
-        /// <param name="path">The file path. Must be a full file path.</param>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder AddResourceProbingPath(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-                throw new ArgumentException("Value must not be null or empty.", nameof(path));
+        this.resourceProbingPaths.Add(path);
 
-            if (!Path.IsPathRooted(path))
-                throw new ArgumentException("Argument must be a full path.", nameof(path));
+        return this;
+    }
 
-            this.resourceProbingPaths.Add(path);
+    /// <summary>
+    /// Enable unloading the assembly load context.
+    /// </summary>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder EnableUnloading()
+    {
+        this.isCollectible = true;
 
-            return this;
-        }
+        return this;
+    }
 
-        /// <summary>
-        /// Enable unloading the assembly load context.
-        /// </summary>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder EnableUnloading()
-        {
-            this.isCollectible = true;
+    /// <summary>
+    /// Read .dll files into memory to avoid locking the files.
+    /// This is not as efficient, so is not enabled by default, but is required for scenarios
+    /// like hot reloading.
+    /// </summary>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder PreloadAssembliesIntoMemory()
+    {
+        this.loadInMemory = true;
 
-            return this;
-        }
+        return this;
+    }
 
-        /// <summary>
-        /// Read .dll files into memory to avoid locking the files.
-        /// This is not as efficient, so is not enabled by default, but is required for scenarios
-        /// like hot reloading.
-        /// </summary>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder PreloadAssembliesIntoMemory()
-        {
-            this.loadInMemory = true;
+    /// <summary>
+    /// Shadow copy native libraries (unmanaged DLLs) to avoid locking of these files.
+    /// This is not as efficient, so is not enabled by default, but is required for scenarios
+    /// like hot reloading of plugins dependent on native libraries.
+    /// </summary>
+    /// <returns>The builder.</returns>
+    public AssemblyLoadContextBuilder ShadowCopyNativeLibraries()
+    {
+        this.shadowCopyNativeLibraries = true;
 
-            return this;
-        }
+        return this;
+    }
 
-        /// <summary>
-        /// Shadow copy native libraries (unmanaged DLLs) to avoid locking of these files.
-        /// This is not as efficient, so is not enabled by default, but is required for scenarios
-        /// like hot reloading of plugins dependent on native libraries.
-        /// </summary>
-        /// <returns>The builder.</returns>
-        public AssemblyLoadContextBuilder ShadowCopyNativeLibraries()
-        {
-            this.shadowCopyNativeLibraries = true;
+    /// <summary>
+    /// Add a <paramref name="path"/> that should be use to search for resource assemblies (aka satellite assemblies)
+    /// relative to any paths specified as <see cref="AddProbingPath"/>.
+    /// </summary>
+    /// <param name="path">The file path. Must not be a full file path since it will be appended to additional probing path roots.</param>
+    /// <returns>The builder.</returns>
+    internal AssemblyLoadContextBuilder AddResourceProbingSubpath(string path)
+    {
+        if (string.IsNullOrEmpty(path))
+            throw new ArgumentException("Value must not be null or empty.", nameof(path));
 
-            return this;
-        }
+        if (Path.IsPathRooted(path))
+            throw new ArgumentException("Argument must be not a full path.", nameof(path));
 
-        /// <summary>
-        /// Add a <paramref name="path"/> that should be use to search for resource assemblies (aka satellite assemblies)
-        /// relative to any paths specified as <see cref="AddProbingPath"/>.
-        /// </summary>
-        /// <param name="path">The file path. Must not be a full file path since it will be appended to additional probing path roots.</param>
-        /// <returns>The builder.</returns>
-        internal AssemblyLoadContextBuilder AddResourceProbingSubpath(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-                throw new ArgumentException("Value must not be null or empty.", nameof(path));
+        this.resourceProbingSubpaths.Add(path);
 
-            if (Path.IsPathRooted(path))
-                throw new ArgumentException("Argument must be not a full path.", nameof(path));
+        return this;
+    }
 
-            this.resourceProbingSubpaths.Add(path);
+    private static void ValidateRelativePath(string probingPath)
+    {
+        if (string.IsNullOrEmpty(probingPath))
+            throw new ArgumentException("Value must not be null or empty.", nameof(probingPath));
 
-            return this;
-        }
-
-        private static void ValidateRelativePath(string probingPath)
-        {
-            if (string.IsNullOrEmpty(probingPath))
-                throw new ArgumentException("Value must not be null or empty.", nameof(probingPath));
-
-            if (Path.IsPathRooted(probingPath))
-                throw new ArgumentException("Argument must be a relative path.", nameof(probingPath));
-        }
+        if (Path.IsPathRooted(probingPath))
+            throw new ArgumentException("Argument must be a relative path.", nameof(probingPath));
     }
 }
diff --git a/Dalamud/Plugin/Internal/Loader/LibraryModel/ManagedLibrary.cs b/Dalamud/Plugin/Internal/Loader/LibraryModel/ManagedLibrary.cs
index 353c07b96..386184c28 100644
--- a/Dalamud/Plugin/Internal/Loader/LibraryModel/ManagedLibrary.cs
+++ b/Dalamud/Plugin/Internal/Loader/LibraryModel/ManagedLibrary.cs
@@ -6,67 +6,66 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 
-namespace Dalamud.Plugin.Internal.Loader.LibraryModel
+namespace Dalamud.Plugin.Internal.Loader.LibraryModel;
+
+/// <summary>
+/// Represents a managed, .NET assembly.
+/// </summary>
+[DebuggerDisplay("{Name} = {AdditionalProbingPath}")]
+internal class ManagedLibrary
 {
-    /// <summary>
-    /// Represents a managed, .NET assembly.
-    /// </summary>
-    [DebuggerDisplay("{Name} = {AdditionalProbingPath}")]
-    internal class ManagedLibrary
+    private ManagedLibrary(AssemblyName name, string additionalProbingPath, string appLocalPath)
     {
-        private ManagedLibrary(AssemblyName name, string additionalProbingPath, string appLocalPath)
-        {
-            this.Name = name ?? throw new ArgumentNullException(nameof(name));
-            this.AdditionalProbingPath = additionalProbingPath ?? throw new ArgumentNullException(nameof(additionalProbingPath));
-            this.AppLocalPath = appLocalPath ?? throw new ArgumentNullException(nameof(appLocalPath));
-        }
+        this.Name = name ?? throw new ArgumentNullException(nameof(name));
+        this.AdditionalProbingPath = additionalProbingPath ?? throw new ArgumentNullException(nameof(additionalProbingPath));
+        this.AppLocalPath = appLocalPath ?? throw new ArgumentNullException(nameof(appLocalPath));
+    }
 
-        /// <summary>
-        /// Gets the name of the managed library.
-        /// </summary>
-        public AssemblyName Name { get; }
+    /// <summary>
+    /// Gets the name of the managed library.
+    /// </summary>
+    public AssemblyName Name { get; }
 
-        /// <summary>
-        /// Gets the path to file within an additional probing path root. This is typically a combination
-        /// of the NuGet package ID (lowercased), version, and path within the package.
-        /// <para>
-        /// For example, <c>microsoft.data.sqlite/1.0.0/lib/netstandard1.3/Microsoft.Data.Sqlite.dll</c>.
-        /// </para>
-        /// </summary>
-        public string AdditionalProbingPath { get; }
+    /// <summary>
+    /// Gets the path to file within an additional probing path root. This is typically a combination
+    /// of the NuGet package ID (lowercased), version, and path within the package.
+    /// <para>
+    /// For example, <c>microsoft.data.sqlite/1.0.0/lib/netstandard1.3/Microsoft.Data.Sqlite.dll</c>.
+    /// </para>
+    /// </summary>
+    public string AdditionalProbingPath { get; }
 
-        /// <summary>
-        /// Gets the path to file within a deployed, framework-dependent application.
-        /// <para>
-        /// For most managed libraries, this will be the file name.
-        /// For example, <c>MyPlugin1.dll</c>.
-        /// </para>
-        /// <para>
-        /// For runtime-specific managed implementations, this may include a sub folder path.
-        /// For example, <c>runtimes/win/lib/netcoreapp2.0/System.Diagnostics.EventLog.dll</c>.
-        /// </para>
-        /// </summary>
-        public string AppLocalPath { get; }
+    /// <summary>
+    /// Gets the path to file within a deployed, framework-dependent application.
+    /// <para>
+    /// For most managed libraries, this will be the file name.
+    /// For example, <c>MyPlugin1.dll</c>.
+    /// </para>
+    /// <para>
+    /// For runtime-specific managed implementations, this may include a sub folder path.
+    /// For example, <c>runtimes/win/lib/netcoreapp2.0/System.Diagnostics.EventLog.dll</c>.
+    /// </para>
+    /// </summary>
+    public string AppLocalPath { get; }
 
-        /// <summary>
-        /// Create an instance of <see cref="ManagedLibrary" /> from a NuGet package.
-        /// </summary>
-        /// <param name="packageId">The name of the package.</param>
-        /// <param name="packageVersion">The version of the package.</param>
-        /// <param name="assetPath">The path within the NuGet package.</param>
-        /// <returns>A managed library.</returns>
-        public static ManagedLibrary CreateFromPackage(string packageId, string packageVersion, string assetPath)
-        {
-            // When the asset comes from "lib/$tfm/", Microsoft.NET.Sdk will flatten this during publish based on the most compatible TFM.
-            // The SDK will not flatten managed libraries found under runtimes/
-            var appLocalPath = assetPath.StartsWith("lib/")
-                ? Path.GetFileName(assetPath)
-                : assetPath;
+    /// <summary>
+    /// Create an instance of <see cref="ManagedLibrary" /> from a NuGet package.
+    /// </summary>
+    /// <param name="packageId">The name of the package.</param>
+    /// <param name="packageVersion">The version of the package.</param>
+    /// <param name="assetPath">The path within the NuGet package.</param>
+    /// <returns>A managed library.</returns>
+    public static ManagedLibrary CreateFromPackage(string packageId, string packageVersion, string assetPath)
+    {
+        // When the asset comes from "lib/$tfm/", Microsoft.NET.Sdk will flatten this during publish based on the most compatible TFM.
+        // The SDK will not flatten managed libraries found under runtimes/
+        var appLocalPath = assetPath.StartsWith("lib/")
+                               ? Path.GetFileName(assetPath)
+                               : assetPath;
 
-            return new ManagedLibrary(
-                new AssemblyName(Path.GetFileNameWithoutExtension(assetPath)),
-                Path.Combine(packageId.ToLowerInvariant(), packageVersion, assetPath),
-                appLocalPath);
-        }
+        return new ManagedLibrary(
+            new AssemblyName(Path.GetFileNameWithoutExtension(assetPath)),
+            Path.Combine(packageId.ToLowerInvariant(), packageVersion, assetPath),
+            appLocalPath);
     }
 }
diff --git a/Dalamud/Plugin/Internal/Loader/LibraryModel/NativeLibrary.cs b/Dalamud/Plugin/Internal/Loader/LibraryModel/NativeLibrary.cs
index 35d6eb3e8..47b9f701d 100644
--- a/Dalamud/Plugin/Internal/Loader/LibraryModel/NativeLibrary.cs
+++ b/Dalamud/Plugin/Internal/Loader/LibraryModel/NativeLibrary.cs
@@ -5,64 +5,63 @@ using System;
 using System.Diagnostics;
 using System.IO;
 
-namespace Dalamud.Plugin.Internal.Loader.LibraryModel
+namespace Dalamud.Plugin.Internal.Loader.LibraryModel;
+
+/// <summary>
+/// Represents an unmanaged library, such as `libsqlite3`, which may need to be loaded
+/// for P/Invoke to work.
+/// </summary>
+[DebuggerDisplay("{Name} = {AdditionalProbingPath}")]
+internal class NativeLibrary
 {
-    /// <summary>
-    /// Represents an unmanaged library, such as `libsqlite3`, which may need to be loaded
-    /// for P/Invoke to work.
-    /// </summary>
-    [DebuggerDisplay("{Name} = {AdditionalProbingPath}")]
-    internal class NativeLibrary
+    private NativeLibrary(string name, string appLocalPath, string additionalProbingPath)
     {
-        private NativeLibrary(string name, string appLocalPath, string additionalProbingPath)
-        {
-            this.Name = name ?? throw new ArgumentNullException(nameof(name));
-            this.AppLocalPath = appLocalPath ?? throw new ArgumentNullException(nameof(appLocalPath));
-            this.AdditionalProbingPath = additionalProbingPath ?? throw new ArgumentNullException(nameof(additionalProbingPath));
-        }
+        this.Name = name ?? throw new ArgumentNullException(nameof(name));
+        this.AppLocalPath = appLocalPath ?? throw new ArgumentNullException(nameof(appLocalPath));
+        this.AdditionalProbingPath = additionalProbingPath ?? throw new ArgumentNullException(nameof(additionalProbingPath));
+    }
 
-        /// <summary>
-        /// Gets the name of the native library. This should match the name of the P/Invoke call.
-        /// <para>
-        /// For example, if specifying `[DllImport("sqlite3")]`, <see cref="Name" /> should be <c>sqlite3</c>.
-        /// This may not match the exact file name as loading will attempt variations on the name according
-        /// to OS convention. On Windows, P/Invoke will attempt to load `sqlite3.dll`. On macOS, it will
-        /// attempt to find `sqlite3.dylib` and `libsqlite3.dylib`. On Linux, it will attempt to find
-        /// `sqlite3.so` and `libsqlite3.so`.
-        /// </para>
-        /// </summary>
-        public string Name { get; }
+    /// <summary>
+    /// Gets the name of the native library. This should match the name of the P/Invoke call.
+    /// <para>
+    /// For example, if specifying `[DllImport("sqlite3")]`, <see cref="Name" /> should be <c>sqlite3</c>.
+    /// This may not match the exact file name as loading will attempt variations on the name according
+    /// to OS convention. On Windows, P/Invoke will attempt to load `sqlite3.dll`. On macOS, it will
+    /// attempt to find `sqlite3.dylib` and `libsqlite3.dylib`. On Linux, it will attempt to find
+    /// `sqlite3.so` and `libsqlite3.so`.
+    /// </para>
+    /// </summary>
+    public string Name { get; }
 
-        /// <summary>
-        /// Gets the path to file within a deployed, framework-dependent application.
-        /// <para>
-        /// For example, <c>runtimes/linux-x64/native/libsqlite.so</c>.
-        /// </para>
-        /// </summary>
-        public string AppLocalPath { get; }
+    /// <summary>
+    /// Gets the path to file within a deployed, framework-dependent application.
+    /// <para>
+    /// For example, <c>runtimes/linux-x64/native/libsqlite.so</c>.
+    /// </para>
+    /// </summary>
+    public string AppLocalPath { get; }
 
-        /// <summary>
-        /// Gets the path to file within an additional probing path root. This is typically a combination
-        /// of the NuGet package ID (lowercased), version, and path within the package.
-        /// <para>
-        /// For example, <c>sqlite/3.13.3/runtimes/linux-x64/native/libsqlite.so</c>.
-        /// </para>
-        /// </summary>
-        public string AdditionalProbingPath { get; }
+    /// <summary>
+    /// Gets the path to file within an additional probing path root. This is typically a combination
+    /// of the NuGet package ID (lowercased), version, and path within the package.
+    /// <para>
+    /// For example, <c>sqlite/3.13.3/runtimes/linux-x64/native/libsqlite.so</c>.
+    /// </para>
+    /// </summary>
+    public string AdditionalProbingPath { get; }
 
-        /// <summary>
-        /// Create an instance of <see cref="NativeLibrary" /> from a NuGet package.
-        /// </summary>
-        /// <param name="packageId">The name of the package.</param>
-        /// <param name="packageVersion">The version of the package.</param>
-        /// <param name="assetPath">The path within the NuGet package.</param>
-        /// <returns>A native library.</returns>
-        public static NativeLibrary CreateFromPackage(string packageId, string packageVersion, string assetPath)
-        {
-            return new NativeLibrary(
-                Path.GetFileNameWithoutExtension(assetPath),
-                assetPath,
-                Path.Combine(packageId.ToLowerInvariant(), packageVersion, assetPath));
-        }
+    /// <summary>
+    /// Create an instance of <see cref="NativeLibrary" /> from a NuGet package.
+    /// </summary>
+    /// <param name="packageId">The name of the package.</param>
+    /// <param name="packageVersion">The version of the package.</param>
+    /// <param name="assetPath">The path within the NuGet package.</param>
+    /// <returns>A native library.</returns>
+    public static NativeLibrary CreateFromPackage(string packageId, string packageVersion, string assetPath)
+    {
+        return new NativeLibrary(
+            Path.GetFileNameWithoutExtension(assetPath),
+            assetPath,
+            Path.Combine(packageId.ToLowerInvariant(), packageVersion, assetPath));
     }
 }
diff --git a/Dalamud/Plugin/Internal/Loader/LoaderConfig.cs b/Dalamud/Plugin/Internal/Loader/LoaderConfig.cs
index 90cf44d07..d3fcdc99e 100644
--- a/Dalamud/Plugin/Internal/Loader/LoaderConfig.cs
+++ b/Dalamud/Plugin/Internal/Loader/LoaderConfig.cs
@@ -7,71 +7,70 @@ using System.IO;
 using System.Reflection;
 using System.Runtime.Loader;
 
-namespace Dalamud.Plugin.Internal.Loader
+namespace Dalamud.Plugin.Internal.Loader;
+
+/// <summary>
+/// Represents the configuration for a plugin loader.
+/// </summary>
+internal class LoaderConfig
 {
     /// <summary>
-    /// Represents the configuration for a plugin loader.
+    /// Initializes a new instance of the <see cref="LoaderConfig"/> class.
     /// </summary>
-    internal class LoaderConfig
+    /// <param name="mainAssemblyPath">The full file path to the main assembly for the plugin.</param>
+    public LoaderConfig(string mainAssemblyPath)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LoaderConfig"/> class.
-        /// </summary>
-        /// <param name="mainAssemblyPath">The full file path to the main assembly for the plugin.</param>
-        public LoaderConfig(string mainAssemblyPath)
-        {
-            if (string.IsNullOrEmpty(mainAssemblyPath))
-                throw new ArgumentException("Value must be null or not empty", nameof(mainAssemblyPath));
+        if (string.IsNullOrEmpty(mainAssemblyPath))
+            throw new ArgumentException("Value must be null or not empty", nameof(mainAssemblyPath));
 
-            if (!Path.IsPathRooted(mainAssemblyPath))
-                throw new ArgumentException("Value must be an absolute file path", nameof(mainAssemblyPath));
+        if (!Path.IsPathRooted(mainAssemblyPath))
+            throw new ArgumentException("Value must be an absolute file path", nameof(mainAssemblyPath));
 
-            if (!File.Exists(mainAssemblyPath))
-                throw new ArgumentException("Value must exist", nameof(mainAssemblyPath));
+        if (!File.Exists(mainAssemblyPath))
+            throw new ArgumentException("Value must exist", nameof(mainAssemblyPath));
 
-            this.MainAssemblyPath = mainAssemblyPath;
-        }
-
-        /// <summary>
-        /// Gets the file path to the main assembly.
-        /// </summary>
-        public string MainAssemblyPath { get; }
-
-        /// <summary>
-        /// Gets a list of assemblies which should be treated as private.
-        /// </summary>
-        public ICollection<AssemblyName> PrivateAssemblies { get; } = new List<AssemblyName>();
-
-        /// <summary>
-        /// Gets a list of assemblies which should be unified between the host and the plugin.
-        /// </summary>
-        /// <seealso href="https://github.com/natemcmaster/DotNetCorePlugins/blob/main/docs/what-are-shared-types.md">what-are-shared-types</seealso>
-        public ICollection<AssemblyName> SharedAssemblies { get; } = new List<AssemblyName>();
-
-        /// <summary>
-        /// Gets or sets a value indicating whether attempt to unify all types from a plugin with the host.
-        /// <para>
-        /// This does not guarantee types will unify.
-        /// </para>
-        /// <seealso href="https://github.com/natemcmaster/DotNetCorePlugins/blob/main/docs/what-are-shared-types.md">what-are-shared-types</seealso>
-        /// </summary>
-        public bool PreferSharedTypes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the default <see cref="AssemblyLoadContext"/> used by the <see cref="PluginLoader"/>.
-        /// Use this feature if the <see cref="AssemblyLoadContext"/> of the <see cref="Assembly"/> is not the Runtime's default load context.
-        /// i.e. (AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly) != <see cref="AssemblyLoadContext.Default"/>.
-        /// </summary>
-        public AssemblyLoadContext DefaultContext { get; set; } = AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()) ?? AssemblyLoadContext.Default;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the plugin can be unloaded from memory.
-        /// </summary>
-        public bool IsUnloadable { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to load assemblies into memory in order to not lock files.
-        /// </summary>
-        public bool LoadInMemory { get; set; }
+        this.MainAssemblyPath = mainAssemblyPath;
     }
+
+    /// <summary>
+    /// Gets the file path to the main assembly.
+    /// </summary>
+    public string MainAssemblyPath { get; }
+
+    /// <summary>
+    /// Gets a list of assemblies which should be treated as private.
+    /// </summary>
+    public ICollection<AssemblyName> PrivateAssemblies { get; } = new List<AssemblyName>();
+
+    /// <summary>
+    /// Gets a list of assemblies which should be unified between the host and the plugin.
+    /// </summary>
+    /// <seealso href="https://github.com/natemcmaster/DotNetCorePlugins/blob/main/docs/what-are-shared-types.md">what-are-shared-types</seealso>
+    public ICollection<AssemblyName> SharedAssemblies { get; } = new List<AssemblyName>();
+
+    /// <summary>
+    /// Gets or sets a value indicating whether attempt to unify all types from a plugin with the host.
+    /// <para>
+    /// This does not guarantee types will unify.
+    /// </para>
+    /// <seealso href="https://github.com/natemcmaster/DotNetCorePlugins/blob/main/docs/what-are-shared-types.md">what-are-shared-types</seealso>
+    /// </summary>
+    public bool PreferSharedTypes { get; set; }
+
+    /// <summary>
+    /// Gets or sets the default <see cref="AssemblyLoadContext"/> used by the <see cref="PluginLoader"/>.
+    /// Use this feature if the <see cref="AssemblyLoadContext"/> of the <see cref="Assembly"/> is not the Runtime's default load context.
+    /// i.e. (AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly) != <see cref="AssemblyLoadContext.Default"/>.
+    /// </summary>
+    public AssemblyLoadContext DefaultContext { get; set; } = AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()) ?? AssemblyLoadContext.Default;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the plugin can be unloaded from memory.
+    /// </summary>
+    public bool IsUnloadable { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether to load assemblies into memory in order to not lock files.
+    /// </summary>
+    public bool LoadInMemory { get; set; }
 }
diff --git a/Dalamud/Plugin/Internal/Loader/ManagedLoadContext.cs b/Dalamud/Plugin/Internal/Loader/ManagedLoadContext.cs
index 26bc3d7d3..4bb326ce4 100644
--- a/Dalamud/Plugin/Internal/Loader/ManagedLoadContext.cs
+++ b/Dalamud/Plugin/Internal/Loader/ManagedLoadContext.cs
@@ -11,387 +11,386 @@ using System.Runtime.Loader;
 
 using Dalamud.Plugin.Internal.Loader.LibraryModel;
 
-namespace Dalamud.Plugin.Internal.Loader
+namespace Dalamud.Plugin.Internal.Loader;
+
+/// <summary>
+/// An implementation of <see cref="AssemblyLoadContext" /> which attempts to load managed and native
+/// binaries at runtime immitating some of the behaviors of corehost.
+/// </summary>
+[DebuggerDisplay("'{Name}' ({_mainAssemblyPath})")]
+internal class ManagedLoadContext : AssemblyLoadContext
 {
+    private readonly string basePath;
+    private readonly string mainAssemblyPath;
+    private readonly IReadOnlyDictionary<string, ManagedLibrary> managedAssemblies;
+    private readonly IReadOnlyDictionary<string, NativeLibrary> nativeLibraries;
+    private readonly IReadOnlyCollection<string> privateAssemblies;
+    private readonly ICollection<string> defaultAssemblies;
+    private readonly IReadOnlyCollection<string> additionalProbingPaths;
+    private readonly bool preferDefaultLoadContext;
+    private readonly string[] resourceRoots;
+    private readonly bool loadInMemory;
+    private readonly AssemblyLoadContext defaultLoadContext;
+    private readonly AssemblyDependencyResolver dependencyResolver;
+    private readonly bool shadowCopyNativeLibraries;
+    private readonly string unmanagedDllShadowCopyDirectoryPath;
+
     /// <summary>
-    /// An implementation of <see cref="AssemblyLoadContext" /> which attempts to load managed and native
-    /// binaries at runtime immitating some of the behaviors of corehost.
+    /// Initializes a new instance of the <see cref="ManagedLoadContext"/> class.
     /// </summary>
-    [DebuggerDisplay("'{Name}' ({_mainAssemblyPath})")]
-    internal class ManagedLoadContext : AssemblyLoadContext
+    /// <param name="mainAssemblyPath">Main assembly path.</param>
+    /// <param name="managedAssemblies">Managed assemblies.</param>
+    /// <param name="nativeLibraries">Native assemblies.</param>
+    /// <param name="privateAssemblies">Private assemblies.</param>
+    /// <param name="defaultAssemblies">Default assemblies.</param>
+    /// <param name="additionalProbingPaths">Additional probing paths.</param>
+    /// <param name="resourceProbingPaths">Resource probing paths.</param>
+    /// <param name="defaultLoadContext">Default load context.</param>
+    /// <param name="preferDefaultLoadContext">If the default load context should be prefered.</param>
+    /// <param name="isCollectible">If the dll is collectible.</param>
+    /// <param name="loadInMemory">If the dll should  be loaded in memory.</param>
+    /// <param name="shadowCopyNativeLibraries">If native libraries should be shadow copied.</param>
+    public ManagedLoadContext(
+        string mainAssemblyPath,
+        IReadOnlyDictionary<string, ManagedLibrary> managedAssemblies,
+        IReadOnlyDictionary<string, NativeLibrary> nativeLibraries,
+        IReadOnlyCollection<string> privateAssemblies,
+        IReadOnlyCollection<string> defaultAssemblies,
+        IReadOnlyCollection<string> additionalProbingPaths,
+        IReadOnlyCollection<string> resourceProbingPaths,
+        AssemblyLoadContext defaultLoadContext,
+        bool preferDefaultLoadContext,
+        bool isCollectible,
+        bool loadInMemory,
+        bool shadowCopyNativeLibraries)
+        : base(Path.GetFileNameWithoutExtension(mainAssemblyPath), isCollectible)
     {
-        private readonly string basePath;
-        private readonly string mainAssemblyPath;
-        private readonly IReadOnlyDictionary<string, ManagedLibrary> managedAssemblies;
-        private readonly IReadOnlyDictionary<string, NativeLibrary> nativeLibraries;
-        private readonly IReadOnlyCollection<string> privateAssemblies;
-        private readonly ICollection<string> defaultAssemblies;
-        private readonly IReadOnlyCollection<string> additionalProbingPaths;
-        private readonly bool preferDefaultLoadContext;
-        private readonly string[] resourceRoots;
-        private readonly bool loadInMemory;
-        private readonly AssemblyLoadContext defaultLoadContext;
-        private readonly AssemblyDependencyResolver dependencyResolver;
-        private readonly bool shadowCopyNativeLibraries;
-        private readonly string unmanagedDllShadowCopyDirectoryPath;
+        if (resourceProbingPaths == null)
+            throw new ArgumentNullException(nameof(resourceProbingPaths));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ManagedLoadContext"/> class.
-        /// </summary>
-        /// <param name="mainAssemblyPath">Main assembly path.</param>
-        /// <param name="managedAssemblies">Managed assemblies.</param>
-        /// <param name="nativeLibraries">Native assemblies.</param>
-        /// <param name="privateAssemblies">Private assemblies.</param>
-        /// <param name="defaultAssemblies">Default assemblies.</param>
-        /// <param name="additionalProbingPaths">Additional probing paths.</param>
-        /// <param name="resourceProbingPaths">Resource probing paths.</param>
-        /// <param name="defaultLoadContext">Default load context.</param>
-        /// <param name="preferDefaultLoadContext">If the default load context should be prefered.</param>
-        /// <param name="isCollectible">If the dll is collectible.</param>
-        /// <param name="loadInMemory">If the dll should  be loaded in memory.</param>
-        /// <param name="shadowCopyNativeLibraries">If native libraries should be shadow copied.</param>
-        public ManagedLoadContext(
-            string mainAssemblyPath,
-            IReadOnlyDictionary<string, ManagedLibrary> managedAssemblies,
-            IReadOnlyDictionary<string, NativeLibrary> nativeLibraries,
-            IReadOnlyCollection<string> privateAssemblies,
-            IReadOnlyCollection<string> defaultAssemblies,
-            IReadOnlyCollection<string> additionalProbingPaths,
-            IReadOnlyCollection<string> resourceProbingPaths,
-            AssemblyLoadContext defaultLoadContext,
-            bool preferDefaultLoadContext,
-            bool isCollectible,
-            bool loadInMemory,
-            bool shadowCopyNativeLibraries)
-            : base(Path.GetFileNameWithoutExtension(mainAssemblyPath), isCollectible)
+        this.mainAssemblyPath = mainAssemblyPath ?? throw new ArgumentNullException(nameof(mainAssemblyPath));
+        this.dependencyResolver = new AssemblyDependencyResolver(mainAssemblyPath);
+        this.basePath = Path.GetDirectoryName(mainAssemblyPath) ?? throw new ArgumentException("Invalid assembly path", nameof(mainAssemblyPath));
+        this.managedAssemblies = managedAssemblies ?? throw new ArgumentNullException(nameof(managedAssemblies));
+        this.privateAssemblies = privateAssemblies ?? throw new ArgumentNullException(nameof(privateAssemblies));
+        this.defaultAssemblies = defaultAssemblies != null ? defaultAssemblies.ToList() : throw new ArgumentNullException(nameof(defaultAssemblies));
+        this.nativeLibraries = nativeLibraries ?? throw new ArgumentNullException(nameof(nativeLibraries));
+        this.additionalProbingPaths = additionalProbingPaths ?? throw new ArgumentNullException(nameof(additionalProbingPaths));
+        this.defaultLoadContext = defaultLoadContext;
+        this.preferDefaultLoadContext = preferDefaultLoadContext;
+        this.loadInMemory = loadInMemory;
+
+        this.resourceRoots = new[] { this.basePath }
+                             .Concat(resourceProbingPaths)
+                             .ToArray();
+
+        this.shadowCopyNativeLibraries = shadowCopyNativeLibraries;
+        this.unmanagedDllShadowCopyDirectoryPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+
+        if (shadowCopyNativeLibraries)
         {
-            if (resourceProbingPaths == null)
-                throw new ArgumentNullException(nameof(resourceProbingPaths));
+            this.Unloading += _ => this.OnUnloaded();
+        }
+    }
 
-            this.mainAssemblyPath = mainAssemblyPath ?? throw new ArgumentNullException(nameof(mainAssemblyPath));
-            this.dependencyResolver = new AssemblyDependencyResolver(mainAssemblyPath);
-            this.basePath = Path.GetDirectoryName(mainAssemblyPath) ?? throw new ArgumentException("Invalid assembly path", nameof(mainAssemblyPath));
-            this.managedAssemblies = managedAssemblies ?? throw new ArgumentNullException(nameof(managedAssemblies));
-            this.privateAssemblies = privateAssemblies ?? throw new ArgumentNullException(nameof(privateAssemblies));
-            this.defaultAssemblies = defaultAssemblies != null ? defaultAssemblies.ToList() : throw new ArgumentNullException(nameof(defaultAssemblies));
-            this.nativeLibraries = nativeLibraries ?? throw new ArgumentNullException(nameof(nativeLibraries));
-            this.additionalProbingPaths = additionalProbingPaths ?? throw new ArgumentNullException(nameof(additionalProbingPaths));
-            this.defaultLoadContext = defaultLoadContext;
-            this.preferDefaultLoadContext = preferDefaultLoadContext;
-            this.loadInMemory = loadInMemory;
+    /// <summary>
+    /// Load an assembly from a filepath.
+    /// </summary>
+    /// <param name="path">Assembly path.</param>
+    /// <returns>A loaded assembly.</returns>
+    public Assembly LoadAssemblyFromFilePath(string path)
+    {
+        if (!this.loadInMemory)
+            return this.LoadFromAssemblyPath(path);
 
-            this.resourceRoots = new[] { this.basePath }
-                .Concat(resourceProbingPaths)
-                .ToArray();
+        using var file = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read);
 
-            this.shadowCopyNativeLibraries = shadowCopyNativeLibraries;
-            this.unmanagedDllShadowCopyDirectoryPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+        var pdbPath = Path.ChangeExtension(path, ".pdb");
+        if (File.Exists(pdbPath))
+        {
+            using var pdbFile = File.Open(pdbPath, FileMode.Open, FileAccess.Read, FileShare.Read);
+            return this.LoadFromStream(file, pdbFile);
+        }
 
-            if (shadowCopyNativeLibraries)
+        return this.LoadFromStream(file);
+    }
+
+    /// <summary>
+    /// Load an assembly.
+    /// </summary>
+    /// <param name="assemblyName">Name of the assembly.</param>
+    /// <returns>Loaded assembly.</returns>
+    protected override Assembly? Load(AssemblyName assemblyName)
+    {
+        if (assemblyName.Name == null)
+        {
+            // not sure how to handle this case. It's technically possible.
+            return null;
+        }
+
+        if ((this.preferDefaultLoadContext || this.defaultAssemblies.Contains(assemblyName.Name)) && !this.privateAssemblies.Contains(assemblyName.Name))
+        {
+            // If default context is preferred, check first for types in the default context unless the dependency has been declared as private
+            try
             {
-                this.Unloading += _ => this.OnUnloaded();
+                var defaultAssembly = this.defaultLoadContext.LoadFromAssemblyName(assemblyName);
+                if (defaultAssembly != null)
+                {
+                    // Older versions used to return null here such that returned assembly would be resolved from the default ALC.
+                    // However, with the addition of custom default ALCs, the Default ALC may not be the user's chosen ALC when
+                    // this context was built. As such, we simply return the Assembly from the user's chosen default load context.
+                    return defaultAssembly;
+                }
+            }
+            catch
+            {
+                // Swallow errors in loading from the default context
             }
         }
 
-        /// <summary>
-        /// Load an assembly from a filepath.
-        /// </summary>
-        /// <param name="path">Assembly path.</param>
-        /// <returns>A loaded assembly.</returns>
-        public Assembly LoadAssemblyFromFilePath(string path)
+        var resolvedPath = this.dependencyResolver.ResolveAssemblyToPath(assemblyName);
+        if (!string.IsNullOrEmpty(resolvedPath) && File.Exists(resolvedPath))
         {
-            if (!this.loadInMemory)
-                return this.LoadFromAssemblyPath(path);
-
-            using var file = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read);
-
-            var pdbPath = Path.ChangeExtension(path, ".pdb");
-            if (File.Exists(pdbPath))
-            {
-                using var pdbFile = File.Open(pdbPath, FileMode.Open, FileAccess.Read, FileShare.Read);
-                return this.LoadFromStream(file, pdbFile);
-            }
-
-            return this.LoadFromStream(file);
+            return this.LoadAssemblyFromFilePath(resolvedPath);
         }
 
-        /// <summary>
-        /// Load an assembly.
-        /// </summary>
-        /// <param name="assemblyName">Name of the assembly.</param>
-        /// <returns>Loaded assembly.</returns>
-        protected override Assembly? Load(AssemblyName assemblyName)
+        // Resource assembly binding does not use the TPA. Instead, it probes PLATFORM_RESOURCE_ROOTS (a list of folders)
+        // for $folder/$culture/$assemblyName.dll
+        // See https://github.com/dotnet/coreclr/blob/3fca50a36e62a7433d7601d805d38de6baee7951/src/binder/assemblybinder.cpp#L1232-L1290
+
+        if (!string.IsNullOrEmpty(assemblyName.CultureName) && !string.Equals(assemblyName.CultureName, "neutral"))
         {
-            if (assemblyName.Name == null)
+            foreach (var resourceRoot in this.resourceRoots)
             {
-                // not sure how to handle this case. It's technically possible.
-                return null;
-            }
-
-            if ((this.preferDefaultLoadContext || this.defaultAssemblies.Contains(assemblyName.Name)) && !this.privateAssemblies.Contains(assemblyName.Name))
-            {
-                // If default context is preferred, check first for types in the default context unless the dependency has been declared as private
-                try
+                var resourcePath = Path.Combine(resourceRoot, assemblyName.CultureName, assemblyName.Name + ".dll");
+                if (File.Exists(resourcePath))
                 {
-                    var defaultAssembly = this.defaultLoadContext.LoadFromAssemblyName(assemblyName);
-                    if (defaultAssembly != null)
-                    {
-                        // Older versions used to return null here such that returned assembly would be resolved from the default ALC.
-                        // However, with the addition of custom default ALCs, the Default ALC may not be the user's chosen ALC when
-                        // this context was built. As such, we simply return the Assembly from the user's chosen default load context.
-                        return defaultAssembly;
-                    }
-                }
-                catch
-                {
-                    // Swallow errors in loading from the default context
-                }
-            }
-
-            var resolvedPath = this.dependencyResolver.ResolveAssemblyToPath(assemblyName);
-            if (!string.IsNullOrEmpty(resolvedPath) && File.Exists(resolvedPath))
-            {
-                return this.LoadAssemblyFromFilePath(resolvedPath);
-            }
-
-            // Resource assembly binding does not use the TPA. Instead, it probes PLATFORM_RESOURCE_ROOTS (a list of folders)
-            // for $folder/$culture/$assemblyName.dll
-            // See https://github.com/dotnet/coreclr/blob/3fca50a36e62a7433d7601d805d38de6baee7951/src/binder/assemblybinder.cpp#L1232-L1290
-
-            if (!string.IsNullOrEmpty(assemblyName.CultureName) && !string.Equals(assemblyName.CultureName, "neutral"))
-            {
-                foreach (var resourceRoot in this.resourceRoots)
-                {
-                    var resourcePath = Path.Combine(resourceRoot, assemblyName.CultureName, assemblyName.Name + ".dll");
-                    if (File.Exists(resourcePath))
-                    {
-                        return this.LoadAssemblyFromFilePath(resourcePath);
-                    }
-                }
-
-                return null;
-            }
-
-            if (this.managedAssemblies.TryGetValue(assemblyName.Name, out var library) && library != null)
-            {
-                if (this.SearchForLibrary(library, out var path) && path != null)
-                {
-                    return this.LoadAssemblyFromFilePath(path);
-                }
-            }
-            else
-            {
-                // if an assembly was not listed in the list of known assemblies,
-                // fallback to the load context base directory
-                var dllName = assemblyName.Name + ".dll";
-                foreach (var probingPath in this.additionalProbingPaths.Prepend(this.basePath))
-                {
-                    var localFile = Path.Combine(probingPath, dllName);
-                    if (File.Exists(localFile))
-                    {
-                        return this.LoadAssemblyFromFilePath(localFile);
-                    }
+                    return this.LoadAssemblyFromFilePath(resourcePath);
                 }
             }
 
             return null;
         }
 
-        /// <summary>
-        /// Loads the unmanaged binary using configured list of native libraries.
-        /// </summary>
-        /// <param name="unmanagedDllName">Unmanaged DLL name.</param>
-        /// <returns>The unmanaged dll handle.</returns>
-        protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
+        if (this.managedAssemblies.TryGetValue(assemblyName.Name, out var library) && library != null)
         {
-            var resolvedPath = this.dependencyResolver.ResolveUnmanagedDllToPath(unmanagedDllName);
-            if (!string.IsNullOrEmpty(resolvedPath) && File.Exists(resolvedPath))
+            if (this.SearchForLibrary(library, out var path) && path != null)
             {
-                return this.LoadUnmanagedDllFromResolvedPath(resolvedPath, normalizePath: false);
+                return this.LoadAssemblyFromFilePath(path);
             }
-
-            foreach (var prefix in PlatformInformation.NativeLibraryPrefixes)
+        }
+        else
+        {
+            // if an assembly was not listed in the list of known assemblies,
+            // fallback to the load context base directory
+            var dllName = assemblyName.Name + ".dll";
+            foreach (var probingPath in this.additionalProbingPaths.Prepend(this.basePath))
             {
-                if (this.nativeLibraries.TryGetValue(prefix + unmanagedDllName, out var library))
+                var localFile = Path.Combine(probingPath, dllName);
+                if (File.Exists(localFile))
                 {
-                    if (this.SearchForLibrary(library, prefix, out var path) && path != null)
-                    {
-                        return this.LoadUnmanagedDllFromResolvedPath(path);
-                    }
-                }
-                else
-                {
-                    // coreclr allows code to use [DllImport("sni")] or [DllImport("sni.dll")]
-                    // This library treats the file name without the extension as the lookup name,
-                    // so this loop is necessary to check if the unmanaged name matches a library
-                    // when the file extension has been trimmed.
-                    foreach (var suffix in PlatformInformation.NativeLibraryExtensions)
-                    {
-                        if (!unmanagedDllName.EndsWith(suffix, StringComparison.OrdinalIgnoreCase))
-                        {
-                            continue;
-                        }
-
-                        // check to see if there is a library entry for the library without the file extension
-                        var trimmedName = unmanagedDllName.Substring(0, unmanagedDllName.Length - suffix.Length);
-
-                        if (this.nativeLibraries.TryGetValue(prefix + trimmedName, out library))
-                        {
-                            if (this.SearchForLibrary(library, prefix, out var path) && path != null)
-                            {
-                                return this.LoadUnmanagedDllFromResolvedPath(path);
-                            }
-                        }
-                        else
-                        {
-                            // fallback to native assets which match the file name in the plugin base directory
-                            var prefixSuffixDllName = prefix + unmanagedDllName + suffix;
-                            var prefixDllName = prefix + unmanagedDllName;
-
-                            foreach (var probingPath in this.additionalProbingPaths.Prepend(this.basePath))
-                            {
-                                var localFile = Path.Combine(probingPath, prefixSuffixDllName);
-                                if (File.Exists(localFile))
-                                {
-                                    return this.LoadUnmanagedDllFromResolvedPath(localFile);
-                                }
-
-                                var localFileWithoutSuffix = Path.Combine(probingPath, prefixDllName);
-                                if (File.Exists(localFileWithoutSuffix))
-                                {
-                                    return this.LoadUnmanagedDllFromResolvedPath(localFileWithoutSuffix);
-                                }
-                            }
-                        }
-                    }
+                    return this.LoadAssemblyFromFilePath(localFile);
                 }
             }
-
-            return base.LoadUnmanagedDll(unmanagedDllName);
         }
 
-        private bool SearchForLibrary(ManagedLibrary library, out string? path)
+        return null;
+    }
+
+    /// <summary>
+    /// Loads the unmanaged binary using configured list of native libraries.
+    /// </summary>
+    /// <param name="unmanagedDllName">Unmanaged DLL name.</param>
+    /// <returns>The unmanaged dll handle.</returns>
+    protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
+    {
+        var resolvedPath = this.dependencyResolver.ResolveUnmanagedDllToPath(unmanagedDllName);
+        if (!string.IsNullOrEmpty(resolvedPath) && File.Exists(resolvedPath))
         {
-            // 1. Check for in _basePath + app local path
-            var localFile = Path.Combine(this.basePath, library.AppLocalPath);
-            if (File.Exists(localFile))
+            return this.LoadUnmanagedDllFromResolvedPath(resolvedPath, normalizePath: false);
+        }
+
+        foreach (var prefix in PlatformInformation.NativeLibraryPrefixes)
+        {
+            if (this.nativeLibraries.TryGetValue(prefix + unmanagedDllName, out var library))
             {
-                path = localFile;
+                if (this.SearchForLibrary(library, prefix, out var path) && path != null)
+                {
+                    return this.LoadUnmanagedDllFromResolvedPath(path);
+                }
+            }
+            else
+            {
+                // coreclr allows code to use [DllImport("sni")] or [DllImport("sni.dll")]
+                // This library treats the file name without the extension as the lookup name,
+                // so this loop is necessary to check if the unmanaged name matches a library
+                // when the file extension has been trimmed.
+                foreach (var suffix in PlatformInformation.NativeLibraryExtensions)
+                {
+                    if (!unmanagedDllName.EndsWith(suffix, StringComparison.OrdinalIgnoreCase))
+                    {
+                        continue;
+                    }
+
+                    // check to see if there is a library entry for the library without the file extension
+                    var trimmedName = unmanagedDllName.Substring(0, unmanagedDllName.Length - suffix.Length);
+
+                    if (this.nativeLibraries.TryGetValue(prefix + trimmedName, out library))
+                    {
+                        if (this.SearchForLibrary(library, prefix, out var path) && path != null)
+                        {
+                            return this.LoadUnmanagedDllFromResolvedPath(path);
+                        }
+                    }
+                    else
+                    {
+                        // fallback to native assets which match the file name in the plugin base directory
+                        var prefixSuffixDllName = prefix + unmanagedDllName + suffix;
+                        var prefixDllName = prefix + unmanagedDllName;
+
+                        foreach (var probingPath in this.additionalProbingPaths.Prepend(this.basePath))
+                        {
+                            var localFile = Path.Combine(probingPath, prefixSuffixDllName);
+                            if (File.Exists(localFile))
+                            {
+                                return this.LoadUnmanagedDllFromResolvedPath(localFile);
+                            }
+
+                            var localFileWithoutSuffix = Path.Combine(probingPath, prefixDllName);
+                            if (File.Exists(localFileWithoutSuffix))
+                            {
+                                return this.LoadUnmanagedDllFromResolvedPath(localFileWithoutSuffix);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return base.LoadUnmanagedDll(unmanagedDllName);
+    }
+
+    private bool SearchForLibrary(ManagedLibrary library, out string? path)
+    {
+        // 1. Check for in _basePath + app local path
+        var localFile = Path.Combine(this.basePath, library.AppLocalPath);
+        if (File.Exists(localFile))
+        {
+            path = localFile;
+            return true;
+        }
+
+        // 2. Search additional probing paths
+        foreach (var searchPath in this.additionalProbingPaths)
+        {
+            var candidate = Path.Combine(searchPath, library.AdditionalProbingPath);
+            if (File.Exists(candidate))
+            {
+                path = candidate;
                 return true;
             }
-
-            // 2. Search additional probing paths
-            foreach (var searchPath in this.additionalProbingPaths)
-            {
-                var candidate = Path.Combine(searchPath, library.AdditionalProbingPath);
-                if (File.Exists(candidate))
-                {
-                    path = candidate;
-                    return true;
-                }
-            }
-
-            // 3. Search in base path
-            foreach (var ext in PlatformInformation.ManagedAssemblyExtensions)
-            {
-                var local = Path.Combine(this.basePath, library.Name.Name + ext);
-                if (File.Exists(local))
-                {
-                    path = local;
-                    return true;
-                }
-            }
-
-            path = null;
-            return false;
         }
 
-        private bool SearchForLibrary(NativeLibrary library, string prefix, out string? path)
+        // 3. Search in base path
+        foreach (var ext in PlatformInformation.ManagedAssemblyExtensions)
         {
-            // 1. Search in base path
-            foreach (var ext in PlatformInformation.NativeLibraryExtensions)
-            {
-                var candidate = Path.Combine(this.basePath, $"{prefix}{library.Name}{ext}");
-                if (File.Exists(candidate))
-                {
-                    path = candidate;
-                    return true;
-                }
-            }
-
-            // 2. Search in base path + app local (for portable deployments of netcoreapp)
-            var local = Path.Combine(this.basePath, library.AppLocalPath);
+            var local = Path.Combine(this.basePath, library.Name.Name + ext);
             if (File.Exists(local))
             {
                 path = local;
                 return true;
             }
-
-            // 3. Search additional probing paths
-            foreach (var searchPath in this.additionalProbingPaths)
-            {
-                var candidate = Path.Combine(searchPath, library.AdditionalProbingPath);
-                if (File.Exists(candidate))
-                {
-                    path = candidate;
-                    return true;
-                }
-            }
-
-            path = null;
-            return false;
         }
 
-        private IntPtr LoadUnmanagedDllFromResolvedPath(string unmanagedDllPath, bool normalizePath = true)
-        {
-            if (normalizePath)
-            {
-                unmanagedDllPath = Path.GetFullPath(unmanagedDllPath);
-            }
+        path = null;
+        return false;
+    }
 
-            return this.shadowCopyNativeLibraries
-                ? this.LoadUnmanagedDllFromShadowCopy(unmanagedDllPath)
-                : this.LoadUnmanagedDllFromPath(unmanagedDllPath);
+    private bool SearchForLibrary(NativeLibrary library, string prefix, out string? path)
+    {
+        // 1. Search in base path
+        foreach (var ext in PlatformInformation.NativeLibraryExtensions)
+        {
+            var candidate = Path.Combine(this.basePath, $"{prefix}{library.Name}{ext}");
+            if (File.Exists(candidate))
+            {
+                path = candidate;
+                return true;
+            }
         }
 
-        private IntPtr LoadUnmanagedDllFromShadowCopy(string unmanagedDllPath)
+        // 2. Search in base path + app local (for portable deployments of netcoreapp)
+        var local = Path.Combine(this.basePath, library.AppLocalPath);
+        if (File.Exists(local))
         {
-            var shadowCopyDllPath = this.CreateShadowCopy(unmanagedDllPath);
-
-            return this.LoadUnmanagedDllFromPath(shadowCopyDllPath);
+            path = local;
+            return true;
         }
 
-        private string CreateShadowCopy(string dllPath)
+        // 3. Search additional probing paths
+        foreach (var searchPath in this.additionalProbingPaths)
         {
-            Directory.CreateDirectory(this.unmanagedDllShadowCopyDirectoryPath);
-
-            var dllFileName = Path.GetFileName(dllPath);
-            var shadowCopyPath = Path.Combine(this.unmanagedDllShadowCopyDirectoryPath, dllFileName);
-
-            if (!File.Exists(shadowCopyPath))
+            var candidate = Path.Combine(searchPath, library.AdditionalProbingPath);
+            if (File.Exists(candidate))
             {
-                File.Copy(dllPath, shadowCopyPath);
+                path = candidate;
+                return true;
             }
-
-            return shadowCopyPath;
         }
 
-        private void OnUnloaded()
-        {
-            if (!this.shadowCopyNativeLibraries || !Directory.Exists(this.unmanagedDllShadowCopyDirectoryPath))
-            {
-                return;
-            }
+        path = null;
+        return false;
+    }
 
-            // Attempt to delete shadow copies
-            try
-            {
-                Directory.Delete(this.unmanagedDllShadowCopyDirectoryPath, recursive: true);
-            }
-            catch (Exception)
-            {
-                // Files might be locked by host process. Nothing we can do about it, I guess.
-            }
+    private IntPtr LoadUnmanagedDllFromResolvedPath(string unmanagedDllPath, bool normalizePath = true)
+    {
+        if (normalizePath)
+        {
+            unmanagedDllPath = Path.GetFullPath(unmanagedDllPath);
+        }
+
+        return this.shadowCopyNativeLibraries
+                   ? this.LoadUnmanagedDllFromShadowCopy(unmanagedDllPath)
+                   : this.LoadUnmanagedDllFromPath(unmanagedDllPath);
+    }
+
+    private IntPtr LoadUnmanagedDllFromShadowCopy(string unmanagedDllPath)
+    {
+        var shadowCopyDllPath = this.CreateShadowCopy(unmanagedDllPath);
+
+        return this.LoadUnmanagedDllFromPath(shadowCopyDllPath);
+    }
+
+    private string CreateShadowCopy(string dllPath)
+    {
+        Directory.CreateDirectory(this.unmanagedDllShadowCopyDirectoryPath);
+
+        var dllFileName = Path.GetFileName(dllPath);
+        var shadowCopyPath = Path.Combine(this.unmanagedDllShadowCopyDirectoryPath, dllFileName);
+
+        if (!File.Exists(shadowCopyPath))
+        {
+            File.Copy(dllPath, shadowCopyPath);
+        }
+
+        return shadowCopyPath;
+    }
+
+    private void OnUnloaded()
+    {
+        if (!this.shadowCopyNativeLibraries || !Directory.Exists(this.unmanagedDllShadowCopyDirectoryPath))
+        {
+            return;
+        }
+
+        // Attempt to delete shadow copies
+        try
+        {
+            Directory.Delete(this.unmanagedDllShadowCopyDirectoryPath, recursive: true);
+        }
+        catch (Exception)
+        {
+            // Files might be locked by host process. Nothing we can do about it, I guess.
         }
     }
 }
diff --git a/Dalamud/Plugin/Internal/Loader/PlatformInformation.cs b/Dalamud/Plugin/Internal/Loader/PlatformInformation.cs
index 47a3d7acf..ec1d557be 100644
--- a/Dalamud/Plugin/Internal/Loader/PlatformInformation.cs
+++ b/Dalamud/Plugin/Internal/Loader/PlatformInformation.cs
@@ -1,32 +1,31 @@
 // Copyright (c) Nate McMaster, Dalamud team.
 // Licensed under the Apache License, Version 2.0. See License.txt in the Loader root for license information.
 
-namespace Dalamud.Plugin.Internal.Loader
+namespace Dalamud.Plugin.Internal.Loader;
+
+/// <summary>
+/// Platform specific information.
+/// </summary>
+internal class PlatformInformation
 {
     /// <summary>
-    /// Platform specific information.
+    /// Gets a list of native OS specific library extensions.
     /// </summary>
-    internal class PlatformInformation
+    public static string[] NativeLibraryExtensions => new[] { ".dll" };
+
+    /// <summary>
+    /// Gets a list of native OS specific library prefixes.
+    /// </summary>
+    public static string[] NativeLibraryPrefixes => new[] { string.Empty };
+
+    /// <summary>
+    /// Gets a list of native OS specific managed assembly extensions.
+    /// </summary>
+    public static string[] ManagedAssemblyExtensions => new[]
     {
-        /// <summary>
-        /// Gets a list of native OS specific library extensions.
-        /// </summary>
-        public static string[] NativeLibraryExtensions => new[] { ".dll" };
-
-        /// <summary>
-        /// Gets a list of native OS specific library prefixes.
-        /// </summary>
-        public static string[] NativeLibraryPrefixes => new[] { string.Empty };
-
-        /// <summary>
-        /// Gets a list of native OS specific managed assembly extensions.
-        /// </summary>
-        public static string[] ManagedAssemblyExtensions => new[]
-        {
-                ".dll",
-                ".ni.dll",
-                ".exe",
-                ".ni.exe",
-        };
-    }
+        ".dll",
+        ".ni.dll",
+        ".exe",
+        ".ni.exe",
+    };
 }
diff --git a/Dalamud/Plugin/Internal/Loader/PluginLoader.cs b/Dalamud/Plugin/Internal/Loader/PluginLoader.cs
index 020739f3a..5c03c32b8 100644
--- a/Dalamud/Plugin/Internal/Loader/PluginLoader.cs
+++ b/Dalamud/Plugin/Internal/Loader/PluginLoader.cs
@@ -5,159 +5,158 @@ using System;
 using System.Reflection;
 using System.Runtime.Loader;
 
-namespace Dalamud.Plugin.Internal.Loader
+namespace Dalamud.Plugin.Internal.Loader;
+
+/// <summary>
+/// This loader attempts to load binaries for execution (both managed assemblies and native libraries)
+/// in the same way that .NET Core would if they were originally part of the .NET Core application.
+/// <para>
+/// This loader reads configuration files produced by .NET Core (.deps.json and runtimeconfig.json)
+/// as well as a custom file (*.config files). These files describe a list of .dlls and a set of dependencies.
+/// The loader searches the plugin path, as well as any additionally specified paths, for binaries
+/// which satisfy the plugin's requirements.
+/// </para>
+/// </summary>
+internal class PluginLoader : IDisposable
 {
+    private readonly LoaderConfig config;
+    private readonly AssemblyLoadContextBuilder contextBuilder;
+    private ManagedLoadContext context;
+    private volatile bool disposed;
+
     /// <summary>
-    /// This loader attempts to load binaries for execution (both managed assemblies and native libraries)
-    /// in the same way that .NET Core would if they were originally part of the .NET Core application.
+    /// Initializes a new instance of the <see cref="PluginLoader"/> class.
+    /// </summary>
+    /// <param name="config">The configuration for the plugin.</param>
+    public PluginLoader(LoaderConfig config)
+    {
+        this.config = config ?? throw new ArgumentNullException(nameof(config));
+        this.contextBuilder = CreateLoadContextBuilder(config);
+        this.context = (ManagedLoadContext)this.contextBuilder.Build();
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether this plugin is capable of being unloaded.
+    /// </summary>
+    public bool IsUnloadable
+        => this.context.IsCollectible;
+
+    /// <summary>
+    /// Gets the assembly load context.
+    /// </summary>
+    public AssemblyLoadContext LoadContext => this.context;
+
+    /// <summary>
+    /// Create a plugin loader for an assembly file.
+    /// </summary>
+    /// <param name="assemblyFile">The file path to the main assembly for the plugin.</param>
+    /// <param name="configure">A function which can be used to configure advanced options for the plugin loader.</param>
+    /// <returns>A loader.</returns>
+    public static PluginLoader CreateFromAssemblyFile(string assemblyFile, Action<LoaderConfig> configure)
+    {
+        if (configure == null)
+            throw new ArgumentNullException(nameof(configure));
+
+        var config = new LoaderConfig(assemblyFile);
+        configure(config);
+        return new PluginLoader(config);
+    }
+
+    /// <summary>
+    /// The unloads and reloads the plugin assemblies.
+    /// This method throws if <see cref="IsUnloadable" /> is <c>false</c>.
+    /// </summary>
+    public void Reload()
+    {
+        this.EnsureNotDisposed();
+
+        if (!this.IsUnloadable)
+        {
+            throw new InvalidOperationException("Reload cannot be used because IsUnloadable is false");
+        }
+
+        this.context.Unload();
+        this.context = (ManagedLoadContext)this.contextBuilder.Build();
+
+        GC.Collect();
+        GC.WaitForPendingFinalizers();
+    }
+
+    /// <summary>
+    /// Load the main assembly for the plugin.
+    /// </summary>
+    /// <returns>The assembly.</returns>
+    public Assembly LoadDefaultAssembly()
+    {
+        this.EnsureNotDisposed();
+        return this.context.LoadAssemblyFromFilePath(this.config.MainAssemblyPath);
+    }
+
+    /// <summary>
+    /// Sets the scope used by some System.Reflection APIs which might trigger assembly loading.
     /// <para>
-    /// This loader reads configuration files produced by .NET Core (.deps.json and runtimeconfig.json)
-    /// as well as a custom file (*.config files). These files describe a list of .dlls and a set of dependencies.
-    /// The loader searches the plugin path, as well as any additionally specified paths, for binaries
-    /// which satisfy the plugin's requirements.
+    /// See https://github.com/dotnet/coreclr/blob/v3.0.0/Documentation/design-docs/AssemblyLoadContext.ContextualReflection.md for more details.
     /// </para>
     /// </summary>
-    internal class PluginLoader : IDisposable
+    /// <returns>A contextual reflection scope.</returns>
+    public AssemblyLoadContext.ContextualReflectionScope EnterContextualReflection()
+        => this.context.EnterContextualReflection();
+
+    /// <summary>
+    /// Disposes the plugin loader. This only does something if <see cref="IsUnloadable" /> is true.
+    /// When true, this will unload assemblies which which were loaded during the lifetime
+    /// of the plugin.
+    /// </summary>
+    public void Dispose()
     {
-        private readonly LoaderConfig config;
-        private readonly AssemblyLoadContextBuilder contextBuilder;
-        private ManagedLoadContext context;
-        private volatile bool disposed;
+        if (this.disposed)
+            return;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PluginLoader"/> class.
-        /// </summary>
-        /// <param name="config">The configuration for the plugin.</param>
-        public PluginLoader(LoaderConfig config)
-        {
-            this.config = config ?? throw new ArgumentNullException(nameof(config));
-            this.contextBuilder = CreateLoadContextBuilder(config);
-            this.context = (ManagedLoadContext)this.contextBuilder.Build();
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this plugin is capable of being unloaded.
-        /// </summary>
-        public bool IsUnloadable
-            => this.context.IsCollectible;
-
-        /// <summary>
-        /// Gets the assembly load context.
-        /// </summary>
-        public AssemblyLoadContext LoadContext => this.context;
-
-        /// <summary>
-        /// Create a plugin loader for an assembly file.
-        /// </summary>
-        /// <param name="assemblyFile">The file path to the main assembly for the plugin.</param>
-        /// <param name="configure">A function which can be used to configure advanced options for the plugin loader.</param>
-        /// <returns>A loader.</returns>
-        public static PluginLoader CreateFromAssemblyFile(string assemblyFile, Action<LoaderConfig> configure)
-        {
-            if (configure == null)
-                throw new ArgumentNullException(nameof(configure));
-
-            var config = new LoaderConfig(assemblyFile);
-            configure(config);
-            return new PluginLoader(config);
-        }
-
-        /// <summary>
-        /// The unloads and reloads the plugin assemblies.
-        /// This method throws if <see cref="IsUnloadable" /> is <c>false</c>.
-        /// </summary>
-        public void Reload()
-        {
-            this.EnsureNotDisposed();
-
-            if (!this.IsUnloadable)
-            {
-                throw new InvalidOperationException("Reload cannot be used because IsUnloadable is false");
-            }
+        this.disposed = true;
 
+        if (this.context.IsCollectible)
             this.context.Unload();
-            this.context = (ManagedLoadContext)this.contextBuilder.Build();
+    }
 
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-        }
+    private static AssemblyLoadContextBuilder CreateLoadContextBuilder(LoaderConfig config)
+    {
+        var builder = new AssemblyLoadContextBuilder();
 
-        /// <summary>
-        /// Load the main assembly for the plugin.
-        /// </summary>
-        /// <returns>The assembly.</returns>
-        public Assembly LoadDefaultAssembly()
+        builder.SetMainAssemblyPath(config.MainAssemblyPath);
+        builder.SetDefaultContext(config.DefaultContext);
+
+        foreach (var ext in config.PrivateAssemblies)
         {
-            this.EnsureNotDisposed();
-            return this.context.LoadAssemblyFromFilePath(this.config.MainAssemblyPath);
+            builder.PreferLoadContextAssembly(ext);
         }
 
-        /// <summary>
-        /// Sets the scope used by some System.Reflection APIs which might trigger assembly loading.
-        /// <para>
-        /// See https://github.com/dotnet/coreclr/blob/v3.0.0/Documentation/design-docs/AssemblyLoadContext.ContextualReflection.md for more details.
-        /// </para>
-        /// </summary>
-        /// <returns>A contextual reflection scope.</returns>
-        public AssemblyLoadContext.ContextualReflectionScope EnterContextualReflection()
-            => this.context.EnterContextualReflection();
-
-        /// <summary>
-        /// Disposes the plugin loader. This only does something if <see cref="IsUnloadable" /> is true.
-        /// When true, this will unload assemblies which which were loaded during the lifetime
-        /// of the plugin.
-        /// </summary>
-        public void Dispose()
+        if (config.PreferSharedTypes)
         {
-            if (this.disposed)
-                return;
-
-            this.disposed = true;
-
-            if (this.context.IsCollectible)
-                this.context.Unload();
+            builder.PreferDefaultLoadContext(true);
         }
 
-        private static AssemblyLoadContextBuilder CreateLoadContextBuilder(LoaderConfig config)
+        if (config.IsUnloadable)
         {
-            var builder = new AssemblyLoadContextBuilder();
-
-            builder.SetMainAssemblyPath(config.MainAssemblyPath);
-            builder.SetDefaultContext(config.DefaultContext);
-
-            foreach (var ext in config.PrivateAssemblies)
-            {
-                builder.PreferLoadContextAssembly(ext);
-            }
-
-            if (config.PreferSharedTypes)
-            {
-                builder.PreferDefaultLoadContext(true);
-            }
-
-            if (config.IsUnloadable)
-            {
-                builder.EnableUnloading();
-            }
-
-            if (config.LoadInMemory)
-            {
-                builder.PreloadAssembliesIntoMemory();
-                builder.ShadowCopyNativeLibraries();
-            }
-
-            foreach (var assemblyName in config.SharedAssemblies)
-            {
-                builder.PreferDefaultLoadContextAssembly(assemblyName);
-            }
-
-            return builder;
+            builder.EnableUnloading();
         }
 
-        private void EnsureNotDisposed()
+        if (config.LoadInMemory)
         {
-            if (this.disposed)
-                throw new ObjectDisposedException(nameof(PluginLoader));
+            builder.PreloadAssembliesIntoMemory();
+            builder.ShadowCopyNativeLibraries();
         }
+
+        foreach (var assemblyName in config.SharedAssemblies)
+        {
+            builder.PreferDefaultLoadContextAssembly(assemblyName);
+        }
+
+        return builder;
+    }
+
+    private void EnsureNotDisposed()
+    {
+        if (this.disposed)
+            throw new ObjectDisposedException(nameof(PluginLoader));
     }
 }
diff --git a/Dalamud/Plugin/Ipc/Exceptions/IpcError.cs b/Dalamud/Plugin/Ipc/Exceptions/IpcError.cs
index 053331dce..5cc0ccae9 100644
--- a/Dalamud/Plugin/Ipc/Exceptions/IpcError.cs
+++ b/Dalamud/Plugin/Ipc/Exceptions/IpcError.cs
@@ -1,36 +1,35 @@
 using System;
 
-namespace Dalamud.Plugin.Ipc.Exceptions
+namespace Dalamud.Plugin.Ipc.Exceptions;
+
+/// <summary>
+/// This exception is thrown when an IPC errors are encountered.
+/// </summary>
+public abstract class IpcError : Exception
 {
     /// <summary>
-    /// This exception is thrown when an IPC errors are encountered.
+    /// Initializes a new instance of the <see cref="IpcError"/> class.
     /// </summary>
-    public abstract class IpcError : Exception
+    public IpcError()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IpcError"/> class.
-        /// </summary>
-        public IpcError()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IpcError"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        public IpcError(string message)
-            : base(message)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="IpcError"/> class.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    public IpcError(string message)
+        : base(message)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IpcError"/> class.
-        /// </summary>
-        /// <param name="message">The message that describes the error.</param>
-        /// <param name="ex">The exception that is the cause of the current exception.</param>
-        public IpcError(string message, Exception ex)
-            : base(message, ex)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="IpcError"/> class.
+    /// </summary>
+    /// <param name="message">The message that describes the error.</param>
+    /// <param name="ex">The exception that is the cause of the current exception.</param>
+    public IpcError(string message, Exception ex)
+        : base(message, ex)
+    {
     }
 }
diff --git a/Dalamud/Plugin/Ipc/Exceptions/IpcLengthMismatchError.cs b/Dalamud/Plugin/Ipc/Exceptions/IpcLengthMismatchError.cs
index bb5f64070..47b204975 100644
--- a/Dalamud/Plugin/Ipc/Exceptions/IpcLengthMismatchError.cs
+++ b/Dalamud/Plugin/Ipc/Exceptions/IpcLengthMismatchError.cs
@@ -1,19 +1,18 @@
-namespace Dalamud.Plugin.Ipc.Exceptions
+namespace Dalamud.Plugin.Ipc.Exceptions;
+
+/// <summary>
+/// This exception is thrown when an IPC method is invoked and the number of types does not match what was previously registered.
+/// </summary>
+public class IpcLengthMismatchError : IpcError
 {
     /// <summary>
-    /// This exception is thrown when an IPC method is invoked and the number of types does not match what was previously registered.
+    /// Initializes a new instance of the <see cref="IpcLengthMismatchError"/> class.
     /// </summary>
-    public class IpcLengthMismatchError : IpcError
+    /// <param name="name">Name of the IPC method.</param>
+    /// <param name="requestedLength">The amount of types requested when checking out the IPC.</param>
+    /// <param name="actualLength">The amount of types registered by the IPC.</param>
+    public IpcLengthMismatchError(string name, int requestedLength, int actualLength)
+        : base($"IPC method {name} has a different number of types than was requested. {requestedLength} != {actualLength}")
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IpcLengthMismatchError"/> class.
-        /// </summary>
-        /// <param name="name">Name of the IPC method.</param>
-        /// <param name="requestedLength">The amount of types requested when checking out the IPC.</param>
-        /// <param name="actualLength">The amount of types registered by the IPC.</param>
-        public IpcLengthMismatchError(string name, int requestedLength, int actualLength)
-            : base($"IPC method {name} has a different number of types than was requested. {requestedLength} != {actualLength}")
-        {
-        }
     }
 }
diff --git a/Dalamud/Plugin/Ipc/Exceptions/IpcNotReadyError.cs b/Dalamud/Plugin/Ipc/Exceptions/IpcNotReadyError.cs
index 6bfd87ba8..1d7803369 100644
--- a/Dalamud/Plugin/Ipc/Exceptions/IpcNotReadyError.cs
+++ b/Dalamud/Plugin/Ipc/Exceptions/IpcNotReadyError.cs
@@ -1,17 +1,16 @@
-namespace Dalamud.Plugin.Ipc.Exceptions
+namespace Dalamud.Plugin.Ipc.Exceptions;
+
+/// <summary>
+/// This exception is thrown when an IPC method is invoked, but no actions or funcs have been registered yet.
+/// </summary>
+public class IpcNotReadyError : IpcError
 {
     /// <summary>
-    /// This exception is thrown when an IPC method is invoked, but no actions or funcs have been registered yet.
+    /// Initializes a new instance of the <see cref="IpcNotReadyError"/> class.
     /// </summary>
-    public class IpcNotReadyError : IpcError
+    /// <param name="name">Name of the IPC method.</param>
+    public IpcNotReadyError(string name)
+        : base($"IPC method {name} was not registered yet")
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IpcNotReadyError"/> class.
-        /// </summary>
-        /// <param name="name">Name of the IPC method.</param>
-        public IpcNotReadyError(string name)
-            : base($"IPC method {name} was not registered yet")
-        {
-        }
     }
 }
diff --git a/Dalamud/Plugin/Ipc/Exceptions/IpcTypeMismatchError.cs b/Dalamud/Plugin/Ipc/Exceptions/IpcTypeMismatchError.cs
index 2de5adce8..1aa191b78 100644
--- a/Dalamud/Plugin/Ipc/Exceptions/IpcTypeMismatchError.cs
+++ b/Dalamud/Plugin/Ipc/Exceptions/IpcTypeMismatchError.cs
@@ -1,22 +1,21 @@
 using System;
 
-namespace Dalamud.Plugin.Ipc.Exceptions
+namespace Dalamud.Plugin.Ipc.Exceptions;
+
+/// <summary>
+/// This exception is thrown when an IPC method is checked out, but the type does not match what was previously registered.
+/// </summary>
+public class IpcTypeMismatchError : IpcError
 {
     /// <summary>
-    /// This exception is thrown when an IPC method is checked out, but the type does not match what was previously registered.
+    /// Initializes a new instance of the <see cref="IpcTypeMismatchError"/> class.
     /// </summary>
-    public class IpcTypeMismatchError : IpcError
+    /// <param name="name">Name of the IPC method.</param>
+    /// <param name="requestedType">The before type.</param>
+    /// <param name="actualType">The after type.</param>
+    /// <param name="ex">The exception that is the cause of the current exception.</param>
+    public IpcTypeMismatchError(string name, Type requestedType, Type actualType, Exception ex)
+        : base($"IPC method {name} blew up when converting from {requestedType.Name} to {actualType}", ex)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IpcTypeMismatchError"/> class.
-        /// </summary>
-        /// <param name="name">Name of the IPC method.</param>
-        /// <param name="requestedType">The before type.</param>
-        /// <param name="actualType">The after type.</param>
-        /// <param name="ex">The exception that is the cause of the current exception.</param>
-        public IpcTypeMismatchError(string name, Type requestedType, Type actualType, Exception ex)
-            : base($"IPC method {name} blew up when converting from {requestedType.Name} to {actualType}", ex)
-        {
-        }
     }
 }
diff --git a/Dalamud/Plugin/Ipc/ICallGateProvider.cs b/Dalamud/Plugin/Ipc/ICallGateProvider.cs
index 62b95c809..333878d07 100644
--- a/Dalamud/Plugin/Ipc/ICallGateProvider.cs
+++ b/Dalamud/Plugin/Ipc/ICallGateProvider.cs
@@ -4,178 +4,177 @@ using Dalamud.Plugin.Ipc.Internal;
 
 #pragma warning disable SA1402 // File may only contain a single type
 
-namespace Dalamud.Plugin.Ipc
+namespace Dalamud.Plugin.Ipc;
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateProvider<TRet>
 {
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateProvider<TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action action);
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<TRet> func);
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<TRet> func);
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
-        public void UnregisterAction();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
+    public void UnregisterAction();
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
-        public void UnregisterFunc();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
+    public void UnregisterFunc();
 
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage();
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage();
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateProvider<T1, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateProvider<T1, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, TRet> func);
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, TRet> func);
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
-        public void UnregisterAction();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
+    public void UnregisterAction();
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
-        public void UnregisterFunc();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
+    public void UnregisterFunc();
 
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateProvider<T1, T2, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateProvider<T1, T2, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, TRet> func);
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, TRet> func);
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
-        public void UnregisterAction();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
+    public void UnregisterAction();
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
-        public void UnregisterFunc();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
+    public void UnregisterFunc();
 
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateProvider<T1, T2, T3, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateProvider<T1, T2, T3, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, TRet> func);
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, TRet> func);
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
-        public void UnregisterAction();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
+    public void UnregisterAction();
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
-        public void UnregisterFunc();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
+    public void UnregisterFunc();
 
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateProvider<T1, T2, T3, T4, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3, T4> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateProvider<T1, T2, T3, T4, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3, T4> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, T4, TRet> func);
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, T4, TRet> func);
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
-        public void UnregisterAction();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
+    public void UnregisterAction();
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
-        public void UnregisterFunc();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
+    public void UnregisterFunc();
 
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateProvider<T1, T2, T3, T4, T5, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3, T4, T5> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateProvider<T1, T2, T3, T4, T5, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3, T4, T5> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, T4, T5, TRet> func);
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, T4, T5, TRet> func);
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
-        public void UnregisterAction();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
+    public void UnregisterAction();
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
-        public void UnregisterFunc();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
+    public void UnregisterFunc();
 
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateProvider<T1, T2, T3, T4, T5, T6, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateProvider<T1, T2, T3, T4, T5, T6, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3, T4, T5, T6> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, TRet> func);
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, TRet> func);
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
-        public void UnregisterAction();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
+    public void UnregisterAction();
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
-        public void UnregisterFunc();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
+    public void UnregisterFunc();
 
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, T7, TRet> func);
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, T7, TRet> func);
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
-        public void UnregisterAction();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
+    public void UnregisterAction();
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
-        public void UnregisterFunc();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
+    public void UnregisterFunc();
 
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, T8, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7, T8> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, T8, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7, T8> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, T7, T8, TRet> func);
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, T7, T8, TRet> func);
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
-        public void UnregisterAction();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterAction"/>
+    public void UnregisterAction();
 
-        /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
-        public void UnregisterFunc();
+    /// <inheritdoc cref="CallGatePubSubBase.UnregisterFunc"/>
+    public void UnregisterFunc();
 
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8);
 }
 
 #pragma warning restore SA1402 // File may only contain a single type
diff --git a/Dalamud/Plugin/Ipc/ICallGateSubscriber.cs b/Dalamud/Plugin/Ipc/ICallGateSubscriber.cs
index d5ddd1329..94afa200a 100644
--- a/Dalamud/Plugin/Ipc/ICallGateSubscriber.cs
+++ b/Dalamud/Plugin/Ipc/ICallGateSubscriber.cs
@@ -4,151 +4,150 @@ using Dalamud.Plugin.Ipc.Internal;
 
 #pragma warning disable SA1402 // File may only contain a single type
 
-namespace Dalamud.Plugin.Ipc
+namespace Dalamud.Plugin.Ipc;
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateSubscriber<TRet>
 {
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateSubscriber<TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action action);
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action action);
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction();
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction();
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc();
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc();
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateSubscriber<T1, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateSubscriber<T1, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action);
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1);
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateSubscriber<T1, T2, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateSubscriber<T1, T2, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2> action);
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2);
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateSubscriber<T1, T2, T3, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateSubscriber<T1, T2, T3, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3> action);
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3);
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateSubscriber<T1, T2, T3, T4, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3, T4> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateSubscriber<T1, T2, T3, T4, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3, T4> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3, T4> action);
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3, T4> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateSubscriber<T1, T2, T3, T4, T5, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3, T4, T5> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateSubscriber<T1, T2, T3, T4, T5, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3, T4, T5> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3, T4, T5> action);
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3, T4, T5> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5);
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateSubscriber<T1, T2, T3, T4, T5, T6, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3, T4, T5, T6> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateSubscriber<T1, T2, T3, T4, T5, T6, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3, T4, T5, T6> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6> action);
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6);
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7> action);
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7);
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7);
+}
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    public interface ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, T8, TRet>
-    {
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action);
+/// <inheritdoc cref="CallGatePubSubBase"/>
+public interface ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, T8, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action);
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8);
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8);
 
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8);
-    }
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8);
 }
 
 #pragma warning restore SA1402 // File may only contain a single type
diff --git a/Dalamud/Plugin/Ipc/Internal/CallGate.cs b/Dalamud/Plugin/Ipc/Internal/CallGate.cs
index 2a857b2d0..7d0f90cb6 100644
--- a/Dalamud/Plugin/Ipc/Internal/CallGate.cs
+++ b/Dalamud/Plugin/Ipc/Internal/CallGate.cs
@@ -1,30 +1,29 @@
 using System.Collections.Generic;
 
-namespace Dalamud.Plugin.Ipc.Internal
+namespace Dalamud.Plugin.Ipc.Internal;
+
+/// <summary>
+/// This class facilitates inter-plugin communication.
+/// </summary>
+[ServiceManager.EarlyLoadedService]
+internal class CallGate : IServiceType
 {
-    /// <summary>
-    /// This class facilitates inter-plugin communication.
-    /// </summary>
-    [ServiceManager.EarlyLoadedService]
-    internal class CallGate : IServiceType
+    private readonly Dictionary<string, CallGateChannel> gates = new();
+
+    [ServiceManager.ServiceConstructor]
+    private CallGate()
     {
-        private readonly Dictionary<string, CallGateChannel> gates = new();
+    }
 
-        [ServiceManager.ServiceConstructor]
-        private CallGate()
-        {
-        }
-
-        /// <summary>
-        /// Gets the provider associated with the specified name.
-        /// </summary>
-        /// <param name="name">Name of the IPC registration.</param>
-        /// <returns>A CallGate registered under the given name.</returns>
-        public CallGateChannel GetOrCreateChannel(string name)
-        {
-            if (!this.gates.TryGetValue(name, out var gate))
-                gate = this.gates[name] = new CallGateChannel(name);
-            return gate;
-        }
+    /// <summary>
+    /// Gets the provider associated with the specified name.
+    /// </summary>
+    /// <param name="name">Name of the IPC registration.</param>
+    /// <returns>A CallGate registered under the given name.</returns>
+    public CallGateChannel GetOrCreateChannel(string name)
+    {
+        if (!this.gates.TryGetValue(name, out var gate))
+            gate = this.gates[name] = new CallGateChannel(name);
+        return gate;
     }
 }
diff --git a/Dalamud/Plugin/Ipc/Internal/CallGateChannel.cs b/Dalamud/Plugin/Ipc/Internal/CallGateChannel.cs
index c933b4cd1..2e2c7249e 100644
--- a/Dalamud/Plugin/Ipc/Internal/CallGateChannel.cs
+++ b/Dalamud/Plugin/Ipc/Internal/CallGateChannel.cs
@@ -7,188 +7,187 @@ using Dalamud.Plugin.Ipc.Exceptions;
 using Newtonsoft.Json;
 using Serilog;
 
-namespace Dalamud.Plugin.Ipc.Internal
+namespace Dalamud.Plugin.Ipc.Internal;
+
+/// <summary>
+/// This class implements the channels and serialization needed for the typed gates to interact with each other.
+/// </summary>
+internal class CallGateChannel
 {
     /// <summary>
-    /// This class implements the channels and serialization needed for the typed gates to interact with each other.
+    /// Initializes a new instance of the <see cref="CallGateChannel"/> class.
     /// </summary>
-    internal class CallGateChannel
+    /// <param name="name">The name of this IPC registration.</param>
+    public CallGateChannel(string name)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CallGateChannel"/> class.
-        /// </summary>
-        /// <param name="name">The name of this IPC registration.</param>
-        public CallGateChannel(string name)
+        this.Name = name;
+    }
+
+    /// <summary>
+    /// Gets the name of the IPC registration.
+    /// </summary>
+    public string Name { get; init; }
+
+    /// <summary>
+    /// Gets a list of delegate subscriptions for when SendMessage is called.
+    /// </summary>
+    public List<Delegate> Subscriptions { get; } = new();
+
+    /// <summary>
+    /// Gets or sets an action for when InvokeAction is called.
+    /// </summary>
+    public Delegate Action { get; set; }
+
+    /// <summary>
+    /// Gets or sets a func for when InvokeFunc is called.
+    /// </summary>
+    public Delegate Func { get; set; }
+
+    /// <summary>
+    /// Invoke all actions that have subscribed to this IPC.
+    /// </summary>
+    /// <param name="args">Message arguments.</param>
+    internal void SendMessage(object?[]? args)
+    {
+        if (this.Subscriptions.Count == 0)
+            return;
+
+        foreach (var subscription in this.Subscriptions)
         {
-            this.Name = name;
+            var methodInfo = subscription.GetMethodInfo();
+            this.CheckAndConvertArgs(args, methodInfo);
+
+            subscription.DynamicInvoke(args);
         }
+    }
 
-        /// <summary>
-        /// Gets the name of the IPC registration.
-        /// </summary>
-        public string Name { get; init; }
+    /// <summary>
+    /// Invoke an action registered for inter-plugin communication.
+    /// </summary>
+    /// <param name="args">Action arguments.</param>
+    /// <exception cref="IpcNotReadyError">This is thrown when the IPC publisher has not registered a func for calling yet.</exception>
+    internal void InvokeAction(object?[]? args)
+    {
+        if (this.Action == null)
+            throw new IpcNotReadyError(this.Name);
 
-        /// <summary>
-        /// Gets a list of delegate subscriptions for when SendMessage is called.
-        /// </summary>
-        public List<Delegate> Subscriptions { get; } = new();
+        var methodInfo = this.Action.GetMethodInfo();
+        this.CheckAndConvertArgs(args, methodInfo);
 
-        /// <summary>
-        /// Gets or sets an action for when InvokeAction is called.
-        /// </summary>
-        public Delegate Action { get; set; }
+        this.Action.DynamicInvoke(args);
+    }
 
-        /// <summary>
-        /// Gets or sets a func for when InvokeFunc is called.
-        /// </summary>
-        public Delegate Func { get; set; }
+    /// <summary>
+    /// Invoke a function registered for inter-plugin communication.
+    /// </summary>
+    /// <param name="args">Func arguments.</param>
+    /// <returns>The return value.</returns>
+    /// <typeparam name="TRet">The return type.</typeparam>
+    /// <exception cref="IpcNotReadyError">This is thrown when the IPC publisher has not registered a func for calling yet.</exception>
+    internal TRet InvokeFunc<TRet>(object?[]? args)
+    {
+        if (this.Func == null)
+            throw new IpcNotReadyError(this.Name);
 
-        /// <summary>
-        /// Invoke all actions that have subscribed to this IPC.
-        /// </summary>
-        /// <param name="args">Message arguments.</param>
-        internal void SendMessage(object?[]? args)
+        var methodInfo = this.Func.GetMethodInfo();
+        this.CheckAndConvertArgs(args, methodInfo);
+
+        var result = this.Func.DynamicInvoke(args);
+
+        if (typeof(TRet) != methodInfo.ReturnType)
+            result = this.ConvertObject(result, typeof(TRet));
+
+        return (TRet)result;
+    }
+
+    private void CheckAndConvertArgs(object?[]? args, MethodInfo methodInfo)
+    {
+        var paramTypes = methodInfo.GetParameters()
+                                   .Select(pi => pi.ParameterType).ToArray();
+
+        if (args?.Length != paramTypes.Length)
+            throw new IpcLengthMismatchError(this.Name, args.Length, paramTypes.Length);
+
+        for (var i = 0; i < args.Length; i++)
         {
-            if (this.Subscriptions.Count == 0)
-                return;
+            var arg = args[i];
+            var paramType = paramTypes[i];
 
-            foreach (var subscription in this.Subscriptions)
+            if (arg == null)
             {
-                var methodInfo = subscription.GetMethodInfo();
-                this.CheckAndConvertArgs(args, methodInfo);
+                if (paramType.IsValueType)
+                    throw new IpcValueNullError(this.Name, paramType, i);
 
-                subscription.DynamicInvoke(args);
+                continue;
             }
-        }
 
-        /// <summary>
-        /// Invoke an action registered for inter-plugin communication.
-        /// </summary>
-        /// <param name="args">Action arguments.</param>
-        /// <exception cref="IpcNotReadyError">This is thrown when the IPC publisher has not registered a func for calling yet.</exception>
-        internal void InvokeAction(object?[]? args)
-        {
-            if (this.Action == null)
-                throw new IpcNotReadyError(this.Name);
-
-            var methodInfo = this.Action.GetMethodInfo();
-            this.CheckAndConvertArgs(args, methodInfo);
-
-            this.Action.DynamicInvoke(args);
-        }
-
-        /// <summary>
-        /// Invoke a function registered for inter-plugin communication.
-        /// </summary>
-        /// <param name="args">Func arguments.</param>
-        /// <returns>The return value.</returns>
-        /// <typeparam name="TRet">The return type.</typeparam>
-        /// <exception cref="IpcNotReadyError">This is thrown when the IPC publisher has not registered a func for calling yet.</exception>
-        internal TRet InvokeFunc<TRet>(object?[]? args)
-        {
-            if (this.Func == null)
-                throw new IpcNotReadyError(this.Name);
-
-            var methodInfo = this.Func.GetMethodInfo();
-            this.CheckAndConvertArgs(args, methodInfo);
-
-            var result = this.Func.DynamicInvoke(args);
-
-            if (typeof(TRet) != methodInfo.ReturnType)
-                result = this.ConvertObject(result, typeof(TRet));
-
-            return (TRet)result;
-        }
-
-        private void CheckAndConvertArgs(object?[]? args, MethodInfo methodInfo)
-        {
-            var paramTypes = methodInfo.GetParameters()
-                .Select(pi => pi.ParameterType).ToArray();
-
-            if (args?.Length != paramTypes.Length)
-                throw new IpcLengthMismatchError(this.Name, args.Length, paramTypes.Length);
-
-            for (var i = 0; i < args.Length; i++)
+            var argType = arg.GetType();
+            if (argType != paramType)
             {
-                var arg = args[i];
-                var paramType = paramTypes[i];
-
-                if (arg == null)
+                // check the inheritance tree
+                var baseTypes = this.GenerateTypes(argType.BaseType);
+                if (baseTypes.Any(t => t == paramType))
                 {
-                    if (paramType.IsValueType)
-                        throw new IpcValueNullError(this.Name, paramType, i);
-
+                    // The source type inherits from the destination type
                     continue;
                 }
 
-                var argType = arg.GetType();
-                if (argType != paramType)
-                {
-                    // check the inheritance tree
-                    var baseTypes = this.GenerateTypes(argType.BaseType);
-                    if (baseTypes.Any(t => t == paramType))
-                    {
-                        // The source type inherits from the destination type
-                        continue;
-                    }
-
-                    args[i] = this.ConvertObject(arg, paramType);
-                }
-            }
-        }
-
-        private IEnumerable<Type> GenerateTypes(Type type)
-        {
-            while (type != null && type != typeof(object))
-            {
-                yield return type;
-                type = type.BaseType;
-            }
-        }
-
-        private object? ConvertObject(object? obj, Type type)
-        {
-            var json = JsonConvert.SerializeObject(obj);
-
-            try
-            {
-                return JsonConvert.DeserializeObject(json, type);
-            }
-            catch (Exception)
-            {
-                Log.Verbose($"Could not convert {obj.GetType().Name} to {type.Name}, will look for compatible type instead");
-            }
-
-            // If type -> type fails, try to find an object that matches.
-            var sourceType = obj.GetType();
-            var fieldNames = sourceType.GetFields(BindingFlags.Public | BindingFlags.Instance)
-                .Select(f => f.Name);
-            var propNames = sourceType.GetProperties(BindingFlags.Public | BindingFlags.Instance)
-                .Select(p => p.Name);
-
-            var assignableTypes = type.Assembly.GetTypes()
-                .Where(t => type.IsAssignableFrom(t) && type != t)
-                .ToArray();
-
-            foreach (var assignableType in assignableTypes)
-            {
-                var matchesFields = assignableType.GetFields().All(f => fieldNames.Contains(f.Name));
-                var matchesProps = assignableType.GetProperties().All(p => propNames.Contains(p.Name));
-                if (matchesFields && matchesProps)
-                {
-                    type = assignableType;
-                    break;
-                }
-            }
-
-            try
-            {
-                return JsonConvert.DeserializeObject(json, type);
-            }
-            catch (Exception ex)
-            {
-                throw new IpcTypeMismatchError(this.Name, obj.GetType(), type, ex);
+                args[i] = this.ConvertObject(arg, paramType);
             }
         }
     }
+
+    private IEnumerable<Type> GenerateTypes(Type type)
+    {
+        while (type != null && type != typeof(object))
+        {
+            yield return type;
+            type = type.BaseType;
+        }
+    }
+
+    private object? ConvertObject(object? obj, Type type)
+    {
+        var json = JsonConvert.SerializeObject(obj);
+
+        try
+        {
+            return JsonConvert.DeserializeObject(json, type);
+        }
+        catch (Exception)
+        {
+            Log.Verbose($"Could not convert {obj.GetType().Name} to {type.Name}, will look for compatible type instead");
+        }
+
+        // If type -> type fails, try to find an object that matches.
+        var sourceType = obj.GetType();
+        var fieldNames = sourceType.GetFields(BindingFlags.Public | BindingFlags.Instance)
+                                   .Select(f => f.Name);
+        var propNames = sourceType.GetProperties(BindingFlags.Public | BindingFlags.Instance)
+                                  .Select(p => p.Name);
+
+        var assignableTypes = type.Assembly.GetTypes()
+                                  .Where(t => type.IsAssignableFrom(t) && type != t)
+                                  .ToArray();
+
+        foreach (var assignableType in assignableTypes)
+        {
+            var matchesFields = assignableType.GetFields().All(f => fieldNames.Contains(f.Name));
+            var matchesProps = assignableType.GetProperties().All(p => propNames.Contains(p.Name));
+            if (matchesFields && matchesProps)
+            {
+                type = assignableType;
+                break;
+            }
+        }
+
+        try
+        {
+            return JsonConvert.DeserializeObject(json, type);
+        }
+        catch (Exception ex)
+        {
+            throw new IpcTypeMismatchError(this.Name, obj.GetType(), type, ex);
+        }
+    }
 }
diff --git a/Dalamud/Plugin/Ipc/Internal/CallGatePubSub.cs b/Dalamud/Plugin/Ipc/Internal/CallGatePubSub.cs
index da1bcda49..39d5b9f4d 100644
--- a/Dalamud/Plugin/Ipc/Internal/CallGatePubSub.cs
+++ b/Dalamud/Plugin/Ipc/Internal/CallGatePubSub.cs
@@ -2,349 +2,348 @@ using System;
 
 #pragma warning disable SA1402 // File may only contain a single type
 
-namespace Dalamud.Plugin.Ipc.Internal
+namespace Dalamud.Plugin.Ipc.Internal;
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+internal class CallGatePubSub<TRet> : CallGatePubSubBase, ICallGateProvider<TRet>, ICallGateSubscriber<TRet>
 {
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    internal class CallGatePubSub<TRet> : CallGatePubSubBase, ICallGateProvider<TRet>, ICallGateSubscriber<TRet>
+    /// <inheritdoc cref="CallGatePubSubBase(string)"/>
+    public CallGatePubSub(string name)
+        : base(name)
     {
-        /// <inheritdoc cref="CallGatePubSubBase(string)"/>
-        public CallGatePubSub(string name)
-            : base(name)
-        {
-        }
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action action)
-            => base.RegisterAction(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<TRet> func)
-            => base.RegisterFunc(func);
-
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage()
-            => base.SendMessage();
-
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action action)
-            => base.Subscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action action)
-            => base.Unsubscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction()
-            => base.InvokeAction();
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc()
-            => this.InvokeFunc<TRet>();
     }
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    internal class CallGatePubSub<T1, TRet> : CallGatePubSubBase, ICallGateProvider<T1, TRet>, ICallGateSubscriber<T1, TRet>
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action action)
+        => base.RegisterAction(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<TRet> func)
+        => base.RegisterFunc(func);
+
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage()
+        => base.SendMessage();
+
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action action)
+        => base.Subscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action action)
+        => base.Unsubscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction()
+        => base.InvokeAction();
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc()
+        => this.InvokeFunc<TRet>();
+}
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+internal class CallGatePubSub<T1, TRet> : CallGatePubSubBase, ICallGateProvider<T1, TRet>, ICallGateSubscriber<T1, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase(string)"/>
+    public CallGatePubSub(string name)
+        : base(name)
     {
-        /// <inheritdoc cref="CallGatePubSubBase(string)"/>
-        public CallGatePubSub(string name)
-            : base(name)
-        {
-        }
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1> action)
-            => base.RegisterAction(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, TRet> func)
-            => base.RegisterFunc(func);
-
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1)
-            => base.SendMessage(arg1);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1> action)
-            => base.Subscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1> action)
-            => base.Unsubscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1)
-            => base.InvokeAction(arg1);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1)
-            => this.InvokeFunc<TRet>(arg1);
     }
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    internal class CallGatePubSub<T1, T2, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, TRet>, ICallGateSubscriber<T1, T2, TRet>
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1> action)
+        => base.RegisterAction(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, TRet> func)
+        => base.RegisterFunc(func);
+
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1)
+        => base.SendMessage(arg1);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1> action)
+        => base.Subscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1> action)
+        => base.Unsubscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1)
+        => base.InvokeAction(arg1);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1)
+        => this.InvokeFunc<TRet>(arg1);
+}
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+internal class CallGatePubSub<T1, T2, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, TRet>, ICallGateSubscriber<T1, T2, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase(string)"/>
+    public CallGatePubSub(string name)
+        : base(name)
     {
-        /// <inheritdoc cref="CallGatePubSubBase(string)"/>
-        public CallGatePubSub(string name)
-            : base(name)
-        {
-        }
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2> action)
-            => base.RegisterAction(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, TRet> func)
-            => base.RegisterFunc(func);
-
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2)
-            => base.SendMessage(arg1, arg2);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2> action)
-            => base.Subscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2> action)
-            => base.Unsubscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2)
-            => base.InvokeAction(arg1, arg2);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2)
-            => this.InvokeFunc<TRet>(arg1, arg2);
     }
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    internal class CallGatePubSub<T1, T2, T3, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, TRet>, ICallGateSubscriber<T1, T2, T3, TRet>
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2> action)
+        => base.RegisterAction(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, TRet> func)
+        => base.RegisterFunc(func);
+
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2)
+        => base.SendMessage(arg1, arg2);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2> action)
+        => base.Subscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2> action)
+        => base.Unsubscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2)
+        => base.InvokeAction(arg1, arg2);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2)
+        => this.InvokeFunc<TRet>(arg1, arg2);
+}
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+internal class CallGatePubSub<T1, T2, T3, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, TRet>, ICallGateSubscriber<T1, T2, T3, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase(string)"/>
+    public CallGatePubSub(string name)
+        : base(name)
     {
-        /// <inheritdoc cref="CallGatePubSubBase(string)"/>
-        public CallGatePubSub(string name)
-            : base(name)
-        {
-        }
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3> action)
-            => base.RegisterAction(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, TRet> func)
-            => base.RegisterFunc(func);
-
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3)
-            => base.SendMessage(arg1, arg2, arg3);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3> action)
-            => base.Subscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3> action)
-            => base.Unsubscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3)
-            => base.InvokeAction(arg1, arg2, arg3);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3)
-            => this.InvokeFunc<TRet>(arg1, arg2, arg3);
     }
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    internal class CallGatePubSub<T1, T2, T3, T4, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, TRet>, ICallGateSubscriber<T1, T2, T3, T4, TRet>
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3> action)
+        => base.RegisterAction(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, TRet> func)
+        => base.RegisterFunc(func);
+
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3)
+        => base.SendMessage(arg1, arg2, arg3);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3> action)
+        => base.Subscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3> action)
+        => base.Unsubscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3)
+        => base.InvokeAction(arg1, arg2, arg3);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3)
+        => this.InvokeFunc<TRet>(arg1, arg2, arg3);
+}
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+internal class CallGatePubSub<T1, T2, T3, T4, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, TRet>, ICallGateSubscriber<T1, T2, T3, T4, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase(string)"/>
+    public CallGatePubSub(string name)
+        : base(name)
     {
-        /// <inheritdoc cref="CallGatePubSubBase(string)"/>
-        public CallGatePubSub(string name)
-            : base(name)
-        {
-        }
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3, T4> action)
-            => base.RegisterAction(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, T4, TRet> func)
-            => base.RegisterFunc(func);
-
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
-            => base.SendMessage(arg1, arg2, arg3, arg4);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3, T4> action)
-            => base.Subscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3, T4> action)
-            => base.Unsubscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
-            => base.InvokeAction(arg1, arg2, arg3, arg4);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
-            => this.InvokeFunc<TRet>(arg1, arg2, arg3, arg4);
     }
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    internal class CallGatePubSub<T1, T2, T3, T4, T5, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, TRet>
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3, T4> action)
+        => base.RegisterAction(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, T4, TRet> func)
+        => base.RegisterFunc(func);
+
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+        => base.SendMessage(arg1, arg2, arg3, arg4);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3, T4> action)
+        => base.Subscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3, T4> action)
+        => base.Unsubscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+        => base.InvokeAction(arg1, arg2, arg3, arg4);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+        => this.InvokeFunc<TRet>(arg1, arg2, arg3, arg4);
+}
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+internal class CallGatePubSub<T1, T2, T3, T4, T5, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase(string)"/>
+    public CallGatePubSub(string name)
+        : base(name)
     {
-        /// <inheritdoc cref="CallGatePubSubBase(string)"/>
-        public CallGatePubSub(string name)
-            : base(name)
-        {
-        }
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3, T4, T5> action)
-            => base.RegisterAction(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, T4, T5, TRet> func)
-            => base.RegisterFunc(func);
-
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
-            => base.SendMessage(arg1, arg2, arg3, arg4, arg5);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3, T4, T5> action)
-            => base.Subscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3, T4, T5> action)
-            => base.Unsubscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
-            => base.InvokeAction(arg1, arg2, arg3, arg4, arg5);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
-            => this.InvokeFunc<TRet>(arg1, arg2, arg3, arg4, arg5);
     }
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    internal class CallGatePubSub<T1, T2, T3, T4, T5, T6, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, T6, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, T6, TRet>
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3, T4, T5> action)
+        => base.RegisterAction(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, T4, T5, TRet> func)
+        => base.RegisterFunc(func);
+
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
+        => base.SendMessage(arg1, arg2, arg3, arg4, arg5);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3, T4, T5> action)
+        => base.Subscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3, T4, T5> action)
+        => base.Unsubscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
+        => base.InvokeAction(arg1, arg2, arg3, arg4, arg5);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
+        => this.InvokeFunc<TRet>(arg1, arg2, arg3, arg4, arg5);
+}
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+internal class CallGatePubSub<T1, T2, T3, T4, T5, T6, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, T6, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, T6, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase(string)"/>
+    public CallGatePubSub(string name)
+        : base(name)
     {
-        /// <inheritdoc cref="CallGatePubSubBase(string)"/>
-        public CallGatePubSub(string name)
-            : base(name)
-        {
-        }
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6> action)
-            => base.RegisterAction(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, TRet> func)
-            => base.RegisterFunc(func);
-
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
-            => base.SendMessage(arg1, arg2, arg3, arg4, arg5, arg6);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3, T4, T5, T6> action)
-            => base.Subscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6> action)
-            => base.Unsubscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
-            => base.InvokeAction(arg1, arg2, arg3, arg4, arg5, arg6);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
-            => this.InvokeFunc<TRet>(arg1, arg2, arg3, arg4, arg5, arg6);
     }
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    internal class CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, TRet>
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3, T4, T5, T6> action)
+        => base.RegisterAction(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, TRet> func)
+        => base.RegisterFunc(func);
+
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
+        => base.SendMessage(arg1, arg2, arg3, arg4, arg5, arg6);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3, T4, T5, T6> action)
+        => base.Subscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6> action)
+        => base.Unsubscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
+        => base.InvokeAction(arg1, arg2, arg3, arg4, arg5, arg6);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
+        => this.InvokeFunc<TRet>(arg1, arg2, arg3, arg4, arg5, arg6);
+}
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+internal class CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase(string)"/>
+    public CallGatePubSub(string name)
+        : base(name)
     {
-        /// <inheritdoc cref="CallGatePubSubBase(string)"/>
-        public CallGatePubSub(string name)
-            : base(name)
-        {
-        }
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7> action)
-            => base.RegisterAction(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, T7, TRet> func)
-            => base.RegisterFunc(func);
-
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
-            => base.SendMessage(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7> action)
-            => base.Subscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7> action)
-            => base.Unsubscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
-            => base.InvokeAction(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
-            => this.InvokeFunc<TRet>(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
     }
 
-    /// <inheritdoc cref="CallGatePubSubBase"/>
-    internal class CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, T8, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, T8, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, T8, TRet>
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7> action)
+        => base.RegisterAction(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, T7, TRet> func)
+        => base.RegisterFunc(func);
+
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
+        => base.SendMessage(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7> action)
+        => base.Subscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7> action)
+        => base.Unsubscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
+        => base.InvokeAction(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
+        => this.InvokeFunc<TRet>(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+}
+
+/// <inheritdoc cref="CallGatePubSubBase"/>
+internal class CallGatePubSub<T1, T2, T3, T4, T5, T6, T7, T8, TRet> : CallGatePubSubBase, ICallGateProvider<T1, T2, T3, T4, T5, T6, T7, T8, TRet>, ICallGateSubscriber<T1, T2, T3, T4, T5, T6, T7, T8, TRet>
+{
+    /// <inheritdoc cref="CallGatePubSubBase(string)"/>
+    public CallGatePubSub(string name)
+        : base(name)
     {
-        /// <inheritdoc cref="CallGatePubSubBase(string)"/>
-        public CallGatePubSub(string name)
-            : base(name)
-        {
-        }
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
-        public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7, T8> action)
-            => base.RegisterAction(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
-        public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, T7, T8, TRet> func)
-            => base.RegisterFunc(func);
-
-        /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
-        public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
-            => base.SendMessage(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
-        public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action)
-            => base.Subscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
-        public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action)
-            => base.Unsubscribe(action);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
-        public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
-            => base.InvokeAction(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-
-        /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
-        public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
-            => this.InvokeFunc<TRet>(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
     }
+
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterAction"/>
+    public void RegisterAction(Action<T1, T2, T3, T4, T5, T6, T7, T8> action)
+        => base.RegisterAction(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.RegisterFunc"/>
+    public void RegisterFunc(Func<T1, T2, T3, T4, T5, T6, T7, T8, TRet> func)
+        => base.RegisterFunc(func);
+
+    /// <inheritdoc cref="CallGatePubSubBase.SendMessage"/>
+    public void SendMessage(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
+        => base.SendMessage(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Subscribe"/>
+    public void Subscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action)
+        => base.Subscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.Unsubscribe"/>
+    public void Unsubscribe(Action<T1, T2, T3, T4, T5, T6, T7, T8> action)
+        => base.Unsubscribe(action);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeAction"/>
+    public void InvokeAction(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
+        => base.InvokeAction(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+
+    /// <inheritdoc cref="CallGatePubSubBase.InvokeFunc"/>
+    public TRet InvokeFunc(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
+        => this.InvokeFunc<TRet>(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
 }
 
 #pragma warning restore SA1402 // File may only contain a single type
diff --git a/Dalamud/Plugin/Ipc/Internal/CallGatePubSubBase.cs b/Dalamud/Plugin/Ipc/Internal/CallGatePubSubBase.cs
index 19b99de05..40c0c4a59 100644
--- a/Dalamud/Plugin/Ipc/Internal/CallGatePubSubBase.cs
+++ b/Dalamud/Plugin/Ipc/Internal/CallGatePubSubBase.cs
@@ -2,90 +2,89 @@ using System;
 
 using Dalamud.Plugin.Ipc.Exceptions;
 
-namespace Dalamud.Plugin.Ipc.Internal
+namespace Dalamud.Plugin.Ipc.Internal;
+
+/// <summary>
+/// This class facilitates inter-plugin communication.
+/// </summary>
+internal abstract class CallGatePubSubBase
 {
     /// <summary>
-    /// This class facilitates inter-plugin communication.
+    /// Initializes a new instance of the <see cref="CallGatePubSubBase"/> class.
     /// </summary>
-    internal abstract class CallGatePubSubBase
+    /// <param name="name">The name of the IPC registration.</param>
+    public CallGatePubSubBase(string name)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CallGatePubSubBase"/> class.
-        /// </summary>
-        /// <param name="name">The name of the IPC registration.</param>
-        public CallGatePubSubBase(string name)
-        {
-            this.Channel = Service<CallGate>.Get().GetOrCreateChannel(name);
-        }
-
-        /// <summary>
-        /// Gets the underlying channel implementation.
-        /// </summary>
-        protected CallGateChannel Channel { get; init; }
-
-        /// <summary>
-        /// Removes a registered Action from inter-plugin communication.
-        /// </summary>
-        public void UnregisterAction()
-            => this.Channel.Action = null;
-
-        /// <summary>
-        /// Removes a registered Func from inter-plugin communication.
-        /// </summary>
-        public void UnregisterFunc()
-            => this.Channel.Func = null;
-
-        /// <summary>
-        /// Registers an Action for inter-plugin communication.
-        /// </summary>
-        /// <param name="action">Action to register.</param>
-        private protected void RegisterAction(Delegate action)
-            => this.Channel.Action = action;
-
-        /// <summary>
-        /// Registers a Func for inter-plugin communication.
-        /// </summary>
-        /// <param name="func">Func to register.</param>
-        private protected void RegisterFunc(Delegate func)
-            => this.Channel.Func = func;
-
-        /// <summary>
-        /// Subscribe an expression to this registration.
-        /// </summary>
-        /// <param name="action">Action to subscribe.</param>
-        private protected void Subscribe(Delegate action)
-            => this.Channel.Subscriptions.Add(action);
-
-        /// <summary>
-        /// Unsubscribe an expression from this registration.
-        /// </summary>
-        /// <param name="action">Action to unsubscribe.</param>
-        private protected void Unsubscribe(Delegate action)
-            => this.Channel.Subscriptions.Remove(action);
-
-        /// <summary>
-        /// Invoke an action registered for inter-plugin communication.
-        /// </summary>
-        /// <param name="args">Action arguments.</param>
-        /// <exception cref="IpcNotReadyError">This is thrown when the IPC publisher has not registered an action for calling yet.</exception>
-        private protected void InvokeAction(params object?[]? args)
-            => this.Channel.InvokeAction(args);
-
-        /// <summary>
-        /// Invoke a function registered for inter-plugin communication.
-        /// </summary>
-        /// <param name="args">Parameter args.</param>
-        /// <returns>The return value.</returns>
-        /// <typeparam name="TRet">The return type.</typeparam>
-        /// <exception cref="IpcNotReadyError">This is thrown when the IPC publisher has not registered a func for calling yet.</exception>
-        private protected TRet InvokeFunc<TRet>(params object?[]? args)
-            => this.Channel.InvokeFunc<TRet>(args);
-
-        /// <summary>
-        /// Invoke all actions that have subscribed to this IPC.
-        /// </summary>
-        /// <param name="args">Delegate arguments.</param>
-        private protected void SendMessage(params object?[]? args)
-            => this.Channel.SendMessage(args);
+        this.Channel = Service<CallGate>.Get().GetOrCreateChannel(name);
     }
+
+    /// <summary>
+    /// Gets the underlying channel implementation.
+    /// </summary>
+    protected CallGateChannel Channel { get; init; }
+
+    /// <summary>
+    /// Removes a registered Action from inter-plugin communication.
+    /// </summary>
+    public void UnregisterAction()
+        => this.Channel.Action = null;
+
+    /// <summary>
+    /// Removes a registered Func from inter-plugin communication.
+    /// </summary>
+    public void UnregisterFunc()
+        => this.Channel.Func = null;
+
+    /// <summary>
+    /// Registers an Action for inter-plugin communication.
+    /// </summary>
+    /// <param name="action">Action to register.</param>
+    private protected void RegisterAction(Delegate action)
+        => this.Channel.Action = action;
+
+    /// <summary>
+    /// Registers a Func for inter-plugin communication.
+    /// </summary>
+    /// <param name="func">Func to register.</param>
+    private protected void RegisterFunc(Delegate func)
+        => this.Channel.Func = func;
+
+    /// <summary>
+    /// Subscribe an expression to this registration.
+    /// </summary>
+    /// <param name="action">Action to subscribe.</param>
+    private protected void Subscribe(Delegate action)
+        => this.Channel.Subscriptions.Add(action);
+
+    /// <summary>
+    /// Unsubscribe an expression from this registration.
+    /// </summary>
+    /// <param name="action">Action to unsubscribe.</param>
+    private protected void Unsubscribe(Delegate action)
+        => this.Channel.Subscriptions.Remove(action);
+
+    /// <summary>
+    /// Invoke an action registered for inter-plugin communication.
+    /// </summary>
+    /// <param name="args">Action arguments.</param>
+    /// <exception cref="IpcNotReadyError">This is thrown when the IPC publisher has not registered an action for calling yet.</exception>
+    private protected void InvokeAction(params object?[]? args)
+        => this.Channel.InvokeAction(args);
+
+    /// <summary>
+    /// Invoke a function registered for inter-plugin communication.
+    /// </summary>
+    /// <param name="args">Parameter args.</param>
+    /// <returns>The return value.</returns>
+    /// <typeparam name="TRet">The return type.</typeparam>
+    /// <exception cref="IpcNotReadyError">This is thrown when the IPC publisher has not registered a func for calling yet.</exception>
+    private protected TRet InvokeFunc<TRet>(params object?[]? args)
+        => this.Channel.InvokeFunc<TRet>(args);
+
+    /// <summary>
+    /// Invoke all actions that have subscribed to this IPC.
+    /// </summary>
+    /// <param name="args">Delegate arguments.</param>
+    private protected void SendMessage(params object?[]? args)
+        => this.Channel.SendMessage(args);
 }
diff --git a/Dalamud/Plugin/PluginLoadReason.cs b/Dalamud/Plugin/PluginLoadReason.cs
index 846525b0f..ade95ae67 100644
--- a/Dalamud/Plugin/PluginLoadReason.cs
+++ b/Dalamud/Plugin/PluginLoadReason.cs
@@ -1,33 +1,32 @@
-namespace Dalamud.Plugin
+namespace Dalamud.Plugin;
+
+/// <summary>
+/// This enum reflects reasons for loading a plugin.
+/// </summary>
+public enum PluginLoadReason
 {
     /// <summary>
-    /// This enum reflects reasons for loading a plugin.
+    /// We don't know why this plugin was loaded.
     /// </summary>
-    public enum PluginLoadReason
-    {
-        /// <summary>
-        /// We don't know why this plugin was loaded.
-        /// </summary>
-        Unknown,
+    Unknown,
 
-        /// <summary>
-        /// This plugin was loaded because it was installed with the plugin installer.
-        /// </summary>
-        Installer,
+    /// <summary>
+    /// This plugin was loaded because it was installed with the plugin installer.
+    /// </summary>
+    Installer,
 
-        /// <summary>
-        /// This plugin was loaded because it was just updated.
-        /// </summary>
-        Update,
+    /// <summary>
+    /// This plugin was loaded because it was just updated.
+    /// </summary>
+    Update,
 
-        /// <summary>
-        /// This plugin was loaded because it was told to reload.
-        /// </summary>
-        Reload,
+    /// <summary>
+    /// This plugin was loaded because it was told to reload.
+    /// </summary>
+    Reload,
 
-        /// <summary>
-        /// This plugin was loaded because the game was started or Dalamud was reinjected.
-        /// </summary>
-        Boot,
-    }
+    /// <summary>
+    /// This plugin was loaded because the game was started or Dalamud was reinjected.
+    /// </summary>
+    Boot,
 }
diff --git a/Dalamud/SafeMemory.cs b/Dalamud/SafeMemory.cs
index fb61453f3..4b2a981bd 100644
--- a/Dalamud/SafeMemory.cs
+++ b/Dalamud/SafeMemory.cs
@@ -2,292 +2,291 @@ using System;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Dalamud
+namespace Dalamud;
+
+/// <summary>
+/// Class facilitating safe memory access.
+/// </summary>
+/// <remarks>
+/// Attention! The performance of these methods is severely worse than regular <see cref="Marshal"/> calls.
+/// Please consider using those instead in performance-critical code.
+/// </remarks>
+public static class SafeMemory
 {
+    private static readonly IntPtr Handle;
+
+    static SafeMemory()
+    {
+        Handle = Imports.GetCurrentProcess();
+    }
+
     /// <summary>
-    /// Class facilitating safe memory access.
+    /// Read a byte array from the current process.
+    /// </summary>
+    /// <param name="address">The address to read from.</param>
+    /// <param name="count">The amount of bytes to read.</param>
+    /// <param name="buffer">The result buffer.</param>
+    /// <returns>Whether or not the read succeeded.</returns>
+    public static bool ReadBytes(IntPtr address, int count, out byte[] buffer)
+    {
+        buffer = new byte[count <= 0 ? 0 : count];
+        return Imports.ReadProcessMemory(Handle, address, buffer, buffer.Length, out _);
+    }
+
+    /// <summary>
+    /// Write a byte array to the current process.
+    /// </summary>
+    /// <param name="address">The address to write to.</param>
+    /// <param name="buffer">The buffer to write.</param>
+    /// <returns>Whether or not the write succeeded.</returns>
+    public static bool WriteBytes(IntPtr address, byte[] buffer)
+    {
+        return Imports.WriteProcessMemory(Handle, address, buffer, buffer.Length, out _);
+    }
+
+    /// <summary>
+    /// Read an object of the specified struct from the current process.
+    /// </summary>
+    /// <typeparam name="T">The type of the struct.</typeparam>
+    /// <param name="address">The address to read from.</param>
+    /// <param name="result">The resulting object.</param>
+    /// <returns>Whether or not the read succeeded.</returns>
+    public static bool Read<T>(IntPtr address, out T result) where T : struct
+    {
+        if (!ReadBytes(address, SizeCache<T>.Size, out var buffer))
+        {
+            result = default;
+            return false;
+        }
+
+        using var mem = new LocalMemory(buffer.Length);
+        mem.Write(buffer);
+
+        result = mem.Read<T>();
+        return true;
+    }
+
+    /// <summary>
+    /// Read an array of objects of the specified struct from the current process.
+    /// </summary>
+    /// <typeparam name="T">The type of the struct.</typeparam>
+    /// <param name="address">The address to read from.</param>
+    /// <param name="count">The length of the array.</param>
+    /// <returns>An array of the read objects, or null if any entry of the array failed to read.</returns>
+    public static T[]? Read<T>(IntPtr address, int count) where T : struct
+    {
+        var size = SizeOf<T>();
+        if (!ReadBytes(address, count * size, out var buffer))
+            return null;
+        var result = new T[count];
+        using var mem = new LocalMemory(buffer.Length);
+        mem.Write(buffer);
+        for (var i = 0; i < result.Length; i++)
+            result[i] = mem.Read<T>(i * size);
+        return result;
+    }
+
+    /// <summary>
+    /// Write a struct to the current process.
+    /// </summary>
+    /// <typeparam name="T">The type of the struct.</typeparam>
+    /// <param name="address">The address to write to.</param>
+    /// <param name="obj">The object to write.</param>
+    /// <returns>Whether or not the write succeeded.</returns>
+    public static bool Write<T>(IntPtr address, T obj) where T : struct
+    {
+        using var mem = new LocalMemory(SizeCache<T>.Size);
+        mem.Write(obj);
+        return WriteBytes(address, mem.Read());
+    }
+
+    /// <summary>
+    /// Write an array of structs to the current process.
+    /// </summary>
+    /// <typeparam name="T">The type of the structs.</typeparam>
+    /// <param name="address">The address to write to.</param>
+    /// <param name="objArray">The array to write.</param>
+    /// <returns>Whether or not the write succeeded.</returns>
+    public static bool Write<T>(IntPtr address, T[] objArray) where T : struct
+    {
+        if (objArray == null || objArray.Length == 0)
+            return true;
+        var size = SizeCache<T>.Size;
+        using var mem = new LocalMemory(objArray.Length * size);
+        for (var i = 0; i < objArray.Length; i++)
+            mem.Write(objArray[i], i * size);
+        return WriteBytes(address, mem.Read());
+    }
+
+    /// <summary>
+    /// Read a string from the current process(UTF-8).
     /// </summary>
     /// <remarks>
-    /// Attention! The performance of these methods is severely worse than regular <see cref="Marshal"/> calls.
-    /// Please consider using those instead in performance-critical code.
+    /// Attention! This will use the .NET Encoding.UTF8 class to decode the text.
+    /// If you read a FFXIV string, please use ReadBytes and parse the string with the applicable class,
+    /// since Encoding.UTF8 destroys the FFXIV payload structure.
     /// </remarks>
-    public static class SafeMemory
+    /// <param name="address">The address to read from.</param>
+    /// <param name="maxLength">The maximum length of the string.</param>
+    /// <returns>The read string, or null in case the read was not successful.</returns>
+    public static string? ReadString(IntPtr address, int maxLength = 256)
     {
-        private static readonly IntPtr Handle;
+        return ReadString(address, Encoding.UTF8, maxLength);
+    }
 
-        static SafeMemory()
-        {
-            Handle = Imports.GetCurrentProcess();
-        }
+    /// <summary>
+    /// Read a string from the current process(UTF-8).
+    /// </summary>
+    /// <remarks>
+    /// Attention! This will use the .NET Encoding class to decode the text.
+    /// If you read a FFXIV string, please use ReadBytes and parse the string with the applicable class,
+    /// since Encoding may destroy the FFXIV payload structure.
+    /// </remarks>
+    /// <param name="address">The address to read from.</param>
+    /// <param name="encoding">The encoding to use to decode the string.</param>
+    /// <param name="maxLength">The maximum length of the string.</param>
+    /// <returns>The read string, or null in case the read was not successful.</returns>
+    public static string? ReadString(IntPtr address, Encoding encoding, int maxLength = 256)
+    {
+        if (!ReadBytes(address, maxLength, out var buffer))
+            return null;
+        var data = encoding.GetString(buffer);
+        var eosPos = data.IndexOf('\0');
+        return eosPos == -1 ? data : data.Substring(0, eosPos);
+    }
 
-        /// <summary>
-        /// Read a byte array from the current process.
-        /// </summary>
-        /// <param name="address">The address to read from.</param>
-        /// <param name="count">The amount of bytes to read.</param>
-        /// <param name="buffer">The result buffer.</param>
-        /// <returns>Whether or not the read succeeded.</returns>
-        public static bool ReadBytes(IntPtr address, int count, out byte[] buffer)
-        {
-            buffer = new byte[count <= 0 ? 0 : count];
-            return Imports.ReadProcessMemory(Handle, address, buffer, buffer.Length, out _);
-        }
+    /// <summary>
+    /// Write a string to the current process.
+    /// </summary>
+    /// <remarks>
+    /// Attention! This will use the .NET Encoding class to encode the text.
+    /// If you read a FFXIV string, please use WriteBytes with the applicable encoded SeString,
+    /// since Encoding may destroy the FFXIV payload structure.
+    /// </remarks>
+    /// <param name="address">The address to write to.</param>
+    /// <param name="str">The string to write.</param>
+    /// <returns>Whether or not the write succeeded.</returns>
+    public static bool WriteString(IntPtr address, string str)
+    {
+        return WriteString(address, str, Encoding.UTF8);
+    }
 
-        /// <summary>
-        /// Write a byte array to the current process.
-        /// </summary>
-        /// <param name="address">The address to write to.</param>
-        /// <param name="buffer">The buffer to write.</param>
-        /// <returns>Whether or not the write succeeded.</returns>
-        public static bool WriteBytes(IntPtr address, byte[] buffer)
-        {
-            return Imports.WriteProcessMemory(Handle, address, buffer, buffer.Length, out _);
-        }
-
-        /// <summary>
-        /// Read an object of the specified struct from the current process.
-        /// </summary>
-        /// <typeparam name="T">The type of the struct.</typeparam>
-        /// <param name="address">The address to read from.</param>
-        /// <param name="result">The resulting object.</param>
-        /// <returns>Whether or not the read succeeded.</returns>
-        public static bool Read<T>(IntPtr address, out T result) where T : struct
-        {
-            if (!ReadBytes(address, SizeCache<T>.Size, out var buffer))
-            {
-                result = default;
-                return false;
-            }
-
-            using var mem = new LocalMemory(buffer.Length);
-            mem.Write(buffer);
-
-            result = mem.Read<T>();
+    /// <summary>
+    /// Write a string to the current process.
+    /// </summary>
+    /// <remarks>
+    /// Attention! This will use the .NET Encoding class to encode the text.
+    /// If you read a FFXIV string, please use WriteBytes with the applicable encoded SeString,
+    /// since Encoding may destroy the FFXIV payload structure.
+    /// </remarks>
+    /// <param name="address">The address to write to.</param>
+    /// <param name="str">The string to write.</param>
+    /// <param name="encoding">The encoding to use.</param>
+    /// <returns>Whether or not the write succeeded.</returns>
+    public static bool WriteString(IntPtr address, string str, Encoding encoding)
+    {
+        if (string.IsNullOrEmpty(str))
             return true;
+        return WriteBytes(address, encoding.GetBytes(str + "\0"));
+    }
+
+    /// <summary>
+    /// Marshals data from an unmanaged block of memory to a managed object.
+    /// </summary>
+    /// <typeparam name="T">The type to create.</typeparam>
+    /// <param name="addr">The address to read from.</param>
+    /// <returns>The read object, or null, if it could not be read.</returns>
+    public static T? PtrToStructure<T>(IntPtr addr) where T : struct => (T?)PtrToStructure(addr, typeof(T));
+
+    /// <summary>
+    /// Marshals data from an unmanaged block of memory to a managed object.
+    /// </summary>
+    /// <param name="addr">The address to read from.</param>
+    /// <param name="type">The type to create.</param>
+    /// <returns>The read object, or null, if it could not be read.</returns>
+    public static object? PtrToStructure(IntPtr addr, Type type)
+    {
+        var size = Marshal.SizeOf(type);
+
+        if (!ReadBytes(addr, size, out var buffer))
+            return null;
+
+        var mem = new LocalMemory(size);
+        mem.Write(buffer);
+
+        return mem.Read(type);
+    }
+
+    /// <summary>
+    /// Get the size of the passed type.
+    /// </summary>
+    /// <typeparam name="T">The type to inspect.</typeparam>
+    /// <returns>The size of the passed type.</returns>
+    public static int SizeOf<T>() where T : struct
+    {
+        return SizeCache<T>.Size;
+    }
+
+    private static class SizeCache<T>
+    {
+        // ReSharper disable once StaticMemberInGenericType
+        public static readonly int Size;
+
+        static SizeCache()
+        {
+            var type = typeof(T);
+            if (type.IsEnum)
+                type = type.GetEnumUnderlyingType();
+            Size = Type.GetTypeCode(type) == TypeCode.Boolean ? 1 : Marshal.SizeOf(type);
+        }
+    }
+
+    private static class Imports
+    {
+        [DllImport("kernel32", SetLastError = true)]
+        public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, [Out] byte[] lpBuffer, int nSize, out int lpNumberOfBytesRead);
+
+        [DllImport("kernel32", SetLastError = true)]
+        public static extern bool WriteProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, byte[] lpBuffer, int nSize, out int lpNumberOfBytesWritten);
+
+        [DllImport("kernel32", SetLastError = false)]
+        public static extern IntPtr GetCurrentProcess();
+    }
+
+    private sealed class LocalMemory : IDisposable
+    {
+        private readonly int size;
+
+        private IntPtr hGlobal;
+
+        public LocalMemory(int size)
+        {
+            this.size = size;
+            this.hGlobal = Marshal.AllocHGlobal(this.size);
         }
 
-        /// <summary>
-        /// Read an array of objects of the specified struct from the current process.
-        /// </summary>
-        /// <typeparam name="T">The type of the struct.</typeparam>
-        /// <param name="address">The address to read from.</param>
-        /// <param name="count">The length of the array.</param>
-        /// <returns>An array of the read objects, or null if any entry of the array failed to read.</returns>
-        public static T[]? Read<T>(IntPtr address, int count) where T : struct
+        ~LocalMemory() => this.Dispose();
+
+        public byte[] Read()
         {
-            var size = SizeOf<T>();
-            if (!ReadBytes(address, count * size, out var buffer))
-                return null;
-            var result = new T[count];
-            using var mem = new LocalMemory(buffer.Length);
-            mem.Write(buffer);
-            for (var i = 0; i < result.Length; i++)
-                result[i] = mem.Read<T>(i * size);
-            return result;
+            var bytes = new byte[this.size];
+            Marshal.Copy(this.hGlobal, bytes, 0, this.size);
+            return bytes;
         }
 
-        /// <summary>
-        /// Write a struct to the current process.
-        /// </summary>
-        /// <typeparam name="T">The type of the struct.</typeparam>
-        /// <param name="address">The address to write to.</param>
-        /// <param name="obj">The object to write.</param>
-        /// <returns>Whether or not the write succeeded.</returns>
-        public static bool Write<T>(IntPtr address, T obj) where T : struct
+        public T Read<T>(int offset = 0) => (T)Marshal.PtrToStructure(this.hGlobal + offset, typeof(T));
+
+        public object? Read(Type type, int offset = 0) => Marshal.PtrToStructure(this.hGlobal + offset, type);
+
+        public void Write(byte[] data, int index = 0) => Marshal.Copy(data, index, this.hGlobal, this.size);
+
+        public void Write<T>(T data, int offset = 0) => Marshal.StructureToPtr(data, this.hGlobal + offset, false);
+
+        public void Dispose()
         {
-            using var mem = new LocalMemory(SizeCache<T>.Size);
-            mem.Write(obj);
-            return WriteBytes(address, mem.Read());
-        }
-
-        /// <summary>
-        /// Write an array of structs to the current process.
-        /// </summary>
-        /// <typeparam name="T">The type of the structs.</typeparam>
-        /// <param name="address">The address to write to.</param>
-        /// <param name="objArray">The array to write.</param>
-        /// <returns>Whether or not the write succeeded.</returns>
-        public static bool Write<T>(IntPtr address, T[] objArray) where T : struct
-        {
-            if (objArray == null || objArray.Length == 0)
-                return true;
-            var size = SizeCache<T>.Size;
-            using var mem = new LocalMemory(objArray.Length * size);
-            for (var i = 0; i < objArray.Length; i++)
-                mem.Write(objArray[i], i * size);
-            return WriteBytes(address, mem.Read());
-        }
-
-        /// <summary>
-        /// Read a string from the current process(UTF-8).
-        /// </summary>
-        /// <remarks>
-        /// Attention! This will use the .NET Encoding.UTF8 class to decode the text.
-        /// If you read a FFXIV string, please use ReadBytes and parse the string with the applicable class,
-        /// since Encoding.UTF8 destroys the FFXIV payload structure.
-        /// </remarks>
-        /// <param name="address">The address to read from.</param>
-        /// <param name="maxLength">The maximum length of the string.</param>
-        /// <returns>The read string, or null in case the read was not successful.</returns>
-        public static string? ReadString(IntPtr address, int maxLength = 256)
-        {
-            return ReadString(address, Encoding.UTF8, maxLength);
-        }
-
-        /// <summary>
-        /// Read a string from the current process(UTF-8).
-        /// </summary>
-        /// <remarks>
-        /// Attention! This will use the .NET Encoding class to decode the text.
-        /// If you read a FFXIV string, please use ReadBytes and parse the string with the applicable class,
-        /// since Encoding may destroy the FFXIV payload structure.
-        /// </remarks>
-        /// <param name="address">The address to read from.</param>
-        /// <param name="encoding">The encoding to use to decode the string.</param>
-        /// <param name="maxLength">The maximum length of the string.</param>
-        /// <returns>The read string, or null in case the read was not successful.</returns>
-        public static string? ReadString(IntPtr address, Encoding encoding, int maxLength = 256)
-        {
-            if (!ReadBytes(address, maxLength, out var buffer))
-                return null;
-            var data = encoding.GetString(buffer);
-            var eosPos = data.IndexOf('\0');
-            return eosPos == -1 ? data : data.Substring(0, eosPos);
-        }
-
-        /// <summary>
-        /// Write a string to the current process.
-        /// </summary>
-        /// <remarks>
-        /// Attention! This will use the .NET Encoding class to encode the text.
-        /// If you read a FFXIV string, please use WriteBytes with the applicable encoded SeString,
-        /// since Encoding may destroy the FFXIV payload structure.
-        /// </remarks>
-        /// <param name="address">The address to write to.</param>
-        /// <param name="str">The string to write.</param>
-        /// <returns>Whether or not the write succeeded.</returns>
-        public static bool WriteString(IntPtr address, string str)
-        {
-            return WriteString(address, str, Encoding.UTF8);
-        }
-
-        /// <summary>
-        /// Write a string to the current process.
-        /// </summary>
-        /// <remarks>
-        /// Attention! This will use the .NET Encoding class to encode the text.
-        /// If you read a FFXIV string, please use WriteBytes with the applicable encoded SeString,
-        /// since Encoding may destroy the FFXIV payload structure.
-        /// </remarks>
-        /// <param name="address">The address to write to.</param>
-        /// <param name="str">The string to write.</param>
-        /// <param name="encoding">The encoding to use.</param>
-        /// <returns>Whether or not the write succeeded.</returns>
-        public static bool WriteString(IntPtr address, string str, Encoding encoding)
-        {
-            if (string.IsNullOrEmpty(str))
-                return true;
-            return WriteBytes(address, encoding.GetBytes(str + "\0"));
-        }
-
-        /// <summary>
-        /// Marshals data from an unmanaged block of memory to a managed object.
-        /// </summary>
-        /// <typeparam name="T">The type to create.</typeparam>
-        /// <param name="addr">The address to read from.</param>
-        /// <returns>The read object, or null, if it could not be read.</returns>
-        public static T? PtrToStructure<T>(IntPtr addr) where T : struct => (T?)PtrToStructure(addr, typeof(T));
-
-        /// <summary>
-        /// Marshals data from an unmanaged block of memory to a managed object.
-        /// </summary>
-        /// <param name="addr">The address to read from.</param>
-        /// <param name="type">The type to create.</param>
-        /// <returns>The read object, or null, if it could not be read.</returns>
-        public static object? PtrToStructure(IntPtr addr, Type type)
-        {
-            var size = Marshal.SizeOf(type);
-
-            if (!ReadBytes(addr, size, out var buffer))
-                return null;
-
-            var mem = new LocalMemory(size);
-            mem.Write(buffer);
-
-            return mem.Read(type);
-        }
-
-        /// <summary>
-        /// Get the size of the passed type.
-        /// </summary>
-        /// <typeparam name="T">The type to inspect.</typeparam>
-        /// <returns>The size of the passed type.</returns>
-        public static int SizeOf<T>() where T : struct
-        {
-            return SizeCache<T>.Size;
-        }
-
-        private static class SizeCache<T>
-        {
-            // ReSharper disable once StaticMemberInGenericType
-            public static readonly int Size;
-
-            static SizeCache()
-            {
-                var type = typeof(T);
-                if (type.IsEnum)
-                    type = type.GetEnumUnderlyingType();
-                Size = Type.GetTypeCode(type) == TypeCode.Boolean ? 1 : Marshal.SizeOf(type);
-            }
-        }
-
-        private static class Imports
-        {
-            [DllImport("kernel32", SetLastError = true)]
-            public static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, [Out] byte[] lpBuffer, int nSize, out int lpNumberOfBytesRead);
-
-            [DllImport("kernel32", SetLastError = true)]
-            public static extern bool WriteProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, byte[] lpBuffer, int nSize, out int lpNumberOfBytesWritten);
-
-            [DllImport("kernel32", SetLastError = false)]
-            public static extern IntPtr GetCurrentProcess();
-        }
-
-        private sealed class LocalMemory : IDisposable
-        {
-            private readonly int size;
-
-            private IntPtr hGlobal;
-
-            public LocalMemory(int size)
-            {
-                this.size = size;
-                this.hGlobal = Marshal.AllocHGlobal(this.size);
-            }
-
-            ~LocalMemory() => this.Dispose();
-
-            public byte[] Read()
-            {
-                var bytes = new byte[this.size];
-                Marshal.Copy(this.hGlobal, bytes, 0, this.size);
-                return bytes;
-            }
-
-            public T Read<T>(int offset = 0) => (T)Marshal.PtrToStructure(this.hGlobal + offset, typeof(T));
-
-            public object? Read(Type type, int offset = 0) => Marshal.PtrToStructure(this.hGlobal + offset, type);
-
-            public void Write(byte[] data, int index = 0) => Marshal.Copy(data, index, this.hGlobal, this.size);
-
-            public void Write<T>(T data, int offset = 0) => Marshal.StructureToPtr(data, this.hGlobal + offset, false);
-
-            public void Dispose()
-            {
-                Marshal.FreeHGlobal(this.hGlobal);
-                this.hGlobal = IntPtr.Zero;
-                GC.SuppressFinalize(this);
-            }
+            Marshal.FreeHGlobal(this.hGlobal);
+            this.hGlobal = IntPtr.Zero;
+            GC.SuppressFinalize(this);
         }
     }
 }
diff --git a/Dalamud/ServiceManager.cs b/Dalamud/ServiceManager.cs
index 224cf6145..a7eb7457d 100644
--- a/Dalamud/ServiceManager.cs
+++ b/Dalamud/ServiceManager.cs
@@ -12,289 +12,288 @@ using Dalamud.Logging.Internal;
 using Dalamud.Utility.Timing;
 using JetBrains.Annotations;
 
-namespace Dalamud
+namespace Dalamud;
+
+/// <summary>
+/// Class to initialize Service&lt;T&gt;s.
+/// </summary>
+internal static class ServiceManager
 {
     /// <summary>
-    /// Class to initialize Service&lt;T&gt;s.
+    /// Static log facility for Service{T}, to avoid duplicate instances for different types.
     /// </summary>
-    internal static class ServiceManager
+    public static readonly ModuleLog Log = new("SVC");
+
+    private static readonly TaskCompletionSource BlockingServicesLoadedTaskCompletionSource = new();
+
+    private static readonly List<Type> LoadedServices = new();
+
+    /// <summary>
+    /// Gets task that gets completed when all blocking early loading services are done loading.
+    /// </summary>
+    public static Task BlockingResolved { get; } = BlockingServicesLoadedTaskCompletionSource.Task;
+
+    /// <summary>
+    /// Initializes Provided Services and FFXIVClientStructs.
+    /// </summary>
+    /// <param name="dalamud">Instance of <see cref="Dalamud"/>.</param>
+    /// <param name="startInfo">Instance of <see cref="DalamudStartInfo"/>.</param>
+    /// <param name="configuration">Instance of <see cref="DalamudConfiguration"/>.</param>
+    public static void InitializeProvidedServicesAndClientStructs(Dalamud dalamud, DalamudStartInfo startInfo, DalamudConfiguration configuration)
     {
-        /// <summary>
-        /// Static log facility for Service{T}, to avoid duplicate instances for different types.
-        /// </summary>
-        public static readonly ModuleLog Log = new("SVC");
+        // Initialize the process information.
+        var cacheDir = new DirectoryInfo(Path.Combine(startInfo.WorkingDirectory!, "cachedSigs"));
+        if (!cacheDir.Exists)
+            cacheDir.Create();
 
-        private static readonly TaskCompletionSource BlockingServicesLoadedTaskCompletionSource = new();
-
-        private static readonly List<Type> LoadedServices = new();
-
-        /// <summary>
-        /// Gets task that gets completed when all blocking early loading services are done loading.
-        /// </summary>
-        public static Task BlockingResolved { get; } = BlockingServicesLoadedTaskCompletionSource.Task;
-
-        /// <summary>
-        /// Initializes Provided Services and FFXIVClientStructs.
-        /// </summary>
-        /// <param name="dalamud">Instance of <see cref="Dalamud"/>.</param>
-        /// <param name="startInfo">Instance of <see cref="DalamudStartInfo"/>.</param>
-        /// <param name="configuration">Instance of <see cref="DalamudConfiguration"/>.</param>
-        public static void InitializeProvidedServicesAndClientStructs(Dalamud dalamud, DalamudStartInfo startInfo, DalamudConfiguration configuration)
+        lock (LoadedServices)
         {
-            // Initialize the process information.
-            var cacheDir = new DirectoryInfo(Path.Combine(startInfo.WorkingDirectory!, "cachedSigs"));
-            if (!cacheDir.Exists)
-                cacheDir.Create();
+            Service<Dalamud>.Provide(dalamud);
+            LoadedServices.Add(typeof(Dalamud));
 
-            lock (LoadedServices)
-            {
-                Service<Dalamud>.Provide(dalamud);
-                LoadedServices.Add(typeof(Dalamud));
+            Service<DalamudStartInfo>.Provide(startInfo);
+            LoadedServices.Add(typeof(DalamudStartInfo));
 
-                Service<DalamudStartInfo>.Provide(startInfo);
-                LoadedServices.Add(typeof(DalamudStartInfo));
+            Service<DalamudConfiguration>.Provide(configuration);
+            LoadedServices.Add(typeof(DalamudConfiguration));
 
-                Service<DalamudConfiguration>.Provide(configuration);
-                LoadedServices.Add(typeof(DalamudConfiguration));
+            Service<ServiceContainer>.Provide(new ServiceContainer());
+            LoadedServices.Add(typeof(ServiceContainer));
 
-                Service<ServiceContainer>.Provide(new ServiceContainer());
-                LoadedServices.Add(typeof(ServiceContainer));
-
-                Service<SigScanner>.Provide(
-                    new SigScanner(
-                        true, new FileInfo(Path.Combine(cacheDir.FullName, $"{startInfo.GameVersion}.json"))));
-                LoadedServices.Add(typeof(SigScanner));
-            }
-
-            using (Timings.Start("CS Resolver Init"))
-            {
-                FFXIVClientStructs.Resolver.InitializeParallel(
-                    new FileInfo(Path.Combine(cacheDir.FullName, $"{startInfo.GameVersion}_cs.json")));
-            }
+            Service<SigScanner>.Provide(
+                new SigScanner(
+                    true, new FileInfo(Path.Combine(cacheDir.FullName, $"{startInfo.GameVersion}.json"))));
+            LoadedServices.Add(typeof(SigScanner));
         }
 
-        /// <summary>
-        /// Kicks off construction of services that can handle early loading.
-        /// </summary>
-        /// <returns>Task for initializing all services.</returns>
-        public static async Task InitializeEarlyLoadableServices()
+        using (Timings.Start("CS Resolver Init"))
         {
-            using var serviceInitializeTimings = Timings.Start("Services Init");
+            FFXIVClientStructs.Resolver.InitializeParallel(
+                new FileInfo(Path.Combine(cacheDir.FullName, $"{startInfo.GameVersion}_cs.json")));
+        }
+    }
 
-            var earlyLoadingServices = new HashSet<Type>();
-            var blockingEarlyLoadingServices = new HashSet<Type>();
+    /// <summary>
+    /// Kicks off construction of services that can handle early loading.
+    /// </summary>
+    /// <returns>Task for initializing all services.</returns>
+    public static async Task InitializeEarlyLoadableServices()
+    {
+        using var serviceInitializeTimings = Timings.Start("Services Init");
 
-            var dependencyServicesMap = new Dictionary<Type, List<Type>>();
-            var getAsyncTaskMap = new Dictionary<Type, Task>();
+        var earlyLoadingServices = new HashSet<Type>();
+        var blockingEarlyLoadingServices = new HashSet<Type>();
 
-            foreach (var serviceType in Assembly.GetExecutingAssembly().GetTypes())
-            {
-                var attr = serviceType.GetCustomAttribute<Service>(true)?.GetType();
-                if (attr?.IsAssignableTo(typeof(EarlyLoadedService)) != true)
-                    continue;
+        var dependencyServicesMap = new Dictionary<Type, List<Type>>();
+        var getAsyncTaskMap = new Dictionary<Type, Task>();
 
-                var getTask = (Task)typeof(Service<>)
-                                    .MakeGenericType(serviceType)
-                                    .InvokeMember(
-                                        "GetAsync",
-                                        BindingFlags.InvokeMethod | BindingFlags.Static | BindingFlags.Public,
-                                        null,
-                                        null,
-                                        null);
+        foreach (var serviceType in Assembly.GetExecutingAssembly().GetTypes())
+        {
+            var attr = serviceType.GetCustomAttribute<Service>(true)?.GetType();
+            if (attr?.IsAssignableTo(typeof(EarlyLoadedService)) != true)
+                continue;
 
-                if (attr.IsAssignableTo(typeof(BlockingEarlyLoadedService)))
-                {
-                    getAsyncTaskMap[serviceType] = getTask;
-                    blockingEarlyLoadingServices.Add(serviceType);
-                }
-                else
-                {
-                    earlyLoadingServices.Add(serviceType);
-                }
-
-                dependencyServicesMap[serviceType] =
-                    (List<Type>)typeof(Service<>)
+            var getTask = (Task)typeof(Service<>)
                                 .MakeGenericType(serviceType)
                                 .InvokeMember(
-                                    "GetDependencyServices",
+                                    "GetAsync",
                                     BindingFlags.InvokeMethod | BindingFlags.Static | BindingFlags.Public,
                                     null,
                                     null,
                                     null);
+
+            if (attr.IsAssignableTo(typeof(BlockingEarlyLoadedService)))
+            {
+                getAsyncTaskMap[serviceType] = getTask;
+                blockingEarlyLoadingServices.Add(serviceType);
+            }
+            else
+            {
+                earlyLoadingServices.Add(serviceType);
             }
 
-            _ = Task.Run(async () =>
-            {
-                try
-                {
-                    await Task.WhenAll(blockingEarlyLoadingServices.Select(x => getAsyncTaskMap[x]));
-                    BlockingServicesLoadedTaskCompletionSource.SetResult();
-                    Timings.Event("BlockingServices Initialized");
-                }
-                catch (Exception e)
-                {
-                    BlockingServicesLoadedTaskCompletionSource.SetException(e);
-                }
-            }).ConfigureAwait(false);
+            dependencyServicesMap[serviceType] =
+                (List<Type>)typeof(Service<>)
+                            .MakeGenericType(serviceType)
+                            .InvokeMember(
+                                "GetDependencyServices",
+                                BindingFlags.InvokeMethod | BindingFlags.Static | BindingFlags.Public,
+                                null,
+                                null,
+                                null);
+        }
 
-            var tasks = new List<Task>();
+        _ = Task.Run(async () =>
+        {
             try
             {
-                var servicesToLoad = new HashSet<Type>();
-                servicesToLoad.UnionWith(earlyLoadingServices);
-                servicesToLoad.UnionWith(blockingEarlyLoadingServices);
-
-                while (servicesToLoad.Any())
-                {
-                    foreach (var serviceType in servicesToLoad)
-                    {
-                        if (dependencyServicesMap[serviceType].Any(
-                                x => getAsyncTaskMap.GetValueOrDefault(x)?.IsCompleted == false))
-                            continue;
-
-                        tasks.Add((Task)typeof(Service<>)
-                                        .MakeGenericType(serviceType)
-                                        .InvokeMember(
-                                            "StartLoader",
-                                            BindingFlags.InvokeMethod | BindingFlags.Static | BindingFlags.NonPublic,
-                                            null,
-                                            null,
-                                            null));
-                        servicesToLoad.Remove(serviceType);
-
-                        tasks.Add(tasks.Last().ContinueWith(task =>
-                        {
-                            if (task.IsFaulted)
-                                return;
-                            lock (LoadedServices)
-                            {
-                                LoadedServices.Add(serviceType);
-                            }
-                        }));
-                    }
-
-                    if (!tasks.Any())
-                        throw new InvalidOperationException("Unresolvable dependency cycle detected");
-
-                    if (servicesToLoad.Any())
-                    {
-                        await Task.WhenAny(tasks);
-                        var faultedTasks = tasks.Where(x => x.IsFaulted).Select(x => (Exception)x.Exception!).ToArray();
-                        if (faultedTasks.Any())
-                            throw new AggregateException(faultedTasks);
-                    }
-                    else
-                    {
-                        await Task.WhenAll(tasks);
-                    }
-
-                    tasks.RemoveAll(x => x.IsCompleted);
-                }
+                await Task.WhenAll(blockingEarlyLoadingServices.Select(x => getAsyncTaskMap[x]));
+                BlockingServicesLoadedTaskCompletionSource.SetResult();
+                Timings.Event("BlockingServices Initialized");
             }
             catch (Exception e)
             {
-                Log.Error(e, "Failed resolving services");
-                try
+                BlockingServicesLoadedTaskCompletionSource.SetException(e);
+            }
+        }).ConfigureAwait(false);
+
+        var tasks = new List<Task>();
+        try
+        {
+            var servicesToLoad = new HashSet<Type>();
+            servicesToLoad.UnionWith(earlyLoadingServices);
+            servicesToLoad.UnionWith(blockingEarlyLoadingServices);
+
+            while (servicesToLoad.Any())
+            {
+                foreach (var serviceType in servicesToLoad)
                 {
-                    BlockingServicesLoadedTaskCompletionSource.SetException(e);
-                }
-                catch (Exception)
-                {
-                    // don't care, as this means task result/exception has already been set
+                    if (dependencyServicesMap[serviceType].Any(
+                            x => getAsyncTaskMap.GetValueOrDefault(x)?.IsCompleted == false))
+                        continue;
+
+                    tasks.Add((Task)typeof(Service<>)
+                                    .MakeGenericType(serviceType)
+                                    .InvokeMember(
+                                        "StartLoader",
+                                        BindingFlags.InvokeMethod | BindingFlags.Static | BindingFlags.NonPublic,
+                                        null,
+                                        null,
+                                        null));
+                    servicesToLoad.Remove(serviceType);
+
+                    tasks.Add(tasks.Last().ContinueWith(task =>
+                    {
+                        if (task.IsFaulted)
+                            return;
+                        lock (LoadedServices)
+                        {
+                            LoadedServices.Add(serviceType);
+                        }
+                    }));
                 }
 
-                while (tasks.Any())
+                if (!tasks.Any())
+                    throw new InvalidOperationException("Unresolvable dependency cycle detected");
+
+                if (servicesToLoad.Any())
                 {
                     await Task.WhenAny(tasks);
-                    tasks.RemoveAll(x => x.IsCompleted);
+                    var faultedTasks = tasks.Where(x => x.IsFaulted).Select(x => (Exception)x.Exception!).ToArray();
+                    if (faultedTasks.Any())
+                        throw new AggregateException(faultedTasks);
                 }
-
-                UnloadAllServices();
-
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Unloads all services, in the reverse order of load.
-        /// </summary>
-        public static void UnloadAllServices()
-        {
-            var framework = Service<Framework>.GetNullable(Service<Framework>.ExceptionPropagationMode.None);
-            if (framework is { IsInFrameworkUpdateThread: false, IsFrameworkUnloading: false })
-            {
-                framework.RunOnFrameworkThread(UnloadAllServices).Wait();
-                return;
-            }
-
-            lock (LoadedServices)
-            {
-                while (LoadedServices.Any())
+                else
                 {
-                    var serviceType = LoadedServices.Last();
-                    LoadedServices.RemoveAt(LoadedServices.Count - 1);
-
-                    typeof(Service<>)
-                        .MakeGenericType(serviceType)
-                        .InvokeMember(
-                            "Unset",
-                            BindingFlags.InvokeMethod | BindingFlags.Static | BindingFlags.NonPublic,
-                            null,
-                            null,
-                            null);
+                    await Task.WhenAll(tasks);
                 }
+
+                tasks.RemoveAll(x => x.IsCompleted);
             }
         }
-
-        /// <summary>
-        /// Indicates that this constructor will be called for early initialization.
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Constructor)]
-        [MeansImplicitUse(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        public class ServiceConstructor : Attribute
+        catch (Exception e)
         {
-        }
+            Log.Error(e, "Failed resolving services");
+            try
+            {
+                BlockingServicesLoadedTaskCompletionSource.SetException(e);
+            }
+            catch (Exception)
+            {
+                // don't care, as this means task result/exception has already been set
+            }
 
-        /// <summary>
-        /// Indicates that the field is a service that should be loaded before constructing the class.
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Field)]
-        public class ServiceDependency : Attribute
-        {
-        }
+            while (tasks.Any())
+            {
+                await Task.WhenAny(tasks);
+                tasks.RemoveAll(x => x.IsCompleted);
+            }
 
-        /// <summary>
-        /// Indicates that the class is a service.
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Class)]
-        public class Service : Attribute
-        {
-        }
+            UnloadAllServices();
 
-        /// <summary>
-        /// Indicates that the class is a service, and will be instantiated automatically on startup.
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Class)]
-        public class EarlyLoadedService : Service
-        {
-        }
-
-        /// <summary>
-        /// Indicates that the class is a service, and will be instantiated automatically on startup,
-        /// blocking game main thread until it completes.
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Class)]
-        public class BlockingEarlyLoadedService : EarlyLoadedService
-        {
-        }
-
-        /// <summary>
-        /// Indicates that the method should be called when the services given in the constructor are ready.
-        /// </summary>
-        [AttributeUsage(AttributeTargets.Method)]
-        [MeansImplicitUse]
-        public class CallWhenServicesReady : Attribute
-        {
+            throw;
         }
     }
+
+    /// <summary>
+    /// Unloads all services, in the reverse order of load.
+    /// </summary>
+    public static void UnloadAllServices()
+    {
+        var framework = Service<Framework>.GetNullable(Service<Framework>.ExceptionPropagationMode.None);
+        if (framework is { IsInFrameworkUpdateThread: false, IsFrameworkUnloading: false })
+        {
+            framework.RunOnFrameworkThread(UnloadAllServices).Wait();
+            return;
+        }
+
+        lock (LoadedServices)
+        {
+            while (LoadedServices.Any())
+            {
+                var serviceType = LoadedServices.Last();
+                LoadedServices.RemoveAt(LoadedServices.Count - 1);
+
+                typeof(Service<>)
+                    .MakeGenericType(serviceType)
+                    .InvokeMember(
+                        "Unset",
+                        BindingFlags.InvokeMethod | BindingFlags.Static | BindingFlags.NonPublic,
+                        null,
+                        null,
+                        null);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Indicates that this constructor will be called for early initialization.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Constructor)]
+    [MeansImplicitUse(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    public class ServiceConstructor : Attribute
+    {
+    }
+
+    /// <summary>
+    /// Indicates that the field is a service that should be loaded before constructing the class.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field)]
+    public class ServiceDependency : Attribute
+    {
+    }
+
+    /// <summary>
+    /// Indicates that the class is a service.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class)]
+    public class Service : Attribute
+    {
+    }
+
+    /// <summary>
+    /// Indicates that the class is a service, and will be instantiated automatically on startup.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class)]
+    public class EarlyLoadedService : Service
+    {
+    }
+
+    /// <summary>
+    /// Indicates that the class is a service, and will be instantiated automatically on startup,
+    /// blocking game main thread until it completes.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class)]
+    public class BlockingEarlyLoadedService : EarlyLoadedService
+    {
+    }
+
+    /// <summary>
+    /// Indicates that the method should be called when the services given in the constructor are ready.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method)]
+    [MeansImplicitUse]
+    public class CallWhenServicesReady : Attribute
+    {
+    }
 }
diff --git a/Dalamud/Service{T}.cs b/Dalamud/Service{T}.cs
index aa014878d..5b8085ac8 100644
--- a/Dalamud/Service{T}.cs
+++ b/Dalamud/Service{T}.cs
@@ -9,253 +9,252 @@ using Dalamud.IoC.Internal;
 using Dalamud.Utility.Timing;
 using JetBrains.Annotations;
 
-namespace Dalamud
+namespace Dalamud;
+
+/// <summary>
+/// Basic service locator.
+/// </summary>
+/// <remarks>
+/// Only used internally within Dalamud, if plugins need access to things it should be _only_ via DI.
+/// </remarks>
+/// <typeparam name="T">The class you want to store in the service locator.</typeparam>
+internal static class Service<T> where T : IServiceType
 {
-    /// <summary>
-    /// Basic service locator.
-    /// </summary>
-    /// <remarks>
-    /// Only used internally within Dalamud, if plugins need access to things it should be _only_ via DI.
-    /// </remarks>
-    /// <typeparam name="T">The class you want to store in the service locator.</typeparam>
-    internal static class Service<T> where T : IServiceType
+    private static TaskCompletionSource<T> instanceTcs = new();
+
+    static Service()
     {
-        private static TaskCompletionSource<T> instanceTcs = new();
+        var exposeToPlugins = typeof(T).GetCustomAttribute<PluginInterfaceAttribute>() != null;
+        if (exposeToPlugins)
+            ServiceManager.Log.Debug("Service<{0}>: Static ctor called; will be exposed to plugins", typeof(T).Name);
+        else
+            ServiceManager.Log.Debug("Service<{0}>: Static ctor called", typeof(T).Name);
 
-        static Service()
-        {
-            var exposeToPlugins = typeof(T).GetCustomAttribute<PluginInterfaceAttribute>() != null;
-            if (exposeToPlugins)
-                ServiceManager.Log.Debug("Service<{0}>: Static ctor called; will be exposed to plugins", typeof(T).Name);
-            else
-                ServiceManager.Log.Debug("Service<{0}>: Static ctor called", typeof(T).Name);
+        if (exposeToPlugins)
+            Service<ServiceContainer>.Get().RegisterSingleton(instanceTcs.Task);
+    }
 
-            if (exposeToPlugins)
-                Service<ServiceContainer>.Get().RegisterSingleton(instanceTcs.Task);
-        }
+    /// <summary>
+    /// Specifies how to handle the cases of failed services when calling <see cref="Service{T}.GetNullable"/>.
+    /// </summary>
+    public enum ExceptionPropagationMode
+    {
+        /// <summary>
+        /// Propagate all exceptions.
+        /// </summary>
+        PropagateAll,
 
         /// <summary>
-        /// Specifies how to handle the cases of failed services when calling <see cref="Service{T}.GetNullable"/>.
+        /// Propagate all exceptions, except for <see cref="UnloadedException"/>.
         /// </summary>
-        public enum ExceptionPropagationMode
-        {
-            /// <summary>
-            /// Propagate all exceptions.
-            /// </summary>
-            PropagateAll,
-
-            /// <summary>
-            /// Propagate all exceptions, except for <see cref="UnloadedException"/>.
-            /// </summary>
-            PropagateNonUnloaded,
-
-            /// <summary>
-            /// Treat all exceptions as null.
-            /// </summary>
-            None,
-        }
+        PropagateNonUnloaded,
 
         /// <summary>
-        /// Sets the type in the service locator to the given object.
+        /// Treat all exceptions as null.
         /// </summary>
-        /// <param name="obj">Object to set.</param>
-        public static void Provide(T obj)
-        {
-            instanceTcs.SetResult(obj);
-            ServiceManager.Log.Debug("Service<{0}>: Provided", typeof(T).Name);
-        }
+        None,
+    }
 
-        /// <summary>
-        /// Sets the service load state to failure.
-        /// </summary>
-        /// <param name="exception">The exception.</param>
-        public static void ProvideException(Exception exception)
-        {
-            ServiceManager.Log.Error(exception, "Service<{0}>: Error", typeof(T).Name);
-            instanceTcs.SetException(exception);
-        }
+    /// <summary>
+    /// Sets the type in the service locator to the given object.
+    /// </summary>
+    /// <param name="obj">Object to set.</param>
+    public static void Provide(T obj)
+    {
+        instanceTcs.SetResult(obj);
+        ServiceManager.Log.Debug("Service<{0}>: Provided", typeof(T).Name);
+    }
 
-        /// <summary>
-        /// Pull the instance out of the service locator, waiting if necessary.
-        /// </summary>
-        /// <returns>The object.</returns>
-        public static T Get()
-        {
-            if (!instanceTcs.Task.IsCompleted)
-                instanceTcs.Task.Wait();
+    /// <summary>
+    /// Sets the service load state to failure.
+    /// </summary>
+    /// <param name="exception">The exception.</param>
+    public static void ProvideException(Exception exception)
+    {
+        ServiceManager.Log.Error(exception, "Service<{0}>: Error", typeof(T).Name);
+        instanceTcs.SetException(exception);
+    }
+
+    /// <summary>
+    /// Pull the instance out of the service locator, waiting if necessary.
+    /// </summary>
+    /// <returns>The object.</returns>
+    public static T Get()
+    {
+        if (!instanceTcs.Task.IsCompleted)
+            instanceTcs.Task.Wait();
+        return instanceTcs.Task.Result;
+    }
+
+    /// <summary>
+    /// Pull the instance out of the service locator, waiting if necessary.
+    /// </summary>
+    /// <returns>The object.</returns>
+    [UsedImplicitly]
+    public static Task<T> GetAsync() => instanceTcs.Task;
+
+    /// <summary>
+    /// Attempt to pull the instance out of the service locator.
+    /// </summary>
+    /// <param name="propagateException">Specifies which exceptions to propagate.</param>
+    /// <returns>The object if registered, null otherwise.</returns>
+    public static T? GetNullable(ExceptionPropagationMode propagateException = ExceptionPropagationMode.PropagateNonUnloaded)
+    {
+        if (instanceTcs.Task.IsCompletedSuccessfully)
             return instanceTcs.Task.Result;
+        if (instanceTcs.Task.IsFaulted && propagateException != ExceptionPropagationMode.None)
+        {
+            if (propagateException == ExceptionPropagationMode.PropagateNonUnloaded
+                && instanceTcs.Task.Exception!.InnerExceptions.FirstOrDefault() is UnloadedException)
+                return default;
+            throw instanceTcs.Task.Exception!;
         }
 
-        /// <summary>
-        /// Pull the instance out of the service locator, waiting if necessary.
-        /// </summary>
-        /// <returns>The object.</returns>
-        [UsedImplicitly]
-        public static Task<T> GetAsync() => instanceTcs.Task;
+        return default;
+    }
 
-        /// <summary>
-        /// Attempt to pull the instance out of the service locator.
-        /// </summary>
-        /// <param name="propagateException">Specifies which exceptions to propagate.</param>
-        /// <returns>The object if registered, null otherwise.</returns>
-        public static T? GetNullable(ExceptionPropagationMode propagateException = ExceptionPropagationMode.PropagateNonUnloaded)
+    /// <summary>
+    /// Gets an enumerable containing Service&lt;T&gt;s that are required for this Service to initialize without blocking.
+    /// </summary>
+    /// <returns>List of dependency services.</returns>
+    [UsedImplicitly]
+    public static List<Type> GetDependencyServices()
+    {
+        var res = new List<Type>();
+        res.AddRange(GetServiceConstructor()
+                     .GetParameters()
+                     .Select(x => x.ParameterType));
+        res.AddRange(typeof(T)
+                     .GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
+                     .Select(x => x.FieldType)
+                     .Where(x => x.GetCustomAttribute<ServiceManager.ServiceDependency>(true) != null));
+        return res
+               .Distinct()
+               .Select(x => typeof(Service<>).MakeGenericType(x))
+               .ToList();
+    }
+
+    [UsedImplicitly]
+    private static Task<T> StartLoader()
+    {
+        if (instanceTcs.Task.IsCompleted)
+            throw new InvalidOperationException($"{typeof(T).Name} is already loaded or disposed.");
+
+        var attr = typeof(T).GetCustomAttribute<ServiceManager.Service>(true)?.GetType();
+        if (attr?.IsAssignableTo(typeof(ServiceManager.EarlyLoadedService)) != true)
+            throw new InvalidOperationException($"{typeof(T).Name} is not an EarlyLoadedService");
+
+        return Task.Run(Timings.AttachTimingHandle(async () =>
         {
-            if (instanceTcs.Task.IsCompletedSuccessfully)
-                return instanceTcs.Task.Result;
-            if (instanceTcs.Task.IsFaulted && propagateException != ExceptionPropagationMode.None)
+            ServiceManager.Log.Debug("Service<{0}>: Begin construction", typeof(T).Name);
+            try
             {
-                if (propagateException == ExceptionPropagationMode.PropagateNonUnloaded
-                    && instanceTcs.Task.Exception!.InnerExceptions.FirstOrDefault() is UnloadedException)
-                    return default;
-                throw instanceTcs.Task.Exception!;
-            }
+                var instance = await ConstructObject();
+                instanceTcs.SetResult(instance);
 
-            return default;
-        }
-
-        /// <summary>
-        /// Gets an enumerable containing Service&lt;T&gt;s that are required for this Service to initialize without blocking.
-        /// </summary>
-        /// <returns>List of dependency services.</returns>
-        [UsedImplicitly]
-        public static List<Type> GetDependencyServices()
-        {
-            var res = new List<Type>();
-            res.AddRange(GetServiceConstructor()
-                .GetParameters()
-                .Select(x => x.ParameterType));
-            res.AddRange(typeof(T)
-                .GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
-                .Select(x => x.FieldType)
-                .Where(x => x.GetCustomAttribute<ServiceManager.ServiceDependency>(true) != null));
-            return res
-                .Distinct()
-                .Select(x => typeof(Service<>).MakeGenericType(x))
-                .ToList();
-        }
-
-        [UsedImplicitly]
-        private static Task<T> StartLoader()
-        {
-            if (instanceTcs.Task.IsCompleted)
-                throw new InvalidOperationException($"{typeof(T).Name} is already loaded or disposed.");
-
-            var attr = typeof(T).GetCustomAttribute<ServiceManager.Service>(true)?.GetType();
-            if (attr?.IsAssignableTo(typeof(ServiceManager.EarlyLoadedService)) != true)
-                throw new InvalidOperationException($"{typeof(T).Name} is not an EarlyLoadedService");
-
-            return Task.Run(Timings.AttachTimingHandle(async () =>
-            {
-                ServiceManager.Log.Debug("Service<{0}>: Begin construction", typeof(T).Name);
-                try
+                foreach (var method in typeof(T).GetMethods(
+                             BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
                 {
-                    var instance = await ConstructObject();
-                    instanceTcs.SetResult(instance);
+                    if (method.GetCustomAttribute<ServiceManager.CallWhenServicesReady>(true) == null)
+                        continue;
 
-                    foreach (var method in typeof(T).GetMethods(
-                                 BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
-                    {
-                        if (method.GetCustomAttribute<ServiceManager.CallWhenServicesReady>(true) == null)
-                            continue;
-
-                        ServiceManager.Log.Debug("Service<{0}>: Calling {1}", typeof(T).Name, method.Name);
-                        var args = await Task.WhenAll(method.GetParameters().Select(
-                                             x => ResolveServiceFromTypeAsync(x.ParameterType)));
-                        method.Invoke(instance, args);
-                    }
-
-                    ServiceManager.Log.Debug("Service<{0}>: Construction complete", typeof(T).Name);
-                    return instance;
+                    ServiceManager.Log.Debug("Service<{0}>: Calling {1}", typeof(T).Name, method.Name);
+                    var args = await Task.WhenAll(method.GetParameters().Select(
+                                                      x => ResolveServiceFromTypeAsync(x.ParameterType)));
+                    method.Invoke(instance, args);
                 }
-                catch (Exception e)
-                {
-                    ServiceManager.Log.Error(e, "Service<{0}>: Construction failure", typeof(T).Name);
-                    instanceTcs.SetException(e);
-                    throw;
-                }
-            }));
-        }
 
-        [UsedImplicitly]
-        private static void Unset()
-        {
-            if (!instanceTcs.Task.IsCompletedSuccessfully)
-                return;
-
-            var instance = instanceTcs.Task.Result;
-            if (instance is IDisposable disposable)
-            {
-                ServiceManager.Log.Debug("Service<{0}>: Disposing", typeof(T).Name);
-                try
-                {
-                    disposable.Dispose();
-                    ServiceManager.Log.Debug("Service<{0}>: Disposed", typeof(T).Name);
-                }
-                catch (Exception e)
-                {
-                    ServiceManager.Log.Warning(e, "Service<{0}>: Dispose failure", typeof(T).Name);
-                }
+                ServiceManager.Log.Debug("Service<{0}>: Construction complete", typeof(T).Name);
+                return instance;
             }
-            else
+            catch (Exception e)
             {
-                ServiceManager.Log.Debug("Service<{0}>: Unset", typeof(T).Name);
+                ServiceManager.Log.Error(e, "Service<{0}>: Construction failure", typeof(T).Name);
+                instanceTcs.SetException(e);
+                throw;
             }
+        }));
+    }
 
-            instanceTcs = new TaskCompletionSource<T>();
-            instanceTcs.SetException(new UnloadedException());
-        }
+    [UsedImplicitly]
+    private static void Unset()
+    {
+        if (!instanceTcs.Task.IsCompletedSuccessfully)
+            return;
 
-        private static async Task<object?> ResolveServiceFromTypeAsync(Type type)
+        var instance = instanceTcs.Task.Result;
+        if (instance is IDisposable disposable)
         {
-            var task = (Task)typeof(Service<>)
-                             .MakeGenericType(type)
-                             .InvokeMember(
-                                 "GetAsync",
-                                 BindingFlags.InvokeMethod |
-                                 BindingFlags.Static |
-                                 BindingFlags.Public,
-                                 null,
-                                 null,
-                                 null)!;
-            await task;
-            return typeof(Task<>).MakeGenericType(type)
-                                 .GetProperty("Result", BindingFlags.Instance | BindingFlags.Public)!
-                                 .GetValue(task);
-        }
-
-        private static ConstructorInfo GetServiceConstructor()
-        {
-            const BindingFlags ctorBindingFlags =
-                BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic |
-                BindingFlags.CreateInstance | BindingFlags.OptionalParamBinding;
-            return typeof(T)
-                .GetConstructors(ctorBindingFlags)
-                .Single(x => x.GetCustomAttributes(typeof(ServiceManager.ServiceConstructor), true).Any());
-        }
-
-        private static async Task<T> ConstructObject()
-        {
-            var ctor = GetServiceConstructor();
-            var args = await Task.WhenAll(
-                           ctor.GetParameters().Select(x => ResolveServiceFromTypeAsync(x.ParameterType)));
-            using (Timings.Start($"{typeof(T).Name} Construct"))
+            ServiceManager.Log.Debug("Service<{0}>: Disposing", typeof(T).Name);
+            try
             {
-                return (T)ctor.Invoke(args)!;
+                disposable.Dispose();
+                ServiceManager.Log.Debug("Service<{0}>: Disposed", typeof(T).Name);
+            }
+            catch (Exception e)
+            {
+                ServiceManager.Log.Warning(e, "Service<{0}>: Dispose failure", typeof(T).Name);
             }
         }
+        else
+        {
+            ServiceManager.Log.Debug("Service<{0}>: Unset", typeof(T).Name);
+        }
 
+        instanceTcs = new TaskCompletionSource<T>();
+        instanceTcs.SetException(new UnloadedException());
+    }
+
+    private static async Task<object?> ResolveServiceFromTypeAsync(Type type)
+    {
+        var task = (Task)typeof(Service<>)
+                         .MakeGenericType(type)
+                         .InvokeMember(
+                             "GetAsync",
+                             BindingFlags.InvokeMethod |
+                             BindingFlags.Static |
+                             BindingFlags.Public,
+                             null,
+                             null,
+                             null)!;
+        await task;
+        return typeof(Task<>).MakeGenericType(type)
+                             .GetProperty("Result", BindingFlags.Instance | BindingFlags.Public)!
+                             .GetValue(task);
+    }
+
+    private static ConstructorInfo GetServiceConstructor()
+    {
+        const BindingFlags ctorBindingFlags =
+            BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic |
+            BindingFlags.CreateInstance | BindingFlags.OptionalParamBinding;
+        return typeof(T)
+               .GetConstructors(ctorBindingFlags)
+               .Single(x => x.GetCustomAttributes(typeof(ServiceManager.ServiceConstructor), true).Any());
+    }
+
+    private static async Task<T> ConstructObject()
+    {
+        var ctor = GetServiceConstructor();
+        var args = await Task.WhenAll(
+                       ctor.GetParameters().Select(x => ResolveServiceFromTypeAsync(x.ParameterType)));
+        using (Timings.Start($"{typeof(T).Name} Construct"))
+        {
+            return (T)ctor.Invoke(args)!;
+        }
+    }
+
+    /// <summary>
+    /// Exception thrown when service is attempted to be retrieved when it's unloaded.
+    /// </summary>
+    public class UnloadedException : InvalidOperationException
+    {
         /// <summary>
-        /// Exception thrown when service is attempted to be retrieved when it's unloaded.
+        /// Initializes a new instance of the <see cref="UnloadedException"/> class.
         /// </summary>
-        public class UnloadedException : InvalidOperationException
+        public UnloadedException()
+            : base("Service is unloaded.")
         {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="UnloadedException"/> class.
-            /// </summary>
-            public UnloadedException()
-                : base("Service is unloaded.")
-            {
-            }
         }
     }
 }
diff --git a/Dalamud/Support/BugBait.cs b/Dalamud/Support/BugBait.cs
index 2de4ee7e5..084c49d9d 100644
--- a/Dalamud/Support/BugBait.cs
+++ b/Dalamud/Support/BugBait.cs
@@ -6,68 +6,67 @@ using Dalamud.Plugin.Internal.Types;
 using Dalamud.Utility;
 using Newtonsoft.Json;
 
-namespace Dalamud.Support
+namespace Dalamud.Support;
+
+/// <summary>
+/// Class responsible for sending feedback.
+/// </summary>
+internal static class BugBait
 {
+    private const string BugBaitUrl = "https://kiko.goats.dev/feedback";
+
     /// <summary>
-    /// Class responsible for sending feedback.
+    /// Send feedback to Discord.
     /// </summary>
-    internal static class BugBait
+    /// <param name="plugin">The plugin to send feedback about.</param>
+    /// <param name="isTesting">Whether or not the plugin is a testing plugin.</param>
+    /// <param name="content">The content of the feedback.</param>
+    /// <param name="reporter">The reporter name.</param>
+    /// <param name="includeException">Whether or not the most recent exception to occur should be included in the report.</param>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    public static async Task SendFeedback(PluginManifest plugin, bool isTesting, string content, string reporter, bool includeException)
     {
-        private const string BugBaitUrl = "https://kiko.goats.dev/feedback";
+        if (content.IsNullOrWhitespace())
+            return;
 
-        /// <summary>
-        /// Send feedback to Discord.
-        /// </summary>
-        /// <param name="plugin">The plugin to send feedback about.</param>
-        /// <param name="isTesting">Whether or not the plugin is a testing plugin.</param>
-        /// <param name="content">The content of the feedback.</param>
-        /// <param name="reporter">The reporter name.</param>
-        /// <param name="includeException">Whether or not the most recent exception to occur should be included in the report.</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public static async Task SendFeedback(PluginManifest plugin, bool isTesting, string content, string reporter, bool includeException)
+        var model = new FeedbackModel
         {
-            if (content.IsNullOrWhitespace())
-                return;
+            Content = content,
+            Reporter = reporter,
+            Name = plugin.InternalName,
+            Version = isTesting ? plugin.TestingAssemblyVersion?.ToString() : plugin.AssemblyVersion.ToString(),
+            DalamudHash = Util.GetGitHash(),
+        };
 
-            var model = new FeedbackModel
-            {
-                Content = content,
-                Reporter = reporter,
-                Name = plugin.InternalName,
-                Version = isTesting ? plugin.TestingAssemblyVersion?.ToString() : plugin.AssemblyVersion.ToString(),
-                DalamudHash = Util.GetGitHash(),
-            };
-
-            if (includeException)
-            {
-                model.Exception = Troubleshooting.LastException == null ? "Was included, but none happened" : Troubleshooting.LastException?.ToString();
-            }
-
-            var postContent = new StringContent(JsonConvert.SerializeObject(model), Encoding.UTF8, "application/json");
-            var response = await Util.HttpClient.PostAsync(BugBaitUrl, postContent);
-
-            response.EnsureSuccessStatusCode();
+        if (includeException)
+        {
+            model.Exception = Troubleshooting.LastException == null ? "Was included, but none happened" : Troubleshooting.LastException?.ToString();
         }
 
-        private class FeedbackModel
-        {
-            [JsonProperty("content")]
-            public string? Content { get; set; }
+        var postContent = new StringContent(JsonConvert.SerializeObject(model), Encoding.UTF8, "application/json");
+        var response = await Util.HttpClient.PostAsync(BugBaitUrl, postContent);
 
-            [JsonProperty("name")]
-            public string? Name { get; set; }
+        response.EnsureSuccessStatusCode();
+    }
 
-            [JsonProperty("dhash")]
-            public string? DalamudHash { get; set; }
+    private class FeedbackModel
+    {
+        [JsonProperty("content")]
+        public string? Content { get; set; }
 
-            [JsonProperty("version")]
-            public string? Version { get; set; }
+        [JsonProperty("name")]
+        public string? Name { get; set; }
 
-            [JsonProperty("reporter")]
-            public string? Reporter { get; set; }
+        [JsonProperty("dhash")]
+        public string? DalamudHash { get; set; }
 
-            [JsonProperty("exception")]
-            public string? Exception { get; set; }
-        }
+        [JsonProperty("version")]
+        public string? Version { get; set; }
+
+        [JsonProperty("reporter")]
+        public string? Reporter { get; set; }
+
+        [JsonProperty("exception")]
+        public string? Exception { get; set; }
     }
 }
diff --git a/Dalamud/Support/Troubleshooting.cs b/Dalamud/Support/Troubleshooting.cs
index 17f15de94..922fc5e50 100644
--- a/Dalamud/Support/Troubleshooting.cs
+++ b/Dalamud/Support/Troubleshooting.cs
@@ -12,119 +12,118 @@ using Dalamud.Utility;
 using Newtonsoft.Json;
 using Serilog;
 
-namespace Dalamud.Support
+namespace Dalamud.Support;
+
+/// <summary>
+/// Class responsible for printing troubleshooting information to the log.
+/// </summary>
+public static class Troubleshooting
 {
     /// <summary>
-    /// Class responsible for printing troubleshooting information to the log.
+    /// Gets the most recent exception to occur.
     /// </summary>
-    public static class Troubleshooting
+    public static Exception? LastException { get; private set; }
+
+    /// <summary>
+    /// Log the last exception in a parseable format to serilog.
+    /// </summary>
+    /// <param name="exception">The exception to log.</param>
+    /// <param name="context">Additional context.</param>
+    public static void LogException(Exception exception, string context)
     {
-        /// <summary>
-        /// Gets the most recent exception to occur.
-        /// </summary>
-        public static Exception? LastException { get; private set; }
+        LastException = exception;
 
-        /// <summary>
-        /// Log the last exception in a parseable format to serilog.
-        /// </summary>
-        /// <param name="exception">The exception to log.</param>
-        /// <param name="context">Additional context.</param>
-        public static void LogException(Exception exception, string context)
+        var fixedContext = context?.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
+
+        try
         {
-            LastException = exception;
-
-            var fixedContext = context?.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
-
-            try
+            var payload = new ExceptionPayload
             {
-                var payload = new ExceptionPayload
-                {
-                    Context = fixedContext,
-                    When = DateTime.Now,
-                    Info = exception.ToString(),
-                };
+                Context = fixedContext,
+                When = DateTime.Now,
+                Info = exception.ToString(),
+            };
 
-                var encodedPayload = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload)));
-                Log.Information($"LASTEXCEPTION:{encodedPayload}");
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Could not print exception.");
-            }
+            var encodedPayload = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload)));
+            Log.Information($"LASTEXCEPTION:{encodedPayload}");
         }
-
-        /// <summary>
-        /// Log troubleshooting information in a parseable format to Serilog.
-        /// </summary>
-        internal static void LogTroubleshooting()
+        catch (Exception ex)
         {
-            var startInfo = Service<DalamudStartInfo>.Get();
-            var configuration = Service<DalamudConfiguration>.Get();
-            var interfaceManager = Service<InterfaceManager>.GetNullable();
-            var pluginManager = Service<PluginManager>.GetNullable();
-
-            try
-            {
-                var payload = new TroubleshootingPayload
-                {
-                    LoadedPlugins = pluginManager?.InstalledPlugins?.Select(x => x.Manifest)?.OrderByDescending(x => x.InternalName).ToArray(),
-                    DalamudVersion = Util.AssemblyVersion,
-                    DalamudGitHash = Util.GetGitHash(),
-                    GameVersion = startInfo.GameVersion.ToString(),
-                    Language = startInfo.Language.ToString(),
-                    BetaKey = configuration.DalamudBetaKey,
-                    DoPluginTest = configuration.DoPluginTest,
-                    LoadAllApiLevels = pluginManager?.LoadAllApiLevels == true,
-                    InterfaceLoaded = interfaceManager?.IsReady ?? false,
-                    HasThirdRepo = configuration.ThirdRepoList is { Count: > 0 },
-                    ForcedMinHook = EnvironmentConfiguration.DalamudForceMinHook,
-                };
-
-                var encodedPayload = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload)));
-                Log.Information($"TROUBLESHOOTING:{encodedPayload}");
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Could not print troubleshooting.");
-            }
-        }
-
-        private class ExceptionPayload
-        {
-            public DateTime When { get; set; }
-
-            public string Info { get; set; }
-
-            public string? Context { get; set; }
-        }
-
-        private class TroubleshootingPayload
-        {
-            public LocalPluginManifest[] LoadedPlugins { get; set; }
-
-            public string DalamudVersion { get; set; }
-
-            public string DalamudGitHash { get; set; }
-
-            public string GameVersion { get; set; }
-
-            public string Language { get; set; }
-
-            public bool DoDalamudTest => false;
-
-            public string? BetaKey { get; set; }
-
-            public bool DoPluginTest { get; set; }
-
-            public bool LoadAllApiLevels { get; set; }
-
-            public bool InterfaceLoaded { get; set; }
-
-            public bool ForcedMinHook { get; set; }
-
-            public List<ThirdPartyRepoSettings> ThirdRepo => new();
-
-            public bool HasThirdRepo { get; set; }
+            Log.Error(ex, "Could not print exception.");
         }
     }
+
+    /// <summary>
+    /// Log troubleshooting information in a parseable format to Serilog.
+    /// </summary>
+    internal static void LogTroubleshooting()
+    {
+        var startInfo = Service<DalamudStartInfo>.Get();
+        var configuration = Service<DalamudConfiguration>.Get();
+        var interfaceManager = Service<InterfaceManager>.GetNullable();
+        var pluginManager = Service<PluginManager>.GetNullable();
+
+        try
+        {
+            var payload = new TroubleshootingPayload
+            {
+                LoadedPlugins = pluginManager?.InstalledPlugins?.Select(x => x.Manifest)?.OrderByDescending(x => x.InternalName).ToArray(),
+                DalamudVersion = Util.AssemblyVersion,
+                DalamudGitHash = Util.GetGitHash(),
+                GameVersion = startInfo.GameVersion.ToString(),
+                Language = startInfo.Language.ToString(),
+                BetaKey = configuration.DalamudBetaKey,
+                DoPluginTest = configuration.DoPluginTest,
+                LoadAllApiLevels = pluginManager?.LoadAllApiLevels == true,
+                InterfaceLoaded = interfaceManager?.IsReady ?? false,
+                HasThirdRepo = configuration.ThirdRepoList is { Count: > 0 },
+                ForcedMinHook = EnvironmentConfiguration.DalamudForceMinHook,
+            };
+
+            var encodedPayload = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload)));
+            Log.Information($"TROUBLESHOOTING:{encodedPayload}");
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Could not print troubleshooting.");
+        }
+    }
+
+    private class ExceptionPayload
+    {
+        public DateTime When { get; set; }
+
+        public string Info { get; set; }
+
+        public string? Context { get; set; }
+    }
+
+    private class TroubleshootingPayload
+    {
+        public LocalPluginManifest[] LoadedPlugins { get; set; }
+
+        public string DalamudVersion { get; set; }
+
+        public string DalamudGitHash { get; set; }
+
+        public string GameVersion { get; set; }
+
+        public string Language { get; set; }
+
+        public bool DoDalamudTest => false;
+
+        public string? BetaKey { get; set; }
+
+        public bool DoPluginTest { get; set; }
+
+        public bool LoadAllApiLevels { get; set; }
+
+        public bool InterfaceLoaded { get; set; }
+
+        public bool ForcedMinHook { get; set; }
+
+        public List<ThirdPartyRepoSettings> ThirdRepo => new();
+
+        public bool HasThirdRepo { get; set; }
+    }
 }
diff --git a/Dalamud/Utility/EnumExtensions.cs b/Dalamud/Utility/EnumExtensions.cs
index 5a2d9172b..8868e4c1f 100644
--- a/Dalamud/Utility/EnumExtensions.cs
+++ b/Dalamud/Utility/EnumExtensions.cs
@@ -1,28 +1,27 @@
 using System;
 using System.Linq;
 
-namespace Dalamud.Utility
+namespace Dalamud.Utility;
+
+/// <summary>
+/// Extension methods for enums.
+/// </summary>
+public static class EnumExtensions
 {
     /// <summary>
-    /// Extension methods for enums.
+    /// Gets an attribute on an enum.
     /// </summary>
-    public static class EnumExtensions
+    /// <typeparam name="TAttribute">The type of attribute to get.</typeparam>
+    /// <param name="value">The enum value that has an attached attribute.</param>
+    /// <returns>The attached attribute, if any.</returns>
+    public static TAttribute GetAttribute<TAttribute>(this Enum value)
+        where TAttribute : Attribute
     {
-        /// <summary>
-        /// Gets an attribute on an enum.
-        /// </summary>
-        /// <typeparam name="TAttribute">The type of attribute to get.</typeparam>
-        /// <param name="value">The enum value that has an attached attribute.</param>
-        /// <returns>The attached attribute, if any.</returns>
-        public static TAttribute GetAttribute<TAttribute>(this Enum value)
-            where TAttribute : Attribute
-        {
-            var type = value.GetType();
-            var name = Enum.GetName(type, value);
-            return type.GetField(name) // I prefer to get attributes this way
-                       .GetCustomAttributes(false)
-                       .OfType<TAttribute>()
-                       .SingleOrDefault();
-        }
+        var type = value.GetType();
+        var name = Enum.GetName(type, value);
+        return type.GetField(name) // I prefer to get attributes this way
+                   .GetCustomAttributes(false)
+                   .OfType<TAttribute>()
+                   .SingleOrDefault();
     }
 }
diff --git a/Dalamud/Utility/EventHandlerExtensions.cs b/Dalamud/Utility/EventHandlerExtensions.cs
index f07b46d10..bce815a7b 100644
--- a/Dalamud/Utility/EventHandlerExtensions.cs
+++ b/Dalamud/Utility/EventHandlerExtensions.cs
@@ -6,93 +6,92 @@ using Serilog;
 
 using static Dalamud.Game.Framework;
 
-namespace Dalamud.Utility
+namespace Dalamud.Utility;
+
+/// <summary>
+/// Extensions for Events.
+/// </summary>
+internal static class EventHandlerExtensions
 {
     /// <summary>
-    /// Extensions for Events.
+    /// Replacement for Invoke() on EventHandlers to catch exceptions that stop event propagation in case
+    /// of a thrown Exception inside of an invocation.
     /// </summary>
-    internal static class EventHandlerExtensions
+    /// <param name="eh">The EventHandler in question.</param>
+    /// <param name="sender">Default sender for Invoke equivalent.</param>
+    /// <param name="e">Default EventArgs for Invoke equivalent.</param>
+    public static void InvokeSafely(this EventHandler eh, object sender, EventArgs e)
     {
-        /// <summary>
-        /// Replacement for Invoke() on EventHandlers to catch exceptions that stop event propagation in case
-        /// of a thrown Exception inside of an invocation.
-        /// </summary>
-        /// <param name="eh">The EventHandler in question.</param>
-        /// <param name="sender">Default sender for Invoke equivalent.</param>
-        /// <param name="e">Default EventArgs for Invoke equivalent.</param>
-        public static void InvokeSafely(this EventHandler eh, object sender, EventArgs e)
-        {
-            if (eh == null)
-                return;
+        if (eh == null)
+            return;
 
-            foreach (var handler in eh.GetInvocationList().Cast<EventHandler>())
-            {
-                HandleInvoke(() => handler(sender, e));
-            }
+        foreach (var handler in eh.GetInvocationList().Cast<EventHandler>())
+        {
+            HandleInvoke(() => handler(sender, e));
         }
+    }
 
-        /// <summary>
-        /// Replacement for Invoke() on generic EventHandlers to catch exceptions that stop event propagation in case
-        /// of a thrown Exception inside of an invocation.
-        /// </summary>
-        /// <param name="eh">The EventHandler in question.</param>
-        /// <param name="sender">Default sender for Invoke equivalent.</param>
-        /// <param name="e">Default EventArgs for Invoke equivalent.</param>
-        /// <typeparam name="T">Type of EventArgs.</typeparam>
-        public static void InvokeSafely<T>(this EventHandler<T> eh, object sender, T e)
+    /// <summary>
+    /// Replacement for Invoke() on generic EventHandlers to catch exceptions that stop event propagation in case
+    /// of a thrown Exception inside of an invocation.
+    /// </summary>
+    /// <param name="eh">The EventHandler in question.</param>
+    /// <param name="sender">Default sender for Invoke equivalent.</param>
+    /// <param name="e">Default EventArgs for Invoke equivalent.</param>
+    /// <typeparam name="T">Type of EventArgs.</typeparam>
+    public static void InvokeSafely<T>(this EventHandler<T> eh, object sender, T e)
+    {
+        if (eh == null)
+            return;
+
+        foreach (var handler in eh.GetInvocationList().Cast<EventHandler<T>>())
         {
-            if (eh == null)
-                return;
-
-            foreach (var handler in eh.GetInvocationList().Cast<EventHandler<T>>())
-            {
-                HandleInvoke(() => handler(sender, e));
-            }
+            HandleInvoke(() => handler(sender, e));
         }
+    }
 
-        /// <summary>
-        /// Replacement for Invoke() on event Actions to catch exceptions that stop event propagation in case
-        /// of a thrown Exception inside of an invocation.
-        /// </summary>
-        /// <param name="act">The Action in question.</param>
-        public static void InvokeSafely(this Action act)
+    /// <summary>
+    /// Replacement for Invoke() on event Actions to catch exceptions that stop event propagation in case
+    /// of a thrown Exception inside of an invocation.
+    /// </summary>
+    /// <param name="act">The Action in question.</param>
+    public static void InvokeSafely(this Action act)
+    {
+        if (act == null)
+            return;
+
+        foreach (var action in act.GetInvocationList().Cast<Action>())
         {
-            if (act == null)
-                return;
-
-            foreach (var action in act.GetInvocationList().Cast<Action>())
-            {
-                HandleInvoke(action);
-            }
+            HandleInvoke(action);
         }
+    }
 
-        /// <summary>
-        /// Replacement for Invoke() on OnUpdateDelegate to catch exceptions that stop event propagation in case
-        /// of a thrown Exception inside of an invocation.
-        /// </summary>
-        /// <param name="updateDelegate">The OnUpdateDelegate in question.</param>
-        /// <param name="framework">Framework to be passed on to OnUpdateDelegate.</param>
-        public static void InvokeSafely(this OnUpdateDelegate updateDelegate, Framework framework)
+    /// <summary>
+    /// Replacement for Invoke() on OnUpdateDelegate to catch exceptions that stop event propagation in case
+    /// of a thrown Exception inside of an invocation.
+    /// </summary>
+    /// <param name="updateDelegate">The OnUpdateDelegate in question.</param>
+    /// <param name="framework">Framework to be passed on to OnUpdateDelegate.</param>
+    public static void InvokeSafely(this OnUpdateDelegate updateDelegate, Framework framework)
+    {
+        if (updateDelegate == null)
+            return;
+
+        foreach (var action in updateDelegate.GetInvocationList().Cast<OnUpdateDelegate>())
         {
-            if (updateDelegate == null)
-                return;
-
-            foreach (var action in updateDelegate.GetInvocationList().Cast<OnUpdateDelegate>())
-            {
-                HandleInvoke(() => action(framework));
-            }
+            HandleInvoke(() => action(framework));
         }
+    }
 
-        private static void HandleInvoke(Action act)
+    private static void HandleInvoke(Action act)
+    {
+        try
         {
-            try
-            {
-                act();
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Exception during raise of {handler}", act.Method);
-            }
+            act();
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Exception during raise of {handler}", act.Method);
         }
     }
 }
diff --git a/Dalamud/Utility/Hash.cs b/Dalamud/Utility/Hash.cs
index 2fe5fd1d6..a8296315e 100644
--- a/Dalamud/Utility/Hash.cs
+++ b/Dalamud/Utility/Hash.cs
@@ -1,35 +1,34 @@
 using System;
 using System.Security.Cryptography;
 
-namespace Dalamud.Utility
+namespace Dalamud.Utility;
+
+/// <summary>
+/// Utility functions for hashing.
+/// </summary>
+public static class Hash
 {
     /// <summary>
-    /// Utility functions for hashing.
+    /// Get the SHA-256 hash of a string.
     /// </summary>
-    public static class Hash
+    /// <param name="text">The string to hash.</param>
+    /// <returns>The computed hash.</returns>
+    internal static string GetStringSha256Hash(string text)
     {
-        /// <summary>
-        /// Get the SHA-256 hash of a string.
-        /// </summary>
-        /// <param name="text">The string to hash.</param>
-        /// <returns>The computed hash.</returns>
-        internal static string GetStringSha256Hash(string text)
-        {
-            return string.IsNullOrEmpty(text) ? string.Empty : GetSha256Hash(System.Text.Encoding.UTF8.GetBytes(text));
-        }
-
-        /// <summary>
-        /// Get the SHA-256 hash of a byte array.
-        /// </summary>
-        /// <param name="buffer">The byte array to hash.</param>
-        /// <returns>The computed hash.</returns>
-        internal static string GetSha256Hash(byte[] buffer)
-        {
-            using var sha = SHA256.Create();
-            var hash = sha.ComputeHash(buffer);
-            return ByteArrayToString(hash);
-        }
-
-        private static string ByteArrayToString(byte[] ba) => BitConverter.ToString(ba).Replace("-", string.Empty);
+        return string.IsNullOrEmpty(text) ? string.Empty : GetSha256Hash(System.Text.Encoding.UTF8.GetBytes(text));
     }
+
+    /// <summary>
+    /// Get the SHA-256 hash of a byte array.
+    /// </summary>
+    /// <param name="buffer">The byte array to hash.</param>
+    /// <returns>The computed hash.</returns>
+    internal static string GetSha256Hash(byte[] buffer)
+    {
+        using var sha = SHA256.Create();
+        var hash = sha.ComputeHash(buffer);
+        return ByteArrayToString(hash);
+    }
+
+    private static string ByteArrayToString(byte[] ba) => BitConverter.ToString(ba).Replace("-", string.Empty);
 }
diff --git a/Dalamud/Utility/SeStringExtensions.cs b/Dalamud/Utility/SeStringExtensions.cs
index dca423eab..4833bd629 100644
--- a/Dalamud/Utility/SeStringExtensions.cs
+++ b/Dalamud/Utility/SeStringExtensions.cs
@@ -1,18 +1,17 @@
 using Dalamud.Game.Text.SeStringHandling;
 
-namespace Dalamud.Utility
+namespace Dalamud.Utility;
+
+/// <summary>
+/// Extension methods for SeStrings.
+/// </summary>
+public static class SeStringExtensions
 {
     /// <summary>
-    /// Extension methods for SeStrings.
+    /// Convert a Lumina SeString into a Dalamud SeString.
+    /// This conversion re-parses the string.
     /// </summary>
-    public static class SeStringExtensions
-    {
-        /// <summary>
-        /// Convert a Lumina SeString into a Dalamud SeString.
-        /// This conversion re-parses the string.
-        /// </summary>
-        /// <param name="originalString">The original Lumina SeString.</param>
-        /// <returns>The re-parsed Dalamud SeString.</returns>
-        public static SeString ToDalamudString(this Lumina.Text.SeString originalString) => SeString.Parse(originalString.RawData);
-    }
+    /// <param name="originalString">The original Lumina SeString.</param>
+    /// <returns>The re-parsed Dalamud SeString.</returns>
+    public static SeString ToDalamudString(this Lumina.Text.SeString originalString) => SeString.Parse(originalString.RawData);
 }
diff --git a/Dalamud/Utility/Signatures/Fallibility.cs b/Dalamud/Utility/Signatures/Fallibility.cs
index 1e5c502cf..e0c1a7a6a 100755
--- a/Dalamud/Utility/Signatures/Fallibility.cs
+++ b/Dalamud/Utility/Signatures/Fallibility.cs
@@ -1,24 +1,23 @@
-namespace Dalamud.Utility.Signatures
+namespace Dalamud.Utility.Signatures;
+
+/// <summary>
+/// The fallibility of a signature.
+/// </summary>
+public enum Fallibility
 {
     /// <summary>
-    /// The fallibility of a signature.
+    /// The fallibility of the signature is determined by the field/property's
+    /// nullability.
     /// </summary>
-    public enum Fallibility
-    {
-        /// <summary>
-        /// The fallibility of the signature is determined by the field/property's
-        /// nullability.
-        /// </summary>
-        Auto,
+    Auto,
 
-        /// <summary>
-        /// The signature is fallible.
-        /// </summary>
-        Fallible,
+    /// <summary>
+    /// The signature is fallible.
+    /// </summary>
+    Fallible,
 
-        /// <summary>
-        /// The signature is infallible.
-        /// </summary>
-        Infallible,
-    }
+    /// <summary>
+    /// The signature is infallible.
+    /// </summary>
+    Infallible,
 }
diff --git a/Dalamud/Utility/Signatures/NullabilityUtil.cs b/Dalamud/Utility/Signatures/NullabilityUtil.cs
index 0a2fb7fc6..9db1117cc 100755
--- a/Dalamud/Utility/Signatures/NullabilityUtil.cs
+++ b/Dalamud/Utility/Signatures/NullabilityUtil.cs
@@ -4,74 +4,73 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
 
-namespace Dalamud.Utility.Signatures
+namespace Dalamud.Utility.Signatures;
+
+/// <summary>
+/// Class providing info about field, property or parameter nullability.
+/// </summary>
+internal static class NullabilityUtil
 {
     /// <summary>
-    /// Class providing info about field, property or parameter nullability.
+    /// Check if the provided property is nullable.
     /// </summary>
-    internal static class NullabilityUtil
+    /// <param name="property">The property to check.</param>
+    /// <returns>Whether or not the property is nullable.</returns>
+    internal static bool IsNullable(PropertyInfo property) => IsNullableHelper(property.PropertyType, property.DeclaringType, property.CustomAttributes);
+
+    /// <summary>
+    /// Check if the provided field is nullable.
+    /// </summary>
+    /// <param name="field">The field to check.</param>
+    /// <returns>Whether or not the field is nullable.</returns>
+    internal static bool IsNullable(FieldInfo field) => IsNullableHelper(field.FieldType, field.DeclaringType, field.CustomAttributes);
+
+    /// <summary>
+    /// Check if the provided parameter is nullable.
+    /// </summary>
+    /// <param name="parameter">The parameter to check.</param>
+    /// <returns>Whether or not the parameter is nullable.</returns>
+    internal static bool IsNullable(ParameterInfo parameter) => IsNullableHelper(parameter.ParameterType, parameter.Member, parameter.CustomAttributes);
+
+    private static bool IsNullableHelper(Type memberType, MemberInfo? declaringType, IEnumerable<CustomAttributeData> customAttributes)
     {
-        /// <summary>
-        /// Check if the provided property is nullable.
-        /// </summary>
-        /// <param name="property">The property to check.</param>
-        /// <returns>Whether or not the property is nullable.</returns>
-        internal static bool IsNullable(PropertyInfo property) => IsNullableHelper(property.PropertyType, property.DeclaringType, property.CustomAttributes);
-
-        /// <summary>
-        /// Check if the provided field is nullable.
-        /// </summary>
-        /// <param name="field">The field to check.</param>
-        /// <returns>Whether or not the field is nullable.</returns>
-        internal static bool IsNullable(FieldInfo field) => IsNullableHelper(field.FieldType, field.DeclaringType, field.CustomAttributes);
-
-        /// <summary>
-        /// Check if the provided parameter is nullable.
-        /// </summary>
-        /// <param name="parameter">The parameter to check.</param>
-        /// <returns>Whether or not the parameter is nullable.</returns>
-        internal static bool IsNullable(ParameterInfo parameter) => IsNullableHelper(parameter.ParameterType, parameter.Member, parameter.CustomAttributes);
-
-        private static bool IsNullableHelper(Type memberType, MemberInfo? declaringType, IEnumerable<CustomAttributeData> customAttributes)
+        if (memberType.IsValueType)
         {
-            if (memberType.IsValueType)
-            {
-                return Nullable.GetUnderlyingType(memberType) != null;
-            }
-
-            var nullable = customAttributes
-                .FirstOrDefault(x => x.AttributeType.FullName == "System.Runtime.CompilerServices.NullableAttribute");
-            if (nullable != null && nullable.ConstructorArguments.Count == 1)
-            {
-                var attributeArgument = nullable.ConstructorArguments[0];
-                if (attributeArgument.ArgumentType == typeof(byte[]))
-                {
-                    var args = (ReadOnlyCollection<CustomAttributeTypedArgument>)attributeArgument.Value!;
-                    if (args.Count > 0 && args[0].ArgumentType == typeof(byte))
-                    {
-                        return (byte)args[0].Value! == 2;
-                    }
-                }
-                else if (attributeArgument.ArgumentType == typeof(byte))
-                {
-                    return (byte)attributeArgument.Value! == 2;
-                }
-            }
-
-            for (var type = declaringType; type != null; type = type.DeclaringType)
-            {
-                var context = type.CustomAttributes
-                                  .FirstOrDefault(x => x.AttributeType.FullName == "System.Runtime.CompilerServices.NullableContextAttribute");
-                if (context != null &&
-                    context.ConstructorArguments.Count == 1 &&
-                    context.ConstructorArguments[0].ArgumentType == typeof(byte))
-                {
-                    return (byte)context.ConstructorArguments[0].Value! == 2;
-                }
-            }
-
-            // Couldn't find a suitable attribute
-            return false;
+            return Nullable.GetUnderlyingType(memberType) != null;
         }
+
+        var nullable = customAttributes
+            .FirstOrDefault(x => x.AttributeType.FullName == "System.Runtime.CompilerServices.NullableAttribute");
+        if (nullable != null && nullable.ConstructorArguments.Count == 1)
+        {
+            var attributeArgument = nullable.ConstructorArguments[0];
+            if (attributeArgument.ArgumentType == typeof(byte[]))
+            {
+                var args = (ReadOnlyCollection<CustomAttributeTypedArgument>)attributeArgument.Value!;
+                if (args.Count > 0 && args[0].ArgumentType == typeof(byte))
+                {
+                    return (byte)args[0].Value! == 2;
+                }
+            }
+            else if (attributeArgument.ArgumentType == typeof(byte))
+            {
+                return (byte)attributeArgument.Value! == 2;
+            }
+        }
+
+        for (var type = declaringType; type != null; type = type.DeclaringType)
+        {
+            var context = type.CustomAttributes
+                              .FirstOrDefault(x => x.AttributeType.FullName == "System.Runtime.CompilerServices.NullableContextAttribute");
+            if (context != null &&
+                context.ConstructorArguments.Count == 1 &&
+                context.ConstructorArguments[0].ArgumentType == typeof(byte))
+            {
+                return (byte)context.ConstructorArguments[0].Value! == 2;
+            }
+        }
+
+        // Couldn't find a suitable attribute
+        return false;
     }
 }
diff --git a/Dalamud/Utility/Signatures/ScanType.cs b/Dalamud/Utility/Signatures/ScanType.cs
index 58e861805..ef06ff0c5 100755
--- a/Dalamud/Utility/Signatures/ScanType.cs
+++ b/Dalamud/Utility/Signatures/ScanType.cs
@@ -1,22 +1,21 @@
 using Dalamud.Game;
 
-namespace Dalamud.Utility.Signatures
+namespace Dalamud.Utility.Signatures;
+
+/// <summary>
+/// The type of scan to perform with a signature.
+/// </summary>
+public enum ScanType
 {
     /// <summary>
-    /// The type of scan to perform with a signature.
+    /// Scan the text section of the executable. Uses
+    /// <see cref="SigScanner.TryScanText"/>.
     /// </summary>
-    public enum ScanType
-    {
-        /// <summary>
-        /// Scan the text section of the executable. Uses
-        /// <see cref="SigScanner.TryScanText"/>.
-        /// </summary>
-        Text,
+    Text,
 
-        /// <summary>
-        /// Scans the text section of the executable in order to find a data section
-        /// address. Uses <see cref="SigScanner.TryGetStaticAddressFromSig"/>.
-        /// </summary>
-        StaticAddress,
-    }
+    /// <summary>
+    /// Scans the text section of the executable in order to find a data section
+    /// address. Uses <see cref="SigScanner.TryGetStaticAddressFromSig"/>.
+    /// </summary>
+    StaticAddress,
 }
diff --git a/Dalamud/Utility/Signatures/SignatureAttribute.cs b/Dalamud/Utility/Signatures/SignatureAttribute.cs
index 49fe8eab0..e4831fd8d 100755
--- a/Dalamud/Utility/Signatures/SignatureAttribute.cs
+++ b/Dalamud/Utility/Signatures/SignatureAttribute.cs
@@ -2,69 +2,68 @@
 
 using JetBrains.Annotations;
 
-namespace Dalamud.Utility.Signatures
+namespace Dalamud.Utility.Signatures;
+
+/// <summary>
+/// The main way to use SignatureHelper. Apply this attribute to any field/property
+/// that should make use of a signature. See the field documentation for more
+/// information.
+/// </summary>
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+[MeansImplicitUse(ImplicitUseKindFlags.Assign, ImplicitUseTargetFlags.Itself)]
+// ReSharper disable once ClassNeverInstantiated.Global
+public sealed class SignatureAttribute : Attribute
 {
     /// <summary>
-    /// The main way to use SignatureHelper. Apply this attribute to any field/property
-    /// that should make use of a signature. See the field documentation for more
-    /// information.
+    /// Initializes a new instance of the <see cref="SignatureAttribute"/> class.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
-    [MeansImplicitUse(ImplicitUseKindFlags.Assign, ImplicitUseTargetFlags.Itself)]
-    // ReSharper disable once ClassNeverInstantiated.Global
-    public sealed class SignatureAttribute : Attribute
+    /// <param name="signature">signature to scan for, see <see cref="Signature"/>.</param>
+    public SignatureAttribute(string signature)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignatureAttribute"/> class.
-        /// </summary>
-        /// <param name="signature">signature to scan for, see <see cref="Signature"/>.</param>
-        public SignatureAttribute(string signature)
-        {
-            this.Signature = signature;
-        }
-
-        /// <summary>
-        /// Gets the memory signature for this field/property.
-        /// </summary>
-        public string Signature { get; init; }
-
-        /// <summary>
-        /// Gets the way this signature should be used. By default, this is guessed using
-        /// simple heuristics, but it can be manually specified if SignatureHelper can't
-        /// figure it out.
-        ///
-        /// <seealso cref="SignatureUseFlags"/>
-        /// </summary>
-        public SignatureUseFlags UseFlags { get; init; } = SignatureUseFlags.Auto;
-
-        /// <summary>
-        /// Gets the type of scan to perform. By default, this scans the text section of
-        /// the executable, but this should be set to StaticAddress for static
-        /// addresses.
-        /// </summary>
-        public ScanType ScanType { get; init; } = ScanType.Text;
-
-        /// <summary>
-        /// Gets the detour name if this signature is for a hook. SignatureHelper will search
-        /// the type containing this field/property for a method that matches the
-        /// hook's delegate type, but if it doesn't find one or finds more than one,
-        /// it will fail. You can specify the name of the method here to avoid this.
-        /// </summary>
-        public string? DetourName { get; init; }
-
-        /// <summary>
-        /// Gets the offset from the signature to read memory from, when <see cref="UseFlags"/> is set to Offset.
-        /// </summary>
-        public int Offset { get; init; }
-
-        /// <summary>
-        /// Gets the fallibility of the signature.
-        /// When a signature is fallible, any errors while resolving it will be
-        /// logged in the Dalamud log and the field/property will not have its value
-        /// set. When a signature is not fallible, any errors will be thrown as
-        /// exceptions instead. If fallibility is not specified, it is inferred
-        /// based on if the field/property is nullable.
-        /// </summary>
-        public Fallibility Fallibility { get; init; } = Fallibility.Auto;
+        this.Signature = signature;
     }
+
+    /// <summary>
+    /// Gets the memory signature for this field/property.
+    /// </summary>
+    public string Signature { get; init; }
+
+    /// <summary>
+    /// Gets the way this signature should be used. By default, this is guessed using
+    /// simple heuristics, but it can be manually specified if SignatureHelper can't
+    /// figure it out.
+    ///
+    /// <seealso cref="SignatureUseFlags"/>
+    /// </summary>
+    public SignatureUseFlags UseFlags { get; init; } = SignatureUseFlags.Auto;
+
+    /// <summary>
+    /// Gets the type of scan to perform. By default, this scans the text section of
+    /// the executable, but this should be set to StaticAddress for static
+    /// addresses.
+    /// </summary>
+    public ScanType ScanType { get; init; } = ScanType.Text;
+
+    /// <summary>
+    /// Gets the detour name if this signature is for a hook. SignatureHelper will search
+    /// the type containing this field/property for a method that matches the
+    /// hook's delegate type, but if it doesn't find one or finds more than one,
+    /// it will fail. You can specify the name of the method here to avoid this.
+    /// </summary>
+    public string? DetourName { get; init; }
+
+    /// <summary>
+    /// Gets the offset from the signature to read memory from, when <see cref="UseFlags"/> is set to Offset.
+    /// </summary>
+    public int Offset { get; init; }
+
+    /// <summary>
+    /// Gets the fallibility of the signature.
+    /// When a signature is fallible, any errors while resolving it will be
+    /// logged in the Dalamud log and the field/property will not have its value
+    /// set. When a signature is not fallible, any errors will be thrown as
+    /// exceptions instead. If fallibility is not specified, it is inferred
+    /// based on if the field/property is nullable.
+    /// </summary>
+    public Fallibility Fallibility { get; init; } = Fallibility.Auto;
 }
diff --git a/Dalamud/Utility/Signatures/SignatureException.cs b/Dalamud/Utility/Signatures/SignatureException.cs
index 6c3efd6dd..ea7cef396 100755
--- a/Dalamud/Utility/Signatures/SignatureException.cs
+++ b/Dalamud/Utility/Signatures/SignatureException.cs
@@ -1,19 +1,18 @@
 using System;
 
-namespace Dalamud.Utility.Signatures
+namespace Dalamud.Utility.Signatures;
+
+/// <summary>
+/// An exception for signatures.
+/// </summary>
+public class SignatureException : Exception
 {
     /// <summary>
-    /// An exception for signatures.
+    /// Initializes a new instance of the <see cref="SignatureException"/> class.
     /// </summary>
-    public class SignatureException : Exception
+    /// <param name="message">Message.</param>
+    internal SignatureException(string message)
+        : base(message)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SignatureException"/> class.
-        /// </summary>
-        /// <param name="message">Message.</param>
-        internal SignatureException(string message)
-            : base(message)
-        {
-        }
     }
 }
diff --git a/Dalamud/Utility/Signatures/SignatureHelper.cs b/Dalamud/Utility/Signatures/SignatureHelper.cs
index 192ee56ee..b58cec9d8 100755
--- a/Dalamud/Utility/Signatures/SignatureHelper.cs
+++ b/Dalamud/Utility/Signatures/SignatureHelper.cs
@@ -8,177 +8,176 @@ using Dalamud.Hooking;
 using Dalamud.Logging;
 using Dalamud.Utility.Signatures.Wrappers;
 
-namespace Dalamud.Utility.Signatures
+namespace Dalamud.Utility.Signatures;
+
+/// <summary>
+/// A utility class to help reduce signature boilerplate code.
+/// </summary>
+public static class SignatureHelper
 {
+    private const BindingFlags Flags = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic;
+
     /// <summary>
-    /// A utility class to help reduce signature boilerplate code.
+    /// Initialises an object's fields and properties that are annotated with a
+    /// <see cref="SignatureAttribute"/>.
     /// </summary>
-    public static class SignatureHelper
+    /// <param name="self">The object to initialise.</param>
+    /// <param name="log">If warnings should be logged using <see cref="PluginLog"/>.</param>
+    public static void Initialise(object self, bool log = true)
     {
-        private const BindingFlags Flags = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic;
+        var scanner = Service<SigScanner>.Get();
+        var selfType = self.GetType();
+        var fields = selfType.GetFields(Flags).Select(field => (IFieldOrPropertyInfo)new FieldInfoWrapper(field))
+                             .Concat(selfType.GetProperties(Flags).Select(prop => new PropertyInfoWrapper(prop)))
+                             .Select(field => (field, field.GetCustomAttribute<SignatureAttribute>()))
+                             .Where(field => field.Item2 != null);
 
-        /// <summary>
-        /// Initialises an object's fields and properties that are annotated with a
-        /// <see cref="SignatureAttribute"/>.
-        /// </summary>
-        /// <param name="self">The object to initialise.</param>
-        /// <param name="log">If warnings should be logged using <see cref="PluginLog"/>.</param>
-        public static void Initialise(object self, bool log = true)
+        foreach (var (info, sig) in fields)
         {
-            var scanner = Service<SigScanner>.Get();
-            var selfType = self.GetType();
-            var fields = selfType.GetFields(Flags).Select(field => (IFieldOrPropertyInfo)new FieldInfoWrapper(field))
-                                 .Concat(selfType.GetProperties(Flags).Select(prop => new PropertyInfoWrapper(prop)))
-                                 .Select(field => (field, field.GetCustomAttribute<SignatureAttribute>()))
-                                 .Where(field => field.Item2 != null);
-
-            foreach (var (info, sig) in fields)
+            var wasWrapped = false;
+            var actualType = info.ActualType;
+            if (actualType.IsGenericType && actualType.GetGenericTypeDefinition() == typeof(Nullable<>))
             {
-                var wasWrapped = false;
-                var actualType = info.ActualType;
-                if (actualType.IsGenericType && actualType.GetGenericTypeDefinition() == typeof(Nullable<>))
+                // unwrap the nullable
+                actualType = actualType.GetGenericArguments()[0];
+                wasWrapped = true;
+            }
+
+            var fallibility = sig!.Fallibility;
+            if (fallibility == Fallibility.Auto)
+            {
+                fallibility = info.IsNullable || wasWrapped
+                                  ? Fallibility.Fallible
+                                  : Fallibility.Infallible;
+            }
+
+            var fallible = fallibility == Fallibility.Fallible;
+
+            void Invalid(string message, bool prepend = true)
+            {
+                var errorMsg = prepend
+                                   ? $"Invalid Signature attribute for {selfType.FullName}.{info.Name}: {message}"
+                                   : message;
+                if (fallible)
                 {
-                    // unwrap the nullable
-                    actualType = actualType.GetGenericArguments()[0];
-                    wasWrapped = true;
+                    PluginLog.Warning(errorMsg);
+                }
+                else
+                {
+                    throw new SignatureException(errorMsg);
+                }
+            }
+
+            IntPtr ptr;
+            var success = sig.ScanType == ScanType.Text
+                              ? scanner.TryScanText(sig.Signature, out ptr)
+                              : scanner.TryGetStaticAddressFromSig(sig.Signature, out ptr);
+            if (!success)
+            {
+                if (log)
+                {
+                    Invalid($"Failed to find {sig.ScanType} signature \"{info.Name}\" for {selfType.FullName} ({sig.Signature})", false);
                 }
 
-                var fallibility = sig!.Fallibility;
-                if (fallibility == Fallibility.Auto)
-                {
-                    fallibility = info.IsNullable || wasWrapped
-                                      ? Fallibility.Fallible
-                                      : Fallibility.Infallible;
-                }
+                continue;
+            }
 
-                var fallible = fallibility == Fallibility.Fallible;
-
-                void Invalid(string message, bool prepend = true)
+            switch (sig.UseFlags)
+            {
+                case SignatureUseFlags.Auto when actualType == typeof(IntPtr) || actualType.IsPointer || actualType.IsAssignableTo(typeof(Delegate)):
+                case SignatureUseFlags.Pointer:
                 {
-                    var errorMsg = prepend
-                                       ? $"Invalid Signature attribute for {selfType.FullName}.{info.Name}: {message}"
-                                       : message;
-                    if (fallible)
+                    if (actualType.IsAssignableTo(typeof(Delegate)))
                     {
-                        PluginLog.Warning(errorMsg);
+                        info.SetValue(self, Marshal.GetDelegateForFunctionPointer(ptr, actualType));
                     }
                     else
                     {
-                        throw new SignatureException(errorMsg);
+                        info.SetValue(self, ptr);
                     }
+
+                    break;
                 }
 
-                IntPtr ptr;
-                var success = sig.ScanType == ScanType.Text
-                                  ? scanner.TryScanText(sig.Signature, out ptr)
-                                  : scanner.TryGetStaticAddressFromSig(sig.Signature, out ptr);
-                if (!success)
+                case SignatureUseFlags.Auto when actualType.IsGenericType && actualType.GetGenericTypeDefinition() == typeof(Hook<>):
+                case SignatureUseFlags.Hook:
+                {
+                    if (!actualType.IsGenericType || actualType.GetGenericTypeDefinition() != typeof(Hook<>))
+                    {
+                        Invalid($"{actualType.Name} is not a Hook<T>");
+                        continue;
+                    }
+
+                    var hookDelegateType = actualType.GenericTypeArguments[0];
+
+                    Delegate? detour;
+                    if (sig.DetourName == null)
+                    {
+                        var matches = selfType.GetMethods(Flags)
+                                              .Select(method => method.IsStatic
+                                                                    ? Delegate.CreateDelegate(hookDelegateType, method, false)
+                                                                    : Delegate.CreateDelegate(hookDelegateType, self, method, false))
+                                              .Where(del => del != null)
+                                              .ToArray();
+                        if (matches.Length != 1)
+                        {
+                            Invalid("Either found no matching detours or found more than one: specify a detour name");
+                            continue;
+                        }
+
+                        detour = matches[0]!;
+                    }
+                    else
+                    {
+                        var method = selfType.GetMethod(sig.DetourName, Flags);
+                        if (method == null)
+                        {
+                            Invalid($"Could not find detour \"{sig.DetourName}\"");
+                            continue;
+                        }
+
+                        var del = method.IsStatic
+                                      ? Delegate.CreateDelegate(hookDelegateType, method, false)
+                                      : Delegate.CreateDelegate(hookDelegateType, self, method, false);
+                        if (del == null)
+                        {
+                            Invalid($"Method {sig.DetourName} was not compatible with delegate {hookDelegateType.Name}");
+                            continue;
+                        }
+
+                        detour = del;
+                    }
+
+                    var ctor = actualType.GetConstructor(new[] { typeof(IntPtr), hookDelegateType });
+                    if (ctor == null)
+                    {
+                        PluginLog.Error("Error in SignatureHelper: could not find Hook constructor");
+                        continue;
+                    }
+
+                    var hook = ctor.Invoke(new object?[] { ptr, detour });
+                    info.SetValue(self, hook);
+
+                    break;
+                }
+
+                case SignatureUseFlags.Auto when actualType.IsPrimitive:
+                case SignatureUseFlags.Offset:
+                {
+                    var offset = Marshal.PtrToStructure(ptr + sig.Offset, actualType);
+                    info.SetValue(self, offset);
+
+                    break;
+                }
+
+                default:
                 {
                     if (log)
                     {
-                        Invalid($"Failed to find {sig.ScanType} signature \"{info.Name}\" for {selfType.FullName} ({sig.Signature})", false);
+                        Invalid("could not detect desired signature use, set SignatureUseFlags manually");
                     }
 
-                    continue;
-                }
-
-                switch (sig.UseFlags)
-                {
-                    case SignatureUseFlags.Auto when actualType == typeof(IntPtr) || actualType.IsPointer || actualType.IsAssignableTo(typeof(Delegate)):
-                    case SignatureUseFlags.Pointer:
-                    {
-                        if (actualType.IsAssignableTo(typeof(Delegate)))
-                        {
-                            info.SetValue(self, Marshal.GetDelegateForFunctionPointer(ptr, actualType));
-                        }
-                        else
-                        {
-                            info.SetValue(self, ptr);
-                        }
-
-                        break;
-                    }
-
-                    case SignatureUseFlags.Auto when actualType.IsGenericType && actualType.GetGenericTypeDefinition() == typeof(Hook<>):
-                    case SignatureUseFlags.Hook:
-                    {
-                        if (!actualType.IsGenericType || actualType.GetGenericTypeDefinition() != typeof(Hook<>))
-                        {
-                            Invalid($"{actualType.Name} is not a Hook<T>");
-                            continue;
-                        }
-
-                        var hookDelegateType = actualType.GenericTypeArguments[0];
-
-                        Delegate? detour;
-                        if (sig.DetourName == null)
-                        {
-                            var matches = selfType.GetMethods(Flags)
-                                                  .Select(method => method.IsStatic
-                                                                        ? Delegate.CreateDelegate(hookDelegateType, method, false)
-                                                                        : Delegate.CreateDelegate(hookDelegateType, self, method, false))
-                                                  .Where(del => del != null)
-                                                  .ToArray();
-                            if (matches.Length != 1)
-                            {
-                                Invalid("Either found no matching detours or found more than one: specify a detour name");
-                                continue;
-                            }
-
-                            detour = matches[0]!;
-                        }
-                        else
-                        {
-                            var method = selfType.GetMethod(sig.DetourName, Flags);
-                            if (method == null)
-                            {
-                                Invalid($"Could not find detour \"{sig.DetourName}\"");
-                                continue;
-                            }
-
-                            var del = method.IsStatic
-                                          ? Delegate.CreateDelegate(hookDelegateType, method, false)
-                                          : Delegate.CreateDelegate(hookDelegateType, self, method, false);
-                            if (del == null)
-                            {
-                                Invalid($"Method {sig.DetourName} was not compatible with delegate {hookDelegateType.Name}");
-                                continue;
-                            }
-
-                            detour = del;
-                        }
-
-                        var ctor = actualType.GetConstructor(new[] { typeof(IntPtr), hookDelegateType });
-                        if (ctor == null)
-                        {
-                            PluginLog.Error("Error in SignatureHelper: could not find Hook constructor");
-                            continue;
-                        }
-
-                        var hook = ctor.Invoke(new object?[] { ptr, detour });
-                        info.SetValue(self, hook);
-
-                        break;
-                    }
-
-                    case SignatureUseFlags.Auto when actualType.IsPrimitive:
-                    case SignatureUseFlags.Offset:
-                    {
-                        var offset = Marshal.PtrToStructure(ptr + sig.Offset, actualType);
-                        info.SetValue(self, offset);
-
-                        break;
-                    }
-
-                    default:
-                    {
-                        if (log)
-                        {
-                            Invalid("could not detect desired signature use, set SignatureUseFlags manually");
-                        }
-
-                        break;
-                    }
+                    break;
                 }
             }
         }
diff --git a/Dalamud/Utility/Signatures/SignatureUseFlags.cs b/Dalamud/Utility/Signatures/SignatureUseFlags.cs
index 759352906..f952bc00e 100755
--- a/Dalamud/Utility/Signatures/SignatureUseFlags.cs
+++ b/Dalamud/Utility/Signatures/SignatureUseFlags.cs
@@ -2,39 +2,38 @@
 
 using Dalamud.Hooking;
 
-namespace Dalamud.Utility.Signatures
+namespace Dalamud.Utility.Signatures;
+
+/// <summary>
+/// Use flags for a signature attribute. This tells SignatureHelper how to use the
+/// result of the signature.
+/// </summary>
+public enum SignatureUseFlags
 {
     /// <summary>
-    /// Use flags for a signature attribute. This tells SignatureHelper how to use the
-    /// result of the signature.
+    /// SignatureHelper will use simple heuristics to determine the best signature
+    /// use for the field/property.
     /// </summary>
-    public enum SignatureUseFlags
-    {
-        /// <summary>
-        /// SignatureHelper will use simple heuristics to determine the best signature
-        /// use for the field/property.
-        /// </summary>
-        Auto,
+    Auto,
 
-        /// <summary>
-        /// The signature should be used as a plain pointer. This is correct for
-        /// static addresses, functions, or anything else that's an
-        /// <see cref="IntPtr"/> at heart.
-        /// </summary>
-        Pointer,
+    /// <summary>
+    /// The signature should be used as a plain pointer. This is correct for
+    /// static addresses, functions, or anything else that's an
+    /// <see cref="IntPtr"/> at heart.
+    /// </summary>
+    Pointer,
 
-        /// <summary>
-        /// The signature should be used as a hook. This is correct for
-        /// <see cref="Hook{T}"/> fields/properties.
-        /// </summary>
-        Hook,
+    /// <summary>
+    /// The signature should be used as a hook. This is correct for
+    /// <see cref="Hook{T}"/> fields/properties.
+    /// </summary>
+    Hook,
 
-        /// <summary>
-        /// The signature should be used to determine an offset. This is the default
-        /// for all primitive types. SignatureHelper will read from the memory at this
-        /// signature and store the result in the field/property. An offset from the
-        /// signature can be specified in the <see cref="SignatureAttribute"/>.
-        /// </summary>
-        Offset,
-    }
+    /// <summary>
+    /// The signature should be used to determine an offset. This is the default
+    /// for all primitive types. SignatureHelper will read from the memory at this
+    /// signature and store the result in the field/property. An offset from the
+    /// signature can be specified in the <see cref="SignatureAttribute"/>.
+    /// </summary>
+    Offset,
 }
diff --git a/Dalamud/Utility/Signatures/Wrappers/FieldInfoWrapper.cs b/Dalamud/Utility/Signatures/Wrappers/FieldInfoWrapper.cs
index daad25bd7..79233eae2 100755
--- a/Dalamud/Utility/Signatures/Wrappers/FieldInfoWrapper.cs
+++ b/Dalamud/Utility/Signatures/Wrappers/FieldInfoWrapper.cs
@@ -1,43 +1,42 @@
 using System;
 using System.Reflection;
 
-namespace Dalamud.Utility.Signatures.Wrappers
+namespace Dalamud.Utility.Signatures.Wrappers;
+
+/// <summary>
+/// Class providing information about a field.
+/// </summary>
+internal sealed class FieldInfoWrapper : IFieldOrPropertyInfo
 {
     /// <summary>
-    /// Class providing information about a field.
+    /// Initializes a new instance of the <see cref="FieldInfoWrapper"/> class.
     /// </summary>
-    internal sealed class FieldInfoWrapper : IFieldOrPropertyInfo
+    /// <param name="info">FieldInfo to populate from.</param>
+    public FieldInfoWrapper(FieldInfo info)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FieldInfoWrapper"/> class.
-        /// </summary>
-        /// <param name="info">FieldInfo to populate from.</param>
-        public FieldInfoWrapper(FieldInfo info)
-        {
-            this.Info = info;
-        }
+        this.Info = info;
+    }
 
-        /// <inheritdoc/>
-        public string Name => this.Info.Name;
+    /// <inheritdoc/>
+    public string Name => this.Info.Name;
 
-        /// <inheritdoc/>
-        public Type ActualType => this.Info.FieldType;
+    /// <inheritdoc/>
+    public Type ActualType => this.Info.FieldType;
 
-        /// <inheritdoc/>
-        public bool IsNullable => NullabilityUtil.IsNullable(this.Info);
+    /// <inheritdoc/>
+    public bool IsNullable => NullabilityUtil.IsNullable(this.Info);
 
-        private FieldInfo Info { get; }
+    private FieldInfo Info { get; }
 
-        /// <inheritdoc/>
-        public void SetValue(object? self, object? value)
-        {
-            this.Info.SetValue(self, value);
-        }
+    /// <inheritdoc/>
+    public void SetValue(object? self, object? value)
+    {
+        this.Info.SetValue(self, value);
+    }
 
-        /// <inheritdoc/>
-        public T? GetCustomAttribute<T>() where T : Attribute
-        {
-            return this.Info.GetCustomAttribute<T>();
-        }
+    /// <inheritdoc/>
+    public T? GetCustomAttribute<T>() where T : Attribute
+    {
+        return this.Info.GetCustomAttribute<T>();
     }
 }
diff --git a/Dalamud/Utility/Signatures/Wrappers/IFieldOrPropertyInfo.cs b/Dalamud/Utility/Signatures/Wrappers/IFieldOrPropertyInfo.cs
index 0c54c80ab..7690f86ec 100755
--- a/Dalamud/Utility/Signatures/Wrappers/IFieldOrPropertyInfo.cs
+++ b/Dalamud/Utility/Signatures/Wrappers/IFieldOrPropertyInfo.cs
@@ -1,39 +1,38 @@
 using System;
 
-namespace Dalamud.Utility.Signatures.Wrappers
+namespace Dalamud.Utility.Signatures.Wrappers;
+
+/// <summary>
+/// Interface providing information about a field or a property.
+/// </summary>
+internal interface IFieldOrPropertyInfo
 {
     /// <summary>
-    /// Interface providing information about a field or a property.
+    /// Gets the name of the field or property.
     /// </summary>
-    internal interface IFieldOrPropertyInfo
-    {
-        /// <summary>
-        /// Gets the name of the field or property.
-        /// </summary>
-        string Name { get; }
+    string Name { get; }
 
-        /// <summary>
-        /// Gets the actual type of the field or property.
-        /// </summary>
-        Type ActualType { get; }
+    /// <summary>
+    /// Gets the actual type of the field or property.
+    /// </summary>
+    Type ActualType { get; }
 
-        /// <summary>
-        /// Gets a value indicating whether or not the field or property is nullable.
-        /// </summary>
-        bool IsNullable { get; }
+    /// <summary>
+    /// Gets a value indicating whether or not the field or property is nullable.
+    /// </summary>
+    bool IsNullable { get; }
 
-        /// <summary>
-        /// Set this field or property's value.
-        /// </summary>
-        /// <param name="self">The object instance.</param>
-        /// <param name="value">The value to set.</param>
-        void SetValue(object? self, object? value);
+    /// <summary>
+    /// Set this field or property's value.
+    /// </summary>
+    /// <param name="self">The object instance.</param>
+    /// <param name="value">The value to set.</param>
+    void SetValue(object? self, object? value);
 
-        /// <summary>
-        /// Get a custom attribute.
-        /// </summary>
-        /// <typeparam name="T">The type of the attribute.</typeparam>
-        /// <returns>The attribute.</returns>
-        T? GetCustomAttribute<T>() where T : Attribute;
-    }
+    /// <summary>
+    /// Get a custom attribute.
+    /// </summary>
+    /// <typeparam name="T">The type of the attribute.</typeparam>
+    /// <returns>The attribute.</returns>
+    T? GetCustomAttribute<T>() where T : Attribute;
 }
diff --git a/Dalamud/Utility/Signatures/Wrappers/PropertyInfoWrapper.cs b/Dalamud/Utility/Signatures/Wrappers/PropertyInfoWrapper.cs
index 8ee3a102d..280e0c012 100755
--- a/Dalamud/Utility/Signatures/Wrappers/PropertyInfoWrapper.cs
+++ b/Dalamud/Utility/Signatures/Wrappers/PropertyInfoWrapper.cs
@@ -1,43 +1,42 @@
 using System;
 using System.Reflection;
 
-namespace Dalamud.Utility.Signatures.Wrappers
+namespace Dalamud.Utility.Signatures.Wrappers;
+
+/// <summary>
+/// Class providing information about a property.
+/// </summary>
+internal sealed class PropertyInfoWrapper : IFieldOrPropertyInfo
 {
     /// <summary>
-    /// Class providing information about a property.
+    /// Initializes a new instance of the <see cref="PropertyInfoWrapper"/> class.
     /// </summary>
-    internal sealed class PropertyInfoWrapper : IFieldOrPropertyInfo
+    /// <param name="info">PropertyInfo.</param>
+    public PropertyInfoWrapper(PropertyInfo info)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyInfoWrapper"/> class.
-        /// </summary>
-        /// <param name="info">PropertyInfo.</param>
-        public PropertyInfoWrapper(PropertyInfo info)
-        {
-            this.Info = info;
-        }
+        this.Info = info;
+    }
 
-        /// <inheritdoc/>
-        public string Name => this.Info.Name;
+    /// <inheritdoc/>
+    public string Name => this.Info.Name;
 
-        /// <inheritdoc/>
-        public Type ActualType => this.Info.PropertyType;
+    /// <inheritdoc/>
+    public Type ActualType => this.Info.PropertyType;
 
-        /// <inheritdoc/>
-        public bool IsNullable => NullabilityUtil.IsNullable(this.Info);
+    /// <inheritdoc/>
+    public bool IsNullable => NullabilityUtil.IsNullable(this.Info);
 
-        private PropertyInfo Info { get; }
+    private PropertyInfo Info { get; }
 
-        /// <inheritdoc/>
-        public void SetValue(object? self, object? value)
-        {
-            this.Info.SetValue(self, value);
-        }
+    /// <inheritdoc/>
+    public void SetValue(object? self, object? value)
+    {
+        this.Info.SetValue(self, value);
+    }
 
-        /// <inheritdoc/>
-        public T? GetCustomAttribute<T>() where T : Attribute
-        {
-            return this.Info.GetCustomAttribute<T>();
-        }
+    /// <inheritdoc/>
+    public T? GetCustomAttribute<T>() where T : Attribute
+    {
+        return this.Info.GetCustomAttribute<T>();
     }
 }
diff --git a/Dalamud/Utility/StringExtensions.cs b/Dalamud/Utility/StringExtensions.cs
index 1cd72c674..150f06c32 100644
--- a/Dalamud/Utility/StringExtensions.cs
+++ b/Dalamud/Utility/StringExtensions.cs
@@ -1,32 +1,31 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Dalamud.Utility
+namespace Dalamud.Utility;
+
+/// <summary>
+/// Extension methods for strings.
+/// </summary>
+public static class StringExtensions
 {
     /// <summary>
-    /// Extension methods for strings.
+    /// An extension method to chain usage of string.Format.
     /// </summary>
-    public static class StringExtensions
-    {
-        /// <summary>
-        /// An extension method to chain usage of string.Format.
-        /// </summary>
-        /// <param name="format">Format string.</param>
-        /// <param name="args">Format arguments.</param>
-        /// <returns>Formatted string.</returns>
-        public static string Format(this string format, params object[] args) => string.Format(format, args);
+    /// <param name="format">Format string.</param>
+    /// <param name="args">Format arguments.</param>
+    /// <returns>Formatted string.</returns>
+    public static string Format(this string format, params object[] args) => string.Format(format, args);
 
-        /// <summary>
-        /// Indicates whether the specified string is null or an empty string ("").
-        /// </summary>
-        /// <param name="value">The string to test.</param>
-        /// <returns>true if the value parameter is null or an empty string (""); otherwise, false.</returns>
-        public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value) => string.IsNullOrEmpty(value);
+    /// <summary>
+    /// Indicates whether the specified string is null or an empty string ("").
+    /// </summary>
+    /// <param name="value">The string to test.</param>
+    /// <returns>true if the value parameter is null or an empty string (""); otherwise, false.</returns>
+    public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value) => string.IsNullOrEmpty(value);
 
-        /// <summary>
-        /// Indicates whether a specified string is null, empty, or consists only of white-space characters.
-        /// </summary>
-        /// <param name="value">The string to test.</param>
-        /// <returns>true if the value parameter is null or an empty string (""), or if value consists exclusively of white-space characters.</returns>
-        public static bool IsNullOrWhitespace([NotNullWhen(false)] this string? value) => string.IsNullOrWhiteSpace(value);
-    }
+    /// <summary>
+    /// Indicates whether a specified string is null, empty, or consists only of white-space characters.
+    /// </summary>
+    /// <param name="value">The string to test.</param>
+    /// <returns>true if the value parameter is null or an empty string (""), or if value consists exclusively of white-space characters.</returns>
+    public static bool IsNullOrWhitespace([NotNullWhen(false)] this string? value) => string.IsNullOrWhiteSpace(value);
 }
diff --git a/Dalamud/Utility/TexFileExtensions.cs b/Dalamud/Utility/TexFileExtensions.cs
index ddfccba9c..5abea692a 100644
--- a/Dalamud/Utility/TexFileExtensions.cs
+++ b/Dalamud/Utility/TexFileExtensions.cs
@@ -1,32 +1,31 @@
 using ImGuiScene;
 using Lumina.Data.Files;
 
-namespace Dalamud.Utility
+namespace Dalamud.Utility;
+
+/// <summary>
+/// Extensions to <see cref="TexFile"/>.
+/// </summary>
+public static class TexFileExtensions
 {
     /// <summary>
-    /// Extensions to <see cref="TexFile"/>.
+    /// Returns the image data formatted for <see cref="RawDX11Scene.LoadImageRaw"/>.
     /// </summary>
-    public static class TexFileExtensions
+    /// <param name="texFile">The TexFile to format.</param>
+    /// <returns>The formatted image data.</returns>
+    public static byte[] GetRgbaImageData(this TexFile texFile)
     {
-        /// <summary>
-        /// Returns the image data formatted for <see cref="RawDX11Scene.LoadImageRaw"/>.
-        /// </summary>
-        /// <param name="texFile">The TexFile to format.</param>
-        /// <returns>The formatted image data.</returns>
-        public static byte[] GetRgbaImageData(this TexFile texFile)
+        var imageData = texFile.ImageData;
+        var dst = new byte[imageData.Length];
+
+        for (var i = 0; i < dst.Length; i += 4)
         {
-            var imageData = texFile.ImageData;
-            var dst = new byte[imageData.Length];
-
-            for (var i = 0; i < dst.Length; i += 4)
-            {
-                dst[i] = imageData[i + 2];
-                dst[i + 1] = imageData[i + 1];
-                dst[i + 2] = imageData[i];
-                dst[i + 3] = imageData[i + 3];
-            }
-
-            return dst;
+            dst[i] = imageData[i + 2];
+            dst[i + 1] = imageData[i + 1];
+            dst[i + 2] = imageData[i];
+            dst[i + 3] = imageData[i + 3];
         }
+
+        return dst;
     }
 }
diff --git a/Dalamud/Utility/Util.cs b/Dalamud/Utility/Util.cs
index 3878cdb25..eba6b562f 100644
--- a/Dalamud/Utility/Util.cs
+++ b/Dalamud/Utility/Util.cs
@@ -20,600 +20,599 @@ using ImGuiNET;
 using Microsoft.Win32;
 using Serilog;
 
-namespace Dalamud.Utility
+namespace Dalamud.Utility;
+
+/// <summary>
+/// Class providing various helper methods for use in Dalamud and plugins.
+/// </summary>
+public static class Util
 {
+    private static string? gitHashInternal;
+    private static string? gitHashClientStructsInternal;
+
+    private static ulong moduleStartAddr;
+    private static ulong moduleEndAddr;
+
     /// <summary>
-    /// Class providing various helper methods for use in Dalamud and plugins.
+    /// Gets an httpclient for usage.
+    /// Do NOT await this.
     /// </summary>
-    public static class Util
+    public static HttpClient HttpClient { get; } = new();
+
+    /// <summary>
+    /// Gets the assembly version of Dalamud.
+    /// </summary>
+    public static string AssemblyVersion { get; } = Assembly.GetAssembly(typeof(ChatHandlers)).GetName().Version.ToString();
+
+    /// <summary>
+    /// Check two byte arrays for equality.
+    /// </summary>
+    /// <param name="a1">The first byte array.</param>
+    /// <param name="a2">The second byte array.</param>
+    /// <returns>Whether or not the byte arrays are equal.</returns>
+    public static unsafe bool FastByteArrayCompare(byte[]? a1, byte[]? a2)
     {
-        private static string? gitHashInternal;
-        private static string? gitHashClientStructsInternal;
+        // Copyright (c) 2008-2013 Hafthor Stefansson
+        // Distributed under the MIT/X11 software license
+        // Ref: http://www.opensource.org/licenses/mit-license.php.
+        // https://stackoverflow.com/a/8808245
 
-        private static ulong moduleStartAddr;
-        private static ulong moduleEndAddr;
-
-        /// <summary>
-        /// Gets an httpclient for usage.
-        /// Do NOT await this.
-        /// </summary>
-        public static HttpClient HttpClient { get; } = new();
-
-        /// <summary>
-        /// Gets the assembly version of Dalamud.
-        /// </summary>
-        public static string AssemblyVersion { get; } = Assembly.GetAssembly(typeof(ChatHandlers)).GetName().Version.ToString();
-
-        /// <summary>
-        /// Check two byte arrays for equality.
-        /// </summary>
-        /// <param name="a1">The first byte array.</param>
-        /// <param name="a2">The second byte array.</param>
-        /// <returns>Whether or not the byte arrays are equal.</returns>
-        public static unsafe bool FastByteArrayCompare(byte[]? a1, byte[]? a2)
+        if (a1 == a2) return true;
+        if (a1 == null || a2 == null || a1.Length != a2.Length)
+            return false;
+        fixed (byte* p1 = a1, p2 = a2)
         {
-            // Copyright (c) 2008-2013 Hafthor Stefansson
-            // Distributed under the MIT/X11 software license
-            // Ref: http://www.opensource.org/licenses/mit-license.php.
-            // https://stackoverflow.com/a/8808245
-
-            if (a1 == a2) return true;
-            if (a1 == null || a2 == null || a1.Length != a2.Length)
-                return false;
-            fixed (byte* p1 = a1, p2 = a2)
+            byte* x1 = p1, x2 = p2;
+            var l = a1.Length;
+            for (var i = 0; i < l / 8; i++, x1 += 8, x2 += 8)
             {
-                byte* x1 = p1, x2 = p2;
-                var l = a1.Length;
-                for (var i = 0; i < l / 8; i++, x1 += 8, x2 += 8)
-                {
-                    if (*((long*)x1) != *((long*)x2))
-                        return false;
-                }
-
-                if ((l & 4) != 0)
-                {
-                    if (*((int*)x1) != *((int*)x2))
-                        return false;
-                    x1 += 4;
-                    x2 += 4;
-                }
-
-                if ((l & 2) != 0)
-                {
-                    if (*((short*)x1) != *((short*)x2))
-                        return false;
-                    x1 += 2;
-                    x2 += 2;
-                }
-
-                if ((l & 1) != 0)
-                {
-                    if (*((byte*)x1) != *((byte*)x2))
-                        return false;
-                }
-
-                return true;
+                if (*((long*)x1) != *((long*)x2))
+                    return false;
             }
+
+            if ((l & 4) != 0)
+            {
+                if (*((int*)x1) != *((int*)x2))
+                    return false;
+                x1 += 4;
+                x2 += 4;
+            }
+
+            if ((l & 2) != 0)
+            {
+                if (*((short*)x1) != *((short*)x2))
+                    return false;
+                x1 += 2;
+                x2 += 2;
+            }
+
+            if ((l & 1) != 0)
+            {
+                if (*((byte*)x1) != *((byte*)x2))
+                    return false;
+            }
+
+            return true;
         }
+    }
 
-        /// <summary>
-        /// Gets the git hash value from the assembly
-        /// or null if it cannot be found.
-        /// </summary>
-        /// <returns>The git hash of the assembly.</returns>
-        public static string GetGitHash()
-        {
-            if (gitHashInternal != null)
-                return gitHashInternal;
-
-            var asm = typeof(Util).Assembly;
-            var attrs = asm.GetCustomAttributes<AssemblyMetadataAttribute>();
-
-            gitHashInternal = attrs.First(a => a.Key == "GitHash").Value;
-
+    /// <summary>
+    /// Gets the git hash value from the assembly
+    /// or null if it cannot be found.
+    /// </summary>
+    /// <returns>The git hash of the assembly.</returns>
+    public static string GetGitHash()
+    {
+        if (gitHashInternal != null)
             return gitHashInternal;
-        }
 
-        /// <summary>
-        /// Gets the git hash value from the assembly
-        /// or null if it cannot be found.
-        /// </summary>
-        /// <returns>The git hash of the assembly.</returns>
-        public static string GetGitHashClientStructs()
-        {
-            if (gitHashClientStructsInternal != null)
-                return gitHashClientStructsInternal;
+        var asm = typeof(Util).Assembly;
+        var attrs = asm.GetCustomAttributes<AssemblyMetadataAttribute>();
 
-            var asm = typeof(Util).Assembly;
-            var attrs = asm.GetCustomAttributes<AssemblyMetadataAttribute>();
+        gitHashInternal = attrs.First(a => a.Key == "GitHash").Value;
 
-            gitHashClientStructsInternal = attrs.First(a => a.Key == "GitHashClientStructs").Value;
+        return gitHashInternal;
+    }
 
+    /// <summary>
+    /// Gets the git hash value from the assembly
+    /// or null if it cannot be found.
+    /// </summary>
+    /// <returns>The git hash of the assembly.</returns>
+    public static string GetGitHashClientStructs()
+    {
+        if (gitHashClientStructsInternal != null)
             return gitHashClientStructsInternal;
+
+        var asm = typeof(Util).Assembly;
+        var attrs = asm.GetCustomAttributes<AssemblyMetadataAttribute>();
+
+        gitHashClientStructsInternal = attrs.First(a => a.Key == "GitHashClientStructs").Value;
+
+        return gitHashClientStructsInternal;
+    }
+
+    /// <summary>
+    /// Read memory from an offset and hexdump them via Serilog.
+    /// </summary>
+    /// <param name="offset">The offset to read from.</param>
+    /// <param name="len">The length to read.</param>
+    public static void DumpMemory(IntPtr offset, int len = 512)
+    {
+        try
+        {
+            SafeMemory.ReadBytes(offset, len, out var data);
+            Log.Information(ByteArrayToHex(data));
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Read failed");
+        }
+    }
+
+    /// <summary>
+    /// Create a hexdump of the provided bytes.
+    /// </summary>
+    /// <param name="bytes">The bytes to hexdump.</param>
+    /// <param name="offset">The offset in the byte array to start at.</param>
+    /// <param name="bytesPerLine">The amount of bytes to display per line.</param>
+    /// <returns>The generated hexdump in string form.</returns>
+    public static string ByteArrayToHex(byte[] bytes, int offset = 0, int bytesPerLine = 16)
+    {
+        if (bytes == null) return string.Empty;
+
+        var hexChars = "0123456789ABCDEF".ToCharArray();
+
+        var offsetBlock = 8 + 3;
+        var byteBlock = offsetBlock + (bytesPerLine * 3) + ((bytesPerLine - 1) / 8) + 2;
+        var lineLength = byteBlock + bytesPerLine + Environment.NewLine.Length;
+
+        var line = (new string(' ', lineLength - Environment.NewLine.Length) + Environment.NewLine).ToCharArray();
+        var numLines = (bytes.Length + bytesPerLine - 1) / bytesPerLine;
+
+        var sb = new StringBuilder(numLines * lineLength);
+
+        for (var i = 0; i < bytes.Length; i += bytesPerLine)
+        {
+            var h = i + offset;
+
+            line[0] = hexChars[(h >> 28) & 0xF];
+            line[1] = hexChars[(h >> 24) & 0xF];
+            line[2] = hexChars[(h >> 20) & 0xF];
+            line[3] = hexChars[(h >> 16) & 0xF];
+            line[4] = hexChars[(h >> 12) & 0xF];
+            line[5] = hexChars[(h >> 8) & 0xF];
+            line[6] = hexChars[(h >> 4) & 0xF];
+            line[7] = hexChars[(h >> 0) & 0xF];
+
+            var hexColumn = offsetBlock;
+            var charColumn = byteBlock;
+
+            for (var j = 0; j < bytesPerLine; j++)
+            {
+                if (j > 0 && (j & 7) == 0) hexColumn++;
+
+                if (i + j >= bytes.Length)
+                {
+                    line[hexColumn] = ' ';
+                    line[hexColumn + 1] = ' ';
+                    line[charColumn] = ' ';
+                }
+                else
+                {
+                    var by = bytes[i + j];
+                    line[hexColumn] = hexChars[(by >> 4) & 0xF];
+                    line[hexColumn + 1] = hexChars[by & 0xF];
+                    line[charColumn] = by < 32 ? '.' : (char)by;
+                }
+
+                hexColumn += 3;
+                charColumn++;
+            }
+
+            sb.Append(line);
         }
 
-        /// <summary>
-        /// Read memory from an offset and hexdump them via Serilog.
-        /// </summary>
-        /// <param name="offset">The offset to read from.</param>
-        /// <param name="len">The length to read.</param>
-        public static void DumpMemory(IntPtr offset, int len = 512)
+        return sb.ToString().TrimEnd(Environment.NewLine.ToCharArray());
+    }
+
+    /// <summary>
+    /// Show a structure in an ImGui context.
+    /// </summary>
+    /// <param name="obj">The structure to show.</param>
+    /// <param name="addr">The address to the structure.</param>
+    /// <param name="autoExpand">Whether or not this structure should start out expanded.</param>
+    /// <param name="path">The already followed path.</param>
+    public static void ShowStruct(object obj, ulong addr, bool autoExpand = false, IEnumerable<string>? path = null)
+    {
+        ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(3, 2));
+        path ??= new List<string>();
+
+        if (moduleEndAddr == 0 && moduleStartAddr == 0)
         {
             try
             {
-                SafeMemory.ReadBytes(offset, len, out var data);
-                Log.Information(ByteArrayToHex(data));
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Read failed");
-            }
-        }
-
-        /// <summary>
-        /// Create a hexdump of the provided bytes.
-        /// </summary>
-        /// <param name="bytes">The bytes to hexdump.</param>
-        /// <param name="offset">The offset in the byte array to start at.</param>
-        /// <param name="bytesPerLine">The amount of bytes to display per line.</param>
-        /// <returns>The generated hexdump in string form.</returns>
-        public static string ByteArrayToHex(byte[] bytes, int offset = 0, int bytesPerLine = 16)
-        {
-            if (bytes == null) return string.Empty;
-
-            var hexChars = "0123456789ABCDEF".ToCharArray();
-
-            var offsetBlock = 8 + 3;
-            var byteBlock = offsetBlock + (bytesPerLine * 3) + ((bytesPerLine - 1) / 8) + 2;
-            var lineLength = byteBlock + bytesPerLine + Environment.NewLine.Length;
-
-            var line = (new string(' ', lineLength - Environment.NewLine.Length) + Environment.NewLine).ToCharArray();
-            var numLines = (bytes.Length + bytesPerLine - 1) / bytesPerLine;
-
-            var sb = new StringBuilder(numLines * lineLength);
-
-            for (var i = 0; i < bytes.Length; i += bytesPerLine)
-            {
-                var h = i + offset;
-
-                line[0] = hexChars[(h >> 28) & 0xF];
-                line[1] = hexChars[(h >> 24) & 0xF];
-                line[2] = hexChars[(h >> 20) & 0xF];
-                line[3] = hexChars[(h >> 16) & 0xF];
-                line[4] = hexChars[(h >> 12) & 0xF];
-                line[5] = hexChars[(h >> 8) & 0xF];
-                line[6] = hexChars[(h >> 4) & 0xF];
-                line[7] = hexChars[(h >> 0) & 0xF];
-
-                var hexColumn = offsetBlock;
-                var charColumn = byteBlock;
-
-                for (var j = 0; j < bytesPerLine; j++)
+                var processModule = Process.GetCurrentProcess().MainModule;
+                if (processModule != null)
                 {
-                    if (j > 0 && (j & 7) == 0) hexColumn++;
-
-                    if (i + j >= bytes.Length)
-                    {
-                        line[hexColumn] = ' ';
-                        line[hexColumn + 1] = ' ';
-                        line[charColumn] = ' ';
-                    }
-                    else
-                    {
-                        var by = bytes[i + j];
-                        line[hexColumn] = hexChars[(by >> 4) & 0xF];
-                        line[hexColumn + 1] = hexChars[by & 0xF];
-                        line[charColumn] = by < 32 ? '.' : (char)by;
-                    }
-
-                    hexColumn += 3;
-                    charColumn++;
+                    moduleStartAddr = (ulong)processModule.BaseAddress.ToInt64();
+                    moduleEndAddr = moduleStartAddr + (ulong)processModule.ModuleMemorySize;
                 }
-
-                sb.Append(line);
-            }
-
-            return sb.ToString().TrimEnd(Environment.NewLine.ToCharArray());
-        }
-
-        /// <summary>
-        /// Show a structure in an ImGui context.
-        /// </summary>
-        /// <param name="obj">The structure to show.</param>
-        /// <param name="addr">The address to the structure.</param>
-        /// <param name="autoExpand">Whether or not this structure should start out expanded.</param>
-        /// <param name="path">The already followed path.</param>
-        public static void ShowStruct(object obj, ulong addr, bool autoExpand = false, IEnumerable<string>? path = null)
-        {
-            ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(3, 2));
-            path ??= new List<string>();
-
-            if (moduleEndAddr == 0 && moduleStartAddr == 0)
-            {
-                try
-                {
-                    var processModule = Process.GetCurrentProcess().MainModule;
-                    if (processModule != null)
-                    {
-                        moduleStartAddr = (ulong)processModule.BaseAddress.ToInt64();
-                        moduleEndAddr = moduleStartAddr + (ulong)processModule.ModuleMemorySize;
-                    }
-                    else
-                    {
-                        moduleEndAddr = 1;
-                    }
-                }
-                catch
+                else
                 {
                     moduleEndAddr = 1;
                 }
             }
-
-            ImGui.PushStyleColor(ImGuiCol.Text, 0xFF00FFFF);
-            if (autoExpand)
+            catch
             {
-                ImGui.SetNextItemOpen(true, ImGuiCond.Appearing);
+                moduleEndAddr = 1;
             }
+        }
 
-            if (ImGui.TreeNode($"{obj}##print-obj-{addr:X}-{string.Join("-", path)}"))
+        ImGui.PushStyleColor(ImGuiCol.Text, 0xFF00FFFF);
+        if (autoExpand)
+        {
+            ImGui.SetNextItemOpen(true, ImGuiCond.Appearing);
+        }
+
+        if (ImGui.TreeNode($"{obj}##print-obj-{addr:X}-{string.Join("-", path)}"))
+        {
+            ImGui.PopStyleColor();
+            foreach (var f in obj.GetType().GetFields(BindingFlags.Static | BindingFlags.Public | BindingFlags.Instance))
             {
-                ImGui.PopStyleColor();
-                foreach (var f in obj.GetType().GetFields(BindingFlags.Static | BindingFlags.Public | BindingFlags.Instance))
+                var fixedBuffer = (FixedBufferAttribute)f.GetCustomAttribute(typeof(FixedBufferAttribute));
+                if (fixedBuffer != null)
                 {
-                    var fixedBuffer = (FixedBufferAttribute)f.GetCustomAttribute(typeof(FixedBufferAttribute));
-                    if (fixedBuffer != null)
-                    {
-                        ImGui.Text($"fixed");
-                        ImGui.SameLine();
-                        ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.9f, 1), $"{fixedBuffer.ElementType.Name}[0x{fixedBuffer.Length:X}]");
-                    }
-                    else
-                    {
-                        ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.9f, 1), $"{f.FieldType.Name}");
-                    }
-
+                    ImGui.Text($"fixed");
                     ImGui.SameLine();
-                    ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.4f, 1), $"{f.Name}: ");
-                    ImGui.SameLine();
-
-                    ShowValue(addr, new List<string>(path) { f.Name }, f.FieldType, f.GetValue(obj));
+                    ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.9f, 1), $"{fixedBuffer.ElementType.Name}[0x{fixedBuffer.Length:X}]");
                 }
-
-                foreach (var p in obj.GetType().GetProperties().Where(p => p.GetGetMethod()?.GetParameters().Length == 0))
-                {
-                    ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.9f, 1), $"{p.PropertyType.Name}");
-                    ImGui.SameLine();
-                    ImGui.TextColored(new Vector4(0.2f, 0.6f, 0.4f, 1), $"{p.Name}: ");
-                    ImGui.SameLine();
-
-                    ShowValue(addr, new List<string>(path) { p.Name }, p.PropertyType, p.GetValue(obj));
-                }
-
-                ImGui.TreePop();
-            }
-            else
-            {
-                ImGui.PopStyleColor();
-            }
-
-            ImGui.PopStyleVar();
-        }
-
-        /// <summary>
-        /// Show a structure in an ImGui context.
-        /// </summary>
-        /// <typeparam name="T">The type of the structure.</typeparam>
-        /// <param name="obj">The pointer to the structure.</param>
-        /// <param name="autoExpand">Whether or not this structure should start out expanded.</param>
-        public static unsafe void ShowStruct<T>(T* obj, bool autoExpand = false) where T : unmanaged
-        {
-            ShowStruct(*obj, (ulong)&obj, autoExpand);
-        }
-
-        /// <summary>
-        /// Show a GameObject's internal data in an ImGui-context.
-        /// </summary>
-        /// <param name="go">The GameObject to show.</param>
-        /// <param name="autoExpand">Whether or not the struct should start as expanded.</param>
-        public static unsafe void ShowGameObjectStruct(GameObject go, bool autoExpand = true)
-        {
-            switch (go)
-            {
-                case BattleChara bchara:
-                    ShowStruct(bchara.Struct, autoExpand);
-                    break;
-                case Character chara:
-                    ShowStruct(chara.Struct, autoExpand);
-                    break;
-                default:
-                    ShowStruct(go.Struct, autoExpand);
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Show all properties and fields of the provided object via ImGui.
-        /// </summary>
-        /// <param name="obj">The object to show.</param>
-        public static void ShowObject(object obj)
-        {
-            var type = obj.GetType();
-
-            ImGui.Text($"Object Dump({type.Name}) for {obj}({obj.GetHashCode()})");
-
-            ImGuiHelpers.ScaledDummy(5);
-
-            ImGui.TextColored(ImGuiColors.DalamudOrange, "-> Properties:");
-
-            ImGui.Indent();
-
-            foreach (var propertyInfo in type.GetProperties().Where(p => p.GetGetMethod()?.GetParameters().Length == 0))
-            {
-                var value = propertyInfo.GetValue(obj);
-                var valueType = value?.GetType();
-                if (valueType == typeof(IntPtr))
-                    ImGui.TextColored(ImGuiColors.DalamudOrange, $"    {propertyInfo.Name}: 0x{value:X}");
                 else
-                    ImGui.TextColored(ImGuiColors.DalamudOrange, $"    {propertyInfo.Name}: {value}");
+                {
+                    ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.9f, 1), $"{f.FieldType.Name}");
+                }
+
+                ImGui.SameLine();
+                ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.4f, 1), $"{f.Name}: ");
+                ImGui.SameLine();
+
+                ShowValue(addr, new List<string>(path) { f.Name }, f.FieldType, f.GetValue(obj));
             }
 
-            ImGui.Unindent();
-
-            ImGuiHelpers.ScaledDummy(5);
-
-            ImGui.TextColored(ImGuiColors.HealerGreen, "-> Fields:");
-
-            ImGui.Indent();
-
-            foreach (var fieldInfo in type.GetFields())
+            foreach (var p in obj.GetType().GetProperties().Where(p => p.GetGetMethod()?.GetParameters().Length == 0))
             {
-                ImGui.TextColored(ImGuiColors.HealerGreen, $"    {fieldInfo.Name}: {fieldInfo.GetValue(obj)}");
+                ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.9f, 1), $"{p.PropertyType.Name}");
+                ImGui.SameLine();
+                ImGui.TextColored(new Vector4(0.2f, 0.6f, 0.4f, 1), $"{p.Name}: ");
+                ImGui.SameLine();
+
+                ShowValue(addr, new List<string>(path) { p.Name }, p.PropertyType, p.GetValue(obj));
             }
 
-            ImGui.Unindent();
+            ImGui.TreePop();
+        }
+        else
+        {
+            ImGui.PopStyleColor();
         }
 
-        /// <summary>
-        /// Display an error MessageBox and exit the current process.
-        /// </summary>
-        /// <param name="message">MessageBox body.</param>
-        /// <param name="caption">MessageBox caption (title).</param>
-        /// <param name="exit">Specify whether to exit immediately.</param>
-        public static void Fatal(string message, string caption, bool exit = true)
-        {
-            var flags = NativeFunctions.MessageBoxType.Ok | NativeFunctions.MessageBoxType.IconError | NativeFunctions.MessageBoxType.Topmost;
-            _ = NativeFunctions.MessageBoxW(Process.GetCurrentProcess().MainWindowHandle, message, caption, flags);
+        ImGui.PopStyleVar();
+    }
 
-            if (exit)
-                Environment.Exit(-1);
+    /// <summary>
+    /// Show a structure in an ImGui context.
+    /// </summary>
+    /// <typeparam name="T">The type of the structure.</typeparam>
+    /// <param name="obj">The pointer to the structure.</param>
+    /// <param name="autoExpand">Whether or not this structure should start out expanded.</param>
+    public static unsafe void ShowStruct<T>(T* obj, bool autoExpand = false) where T : unmanaged
+    {
+        ShowStruct(*obj, (ulong)&obj, autoExpand);
+    }
+
+    /// <summary>
+    /// Show a GameObject's internal data in an ImGui-context.
+    /// </summary>
+    /// <param name="go">The GameObject to show.</param>
+    /// <param name="autoExpand">Whether or not the struct should start as expanded.</param>
+    public static unsafe void ShowGameObjectStruct(GameObject go, bool autoExpand = true)
+    {
+        switch (go)
+        {
+            case BattleChara bchara:
+                ShowStruct(bchara.Struct, autoExpand);
+                break;
+            case Character chara:
+                ShowStruct(chara.Struct, autoExpand);
+                break;
+            default:
+                ShowStruct(go.Struct, autoExpand);
+                break;
         }
+    }
 
-        /// <summary>
-        /// Transform byte count to human readable format.
-        /// </summary>
-        /// <param name="bytes">Number of bytes.</param>
-        /// <returns>Human readable version.</returns>
-        public static string FormatBytes(long bytes)
+    /// <summary>
+    /// Show all properties and fields of the provided object via ImGui.
+    /// </summary>
+    /// <param name="obj">The object to show.</param>
+    public static void ShowObject(object obj)
+    {
+        var type = obj.GetType();
+
+        ImGui.Text($"Object Dump({type.Name}) for {obj}({obj.GetHashCode()})");
+
+        ImGuiHelpers.ScaledDummy(5);
+
+        ImGui.TextColored(ImGuiColors.DalamudOrange, "-> Properties:");
+
+        ImGui.Indent();
+
+        foreach (var propertyInfo in type.GetProperties().Where(p => p.GetGetMethod()?.GetParameters().Length == 0))
         {
-            string[] suffix = { "B", "KB", "MB", "GB", "TB" };
-            int i;
-            double dblSByte = bytes;
-            for (i = 0; i < suffix.Length && bytes >= 1024; i++, bytes /= 1024)
-            {
-                dblSByte = bytes / 1024.0;
-            }
-
-            return $"{dblSByte:0.00} {suffix[i]}";
-        }
-
-        /// <summary>
-        /// Retrieve a UTF8 string from a null terminated byte array.
-        /// </summary>
-        /// <param name="array">A null terminated UTF8 byte array.</param>
-        /// <returns>A UTF8 encoded string.</returns>
-        public static string GetUTF8String(byte[] array)
-        {
-            var count = 0;
-            for (; count < array.Length; count++)
-            {
-                if (array[count] == 0)
-                    break;
-            }
-
-            string text;
-            if (count == array.Length)
-            {
-                text = Encoding.UTF8.GetString(array);
-                Log.Warning($"Warning: text exceeds underlying array length ({text})");
-            }
+            var value = propertyInfo.GetValue(obj);
+            var valueType = value?.GetType();
+            if (valueType == typeof(IntPtr))
+                ImGui.TextColored(ImGuiColors.DalamudOrange, $"    {propertyInfo.Name}: 0x{value:X}");
             else
-            {
-                text = Encoding.UTF8.GetString(array, 0, count);
-            }
-
-            return text;
+                ImGui.TextColored(ImGuiColors.DalamudOrange, $"    {propertyInfo.Name}: {value}");
         }
 
-        /// <summary>
-        /// Compress a string using GZip.
-        /// </summary>
-        /// <param name="str">The input string.</param>
-        /// <returns>The compressed output bytes.</returns>
-        public static byte[] CompressString(string str)
+        ImGui.Unindent();
+
+        ImGuiHelpers.ScaledDummy(5);
+
+        ImGui.TextColored(ImGuiColors.HealerGreen, "-> Fields:");
+
+        ImGui.Indent();
+
+        foreach (var fieldInfo in type.GetFields())
         {
-            var bytes = Encoding.UTF8.GetBytes(str);
-
-            using var msi = new MemoryStream(bytes);
-            using var mso = new MemoryStream();
-            using (var gs = new GZipStream(mso, CompressionMode.Compress))
-            {
-                msi.CopyTo(gs);
-            }
-
-            return mso.ToArray();
+            ImGui.TextColored(ImGuiColors.HealerGreen, $"    {fieldInfo.Name}: {fieldInfo.GetValue(obj)}");
         }
 
-        /// <summary>
-        /// Decompress a string using GZip.
-        /// </summary>
-        /// <param name="bytes">The input bytes.</param>
-        /// <returns>The compressed output string.</returns>
-        public static string DecompressString(byte[] bytes)
+        ImGui.Unindent();
+    }
+
+    /// <summary>
+    /// Display an error MessageBox and exit the current process.
+    /// </summary>
+    /// <param name="message">MessageBox body.</param>
+    /// <param name="caption">MessageBox caption (title).</param>
+    /// <param name="exit">Specify whether to exit immediately.</param>
+    public static void Fatal(string message, string caption, bool exit = true)
+    {
+        var flags = NativeFunctions.MessageBoxType.Ok | NativeFunctions.MessageBoxType.IconError | NativeFunctions.MessageBoxType.Topmost;
+        _ = NativeFunctions.MessageBoxW(Process.GetCurrentProcess().MainWindowHandle, message, caption, flags);
+
+        if (exit)
+            Environment.Exit(-1);
+    }
+
+    /// <summary>
+    /// Transform byte count to human readable format.
+    /// </summary>
+    /// <param name="bytes">Number of bytes.</param>
+    /// <returns>Human readable version.</returns>
+    public static string FormatBytes(long bytes)
+    {
+        string[] suffix = { "B", "KB", "MB", "GB", "TB" };
+        int i;
+        double dblSByte = bytes;
+        for (i = 0; i < suffix.Length && bytes >= 1024; i++, bytes /= 1024)
         {
-            using var msi = new MemoryStream(bytes);
-            using var mso = new MemoryStream();
-            using (var gs = new GZipStream(msi, CompressionMode.Decompress))
-            {
-                gs.CopyTo(mso);
-            }
-
-            return Encoding.UTF8.GetString(mso.ToArray());
+            dblSByte = bytes / 1024.0;
         }
 
-        /// <summary>
-        /// Copy one stream to another.
-        /// </summary>
-        /// <param name="src">The source stream.</param>
-        /// <param name="dest">The destination stream.</param>
-        /// <param name="len">The maximum length to copy.</param>
-        [Obsolete("Use Stream.CopyTo() instead", true)]
-        public static void CopyTo(Stream src, Stream dest, int len = 4069)
+        return $"{dblSByte:0.00} {suffix[i]}";
+    }
+
+    /// <summary>
+    /// Retrieve a UTF8 string from a null terminated byte array.
+    /// </summary>
+    /// <param name="array">A null terminated UTF8 byte array.</param>
+    /// <returns>A UTF8 encoded string.</returns>
+    public static string GetUTF8String(byte[] array)
+    {
+        var count = 0;
+        for (; count < array.Length; count++)
         {
-            var bytes = new byte[len];
-            int cnt;
-
-            while ((cnt = src.Read(bytes, 0, bytes.Length)) != 0) dest.Write(bytes, 0, cnt);
+            if (array[count] == 0)
+                break;
         }
 
-        /// <summary>
-        /// Heuristically determine if Dalamud is running on Linux/WINE.
-        /// </summary>
-        /// <returns>Whether or not Dalamud is running on Linux/WINE.</returns>
-        public static bool IsLinux()
+        string text;
+        if (count == array.Length)
         {
-            bool Check1()
-            {
-                return EnvironmentConfiguration.XlWineOnLinux;
-            }
-
-            bool Check2()
-            {
-                var hModule = NativeFunctions.GetModuleHandleW("ntdll.dll");
-                var proc1 = NativeFunctions.GetProcAddress(hModule, "wine_get_version");
-                var proc2 = NativeFunctions.GetProcAddress(hModule, "wine_get_build_id");
-
-                return proc1 != IntPtr.Zero || proc2 != IntPtr.Zero;
-            }
-
-            bool Check3()
-            {
-                return Registry.CurrentUser.OpenSubKey(@"Software\Wine") != null ||
-                       Registry.LocalMachine.OpenSubKey(@"Software\Wine") != null;
-            }
-
-            return Check1() || Check2() || Check3();
+            text = Encoding.UTF8.GetString(array);
+            Log.Warning($"Warning: text exceeds underlying array length ({text})");
         }
-
-        /// <summary>
-        /// Open a link in the default browser.
-        /// </summary>
-        /// <param name="url">The link to open.</param>
-        public static void OpenLink(string url)
+        else
         {
-            var process = new ProcessStartInfo(url)
-            {
-                UseShellExecute = true,
-            };
-            Process.Start(process);
+            text = Encoding.UTF8.GetString(array, 0, count);
         }
 
-        /// <summary>
-        /// Dispose this object.
-        /// </summary>
-        /// <param name="obj">The object to dispose.</param>
-        /// <typeparam name="T">The type of object to dispose.</typeparam>
-        internal static void ExplicitDispose<T>(this T obj) where T : IDisposable
+        return text;
+    }
+
+    /// <summary>
+    /// Compress a string using GZip.
+    /// </summary>
+    /// <param name="str">The input string.</param>
+    /// <returns>The compressed output bytes.</returns>
+    public static byte[] CompressString(string str)
+    {
+        var bytes = Encoding.UTF8.GetBytes(str);
+
+        using var msi = new MemoryStream(bytes);
+        using var mso = new MemoryStream();
+        using (var gs = new GZipStream(mso, CompressionMode.Compress))
+        {
+            msi.CopyTo(gs);
+        }
+
+        return mso.ToArray();
+    }
+
+    /// <summary>
+    /// Decompress a string using GZip.
+    /// </summary>
+    /// <param name="bytes">The input bytes.</param>
+    /// <returns>The compressed output string.</returns>
+    public static string DecompressString(byte[] bytes)
+    {
+        using var msi = new MemoryStream(bytes);
+        using var mso = new MemoryStream();
+        using (var gs = new GZipStream(msi, CompressionMode.Decompress))
+        {
+            gs.CopyTo(mso);
+        }
+
+        return Encoding.UTF8.GetString(mso.ToArray());
+    }
+
+    /// <summary>
+    /// Copy one stream to another.
+    /// </summary>
+    /// <param name="src">The source stream.</param>
+    /// <param name="dest">The destination stream.</param>
+    /// <param name="len">The maximum length to copy.</param>
+    [Obsolete("Use Stream.CopyTo() instead", true)]
+    public static void CopyTo(Stream src, Stream dest, int len = 4069)
+    {
+        var bytes = new byte[len];
+        int cnt;
+
+        while ((cnt = src.Read(bytes, 0, bytes.Length)) != 0) dest.Write(bytes, 0, cnt);
+    }
+
+    /// <summary>
+    /// Heuristically determine if Dalamud is running on Linux/WINE.
+    /// </summary>
+    /// <returns>Whether or not Dalamud is running on Linux/WINE.</returns>
+    public static bool IsLinux()
+    {
+        bool Check1()
+        {
+            return EnvironmentConfiguration.XlWineOnLinux;
+        }
+
+        bool Check2()
+        {
+            var hModule = NativeFunctions.GetModuleHandleW("ntdll.dll");
+            var proc1 = NativeFunctions.GetProcAddress(hModule, "wine_get_version");
+            var proc2 = NativeFunctions.GetProcAddress(hModule, "wine_get_build_id");
+
+            return proc1 != IntPtr.Zero || proc2 != IntPtr.Zero;
+        }
+
+        bool Check3()
+        {
+            return Registry.CurrentUser.OpenSubKey(@"Software\Wine") != null ||
+                   Registry.LocalMachine.OpenSubKey(@"Software\Wine") != null;
+        }
+
+        return Check1() || Check2() || Check3();
+    }
+
+    /// <summary>
+    /// Open a link in the default browser.
+    /// </summary>
+    /// <param name="url">The link to open.</param>
+    public static void OpenLink(string url)
+    {
+        var process = new ProcessStartInfo(url)
+        {
+            UseShellExecute = true,
+        };
+        Process.Start(process);
+    }
+
+    /// <summary>
+    /// Dispose this object.
+    /// </summary>
+    /// <param name="obj">The object to dispose.</param>
+    /// <typeparam name="T">The type of object to dispose.</typeparam>
+    internal static void ExplicitDispose<T>(this T obj) where T : IDisposable
+    {
+        obj.Dispose();
+    }
+
+    /// <summary>
+    /// Dispose this object.
+    /// </summary>
+    /// <param name="obj">The object to dispose.</param>
+    /// <param name="logMessage">Log message to print, if specified and an error occurs.</param>
+    /// <param name="moduleLog">Module logger, if any.</param>
+    /// <typeparam name="T">The type of object to dispose.</typeparam>
+    internal static void ExplicitDisposeIgnoreExceptions<T>(this T obj, string? logMessage = null, ModuleLog? moduleLog = null) where T : IDisposable
+    {
+        try
         {
             obj.Dispose();
         }
-
-        /// <summary>
-        /// Dispose this object.
-        /// </summary>
-        /// <param name="obj">The object to dispose.</param>
-        /// <param name="logMessage">Log message to print, if specified and an error occurs.</param>
-        /// <param name="moduleLog">Module logger, if any.</param>
-        /// <typeparam name="T">The type of object to dispose.</typeparam>
-        internal static void ExplicitDisposeIgnoreExceptions<T>(this T obj, string? logMessage = null, ModuleLog? moduleLog = null) where T : IDisposable
+        catch (Exception e)
         {
-            try
-            {
-                obj.Dispose();
-            }
-            catch (Exception e)
-            {
-                if (logMessage == null)
-                    return;
+            if (logMessage == null)
+                return;
 
-                if (moduleLog != null)
-                    moduleLog.Error(e, logMessage);
-                else
-                    Log.Error(e, logMessage);
-            }
+            if (moduleLog != null)
+                moduleLog.Error(e, logMessage);
+            else
+                Log.Error(e, logMessage);
         }
+    }
 
-        private static unsafe void ShowValue(ulong addr, IEnumerable<string> path, Type type, object value)
+    private static unsafe void ShowValue(ulong addr, IEnumerable<string> path, Type type, object value)
+    {
+        if (type.IsPointer)
         {
-            if (type.IsPointer)
+            var val = (Pointer)value;
+            var unboxed = Pointer.Unbox(val);
+            if (unboxed != null)
             {
-                var val = (Pointer)value;
-                var unboxed = Pointer.Unbox(val);
-                if (unboxed != null)
+                var unboxedAddr = (ulong)unboxed;
+                ImGuiHelpers.ClickToCopyText($"{(ulong)unboxed:X}");
+                if (moduleStartAddr > 0 && unboxedAddr >= moduleStartAddr && unboxedAddr <= moduleEndAddr)
                 {
-                    var unboxedAddr = (ulong)unboxed;
-                    ImGuiHelpers.ClickToCopyText($"{(ulong)unboxed:X}");
-                    if (moduleStartAddr > 0 && unboxedAddr >= moduleStartAddr && unboxedAddr <= moduleEndAddr)
-                    {
-                        ImGui.SameLine();
-                        ImGui.PushStyleColor(ImGuiCol.Text, 0xffcbc0ff);
-                        ImGuiHelpers.ClickToCopyText($"ffxiv_dx11.exe+{unboxedAddr - moduleStartAddr:X}");
-                        ImGui.PopStyleColor();
-                    }
+                    ImGui.SameLine();
+                    ImGui.PushStyleColor(ImGuiCol.Text, 0xffcbc0ff);
+                    ImGuiHelpers.ClickToCopyText($"ffxiv_dx11.exe+{unboxedAddr - moduleStartAddr:X}");
+                    ImGui.PopStyleColor();
+                }
 
-                    try
+                try
+                {
+                    var eType = type.GetElementType();
+                    var ptrObj = SafeMemory.PtrToStructure(new IntPtr(unboxed), eType);
+                    ImGui.SameLine();
+                    if (ptrObj == null)
                     {
-                        var eType = type.GetElementType();
-                        var ptrObj = SafeMemory.PtrToStructure(new IntPtr(unboxed), eType);
-                        ImGui.SameLine();
-                        if (ptrObj == null)
-                        {
-                            ImGui.Text("null or invalid");
-                        }
-                        else
-                        {
-                            ShowStruct(ptrObj, (ulong)unboxed, path: new List<string>(path));
-                        }
+                        ImGui.Text("null or invalid");
                     }
-                    catch
+                    else
                     {
-                        // Ignored
+                        ShowStruct(ptrObj, (ulong)unboxed, path: new List<string>(path));
                     }
                 }
-                else
+                catch
                 {
-                    ImGui.Text("null");
+                    // Ignored
                 }
             }
             else
             {
-                if (!type.IsPrimitive)
-                {
-                    ShowStruct(value, addr, path: new List<string>(path));
-                }
-                else
-                {
-                    ImGui.Text($"{value}");
-                }
+                ImGui.Text("null");
+            }
+        }
+        else
+        {
+            if (!type.IsPrimitive)
+            {
+                ShowStruct(value, addr, path: new List<string>(path));
+            }
+            else
+            {
+                ImGui.Text($"{value}");
             }
         }
     }
diff --git a/Dalamud/Utility/VectorExtensions.cs b/Dalamud/Utility/VectorExtensions.cs
index 0a14299c2..f617c8420 100644
--- a/Dalamud/Utility/VectorExtensions.cs
+++ b/Dalamud/Utility/VectorExtensions.cs
@@ -1,52 +1,51 @@
 using System.Numerics;
 
-namespace Dalamud.Utility
+namespace Dalamud.Utility;
+
+/// <summary>
+/// Extension methods for System.Numerics.VectorN and SharpDX.VectorN.
+/// </summary>
+public static class VectorExtensions
 {
     /// <summary>
-    /// Extension methods for System.Numerics.VectorN and SharpDX.VectorN.
+    /// Converts a SharpDX vector to System.Numerics.
     /// </summary>
-    public static class VectorExtensions
-    {
-        /// <summary>
-        /// Converts a SharpDX vector to System.Numerics.
-        /// </summary>
-        /// <param name="vec">Vector to convert.</param>
-        /// <returns>A converted vector.</returns>
-        public static Vector2 ToSystem(this SharpDX.Vector2 vec) => new(x: vec.X, y: vec.Y);
+    /// <param name="vec">Vector to convert.</param>
+    /// <returns>A converted vector.</returns>
+    public static Vector2 ToSystem(this SharpDX.Vector2 vec) => new(x: vec.X, y: vec.Y);
 
-        /// <summary>
-        /// Converts a SharpDX vector to System.Numerics.
-        /// </summary>
-        /// <param name="vec">Vector to convert.</param>
-        /// <returns>A converted vector.</returns>
-        public static Vector3 ToSystem(this SharpDX.Vector3 vec) => new(x: vec.X, y: vec.Y, z: vec.Z);
+    /// <summary>
+    /// Converts a SharpDX vector to System.Numerics.
+    /// </summary>
+    /// <param name="vec">Vector to convert.</param>
+    /// <returns>A converted vector.</returns>
+    public static Vector3 ToSystem(this SharpDX.Vector3 vec) => new(x: vec.X, y: vec.Y, z: vec.Z);
 
-        /// <summary>
-        /// Converts a SharpDX vector to System.Numerics.
-        /// </summary>
-        /// <param name="vec">Vector to convert.</param>
-        /// <returns>A converted vector.</returns>
-        public static Vector4 ToSystem(this SharpDX.Vector4 vec) => new(x: vec.X, y: vec.Y, z: vec.Z, w: vec.W);
+    /// <summary>
+    /// Converts a SharpDX vector to System.Numerics.
+    /// </summary>
+    /// <param name="vec">Vector to convert.</param>
+    /// <returns>A converted vector.</returns>
+    public static Vector4 ToSystem(this SharpDX.Vector4 vec) => new(x: vec.X, y: vec.Y, z: vec.Z, w: vec.W);
 
-        /// <summary>
-        /// Converts a System.Numerics vector to SharpDX.
-        /// </summary>
-        /// <param name="vec">Vector to convert.</param>
-        /// <returns>A converted vector.</returns>
-        public static SharpDX.Vector2 ToSharpDX(this Vector2 vec) => new(x: vec.X, y: vec.Y);
+    /// <summary>
+    /// Converts a System.Numerics vector to SharpDX.
+    /// </summary>
+    /// <param name="vec">Vector to convert.</param>
+    /// <returns>A converted vector.</returns>
+    public static SharpDX.Vector2 ToSharpDX(this Vector2 vec) => new(x: vec.X, y: vec.Y);
 
-        /// <summary>
-        /// Converts a System.Numerics vector to SharpDX.
-        /// </summary>
-        /// <param name="vec">Vector to convert.</param>
-        /// <returns>A converted vector.</returns>
-        public static SharpDX.Vector3 ToSharpDX(this Vector3 vec) => new(x: vec.X, y: vec.Y, z: vec.Z);
+    /// <summary>
+    /// Converts a System.Numerics vector to SharpDX.
+    /// </summary>
+    /// <param name="vec">Vector to convert.</param>
+    /// <returns>A converted vector.</returns>
+    public static SharpDX.Vector3 ToSharpDX(this Vector3 vec) => new(x: vec.X, y: vec.Y, z: vec.Z);
 
-        /// <summary>
-        /// Converts a System.Numerics vector to SharpDX.
-        /// </summary>
-        /// <param name="vec">Vector to convert.</param>
-        /// <returns>A converted vector.</returns>
-        public static SharpDX.Vector4 ToSharpDX(this Vector4 vec) => new(x: vec.X, y: vec.Y, z: vec.Z, w: vec.W);
-    }
+    /// <summary>
+    /// Converts a System.Numerics vector to SharpDX.
+    /// </summary>
+    /// <param name="vec">Vector to convert.</param>
+    /// <returns>A converted vector.</returns>
+    public static SharpDX.Vector4 ToSharpDX(this Vector4 vec) => new(x: vec.X, y: vec.Y, z: vec.Z, w: vec.W);
 }