diff --git a/include/blt/gfx/model.h b/include/blt/gfx/model.h
index 19814cd..021db13 100644
--- a/include/blt/gfx/model.h
+++ b/include/blt/gfx/model.h
@@ -130,7 +130,7 @@ namespace blt::gfx
         private:
             GLuint vaoID;
             static_dynamic_array VBOs;
-            HASHSET<GLuint> used_attributes;
+            blt::hashset_t<GLuint> used_attributes;
             vbo_t element;
             
             void handle_vbo(const vbo_t& vbo, int attribute_number, int coordinate_size, GLenum type, int stride, long offset);
diff --git a/include/blt/gfx/renderer/batch_2d_renderer.h b/include/blt/gfx/renderer/batch_2d_renderer.h
index b47057c..5b50c94 100644
--- a/include/blt/gfx/renderer/batch_2d_renderer.h
+++ b/include/blt/gfx/renderer/batch_2d_renderer.h
@@ -68,7 +68,7 @@ namespace blt::gfx
             vertex_array* square_vao = nullptr;
             shader_t* shader = nullptr;
             resource_manager& resources;
-            HASHMAP<std::string, HASHMAP<blt::vec4, HASHMAP<blt::vec4, std::vector<rectangle2d_t>, vec_hash>, vec_hash>> complex_rectangles;
+            blt::hashmap_t<std::string, blt::hashmap_t<blt::vec4, blt::hashmap_t<blt::vec4, std::vector<rectangle2d_t>, vec_hash>, vec_hash>> complex_rectangles;
             size_t draw_count_ = 0;
         public:
             explicit batch_renderer_2d(resource_manager& resources): resources(resources)
diff --git a/include/blt/gfx/renderer/resource_manager.h b/include/blt/gfx/renderer/resource_manager.h
index 3bbeb05..074ecb2 100644
--- a/include/blt/gfx/renderer/resource_manager.h
+++ b/include/blt/gfx/renderer/resource_manager.h
@@ -48,7 +48,7 @@ namespace blt::gfx
             std::mutex save_lock;
             std::vector<loadable_texture> textures_to_load;
             std::vector<texture_file*> loaded_textures;
-            HASHMAP<std::string, texture_gl2D*> textures_2d;
+            blt::hashmap_t<std::string, texture_gl2D*> textures_2d;
         public:
             resource_manager() = default;
             
diff --git a/libraries/BLT b/libraries/BLT
index 9147a85..9950fd3 160000
--- a/libraries/BLT
+++ b/libraries/BLT
@@ -1 +1 @@
-Subproject commit 9147a85dc32f06be2a4cfe4e422fdbc52679adc5
+Subproject commit 9950fd3c94d2fd52e6f953bfd188962e16e55a08
diff --git a/libraries/imgui b/libraries/imgui
index a1b0682..96839b4 160000
--- a/libraries/imgui
+++ b/libraries/imgui
@@ -1 +1 @@
-Subproject commit a1b06823fe2d964a62fda99385499b218cf5cea5
+Subproject commit 96839b445e32e46d87a44fd43a9cdd60c806f7e1
diff --git a/libraries/openal-soft b/libraries/openal-soft
index 6675317..358fee3 160000
--- a/libraries/openal-soft
+++ b/libraries/openal-soft
@@ -1 +1 @@
-Subproject commit 6675317107257c2cc16c947b359d557821d85bf2
+Subproject commit 358fee381e2d0d6f56f8dcc4e2eeda7449270545
diff --git a/src/blt/gfx/window.cpp b/src/blt/gfx/window.cpp
index 90f3248..2a4e360 100644
--- a/src/blt/gfx/window.cpp
+++ b/src/blt/gfx/window.cpp
@@ -44,7 +44,7 @@ namespace blt::gfx
     void create_callbacks()
     {
         /* Setup keyboard callback */
-        glfwSetKeyCallback(window_state.window, [](GLFWwindow* window, int key, int scancode, int action, int mods) {
+        glfwSetKeyCallback(window_state.window, [](GLFWwindow*, int key, int, int action, int) {
             if (key < 0 || key == GLFW_KEY_UNKNOWN)
                 return;
             KEY_STATE state;
@@ -64,7 +64,7 @@ namespace blt::gfx
         });
         
         /* Setup mouse button callback */
-        glfwSetMouseButtonCallback(window_state.window, [](GLFWwindow* window, int button, int action, int mods) {
+        glfwSetMouseButtonCallback(window_state.window, [](GLFWwindow*, int button, int action, int) {
             if (button < 0)
                 return;
             MOUSE_STATE state;
@@ -82,18 +82,18 @@ namespace blt::gfx
         });
         
         /* Setup mouse cursor callback */
-        glfwSetCursorPosCallback(window_state.window, [](GLFWwindow* window, double x, double y) {
+        glfwSetCursorPosCallback(window_state.window, [](GLFWwindow*, double x, double y) {
             window_state.inputManager.updateMousePos(x, y);
             window_state.inputManager.mouse_moved = true;
         });
         
         /* Setup mouse scroll callback */
-        glfwSetScrollCallback(window_state.window, [](GLFWwindow* window, double x, double s) {
+        glfwSetScrollCallback(window_state.window, [](GLFWwindow*, double, double s) {
             window_state.inputManager.updateScroll(s);
         });
         
         /* Setup drop input callback */
-        glfwSetDropCallback(window_state.window, [](GLFWwindow* window, int count, const char** paths) {
+        glfwSetDropCallback(window_state.window, [](GLFWwindow*, int count, const char** paths) {
             for (int i = 0; i < count; i++)
                 window_state.pendingPaths.emplace(paths[i]);
         });