diff --git a/.gitmodules b/.gitmodules
index 91c5a9e..03fddc6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -24,7 +24,7 @@
 	url = https://sys4.fr/gitea/nalc/christmas_craft.git
 [submodule "claycrafter"]
 	path = claycrafter
-	url = https://sys4.fr/gitea/nalc/claycrafter.git
+	url = https://sys4.fr/gitea/mtcontrib/claycrafter.git
 [submodule "columnia"]
 	path = columnia
 	url = https://sys4.fr/gitea/nalc/columnia.git
diff --git a/claycrafter b/claycrafter
index fc9daaa..8e33df0 160000
--- a/claycrafter
+++ b/claycrafter
@@ -1 +1 @@
-Subproject commit fc9daaa4017b0ddd54cd741f419fbb36b5ce5c63
+Subproject commit 8e33df0067e2eaa4384f9bf9a49b98a2f57cd31e
diff --git a/craftguide b/craftguide
index c15ce57..7e70cca 160000
--- a/craftguide
+++ b/craftguide
@@ -1 +1 @@
-Subproject commit c15ce57d1b9716883c0f9851fa96a14e6198b4e4
+Subproject commit 7e70ccab276b769febad09d7b65c5b39d6846ddb
diff --git a/maptools b/maptools
index edfb282..c523170 160000
--- a/maptools
+++ b/maptools
@@ -1 +1 @@
-Subproject commit edfb2821f8d0a918dea9940872fc19dc9d448dd7
+Subproject commit c523170c869dade90aa75523916b6bc27c239d75
diff --git a/scifi_nodes b/scifi_nodes
index d3d6a7b..d66e04f 160000
--- a/scifi_nodes
+++ b/scifi_nodes
@@ -1 +1 @@
-Subproject commit d3d6a7bf79eb501172c7395da6e2ebf6d7564389
+Subproject commit d66e04f9b1230f1590f10ac422b450bb2a5fe0be