diff --git a/Glamourer/Api/ApiHelpers.cs b/Glamourer/Api/ApiHelpers.cs
index 238d349..45d84b9 100644
--- a/Glamourer/Api/ApiHelpers.cs
+++ b/Glamourer/Api/ApiHelpers.cs
@@ -2,6 +2,7 @@
 using Glamourer.Designs;
 using Glamourer.State;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Services;
 using Penumbra.GameData.Actors;
diff --git a/Glamourer/Automation/AutoDesignManager.cs b/Glamourer/Automation/AutoDesignManager.cs
index 6635a89..7a4511b 100644
--- a/Glamourer/Automation/AutoDesignManager.cs
+++ b/Glamourer/Automation/AutoDesignManager.cs
@@ -10,6 +10,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Filesystem;
 using Penumbra.GameData.Actors;
 using Penumbra.GameData.Enums;
diff --git a/Glamourer/Configuration.cs b/Glamourer/Configuration.cs
index b1b9ec2..4339186 100644
--- a/Glamourer/Configuration.cs
+++ b/Glamourer/Configuration.cs
@@ -8,6 +8,7 @@ using Glamourer.Services;
 using Newtonsoft.Json;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Filesystem;
 using OtterGui.Widgets;
 using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
diff --git a/Glamourer/Designs/DesignBase64Migration.cs b/Glamourer/Designs/DesignBase64Migration.cs
index cab9e27..8cd137f 100644
--- a/Glamourer/Designs/DesignBase64Migration.cs
+++ b/Glamourer/Designs/DesignBase64Migration.cs
@@ -1,6 +1,7 @@
 using Glamourer.Api.Enums;
 using Glamourer.Services;
 using OtterGui;
+using OtterGui.Extensions;
 using Penumbra.GameData.DataContainers;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;
diff --git a/Glamourer/Designs/DesignColors.cs b/Glamourer/Designs/DesignColors.cs
index 96592bf..172e10f 100644
--- a/Glamourer/Designs/DesignColors.cs
+++ b/Glamourer/Designs/DesignColors.cs
@@ -8,6 +8,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 
 namespace Glamourer.Designs;
 
diff --git a/Glamourer/Designs/DesignManager.cs b/Glamourer/Designs/DesignManager.cs
index ef01e98..fff9565 100644
--- a/Glamourer/Designs/DesignManager.cs
+++ b/Glamourer/Designs/DesignManager.cs
@@ -8,7 +8,7 @@ using Glamourer.Interop.Penumbra;
 using Glamourer.Services;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using OtterGui;
+using OtterGui.Extensions;
 using Penumbra.GameData.DataContainers;
 using Penumbra.GameData.Enums;
 
diff --git a/Glamourer/Designs/Links/DesignLinkLoader.cs b/Glamourer/Designs/Links/DesignLinkLoader.cs
index fc7a26d..24138a8 100644
--- a/Glamourer/Designs/Links/DesignLinkLoader.cs
+++ b/Glamourer/Designs/Links/DesignLinkLoader.cs
@@ -1,6 +1,6 @@
 using Dalamud.Interface.ImGuiNotification;
-using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Services;
 using Notification = OtterGui.Classes.Notification;
 
diff --git a/Glamourer/GameData/CustomizeSet.cs b/Glamourer/GameData/CustomizeSet.cs
index d0193aa..8795c19 100644
--- a/Glamourer/GameData/CustomizeSet.cs
+++ b/Glamourer/GameData/CustomizeSet.cs
@@ -1,4 +1,5 @@
 using OtterGui;
+using OtterGui.Extensions;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;
 using Race = Penumbra.GameData.Enums.Race;
diff --git a/Glamourer/Gui/Customization/CustomizationDrawer.Icon.cs b/Glamourer/Gui/Customization/CustomizationDrawer.Icon.cs
index 486fdb4..eabb6f0 100644
--- a/Glamourer/Gui/Customization/CustomizationDrawer.Icon.cs
+++ b/Glamourer/Gui/Customization/CustomizationDrawer.Icon.cs
@@ -3,6 +3,7 @@ using Glamourer.GameData;
 using Glamourer.Unlocks;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;
