diff --git a/custom.el b/custom.el
index 490dc8c..b07030a 100644
--- a/custom.el
+++ b/custom.el
@@ -6,12 +6,14 @@
  ;; If there is more than one, they won't work right.
  '(custom-enabled-themes '(deeper-blue))
  '(package-selected-packages
-   '(cape dart-mode diminish dumber-jump evil evil-collection
-	  exec-path-from-shell fish-mode ghostel jai-mode magit
-	  move-text multiple-cursors org-roam terraform-mode undo-tree
-	  yaml-mode yasnippet yasnippet-snippets))
+   '(apheleia cape dart-mode diminish dumber-jump evil evil-collection
+	      evil-surround exec-path-from-shell fish-mode ghostel
+	      jai-mode magit mise move-text multiple-cursors org-roam
+	      pgmacs terraform-mode undo-tree yaml-mode yasnippet
+	      yasnippet-snippets))
  '(package-vc-selected-packages
-   '((jai-mode :url "https://github.com/valignatev/jai-mode.git"))))
+   '((pgmacs :url "https://github.com/emarsden/pgmacs.git")
+     (jai-mode :url "https://github.com/valignatev/jai-mode.git"))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/init.el b/init.el
index 464a64f..9bd83d4 100644
--- a/init.el
+++ b/init.el
@@ -4,7 +4,7 @@
 (package-initialize)
 
 (if (string= system-type "darwin")
-    (set-frame-font "Berkeley Mono 16" nil t)
+    (set-frame-font "Berkeley Mono 18" nil t)
   (set-frame-font "BerkeleyMono 14" nil t))
 
 (load-theme 'deeper-blue)
@@ -77,6 +77,7 @@
 (add-hook 'before-save-hook 'delete-trailing-whitespace)
 (add-hook 'before-save-hook 'hgh/untabify-buffer)
 
+
 (if (file-exists-p custom-file)
     (load-file custom-file))
 
@@ -90,7 +91,11 @@
 
 (exec-path-from-shell-initialize)
 
-(use-package diminish)
+(use-package diminish
+  :demand t
+  :config
+  (diminish 'eldoc-mode)
+  (diminish 'completion-preview-mode))
 
 (setq treesit-enabled-modes t)
 
@@ -125,6 +130,7 @@
   (evil-global-set-key 'normal (kbd "[d")         #'flymake-goto-prev-error))
 
 (use-package evil-collection
+  :diminish 'evil-collection-unimpaired-mode
   :after evil
   :ensure t
   :custom
@@ -137,6 +143,11 @@
   (keymap-set compilation-mode-map "SPC" nil)
   (keymap-set help-mode-map "SPC" nil))
 
+(use-package evil-surround
+  :ensure t
+  :config
+  (global-evil-surround-mode 1))
+
 (use-package move-text
   :bind (("M-<down>" . 'move-text-down)
          ("M-j"      . 'move-text-down)
@@ -145,7 +156,7 @@
 
 (use-package jai-mode
   :vc (:url "https://github.com/valignatev/jai-mode.git"
-       :rev :newest))
+            :rev :newest))
 
 (use-package magit
   :bind ("C-x g" . magit-status)
@@ -171,21 +182,21 @@
   :config
   (push
    '(:language "jai" :type "function"
-           :supports ("ag" "grep" "rg" "git-grep")
-           :regex "\\bJJJ\\s*::"
-           :tests ("test ::"))
+               :supports ("ag" "grep" "rg" "git-grep")
+               :regex "\\bJJJ\\s*::"
+               :tests ("test ::"))
    dumber-jump-find-rules)
   (push
-    '(:language "jai" :type "variable"
-           :supports ("ag" "grep" "rg" "git-grep")
-           :regex "\\bJJJ\\s*(:|:\\s*=|::)"
-           :tests ("test: Type" "test : Type = Val" "test :: Val"))
-    dumber-jump-find-rules)
+   '(:language "jai" :type "variable"
+               :supports ("ag" "grep" "rg" "git-grep")
+               :regex "\\bJJJ\\s*(:|:\\s*=|::)"
+               :tests ("test: Type" "test : Type = Val" "test :: Val"))
+   dumber-jump-find-rules)
   (push
    '(:language "jai" :type "type"
-           :supports ("ag" "grep" "rg" "git-grep")
-           :regex "\\bJJJ\\s*::"
-           :tests ("test ::"))
+               :supports ("ag" "grep" "rg" "git-grep")
+               :regex "\\bJJJ\\s*::"
+               :tests ("test ::"))
    dumber-jump-find-rules))
 
 (use-package eglot
@@ -205,14 +216,14 @@
 (use-package fish-mode)
 
 (use-package yasnippet
-  :diminish t
+  :diminish yas-minor-mode
   :config
   (yas-global-mode 1))
 
 (use-package yasnippet-snippets)
 
 (use-package undo-tree
-  :diminish t
+  :diminish undo-tree-mode
   :custom
   (undo-tree-history-directory-alist `(,(cons "." (concat (file-name-directory user-init-file) "undo-tree"))))
   :config
@@ -250,4 +261,16 @@
   :custom
   (ghostel-module-auto-install "download"))
 
-(use-package terraform-mode)
+(use-package terraform-mode
+  :init
+  (setf (alist-get "\\.tfstate\\'" auto-mode-alist nil nil #'string=) 'json-ts-mode))
+
+(use-package apheleia
+  :diminish apheleia-mode
+  :config
+  (apheleia-global-mode 1))
+
+(use-package mise
+  :diminish mise-mode
+  :config
+  (global-mise-mode 1))