diff --git a/.gitmodules b/.gitmodules
index dbebb4d..99cb4cc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -136,6 +136,7 @@
 [submodule ".vim/pack/alpha/start/vim-terraform"]
 	path = .vim/pack/alpha/start/vim-terraform
 	url = https://github.com/hashivim/vim-terraform.git
+	branch = master
 [submodule ".vim/pack/alpha/start/vim-nix"]
 	path = .vim/pack/alpha/start/vim-nix
 	url = https://github.com/LnL7/vim-nix.git
@@ -253,6 +254,7 @@
 [submodule "terraform"]
 	path = .local/share/nvim/site/pack/alpha/start/terraform
 	url = https://github.com/hashivim/vim-terraform.git
+	branch = master
 	shallow = true
 [submodule "alfred-gemoji"]
 	path = src/alfred-gemoji
@@ -282,7 +284,6 @@
 [submodule "fidget.nvim"]
 	path = .local/share/nvim/site/pack/alpha/start/fidget
 	url = https://github.com/j-hui/fidget.nvim.git
-	branch = main
 	shallow = true
 [submodule "dirvish"]
 	path = .local/share/nvim/site/pack/alpha/start/dirvish
diff --git a/.local/share/nvim/site/pack/alpha/start/direnv b/.local/share/nvim/site/pack/alpha/start/direnv
index 4c858b8..165031f 160000
--- a/.local/share/nvim/site/pack/alpha/start/direnv
+++ b/.local/share/nvim/site/pack/alpha/start/direnv
@@ -1 +1 @@
-Subproject commit 4c858b8cd8cbfac998534096e6ffb710d7a07358
+Subproject commit 165031fa2c8dbb1e78dfd7054fe064ea926384cb
diff --git a/.local/share/nvim/site/pack/alpha/start/dirvish b/.local/share/nvim/site/pack/alpha/start/dirvish
index 6233243..bbf53b3 160000
--- a/.local/share/nvim/site/pack/alpha/start/dirvish
+++ b/.local/share/nvim/site/pack/alpha/start/dirvish
@@ -1 +1 @@
-Subproject commit 6233243f0caa71d27d27ea102540a88bce8eb6ea
+Subproject commit bbf53b30ca1e718625b9b84b1d32379e470ddad7
diff --git a/.local/share/nvim/site/pack/alpha/start/fzf b/.local/share/nvim/site/pack/alpha/start/fzf
index dc71692..1dcdb21 160000
--- a/.local/share/nvim/site/pack/alpha/start/fzf
+++ b/.local/share/nvim/site/pack/alpha/start/fzf
@@ -1 +1 @@
-Subproject commit dc71692255b62d1f67dc55c8e51ab1aa467b1d46
+Subproject commit 1dcdb21db618055134cd611f4f5918f6d00a5df0
diff --git a/.local/share/nvim/site/pack/alpha/start/hotpot b/.local/share/nvim/site/pack/alpha/start/hotpot
index 9fd5d6e..026eba9 160000
--- a/.local/share/nvim/site/pack/alpha/start/hotpot
+++ b/.local/share/nvim/site/pack/alpha/start/hotpot
@@ -1 +1 @@
-Subproject commit 9fd5d6e341861c776ec9c69a2fc524deae67b541
+Subproject commit 026eba9596b506ab6f807fd4aa93cd5f76255725
diff --git a/.local/share/nvim/site/pack/alpha/start/indent-blankline b/.local/share/nvim/site/pack/alpha/start/indent-blankline
index 7075d78..4541d69 160000
--- a/.local/share/nvim/site/pack/alpha/start/indent-blankline
+++ b/.local/share/nvim/site/pack/alpha/start/indent-blankline
@@ -1 +1 @@
-Subproject commit 7075d7861f7a6bbf0de0298c83f8a13195e6ec01
+Subproject commit 4541d690816cb99a7fc248f1486aa87f3abce91c
diff --git a/.local/share/nvim/site/pack/alpha/start/lspconfig b/.local/share/nvim/site/pack/alpha/start/lspconfig
index 9166622..4b26897 160000
--- a/.local/share/nvim/site/pack/alpha/start/lspconfig
+++ b/.local/share/nvim/site/pack/alpha/start/lspconfig
@@ -1 +1 @@
-Subproject commit 9166622781a39a829878d1fd24c174529d996838
+Subproject commit 4b26897a80c41eb2f116b271cbdcd4686fb52dd6
diff --git a/.local/share/nvim/site/pack/alpha/start/navic b/.local/share/nvim/site/pack/alpha/start/navic
index 15704c6..e6da6f7 160000
--- a/.local/share/nvim/site/pack/alpha/start/navic
+++ b/.local/share/nvim/site/pack/alpha/start/navic
@@ -1 +1 @@
-Subproject commit 15704c607569d6c5cfeab486d3ef9459645a70ce
+Subproject commit e6da6f74d89de65258ea7e98e22103ff5de6dcf5
diff --git a/.local/share/nvim/site/pack/alpha/start/treesitter b/.local/share/nvim/site/pack/alpha/start/treesitter
index 56c6352..12d970f 160000
--- a/.local/share/nvim/site/pack/alpha/start/treesitter
+++ b/.local/share/nvim/site/pack/alpha/start/treesitter
@@ -1 +1 @@
-Subproject commit 56c63529c052a179134842c56c6df5728cc375da
+Subproject commit 12d970f8aea7eed4d98727b3234ab098ddde3576
diff --git a/.local/share/nvim/site/pack/alpha/start/treesitter-context b/.local/share/nvim/site/pack/alpha/start/treesitter-context
index 2182556..6f8f788 160000
--- a/.local/share/nvim/site/pack/alpha/start/treesitter-context
+++ b/.local/share/nvim/site/pack/alpha/start/treesitter-context
@@ -1 +1 @@
-Subproject commit 2182556aab4524b4fa8d00031bf1228ea2e4a023
+Subproject commit 6f8f788738b968f24a108ee599c5be0031f94f06
diff --git a/.local/share/nvim/site/pack/alpha/start/treesitter-textobjects b/.local/share/nvim/site/pack/alpha/start/treesitter-textobjects
index 95b76b9..52f1f32 160000
--- a/.local/share/nvim/site/pack/alpha/start/treesitter-textobjects
+++ b/.local/share/nvim/site/pack/alpha/start/treesitter-textobjects
@@ -1 +1 @@
-Subproject commit 95b76b95eff25e1e64f363938cd853852355d70a
+Subproject commit 52f1f3280d9092bfaee5c45be5962fabee3d9654
diff --git a/.vim/pack/alpha/start/fzf.vim b/.vim/pack/alpha/start/fzf.vim
index dc71692..1dcdb21 160000
--- a/.vim/pack/alpha/start/fzf.vim
+++ b/.vim/pack/alpha/start/fzf.vim
@@ -1 +1 @@
-Subproject commit dc71692255b62d1f67dc55c8e51ab1aa467b1d46
+Subproject commit 1dcdb21db618055134cd611f4f5918f6d00a5df0
diff --git a/Rakefile b/Rakefile
index 3a688f1..148e863 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,12 +17,7 @@ namespace :sync do
 
   desc "Sync submodules"
   task :submodules do