diff --git a/Glamourer/Gui/DesignCombo.cs b/Glamourer/Gui/DesignCombo.cs
index dccfa44..a871cf1 100644
--- a/Glamourer/Gui/DesignCombo.cs
+++ b/Glamourer/Gui/DesignCombo.cs
@@ -8,6 +8,7 @@ using Glamourer.Events;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Widgets;
 
diff --git a/Glamourer/Gui/Equipment/BonusItemCombo.cs b/Glamourer/Gui/Equipment/BonusItemCombo.cs
index c333a87..892d9f1 100644
--- a/Glamourer/Gui/Equipment/BonusItemCombo.cs
+++ b/Glamourer/Gui/Equipment/BonusItemCombo.cs
@@ -5,6 +5,7 @@ using ImGuiNET;
 using Lumina.Excel.Sheets;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Raii;
 using OtterGui.Widgets;
diff --git a/Glamourer/Gui/Equipment/EquipmentDrawer.cs b/Glamourer/Gui/Equipment/EquipmentDrawer.cs
index 2bd84e7..0d2e8dc 100644
--- a/Glamourer/Gui/Equipment/EquipmentDrawer.cs
+++ b/Glamourer/Gui/Equipment/EquipmentDrawer.cs
@@ -8,6 +8,7 @@ using Glamourer.Services;
 using Glamourer.Unlocks;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Text;
 using OtterGui.Text.EndObjects;
diff --git a/Glamourer/Gui/Equipment/ItemCombo.cs b/Glamourer/Gui/Equipment/ItemCombo.cs
index f7c75e1..14f2e8a 100644
--- a/Glamourer/Gui/Equipment/ItemCombo.cs
+++ b/Glamourer/Gui/Equipment/ItemCombo.cs
@@ -3,8 +3,8 @@ using Glamourer.Services;
 using Glamourer.Unlocks;
 using ImGuiNET;
 using Lumina.Excel.Sheets;
-using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Raii;
 using OtterGui.Text;
diff --git a/Glamourer/Gui/Equipment/WeaponCombo.cs b/Glamourer/Gui/Equipment/WeaponCombo.cs
index 37d9d3c..e96f721 100644
--- a/Glamourer/Gui/Equipment/WeaponCombo.cs
+++ b/Glamourer/Gui/Equipment/WeaponCombo.cs
@@ -3,6 +3,7 @@ using Glamourer.Unlocks;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Raii;
 using OtterGui.Text;
diff --git a/Glamourer/Gui/Tabs/AutomationTab/HumanNpcCombo.cs b/Glamourer/Gui/Tabs/AutomationTab/HumanNpcCombo.cs
index 530e04a..8a08437 100644
--- a/Glamourer/Gui/Tabs/AutomationTab/HumanNpcCombo.cs
+++ b/Glamourer/Gui/Tabs/AutomationTab/HumanNpcCombo.cs
@@ -3,6 +3,7 @@ using Dalamud.Utility;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Custom;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Widgets;
 using Penumbra.GameData.DataContainers;
diff --git a/Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs b/Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs
index 7f576b3..1600837 100644
--- a/Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs
+++ b/Glamourer/Gui/Tabs/AutomationTab/SetPanel.cs
@@ -8,6 +8,7 @@ using Glamourer.Services;
 using Glamourer.Unlocks;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Log;
 using OtterGui.Raii;
 using OtterGui.Text;
diff --git a/Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs b/Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs
index 09ee6aa..96730e8 100644
--- a/Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs
+++ b/Glamourer/Gui/Tabs/AutomationTab/SetSelector.cs
@@ -5,6 +5,7 @@ using Glamourer.Events;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using Penumbra.GameData.Interop;
 using Penumbra.String;
