diff --git a/.editorconfig b/.editorconfig
index 0e4f800e0..0ae30cf95 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -57,12 +57,12 @@ dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
 dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
-dotnet_style_parentheses_in_arithmetic_binary_operators =always_for_clarity:suggestion
-dotnet_style_parentheses_in_other_binary_operators =always_for_clarity:suggestion
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
 dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
-dotnet_style_parentheses_in_other_operators=always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = always_for_clarity:silent
 dotnet_style_object_initializer = false
 dotnet_style_qualification_for_event = true:suggestion
 dotnet_style_qualification_for_field = true:suggestion
@@ -78,7 +78,7 @@ csharp_space_before_comma = false
 csharp_space_after_keywords_in_control_flow_statements = true
 csharp_space_after_comma = true
 csharp_space_after_cast = false
-csharp_space_around_binary_operators  = before_and_after
+csharp_space_around_binary_operators = before_and_after
 csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = none
@@ -101,7 +101,7 @@ resharper_braces_for_ifelse = required_for_multiline
 resharper_can_use_global_alias = false
 resharper_csharp_align_multiline_parameter = true
 resharper_csharp_align_multiple_declaration = true
-resharper_csharp_empty_block_style = together_same_line
+resharper_csharp_empty_block_style = multiline
 resharper_csharp_int_align_comments = true
 resharper_csharp_new_line_before_while = true
 resharper_csharp_wrap_after_declaration_lpar = true
@@ -133,13 +133,13 @@ resharper_suggest_var_or_type_built_in_types_highlighting = hint
 resharper_suggest_var_or_type_elsewhere_highlighting = hint
 resharper_suggest_var_or_type_simple_types_highlighting = hint
 resharper_unused_auto_property_accessor_global_highlighting = none
-csharp_style_deconstructed_variable_declaration=true:silent
+csharp_style_deconstructed_variable_declaration = true:silent
 
 [*.{appxmanifest,asax,ascx,aspx,axaml,axml,build,c,c++,cc,cginc,compute,config,cp,cpp,cs,cshtml,csproj,css,cu,cuh,cxx,dbml,discomap,dtd,h,hh,hlsl,hlsli,hlslinc,hpp,htm,html,hxx,inc,inl,ino,ipp,js,json,jsproj,jsx,lsproj,master,mpp,mq4,mq5,mqh,njsproj,nuspec,paml,proj,props,proto,razor,resjson,resw,resx,skin,StyleCop,targets,tasks,tpp,ts,tsx,usf,ush,vb,vbproj,xaml,xamlx,xml,xoml,xsd}]
 indent_style = space
 indent_size = 4
 tab_width = 4
-dotnet_style_parentheses_in_other_operators=always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = always_for_clarity:silent
 
 [*.{yaml,yml}]
 indent_style = space
diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs b/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
index 59f32e33d..add7a7f9f 100644
--- a/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
+++ b/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects.Enums;
 
 namespace Dalamud.Game.ClientState.Objects.Types;
@@ -25,5 +23,5 @@ public unsafe class BattleNpc : BattleChara
     public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind;
 
     /// <inheritdoc/>
-    public override ulong TargetObjectId => this.Struct->Character.TargetObjectID;
+    public override ulong TargetObjectId => this.Struct->Character.TargetId;
 }
diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs b/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
index 7fc9c0079..9de11e3ec 100644
--- a/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
+++ b/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.ClientState.Resolvers;
 
@@ -33,5 +31,5 @@ public unsafe class PlayerCharacter : BattleChara
     /// <summary>
     /// Gets the target actor ID of the PlayerCharacter.
     /// </summary>
-    public override ulong TargetObjectId => this.Struct->Character.PlayerTargetObjectID;
+    public override ulong TargetObjectId => this.Struct->Character.LookTargetId;
 }
diff --git a/Dalamud/Game/ClientState/Objects/Types/Character.cs b/Dalamud/Game/ClientState/Objects/Types/Character.cs
index ee8418362..a1eb52edc 100644
--- a/Dalamud/Game/ClientState/Objects/Types/Character.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/Character.cs
@@ -1,5 +1,3 @@
-using System;
-
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Resolvers;
 using Dalamud.Game.Text.SeStringHandling;
@@ -87,7 +85,7 @@ public unsafe class Character : GameObject
     /// <summary>
     /// Gets the target object ID of the character.
     /// </summary>
-    public override ulong TargetObjectId => this.Struct->TargetObjectID;
+    public override ulong TargetObjectId => this.Struct->TargetId;
 
     /// <summary>
     /// Gets the name ID of the character.
@@ -115,5 +113,6 @@ public unsafe class Character : GameObject
     /// <summary>
     /// Gets the underlying structure.
     /// </summary>
-    protected internal new FFXIVClientStructs.FFXIV.Client.Game.Character.Character* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)this.Address;
+    protected internal new FFXIVClientStructs.FFXIV.Client.Game.Character.Character* Struct =>
+        (FFXIVClientStructs.FFXIV.Client.Game.Character.Character*)this.Address;
 }
diff --git a/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs b/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs
index 85c6a4a39..e3ea74f2d 100644
--- a/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs
+++ b/Dalamud/Game/Gui/PartyFinder/PartyFinderGui.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Runtime.InteropServices;
-
 using Dalamud.Game.Gui.PartyFinder.Internal;
 using Dalamud.Game.Gui.PartyFinder.Types;
 using Dalamud.Hooking;
@@ -128,6 +126,9 @@ internal sealed class PartyFinderGui : IDisposable, IServiceType, IPartyFinderGu
     }
 }
 
