diff --git a/engine/core/src/core.zig b/engine/core/src/core.zig
index 63a3984..3042d92 100644
--- a/engine/core/src/core.zig
+++ b/engine/core/src/core.zig
@@ -1,5 +1,4 @@
 // main public facing root file for core
-
 const std = @import("std");
 
 pub const gameObjectList = @import("utils/gameObjectList.zig");
@@ -26,18 +25,15 @@ pub const debugBox = debug_draw.debugBox;
 pub const debugLine = debug_draw.debugLine;
 // pub const script_bindings = script.script_bindings;
 
+pub const misc = @import("misc.zig");
+pub const engineTime = @import("engineTime.zig");
 pub const engineObject = @import("engineObject.zig");
-
-pub usingnamespace @import("misc.zig");
-pub usingnamespace @import("logging.zig");
-pub usingnamespace @import("engineTime.zig");
-pub usingnamespace @import("engineObject.zig");
-pub usingnamespace @import("jobs.zig");
-pub usingnamespace @import("file_utils.zig");
-pub usingnamespace @import("string_utils.zig");
-pub usingnamespace @import("type_utils.zig");
+pub const jobs = @import("jobs.zig");
+pub const file_utils = @import("file_utils.zig");
+pub const string_utils = @import("string_utils.zig");
+pub const type_utils = @import("type_utils.zig");
 pub const engine = @import("engine.zig");
-pub const tracy = @import("tracy");
+pub const tracy = @import("tracy").t;
 pub const png = @import("png.zig");
 
 pub const colors = @import("colors.zig");
@@ -45,10 +41,21 @@ pub const colors = @import("colors.zig");
 pub const zgltf = @import("zgltf");
 
 pub const zm = @import("zmath");
-pub usingnamespace @import("p2");
+
+pub const p2 = @import("p2");
+pub const assert = p2.assert;
+pub const BumpArena = p2.BumpArena;
+pub const ObjectHandle = p2.ObjectHandle;
+pub const SparseSet = p2.SparseSet;
+pub const RingQueue = p2.RingQueue;
+pub const RingQueueU = p2.RingQueueU;
+pub const ConcurrentQueueU = p2.ConcurrentQueueU;
+pub const Name = p2.Name;
+
 pub const algorithm = @import("p2");
-pub usingnamespace @import("math.zig");
-pub usingnamespace @import("args.zig");
+pub const math = @import("math.zig");
+pub const Vectorf = math.Vectorf;
+pub const launchArgs = @import("args.zig");
 
 pub const panickers = @import("panickers.zig");
 pub const scene = @import("scene.zig");
@@ -57,7 +64,6 @@ pub const SceneSystem = scene.SceneSystem;
 
 pub const Engine = engine.Engine;
 
-const Name = algorithm.Name;
 pub const spng = @import("spng");
 
 pub const MemoryTracker = @import("MemoryTracker.zig");
@@ -67,8 +73,8 @@ pub const DefaultSavePath = "Saved";
 const logging = @import("logging.zig");
 const c = @This();
 
-const logs = logging.engine_logs;
-const log = logging.engine_log;
+pub const engine_logs = logging.engine_logs;
+pub const engine_log = logging.engine_log;
 
 pub const packer = @import("packer");
 
@@ -109,7 +115,7 @@ pub const ModuleLoader = externModule.ModuleLoader;
 pub const ModuleLoaderArgs = externModule.ModuleLoaderArgs;
 
 pub const ecs = @import("ecs.zig");
-pub usingnamespace ecs;
+pub const Entity = ecs.Entity;
 
 // pub const script = @import("script.zig");
 