diff --git a/Glamourer/Gui/Tabs/DebugTab/AutoDesignPanel.cs b/Glamourer/Gui/Tabs/DebugTab/AutoDesignPanel.cs
index 98b7d9e..df39f45 100644
--- a/Glamourer/Gui/Tabs/DebugTab/AutoDesignPanel.cs
+++ b/Glamourer/Gui/Tabs/DebugTab/AutoDesignPanel.cs
@@ -1,6 +1,7 @@
 using Glamourer.Automation;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using Penumbra.GameData.Gui.Debug;
 
diff --git a/Glamourer/Gui/Tabs/DebugTab/DesignManagerPanel.cs b/Glamourer/Gui/Tabs/DebugTab/DesignManagerPanel.cs
index b562ecf..ede3e9e 100644
--- a/Glamourer/Gui/Tabs/DebugTab/DesignManagerPanel.cs
+++ b/Glamourer/Gui/Tabs/DebugTab/DesignManagerPanel.cs
@@ -2,6 +2,7 @@
 using Glamourer.Designs;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Gui.Debug;
diff --git a/Glamourer/Gui/Tabs/DebugTab/DesignTesterPanel.cs b/Glamourer/Gui/Tabs/DebugTab/DesignTesterPanel.cs
index c893f4c..26be8ce 100644
--- a/Glamourer/Gui/Tabs/DebugTab/DesignTesterPanel.cs
+++ b/Glamourer/Gui/Tabs/DebugTab/DesignTesterPanel.cs
@@ -3,6 +3,7 @@ using Glamourer.Designs;
 using Glamourer.Services;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using Penumbra.GameData.DataContainers;
 using Penumbra.GameData.Enums;
diff --git a/Glamourer/Gui/Tabs/DebugTab/GlamourPlatePanel.cs b/Glamourer/Gui/Tabs/DebugTab/GlamourPlatePanel.cs
index 100cc9c..aafc21a 100644
--- a/Glamourer/Gui/Tabs/DebugTab/GlamourPlatePanel.cs
+++ b/Glamourer/Gui/Tabs/DebugTab/GlamourPlatePanel.cs
@@ -7,6 +7,7 @@ using Glamourer.Services;
 using Glamourer.State;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Text;
 using Penumbra.GameData;
 using Penumbra.GameData.Enums;
diff --git a/Glamourer/Gui/Tabs/DesignTab/DesignColorCombo.cs b/Glamourer/Gui/Tabs/DesignTab/DesignColorCombo.cs
index e59be09..9444ff7 100644
--- a/Glamourer/Gui/Tabs/DesignTab/DesignColorCombo.cs
+++ b/Glamourer/Gui/Tabs/DesignTab/DesignColorCombo.cs
@@ -1,6 +1,7 @@
 using Glamourer.Designs;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Widgets;
 
diff --git a/Glamourer/Gui/Tabs/DesignTab/ModAssociationsTab.cs b/Glamourer/Gui/Tabs/DesignTab/ModAssociationsTab.cs
index 80000d9..bab25f0 100644
--- a/Glamourer/Gui/Tabs/DesignTab/ModAssociationsTab.cs
+++ b/Glamourer/Gui/Tabs/DesignTab/ModAssociationsTab.cs
@@ -8,6 +8,7 @@ using Glamourer.State;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Text;
 using OtterGui.Text.Widget;
diff --git a/Glamourer/Gui/Tabs/DesignTab/MultiDesignPanel.cs b/Glamourer/Gui/Tabs/DesignTab/MultiDesignPanel.cs
index 2a5b3e1..3567fb6 100644
--- a/Glamourer/Gui/Tabs/DesignTab/MultiDesignPanel.cs
+++ b/Glamourer/Gui/Tabs/DesignTab/MultiDesignPanel.cs
@@ -4,6 +4,7 @@ using Glamourer.Designs;
 using Glamourer.Interop.Material;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using OtterGui.Text;
 using static Glamourer.Gui.Tabs.HeaderDrawer;
