diff --git a/init.el b/init.el
index 8ad68b3..9819ca6 100644
--- a/init.el
+++ b/init.el
@@ -573,7 +573,7 @@
   (:option org-adapt-indentation nil
            org-auto-align-tags t
            org-archive-mark-done t
-           org-catch-invisible-edits 'show-and-error
+           org-fold-catch-invisible-edits 'show-and-error
            org-clock-clocked-in-display 'mode-line
            org-clock-frame-title-format (cons
                                          '(t org-mode-line-string)
@@ -1048,17 +1048,25 @@
 
 (setup (:straight (cape
                    :host github :repo "minad/cape"))
-  (dolist (fn
-           ;; All available cape capfs listed here. Add them to the front since
-           ;; they're reversed with `add-to-list'.
-           '(cape-file
-             cape-dabbrev
-             cape-keyword
-             ;;cape-abbrev
-             cape-ispell
-             ;;cape-dict
-             ))
-    (add-to-list 'completion-at-point-functions fn :append)))
+  (let
+      ;; All available cape capfs listed here. Add them to the front since
+      ;; they're reversed with `add-to-list'.
+      ((append-fns '(cape-file
+                     cape-dabbrev
+                     cape-keyword))
+       (remove-fns '(cap-abbrev
+                     cape-ispell
+                     cape-dict)))
+    (dolist (fn append-fns)
+      (add-to-list 'completion-at-point-functions fn :append))
+    (dolist (fn remove-fns)
+      (setq completion-at-point-functions
+            (delete fn completion-at-point-functions)))
+    ;; Fix position of t
+    (when (memq t completion-at-point-functions)
+      (setq completion-at-point-functions
+            (append (delq t completion-at-point-functions)
+                    '(t))))))
 
 (setup (:straight circe)
   (:require _circe
@@ -1164,7 +1172,8 @@
   (advice-add #'circe-command-GQUIT :after #'+circe-gquit@kill-buffer)
 
   (:with-mode circe-chat-mode
-    (:local-set lui-input-function #'+lui-filter)
+    (:local-set lui-input-function #'+lui-filter
+                +modeline-position-function 'empty)
     (:hook #'enable-circe-color-nicks
            #'enable-circe-new-day-notifier
            #'+circe-chat@set-prompt
@@ -2034,7 +2043,17 @@
                                                    :foreground ,red-nuanced-fg)))
                  `(font-lock-todo-face ((,class :inherit font-lock-comment-face
                                                 :foreground ,fg-header
-                                                :background ,yellow-intense-bg)))))))
+                                                :background ,yellow-intense-bg))))
+                ;; Major mode in the mode-line
+                (defface +modeline-text-mode-face `((,class ( :foreground ,blue
+                                                              :inherit modus-themes-bold)))
+                  "Text-mode major mode face.")
+                (defface +modeline-prog-mode-face `((,class ( :foreground ,magenta
+                                                              :inherit modus-themes-bold)))
+                  "Prog-mode major mode face.")
+                (:option +modeline-major-mode-faces `((text-mode . +modeline-text-mode-face)
+                                                      (prog-mode . +modeline-prog-mode-face)
+                                                      (t . bold))))))
 
   (require 'dawn)
   (dawn-schedule #'modus-themes-load-operandi
@@ -2259,7 +2278,7 @@
               +modeline-position
               +modeline-major-mode
               +modeline-file-percentage
-              )))
+              +modeline-spacer)))
   (simple-modeline-mode +1))
 
 (setup (:straight slack)
@@ -2370,7 +2389,10 @@
   (define-key +key-mode-map (kbd "C-x 5 t") +transpose-frame-map))
 
 (setup (:straight trashed)
-  (:option trashed-action-confirmer #'y-or-n-p))
+  (:+leader "t" #'trashed)
+  (:option trashed-action-confirmer #'y-or-n-p
+           trashed-use-header-line t
+           trashed-size-format 'human-readable))
 
 (setup (:straight undo-fu)
   (:option undo-fu-allow-undo-in-region t)
diff --git a/lisp/+emacs.el b/lisp/+emacs.el
index a0627cf..7851c43 100644
--- a/lisp/+emacs.el
+++ b/lisp/+emacs.el
@@ -297,7 +297,7 @@ ARG is passed to `backward-kill-word'."
                    ("C-r" . isearch-backward-regexp)
                    ("C-M-s" . isearch-forward)
                    ("C-M-r" . isearch-backward)))
-  (define-key +key-mode-map (kbd (car binding)) (cdr binding)))
+  (define-key (current-global-map) (kbd (car binding)) (cdr binding)))
 
 
 ;;; Required libraries