diff --git a/ARControl/ARControl.csproj b/ARControl/ARControl.csproj
index 45ee9cc..d37eca0 100644
--- a/ARControl/ARControl.csproj
+++ b/ARControl/ARControl.csproj
@@ -1,65 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Dalamud.NET.Sdk/9.0.2">
     <PropertyGroup>
-        <TargetFramework>net8.0-windows</TargetFramework>
-        <Version>4.2</Version>
-        <LangVersion>12</LangVersion>
-        <Nullable>enable</Nullable>
-        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+        <Version>5.0</Version>
         <OutputPath>dist</OutputPath>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <DebugType>portable</DebugType>
-        <PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
-        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
-        <DalamudLibPath>$(DALAMUD_HOME)/</DalamudLibPath>
-    </PropertyGroup>
+    <Import Project="..\LLib\LLib.targets"/>
+    <Import Project="..\LLib\RenameZip.targets"/>
 
     <ItemGroup>
         <ProjectReference Include="..\AutoRetainerAPI\AutoRetainerAPI\AutoRetainerAPI.csproj" />
         <ProjectReference Include="..\LLib\LLib.csproj"/>
     </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="DalamudPackager" Version="2.1.12"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <Reference Include="Dalamud">
-            <HintPath>$(DalamudLibPath)Dalamud.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="ImGui.NET">
-            <HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="Lumina">
-            <HintPath>$(DalamudLibPath)Lumina.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="Lumina.Excel">
-            <HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="Newtonsoft.Json">
-            <HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="FFXIVClientStructs">
-            <HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
-            <Private>false</Private>
-        </Reference>
-    </ItemGroup>
-
-
-    <Target Name="RenameLatestZip" AfterTargets="PackagePlugin">
-        <Exec Command="rename $(OutDir)$(AssemblyName)\latest.zip $(AssemblyName)-$(Version).zip"/>
-    </Target>
 </Project>
diff --git a/ARControl/AutoRetainerControlPlugin.cs b/ARControl/AutoRetainerControlPlugin.cs
index 96e51d4..21a498e 100644
--- a/ARControl/AutoRetainerControlPlugin.cs
+++ b/ARControl/AutoRetainerControlPlugin.cs
@@ -26,7 +26,7 @@ public sealed partial class AutoRetainerControlPlugin : IDalamudPlugin
     private const int QuickVentureId = 395;
     private readonly WindowSystem _windowSystem = new(nameof(AutoRetainerControlPlugin));
 
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly IClientState _clientState;
     private readonly IChatGui _chatGui;
     private readonly ICommandManager _commandManager;
@@ -41,7 +41,7 @@ public sealed partial class AutoRetainerControlPlugin : IDalamudPlugin
     private readonly AutoRetainerApi _autoRetainerApi;
     private readonly AutoRetainerReflection _autoRetainerReflection;
 
