diff --git a/.gitmodules b/.gitmodules
index 9f5a8729..82819578 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,9 @@
 [submodule "src/lib/abseil-cpp"]
 	path = src/lib/abseil-cpp
 	url = https://github.com/abseil/abseil-cpp.git
+[submodule "src/lib/--force"]
+	path = src/lib/--force
+	url = https://github.com/libsdl-org/SDL.git
+[submodule "src/lib/SDL"]
+	path = src/lib/SDL
+	url = https://github.com/libsdl-org/SDL.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7ccb85d..319d028e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,8 +23,13 @@ set(ABSL_CXX_STANDARD 17)
 set(ABSL_USE_GOOGLETEST_HEAD ON)
 set(ABSL_ENABLE_INSTALL ON)
 
-add_subdirectory(src/lib/abseil-cpp)
+# Video Libraries -------------------------------------------------------------
+find_package(PNG REQUIRED)
+find_package(OpenGL REQUIRED)
+find_package(GLEW REQUIRED)
 
 # Project Files
+add_subdirectory(src/lib/abseil-cpp)
+add_subdirectory(src/lib/SDL)
 add_subdirectory(src)
 add_subdirectory(test)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e784d5de..be7c27e6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,5 @@
 include_directories(lib/cmake)
 
-# find libraries --------------------------------------------------------------------------------------------------
-find_package(SDL2 REQUIRED)
-find_package(PNG REQUIRED)
-find_package(OpenGL REQUIRED)
-find_package(GLEW REQUIRED)
 
 # gui libraries ---------------------------------------------------------------------------------------------------
 set(IMGUI_PATH  "lib/imgui")
@@ -86,9 +81,9 @@ target_link_libraries(
   absl::raw_logging_internal
   absl::failure_signal_handler
   absl::flat_hash_map
-  SDL2main
+  SDL2::SDL2main
+  SDL2::SDL2
   ${PNG_LIBRARIES}
-  ${SDL2_LIBRARIES} 
   ${GLEW_LIBRARIES}
   ${OPENGL_LIBRARIES} 
   ImGui
diff --git a/src/app/core/controller.cc b/src/app/core/controller.cc
index d9765fb7..5a8b7b63 100644
--- a/src/app/core/controller.cc
+++ b/src/app/core/controller.cc
@@ -1,6 +1,6 @@
 #include "controller.h"
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <imgui/backends/imgui_impl_sdl.h>
 #include <imgui/backends/imgui_impl_sdlrenderer.h>
 #include <imgui/imgui.h>
diff --git a/src/app/core/controller.h b/src/app/core/controller.h
index ec0d181a..a3823e11 100644
--- a/src/app/core/controller.h
+++ b/src/app/core/controller.h
@@ -2,7 +2,7 @@
 #define YAZE_APP_CORE_CONTROLLER_H
 #define SDL_MAIN_HANDLED
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <imgui/backends/imgui_impl_sdl.h>
 #include <imgui/backends/imgui_impl_sdlrenderer.h>
 #include <imgui/imgui.h>
diff --git a/src/app/gfx/bitmap.cc b/src/app/gfx/bitmap.cc
index 59c473b8..826adf9b 100644
--- a/src/app/gfx/bitmap.cc
+++ b/src/app/gfx/bitmap.cc
@@ -1,6 +1,6 @@
 #include "bitmap.h"
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/app/gfx/bitmap.h b/src/app/gfx/bitmap.h
index b4e34d26..ea6ac855 100644
--- a/src/app/gfx/bitmap.h
+++ b/src/app/gfx/bitmap.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_GFX_BITMAP_H
 #define YAZE_APP_GFX_BITMAP_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/app/gfx/pseudo_vram.h b/src/app/gfx/pseudo_vram.h
index 2119a3d1..4f07ed15 100644
--- a/src/app/gfx/pseudo_vram.h
+++ b/src/app/gfx/pseudo_vram.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_GFX_PSEUDO_VRAM_H
 #define YAZE_APP_GFX_PSEUDO_VRAM_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <cstdint>
 #include <unordered_map>
diff --git a/src/app/gfx/snes_palette.cc b/src/app/gfx/snes_palette.cc
index 664f2b48..e88a8b2c 100644
--- a/src/app/gfx/snes_palette.cc
+++ b/src/app/gfx/snes_palette.cc
@@ -1,6 +1,6 @@
 #include "snes_palette.h"
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <imgui/imgui.h>
 
 #include <cstdint>
diff --git a/src/app/gfx/snes_palette.h b/src/app/gfx/snes_palette.h
index 7b1a9246..00301788 100644
--- a/src/app/gfx/snes_palette.h
+++ b/src/app/gfx/snes_palette.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_GFX_PALETTE_H
 #define YAZE_APP_GFX_PALETTE_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include <imgui/imgui.h>
 
 #include <cstdint>
diff --git a/src/app/rom.cc b/src/app/rom.cc
index e17aab79..93d16dca 100644
--- a/src/app/rom.cc
+++ b/src/app/rom.cc
@@ -1,6 +1,6 @@
 #include "rom.h"
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <cstddef>
 #include <cstring>
diff --git a/src/app/rom.h b/src/app/rom.h
index 9443f4cc..a91fe870 100644
--- a/src/app/rom.h
+++ b/src/app/rom.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_ROM_H
 #define YAZE_APP_ROM_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <cstddef>
 #include <cstring>
diff --git a/src/app/zelda3/overworld.h b/src/app/zelda3/overworld.h
index fb0a703c..f874d1e7 100644
--- a/src/app/zelda3/overworld.h
+++ b/src/app/zelda3/overworld.h
@@ -1,7 +1,7 @@
 #ifndef YAZE_APP_DATA_OVERWORLD_H
 #define YAZE_APP_DATA_OVERWORLD_H
 
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #include <memory>
 #include <vector>
diff --git a/src/lib/SDL b/src/lib/SDL
new file mode 160000
index 00000000..2241bd66
--- /dev/null
+++ b/src/lib/SDL
@@ -0,0 +1 @@
+Subproject commit 2241bd669fcb96046390e2a08eeea5864a832b15
diff --git a/src/yaze.cc b/src/yaze.cc
index 6d2064bc..ff38a050 100644
--- a/src/yaze.cc
+++ b/src/yaze.cc
@@ -1,3 +1,4 @@
+#define main SDL_main
 #include "absl/debugging/failure_signal_handler.h"
 #include "absl/debugging/symbolize.h"
 #include "app/core/controller.h"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 80bbdde3..8d50a461 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,8 +10,6 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)
 enable_testing()
 
-find_package(SDL2 REQUIRED)
-
 add_executable(
   yaze_test
   yaze_test.cc
@@ -43,7 +41,7 @@ target_link_libraries(
   absl::config
   absl::core_headers
   absl::raw_logging_internal
-  ${SDL2_LIBRARIES}
+  SDL2::SDL2
   ${OPENGL_LIBRARIES}
   gtest_main
   gtest