diff --git a/config/defaults.org b/config/defaults.org
index 70c3f49..00d1926 100644
--- a/config/defaults.org
+++ b/config/defaults.org
@@ -178,30 +178,6 @@
                           (ibuffer-do-sort-by-project-file-relative))))))
 #+end_src
 
-* whitespace-mode
-#+begin_src emacs-lisp
-  (use-package whitespace
-    :custom
-    (whitespace-action '(report-on-bogus
-                         cleanup
-                         warn-if-read-only))
-    (whitespace-style '(face
-                        trailing
-                        tabs
-                        spaces
-                        lines-tail
-                        newline
-                        missing-newline-at-eof
-                        empty
-                        indentation
-                        big-indent
-                        space-after-tab
-                        space-before-tab
-                        space-mark
-                        tab-mark
-                        newline-mark)))
-#+end_src
-
 * Link hint keymaps
 #+begin_src emacs-lisp
   (use-package link-hint
diff --git a/config/ui.org b/config/ui.org
index 3840437..05a5a7a 100644
--- a/config/ui.org
+++ b/config/ui.org
@@ -30,6 +30,9 @@
     :diminish
     :config (global-page-break-lines-mode +1))
 
+  (electric-pair-mode +1)
+  (show-paren-mode +1)
+
   ;; add visual pulse when changing focus, like beacon but built-in
   ;; from from https://karthinks.com/software/batteries-included-with-emacs/
   (defun pulse-line (&rest _)
@@ -117,6 +120,22 @@
        "/*" "*/" "+++" "<!--" "<!---"))
     (global-ligature-mode +1))
 #+end_src
+
+** Whitespace mode
+#+begin_src emacs-lisp
+  (use-package whitespace
+    :init
+    (global-whitespace-mode +1)
+    :custom
+    (whitespace-style '(face
+                        empty
+                        trailing
+                        tab-mark
+                        indentation::space))
+    (whitespace-action '(report-on-bogus
+                         cleanup
+                         auto-cleanup)))
+#+end_src
 * Window management
 
 ** windmove