From 90e426b32529107f54bb717ace8a9931b80922cf Mon Sep 17 00:00:00 2001
From: goaaats <goatsdev@protonmail.com>
Date: Sun, 22 Jun 2025 22:21:12 +0200
Subject: [PATCH] Remove ImGui.NET entirely

---
 .gitmodules                                   |  3 --
 Dalamud.CorePlugin/PluginWindow.cs            |  2 +-
 Dalamud/Dalamud.csproj                        |  1 -
 .../Interface/Internal/InterfaceManager.cs    |  4 +-
 Dalamud/Interface/Internal/UiDebug.cs         |  2 +-
 .../Internal/UiDebug2/Popout.Addon.cs         |  4 +-
 .../Internal/UiDebug2/Popout.Node.cs          |  4 +-
 .../Internal/Windows/ChangelogWindow.cs       |  2 +-
 .../Internal/Windows/ColorDemoWindow.cs       |  2 +-
 .../Internal/Windows/ComponentDemoWindow.cs   |  2 +-
 .../Internal/Windows/ConsoleWindow.cs         |  2 +-
 .../Internal/Windows/Data/DataWindow.cs       |  2 +-
 .../Windows/GamepadModeNotifierWindow.cs      |  2 +-
 .../PluginInstaller/PluginInstallerWindow.cs  |  2 +-
 .../Internal/Windows/PluginStatWindow.cs      |  2 +-
 .../Windows/SelfTest/SelfTestWindow.cs        |  2 +-
 .../SelfTest/Steps/CompletionSelfTestStep.cs  |  6 +--
 .../Windows/Settings/SettingsWindow.cs        |  2 +-
 .../Windows/Settings/Tabs/SettingsTabDtr.cs   |  2 +-
 .../Internal/Windows/TitleScreenMenuWindow.cs |  2 +-
 .../DeviceContextStateBackup.cs               |  2 -
 Dalamud/Interface/UiBuilder.cs                | 54 ++-----------------
 Dalamud/Interface/Utility/ImGuiHelpers.cs     | 20 +------
 Dalamud/Interface/Utility/Raii/Color.cs       | 16 ------
 Dalamud/Interface/Utility/Raii/Font.cs        | 10 ----
 Dalamud/Interface/Windowing/Window.cs         | 44 ++-------------
 Dalamud/Plugin/Internal/PluginErrorHandler.cs |  3 +-
 Dalamud/Plugin/Services/ITextureProvider.cs   |  5 +-
 lib/ImGui.NET                                 |  1 -
 29 files changed, 32 insertions(+), 173 deletions(-)
 delete mode 160000 lib/ImGui.NET

diff --git a/.gitmodules b/.gitmodules
index 561b30375..ba6c43f8e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,6 +19,3 @@
 [submodule "lib/Hexa.NET.ImGui"]
 	path = lib/Hexa.NET.ImGui
 	url = https://github.com/goatcorp/Hexa.NET.ImGui.git
-[submodule "lib/ImGui.NET"]
-	path = lib/ImGui.NET
-	url = https://github.com/goatcorp/ImGui.NET.git
diff --git a/Dalamud.CorePlugin/PluginWindow.cs b/Dalamud.CorePlugin/PluginWindow.cs
index 6766232fb..3a17ea065 100644
--- a/Dalamud.CorePlugin/PluginWindow.cs
+++ b/Dalamud.CorePlugin/PluginWindow.cs
@@ -20,7 +20,7 @@ namespace Dalamud.CorePlugin
             this.IsOpen = true;
 
             this.Size = new Vector2(810, 520);
-            this.SizeConditionNew = ImGuiCond.FirstUseEver;
+            this.SizeCondition = ImGuiCond.FirstUseEver;
         }
 
         /// <inheritdoc/>
diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index b13de0b77..cffa644fd 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -109,7 +109,6 @@
         <ProjectReference Include="..\imgui\ImGuiScene\ImGuiScene.csproj" />
         <ProjectReference Include="..\lib\FFXIVClientStructs\FFXIVClientStructs\FFXIVClientStructs.csproj" />
         <ProjectReference Include="..\lib\FFXIVClientStructs\InteropGenerator.Runtime\InteropGenerator.Runtime.csproj" />
