diff --git a/.borgconfig b/.borgconfig
index d6cea4d..c309a99 100644
--- a/.borgconfig
+++ b/.borgconfig
@@ -2,8 +2,8 @@
 	no-byte-compile = dash-functional.el
 	no-makeinfo = dash-template.texi
 [submodule "emacsql"]
+	no-byte-compile = emacsql-mysql.el
 	no-byte-compile = emacsql-pg.el
-[submodule "magit"]
-	no-byte-compile = lisp/magit-libgit.el
-[submodule "sqlite3"]
-	build-step = make
+	no-byte-compile = emacsql-psql.el
+	no-byte-compile = emacsql-sqlite.el
+	no-byte-compile = emacsql-sqlite-module.el
diff --git a/.gitmodules b/.gitmodules
index d69712f..9dad0e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,25 +3,25 @@
 	path = .borgconfig
 [submodule "auto-compile"]
 	path = lib/auto-compile
-	url = git@github.com:emacscollective/auto-compile.git
+	url = https://github.com/emacscollective/auto-compile.git
 [submodule "borg"]
 	path = lib/borg
-	url = git@github.com:emacscollective/borg.git
+	url = https://github.com/emacscollective/borg.git
 [submodule "closql"]
 	path = lib/closql
-	url = git@github.com:magit/closql.git
+	url = https://github.com/magit/closql.git
 [submodule "compat"]
 	path = lib/compat
-	url = git@github.com:emacs-compat/compat.git
+	url = https://github.com/emacs-compat/compat.git
 [submodule "dash"]
 	path = lib/dash
-	url = git@github.com:magnars/dash.el.git
+	url = https://github.com/magnars/dash.el.git
 [submodule "debbugs"]
 	path = lib/debbugs
 	url = git@github.com:emacsmirror/debbugs.git
 [submodule "diff-hl"]
 	path = lib/diff-hl
-	url = git@github.com:dgutov/diff-hl.git
+	url = https://github.com/dgutov/diff-hl.git
 [submodule "dim-autoload"]
 	path = lib/dim-autoload
 	url = git@github.com:tarsius/dim-autoload.git
@@ -30,10 +30,10 @@
 	url = https://git.sv.gnu.org/r/emacs/elpa.git
 [submodule "emacsql"]
 	path = lib/emacsql
-	url = git@github.com:magit/emacsql.git
+	url = https://github.com/magit/emacsql.git
 [submodule "epkg"]
 	path = lib/epkg
-	url = git@github.com:emacscollective/epkg.git
+	url = https://github.com/emacscollective/epkg.git
 [submodule "forge"]
 	path = lib/forge
 	url = git@github.com:magit/forge.git
@@ -42,19 +42,19 @@
 	url = git@github.com:magit/ghub.git
 [submodule "git-modes"]
 	path = lib/git-modes
-	url = git@github.com:magit/git-modes.git
+	url = https://github.com/magit/git-modes.git
 [submodule "hl-todo"]
 	path = lib/hl-todo
 	url = git@github.com:tarsius/hl-todo.git
 [submodule "llama"]
 	path = lib/llama
-	url = https://git.sr.ht/~tarsius/llama
+	url = https://github.com/tarsius/llama.git
 [submodule "macrostep"]
 	path = lib/macrostep
 	url = git@github.com:emacsorphanage/macrostep.git
 [submodule "magit"]
 	path = lib/magit
-	url = git@github.com:magit/magit.git
+	url = https://github.com/magit/magit.git
 [submodule "magit-imerge"]
 	path = lib/magit-imerge
 	url = git@github.com:magit/magit-imerge.git
@@ -100,25 +100,19 @@
 [submodule "sisyphus"]
 	path = lib/sisyphus
 	url = git@github.com:magit/sisyphus.git
-[submodule "sqlite3"]
-	path = lib/sqlite3
-	url = git@github.com:pekingduck/emacs-sqlite3-api.git
 [submodule "transient"]
 	path = lib/transient
-	url = git@github.com:magit/transient.git
+	url = https://github.com/magit/transient.git
 [submodule "treepy"]
 	path = lib/treepy
-	url = git@github.com:volrath/treepy.el.git
+	url = https://github.com/volrath/treepy.el.git
 [submodule "undo-tree"]
 	remote = silent http://www.dr-qubit.org/git/undo-tree.git
 	path = lib/undo-tree
 	url = git@github.com:tarsiiformes/undo-tree.git
-[submodule "use-package"]
-	path = lib/use-package
-	url = git@github.com:jwiegley/use-package.git
 [submodule "with-editor"]
 	path = lib/with-editor
-	url = git@github.com:magit/with-editor.git
+	url = https://github.com/magit/with-editor.git
 [submodule "yaml"]
 	path = lib/yaml
 	url = git@github.com:zkry/yaml.el.git
diff --git a/early-init.el b/early-init.el
index 72fa63c..200c2c4 100644
--- a/early-init.el
+++ b/early-init.el
@@ -7,10 +7,10 @@
 
 (setq load-prefer-newer t)
 