@@ -179,7 +185,7 @@ pub fn start_module_(map: *SpecVariantMap, args: anytype, allocator: std.mem.All
 
     if (map.get("utility")) |x| {
         if (x.boolean == true) {
-            logs("utility mode - no gui");
+            engine_logs("utility mode - no gui");
             gIsUtility = true;
         }
     }
@@ -450,7 +456,7 @@ pub fn SlackStruct(comptime T: type, comptime SlackSize: usize) type {
 }
 
 pub fn cast(comptime T: type, p: *anyopaque) T {
-    return @alignCast(@ptrCast(p));
+    return @ptrCast(@alignCast(p));
 }
 
 pub fn MakeNameFmt(comptime fmt: []const u8, args: anytype) Name {
diff --git a/engine/core/src/extern/externModule.zig b/engine/core/src/extern/externModule.zig
index 44cf23e..d4b9b8f 100644
--- a/engine/core/src/extern/externModule.zig
+++ b/engine/core/src/extern/externModule.zig
@@ -2,8 +2,8 @@
 //
 
 const ModuleInterface = struct {
-    startup: *const fn (*anyopaque, ?*anyopaque) callconv(.C) bool = undefined,
-    shutdown: *const fn () callconv(.C) void = undefined,
+    startup: *const fn (*anyopaque, ?*anyopaque) callconv(.c) bool = undefined,
+    shutdown: *const fn () callconv(.c) void = undefined,
 };
 
 pub const ModuleLoaderArgs = extern struct {
diff --git a/engine/core/src/externObject.zig b/engine/core/src/externObject.zig
index 95e4118..554e9a0 100644
--- a/engine/core/src/externObject.zig
+++ b/engine/core/src/externObject.zig
@@ -1,9 +1,9 @@
 // script objects.
 
 pub const ObjectTable = extern struct {
-    create: *const fn (allocator: *anyopaque) callconv(.C) ?*anyopaque,
-    tick: *const fn (*anyopaque, f64) callconv(.C) void,
-    destroy: *const fn (p: *anyopaque) callconv(.C) ?*anyopaque,
+    create: *const fn (allocator: *anyopaque) callconv(.c) ?*anyopaque,
+    tick: *const fn (*anyopaque, f64) callconv(.c) void,
+    destroy: *const fn (p: *anyopaque) callconv(.c) ?*anyopaque,
 };
 
 // eg. in C
diff --git a/engine/core/src/jobs.zig b/engine/core/src/jobs.zig
index 26aa558..6d04243 100644
--- a/engine/core/src/jobs.zig
+++ b/engine/core/src/jobs.zig
@@ -150,7 +150,7 @@ pub const JobWorker = struct {
     }
 
     pub fn workerThreadFunc(self: *@This()) void {
-        const printed = std.fmt.allocPrintZ(self.allocator, "WorkerThread_{d}", .{self.workerId}) catch unreachable;
+        const printed = std.fmt.allocPrintSentinel(self.allocator, "WorkerThread_{d}", .{self.workerId}, 0) catch unreachable;
         tracy.InitThread();
         tracy.SetThreadName(@as([*:0]u8, @ptrCast(printed.ptr)));
 
diff --git a/engine/core/src/panickers.zig b/engine/core/src/panickers.zig
index f3d2c29..bd397ab 100644
--- a/engine/core/src/panickers.zig
+++ b/engine/core/src/panickers.zig
@@ -104,7 +104,7 @@ fn dumpSegfaultInfoPosix(sig: i32, addr: usize, ctx_ptr: ?*anyopaque) void {
     }
 }
 
-fn handleSegfaultPosix(sig: i32, info: *const std.posix.siginfo_t, ctx_ptr: ?*anyopaque) callconv(.C) noreturn {
+fn handleSegfaultPosix(sig: i32, info: *const std.posix.siginfo_t, ctx_ptr: ?*anyopaque) callconv(.c) noreturn {
     core.engine_logs("PANIC!!");
     core.forceFlush();
     resetSegfaultHandler();
diff --git a/engine/core/src/script.zig b/engine/core/src/script.zig
index ca9d08d..539a575 100644
--- a/engine/core/src/script.zig
+++ b/engine/core/src/script.zig
@@ -27,7 +27,7 @@ const luaRegLibs: []const c.luaL_Reg = &.{
 };
 
 // binds the default print() function in lua to print to the console
-fn printWrapper(l: ?*lua.c.lua_State) callconv(.C) i32 {
+fn printWrapper(l: ?*lua.c.lua_State) callconv(.c) i32 {
     const state: lua.LuaState = .{ .l = l };
     const argc = state.getTop();
 
diff --git a/engine/core/src/stacks.zig b/engine/core/src/stacks.zig
index b4effd4..d84c4a1 100644
--- a/engine/core/src/stacks.zig
+++ b/engine/core/src/stacks.zig
@@ -98,17 +98,14 @@ pub const StackCompactor = struct {
                 const symbol_info = module.getSymbolAtAddress(debug_info.allocator, address) catch continue;
 
                 if (symbol_info.source_location) |line_info| {
-                    ownedStack.debugStr[i] = try std.fmt.allocPrintZ(
+                    ownedStack.debugStr[i] = try std.fmt.allocPrintSentinel(
                         bumpAllocator,
                         "{d}> @0x{x} symbol_name: {s} {s} > {s}: {d}",
                         .{ i, address, symbol_info.name, symbol_info.compile_unit_name, line_info.file_name, line_info.line },
+                        0,
                     );
                 } else {
-                    ownedStack.debugStr[i] = try std.fmt.allocPrintZ(
-                        bumpAllocator,
-                        "{d}> @0x{x} symbol_name: {s} {s} > no file info",
-                        .{ i, address, symbol_info.name, symbol_info.compile_unit_name },
-                    );
+                    ownedStack.debugStr[i] = try std.fmt.allocPrintSentinel(bumpAllocator, "{d}> @0x{x} symbol_name: {s} {s} > no file info", .{ i, address, symbol_info.name, symbol_info.compile_unit_name }, 0);
                 }
             }
 
diff --git a/engine/physics/src/physicsSystem.zig b/engine/physics/src/physicsSystem.zig
index 86a0d5c..d0a605a 100644
--- a/engine/physics/src/physicsSystem.zig
+++ b/engine/physics/src/physicsSystem.zig
@@ -41,7 +41,7 @@ pub const IgnoreFixedBodiesFilter = extern struct {
         self.len += 1;
     }
 
-    pub fn _shouldCollide(p: *const zphysics.BodyFilter, bodyId: *const BodyId) callconv(.C) bool {
+    pub fn _shouldCollide(p: *const zphysics.BodyFilter, bodyId: *const BodyId) callconv(.c) bool {
         const self: *const @This() = @ptrCast(p);
         for (0..self.len) |i| {
             if (self.filtered[i] == bodyId.*) {
@@ -51,7 +51,7 @@ pub const IgnoreFixedBodiesFilter = extern struct {
         return true;
     }
 
-    pub fn _shouldCollideLocked(p: *const zphysics.BodyFilter, body: *const Body) callconv(.C) bool {
+    pub fn _shouldCollideLocked(p: *const zphysics.BodyFilter, body: *const Body) callconv(.c) bool {
         const self: *const @This() = @ptrCast(p);
         _ = self;
         _ = body;
@@ -77,14 +77,14 @@ const BroadPhaseLayerInterface = extern struct {
         return layer_interface;
     }
 
-    fn _getNumBroadPhaseLayers(_: *const zphysics.BroadPhaseLayerInterface) callconv(.C) u32 {
+    fn _getNumBroadPhaseLayers(_: *const zphysics.BroadPhaseLayerInterface) callconv(.c) u32 {
         return BroadPhaseLayers.len;
     }
 
     fn _getBroadPhaseLayer(
         interface_self: *const zphysics.BroadPhaseLayerInterface,
         object_layer: zphysics.ObjectLayer,
-    ) callconv(.C) zphysics.BroadPhaseLayer {
+    ) callconv(.c) zphysics.BroadPhaseLayer {
         const self: *const BroadPhaseLayerInterface = @ptrCast(interface_self);
         return self.object_to_broad_phase[object_layer];
     }
@@ -100,7 +100,7 @@ const ObjectVsBroadPhaseLayerFilter = extern struct {
         _: *const zphysics.ObjectVsBroadPhaseLayerFilter,
         object_layer: zphysics.ObjectLayer,
         broad_phase_layer: zphysics.BroadPhaseLayer,
-    ) callconv(.C) bool {
+    ) callconv(.c) bool {
         return switch (object_layer) {
             ObjectLayers.non_moving => broad_phase_layer == BroadPhaseLayers.moving,
             ObjectLayers.moving => true,
@@ -119,7 +119,7 @@ const ObjectLayerPairFilter = extern struct {
         _: *const zphysics.ObjectLayerPairFilter,
         a: zphysics.ObjectLayer,
         b: zphysics.ObjectLayer,
-    ) callconv(.C) bool {
+    ) callconv(.c) bool {
         return switch (a) {
             ObjectLayers.non_moving => b == ObjectLayers.moving,
             ObjectLayers.moving => true,
diff --git a/engine/physics/src/physicsSystem_old.zig b/engine/physics/src/physicsSystem_old.zig
index e2865e6..19428c0 100644
--- a/engine/physics/src/physicsSystem_old.zig
+++ b/engine/physics/src/physicsSystem_old.zig
@@ -33,14 +33,14 @@ const BroadPhaseLayerInterface = extern struct {
         return layer_interface;
     }
 
-    fn _getNumBroadPhaseLayers(_: *const zphysics.BroadPhaseLayerInterface) callconv(.C) u32 {
+    fn _getNumBroadPhaseLayers(_: *const zphysics.BroadPhaseLayerInterface) callconv(.c) u32 {
         return BroadPhaseLayers.len;
     }
 
     fn _getBroadPhaseLayer(
         interface_self: *const zphysics.BroadPhaseLayerInterface,
         object_layer: zphysics.ObjectLayer,
-    ) callconv(.C) zphysics.BroadPhaseLayer {
+    ) callconv(.c) zphysics.BroadPhaseLayer {
         const self: *const BroadPhaseLayerInterface = @ptrCast(interface_self);
         return self.object_to_broad_phase[object_layer];
     }
@@ -56,7 +56,7 @@ const ObjectVsBroadPhaseLayerFilter = extern struct {
         _: *const zphysics.ObjectVsBroadPhaseLayerFilter,
         object_layer: zphysics.ObjectLayer,
         broad_phase_layer: zphysics.BroadPhaseLayer,
-    ) callconv(.C) bool {
+    ) callconv(.c) bool {
         return switch (object_layer) {
             ObjectLayers.non_moving => broad_phase_layer == BroadPhaseLayers.moving,
             ObjectLayers.moving => true,
@@ -75,7 +75,7 @@ const ObjectLayerPairFilter = extern struct {
         _: *const zphysics.ObjectLayerPairFilter,
         a: zphysics.ObjectLayer,
         b: zphysics.ObjectLayer,
-    ) callconv(.C) bool {
+    ) callconv(.c) bool {
         return switch (a) {
             ObjectLayers.non_moving => b == ObjectLayers.moving,
             ObjectLayers.moving => true,
diff --git a/lib/cimgui/cimgui/imgui/translated.zig b/lib/cimgui/cimgui/imgui/translated.zig
index 7c3b2ca..1940bfc 100644
--- a/lib/cimgui/cimgui/imgui/translated.zig
+++ b/lib/cimgui/cimgui/imgui/translated.zig
@@ -193,7 +193,7 @@ pub const struct_ImVector_ImFontConfig = extern struct {
 };
 pub const ImVector_ImFontConfig = struct_ImVector_ImFontConfig;
 pub const struct_ImFontBuilderIO = extern struct {
-    FontBuilder_Build: ?*const fn ([*c]ImFontAtlas) callconv(.C) bool = @import("std").mem.zeroes(?*const fn ([*c]ImFontAtlas) callconv(.C) bool),
+    FontBuilder_Build: ?*const fn ([*c]ImFontAtlas) callconv(.c) bool = @import("std").mem.zeroes(?*const fn ([*c]ImFontAtlas) callconv(.c) bool),
 };
 pub const ImFontBuilderIO = struct_ImFontBuilderIO;
 pub const struct_ImFontAtlas = extern struct {
@@ -311,7 +311,7 @@ pub const struct_ImDrawList = extern struct {
     _FringeScale: f32 = @import("std").mem.zeroes(f32),
 };
 pub const ImDrawList = struct_ImDrawList;
-pub const ImDrawCallback = ?*const fn ([*c]const ImDrawList, [*c]const ImDrawCmd) callconv(.C) void;
+pub const ImDrawCallback = ?*const fn ([*c]const ImDrawList, [*c]const ImDrawCmd) callconv(.c) void;
 pub const struct_ImDrawCmd = extern struct {
     ClipRect: ImVec4 = @import("std").mem.zeroes(ImVec4),
     TextureId: ImTextureID = @import("std").mem.zeroes(ImTextureID),
@@ -437,10 +437,10 @@ pub const struct_ImGuiIO = extern struct {
     BackendPlatformUserData: ?*anyopaque = @import("std").mem.zeroes(?*anyopaque),
     BackendRendererUserData: ?*anyopaque = @import("std").mem.zeroes(?*anyopaque),
     BackendLanguageUserData: ?*anyopaque = @import("std").mem.zeroes(?*anyopaque),
-    GetClipboardTextFn: ?*const fn (?*anyopaque) callconv(.C) [*c]const u8 = @import("std").mem.zeroes(?*const fn (?*anyopaque) callconv(.C) [*c]const u8),
-    SetClipboardTextFn: ?*const fn (?*anyopaque, [*c]const u8) callconv(.C) void = @import("std").mem.zeroes(?*const fn (?*anyopaque, [*c]const u8) callconv(.C) void),
+    GetClipboardTextFn: ?*const fn (?*anyopaque) callconv(.c) [*c]const u8 = @import("std").mem.zeroes(?*const fn (?*anyopaque) callconv(.c) [*c]const u8),
+    SetClipboardTextFn: ?*const fn (?*anyopaque, [*c]const u8) callconv(.c) void = @import("std").mem.zeroes(?*const fn (?*anyopaque, [*c]const u8) callconv(.c) void),
     ClipboardUserData: ?*anyopaque = @import("std").mem.zeroes(?*anyopaque),
-    SetPlatformImeDataFn: ?*const fn ([*c]ImGuiViewport, [*c]ImGuiPlatformImeData) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, [*c]ImGuiPlatformImeData) callconv(.C) void),
+    SetPlatformImeDataFn: ?*const fn ([*c]ImGuiViewport, [*c]ImGuiPlatformImeData) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, [*c]ImGuiPlatformImeData) callconv(.c) void),
     _UnusedPadding: ?*anyopaque = @import("std").mem.zeroes(?*anyopaque),
     WantCaptureMouse: bool = @import("std").mem.zeroes(bool),
     WantCaptureKeyboard: bool = @import("std").mem.zeroes(bool),
@@ -518,29 +518,29 @@ pub const struct_ImVector_ImGuiViewportPtr = extern struct {
 };
 pub const ImVector_ImGuiViewportPtr = struct_ImVector_ImGuiViewportPtr;
 pub const struct_ImGuiPlatformIO = extern struct {
-    Platform_CreateWindow: ?*const fn ([*c]ImGuiViewport) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) void),
-    Platform_DestroyWindow: ?*const fn ([*c]ImGuiViewport) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) void),
-    Platform_ShowWindow: ?*const fn ([*c]ImGuiViewport) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) void),
-    Platform_SetWindowPos: ?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.C) void),
-    Platform_GetWindowPos: ?*const fn ([*c]ImGuiViewport) callconv(.C) ImVec2 = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) ImVec2),
-    Platform_SetWindowSize: ?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.C) void),
-    Platform_GetWindowSize: ?*const fn ([*c]ImGuiViewport) callconv(.C) ImVec2 = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) ImVec2),
-    Platform_SetWindowFocus: ?*const fn ([*c]ImGuiViewport) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) void),
-    Platform_GetWindowFocus: ?*const fn ([*c]ImGuiViewport) callconv(.C) bool = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) bool),
-    Platform_GetWindowMinimized: ?*const fn ([*c]ImGuiViewport) callconv(.C) bool = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) bool),
-    Platform_SetWindowTitle: ?*const fn ([*c]ImGuiViewport, [*c]const u8) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, [*c]const u8) callconv(.C) void),
-    Platform_SetWindowAlpha: ?*const fn ([*c]ImGuiViewport, f32) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, f32) callconv(.C) void),
-    Platform_UpdateWindow: ?*const fn ([*c]ImGuiViewport) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) void),
-    Platform_RenderWindow: ?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.C) void),
-    Platform_SwapBuffers: ?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.C) void),
-    Platform_GetWindowDpiScale: ?*const fn ([*c]ImGuiViewport) callconv(.C) f32 = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) f32),
-    Platform_OnChangedViewport: ?*const fn ([*c]ImGuiViewport) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) void),
-    Platform_CreateVkSurface: ?*const fn ([*c]ImGuiViewport, ImU64, ?*const anyopaque, [*c]ImU64) callconv(.C) c_int = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ImU64, ?*const anyopaque, [*c]ImU64) callconv(.C) c_int),
-    Renderer_CreateWindow: ?*const fn ([*c]ImGuiViewport) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) void),
-    Renderer_DestroyWindow: ?*const fn ([*c]ImGuiViewport) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.C) void),
-    Renderer_SetWindowSize: ?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.C) void),
-    Renderer_RenderWindow: ?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.C) void),
-    Renderer_SwapBuffers: ?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.C) void),
+    Platform_CreateWindow: ?*const fn ([*c]ImGuiViewport) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) void),
+    Platform_DestroyWindow: ?*const fn ([*c]ImGuiViewport) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) void),
+    Platform_ShowWindow: ?*const fn ([*c]ImGuiViewport) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) void),
+    Platform_SetWindowPos: ?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.c) void),
+    Platform_GetWindowPos: ?*const fn ([*c]ImGuiViewport) callconv(.c) ImVec2 = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) ImVec2),
+    Platform_SetWindowSize: ?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.c) void),
+    Platform_GetWindowSize: ?*const fn ([*c]ImGuiViewport) callconv(.c) ImVec2 = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) ImVec2),
+    Platform_SetWindowFocus: ?*const fn ([*c]ImGuiViewport) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) void),
+    Platform_GetWindowFocus: ?*const fn ([*c]ImGuiViewport) callconv(.c) bool = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) bool),
+    Platform_GetWindowMinimized: ?*const fn ([*c]ImGuiViewport) callconv(.c) bool = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) bool),
+    Platform_SetWindowTitle: ?*const fn ([*c]ImGuiViewport, [*c]const u8) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, [*c]const u8) callconv(.c) void),
+    Platform_SetWindowAlpha: ?*const fn ([*c]ImGuiViewport, f32) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, f32) callconv(.c) void),
+    Platform_UpdateWindow: ?*const fn ([*c]ImGuiViewport) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) void),
+    Platform_RenderWindow: ?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.c) void),
+    Platform_SwapBuffers: ?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.c) void),
+    Platform_GetWindowDpiScale: ?*const fn ([*c]ImGuiViewport) callconv(.c) f32 = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) f32),
+    Platform_OnChangedViewport: ?*const fn ([*c]ImGuiViewport) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) void),
+    Platform_CreateVkSurface: ?*const fn ([*c]ImGuiViewport, ImU64, ?*const anyopaque, [*c]ImU64) callconv(.c) c_int = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ImU64, ?*const anyopaque, [*c]ImU64) callconv(.c) c_int),
+    Renderer_CreateWindow: ?*const fn ([*c]ImGuiViewport) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) void),
+    Renderer_DestroyWindow: ?*const fn ([*c]ImGuiViewport) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport) callconv(.c) void),
+    Renderer_SetWindowSize: ?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ImVec2) callconv(.c) void),
+    Renderer_RenderWindow: ?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.c) void),
+    Renderer_SwapBuffers: ?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiViewport, ?*anyopaque) callconv(.c) void),
     Monitors: ImVector_ImGuiPlatformMonitor = @import("std").mem.zeroes(ImVector_ImGuiPlatformMonitor),
     Viewports: ImVector_ImGuiViewportPtr = @import("std").mem.zeroes(ImVector_ImGuiViewportPtr),
 };
