diff --git a/.doom.d/config.el b/.doom.d/config.el
index cd83fcc..4bbff90 100644
--- a/.doom.d/config.el
+++ b/.doom.d/config.el
@@ -111,3 +111,24 @@
     (if project-name
     (format "Project: %s" (expand-file-name project-name))
       centaur-tabs-common-group-name)))
+
+
+;; Centaur Tabs config, because the defaults are pretty ok
+(setq x-underline-at-descent-line t) ;; dependency for tab-set-bar under
+(setq centaur-tabs-set-bar 'under)
+;; (setq centaur-tabs-style "bar")
+;; (setq centaur-tabs-set-icons t)
+
+;; Fix Centaur Tabs when changing the theme
+(after! centaur-tabs
+  (add-hook! 'doom-load-theme-hook
+    (defun +tab-refresh-all-the-things-h ()
+      (setq centaur-tabs-active-bar
+            (centaur-tabs--make-xpm 'centaur-tabs-active-bar-face
+                                    2 centaur-tabs-bar-height)
+            centaur-tabs-background-color (face-background 'centaur-tabs-default))
+      (centaur-tabs-separator-reset-cache)
+        (centaur-tabs-init-tabsets-store)
+        (centaur-tabs-display-update)
+        (centaur-tabs-headline-match)
+      )))
diff --git a/.doom.d/init.el b/.doom.d/init.el
index 9c80d47..df17953 100644
--- a/.doom.d/init.el
+++ b/.doom.d/init.el
@@ -55,7 +55,7 @@
        (evil +everywhere); come to the dark side, we have cookies
        file-templates    ; auto-snippets for empty files
        fold              ; (nigh) universal code folding
-       ;;(format +onsave)  ; automated prettiness
+       (format +onsave)  ; automated prettiness
        ;;god               ; run Emacs commands without modifier keys
        ;;lispy             ; vim for lisp, for people who don't like vim
        ;;multiple-cursors  ; editing in many places at once