-(let ((dir (file-name-directory (or load-file-name buffer-file-name))))
-  (add-to-list 'load-path (expand-file-name "lib/compat" dir))
-  (add-to-list 'load-path (expand-file-name "lib/packed" dir))
-  (add-to-list 'load-path (expand-file-name "lib/auto-compile" dir)))
+(add-to-list 'load-path
+             (expand-file-name
+              "lib/auto-compile"
+              (file-name-directory (or load-file-name buffer-file-name))))
 (require 'auto-compile)
 (auto-compile-on-load-mode)
 (auto-compile-on-save-mode)
diff --git a/init.el b/init.el
index 4887638..70e4788 100644
--- a/init.el
+++ b/init.el
@@ -30,8 +30,11 @@
   (borg-initialize))
 
 (eval-and-compile ; `use-package'
-  (require  'use-package)
-  (setq use-package-verbose t))
+  (setopt use-package-enable-imenu-support t)
+  (setopt use-package-verbose t)
+  (require 'use-package))
+
+(use-package compat)
 
 (use-package dash
   :config (global-dash-fontify-mode))
@@ -64,7 +67,7 @@
     (load custom-file)))
 
 (use-package server
-  :commands (server-running-p)
+  :functions (server-running-p)
   :config (or (server-running-p) (server-mode)))
 
 (progn ;     startup
diff --git a/lib/auto-compile b/lib/auto-compile
index 6ed8e29..5cc4e97 160000
--- a/lib/auto-compile
+++ b/lib/auto-compile
@@ -1 +1 @@
-Subproject commit 6ed8e29d23c6c91f8c98f18ff745d2475d6f6a38
+Subproject commit 5cc4e97443727554357f6c57614f12ca87419627
diff --git a/lib/borg b/lib/borg
index e29d983..7b88080 160000
--- a/lib/borg
+++ b/lib/borg
@@ -1 +1 @@
-Subproject commit e29d9839390c0f9e6c375acb4374430cf5595fdf
+Subproject commit 7b88080eea47f6991e74df6e573d3fc88920ac59
diff --git a/lib/closql b/lib/closql
index 85ac7b8..c1a346d 160000
--- a/lib/closql
+++ b/lib/closql
@@ -1 +1 @@
-Subproject commit 85ac7b8a894a4e259439d79eb6bd6f5129770905
+Subproject commit c1a346d56ecee16d1f0d7707f0d62c72604a8802
diff --git a/lib/compat b/lib/compat
index e0ed957..e9203e1 160000
--- a/lib/compat
+++ b/lib/compat
@@ -1 +1 @@
-Subproject commit e0ed957c2f6e71e190659b5e1b08a6b466667d4d
+Subproject commit e9203e164903a6bb7de3e58aa0d653bbcff9d3d1
diff --git a/lib/dash b/lib/dash
index f46268c..1de9dcb 160000
--- a/lib/dash
+++ b/lib/dash
@@ -1 +1 @@
-Subproject commit f46268c75cb7c18361d3cee942cd4dc14a03aef4
+Subproject commit 1de9dcb83eacfb162b6d9a118a4770b1281bcd84
diff --git a/lib/diff-hl b/lib/diff-hl
index d9e34f7..b80ff9b 160000
--- a/lib/diff-hl
+++ b/lib/diff-hl
@@ -1 +1 @@
-Subproject commit d9e34f7b8110b7f753c237d0d0b3f267f3ca4779
+Subproject commit b80ff9b4a772f7ea000e86fbf88175104ddf9557
diff --git a/lib/emacsql b/lib/emacsql
index 6401226..e5f0928 160000
--- a/lib/emacsql
+++ b/lib/emacsql
@@ -1 +1 @@
-Subproject commit 64012261f65fcdd7ea137d1973ef051af1dced42
+Subproject commit e5f0928a047dba8e3a00b6333400422b301bac35
diff --git a/lib/epkg b/lib/epkg
index 5acd454..8f51609 160000
--- a/lib/epkg
+++ b/lib/epkg
@@ -1 +1 @@
-Subproject commit 5acd45411b012b15ec1a042418c9024b091c3ad7
+Subproject commit 8f51609006a563222e64c3f61363061a8c2d7748
diff --git a/lib/git-modes b/lib/git-modes
index 44d536b..f99010b 160000
--- a/lib/git-modes
+++ b/lib/git-modes
@@ -1 +1 @@
-Subproject commit 44d536ba637235c9dd203410281397417a3e60b6
+Subproject commit f99010bbeb8b6d8a0819fac0195a2ef0159d08f0
diff --git a/lib/llama b/lib/llama
index 5c454f1..732389e 160000
--- a/lib/llama
+++ b/lib/llama
@@ -1 +1 @@
-Subproject commit 5c454f1a83c698668942603e595cec36a5211768
+Subproject commit 732389e3886b510c2661d7d4fd65e01837211e8a
diff --git a/lib/magit b/lib/magit
index b3f473f..461d5ba 160000
--- a/lib/magit
+++ b/lib/magit
@@ -1 +1 @@
-Subproject commit b3f473f31d7bc7517abb9266efaf65bdc8a32532
+Subproject commit 461d5ba249b8178ae83f80596da4312e65010720
diff --git a/lib/sqlite3 b/lib/sqlite3
deleted file mode 160000
index ad6dc36..0000000
--- a/lib/sqlite3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ad6dc366b7cc7587965a7eeb7c1fb8b83679f81e
diff --git a/lib/transient b/lib/transient
index e163a90..3ec0692 160000
--- a/lib/transient
+++ b/lib/transient
@@ -1 +1 @@
-Subproject commit e163a904b5b98f9a43299805296934da27fc1f55
+Subproject commit 3ec0692c3122ab78e1967bbbfa377711a123abe6
diff --git a/lib/use-package b/lib/use-package
deleted file mode 160000
index a6e8564..0000000
--- a/lib/use-package
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a6e856418d2ebd053b34e0ab2fda328abeba731c
diff --git a/lib/with-editor b/lib/with-editor
index a485378..63e60d5 160000
--- a/lib/with-editor
+++ b/lib/with-editor
@@ -1 +1 @@
-Subproject commit a4853781835346aabf083d2d9cb87f656d01ccac
+Subproject commit 63e60d5877c97b5c4205816ddd2ba53dde109317