-    sh "git submodule foreach git pull"
-    Dir.chdir "src/prezto" do
-      sh "git fetch upstream"
-      sh "git rebase upstream/master"
-      sh "git submodule update --init --recursive"
-    end
+    sh "git submodule update --init --recursive --remote"
   end
 
   desc "Sync puzzles from ~/Downloads"
diff --git a/src/bqn b/src/bqn
index 5ba1a88..4fcf3d5 160000
--- a/src/bqn
+++ b/src/bqn
@@ -1 +1 @@
-Subproject commit 5ba1a886035f52c295214b5d9db9dd5d8556dabd
+Subproject commit 4fcf3d5917d0bfdba90e30cc1857a865695b6a1d
diff --git a/src/emoji.alfredworkflow b/src/emoji.alfredworkflow
index ad46c6d..c1d3b14 160000
--- a/src/emoji.alfredworkflow
+++ b/src/emoji.alfredworkflow
@@ -1 +1 @@
-Subproject commit ad46c6dbcc413ab619354ce1e97e42f10c229bea
+Subproject commit c1d3b14ebfc91c24342c32afd063094bc15856d8
diff --git a/src/fzf-git.sh b/src/fzf-git.sh
index 703f9a2..b6192ec 160000
--- a/src/fzf-git.sh
+++ b/src/fzf-git.sh
@@ -1 +1 @@
-Subproject commit 703f9a2a0ae4b131def667d758649479236ad326
+Subproject commit b6192ec86609afea761c7d3954f9b539a512dc80
diff --git a/src/giphy.alfredworkflow b/src/giphy.alfredworkflow
index bb17bdd..517c317 160000
--- a/src/giphy.alfredworkflow
+++ b/src/giphy.alfredworkflow
@@ -1 +1 @@
-Subproject commit bb17bdd387a4b38458a43d781c040f4867f721c8
+Subproject commit 517c3175af8d690c913c95b106630b7fa858b493