diff --git a/.borgconfig b/.borgconfig
index 0a6665a..bb81464 100644
--- a/.borgconfig
+++ b/.borgconfig
@@ -5,7 +5,6 @@
 	no-byte-compile = emacsql-mysql.el
 	no-byte-compile = emacsql-pg.el
 	no-byte-compile = emacsql-psql.el
-	no-byte-compile = emacsql-sqlite.el
 	no-byte-compile = emacsql-sqlite-module.el
 [submodule "lua-mode"]
 	no-byte-compile = init-tryout.el
diff --git a/.gitmodules b/.gitmodules
index 455c283..92d7af1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,6 +13,9 @@
 [submodule "compat"]
 	path = lib/compat
 	url = https://github.com/emacs-compat/compat.git
+[submodule "cond-let"]
+	path = lib/cond-let
+	url = https://github.com/tarsius/cond-let
 [submodule "dash"]
 	path = lib/dash
 	url = https://github.com/magnars/dash.el.git
diff --git a/Makefile b/Makefile
index ac8caa4..e3cc47a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,10 @@ help helpall::
 	@printf "\n"
 
 bootstrap-borg:
-	@mkdir .git/modules
-	@git clone https://github.com/emacscollective/borg lib/borg \
-	--separate-git-dir .git/modules/borg
+	@ GITDIR="$$(realpath --relative-to=. "$$(git rev-parse --git-dir)")"; \
+	mkdir "$$GITDIR/modules"; \
+	git clone https://github.com/emacscollective/borg lib/borg \
+	--separate-git-dir "$$GITDIR/modules/borg"
 	@cd lib/borg; git symbolic-ref HEAD refs/heads/main
 	@cd lib/borg; git reset --hard HEAD
 
diff --git a/init.el b/init.el
index 88c19b6..c9995ae 100644
--- a/init.el
+++ b/init.el
@@ -75,6 +75,10 @@
 
 ;;; Long tail
 
+(use-package cond-let
+  :config
+  (font-lock-add-keywords 'emacs-lisp-mode cond-let-font-lock-keywords t))
+
 (use-package diff-hl
   :config
   (setq diff-hl-draw-borders nil)
diff --git a/lib/auto-compile b/lib/auto-compile
index 5cc4e97..20744a6 160000
--- a/lib/auto-compile
+++ b/lib/auto-compile
@@ -1 +1 @@
-Subproject commit 5cc4e97443727554357f6c57614f12ca87419627
+Subproject commit 20744a681ba5f0584695973a5ece3a794026ff76
diff --git a/lib/borg b/lib/borg
index 7b88080..5b192d8 160000
--- a/lib/borg
+++ b/lib/borg
@@ -1 +1 @@
-Subproject commit 7b88080eea47f6991e74df6e573d3fc88920ac59
+Subproject commit 5b192d8d1a426402b98a2e2e3342c4b73477fbcc
diff --git a/lib/closql b/lib/closql
index c1a346d..cc291a0 160000
--- a/lib/closql
+++ b/lib/closql
@@ -1 +1 @@
-Subproject commit c1a346d56ecee16d1f0d7707f0d62c72604a8802
+Subproject commit cc291a0d8f527a36315fca4c8e1dd32e81fdf871
diff --git a/lib/compat b/lib/compat
index e9203e1..cccd41f 160000
--- a/lib/compat
+++ b/lib/compat
@@ -1 +1 @@
-Subproject commit e9203e164903a6bb7de3e58aa0d653bbcff9d3d1
+Subproject commit cccd41f549fa88031a32deb26253b462021d7e12
diff --git a/lib/cond-let b/lib/cond-let
new file mode 160000
index 0000000..09ebf1c
--- /dev/null
+++ b/lib/cond-let
@@ -0,0 +1 @@
+Subproject commit 09ebf1caa81c99677ce74091a23b48a28d53bcd9
diff --git a/lib/dash b/lib/dash
index 1de9dcb..fb443e7 160000
--- a/lib/dash
+++ b/lib/dash
@@ -1 +1 @@
-Subproject commit 1de9dcb83eacfb162b6d9a118a4770b1281bcd84
+Subproject commit fb443e7a6e660ba849cafcd01021d9aac3ac6764
diff --git a/lib/diff-hl b/lib/diff-hl
index b80ff9b..16a27cb 160000
--- a/lib/diff-hl
+++ b/lib/diff-hl
@@ -1 +1 @@
-Subproject commit b80ff9b4a772f7ea000e86fbf88175104ddf9557
+Subproject commit 16a27cb4872c4ea3b2a9ccff231c464279601e9c
diff --git a/lib/emacsql b/lib/emacsql
index e5f0928..3e015ab 160000
--- a/lib/emacsql
+++ b/lib/emacsql
@@ -1 +1 @@
-Subproject commit e5f0928a047dba8e3a00b6333400422b301bac35
+Subproject commit 3e015ab99e061f3967a154683f068ce6553f168a
diff --git a/lib/epkg b/lib/epkg
index 8f51609..b6922f1 160000
--- a/lib/epkg
+++ b/lib/epkg
@@ -1 +1 @@
-Subproject commit 8f51609006a563222e64c3f61363061a8c2d7748
+Subproject commit b6922f112dd0b523df0e2da49b4cc9327b1085ba
diff --git a/lib/git-modes b/lib/git-modes
index f99010b..7063d66 160000
--- a/lib/git-modes
+++ b/lib/git-modes
@@ -1 +1 @@
-Subproject commit f99010bbeb8b6d8a0819fac0195a2ef0159d08f0
+Subproject commit 7063d66857023e6c010cecac52de67c0baa77fb7
diff --git a/lib/llama b/lib/llama
index 732389e..ec1d4ef 160000
--- a/lib/llama
+++ b/lib/llama
@@ -1 +1 @@
-Subproject commit 732389e3886b510c2661d7d4fd65e01837211e8a
+Subproject commit ec1d4ef02f5572fc5aff3f62d3e7ef791f444456
diff --git a/lib/magit b/lib/magit
index 461d5ba..5183b8f 160000
--- a/lib/magit
+++ b/lib/magit
@@ -1 +1 @@
-Subproject commit 461d5ba249b8178ae83f80596da4312e65010720
+Subproject commit 5183b8f0d42345432a560996e4f434d27452faa8
diff --git a/lib/transient b/lib/transient
index 3ec0692..1d2710c 160000
--- a/lib/transient
+++ b/lib/transient
@@ -1 +1 @@
-Subproject commit 3ec0692c3122ab78e1967bbbfa377711a123abe6
+Subproject commit 1d2710c7f8bba962bfbe6502d76158c2150840c1
diff --git a/lib/treepy b/lib/treepy
index 75fe3ec..651e263 160000
--- a/lib/treepy
+++ b/lib/treepy
@@ -1 +1 @@
-Subproject commit 75fe3ec37e6f9b2bdfd6d0584efd984d0c00a43e
+Subproject commit 651e2634f01f346da9ec8a64613c51f54b444bc3
diff --git a/lib/with-editor b/lib/with-editor
index 63e60d5..87a384a 160000
--- a/lib/with-editor
+++ b/lib/with-editor
@@ -1 +1 @@
-Subproject commit 63e60d5877c97b5c4205816ddd2ba53dde109317
+Subproject commit 87a384a0e59260cca41ca8831d98e195b1ec8ada