diff --git a/.gitmodules b/.gitmodules
index 350a0a4..7e6af95 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@
 	url = git@github.com:emacscollective/borg.git
 [submodule "closql"]
 	path = lib/closql
-	url = git@github.com:emacscollective/closql.git
+	url = git@github.com:magit/closql.git
 [submodule "compat"]
 	path = lib/compat
 	url = https://git.sr.ht/~pkal/compat
@@ -24,10 +24,7 @@
 [submodule "emacsql"]
 	no-byte-compile = emacsql-pg.el
 	path = lib/emacsql
-	url = git@github.com:skeeto/emacsql.git
-[submodule "emacsql-sqlite-builtin"]
-	path = lib/emacsql-sqlite-builtin
-	url = git@github.com:emacscollective/emacsql-sqlite-builtin.git
+	url = git@github.com:magit/emacsql.git
 [submodule "epkg"]
 	path = lib/epkg
 	url = git@github.com:emacscollective/epkg.git
diff --git a/Makefile b/Makefile
index 0ab1a8c..94d3ea5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,28 @@
 -include lib/borg/borg.mk
 
+ifndef BORG_DIR
+
+help helpall::
+	$(info )
+	$(info Bootstrapping)
+	$(info -------------)
+	$(info make bootstrap-borg  = make borg and make targets available)
+	@printf "\n"
+
 bootstrap-borg:
 	@git submodule--helper clone --name borg --path lib/borg \
 	--url git@github.com:emacscollective/borg.git
 	@cd lib/borg; git symbolic-ref HEAD refs/heads/master
 	@cd lib/borg; git reset --hard HEAD
 
+else
+
 helpall::
 	$(info Test and fix targets)
 	$(info --------------------)
 	$(info make codespell-dry   = run codespell, dry run)
 	$(info make codespell-fix   = run codespell, write fixes)
-	$(info )
+	@printf "\n"
 
 codespell-dry:
 	@cd lib; codespell \
@@ -26,3 +37,5 @@ codespell-fix:
 	  --exclude-file ~/.emacs.d/etc/codespell/ignore-lines \
 	  --skip $(shell sed '/^\s*$$/d;/^\s*#.*$$/d;s/#.*//;s/\s//g' \
 	  ~/.emacs.d/etc/codespell/ignore-files | tr "\\n" ",")
