diff --git a/.gitmodules b/.gitmodules
index 03410c2..128aa8b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,21 @@
-[submodule "Externals/asio"]
-	path = Externals/asio
-	url = https://github.com/IlyaShurupov/asio.git
-[submodule "Externals/glfw"]
-	path = Externals/glfw
-	url = https://github.com/IlyaShurupov/glfw.git
 [submodule "Externals/imgui"]
 	path = Externals/imgui
-	url = https://github.com/IlyaShurupov/imgui.git
-[submodule "Externals/glew"]
-	path = Externals/glew
-	url = https://github.com/IlyaShurupov/glew.git
-[submodule "Externals/nanovg"]
-	path = Externals/nanovg
-	url = https://github.com/IlyaShurupov/nanovg.git
+	url = https://github.com/elushaX/imgui.git
 [submodule "Externals/lua"]
-    path = Externals/lua
-    url = https://github.com/lua/lua.git
-[submodule "Externals/lalr"]
-	path = Externals/lalr
-	url = https://github.com/IlyaShurupov/lalr.git
+	path = Externals/lua
+	url = https://github.com/elushaX/lua.git
 [submodule "Externals/unittest-cpp"]
 	path = Externals/unittest-cpp
-	url = https://github.com/unittest-cpp/unittest-cpp.git
+	url = https://github.com/elushaX/unittest-cpp.git
+[submodule "Externals/glfw"]
+	path = Externals/glfw
+	url = https://github.com/elushaX/glfw.git
+[submodule "Externals/nanovg"]
+	path = Externals/nanovg
+	url = https://github.com/elushaX/nanovg.git
+[submodule "Externals/asio"]
+	path = Externals/asio
+	url = https://github.com/elushaX/asio.git
+[submodule "Externals/lalr"]
+	path = Externals/lalr
+	url = https://github.com/elushaX/lalr.git
diff --git a/Externals/CMakeLists.txt b/Externals/CMakeLists.txt
index 197221c..a1a21d8 100644
--- a/Externals/CMakeLists.txt
+++ b/Externals/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
 #add_subdirectory(glew/build/cmake/)
 #target_compile_definitions(glew_s PUBLIC GLEW_NO_GLU)
 
-add_subdirectory(unittest-cpp)
+#add_subdirectory(unittest-cpp)
 
 add_subdirectory(lalr)
 
diff --git a/Externals/lalr b/Externals/lalr
index 62a0e9f..6d16a6b 160000
--- a/Externals/lalr
+++ b/Externals/lalr
@@ -1 +1 @@
-Subproject commit 62a0e9f7ad37de6081a7ede90f7e454c76a38e7b
+Subproject commit 6d16a6bb60490a2ee4e86f689c86e647b300c7fb