diff --git a/Glamourer/Gui/Tabs/NpcTab/NpcSelector.cs b/Glamourer/Gui/Tabs/NpcTab/NpcSelector.cs
index b3f0cef..847b65e 100644
--- a/Glamourer/Gui/Tabs/NpcTab/NpcSelector.cs
+++ b/Glamourer/Gui/Tabs/NpcTab/NpcSelector.cs
@@ -1,6 +1,7 @@
 using Glamourer.GameData;
 using ImGuiNET;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Raii;
 using ImGuiClip = OtterGui.ImGuiClip;
 
diff --git a/Glamourer/Interop/Material/UpdateColorSets.cs b/Glamourer/Interop/Material/UpdateColorSets.cs
index a96c60f..e503bc6 100644
--- a/Glamourer/Interop/Material/UpdateColorSets.cs
+++ b/Glamourer/Interop/Material/UpdateColorSets.cs
@@ -8,7 +8,7 @@ public sealed class UpdateColorSets : FastHook<UpdateColorSets.Delegate>
 {
     public delegate void Delegate(Model model, uint unk);
 
-    private readonly ThreadLocal<Model> _updatingModel = new();
+    private readonly ThreadLocal<Model> _updatingModel = new(() => Model.Null);
 
     public UpdateColorSets(HookManager hooks)
         => Task = hooks.CreateHook<Delegate>("Update Color Sets", Sigs.UpdateColorSets, Detour, true);
@@ -17,7 +17,7 @@ public sealed class UpdateColorSets : FastHook<UpdateColorSets.Delegate>
     {
         _updatingModel.Value = model;
         Task.Result.Original(model, unk);
-        _updatingModel.Value = nint.Zero;
+        _updatingModel.Value = Model.Null;
     }
 
     public Model Get()
diff --git a/Glamourer/Services/CollectionOverrideService.cs b/Glamourer/Services/CollectionOverrideService.cs
index fcc9998..99635d8 100644
--- a/Glamourer/Services/CollectionOverrideService.cs
+++ b/Glamourer/Services/CollectionOverrideService.cs
@@ -3,6 +3,7 @@ using Glamourer.Interop.Penumbra;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OtterGui;
+using OtterGui.Extensions;
 using OtterGui.Filesystem;
 using OtterGui.Services;
 using Penumbra.GameData.Actors;
diff --git a/Glamourer/Services/CommandService.cs b/Glamourer/Services/CommandService.cs
index ed51a06..3d40fa9 100644
--- a/Glamourer/Services/CommandService.cs
+++ b/Glamourer/Services/CommandService.cs
@@ -12,6 +12,7 @@ using Glamourer.State;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using OtterGui.Services;
 using Penumbra.GameData.Actors;
 using Penumbra.GameData.Enums;
diff --git a/Glamourer/State/FunModule.cs b/Glamourer/State/FunModule.cs
index 52394a2..ae7160c 100644
--- a/Glamourer/State/FunModule.cs
+++ b/Glamourer/State/FunModule.cs
@@ -7,6 +7,7 @@ using Glamourer.Services;
 using ImGuiNET;
 using OtterGui;
 using OtterGui.Classes;
+using OtterGui.Extensions;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Interop;
 using Penumbra.GameData.Structs;
diff --git a/OtterGui b/OtterGui
index f53fd22..d13d700 160000
--- a/OtterGui
+++ b/OtterGui
@@ -1 +1 @@
-Subproject commit f53fd227a242435ce44a9fe9c5e847d0ca788869
+Subproject commit d13d700796648f2a9279250052c4aa8ebeca221f
diff --git a/Penumbra.GameData b/Penumbra.GameData
index e10d8f3..62bbce5 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit e10d8f33a676ff4544d7ca05a93d555416f41222
+Subproject commit 62bbce5981e961a91322ca1a7d3bb5be25f67185