diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bbc5bd..e6a510c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ set(META_AUTHOR_DOMAIN       "https://github.com/abdes/asap")
 set(META_AUTHOR_MAINTAINER   "Abdessattar Sassi (abde.sassi gmail account)")
 set(META_VERSION_MAJOR       "0")
 set(META_VERSION_MINOR       "9")
-set(META_VERSION_PATCH       "3")
+set(META_VERSION_PATCH       "4")
 set(META_VERSION_REVISION    "${GIT_REV}")
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 set(META_NAME_VERSION        "${META_PROJECT_NAME} v${META_VERSION} (${META_VERSION_REVISION})")
diff --git a/README.md b/README.md
index b98409c..caeafa6 100644
--- a/README.md
+++ b/README.md
@@ -11,13 +11,13 @@
 | Windows | [![Windows][21]][20] |
 
 [0]: https://travis-ci.org/abdes/asap_app_imgui
-[9]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/9
-[10]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/10
-[11]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/11
-[12]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/12
-[13]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/13
+[9]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/9
+[10]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/10
+[11]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/11
+[12]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/12
+[13]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/13
 [20]: https://ci.appveyor.com/project/abdes/asap-app-imgui
-[21]: https://ci.appveyor.com/api/projects/status/qoaae14rw3cyivgq/branch/master?svg=true
+[21]: https://ci.appveyor.com/api/projects/status/qoaae14rw3cyivgq/branch/develop?svg=true
 
 # Starter project with minimum necessary functionality
   - use cmake for the build system
diff --git a/common b/common
index a9cbe84..4de2212 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a9cbe84b17d30fe4c38af779033aca333d1847a2
+Subproject commit 4de22128c6bed6d531886b0310d9a177588924cc
diff --git a/filesystem b/filesystem
index 57c6d85..a89c275 160000
--- a/filesystem
+++ b/filesystem
@@ -1 +1 @@
-Subproject commit 57c6d859cad46cddbbb3d0cb7541756f61e773a6
+Subproject commit a89c27530963934108ddf3baa7e1a59fa0406d30
diff --git a/imgui b/imgui
index 4d7988b..6c3b156 160000
--- a/imgui
+++ b/imgui
@@ -1 +1 @@
-Subproject commit 4d7988bb64dc2d422ebf492939442d9c65633431
+Subproject commit 6c3b15626b7953b5f02434bccaf4d72239f54acc
diff --git a/main/src/ui/application_base.cpp b/main/src/ui/application_base.cpp
index a8a4d0e..cb758ea 100644
--- a/main/src/ui/application_base.cpp
+++ b/main/src/ui/application_base.cpp
@@ -358,7 +358,7 @@ void ShowDisplaySettings(ImGuiRunner *runner) {
   // Toolbar
   ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, {5.0f, 2.0f});
   ImGui::PushStyleColor(
-      ImGuiCol_ChildWindowBg,
+      ImGuiCol_ChildBg,
       (pending_changes) ? ImGui::GetStyleColorVec4(ImGuiCol_PlotLinesHovered)
                         : ImGui::GetStyleColorVec4(ImGuiCol_MenuBarBg));
 
@@ -460,7 +460,7 @@ void ShowStyleSettings() {
   // Toolbar
   {
     ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, {5.0f, 2.0f});
-    ImGui::PushStyleColor(ImGuiCol_ChildWindowBg,
+    ImGui::PushStyleColor(ImGuiCol_ChildBg,
                           ImGui::GetStyleColorVec4(ImGuiCol_MenuBarBg));
     {
       ImGui::BeginChild("Style Settings Toolbar",
diff --git a/third_party/catch2 b/third_party/catch2
index a2c8dce..7f21cc6 160000
--- a/third_party/catch2
+++ b/third_party/catch2
@@ -1 +1 @@
-Subproject commit a2c8dce85c554aa30607914c57be300feaa3b05f
+Subproject commit 7f21cc6c5599f59835f769debf13b4c3e6148a28
diff --git a/third_party/glfw b/third_party/glfw
index b079610..0a49ef0 160000
--- a/third_party/glfw
+++ b/third_party/glfw
@@ -1 +1 @@
-Subproject commit b0796109629931b6fa6e449c15a177845256a407
+Subproject commit 0a49ef0a00baa3ab520ddc452f0e3b1e099c5589
diff --git a/third_party/glm b/third_party/glm
index d162eee..bf71a83 160000
--- a/third_party/glm
+++ b/third_party/glm
@@ -1 +1 @@
-Subproject commit d162eee1e6f7c317a09229fe6ceab8ec6ab9a4b4
+Subproject commit bf71a834948186f4097caa076cd2663c69a10e1e
diff --git a/third_party/spdlog b/third_party/spdlog
index 1549ff1..616caa5 160000
--- a/third_party/spdlog
+++ b/third_party/spdlog
@@ -1 +1 @@
-Subproject commit 1549ff12f1aa61ffc4d9a8727c519034724392a0
+Subproject commit 616caa5d30172b65cc3a06800894c575d70cb8e6