diff --git a/lib/SDL b/lib/SDL
index d4519aaf..ac6b32bb 160000
--- a/lib/SDL
+++ b/lib/SDL
@@ -1 +1 @@
-Subproject commit d4519aafd3d1f3f54cef62ba09c016e6f913a772
+Subproject commit ac6b32bb0280f225bd117a0c1db554dc3ee8f3f2
diff --git a/lib/freetype b/lib/freetype
index 5769f13a..dc519d06 160000
--- a/lib/freetype
+++ b/lib/freetype
@@ -1 +1 @@
-Subproject commit 5769f13a6b9fafa3840726f06dde07e755501a16
+Subproject commit dc519d06ea67b3f75b2dffe238369b76158e7c8a
diff --git a/lib/glm b/lib/glm
index 5c46b9c0..47585fde 160000
--- a/lib/glm
+++ b/lib/glm
@@ -1 +1 @@
-Subproject commit 5c46b9c07008ae65cb81ab79cd677ecc1934b903
+Subproject commit 47585fde0c49fa77a2bf2fb1d2ead06999fd4b6e
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6a735b6..d32bf30f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,9 +9,6 @@ set(
   CACHE INTERNAL ${DAWN_CACHE_TARGET}
 )
 
-# Include shared libs
-add_subdirectory(dawnshared)
-
 # Change what we are building. Pulled from the cmake/targets dir.
 if(DEFINED DAWN_BUILDING)
   add_subdirectory(${DAWN_BUILDING})
diff --git a/src/dawn/CMakeLists.txt b/src/dawn/CMakeLists.txt
index 2fc0ed6f..9c38871f 100644
--- a/src/dawn/CMakeLists.txt
+++ b/src/dawn/CMakeLists.txt
@@ -24,6 +24,7 @@ target_sources(${DAWN_TARGET_NAME}
 )
 
 # Subdirs
+add_subdirectory(assert)
 add_subdirectory(asset)
 add_subdirectory(display)
 add_subdirectory(game)
@@ -36,6 +37,7 @@ add_subdirectory(save)
 add_subdirectory(scene)
 add_subdirectory(state)
 add_subdirectory(time)
+add_subdirectory(util)
 
 # Definitions
 target_compile_definitions(${DAWN_TARGET_NAME}
diff --git a/src/dawn/assert/assert.hpp b/src/dawn/assert/assert.hpp
index 3524d090..18a2fb55 100644
--- a/src/dawn/assert/assert.hpp
+++ b/src/dawn/assert/assert.hpp
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 
 /**
  * Assert a given value to be true.
diff --git a/src/dawn/dawnlibs.hpp b/src/dawn/dawnlibs.hpp
index 2b6a2746..ed50c914 100644
--- a/src/dawn/dawnlibs.hpp
+++ b/src/dawn/dawnlibs.hpp
@@ -6,8 +6,32 @@
  */
 
 #pragma once
-#include "dawnsharedlibs.hpp"
-#include "util/memory.hpp"
+// Static Libs
+extern "C" {
+  // Standard Libs
+  #include <stdio.h>
+  #include <stdint.h>
+  #include <stdbool.h>
+  #include <string.h>
+  #include <math.h>
+  #include <stdlib.h>
+  #include <assert.h>
+  #include <float.h>
+
+  typedef bool bool_t;
+  typedef char char_t;
+}
+
+#include <vector>
+#include <iostream>
+#include <thread>
+#include <map>
+#include <array>
+#include <memory>
+#include <algorithm>
+#include <sstream>
+#include <string>
+#include <functional>
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
diff --git a/src/dawn/display/CMakeLists.txt b/src/dawn/display/CMakeLists.txt
index 7522759a..713f8b81 100644
--- a/src/dawn/display/CMakeLists.txt
+++ b/src/dawn/display/CMakeLists.txt
@@ -9,6 +9,7 @@ target_sources(${DAWN_TARGET_NAME}
     RenderPipeline.cpp
     Transform.cpp
     Tileset.cpp
+    Color.cpp
 )
 
 # Subdirs
diff --git a/src/dawn/display/Color.hpp b/src/dawn/display/Color.hpp
index 82ec6a59..59e6f41f 100644
--- a/src/dawn/display/Color.hpp
+++ b/src/dawn/display/Color.hpp
@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 #include "util/string.hpp"
 
 namespace Dawn {
diff --git a/src/dawn/util/CMakeLists.txt b/src/dawn/util/CMakeLists.txt
new file mode 100644
index 00000000..87767fe9
--- /dev/null
+++ b/src/dawn/util/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) 2023 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+# Sources
+target_sources(${DAWN_TARGET_NAME}
+  PRIVATE
+    memory.cpp
+    UsageLock.cpp
+    Xml.cpp
+)
diff --git a/src/dawn/util/Xml.hpp b/src/dawn/util/Xml.hpp
index 7eb3db7c..78ab31e4 100644
--- a/src/dawn/util/Xml.hpp
+++ b/src/dawn/util/Xml.hpp
@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 #include "util/memory.hpp"
 #include "assert/assert.hpp"
 #include "util/array.hpp"
diff --git a/src/dawn/util/array.hpp b/src/dawn/util/array.hpp
index fd700cc2..55b71f9e 100644
--- a/src/dawn/util/array.hpp
+++ b/src/dawn/util/array.hpp
@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 #include "assert/assert.hpp"
 
 namespace Dawn {
diff --git a/src/dawn/util/flag.hpp b/src/dawn/util/flag.hpp
index 78c9b2a3..669b0c8b 100644
--- a/src/dawn/util/flag.hpp
+++ b/src/dawn/util/flag.hpp
@@ -4,7 +4,7 @@
 // https://opensource.org/licenses/MIT
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 
 typedef uint_fast8_t flag8_t;
 typedef uint_fast16_t flag16_t;
diff --git a/src/dawn/util/mathutils.hpp b/src/dawn/util/mathutils.hpp
index 0951d285..7f43006b 100644
--- a/src/dawn/util/mathutils.hpp
+++ b/src/dawn/util/mathutils.hpp
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 
 #define MATH_PI 3.1415926535897f
 
diff --git a/src/dawn/util/memory.hpp b/src/dawn/util/memory.hpp
index 1650b250..7cbf6303 100644
--- a/src/dawn/util/memory.hpp
+++ b/src/dawn/util/memory.hpp
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "dawnsharedlibs.hpp"
+#include "dawnlibs.hpp"
 
 #define DAWN_MEMORY_TRACKING 1