@@ -859,7 +859,7 @@ pub const struct_ImGuiSizeCallbackData = extern struct {
     DesiredSize: ImVec2 = @import("std").mem.zeroes(ImVec2),
 };
 pub const ImGuiSizeCallbackData = struct_ImGuiSizeCallbackData;
-pub const ImGuiSizeCallback = ?*const fn ([*c]ImGuiSizeCallbackData) callconv(.C) void;
+pub const ImGuiSizeCallback = ?*const fn ([*c]ImGuiSizeCallbackData) callconv(.c) void;
 pub const struct_ImGuiNextWindowData = extern struct {
     Flags: ImGuiNextWindowDataFlags = @import("std").mem.zeroes(ImGuiNextWindowDataFlags),
     PosCond: ImGuiCond = @import("std").mem.zeroes(ImGuiCond),
@@ -1231,12 +1231,12 @@ pub const ImGuiContext = struct_ImGuiContext;
 pub const struct_ImGuiSettingsHandler = extern struct {
     TypeName: [*c]const u8 = @import("std").mem.zeroes([*c]const u8),
     TypeHash: ImGuiID = @import("std").mem.zeroes(ImGuiID),
-    ClearAllFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.C) void),
-    ReadInitFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.C) void),
-    ReadOpenFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, [*c]const u8) callconv(.C) ?*anyopaque = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, [*c]const u8) callconv(.C) ?*anyopaque),
-    ReadLineFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, ?*anyopaque, [*c]const u8) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, ?*anyopaque, [*c]const u8) callconv(.C) void),
-    ApplyAllFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.C) void),
-    WriteAllFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, [*c]ImGuiTextBuffer) callconv(.C) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, [*c]ImGuiTextBuffer) callconv(.C) void),
+    ClearAllFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.c) void),
+    ReadInitFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.c) void),
+    ReadOpenFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, [*c]const u8) callconv(.c) ?*anyopaque = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, [*c]const u8) callconv(.c) ?*anyopaque),
+    ReadLineFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, ?*anyopaque, [*c]const u8) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, ?*anyopaque, [*c]const u8) callconv(.c) void),
+    ApplyAllFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler) callconv(.c) void),
+    WriteAllFn: ?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, [*c]ImGuiTextBuffer) callconv(.c) void = @import("std").mem.zeroes(?*const fn ([*c]ImGuiContext, [*c]ImGuiSettingsHandler, [*c]ImGuiTextBuffer) callconv(.c) void),
     UserData: ?*anyopaque = @import("std").mem.zeroes(?*anyopaque),
 };
 pub const ImGuiSettingsHandler = struct_ImGuiSettingsHandler;
