diff --git a/.gitmodules b/.gitmodules
index 7405339..50fa791 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "lib/squall"]
-	path = lib/squall
-	url = https://github.com/whoahq/squall
-[submodule "lib/system"]
-	path = lib/system
-	url = https://github.com/whoahq/system
 [submodule "lib/typhoon"]
 	path = lib/typhoon
-	url = https://github.com/whoahq/typhoon
+	url = https://github.com/thunderbrewhq/typhoon.git
+[submodule "lib/squall"]
+	path = lib/squall
+	url = https://github.com/thunderbrewhq/squall.git
+[submodule "lib/system"]
+	path = lib/system
+	url = https://github.com/thunderbrewhq/system.git
diff --git a/lib/squall b/lib/squall
index 3d14119..9d7e30c 160000
--- a/lib/squall
+++ b/lib/squall
@@ -1 +1 @@
-Subproject commit 3d141195362dc7557d09deab5b25c3647ee4764e
+Subproject commit 9d7e30c19832f730b8092d0cafdf48f72e08f81a
diff --git a/lib/typhoon b/lib/typhoon
index 036c986..5f09b0f 160000
--- a/lib/typhoon
+++ b/lib/typhoon
@@ -1 +1 @@
-Subproject commit 036c986cd455179873baeb75e81fd3edaca4abbe
+Subproject commit 5f09b0feee4800cd9e8750342a3db4e0209c8dc3