diff --git a/Glamourer.Api b/Glamourer.Api
index 3bfd1db..7b7ab85 160000
--- a/Glamourer.Api
+++ b/Glamourer.Api
@@ -1 +1 @@
-Subproject commit 3bfd1db3a471f6e808c4d981485a08f58a4bf6cd
+Subproject commit 7b7ab85941f4ad0ddb950cddb26d771933a17869
diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index dd65eb1..e44535b 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Dalamud.NET.Sdk/14.0.0">
+<Project Sdk="Dalamud.NET.Sdk/15.0.0">
   <PropertyGroup>
     <AssemblyName>ClubPenguinSync</AssemblyName>
     <Version>1.7.1.6</Version>
     <PackageProjectUrl>https://github.com/Rawrington/ClubPenguinSync/</PackageProjectUrl>
+	<LangVersion>latest</LangVersion> 
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MareSynchronos/Services/DalamudUtilService.cs b/MareSynchronos/Services/DalamudUtilService.cs
index ce44ffc..0c80341 100644
--- a/MareSynchronos/Services/DalamudUtilService.cs
+++ b/MareSynchronos/Services/DalamudUtilService.cs
@@ -57,7 +57,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     private DateTime _delayedFrameworkUpdateCheck = DateTime.UtcNow;
     private string _lastGlobalBlockPlayer = string.Empty;
     private string _lastGlobalBlockReason = string.Empty;
-    private ushort _lastZone = 0;
+    private uint _lastZone = 0;
     private readonly Dictionary<string, PlayerCharacter> _playerCharas = new(StringComparer.Ordinal);
     private readonly List<string> _notUpdatedCharas = [];
     private bool _sentBetweenAreas = false;
@@ -206,7 +206,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
     {
         EnsureIsOnFramework();
         var objTableObj = _objectTable[index];
-        if (objTableObj!.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player) return null;
+        if (objTableObj!.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Pc) return null;
         return (Dalamud.Game.ClientState.Objects.Types.ICharacter)objTableObj;
     }
 
@@ -238,7 +238,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
 
     public IEnumerable<ICharacter?> GetGposeCharactersFromObjectTable()
     {
-        return _objectTable.Where(o => o.ObjectIndex > 200 && o.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player).Cast<ICharacter>();
+        return _objectTable.Where(o => o.ObjectIndex > 200 && o.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Pc).Cast<ICharacter>();
     }
 
     public bool GetIsPlayerPresent()
@@ -657,7 +657,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber
                     for (int i = 0; i < 200; i += 2)
                     {
                         var chara = _objectTable[i];
-                        if (chara == null || chara.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player)
+                        if (chara == null || chara.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Pc)
                             continue;
 
                         if (_blockedCharacterHandler.IsCharacterBlocked(chara.Address, out bool firstTime) && firstTime)
diff --git a/MareSynchronos/UI/SettingsUi.cs b/MareSynchronos/UI/SettingsUi.cs
index bd28345..db247f9 100644
--- a/MareSynchronos/UI/SettingsUi.cs
+++ b/MareSynchronos/UI/SettingsUi.cs
@@ -4,6 +4,7 @@ using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility;
 using Dalamud.Interface.Utility.Raii;
+using Dalamud.Interface.Windowing;
 using Dalamud.Utility;
 using MareSynchronos.API.Data;
 using MareSynchronos.API.Data.Comparer;
diff --git a/Penumbra.Api b/Penumbra.Api
index e4934cc..3141bb9 160000
--- a/Penumbra.Api
+++ b/Penumbra.Api
@@ -1 +1 @@
-Subproject commit e4934ccca0379f22dadf989ab2d34f30b3c5c7ea
+Subproject commit 3141bb976c61b007af5e2379f1f5dbfe1c973ded