diff --git a/init.el b/init.el
index 1784039..5ec871f 100644
--- a/init.el
+++ b/init.el
@@ -702,9 +702,10 @@ if ripgrep is installed, otherwise `consult-grep'."
   (setup (:straight flyspell-correct)
     (define-key flyspell-mode-map (kbd "C-;") #'flyspell-correct-wrapper)))
 
-(when (eq acdw/system :home)
-  (setup (:straight pkgbuild-mode)))
+
+;;; Programming
 
+;;; General tools
 (setup (:straight (apheleia :host github
                             :repo "raxod502/apheleia"))
   (apheleia-global-mode +1)
@@ -829,3 +830,6 @@ don't want."
   (add-to-list 'auto-mode-alist '("\\.fs\\'" . forth-mode))
   (autoload 'forth-block-mode "gforth")
   (add-to-list 'auto-mode-alist '("\\.fb\\'" . forth-block-mode)))
+
+(when (eq acdw/system :home)
+  (setup (:straight pkgbuild-mode)))