diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index a6cd7b8..36b66fd 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -1,23 +1,27 @@
 cmake_minimum_required(VERSION 3.22)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
-	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libpicasso)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libpicasso)
 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "NintendoSwitch")
-	# SPIRV-Helper
-	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-helper)
+    # SPIRV-Helper
+    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+        # For some reason cmake is generating wrong headers for glslang on windows
+        set(SPV_EXCLUDE_GLSLANG ON CACHE BOOL "")
+    endif()
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-helper)
 else()
-	# GLAD
-	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glad)
-	# SPIRV-Helper
-	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-helper)
+    # GLAD
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glad)
+    # SPIRV-Helper
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-helper)
 endif()
 
 # STB
 add_library(stb INTERFACE)
 target_include_directories(stb
-	INTERFACE
-		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/stb>
-		$<INSTALL_INTERFACE:include>
+    INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/stb>
+    $<INSTALL_INTERFACE:include>
 )
 install(TARGETS stb
     EXPORT palladiumTargets
@@ -25,9 +29,9 @@ install(TARGETS stb
 )
 
 if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "NintendoSwitch")
-	# GLFW
-	set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "")
-	set(GLFW_BUILD_TESTS OFF CACHE BOOL "")
-	set(GLFW_BUILD_DOCS OFF CACHE BOOL "")
-	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glfw)
+    # GLFW
+    set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "")
+    set(GLFW_BUILD_TESTS OFF CACHE BOOL "")
+    set(GLFW_BUILD_DOCS OFF CACHE BOOL "")
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glfw)
 endif()
diff --git a/vendor/spirv-helper b/vendor/spirv-helper
index 91f57a5..c2165a2 160000
--- a/vendor/spirv-helper
+++ b/vendor/spirv-helper
@@ -1 +1 @@
-Subproject commit 91f57a510129bd29c62677810e450ae5f1d6f85a
+Subproject commit c2165a23a82a1ad91a6dae47bb5ae2c6fb3d2f44