diff --git a/.gitmodules b/.gitmodules
index b023daa3..7b67c02d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -83,9 +83,6 @@
 [submodule "mods/character_creator"]
 	path = mods/character_creator
 	url = https://github.com/minetest-mods/character_creator
-[submodule "mods/3d_armor"]
-	path = mods/3d_armor
-	url = https://github.com/stujones11/minetest-3d_armor
 [submodule "mods/illuna_ethereal"]
 	path = mods/illuna_ethereal
 	url = https://git.tchncs.de/Illuna-Minetest/illuna_ethereal
@@ -227,3 +224,6 @@
 [submodule "mods/areas"]
 	path = mods/areas
 	url = https://git.tchncs.de/Illuna-Minetest/areas
+[submodule "mods/3d_armor"]
+	path = mods/3d_armor
+	url = https://git.tchncs.de/Illuna-Minetest/3d_armor
diff --git a/mods/3d_armor b/mods/3d_armor
index cca523f1..f649e4f2 160000
--- a/mods/3d_armor
+++ b/mods/3d_armor
@@ -1 +1 @@
-Subproject commit cca523f1930dd0eb81d158d70748c90b061d9be7
+Subproject commit f649e4f26a5b1d257d5b7a985dd475e34ccfa327
diff --git a/mods/illuna b/mods/illuna
index d5ac539f..b738d12e 160000
--- a/mods/illuna
+++ b/mods/illuna
@@ -1 +1 @@
-Subproject commit d5ac539ff3975f1f4e66fb34073da2fc8f1fd36a
+Subproject commit b738d12eae166043b75ee926589d97b3fc17191f
diff --git a/mods/illuna_costumes b/mods/illuna_costumes
index 3a934e53..67bccc8d 160000
--- a/mods/illuna_costumes
+++ b/mods/illuna_costumes
@@ -1 +1 @@
-Subproject commit 3a934e53c19093b99dcf61f97a13a8bf1cbeae45
+Subproject commit 67bccc8dbaf92118cd322f05583a8ae29a60699b
diff --git a/mods/illuna_ethereal b/mods/illuna_ethereal
index 68ece42d..6de4f85a 160000
--- a/mods/illuna_ethereal
+++ b/mods/illuna_ethereal
@@ -1 +1 @@
-Subproject commit 68ece42de04b71af4ed5472fac2d6396dcc8f1d7
+Subproject commit 6de4f85a8c3cd79ffaea3f973c3b1f618488ebb1