-    public AutoRetainerControlPlugin(DalamudPluginInterface pluginInterface, IDataManager dataManager,
+    public AutoRetainerControlPlugin(IDalamudPluginInterface pluginInterface, IDataManager dataManager,
         IClientState clientState, IChatGui chatGui, ICommandManager commandManager, ITextureProvider textureProvider,
         IFramework framework, IPluginLog pluginLog)
     {
diff --git a/ARControl/External/AllaganToolsIpc.cs b/ARControl/External/AllaganToolsIpc.cs
index 9885732..fc8f0f2 100644
--- a/ARControl/External/AllaganToolsIpc.cs
+++ b/ARControl/External/AllaganToolsIpc.cs
@@ -25,7 +25,7 @@ internal sealed class AllaganToolsIpc
 
     private readonly ICallGateSubscriber<uint, bool, uint[], uint> _itemCountOwned;
 
-    public AllaganToolsIpc(DalamudPluginInterface pluginInterface, IPluginLog pluginLog)
+    public AllaganToolsIpc(IDalamudPluginInterface pluginInterface, IPluginLog pluginLog)
     {
         _pluginLog = pluginLog;
         _itemCountOwned = pluginInterface.GetIpcSubscriber<uint, bool, uint[], uint>("AllaganTools.ItemCountOwned");
diff --git a/ARControl/External/AutoRetainerReflection.cs b/ARControl/External/AutoRetainerReflection.cs
index 26d80a7..d5ff083 100644
--- a/ARControl/External/AutoRetainerReflection.cs
+++ b/ARControl/External/AutoRetainerReflection.cs
@@ -14,7 +14,7 @@ namespace ARControl.External
         private readonly AutoRetainerApi _autoRetainerApi;
         private readonly DalamudReflector _reflector;
 
-        public AutoRetainerReflection(DalamudPluginInterface pluginInterface, IFramework framework,
+        public AutoRetainerReflection(IDalamudPluginInterface pluginInterface, IFramework framework,
             IPluginLog pluginLog, AutoRetainerApi autoRetainerApi)
         {
             _pluginLog = pluginLog;
diff --git a/ARControl/External/DiscardHelperIpc.cs b/ARControl/External/DiscardHelperIpc.cs
index 7b67856..ab0946a 100644
--- a/ARControl/External/DiscardHelperIpc.cs
+++ b/ARControl/External/DiscardHelperIpc.cs
@@ -10,7 +10,7 @@ internal sealed class DiscardHelperIpc
 {
     private readonly ICallGateSubscriber<IReadOnlySet<uint>> _itemsToDiscard;
 
-    public DiscardHelperIpc(DalamudPluginInterface pluginInterface)
+    public DiscardHelperIpc(IDalamudPluginInterface pluginInterface)
     {
         _itemsToDiscard = pluginInterface.GetIpcSubscriber<IReadOnlySet<uint>>("ARDiscard.GetItemsToDiscard");
     }
diff --git a/ARControl/Windows/ConfigWindow.cs b/ARControl/Windows/ConfigWindow.cs
index d982b0a..0f0bd73 100644
--- a/ARControl/Windows/ConfigWindow.cs
+++ b/ARControl/Windows/ConfigWindow.cs
@@ -11,7 +11,7 @@ using Dalamud.Game.Text;
 using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Components;
-using Dalamud.Interface.Internal;
+using Dalamud.Interface.Textures.TextureWraps;
 using Dalamud.Interface.Utility;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
@@ -40,7 +40,7 @@ internal sealed class ConfigWindow : LWindow
     private static readonly string CurrentCharPrefix = FontAwesomeIcon.Male.ToIconString();
     private static readonly string DiscardWarningPrefix = FontAwesomeIcon.ExclamationCircle.ToIconString();
 
-    private readonly DalamudPluginInterface _pluginInterface;
+    private readonly IDalamudPluginInterface _pluginInterface;
     private readonly Configuration _configuration;
     private readonly GameCache _gameCache;
     private readonly IClientState _clientState;
@@ -63,7 +63,7 @@ internal sealed class ConfigWindow : LWindow
     };
 
     public ConfigWindow(
-        DalamudPluginInterface pluginInterface,
+        IDalamudPluginInterface pluginInterface,
         Configuration configuration,
         GameCache gameCache,
         IClientState clientState,
@@ -352,6 +352,8 @@ internal sealed class ConfigWindow : LWindow
                     ImGui.Image(icon.ImGuiHandle, new Vector2(23, 23));
                     ImGui.SameLine();
                     ImGui.SetCursorPosY(ImGui.GetCursorPosY() + 3);
+
+                    icon.Dispose();
                 }
 
                 bool addThis = ImGui.Selectable(
diff --git a/ARControl/packages.lock.json b/ARControl/packages.lock.json
index 119461b..d7dd5bc 100644
--- a/ARControl/packages.lock.json
+++ b/ARControl/packages.lock.json
@@ -4,9 +4,77 @@
     "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.12, )",
-        "resolved": "2.1.12",
-        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
+        "requested": "[2.1.13, )",
+        "resolved": "2.1.13",
+        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
+      },
+      "DotNet.ReproducibleBuilds": {
+        "type": "Direct",
+        "requested": "[1.1.1, )",
+        "resolved": "1.1.1",
+        "contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==",
+        "dependencies": {
+          "Microsoft.SourceLink.AzureRepos.Git": "1.1.1",
+          "Microsoft.SourceLink.Bitbucket.Git": "1.1.1",
+          "Microsoft.SourceLink.GitHub": "1.1.1",
+          "Microsoft.SourceLink.GitLab": "1.1.1"
+        }
+      },
+      "Microsoft.SourceLink.Gitea": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "KOBodmDnlWGIqZt2hT47Q69TIoGhIApDVLCyyj9TT5ct8ju16AbHYcB4XeknoHX562wO1pMS/1DfBIZK+V+sxg==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "8.0.0",
+          "Microsoft.SourceLink.Common": "8.0.0"
+        }
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
+      "Microsoft.SourceLink.AzureRepos.Git": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "Microsoft.SourceLink.Bitbucket.Git": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
+      },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "Microsoft.SourceLink.GitLab": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
       },
       "autoretainerapi": {
         "type": "Project",
@@ -18,7 +86,10 @@
         "type": "Project"
       },
       "llib": {
-        "type": "Project"
+        "type": "Project",
+        "dependencies": {
+          "DalamudPackager": "[2.1.13, )"
+        }
       }
     }
   }
diff --git a/AutoRetainerAPI b/AutoRetainerAPI
index 6f0aaa5..a63c8e7 160000
--- a/AutoRetainerAPI
+++ b/AutoRetainerAPI
@@ -1 +1 @@
-Subproject commit 6f0aaa55bce6ec79fd4d72f84f21597b39e5445d
+Subproject commit a63c8e7154e272374ffa03d5c801736d4229e38a
diff --git a/ECommons b/ECommons
index 6c6e6db..677e28c 160000
--- a/ECommons
+++ b/ECommons
@@ -1 +1 @@
-Subproject commit 6c6e6db85dcb28a6bdc3a69fd69f4eef6a8598cf
+Subproject commit 677e28c0696eb13351d90d13ff27adb667b2c862
diff --git a/LLib b/LLib
index 3792244..93fac6e 160000
--- a/LLib
+++ b/LLib
@@ -1 +1 @@
-Subproject commit 3792244261a9f5426a7916f5a6dd1966238ba84a
+Subproject commit 93fac6efb01a1272192d929fd863328271512ea4