diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8d7f609..964a2253 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,24 +72,29 @@ if (DOWNLOAD_DEPENDENCIES)
   # FetchContent downloads and configures dependencies
   message(STATUS "Fetching SDL3 and iniparser. This might take a while...")
   include(FetchContent)
-  if (!NXDK)
-    if (WINDOWS_STORE)
-      FetchContent_Declare(
-        SDL3
-        GIT_REPOSITORY "https://github.com/Helloyunho/SDL3-uwp.git"
-        GIT_TAG "main"
-        EXCLUDE_FROM_ALL
-      )
-    else()
-      FetchContent_Declare(
-          SDL3
-          GIT_REPOSITORY "https://github.com/libsdl-org/SDL.git"
-          GIT_TAG "main"
-          EXCLUDE_FROM_ALL
-      )
-    endif()
-    FetchContent_MakeAvailable(SDL3)
+  if (WINDOWS_STORE)
+    FetchContent_Declare(
+      SDL3
+      GIT_REPOSITORY "https://github.com/Helloyunho/SDL3-uwp.git"
+      GIT_TAG "main"
+      EXCLUDE_FROM_ALL
+    )
+  elseif(NXDK)
+    FetchContent_Declare(
+      SDL3
+      GIT_REPOSITORY "https://github.com/Ryzee119/nxdk-sdl3.git"
+      GIT_TAG "master"
+      EXCLUDE_FROM_ALL
+    )
+  else()
+    FetchContent_Declare(
+      SDL3
+      GIT_REPOSITORY "https://github.com/libsdl-org/SDL.git"
+      GIT_TAG "main"
+      EXCLUDE_FROM_ALL
+    )
   endif()
+  FetchContent_MakeAvailable(SDL3)
 
   FetchContent_Declare(
     iniparser
@@ -107,9 +112,7 @@ else()
   # find_package looks for already-installed system packages.
   # Configure with `-DCMAKE_PREFIX_PATH="/path/to/package1;/path/to/package2"`
   # to add search paths.
-  if (!NXDK)
-    find_package(SDL3 CONFIG REQUIRED)
-  endif()
+  find_package(SDL3 CONFIG REQUIRED)
 
   find_package(iniparser REQUIRED CONFIG COMPONENTS shared)
   target_link_libraries(Isle::iniparser INTERFACE iniparser-shared)
@@ -182,15 +185,8 @@ target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/L
 target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/LEGO1/lego/sources>")
 target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include>")
 target_include_directories(lego1 PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include/actions>")
-if (NXDK)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSDL_DISABLE_ALLOCA -DSDL_DISABLE_ANALYZE_MACROS -DSTBI_NO_SIMD -DSDL_DISABLE_MMX -DSDL_platform_defines_h_")
-  target_link_libraries(lego1 PRIVATE ${NXDK_DIR}/lib/libpbkit.lib)
-  target_link_libraries(lego1 PRIVATE ${NXDK_DIR}/lib/libSDL3.lib)
-  target_include_directories(lego1 PRIVATE ${NXDK_DIR}/lib/sdl/SDL3/include)
-else()
-  target_link_libraries(lego1 PRIVATE SDL3::SDL3)
-  target_link_libraries(lego1 PUBLIC SDL3::Headers)
-endif()
+target_link_libraries(lego1 PRIVATE SDL3::SDL3)
+target_link_libraries(lego1 PUBLIC SDL3::Headers)
 target_link_libraries(lego1 PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DirectX5::DirectX5>)
 # Allow unconditional include of miniwin/miniwind3d.h
 target_link_libraries(lego1 PRIVATE miniwin-headers)
@@ -531,14 +527,7 @@ if (ISLE_BUILD_APP)
   target_link_libraries(isle PRIVATE $<$<BOOL:${ISLE_USE_DX5}>:DirectX5::DirectX5>)
 
   # Link SDL and iniparser
-  if (NXDK)
-    target_link_libraries(isle PRIVATE ${NXDK_DIR}/lib/libpbkit.lib)
-    target_link_libraries(isle PRIVATE ${NXDK_DIR}/lib/libSDL3.lib)
-    target_include_directories(isle PRIVATE ${NXDK_DIR}/lib/sdl/SDL3/include)
-    target_link_libraries(isle PRIVATE Isle::iniparser)
-  else()
-    target_link_libraries(isle PRIVATE SDL3::SDL3 Isle::iniparser)
-  endif()
+  target_link_libraries(isle PRIVATE SDL3::SDL3 Isle::iniparser)
 
   # Allow unconditional include of miniwin/miniwindevice.h
   target_link_libraries(isle PRIVATE miniwin-headers)
@@ -656,11 +645,6 @@ if (ISLE_BUILD_CONFIG)
     target_link_libraries(isle-config PRIVATE DirectX5::DirectX5)
   endif()
   target_compile_definitions(isle-config PRIVATE DIRECT3D_VERSION=0x500)
-  if (NXDK)
-    target_link_libraries(isle-config PRIVATE ${NXDK_DIR}/lib/libpbkit.lib)
-    target_link_libraries(isle-config PRIVATE ${NXDK_DIR}/lib/libSDL3.lib)
-    target_include_directories(isle-config PRIVATE ${NXDK_DIR}/lib/sdl/SDL3/include)
-  endif()
   target_link_libraries(isle-config PRIVATE SDL3::SDL3 Isle::iniparser)
   if (NOT ISLE_MINIWIN)
     target_link_libraries(isle-config PRIVATE ddraw dxguid)