diff --git a/.gitmodules b/.gitmodules
index 23d7fa2bb..0cb8b7a3a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "third_party/xbyak"]
 	path = third_party/xbyak
-	url = https://github.com/xenia-project/xbyak.git
+	url = https://github.com/herumi/xbyak.git
 [submodule "third_party/imgui"]
 	path = third_party/imgui
 	url = https://github.com/ocornut/imgui.git
@@ -30,7 +30,7 @@
 	url = https://github.com/openluopworld/aes_128.git
 [submodule "third_party/capstone"]
 	path = third_party/capstone
-	url = https://github.com/xenia-project/capstone.git
+	url = https://github.com/capstone-engine/capstone.git
 [submodule "third_party/cpptoml"]
 	path = third_party/cpptoml
 	url = https://github.com/skystrife/cpptoml.git
diff --git a/third_party/capstone b/third_party/capstone
index f9c6a9048..097c04d94 160000
--- a/third_party/capstone
+++ b/third_party/capstone
@@ -1 +1 @@
-Subproject commit f9c6a90489be7b3637ff1c7298e45efafe7cf1b9
+Subproject commit 097c04d9413c59a58b00d4d1c8d5dc0ac158ffaa
diff --git a/third_party/capstone.lua b/third_party/capstone.lua
index 62bd4e028..a29e4e879 100644
--- a/third_party/capstone.lua
+++ b/third_party/capstone.lua
@@ -39,6 +39,8 @@ project("capstone")
     "capstone/SStream.h",
     "capstone/utils.c",
     "capstone/utils.h",
+    "capstone/Mapping.c",
+    "capstone/Mapping.h",
 
     "capstone/arch/X86/*.c",
     "capstone/arch/X86/*.h",
diff --git a/third_party/cxxopts b/third_party/cxxopts
index b2b8cf2f5..3bf268481 160000
--- a/third_party/cxxopts
+++ b/third_party/cxxopts
@@ -1 +1 @@
-Subproject commit b2b8cf2f50a449720874f43445e23d75b77dcc43
+Subproject commit 3bf268481da8208d171d8908e6491459de3651d7
diff --git a/third_party/fmt b/third_party/fmt
index 27e3c0fe9..7bdf0628b 160000
--- a/third_party/fmt
+++ b/third_party/fmt
@@ -1 +1 @@
-Subproject commit 27e3c0fe9b5dc99f339637ec2ea7efae5b945ab8
+Subproject commit 7bdf0628b1276379886c7f6dda2cef2b3b374f0b
diff --git a/third_party/xbyak b/third_party/xbyak
index bc70e7e11..63e6ee92c 160000
--- a/third_party/xbyak
+++ b/third_party/xbyak
@@ -1 +1 @@
-Subproject commit bc70e7e11ad37f207ece73330c5b72a55fef1ceb
+Subproject commit 63e6ee92cc906a3dbf6b333b2fd51ac1ca95f891