diff --git a/.gitmodules b/.gitmodules
index dddb2a6a..245988ed 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +1,16 @@
-[submodule "OtterGui"]
-	path = OtterGui
-	url = https://github.com/Ottermandias/OtterGui.git
+[submodule "Penumbra.Api"]
+	path = Penumbra.Api
+	url = https://github.com/Ottermandias/Penumbra.Api.git
+	branch = main
+[submodule "Penumbra.String"]
+	path = Penumbra.String
+	url = https://github.com/Ottermandias/Penumbra.String.git
+	branch = main
+[submodule "Penumbra.GameData"]
+	path = Penumbra.GameData
+	url = https://github.com/Ottermandias/Penumbra.GameData.git
+	branch = main
+[submodule "Luna"]
+	path = Luna
+	url = git@github.com:Ottermandias/Luna.git
 	branch = main
-[submodule "Penumbra.Api"]
-	path = Penumbra.Api
-	url = https://github.com/Ottermandias/Penumbra.Api.git
-	branch = main
-[submodule "Penumbra.String"]
-	path = Penumbra.String
-	url = https://github.com/Ottermandias/Penumbra.String.git
-	branch = main
-[submodule "Penumbra.GameData"]
-	path = Penumbra.GameData
-	url = https://github.com/Ottermandias/Penumbra.GameData.git
-	branch = main
-[submodule "Luna"]
-	path = Luna
-	url = git@github.com:Ottermandias/Luna.git
-	branch = main
diff --git a/Luna b/Luna
index 2487453c..384b437a 160000
--- a/Luna
+++ b/Luna
@@ -1 +1 @@
-Subproject commit 2487453cfa4e95b9dbc661ed6e7298655df3b055
+Subproject commit 384b437a8cf16b4b1a51da43a4837d8fcc2116bd
diff --git a/OtterGui b/OtterGui
deleted file mode 160000
index ff1e6543..00000000
--- a/OtterGui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff1e6543845e3b8c53a5f8b240bc38faffb1b3bf
diff --git a/Penumbra.GameData b/Penumbra.GameData
index be7792ea..d13caf68 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit be7792ea33ae0b91109fcb95360cf4f382e9bc99
+Subproject commit d13caf68759521f2b89e74eae79698a5fa346ad5
diff --git a/Penumbra/Import/Textures/TextureDrawer.cs b/Penumbra/Import/Textures/TextureDrawer.cs
index eaca8927..7df09942 100644
--- a/Penumbra/Import/Textures/TextureDrawer.cs
+++ b/Penumbra/Import/Textures/TextureDrawer.cs
@@ -2,9 +2,7 @@ using ImSharp;
 using Lumina.Data.Files;
 using Luna;
 using OtterTex;
-using Penumbra.UI;
 using Penumbra.UI.Classes;
-using VectorExtensions = Luna.VectorExtensions;
 
 namespace Penumbra.Import.Textures;
 
@@ -14,9 +12,9 @@ public static class TextureDrawer
     {
         if (texture.TextureWrap != null)
         {
-            size = VectorExtensions.Contain(texture.TextureWrap.Size, size);
+            size = texture.TextureWrap.Size.Contain(size);
 
-            Im.Image.Draw(texture.TextureWrap.Id(), size);
+            Im.Image.Draw(texture.TextureWrap.Id, size);
             DrawData(texture);
         }
         else if (texture.LoadError != null)
diff --git a/Penumbra/UI/Classes/ChangedItemDrawer.cs b/Penumbra/UI/Classes/ChangedItemDrawer.cs
index 579a90e1..f0d97cba 100644
--- a/Penumbra/UI/Classes/ChangedItemDrawer.cs
+++ b/Penumbra/UI/Classes/ChangedItemDrawer.cs
@@ -110,11 +110,11 @@ public class ChangedItemDrawer : IDisposable, IUiService
             return;
         }
 
-        Im.Image.Draw(icon.Id(), new Vector2(height));
+        Im.Image.Draw(icon.Id, new Vector2(height));
         if (Im.Item.Hovered())
         {
             using var tt = Im.Tooltip.Begin();
-            Im.Image.Draw(icon.Id(), new Vector2(_smallestIconWidth));
+            Im.Image.Draw(icon.Id, new Vector2(_smallestIconWidth));
             Im.Line.Same();
             ImEx.TextFramed(iconFlagType.ToDescription(), new Vector2(0, _smallestIconWidth), 0);
         }
@@ -198,7 +198,7 @@ public class ChangedItemDrawer : IDisposable, IUiService
         }
 
         Im.Cursor.X = Im.ContentRegion.Maximum.X - size.X;
-        Im.Image.Draw(_icons[ChangedItemFlagExtensions.AllFlags].Id(), size, Vector2.Zero, Vector2.One,
+        Im.Image.Draw(_icons[ChangedItemFlagExtensions.AllFlags].Id, size, Vector2.Zero, Vector2.One,
             typeFilter switch
             {
                 0                                  => new Vector4(0.6f,  0.3f,  0.3f,  1f),
@@ -218,7 +218,7 @@ public class ChangedItemDrawer : IDisposable, IUiService
             var localRet = false;
             var icon     = _icons[type];
             var flag     = filter.HasFlag(type);
-            Im.Image.Draw(icon.Id(), size, Vector2.Zero, Vector2.One, flag ? Vector4.One : new Vector4(0.6f, 0.3f, 0.3f, 1f));
+            Im.Image.Draw(icon.Id, size, Vector2.Zero, Vector2.One, flag ? Vector4.One : new Vector4(0.6f, 0.3f, 0.3f, 1f));
             if (Im.Item.Clicked())
             {
                 filter   = flag ? filter & ~type : filter | type;
@@ -237,7 +237,7 @@ public class ChangedItemDrawer : IDisposable, IUiService
             if (Im.Item.Hovered())
             {
                 using var tt = Im.Tooltip.Begin();
-                Im.Image.Draw(icon.Id(), new Vector2(_smallestIconWidth));
+                Im.Image.Draw(icon.Id, new Vector2(_smallestIconWidth));
                 Im.Line.Same();
                 ImEx.TextFramed(type.ToDescription(), new Vector2(0, _smallestIconWidth), 0);
             }