diff --git a/.ccls b/.ccls
index 8e7f5b6..904a51b 100644
--- a/.ccls
+++ b/.ccls
@@ -3,7 +3,7 @@ gcc
 -Isrc/headers
 -Isrc/ecs/headers
 -Isrc/ecs/components/headers
--ISDL_Core/src/headers
--INCurses_Core/src/headers
+-ISDL2_Core/src/headers
+#-INCurses_Core/src/headers
 -Iassets/asset_builder/src/headers
 -DASSET_FILE_NAME="$(make print-ASSET_OUTPUT)"
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 75ae7f3..4c41a37 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ all: build_core build_src build_assets
 
 # Sub Makefiles
 SOURCE_DIR = src
-CORE_DIR = SDL_Core/src
+CORE_DIR = SDL2_Core/src
 ASSETS_DIR = assets
 
 include $(CORE_DIR)/Makefile
diff --git a/NCurses_Core b/NCurses_Core
index 0ef33e0..1821d20 160000
--- a/NCurses_Core
+++ b/NCurses_Core
@@ -1 +1 @@
-Subproject commit 0ef33e0b09c5834dbca891f86e2b4f89a55d3ffb
+Subproject commit 1821d2092357eecc3ed4999751fb1a71b521324b
diff --git a/SDL2_Core b/SDL2_Core
new file mode 160000
index 0000000..91709bf
--- /dev/null
+++ b/SDL2_Core
@@ -0,0 +1 @@
+Subproject commit 91709bfacc498483ac92cf71364dff790ff83a27
diff --git a/SDL_Core b/SDL_Core
deleted file mode 160000
index c1a3dea..0000000
--- a/SDL_Core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c1a3dea5609002d1be55a3e5a2c11ebc0fa7e57e
diff --git a/shell.nix b/shell.nix
index 7974c84..2d62d1d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -9,11 +9,12 @@ stdenv.mkDerivation {
     valgrind
   ];
   buildInputs = [
-    SDL2
     libpng
+    SDL2
+    ncurses
   ];
   shellHook = ''
-    export LD_LIBRARY_PATH=${pkgs.SDL2}/lib:${pkgs.sdl3}/lib:${pkgs.libpng}/lib:$LD_LIBRARY_PATH
-    export PKG_CONFIG_PATH=${pkgs.SDL2}/lib/pkgconfig:${pkgs.libpng}/lib/pkgconfig:$PKG_CONFIG_PATH
+    export LD_LIBRARY_PATH=${pkgs.libpng}/lib:${pkgs.SDL2}/lib:${pkgs.sdl3}/lib:${pkgs.ncurses}/lib:$LD_LIBRARY_PATH
+    export PKG_CONFIG_PATH=${pkgs.libpng}/lib/pkgconfig:${pkgs.SDL2}/lib/pkgconfig:${pkgs.sdl3}/lib/pkgconfig:${pkgs.ncurses}/lib/pkgconfig:$PKG_CONFIG_PATH
   '';
 }