diff --git a/AutoRetainerAPI b/AutoRetainerAPI
index a63c8e7..069cf98 160000
--- a/AutoRetainerAPI
+++ b/AutoRetainerAPI
@@ -1 +1 @@
-Subproject commit a63c8e7154e272374ffa03d5c801736d4229e38a
+Subproject commit 069cf988b5da8657bc13ade73bfcbc2675601023
diff --git a/ECommons b/ECommons
index 11fd2f0..974a0ef 160000
--- a/ECommons
+++ b/ECommons
@@ -1 +1 @@
-Subproject commit 11fd2f06e1374e846e1aada06071da5fc7ef697a
+Subproject commit 974a0ef35536b7f0a10a278539f7136d6966baa3
diff --git a/KitchenSink.sln.DotSettings b/KitchenSink.sln.DotSettings
new file mode 100644
index 0000000..69b1c96
--- /dev/null
+++ b/KitchenSink.sln.DotSettings
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=AutoRetainerAPI/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=ECommons/@EntryIndexedValue">ExplicitlyExcluded</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/KitchenSink/Commands/CharacterSwitch.cs b/KitchenSink/Commands/CharacterSwitch.cs
index a0d60be..a5ebcdb 100644
--- a/KitchenSink/Commands/CharacterSwitch.cs
+++ b/KitchenSink/Commands/CharacterSwitch.cs
@@ -10,6 +10,7 @@ using Dalamud.Game.Text;
 using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Plugin.Ipc.Exceptions;
 using Dalamud.Plugin.Services;
+using FFXIVClientStructs.FFXIV.Client.System.Input;
 using FFXIVClientStructs.FFXIV.Client.UI;
 
 namespace KitchenSink.Commands;
@@ -55,13 +56,13 @@ internal sealed class CharacterSwitch : IDisposable
         {
             unsafe
             {
-                uint? homeWorldId = _clientState.LocalPlayer?.HomeWorld.Id;
-                uint? currentWorldId = _clientState.LocalPlayer?.CurrentWorld.Id;
+                uint? homeWorldId = _clientState.LocalPlayer?.HomeWorld.RowId;
+                uint? currentWorldId = _clientState.LocalPlayer?.CurrentWorld.RowId;
                 if (homeWorldId == currentWorldId)
                 {
                     UIInputData* uiInputData = UIInputData.Instance();
                     MouseButtonFlags mouseButtonFlags =
-                        uiInputData != null ? uiInputData->MouseButtonReleasedFlags : MouseButtonFlags.LBUTTON;
+                        uiInputData != null ? uiInputData->CursorInputs.MouseButtonReleasedFlags : MouseButtonFlags.LBUTTON;
                     var target = FindCharacter(mouseButtonFlags.HasFlag(MouseButtonFlags.RBUTTON) ? -1 : 1);
                     SwitchCharacter(target);
                 }
@@ -196,8 +197,8 @@ internal sealed class CharacterSwitch : IDisposable
 
         try
         {
-            string? currentWorld = _clientState.LocalPlayer?.CurrentWorld.GameData?.Name?.ToString();
-            string? homeWorld = _clientState.LocalPlayer?.HomeWorld.GameData?.Name?.ToString();
+            string? currentWorld = _clientState.LocalPlayer?.CurrentWorld.Value.Name.ToString();
+            string? homeWorld = _clientState.LocalPlayer?.HomeWorld.Value.Name.ToString();
             var characterIds = _autoRetainerApi.GetRegisteredCharacters() ?? new();
             var characterIdsOnHomeWorld = characterIds
                 .Where(x => _autoRetainerApi.GetOfflineCharacterData(x)?.World == homeWorld).ToList();
diff --git a/KitchenSink/Commands/DropboxQueue.cs b/KitchenSink/Commands/DropboxQueue.cs
index 5c5b3d7..0bbadd0 100644
--- a/KitchenSink/Commands/DropboxQueue.cs
+++ b/KitchenSink/Commands/DropboxQueue.cs
@@ -240,12 +240,12 @@ internal sealed class DropboxQueue : IDisposable
                     if (item->Flags.HasFlag(InventoryItem.ItemFlags.HighQuality))
                         itemCount = itemCount with
                         {
-                            HighQualityQuantity = itemCount.HighQualityQuantity + (int)item->Quantity
+                            HighQualityQuantity = itemCount.HighQualityQuantity + item->Quantity
                         };
                     else
                         itemCount = itemCount with
                         {
-                            NormalQualityQuantity = itemCount.NormalQualityQuantity + (int)item->Quantity
+                            NormalQualityQuantity = itemCount.NormalQualityQuantity + item->Quantity
                         };
 
                     allItems[item->ItemId] = itemCount;
diff --git a/KitchenSink/KitchenSink.csproj b/KitchenSink/KitchenSink.csproj
index ff00793..6ac1de3 100644
--- a/KitchenSink/KitchenSink.csproj
+++ b/KitchenSink/KitchenSink.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Dalamud.NET.Sdk/9.0.2">
+<Project Sdk="Dalamud.NET.Sdk/11.0.0">
     <PropertyGroup>
-        <Version>1.2</Version>
+        <Version>2.0</Version>
         <OutputPath>dist</OutputPath>
     </PropertyGroup>
 
diff --git a/KitchenSink/packages.lock.json b/KitchenSink/packages.lock.json
index 21e8554..9b01336 100644
--- a/KitchenSink/packages.lock.json
+++ b/KitchenSink/packages.lock.json
@@ -4,9 +4,9 @@
     "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.13, )",
-        "resolved": "2.1.13",
-        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
+        "requested": "[11.0.0, )",
+        "resolved": "11.0.0",
+        "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
       },
       "DotNet.ReproducibleBuilds": {
         "type": "Direct",
@@ -88,7 +88,7 @@
       "llib": {
         "type": "Project",
         "dependencies": {
-          "DalamudPackager": "[2.1.13, )"
+          "DalamudPackager": "[11.0.0, )"
         }
       }
     }
diff --git a/LLib b/LLib
index 93fac6e..e4bbc05 160000
--- a/LLib
+++ b/LLib
@@ -1 +1 @@
-Subproject commit 93fac6efb01a1272192d929fd863328271512ea4
+Subproject commit e4bbc05ede6f6f01e7028b24614ed8cb333e909c