@@ -1254,7 +1254,7 @@ pub const struct_ImChunkStream_ImGuiTableSettings = extern struct {
     Buf: ImVector_char = @import("std").mem.zeroes(ImVector_char),
 };
 pub const ImChunkStream_ImGuiTableSettings = struct_ImChunkStream_ImGuiTableSettings;
-pub const ImGuiContextHookCallback = ?*const fn ([*c]ImGuiContext, [*c]ImGuiContextHook) callconv(.C) void;
+pub const ImGuiContextHookCallback = ?*const fn ([*c]ImGuiContext, [*c]ImGuiContextHook) callconv(.c) void;
 pub const struct_ImGuiContextHook = extern struct {
     HookId: ImGuiID = @import("std").mem.zeroes(ImGuiID),
     Type: ImGuiContextHookType = @import("std").mem.zeroes(ImGuiContextHookType),
@@ -1731,9 +1731,9 @@ pub const ImGuiTableRowFlags = c_int;
 pub const ImGuiTreeNodeFlags = c_int;
 pub const ImS64 = c_longlong;
 pub const ImWchar32 = c_uint;
-pub const ImGuiInputTextCallback = ?*const fn ([*c]ImGuiInputTextCallbackData) callconv(.C) c_int;
-pub const ImGuiMemAllocFunc = ?*const fn (usize, ?*anyopaque) callconv(.C) ?*anyopaque;
-pub const ImGuiMemFreeFunc = ?*const fn (?*anyopaque, ?*anyopaque) callconv(.C) void;
+pub const ImGuiInputTextCallback = ?*const fn ([*c]ImGuiInputTextCallbackData) callconv(.c) c_int;
+pub const ImGuiMemAllocFunc = ?*const fn (usize, ?*anyopaque) callconv(.c) ?*anyopaque;
+pub const ImGuiMemFreeFunc = ?*const fn (?*anyopaque, ?*anyopaque) callconv(.c) void;
 pub const ImGuiWindowFlags_None: c_int = 0;
 pub const ImGuiWindowFlags_NoTitleBar: c_int = 1;
 pub const ImGuiWindowFlags_NoResize: c_int = 2;
@@ -2385,7 +2385,7 @@ pub const ImGuiNavDirSourceFlags = c_int;
 pub const ImGuiSeparatorFlags = c_int;
 pub const ImGuiTextFlags = c_int;
 pub const ImGuiTooltipFlags = c_int;
-pub const ImGuiErrorLogCallback = ?*const fn (?*anyopaque, [*c]const u8, ...) callconv(.C) void;
+pub const ImGuiErrorLogCallback = ?*const fn (?*anyopaque, [*c]const u8, ...) callconv(.c) void;
 pub extern var GImGui: [*c]ImGuiContext;
 pub const struct_StbTexteditRow = extern struct {
     x0: f32 = @import("std").mem.zeroes(f32),
@@ -2850,7 +2850,7 @@ pub extern fn igBeginCombo(label: [*c]const u8, preview_value: [*c]const u8, fla
 pub extern fn igEndCombo() void;
 pub extern fn igCombo_Str_arr(label: [*c]const u8, current_item: [*c]c_int, items: [*c]const [*c]const u8, items_count: c_int, popup_max_height_in_items: c_int) bool;
 pub extern fn igCombo_Str(label: [*c]const u8, current_item: [*c]c_int, items_separated_by_zeros: [*c]const u8, popup_max_height_in_items: c_int) bool;
-pub extern fn igCombo_FnBoolPtr(label: [*c]const u8, current_item: [*c]c_int, items_getter: ?*const fn (?*anyopaque, c_int, [*c][*c]const u8) callconv(.C) bool, data: ?*anyopaque, items_count: c_int, popup_max_height_in_items: c_int) bool;
+pub extern fn igCombo_FnBoolPtr(label: [*c]const u8, current_item: [*c]c_int, items_getter: ?*const fn (?*anyopaque, c_int, [*c][*c]const u8) callconv(.c) bool, data: ?*anyopaque, items_count: c_int, popup_max_height_in_items: c_int) bool;
 pub extern fn igDragFloat(label: [*c]const u8, v: [*c]f32, v_speed: f32, v_min: f32, v_max: f32, format: [*c]const u8, flags: ImGuiSliderFlags) bool;
 pub extern fn igDragFloat2(label: [*c]const u8, v: [*c]f32, v_speed: f32, v_min: f32, v_max: f32, format: [*c]const u8, flags: ImGuiSliderFlags) bool;
 pub extern fn igDragFloat3(label: [*c]const u8, v: [*c]f32, v_speed: f32, v_min: f32, v_max: f32, format: [*c]const u8, flags: ImGuiSliderFlags) bool;
@@ -2919,11 +2919,11 @@ pub extern fn igSelectable_BoolPtr(label: [*c]const u8, p_selected: [*c]bool, fl
 pub extern fn igBeginListBox(label: [*c]const u8, size: ImVec2) bool;
 pub extern fn igEndListBox() void;
 pub extern fn igListBox_Str_arr(label: [*c]const u8, current_item: [*c]c_int, items: [*c]const [*c]const u8, items_count: c_int, height_in_items: c_int) bool;
-pub extern fn igListBox_FnBoolPtr(label: [*c]const u8, current_item: [*c]c_int, items_getter: ?*const fn (?*anyopaque, c_int, [*c][*c]const u8) callconv(.C) bool, data: ?*anyopaque, items_count: c_int, height_in_items: c_int) bool;
+pub extern fn igListBox_FnBoolPtr(label: [*c]const u8, current_item: [*c]c_int, items_getter: ?*const fn (?*anyopaque, c_int, [*c][*c]const u8) callconv(.c) bool, data: ?*anyopaque, items_count: c_int, height_in_items: c_int) bool;
 pub extern fn igPlotLines_FloatPtr(label: [*c]const u8, values: [*c]const f32, values_count: c_int, values_offset: c_int, overlay_text: [*c]const u8, scale_min: f32, scale_max: f32, graph_size: ImVec2, stride: c_int) void;
-pub extern fn igPlotLines_FnFloatPtr(label: [*c]const u8, values_getter: ?*const fn (?*anyopaque, c_int) callconv(.C) f32, data: ?*anyopaque, values_count: c_int, values_offset: c_int, overlay_text: [*c]const u8, scale_min: f32, scale_max: f32, graph_size: ImVec2) void;     
+pub extern fn igPlotLines_FnFloatPtr(label: [*c]const u8, values_getter: ?*const fn (?*anyopaque, c_int) callconv(.c) f32, data: ?*anyopaque, values_count: c_int, values_offset: c_int, overlay_text: [*c]const u8, scale_min: f32, scale_max: f32, graph_size: ImVec2) void;     
 pub extern fn igPlotHistogram_FloatPtr(label: [*c]const u8, values: [*c]const f32, values_count: c_int, values_offset: c_int, overlay_text: [*c]const u8, scale_min: f32, scale_max: f32, graph_size: ImVec2, stride: c_int) void;
-pub extern fn igPlotHistogram_FnFloatPtr(label: [*c]const u8, values_getter: ?*const fn (?*anyopaque, c_int) callconv(.C) f32, data: ?*anyopaque, values_count: c_int, values_offset: c_int, overlay_text: [*c]const u8, scale_min: f32, scale_max: f32, graph_size: ImVec2) void; 
+pub extern fn igPlotHistogram_FnFloatPtr(label: [*c]const u8, values_getter: ?*const fn (?*anyopaque, c_int) callconv(.c) f32, data: ?*anyopaque, values_count: c_int, values_offset: c_int, overlay_text: [*c]const u8, scale_min: f32, scale_max: f32, graph_size: ImVec2) void; 
 pub extern fn igValue_Bool(prefix: [*c]const u8, b: bool) void;
 pub extern fn igValue_Int(prefix: [*c]const u8, v: c_int) void;
 pub extern fn igValue_Uint(prefix: [*c]const u8, v: c_uint) void;
@@ -3334,7 +3334,7 @@ pub extern fn ImGuiPlatformImeData_destroy(self: [*c]ImGuiPlatformImeData) void;
 pub extern fn igGetKeyIndex(key: ImGuiKey) c_int;
 pub extern fn igImHashData(data: ?*const anyopaque, data_size: usize, seed: ImU32) ImGuiID;
 pub extern fn igImHashStr(data: [*c]const u8, data_size: usize, seed: ImU32) ImGuiID;
-pub extern fn igImQsort(base: ?*anyopaque, count: usize, size_of_element: usize, compare_func: ?*const fn (?*const anyopaque, ?*const anyopaque) callconv(.C) c_int) void;
+pub extern fn igImQsort(base: ?*anyopaque, count: usize, size_of_element: usize, compare_func: ?*const fn (?*const anyopaque, ?*const anyopaque) callconv(.c) c_int) void;
 pub extern fn igImAlphaBlendColors(col_a: ImU32, col_b: ImU32) ImU32;
 pub extern fn igImIsPowerOfTwo_Int(v: c_int) bool;
 pub extern fn igImIsPowerOfTwo_U64(v: ImU64) bool;
@@ -3908,7 +3908,7 @@ pub extern fn igGetInputTextState(id: ImGuiID) [*c]ImGuiInputTextState;
 pub extern fn igColorTooltip(text: [*c]const u8, col: [*c]const f32, flags: ImGuiColorEditFlags) void;
 pub extern fn igColorEditOptionsPopup(col: [*c]const f32, flags: ImGuiColorEditFlags) void;
 pub extern fn igColorPickerOptionsPopup(ref_col: [*c]const f32, flags: ImGuiColorEditFlags) void;
-pub extern fn igPlotEx(plot_type: ImGuiPlotType, label: [*c]const u8, values_getter: ?*const fn (?*anyopaque, c_int) callconv(.C) f32, data: ?*anyopaque, values_count: c_int, values_offset: c_int, overlay_text: [*c]const u8, scale_min: f32, scale_max: f32, frame_size: ImVec2
+pub extern fn igPlotEx(plot_type: ImGuiPlotType, label: [*c]const u8, values_getter: ?*const fn (?*anyopaque, c_int) callconv(.c) f32, data: ?*anyopaque, values_count: c_int, values_offset: c_int, overlay_text: [*c]const u8, scale_min: f32, scale_max: f32, frame_size: ImVec2
 ) c_int;
 pub extern fn igShadeVertsLinearColorGradientKeepAlpha(draw_list: [*c]ImDrawList, vert_start_idx: c_int, vert_end_idx: c_int, gradient_p0: ImVec2, gradient_p1: ImVec2, col0: ImU32, col1: ImU32) void;
 pub extern fn igShadeVertsLinearUV(draw_list: [*c]ImDrawList, vert_start_idx: c_int, vert_end_idx: c_int, a: ImVec2, b: ImVec2, uv_a: ImVec2, uv_b: ImVec2, clamp: bool) void;
diff --git a/lib/cimgui/src/cimgui.zig b/lib/cimgui/src/cimgui.zig
index f5c58f4..cb103db 100644
--- a/lib/cimgui/src/cimgui.zig
+++ b/lib/cimgui/src/cimgui.zig
@@ -81,10 +81,10 @@ pub const Wchar = c_ushort; // ImWchar;
 pub const Wchar16 = c_ushort; // ImWchar16;
 pub const Wchar32 = c_int; // ImWchar32;
 
-pub const InputTextCallback = ?*const fn (data: *InputTextCallbackData) callconv(.C) c_int; // ImGuiInputTextCallback
-pub const SizeCallback = *const fn (data: *SizeCallbackData) callconv(.C) void; // ImGuiInputTextCallback
-pub const MemAllocFunc = *const fn (sz: usize, user_data: ?*anyopaque) callconv(.C) ?*anyopaque; // ImGuiMemAllocFunc
-pub const MemFreeFunc = *const fn (ptr: ?*anyopaque, user_data: ?*anyopaque) callconv(.C) void; // ImMemAllocFunction
+pub const InputTextCallback = ?*const fn (data: *InputTextCallbackData) callconv(.c) c_int; // ImGuiInputTextCallback
+pub const SizeCallback = *const fn (data: *SizeCallbackData) callconv(.c) void; // ImGuiInputTextCallback
+pub const MemAllocFunc = *const fn (sz: usize, user_data: ?*anyopaque) callconv(.c) ?*anyopaque; // ImGuiMemAllocFunc
+pub const MemFreeFunc = *const fn (ptr: ?*anyopaque, user_data: ?*anyopaque) callconv(.c) void; // ImMemAllocFunction
 
 pub const Vec2 = extern struct { // ImVec2
     x: f32 = 0,
@@ -1034,14 +1034,14 @@ pub const Io = extern struct {
     backend_language_user_data: ?*anyopaque, // void* BackendLanguageUserData;
     //
     // const char* (*GetClipboardTextFn)(void* user_data);
-    get_clipboard_text_fn: *const fn (?*anyopaque) callconv(.C) [*c]const u8,
+    get_clipboard_text_fn: *const fn (?*anyopaque) callconv(.c) [*c]const u8,
 
     // void (*SetClipboardTextFn)(void* user_data, const char* text);
-    set_clipboard_text_fn: *const fn (?*anyopaque, [*c]const u8) callconv(.C) void,
+    set_clipboard_text_fn: *const fn (?*anyopaque, [*c]const u8) callconv(.c) void,
     clipboard_user_data: ?*anyopaque, // void* ClipboardUserData;
 
     // void (*SetPlatformImeDataFn)(ImGuiViewport* viewport, ImGuiPlatformImeData* data);
-    set_platform_ime_data_fn: *const fn ([*c]Viewport, [*c]PlatformImeData) callconv(.C) void,
+    set_platform_ime_data_fn: *const fn ([*c]Viewport, [*c]PlatformImeData) callconv(.c) void,
 
     _unused_padding: ?*anyopaque, // void* _UnusedPadding;
     want_capture_mouse: bool, // bool WantCaptureMouse;
@@ -1130,29 +1130,29 @@ pub const ViewportPtrVector = extern struct { // struct ImVector_ImGuiViewportPt
 };
 
 pub const PlatformIO = extern struct { // struct ImGuiPlatformIO
-    platform_create_window: *const fn ([*c]Viewport) callconv(.C) void,
-    platform_destroy_window: *const fn ([*c]Viewport) callconv(.C) void,
-    platform_show_window: *const fn ([*c]Viewport) callconv(.C) void,
-    platform_set_window_pos: *const fn ([*c]Viewport, Vec2) callconv(.C) void,
-    platform_get_window_pos: *const fn ([*c]Viewport) callconv(.C) Vec2,
-    platform_set_window_size: *const fn ([*c]Viewport, Vec2) callconv(.C) void,
-    platform_get_window_size: *const fn ([*c]Viewport) callconv(.C) Vec2,
-    platform_set_window_focus: *const fn ([*c]Viewport) callconv(.C) void,
-    platform_get_window_focus: *const fn ([*c]Viewport) callconv(.C) bool,
-    platform_get_window_minimized: *const fn ([*c]Viewport) callconv(.C) bool,
-    platform_set_window_title: *const fn ([*c]Viewport, [*c]const u8) callconv(.C) void,
-    platform_set_window_alpha: *const fn ([*c]Viewport, f32) callconv(.C) void,
-    platform_update_window: *const fn ([*c]Viewport) callconv(.C) void,
-    platform_render_window: *const fn ([*c]Viewport, ?*anyopaque) callconv(.C) void,
-    platform_swap_buffers: *const fn ([*c]Viewport, ?*anyopaque) callconv(.C) void,
-    platform_get_window_dpi_scale: *const fn ([*c]Viewport) callconv(.C) f32,
-    platform_on_changed_viewport: *const fn ([*c]Viewport) callconv(.C) void,
-    platform_create_vk_surface: *const fn ([*c]Viewport, U64, ?*const anyopaque, [*c]U64) callconv(.C) c_int,
-    renderer_create_window: *const fn ([*c]Viewport) callconv(.C) void,
-    renderer_destroy_window: *const fn ([*c]Viewport) callconv(.C) void,
-    renderer_set_window_size: *const fn ([*c]Viewport, Vec2) callconv(.C) void,
-    renderer_render_window: *const fn ([*c]Viewport, ?*anyopaque) callconv(.C) void,
-    renderer_swap_buffers: *const fn ([*c]Viewport, ?*anyopaque) callconv(.C) void,
+    platform_create_window: *const fn ([*c]Viewport) callconv(.c) void,
+    platform_destroy_window: *const fn ([*c]Viewport) callconv(.c) void,
+    platform_show_window: *const fn ([*c]Viewport) callconv(.c) void,
+    platform_set_window_pos: *const fn ([*c]Viewport, Vec2) callconv(.c) void,
+    platform_get_window_pos: *const fn ([*c]Viewport) callconv(.c) Vec2,
+    platform_set_window_size: *const fn ([*c]Viewport, Vec2) callconv(.c) void,
+    platform_get_window_size: *const fn ([*c]Viewport) callconv(.c) Vec2,
+    platform_set_window_focus: *const fn ([*c]Viewport) callconv(.c) void,
+    platform_get_window_focus: *const fn ([*c]Viewport) callconv(.c) bool,
+    platform_get_window_minimized: *const fn ([*c]Viewport) callconv(.c) bool,
+    platform_set_window_title: *const fn ([*c]Viewport, [*c]const u8) callconv(.c) void,
+    platform_set_window_alpha: *const fn ([*c]Viewport, f32) callconv(.c) void,
+    platform_update_window: *const fn ([*c]Viewport) callconv(.c) void,
+    platform_render_window: *const fn ([*c]Viewport, ?*anyopaque) callconv(.c) void,
+    platform_swap_buffers: *const fn ([*c]Viewport, ?*anyopaque) callconv(.c) void,
+    platform_get_window_dpi_scale: *const fn ([*c]Viewport) callconv(.c) f32,
+    platform_on_changed_viewport: *const fn ([*c]Viewport) callconv(.c) void,
+    platform_create_vk_surface: *const fn ([*c]Viewport, U64, ?*const anyopaque, [*c]U64) callconv(.c) c_int,
+    renderer_create_window: *const fn ([*c]Viewport) callconv(.c) void,
+    renderer_destroy_window: *const fn ([*c]Viewport) callconv(.c) void,
+    renderer_set_window_size: *const fn ([*c]Viewport, Vec2) callconv(.c) void,
+    renderer_render_window: *const fn ([*c]Viewport, ?*anyopaque) callconv(.c) void,
+    renderer_swap_buffers: *const fn ([*c]Viewport, ?*anyopaque) callconv(.c) void,
     monitors: PlatformMonitor,
     viewports: ViewportPtrVector,
 };
@@ -2125,7 +2125,7 @@ pub const TableSettings = extern struct { // struct ImGuiTableSettings
 };
 
 pub const FontBuilderIO = extern struct { // struct ImFontBuilderIO
-    font_builder_build: *const fn ([*c]FontAtlas) callconv(.C) bool,
+    font_builder_build: *const fn ([*c]FontAtlas) callconv(.c) bool,
 };
 
 pub const TableCellData = extern struct { // struct ImGuiTableCellData
@@ -4678,8 +4678,8 @@ pub const FontGlyph = opaque {};
 pub const DockNodeSettings = opaque {};
 pub const StoragePair = opaque {};
 
-pub const ErrorLogCallback = *const fn (?*anyopaque, [*c]const u8) callconv(.C) void;
-pub const DrawCallback = *const fn ([*c]const DrawList, [*c]const DrawCmd) callconv(.C) void;
+pub const ErrorLogCallback = *const fn (?*anyopaque, [*c]const u8) callconv(.c) void;
+pub const DrawCallback = *const fn ([*c]const DrawList, [*c]const DrawCmd) callconv(.c) void;
 
 // TODO file handles? typedef FILE* ImFileHandle;
 pub const FileHandle = std.fs.File;
diff --git a/lib/lua/src/lua.zig b/lib/lua/src/lua.zig
index f33d27d..97f5b02 100644
--- a/lib/lua/src/lua.zig
+++ b/lib/lua/src/lua.zig
@@ -22,9 +22,9 @@ pub fn CWrap(comptime Func: anytype) LuaCFunc {
     return Wrap.inner;
 }
 
-pub extern fn setupMiniDump(takeFullDump: bool) callconv(.C) void;
-pub extern fn generateAnException() callconv(.C) void;
-pub extern fn takeDump() callconv(.C) void;
+pub extern fn setupMiniDump(takeFullDump: bool) callconv(.c) void;
+pub extern fn generateAnException() callconv(.c) void;
+pub extern fn takeDump() callconv(.c) void;
 
 pub fn WrapZigFunc(comptime baseFunc: anytype) LuaCFunc {
     return CWrap(FuncWrapper(baseFunc).wrapper);
diff --git a/lib/lua/src/pod.zig b/lib/lua/src/pod.zig
index 64e7d8e..f14e556 100644
--- a/lib/lua/src/pod.zig
+++ b/lib/lua/src/pod.zig
@@ -311,7 +311,7 @@ pub const DataTable = struct {
     // list of zig functions which can be directly called using *Type
     funcs: []const []const u8 = &.{},
 
-    // list of functions that take in a function that directly matches the signature *const fn (?*c.lua_State) callconv(.C) i32
+    // list of functions that take in a function that directly matches the signature *const fn (?*c.lua_State) callconv(.c) i32
     luaFuncs: []const []const u8 = &.{},
 
     // same as above, but lets you set the name name to use in lualand.
diff --git a/lib/ozz/src/ozz_zig.cpp b/lib/ozz/src/ozz_zig.cpp
index 36874c7..9ef4bcc 100644
--- a/lib/ozz/src/ozz_zig.cpp
+++ b/lib/ozz/src/ozz_zig.cpp
@@ -216,7 +216,7 @@ OZZ_CPP_API void LoadAnimationFromFile_c(void* anim, const char* filename)
 
 // === SmplingJobContext ===
 
-    //pub extern fn CreateSamplingJobContextCount_c(c_int) callconv(.C) ?*anyopaque;
+    //pub extern fn CreateSamplingJobContextCount_c(c_int) callconv(.c) ?*anyopaque;
 OZZ_CPP_API void* CreateSamplingJobContext_c() 
 {
     ozz::animation::SamplingJob::Context* rv = new ozz::animation::SamplingJob::Context();
diff --git a/projects/sampleGame/main.zig b/projects/sampleGame/main.zig
index 661ee19..b18e069 100644
--- a/projects/sampleGame/main.zig
+++ b/projects/sampleGame/main.zig
@@ -26,7 +26,7 @@ videoFullbright: bool = false,
 
 tbMap: ?*bsp.maploader.TBMap = null,
 
-// addFunc: ?*const fn (i32, i32) callconv(.C) i32 = undefined,
+// addFunc: ?*const fn (i32, i32) callconv(.c) i32 = undefined,
 
 engineTool: *extras.EngineTool = undefined,