diff --git a/.config/emacs/site-lisp/core/dot-core-config.el b/.config/emacs/site-lisp/core/dot-core-config.el
index 46e504d..6e86645 100644
--- a/.config/emacs/site-lisp/core/dot-core-config.el
+++ b/.config/emacs/site-lisp/core/dot-core-config.el
@@ -34,6 +34,7 @@
 ;; Parenthesis, set behavior
 (setq show-paren-delay 0)
 (setq show-paren-style 'mixed)
+(setq show-paren-context-when-offscreen t)
 
 ;; Tramp default protocol
 (setq tramp-default-method "ssh")
@@ -101,8 +102,11 @@
 (setq eshell-directory-name           (expand-file-name "eshell/" dot-cache-dir))
 (setq tramp-auto-save-directory       (expand-file-name "tramp-auto-save/" dot-cache-dir))
 (setq tramp-backup-directory-alist    backup-directory-alist)
+(setq treesit-extra-load-path        `(,(expand-file-name "tree-sitter" dot-cache-dir)))
 (setq url-configuration-directory     (expand-file-name "url/" dot-cache-dir))
 
+(startup-redirect-eln-cache (expand-file-name "eln-cache" dot-cache-dir))
+
 ;; Set file locations
 (setq bookmark-default-file           (expand-file-name "bookmarks" dot-etc-dir))
 (setq nsm-settings-file               (expand-file-name "network-security.data" dot-cache-dir))
diff --git a/.config/emacs/site-lisp/dot-development.el b/.config/emacs/site-lisp/dot-development.el
index 595f0ec..ec19a2f 100644
--- a/.config/emacs/site-lisp/dot-development.el
+++ b/.config/emacs/site-lisp/dot-development.el
@@ -323,7 +323,7 @@
 ;; - omnisharp-roslyn-bin
 ;; - netcoredbg (edit PKGBUILD to detect dotnet -6.0 dependencies)
 
-(elpaca-setup csharp-mode)
+(elpaca nil (setup csharp-mode)) ; built-in
 
 ;;; CMake
 
diff --git a/.config/emacs/site-lisp/dot-elpaca.el b/.config/emacs/site-lisp/dot-elpaca.el
index 1c61ed8..b51ff3f 100644
--- a/.config/emacs/site-lisp/dot-elpaca.el
+++ b/.config/emacs/site-lisp/dot-elpaca.el
@@ -9,7 +9,7 @@
 ;; -----------------------------------------
 
 ;; Elpaca bootstrap
-(defvar elpaca-installer-version 0.3)
+(defvar elpaca-installer-version 0.5)
 (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
 (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
 (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
@@ -24,6 +24,7 @@
   (add-to-list 'load-path (if (file-exists-p build) build repo))
   (unless (file-exists-p repo)
     (make-directory repo t)
+    (when (< emacs-major-version 28) (require 'subr-x))
     (condition-case-unless-debug err
         (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*"))
                  ((zerop (call-process "git" nil buffer t "clone"
@@ -35,7 +36,7 @@
                                        "--eval" "(byte-recompile-directory \".\" 0 'force)")))
                  ((require 'elpaca))
                  ((elpaca-generate-autoloads "elpaca" repo)))
-            (kill-buffer buffer)
+            (progn (message "%s" (buffer-string)) (kill-buffer buffer))
           (error "%s" (with-current-buffer buffer (buffer-string))))
       ((error) (warn "%s" err) (delete-directory repo 'recursive))))
   (unless (require 'elpaca-autoloads nil t)
diff --git a/.config/emacs/site-lisp/dot-org-mode.el b/.config/emacs/site-lisp/dot-org-mode.el
index dc8b86d..d94b0af 100644
--- a/.config/emacs/site-lisp/dot-org-mode.el
+++ b/.config/emacs/site-lisp/dot-org-mode.el
@@ -142,11 +142,12 @@ If point is on:
 
 ;;; Org Roam
 
-(elpaca-setup emacsql-sqlite)
+(elpaca emacsql-sqlite-builtin)
 
 (elpaca-setup org-roam
   (:autoload org-roam-node-find) ;; TODO, is this enough?
   (setq org-roam-v2-ack t)
+  (setq org-roam-database-connector 'sqlite-builtin)
   (:when-loaded
     (setq org-roam-db-location (expand-file-name "org-roam.db" dot-cache-dir))
     (setq org-roam-directory org-directory)