diff --git a/Code/admin/xmake.lua b/Code/admin/xmake.lua
index 4afec7f04..b72cf751c 100644
--- a/Code/admin/xmake.lua
+++ b/Code/admin/xmake.lua
@@ -1,5 +1,4 @@
-add_requires("magnum", { configs = { sdl2 = true }})
-add_requires("magnum-integration",  { configs = { imgui = true }})
+
 
 target("Admin")
     set_kind("binary")
diff --git a/Code/client/Services/Generic/ImguiService.cpp b/Code/client/Services/Generic/ImguiService.cpp
index d8dc3fa5f..7433f9459 100644
--- a/Code/client/Services/Generic/ImguiService.cpp
+++ b/Code/client/Services/Generic/ImguiService.cpp
@@ -42,6 +42,8 @@ void ImguiService::Render() const
     ImGui_ImplWin32_NewFrame();
     ImGui::NewFrame();
 
+    ImGui::DockSpaceOverViewport(ImGui::GetMainViewport(), ImGuiDockNodeFlags_PassthruCentralNode);
+
     m_drawSignal.publish();
     ImGui::Render();
 
diff --git a/Code/components/crash_handler/xmake.lua b/Code/components/crash_handler/xmake.lua
index 04057ee43..5a1417596 100644
--- a/Code/components/crash_handler/xmake.lua
+++ b/Code/components/crash_handler/xmake.lua
@@ -1,4 +1,2 @@
-add_requires("sentry-native", { configs = { backend = "crashpad" } })
-
 component("CrashHandler")
     add_packages("sentry-native")
diff --git a/Code/components/es_loader/xmake.lua b/Code/components/es_loader/xmake.lua
index b20e121e4..effe90573 100644
--- a/Code/components/es_loader/xmake.lua
+++ b/Code/components/es_loader/xmake.lua
@@ -1,5 +1,3 @@
-add_requires("zlib")
-
 component("ESLoader")
 	set_pcxxheader("stdafx.h")
 	add_headerfiles("stdafx.h", {prefixdir = "ESLoader"})
diff --git a/Code/components/imgui/ImGuiDriver.cpp b/Code/components/imgui/ImGuiDriver.cpp
index 484c45e3d..be316dde4 100644
--- a/Code/components/imgui/ImGuiDriver.cpp
+++ b/Code/components/imgui/ImGuiDriver.cpp
@@ -87,6 +87,9 @@ ImGuiDriver::ImGuiDriver()
     ImGui::CreateContext();
 
     auto& io = ImGui::GetIO();
+
+    io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+
     InstallClipboardHandlers(io);
 
     // io.IniFilename = nullptr;
diff --git a/Code/immersive_launcher/xmake.lua b/Code/immersive_launcher/xmake.lua
index e4027fb0e..fb8f1c7a3 100644
--- a/Code/immersive_launcher/xmake.lua
+++ b/Code/immersive_launcher/xmake.lua
@@ -65,8 +65,6 @@ local function build_launcher()
         "sentry-native")
 end
 
-add_requires("sentry-native")
-
 target("SkyrimImmersiveLauncher")
     set_basename("SkyrimTogether")
     add_defines(
diff --git a/Code/xmake.lua b/Code/xmake.lua
index 16b92b36c..941d311da 100644
--- a/Code/xmake.lua
+++ b/Code/xmake.lua
@@ -1,5 +1,3 @@
-add_requires("glm")
-
 if is_plat("windows") then
     includes("client")
     includes("immersive_elf")
diff --git a/Libraries/xmake.lua b/Libraries/xmake.lua
index 8bc97b6f8..8189ddca5 100644
--- a/Libraries/xmake.lua
+++ b/Libraries/xmake.lua
@@ -2,23 +2,7 @@
 lib_dir = os.curdir()
 directx_dir = lib_dir .. "/DXSDK"
 
-add_requireconfs("cpp-httplib", {configs = {ssl = true}})
-add_requires(
-    "tiltedcore",
-	"cryptopp",
-    "spdlog",
-    "cpp-httplib",
-    "gtest",
-    "mem")
-
--- all libraries listed here are under frequent change, and are thus not quired via
--- the xmake package manager, we intend to change this in the future though.
-
 if is_plat("windows") then
-    add_requires(
-    "discord",
-    "imgui")
-
 	includes("./TiltedUI")
 	includes("./TiltedReverse")
 	includes("./TiltedHooks")
diff --git a/xmake.lua b/xmake.lua
index c4c850822..f5ded2cdd 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -25,7 +25,31 @@ if has_config("unitybuild") then
     add_rules("c++.unity_build", {batchsize = 12})
 end
 
-add_requires("entt", "recastnavigation")
+add_requires(
+    "entt", 
+    "recastnavigation", 
+    "tiltedcore", 
+    "cryptopp", 
+    "spdlog", 
+    "cpp-httplib",
+    "gtest", 
+    "mem", 
+    "glm", 
+    "sentry-native", 
+    "magnum", 
+    "magnum-integration",
+    "zlib")
+
+add_requireconfs("cpp-httplib", {configs = {ssl = true}})
+add_requireconfs("sentry-native", { configs = { backend = "crashpad" } })
+add_requireconfs("magnum", { configs = { sdl2 = true }})
+add_requireconfs("magnum-integration",  { configs = { imgui = true }})
+add_requireconfs("magnum-integration.magnum",  { configs = { sdl2 = true }})
+add_requireconfs("magnum-integration.imgui", {version = "v1.87-docking", override = true})
+
+if is_plat("windows") then
+    add_requires("discord", "imgui v1.87-docking")
+end
 
 before_build(function (target)
     import("modules.version")