diff --git a/.gitignore b/.gitignore
index 34d430b..42bdd4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 !ascii-arts
 !ascii-arts/*
 !zsh-stuff
+!zsh-stuff/*
 
 !.config
 !.config/picom
diff --git a/.gitmodules b/.gitmodules
index 84d9d3f..fbe74a4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,12 @@
-[submodule "zsh-stuff/zsh-syntax-highlighting"]
-	path = zsh-stuff/zsh-syntax-highlighting
-	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
-[submodule "zsh-stuff/spaceship-prompt"]
-	path = zsh-stuff/spaceship-prompt
-	url = https://github.com/spaceship-prompt/spaceship-prompt.git
 [submodule ".stumpwm.d/modules"]
 	path = .stumpwm.d/modules
 	url = https://github.com/stumpwm/stumpwm-contrib
+[submodule "zsh-stuff/spaceship-prompt"]
+	path = zsh-stuff/spaceship-prompt
+	url = https://github.com/spaceship-prompt/spaceship-prompt.git
+[submodule "spaceship"]
+	path = zsh-stuff/spaceship-prompt
+	url = https://github.com/spaceship-prompt/spaceship-prompt.git
+[submodule "stumpwm-modules"]
+	path = .stumpwm.d/modules
+	url = https://github.com/stumpwm/stumpwm-contrib
diff --git a/.stumpwm.d/modules b/.stumpwm.d/modules
new file mode 160000
index 0000000..6d4584f
--- /dev/null
+++ b/.stumpwm.d/modules
@@ -0,0 +1 @@
+Subproject commit 6d4584f01dec0143a169186df1608860d1aa1ef0
diff --git a/zsh-stuff/spaceship-prompt b/zsh-stuff/spaceship-prompt
new file mode 160000
index 0000000..8e510cf
--- /dev/null
+++ b/zsh-stuff/spaceship-prompt
@@ -0,0 +1 @@
+Subproject commit 8e510cf0422691470da071931ea2f901ea1ccfcd
diff --git a/zsh-stuff/zsh-syntax-highlighting b/zsh-stuff/zsh-syntax-highlighting
new file mode 160000
index 0000000..122dc46
--- /dev/null
+++ b/zsh-stuff/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 122dc464392302114556b53ec01a1390c54f739f