+/// <summary>
+/// A scoped variant of the PartyFinderGui service.
+/// </summary>
 [PluginInterface]
 [InterfaceVersion("1.0")]
 [ServiceManager.ScopedService]
diff --git a/Dalamud/Interface/ColorHelpers.cs b/Dalamud/Interface/ColorHelpers.cs
index 71f959292..ad9eedaa9 100644
--- a/Dalamud/Interface/ColorHelpers.cs
+++ b/Dalamud/Interface/ColorHelpers.cs
@@ -1,4 +1,4 @@
-using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 
 namespace Dalamud.Interface;
@@ -8,6 +8,17 @@ namespace Dalamud.Interface;
 /// </summary>
 public static class ColorHelpers
 {
+    /// <summary>
+    /// A struct representing a color using HSVA coordinates.
+    /// </summary>
+    /// <param name="H">The hue represented by this struct.</param>
+    /// <param name="S">The saturation represented by this struct.</param>
+    /// <param name="V">The value represented by this struct.</param>
+    /// <param name="A">The alpha represented by this struct.</param>
+    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1313:Parameter names should begin with lower-case letter",
+                     Justification = "I don't like it.")]
+    public record struct HsvaColor(float H, float S, float V, float A);
+
     /// <summary>
     /// Pack a vector4 color into a uint for use in ImGui APIs.
     /// </summary>
@@ -22,7 +33,7 @@ public static class ColorHelpers
 
         return (uint)((a << 24) | (b << 16) | (g << 8) | r);
     }
-    
+
     /// <summary>
     /// Convert a RGBA color in the range of 0.f to 1.f to a uint.
     /// </summary>
@@ -37,7 +48,7 @@ public static class ColorHelpers
 
         return new Vector4(r, g, b, a);
     }
-    
+
     /// <summary>
     /// Convert a RGBA color in the range of 0.f to 1.f to a HSV color.
     /// </summary>
@@ -146,7 +157,7 @@ public static class ColorHelpers
 
         return new Vector4(r, g, b, hsv.A);
     }
-    
+
     /// <summary>
     /// Lighten a color.
     /// </summary>
@@ -159,7 +170,7 @@ public static class ColorHelpers
         hsv.V += amount;
         return HsvToRgb(hsv);
     }
-    
+
     /// <summary>
     /// Lighten a color.
     /// </summary>
@@ -168,7 +179,7 @@ public static class ColorHelpers
     /// <returns>The lightened color.</returns>
     public static uint Lighten(uint color, float amount)
         => RgbaVector4ToUint(Lighten(RgbaUintToVector4(color), amount));
-    
+
     /// <summary>
     /// Darken a color.
     /// </summary>
@@ -181,7 +192,7 @@ public static class ColorHelpers
         hsv.V -= amount;
         return HsvToRgb(hsv);
     }
-    
+
     /// <summary>
     /// Darken a color.
     /// </summary>
@@ -190,7 +201,7 @@ public static class ColorHelpers
     /// <returns>The darkened color.</returns>
     public static uint Darken(uint color, float amount)
         => RgbaVector4ToUint(Darken(RgbaUintToVector4(color), amount));
-    
+
     /// <summary>
     /// Saturate a color.
     /// </summary>
@@ -203,7 +214,7 @@ public static class ColorHelpers
         hsv.S += amount;
         return HsvToRgb(hsv);
     }
-    
+
     /// <summary>
     /// Saturate a color.
     /// </summary>
@@ -212,7 +223,7 @@ public static class ColorHelpers
     /// <returns>The saturated color.</returns>
     public static uint Saturate(uint color, float amount)
         => RgbaVector4ToUint(Saturate(RgbaUintToVector4(color), amount));
-    
+
     /// <summary>
     /// Desaturate a color.
     /// </summary>
@@ -225,7 +236,7 @@ public static class ColorHelpers
         hsv.S -= amount;
         return HsvToRgb(hsv);
     }
-    
+
     /// <summary>
     /// Desaturate a color.
     /// </summary>
@@ -234,7 +245,7 @@ public static class ColorHelpers
     /// <returns>The desaturated color.</returns>
     public static uint Desaturate(uint color, float amount)
         => RgbaVector4ToUint(Desaturate(RgbaUintToVector4(color), amount));
-    
+
     /// <summary>
     /// Fade a color.
     /// </summary>
@@ -247,7 +258,7 @@ public static class ColorHelpers
         hsv.A -= amount;
         return HsvToRgb(hsv);
     }
-    
+
     /// <summary>
     /// Fade a color.
     /// </summary>
@@ -256,6 +267,4 @@ public static class ColorHelpers
     /// <returns>The faded color.</returns>
     public static uint Fade(uint color, float amount)
         => RgbaVector4ToUint(Fade(RgbaUintToVector4(color), amount));
-    
-    public record struct HsvaColor(float H, float S, float V, float A);
 }
diff --git a/Dalamud/Plugin/Services/IPluginLog.cs b/Dalamud/Plugin/Services/IPluginLog.cs
index 87876f36f..62f9e8728 100644
--- a/Dalamud/Plugin/Services/IPluginLog.cs
+++ b/Dalamud/Plugin/Services/IPluginLog.cs
@@ -1,8 +1,8 @@
-using System;
-
-using Serilog;
+using Serilog;
 using Serilog.Events;
 
+#pragma warning disable CS1573 // See https://github.com/dotnet/roslyn/issues/40325
+
 namespace Dalamud.Plugin.Services;
 
 /// <summary>
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index 7279a8f3c..06e3ca233 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit 7279a8f3ca6b79490184b05532af509781a89415
+Subproject commit 06e3ca2336031ba86ef95d022a2af722e5d00a7e