diff --git a/.gitmodules b/.gitmodules
index 411cc96..b21937d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "lib/zgui"]
-	path = lib/zgui
-	url = https://git.musuka.dev/paoda/zgui
 [submodule "lib/SDL.zig"]
 	path = lib/SDL.zig
 	url = https://github.com/paoda/SDL.zig
diff --git a/build.zig b/build.zig
index ec69dc3..4ad4cc5 100644
--- a/build.zig
+++ b/build.zig
@@ -2,7 +2,6 @@ const std = @import("std");
 const builtin = @import("builtin");
 
 const Sdk = @import("lib/SDL.zig/build.zig");
-const zgui = @import("lib/zgui/build.zig");
 
 const SemVer = std.SemanticVersion;
 
@@ -24,6 +23,10 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
 
+    const sdk = Sdk.init(b, null); // https://github.com/MasterQ32/SDL.zig
+    const zgui = b.dependency("zgui", .{ .shared = false, .with_implot = true, .backend = .sdl2_opengl3 });
+    const imgui = zgui.artifact("imgui");
+
     exe.root_module.addImport("known_folders", b.dependency("known-folders", .{}).module("known-folders")); // https://github.com/ziglibs/known-folders
     exe.root_module.addImport("datetime", b.dependency("zig-datetime", .{}).module("zig-datetime")); // https://github.com/frmdstryr/zig-datetime
     exe.root_module.addImport("clap", b.dependency("zig-clap", .{}).module("clap")); // https://github.com/Hejsil/zig-clap
@@ -32,20 +35,16 @@ pub fn build(b: *std.Build) void {
     exe.root_module.addImport("arm32", b.dependency("arm32", .{}).module("arm32")); // https://git.musuka.dev/paoda/arm32
     exe.root_module.addImport("gdbstub", b.dependency("zba-gdbstub", .{}).module("gdbstub")); // https://git.musuka.dev/paoda/gdbstub
     exe.root_module.addImport("nfd", b.dependency("nfd", .{}).module("nfd")); // https://github.com/fabioarnold/nfd-zig
+    exe.root_module.addImport("zgui", zgui.module("root")); // https://git.musuka.dev/paoda/zgui
+    exe.root_module.addImport("sdl2", sdk.getNativeModule());
 
     exe.root_module.addAnonymousImport("bitfield", .{ .root_source_file = .{ .path = "lib/bitfield.zig" } }); // https://github.com/FlorenceOS/
     exe.root_module.addAnonymousImport("gl", .{ .root_source_file = .{ .path = "lib/gl.zig" } }); // https://github.com/MasterQ32/zig-opengl
     exe.root_module.addAnonymousImport("example.toml", .{ .root_source_file = .{ .path = "example.toml" } });
 
-    // https://github.com/MasterQ32/SDL.zig
-    const sdk = Sdk.init(b, null);
     sdk.link(exe, .dynamic);
-    exe.root_module.addImport("sdl2", sdk.getNativeModule());
-
-    // https://git.musuka.dev/paoda/zgui
-    const zgui_pkg = zgui.package(b, target, optimize, .{ .options = .{ .backend = .sdl2_opengl3 } });
-    zgui_pkg.link(exe);
-    sdk.link(zgui_pkg.zgui_c_cpp, .dynamic);
+    sdk.link(imgui, .dynamic);
+    exe.linkLibrary(imgui);
 
     b.installArtifact(exe);
 
diff --git a/build.zig.zon b/build.zig.zon
index 7d512db..82d011d 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -41,5 +41,9 @@
             .url = "https://git.musuka.dev/paoda/arm32/archive/6f0e27136072610e6dba97ff8aaf5e2ec86e2c09.tar.gz",
             .hash = "122047d0affe12b9e9e9c655a7ba6d51b311f02d688e9f1c9a91394a03103f1c0cd5",
         },
+        .zgui = .{
+            .url = "https://git.musuka.dev/paoda/zgui/archive/28e926748b8f302dd4e2902835e392c9b87ea3c6.tar.gz",
+            .hash = "1220dbf1d809d07d1910b9853f162458ed1ebc66be81b21ccfc40a2552bc1019f9c2",
+        },
     },
 }
diff --git a/lib/SDL.zig b/lib/SDL.zig
index cd90212..0f74e59 160000
--- a/lib/SDL.zig
+++ b/lib/SDL.zig
@@ -1 +1 @@
-Subproject commit cd902129b7ab571693892c72bbf4e2fb58658730
+Subproject commit 0f74e59f4b258868959104b24fdf6c43071e11ad
diff --git a/lib/zgui b/lib/zgui
deleted file mode 160000
index 1fff275..0000000
--- a/lib/zgui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1fff275f8d322d44355a08f2eac3e7c4905fc382