diff --git a/.gitmodules b/.gitmodules
index 442ccb09..f5094ca5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,4 +17,4 @@
 	url = https://github.com/epezent/implot
 [submodule "deps/imgui/ImGuizmo"]
 	path = deps/imgui/ImGuizmo
-	url = https://github.com/nmwsharp/ImGuizmo.git
+	url = https://github.com/jdumas/ImGuizmo.git
diff --git a/deps/imgui/CMakeLists.txt b/deps/imgui/CMakeLists.txt
index b4a8b365..c546d42f 100644
--- a/deps/imgui/CMakeLists.txt
+++ b/deps/imgui/CMakeLists.txt
@@ -32,8 +32,8 @@ list(APPEND SRCS
     )
 
 # imguizmo sources
-list(APPEND SRCS 
-        ImGuizmo/ImGuizmo.cpp
+list(APPEND SRCS
+        ImGuizmo/src/ImGuizmo.cpp
     )
 
 
@@ -70,7 +70,7 @@ if("${POLYSCOPE_BACKEND_OPENGL3_GLFW}")
   target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/imgui/")
   target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/custom_backends/")
   target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/implot/")
-  target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo/")
+  target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo/src/")
   target_include_directories(imgui PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../glad/include/")
   target_link_libraries(imgui PRIVATE glfw)
 
@@ -99,7 +99,7 @@ if("${POLYSCOPE_BACKEND_OPENGL3_EGL}")
 
   target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/imgui/")
   target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/implot/")
-  target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo/")
+  target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo/src/")
   target_include_directories(imgui PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../glad/include/")
 
   # linux only
diff --git a/deps/imgui/ImGuizmo b/deps/imgui/ImGuizmo
index fb5dec9a..097e4da6 160000
--- a/deps/imgui/ImGuizmo
+++ b/deps/imgui/ImGuizmo
@@ -1 +1 @@
-Subproject commit fb5dec9a5f5c9bb45d908ac3e92c8d26ca105fdc
+Subproject commit 097e4da69386a6351ec441b7839a3b385eec6a0e
diff --git a/deps/imgui/imgui b/deps/imgui/imgui
index 922a11f0..8936b58f 160000
--- a/deps/imgui/imgui
+++ b/deps/imgui/imgui
@@ -1 +1 @@
-Subproject commit 922a11f0847fe1a7907345c31a22e0e77a43829c
+Subproject commit 8936b58fe26e8c3da834b8f60b06511d537b4c63
diff --git a/deps/imgui/implot b/deps/imgui/implot
index 3da8bd34..d65a2bef 160000
--- a/deps/imgui/implot
+++ b/deps/imgui/implot
@@ -1 +1 @@
-Subproject commit 3da8bd34299965d3b0ab124df743fe3e076fa222
+Subproject commit d65a2bef53d32502407de3a4be80f191e2f412d7
diff --git a/src/color_bar.cpp b/src/color_bar.cpp
index 7cd48f37..468d48d3 100644
--- a/src/color_bar.cpp
+++ b/src/color_bar.cpp
@@ -260,7 +260,7 @@ void OnscreenColorBarWidget::draw() {
 
   // draw the border around the map
   dl->AddRect(barTopLeft, ImVec2(barTopLeft.x + barRegionWidth, barTopLeft.y + barRegionHeight), foregroundColor, 0.f,
-              ImDrawFlags_None, borderWidth);
+              borderWidth, ImDrawFlags_None);
 
   // title text
   dl->AddText(ImVec2(barTopLeft.x + 0.5 * borderWidth, barTopLeft.y - 1.3 * titleHeight), foregroundColor,