+
+endif
diff --git a/init.el b/init.el
index 0a2b596..6735099 100644
--- a/init.el
+++ b/init.el
@@ -71,7 +71,7 @@
 ;;; Long tail
 
 (use-package dash
-  :config (global-dash-fontify-mode 1))
+  :config (global-dash-fontify-mode))
 
 (use-package diff-hl
   :config
@@ -134,7 +134,7 @@
 
 (use-package recentf
   :demand t
-  :config (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:"))
+  :config (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?x?:"))
 
 (use-package savehist
   :config (savehist-mode))
diff --git a/lib/auto-compile b/lib/auto-compile
index b204e2f..9caa1ae 160000
--- a/lib/auto-compile
+++ b/lib/auto-compile
@@ -1 +1 @@
-Subproject commit b204e2f85aaa4d41af4eb1819633c9613f5172bf
+Subproject commit 9caa1aeaa9c37faae87fc2e6b86e6be0dc1ab084
diff --git a/lib/borg b/lib/borg
index 3cea55c..032ddf3 160000
--- a/lib/borg
+++ b/lib/borg
@@ -1 +1 @@
-Subproject commit 3cea55cd44fe3b92034afa02315c4c37a42fbb2f
+Subproject commit 032ddf33799dd0a2c89d1a3e9e04dc3cdc13320c
diff --git a/lib/closql b/lib/closql
index 87d2eda..820e951 160000
--- a/lib/closql
+++ b/lib/closql
@@ -1 +1 @@
-Subproject commit 87d2edae8bc3d390bcfc5e909e9c13ff9fce994a
+Subproject commit 820e95170acb79de0fb554577a0dc9b707e23aea
diff --git a/lib/compat b/lib/compat
index 8c51417..e827a9f 160000
--- a/lib/compat
+++ b/lib/compat
@@ -1 +1 @@
-Subproject commit 8c514176612add24d1d5d8554510547ccc841a25
+Subproject commit e827a9f3e2ba585de8b07cd246534a15ec414a8b
diff --git a/lib/dash b/lib/dash
index 0ac1ecf..3df46d7 160000
--- a/lib/dash
+++ b/lib/dash
@@ -1 +1 @@
-Subproject commit 0ac1ecf6b56eb67bb81a3cf70f8d4354b5782341
+Subproject commit 3df46d7d9fe74f52a661565888e4d31fd760f0df
diff --git a/lib/diff-hl b/lib/diff-hl
index e84209e..68fb280 160000
--- a/lib/diff-hl
+++ b/lib/diff-hl
@@ -1 +1 @@
-Subproject commit e84209e959a17c7b96148e099e391daa29a4835e
+Subproject commit 68fb280b300c5d8460cc7b9183e29fb3ec604136
diff --git a/lib/emacsql b/lib/emacsql
index 373975c..e318a6c 160000
--- a/lib/emacsql
+++ b/lib/emacsql
@@ -1 +1 @@
-Subproject commit 373975cbccf7776af771e23f86043b236a330702
+Subproject commit e318a6c8f65371e2ab667d811205a0d9a98dacbb
diff --git a/lib/emacsql-sqlite-builtin b/lib/emacsql-sqlite-builtin
deleted file mode 160000
index 3e820c6..0000000
--- a/lib/emacsql-sqlite-builtin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3e820c66fdaa9937f9e612900954dcd6c7d01943
diff --git a/lib/epkg b/lib/epkg
index 4524f9a..dbb2d65 160000
--- a/lib/epkg
+++ b/lib/epkg
@@ -1 +1 @@
-Subproject commit 4524f9a8f19717c4afb84a184db7841b4ffcbf56
+Subproject commit dbb2d6556b8d100633b8a8b71914df476279dc13
diff --git a/lib/git-modes b/lib/git-modes
index eca3bb4..4f9ad30 160000
--- a/lib/git-modes
+++ b/lib/git-modes
@@ -1 +1 @@
-Subproject commit eca3bb42ea8abed9ef8549b2ac91bbea445c5bb5
+Subproject commit 4f9ad30f01cfb3f8460b786153f8569578c0f8dc
diff --git a/lib/magit b/lib/magit
index dbb2e9c..2a5815f 160000
--- a/lib/magit
+++ b/lib/magit
@@ -1 +1 @@
-Subproject commit dbb2e9c8de8806c3160e896e346d681168c5a64e
+Subproject commit 2a5815fee1ed091751b8bbfa242f7a78d7e5e039
diff --git a/lib/packed b/lib/packed
index 6a427d9..c079fc6 160000
--- a/lib/packed
+++ b/lib/packed
@@ -1 +1 @@
-Subproject commit 6a427d9da742d78a8f6bd6ed9e31fbf241b2ea82
+Subproject commit c079fc64f46e514ab685c01fef22f13a33f90d0f
diff --git a/lib/transient b/lib/transient
index a583d2b..ad953cc 160000
--- a/lib/transient
+++ b/lib/transient
@@ -1 +1 @@
-Subproject commit a583d2b2f5f8963f08cb5a15a4d4dd55faa13585
+Subproject commit ad953cc3c5b8a066d3da11a8527c035744f1385f
diff --git a/lib/treepy b/lib/treepy
index 3ac940e..de1a2dd 160000
--- a/lib/treepy
+++ b/lib/treepy
@@ -1 +1 @@
-Subproject commit 3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3
+Subproject commit de1a2ddc3fd7152d0bfbd9e14312ff8a4864ab2b
diff --git a/lib/use-package b/lib/use-package
index a7422fb..0be480e 160000
--- a/lib/use-package
+++ b/lib/use-package
@@ -1 +1 @@
-Subproject commit a7422fb8ab1baee19adb2717b5b47b9c3812a84c
+Subproject commit 0be480ea77655304a4e6aa9d38d9d9a251b2bd32
diff --git a/lib/with-editor b/lib/with-editor
index cfcbc27..4ca225b 160000
--- a/lib/with-editor
+++ b/lib/with-editor
@@ -1 +1 @@
-Subproject commit cfcbc2731e402b9169c0dc03e89b5b57aa988502
+Subproject commit 4ca225bf1c54d6dab2ba7e734f594419c7769e36