diff --git a/.gitmodules b/.gitmodules
index 5e72028c..08aa6ff9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,9 @@
 [submodule "Nuake/dependencies/tracy"]
 	path = Nuake/dependencies/tracy
 	url = https://github.com/wolfpld/tracy.git
+[submodule "Nuake/dependencies/msdf-atlas-gen"]
+	path = Nuake/dependencies/msdf-atlas-gen
+	url = https://github.com/antopilo/msdf-atlas-gen.git
+[submodule "Nuake/dependencies/yoga"]
+	path = Nuake/dependencies/yoga
+	url = https://github.com/facebook/yoga.git
diff --git a/Nuake/dependencies/msdf-atlas-gen b/Nuake/dependencies/msdf-atlas-gen
new file mode 160000
index 00000000..7116b625
--- /dev/null
+++ b/Nuake/dependencies/msdf-atlas-gen
@@ -0,0 +1 @@
+Subproject commit 7116b6255dc555904cec82e7a72ffb0e18c40a5b
diff --git a/Nuake/dependencies/yoga b/Nuake/dependencies/yoga
new file mode 160000
index 00000000..dc4ab5ad
--- /dev/null
+++ b/Nuake/dependencies/yoga
@@ -0,0 +1 @@
+Subproject commit dc4ab5ad571c91c2a29e35a66182315c01726f3c
diff --git a/Nuake/dependencies/yoga_p5.lua b/Nuake/dependencies/yoga_p5.lua
new file mode 100644
index 00000000..f19925a4
--- /dev/null
+++ b/Nuake/dependencies/yoga_p5.lua
@@ -0,0 +1,34 @@
+project '*'
+	includedirs {
+		'yoga/yoga/'
+	}
+
+group "Dependencies"
+
+project 'yoga'
+	kind "StaticLib"
+	staticruntime "on"
+	warnings 'Off'
+	optimize 'Speed'
+	cppdialect "C++20"
+
+	includedirs {
+		'yoga/'
+	}
+	files {
+		'yoga/yoga/*.cpp',
+		'yoga/yoga/*.h',
+	}
+
+	defines {
+	}
+
+	filter "configurations:Debug"
+		runtime "Debug"
+		symbols "on"
+
+	filter "configurations:Release"
+		runtime "Release"
+		optimize "on"
+
+group ""
\ No newline at end of file
diff --git a/premake5.lua b/premake5.lua
index df882a9a..426a3330 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -57,6 +57,7 @@ group "Dependencies"
     include "Nuake/dependencies/coral_p5.lua"
     include "Nuake/dependencies/recastnavigation_p5.lua"
     include "Nuake/dependencies/tracy_p5.lua"
+    include "Nuake/dependencies/yoga_p5.lua"
 group ""
 
 include "NuakeNet/premake5.lua"
@@ -136,8 +137,8 @@ project "Nuake"
         "%{prj.name}/src/Vendors/katana-parser/*.c",
         "%{prj.name}/src/Vendors/incbin/*.c",
         "%{prj.name}/src/Vendors/incbin/*.h",
-        "%{prj.name}/src/Vendors/filewatch/*.hpp",
-        
+        "%{prj.name}/src/Vendors/nanosvg/*.h",
+
         -- Modules System
         "%{prj.name}/src/Modules/Modules.h",
         "%{prj.name}/src/Modules/Modules.cpp",
@@ -154,6 +155,7 @@ project "Nuake"
         "%{prj.name}/dependencies/JoltPhysics",
         "%{prj.name}/src/Vendors/wren/src/include",
         "%{prj.name}/src/Vendors/incbin",
+        "%{prj.name}/src/Vendors/nanosvg",
         "%{prj.name}/dependencies/build",
         "%{prj.name}/dependencies/soloud/include",
         "%{prj.name}/dependencies/Coral/Coral.Native/Include",
@@ -169,7 +171,8 @@ project "Nuake"
     links
     {
         "soloud",
-        "tracy"
+        "tracy",
+        "yoga"
     }
 
     filter "system:linux"
@@ -421,6 +424,7 @@ project "Editor"
 	    "DetourTileCache",
 	    "Recast",
 	    "tracy",
+        "yoga"
     }
     
     defines {