-        <ProjectReference Include="..\lib\ImGui.NET\src\ImGui.NET-472\ImGui.NET-472.csproj" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs
index d0a02d9d7..89e77bce6 100644
--- a/Dalamud/Interface/Internal/InterfaceManager.cs
+++ b/Dalamud/Interface/Internal/InterfaceManager.cs
@@ -493,7 +493,7 @@ internal partial class InterfaceManager : IInternalDisposableService
 
         var value = enabled ? 1u : 0u;
         global::Windows.Win32.PInvoke.DwmSetWindowAttribute(
-            new(this.GameWindowHandle.Value),
+            new(new IntPtr(this.GameWindowHandle.Value)),
             DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE,
             &value,
             sizeof(uint)).ThrowOnFailure();
@@ -723,7 +723,7 @@ internal partial class InterfaceManager : IInternalDisposableService
             // NOTE (Chiv) Explicitly deactivate on dalamud boot
             ImGui.GetIO().ConfigFlags &= ~ImGuiConfigFlags.NavEnableGamepad;
 
-            ImGuiHelpers.MainViewportNew = ImGui.GetMainViewport();
+            ImGuiHelpers.MainViewport = ImGui.GetMainViewport();
 
             Log.Information("[IM] Scene & ImGui setup OK!");
         }
diff --git a/Dalamud/Interface/Internal/UiDebug.cs b/Dalamud/Interface/Internal/UiDebug.cs
index b700a1610..21dc9d3eb 100644
--- a/Dalamud/Interface/Internal/UiDebug.cs
+++ b/Dalamud/Interface/Internal/UiDebug.cs
@@ -672,6 +672,6 @@ internal unsafe class UiDebug
 
         position += ImGuiHelpers.MainViewport.Pos;
 
-        ImGui.GetForegroundDrawList(ImGuiHelpers.MainViewportNew).AddRect(position, position + size, nodeVisible ? 0xFF00FF00 : 0xFF0000FF);
+        ImGui.GetForegroundDrawList(ImGuiHelpers.MainViewport).AddRect(position, position + size, nodeVisible ? 0xFF00FF00 : 0xFF0000FF);
     }
 }
diff --git a/Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs b/Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs
index dd5c80d36..4684caa60 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs
+++ b/Dalamud/Interface/Internal/UiDebug2/Popout.Addon.cs
@@ -23,14 +23,14 @@ internal class AddonPopoutWindow : Window, IDisposable
         : base(name)
     {
         this.addonTree = tree;
-        this.PositionConditionNew = ImGuiCond.Once;
+        this.PositionCondition = ImGuiCond.Once;
 
         var pos = ImGui.GetMousePos() + new Vector2(50, -50);
         var workSize = ImGui.GetMainViewport().WorkSize;
         var pos2 = new Vector2(Math.Min(workSize.X - 750, pos.X), Math.Min(workSize.Y - 250, pos.Y));
 
         this.Position = pos2;
-        this.SizeConditionNew = ImGuiCond.Once;
+        this.SizeCondition = ImGuiCond.Once;
         this.Size = new(700, 200);
         this.IsOpen = true;
         this.SizeConstraints = new() { MinimumSize = new(100, 100) };
diff --git a/Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs b/Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs
index 651eeb861..da4b95256 100644
--- a/Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs
+++ b/Dalamud/Interface/Internal/UiDebug2/Popout.Node.cs
@@ -35,8 +35,8 @@ internal unsafe class NodePopoutWindow : Window, IDisposable
 
         this.Position = pos2;
         this.IsOpen = true;
-        this.PositionConditionNew = ImGuiCond.Once;
-        this.SizeConditionNew = ImGuiCond.Once;
+        this.PositionCondition = ImGuiCond.Once;
+        this.SizeCondition = ImGuiCond.Once;
         this.Size = new(700, 200);
         this.SizeConstraints = new() { MinimumSize = new(100, 100) };
     }
diff --git a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
index 6f878ba43..d7b96189e 100644
--- a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs
@@ -216,7 +216,7 @@ internal sealed class ChangelogWindow : Window, IDisposable
         ImGui.SetNextWindowBgAlpha(Math.Clamp(this.windowFade.EasedPoint.X, 0, 0.9f));
 
         this.Size = new Vector2(900, 400);
-        this.SizeConditionNew = ImGuiCond.Always;
+        this.SizeCondition = ImGuiCond.Always;
 
         // Center the window on the main viewport
         var viewportPos = ImGuiHelpers.MainViewport.Pos;
