diff --git a/dot_config/emacs/init.el b/dot_config/emacs/init.el
index 5c19417..40a9825 100644
--- a/dot_config/emacs/init.el
+++ b/dot_config/emacs/init.el
@@ -139,6 +139,9 @@
 (use-feature cus-edit
   :init (setopt custom-file null-device))
 
+(use-feature custom
+  :config (setopt custom-safe-themes t))
+
 ;; Customize fill column indicator
 (use-feature display-fill-column-indicator
   :hook ((conf-mode
@@ -229,7 +232,8 @@
     (unless (file-directory-p auto_save_directory)
       (make-directory auto_save_directory))
     (setopt backup-directory-alist `((".*" . ,auto_save_directory))
-            auto-save-file-name-transforms `((".*" ,auto_save_directory t))))
+            auto-save-list-file-prefix (concat auto_save_directory "saves-"))
+            auto-save-file-name-transforms `((".*" ,auto_save_directory t)))
   (setopt backup-by-copying t
           confirm-kill-processes nil
           delete-old-versions t
@@ -346,8 +350,7 @@
   :config
   (add-hook 'before-save-hook #'whitespace-cleanup)
   (setopt whitespace-line-column nil
-          whitespace-style '(face
-                             lines-char
+          whitespace-style '(lines-char
                              missing-newline-at-eof
                              space-after-tab
                              space-before-tab
@@ -375,11 +378,12 @@
 
 ;; Catppuccin theme
 (use-package catppuccin-theme
+  :disabled
   :config
-  (setopt custom-safe-themes t
-          catppuccin-flavor 'macchiato)
-  (catppuccin-reload)
-  (load-theme 'catppuccin t))
+  (setopt catppuccin-flavor 'macchiato)
+  ;; (catppuccin-reload)
+  ;; (load-theme 'catppuccin t)
+  )
 
 ;; C/C++ formatting
 ;; Ad hoc format file: clang-format -style=webkit -dump-config > .clang-format
@@ -473,6 +477,7 @@
 
 ;; In-buffer completion
 (use-package company
+  :disabled
   :bind
   (:map company-active-map
         ("RET"      . nil)
@@ -488,7 +493,7 @@
 
 ;; FIXME - I crash emacs
 (use-package corfu
-  :disabled
+  ;; :disabled
   :bind
   (:map corfu-map
         ("M-SPC" . corfu-insert-separator)
@@ -501,6 +506,30 @@
   :defer 3
   :ensure (corfu :files (:defaults "extensions/*")))
 
+(use-package doom-themes
+  :disabled
+  :config
+  (setopt doom-themes-enable-bold t
+          doom-themes-enable-italic t))
+
+(use-package nimbus-theme
+  :config (load-theme 'nimbus))
+
+(use-package ef-themes
+  :disabled
+  :config
+  (setopt ef-themes-headings '((0 variable-pitch light 1.9)
+                               (1 variable-pitch light 1.8)
+                               (2 variable-pitch regular 1.7)
+                               (3 variable-pitch regular 1.6)
+                               (4 variable-pitch regular 1.5)
+                               (5 variable-pitch 1.4) ; absence of weight means `bold'
+                               (6 variable-pitch 1.3)
+                               (7 variable-pitch 1.2)
+                               (t variable-pitch 1.1))
+          ef-themes-mixed-fonts t
+          ef-themes-variable-pitch-ui t))
+
 ;; Use `emacs-lsp-booster' with `Eglot'
 (use-package eglot-booster
   :after eglot
@@ -542,7 +571,7 @@
         '(("Org"
            ("Agenda" (org-agenda nil "a") "a")
            ("Time blocking" org-timeblock "b")
-           ("List all TODOs" (org-agenda nil "t") "t")
+           ("Super agenda" (org-agenda nil "u") "u")
            ("Match Tags" (org-agenda nil "m") "m"))))
       "    "
       ,(enlight-menu
@@ -590,7 +619,7 @@
                                   ("FIXME" error bold)
                                   ("NOTE" highlight italic)
                                   ("REVIEW" highlight italic)
-                                  ("TODO" bookmark-face bold)))
+                                  ("TODO" highlight bold)))
   :ensure (hl-todo :depth nil)
   :hook (prog-mode . hl-todo-mode))