diff --git a/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs b/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs
index 704a74695..5e8ce1f12 100644
--- a/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs
@@ -23,7 +23,7 @@ internal sealed class ColorDemoWindow : Window
         : base("Dalamud Colors Demo")
     {
         this.Size = new Vector2(600, 500);
-        this.SizeConditionNew = ImGuiCond.FirstUseEver;
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
         this.colors = new List<(string Name, Vector4 Color)>()
         {
diff --git a/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs b/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs
index 6ce52233b..1d9f2f9e3 100644
--- a/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/ComponentDemoWindow.cs
@@ -38,7 +38,7 @@ internal sealed class ComponentDemoWindow : Window
         : base("Dalamud Components Demo")
     {
         this.Size = new Vector2(600, 500);
-        this.SizeConditionNew = ImGuiCond.FirstUseEver;
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
         this.RespectCloseHotkey = false;
 
diff --git a/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs b/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
index 3b2109d70..00afd53b0 100644
--- a/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/ConsoleWindow.cs
@@ -100,7 +100,7 @@ internal class ConsoleWindow : Window, IDisposable
         cm.AddAlias("clear", "cls");
 
         this.Size = new Vector2(500, 400);
-        this.SizeConditionNew = ImGuiCond.FirstUseEver;
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
         this.RespectCloseHotkey = false;
 
diff --git a/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs b/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs
index d69a0d1c2..f37fee404 100644
--- a/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/Data/DataWindow.cs
@@ -78,7 +78,7 @@ internal class DataWindow : Window, IDisposable
         : base("Dalamud Data", ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse)
     {
         this.Size = new Vector2(400, 300);
-        this.SizeConditionNew = ImGuiCond.FirstUseEver;
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
         this.RespectCloseHotkey = false;
         this.orderedModules = this.modules.OrderBy(module => module.DisplayName);
diff --git a/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs b/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs
index e98bc6057..91f7f02d9 100644
--- a/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/GamepadModeNotifierWindow.cs
@@ -24,7 +24,7 @@ internal class GamepadModeNotifierWindow : Window
             true)
     {
         this.Size = Vector2.Zero;
-        this.SizeConditionNew = ImGuiCond.Always;
+        this.SizeCondition = ImGuiCond.Always;
         this.IsOpen = false;
 
         this.RespectCloseHotkey = false;
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
index 993cfecaa..c463b7f07 100644
--- a/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
@@ -152,7 +152,7 @@ internal class PluginInstallerWindow : Window, IDisposable
         this.imageCache = imageCache;
 
         this.Size = new Vector2(830, 570);
-        this.SizeConditionNew = ImGuiCond.FirstUseEver;
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
         this.SizeConstraints = new WindowSizeConstraints
         {
diff --git a/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs b/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
index 05de41203..c1915deee 100644
--- a/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginStatWindow.cs
@@ -37,7 +37,7 @@ internal class PluginStatWindow : Window
         this.RespectCloseHotkey = false;
 
         this.Size = new Vector2(810, 520);
-        this.SizeConditionNew = ImGuiCond.FirstUseEver;
+        this.SizeCondition = ImGuiCond.FirstUseEver;
     }
 
     /// <inheritdoc/>
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs b/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
index 00f74fab7..743039e08 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/SelfTestWindow.cs
@@ -73,7 +73,7 @@ internal class SelfTestWindow : Window
         : base("Dalamud Self-Test", ImGuiWindowFlags.NoScrollbar | ImGuiWindowFlags.NoScrollWithMouse)
     {
         this.Size = new Vector2(800, 800);
-        this.SizeConditionNew = ImGuiCond.FirstUseEver;
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
         this.RespectCloseHotkey = false;
     }
diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/CompletionSelfTestStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/CompletionSelfTestStep.cs
index 40f8f3bce..6390d30bc 100644
--- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/CompletionSelfTestStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/CompletionSelfTestStep.cs
@@ -1,9 +1,5 @@
+using Dalamud.Bindings.ImGui;
 using Dalamud.Game.Command;
-using Dalamud.Game.Gui;
-using Dalamud.Game.Text;
-using Dalamud.Game.Text.SeStringHandling;
-
-using ImGuiNET;
 
 namespace Dalamud.Interface.Internal.Windows.SelfTest.Steps;
 
diff --git a/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs b/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs
index c40b43b7a..30aa62136 100644
--- a/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/Settings/SettingsWindow.cs
@@ -39,7 +39,7 @@ internal class SettingsWindow : Window
             MaximumSize = new Vector2(1780, 940),
         };
 
-        this.SizeConditionNew = ImGuiCond.FirstUseEver;
+        this.SizeCondition = ImGuiCond.FirstUseEver;
 
         this.tabs =
         [
diff --git a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabDtr.cs b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabDtr.cs
index ee3d75ff0..ff1df30c5 100644
--- a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabDtr.cs
+++ b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabDtr.cs
@@ -56,7 +56,7 @@ public class SettingsTabDtr : SettingsTab
             // TODO: Maybe we can also resort the rest of the bar in the future?
             // var isRequired = search is Configuration.SearchSetting.Internal or Configuration.SearchSetting.MacroLinks;
 
-            ImGui.PushFont(UiBuilder.IconFontNew);
+            ImGui.PushFont(UiBuilder.IconFont);
 
             var arrowUpText = $"{FontAwesomeIcon.ArrowUp.ToIconString()}##{title}";
             if (i == 0)
diff --git a/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs b/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
index 646004bb8..028291375 100644
--- a/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/TitleScreenMenuWindow.cs
@@ -100,7 +100,7 @@ internal class TitleScreenMenuWindow : Window, IDisposable
         this.ForceMainWindow = true;
 
         this.Position = new Vector2(0, 200);
-        this.PositionConditionNew = ImGuiCond.Always;
+        this.PositionCondition = ImGuiCond.Always;
         this.RespectCloseHotkey = false;
 
         this.shadeTexture = new(() => dalamudAssetManager.GetDalamudTextureWrap(DalamudAsset.TitleScreenMenuShade));
diff --git a/Dalamud/Interface/Textures/TextureWraps/Internal/DrawListTextureWrap/DeviceContextStateBackup.cs b/Dalamud/Interface/Textures/TextureWraps/Internal/DrawListTextureWrap/DeviceContextStateBackup.cs
index 55cf13881..b8f82828b 100644
--- a/Dalamud/Interface/Textures/TextureWraps/Internal/DrawListTextureWrap/DeviceContextStateBackup.cs
+++ b/Dalamud/Interface/Textures/TextureWraps/Internal/DrawListTextureWrap/DeviceContextStateBackup.cs
@@ -1,7 +1,5 @@
 using System.Runtime.InteropServices;
 
-using ImGuiNET;
-
 using TerraFX.Interop.DirectX;
 using TerraFX.Interop.Windows;
 
diff --git a/Dalamud/Interface/UiBuilder.cs b/Dalamud/Interface/UiBuilder.cs
index 9d0284ff6..e1c710b0a 100644
--- a/Dalamud/Interface/UiBuilder.cs
+++ b/Dalamud/Interface/UiBuilder.cs
@@ -333,67 +333,19 @@ public sealed class UiBuilder : IDisposable, IUiBuilder
     /// Gets the default Dalamud font - supporting all game languages and icons.<br />
     /// <strong>Accessing this static property outside of <see cref="Draw"/> is dangerous and not supported.</strong>
     /// </summary>
-    public static ImFontPtr DefaultFontNew => InterfaceManager.DefaultFont;
+    public static ImFontPtr DefaultFont => InterfaceManager.DefaultFont;
 
     /// <summary>
     /// Gets the default Dalamud icon font based on FontAwesome 5 Free solid.<br />
     /// <strong>Accessing this static property outside of <see cref="Draw"/> is dangerous and not supported.</strong>
     /// </summary>
-    public static ImFontPtr IconFontNew => InterfaceManager.IconFont;
+    public static ImFontPtr IconFont => InterfaceManager.IconFont;
 
     /// <summary>
     /// Gets the default Dalamud monospaced font based on Inconsolata Regular.<br />
     /// <strong>Accessing this static property outside of <see cref="Draw"/> is dangerous and not supported.</strong>
     /// </summary>
-    public static ImFontPtr MonoFontNew => InterfaceManager.MonoFont;
-
-    /// <summary>
-    /// Gets the default Dalamud font - supporting all game languages and icons.<br />
-    /// <strong>Accessing this static property outside of <see cref="Draw"/> is dangerous and not supported.</strong>
-    /// </summary>
-    [ImGuiBindingsToDo("Remove, rename New variant.")]
-    public static ImGuiNET.ImFontPtr DefaultFont
-    {
-        get
-        {
-            unsafe
-            {
-                return new ImGuiNET.ImFontPtr((nint)InterfaceManager.DefaultFont.Handle);
-            }
-        }
-    }
-
-    /// <summary>
-    /// Gets the default Dalamud icon font based on FontAwesome 5 Free solid.<br />
-    /// <strong>Accessing this static property outside of <see cref="Draw"/> is dangerous and not supported.</strong>
-    /// </summary>
-    [ImGuiBindingsToDo("Remove, rename New variant.")]
-    public static ImGuiNET.ImFontPtr IconFont
-    {
-        get
-        {
-            unsafe
-            {
-                return new ImGuiNET.ImFontPtr((nint)InterfaceManager.IconFont.Handle);
-            }
-        }
-    }
-
-    /// <summary>
-    /// Gets the default Dalamud monospaced font based on Inconsolata Regular.<br />
-    /// <strong>Accessing this static property outside of <see cref="Draw"/> is dangerous and not supported.</strong>
-    /// </summary>
-    [ImGuiBindingsToDo("Remove, rename New variant.")]
-    public static ImGuiNET.ImFontPtr MonoFont
-    {
-        get
-        {
-            unsafe
-            {
-                return new ImGuiNET.ImFontPtr((nint)InterfaceManager.MonoFont.Handle);
-            }
-        }
-    }
+    public static ImFontPtr MonoFont => InterfaceManager.MonoFont;
 
     /// <summary>
     /// Gets the default font specifications.
diff --git a/Dalamud/Interface/Utility/ImGuiHelpers.cs b/Dalamud/Interface/Utility/ImGuiHelpers.cs
index c865817f4..3285c8daf 100644
--- a/Dalamud/Interface/Utility/ImGuiHelpers.cs
+++ b/Dalamud/Interface/Utility/ImGuiHelpers.cs
@@ -10,7 +10,6 @@ using System.Text.Unicode;
 
 using Dalamud.Bindings.ImGui;
 using Dalamud.Configuration.Internal;
-using Dalamud.Game.ClientState.Keys;
 using Dalamud.Game.Text.SeStringHandling.Payloads;
 using Dalamud.Interface.ImGuiBackend.InputHandler;
 using Dalamud.Interface.ImGuiSeStringRenderer;
@@ -18,9 +17,7 @@ using Dalamud.Interface.ImGuiSeStringRenderer.Internal;
 using Dalamud.Interface.ManagedFontAtlas;
 using Dalamud.Interface.ManagedFontAtlas.Internals;
 using Dalamud.Interface.Utility.Raii;
-using Dalamud.Utility;
 
-using ImGuiViewport = ImGuiNET.ImGuiViewport;
 using VirtualKey = Dalamud.Game.ClientState.Keys.VirtualKey;
 
 namespace Dalamud.Interface.Utility;
@@ -33,22 +30,7 @@ public static partial class ImGuiHelpers
     /// <summary>
     /// Gets the main viewport.
     /// </summary>
-    public static ImGuiViewportPtr MainViewportNew { get; internal set; }
-
-    /// <summary>
-    /// Gets the main viewport.
-    /// </summary>
-    [ImGuiBindingsToDo("Remove and rename MainViewportNew to MainViewport")]
-    public static ImGuiNET.ImGuiViewportPtr MainViewport
-    {
-        get
-        {
-            unsafe
-            {
-                return new ImGuiNET.ImGuiViewportPtr((nint)MainViewportNew.Handle);
-            }
-        }
-    }
+    public static ImGuiViewportPtr MainViewport { get; internal set; }
 
     /// <summary>
     /// Gets the global Dalamud scale.
diff --git a/Dalamud/Interface/Utility/Raii/Color.cs b/Dalamud/Interface/Utility/Raii/Color.cs
index 36c10acf3..7bf2efc38 100644
--- a/Dalamud/Interface/Utility/Raii/Color.cs
+++ b/Dalamud/Interface/Utility/Raii/Color.cs
@@ -17,14 +17,6 @@ public static partial class ImRaii
     public static Color PushColor(ImGuiCol idx, Vector4 color, bool condition = true)
         => new Color().Push(idx, color, condition);
 
-    [ImGuiBindingsToDo("Remove.")]
-    public static Color PushColor(ImGuiNET.ImGuiCol idx, uint color, bool condition = true)
-        => new Color().Push(idx, color, condition);
-
-    [ImGuiBindingsToDo("Remove.")]
-    public static Color PushColor(ImGuiNET.ImGuiCol idx, Vector4 color, bool condition = true)
-        => new Color().Push(idx, color, condition);
-
     // Push colors that revert all current color changes made temporarily.
     public static Color DefaultColors()
     {
@@ -40,7 +32,6 @@ public static partial class ImRaii
         internal static readonly List<(ImGuiCol, uint)> Stack = new();
         private                  int                    count;
 
-        [ImGuiBindingsToDo("Remove.")]
         public Color Push(ImGuiCol idx, uint color, bool condition = true)
         {
             if (condition)
@@ -53,7 +44,6 @@ public static partial class ImRaii
             return this;
         }
 
-        [ImGuiBindingsToDo("Remove.")]
         public Color Push(ImGuiCol idx, Vector4 color, bool condition = true)
         {
             if (condition)
@@ -66,12 +56,6 @@ public static partial class ImRaii
             return this;
         }
 
-        public Color Push(ImGuiNET.ImGuiCol idx, uint color, bool condition = true)
-            => this.Push((ImGuiCol)idx, color, condition);
-
-        public Color Push(ImGuiNET.ImGuiCol idx, Vector4 color, bool condition = true)
-            => this.Push((ImGuiCol)idx, color, condition);
-
         public void Pop(int num = 1)
         {
             num    =  Math.Min(num, this.count);
diff --git a/Dalamud/Interface/Utility/Raii/Font.cs b/Dalamud/Interface/Utility/Raii/Font.cs
index 18c1ce94e..da35c693a 100644
--- a/Dalamud/Interface/Utility/Raii/Font.cs
+++ b/Dalamud/Interface/Utility/Raii/Font.cs
@@ -10,10 +10,6 @@ public static partial class ImRaii
     public static Font PushFont(ImFontPtr font, bool condition = true)
         => condition ? new Font().Push(font) : new Font();
 
-    [ImGuiBindingsToDo("Remove.")]
-    public static Font PushFont(ImGuiNET.ImFontPtr font, bool condition = true)
-        => condition ? new Font().Push(font) : new Font();
-
     // Push the default font if any other font is currently pushed.
     public static Font DefaultFont()
         => new Font().Push(Font.DefaultPushed, Font.FontPushCounter > 0);
@@ -41,12 +37,6 @@ public static partial class ImRaii
             return this;
         }
 
-        [ImGuiBindingsToDo("Remove.")]
-        public unsafe Font Push(ImGuiNET.ImFontPtr font, bool condition = true)
-        {
-            return this.Push(new ImFontPtr((ImFont*)font.NativePtr), condition);
-        }
-
         public void Pop(int num = 1)
         {
             num             =  Math.Min(num, this.count);
diff --git a/Dalamud/Interface/Windowing/Window.cs b/Dalamud/Interface/Windowing/Window.cs
index f770b0de9..d302552f5 100644
--- a/Dalamud/Interface/Windowing/Window.cs
+++ b/Dalamud/Interface/Windowing/Window.cs
@@ -71,22 +71,6 @@ public abstract class Window
         this.ForceMainWindow = forceMainWindow;
     }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Window"/> class.
-    /// </summary>
-    /// <param name="name">The name/ID of this window.
-    /// If you have multiple windows with the same name, you will need to
-    /// append a unique ID to it by specifying it after "###" behind the window title.
-    /// </param>
-    /// <param name="flags">The <see cref="ImGuiWindowFlags"/> of this window.</param>
-    /// <param name="forceMainWindow">Whether this window should be limited to the main game window.</param>
-    [ImGuiBindingsToDo("Remove.")]
-    protected Window(
-        string name, ImGuiNET.ImGuiWindowFlags flags = ImGuiNET.ImGuiWindowFlags.None, bool forceMainWindow = false)
-        : this(name, (ImGuiWindowFlags)flags, forceMainWindow)
-    {
-    }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="Window"/> class.
     /// </summary>
@@ -182,17 +166,7 @@ public abstract class Window
     /// <summary>
     /// Gets or sets the condition that defines when the position of this window is set.
     /// </summary>
-    public ImGuiCond PositionConditionNew
-    {
-        get => (ImGuiCond)this.PositionCondition;
-        set => this.PositionCondition = (ImGuiNET.ImGuiCond)value;
-    }
-
-    /// <summary>
-    /// Gets or sets the condition that defines when the position of this window is set.
-    /// </summary>
-    [ImGuiBindingsToDo("Remove. Rename New.")]
-    public ImGuiNET.ImGuiCond PositionCondition { get; set; }
+    public ImGuiCond PositionCondition { get; set; }
 
     /// <summary>
     /// Gets or sets the size of the window. The size provided will be scaled by the global scale.
@@ -202,17 +176,7 @@ public abstract class Window
     /// <summary>
     /// Gets or sets the condition that defines when the size of this window is set.
     /// </summary>
-    public ImGuiCond SizeConditionNew
-    {
-        get => (ImGuiCond)this.SizeCondition;
-        set => this.SizeCondition = (ImGuiNET.ImGuiCond)value;
-    }
-
-    /// <summary>
-    /// Gets or sets the condition that defines when the size of this window is set.
-    /// </summary>
-    [ImGuiBindingsToDo("Remove. Rename New.")]
-    public ImGuiNET.ImGuiCond SizeCondition { get; set; }
+    public ImGuiCond SizeCondition { get; set; }
 
     /// <summary>
     /// Gets or sets the size constraints of the window. The size constraints provided will be scaled by the global scale.
@@ -700,12 +664,12 @@ public abstract class Window
             if (this.ForceMainWindow)
                 pos += ImGuiHelpers.MainViewport.Pos;
 
-            ImGui.SetNextWindowPos(pos, this.PositionConditionNew);
+            ImGui.SetNextWindowPos(pos, this.PositionCondition);
         }
 
         if (this.Size.HasValue)
         {
-            ImGui.SetNextWindowSize(this.Size.Value * ImGuiHelpers.GlobalScale, this.SizeConditionNew);
+            ImGui.SetNextWindowSize(this.Size.Value * ImGuiHelpers.GlobalScale, this.SizeCondition);
         }
 
         if (this.Collapsed.HasValue)
diff --git a/Dalamud/Plugin/Internal/PluginErrorHandler.cs b/Dalamud/Plugin/Internal/PluginErrorHandler.cs
index f9d1f73f6..acad93eba 100644
--- a/Dalamud/Plugin/Internal/PluginErrorHandler.cs
+++ b/Dalamud/Plugin/Internal/PluginErrorHandler.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface;
 using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Interface.ImGuiNotification.Internal;
 using Dalamud.Interface.Internal;
 using Dalamud.Plugin.Internal.Types;
 
-using ImGuiNET;
-
 using Serilog;
 
 namespace Dalamud.Plugin.Internal;
diff --git a/Dalamud/Plugin/Services/ITextureProvider.cs b/Dalamud/Plugin/Services/ITextureProvider.cs
index 3f9ae99df..a8ad76995 100644
--- a/Dalamud/Plugin/Services/ITextureProvider.cs
+++ b/Dalamud/Plugin/Services/ITextureProvider.cs
@@ -5,12 +5,11 @@ using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 
+using Dalamud.Bindings.ImGui;
 using Dalamud.Interface.Internal.Windows.Data.Widgets;
 using Dalamud.Interface.Textures;
 using Dalamud.Interface.Textures.TextureWraps;
 
-using ImGuiNET;
-
 using Lumina.Data.Files;
 
 namespace Dalamud.Plugin.Services;
@@ -214,7 +213,7 @@ public interface ITextureProvider
     /// to read using <see cref="CreateFromClipboardAsync"/>.</summary>
     /// <returns><c>true</c> if it is the case.</returns>
     bool HasClipboardImage();
-    
+
     /// <summary>Gets a shared texture corresponding to the given game resource icon specifier.</summary>
     /// <remarks>
     /// <para>This function does not throw exceptions.</para>
diff --git a/lib/ImGui.NET b/lib/ImGui.NET
deleted file mode 160000
index 98304cfd0..000000000
--- a/lib/ImGui.NET
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 98304cfd0bf86cf176732d60eb5dba6fc351f737