diff --git a/core/core-company.el b/core/core-company.el
index b603b46a6..69c8fc5ac 100644
--- a/core/core-company.el
+++ b/core/core-company.el
@@ -4,12 +4,10 @@
 (eval-when-compile (require 'core))
 
 (use-package company
-  :diminish "="
   :commands (global-company-mode company-complete-common company-dict
              company-files company-tags company-ispell company-yasnippet
              company-semantic company-dabbrev-code)
   :init
-  (after! abbrev (diminish 'abbrev-mode "A"))
   (setq company-idle-delay nil
         company-minimum-prefix-length 2
         company-tooltip-limit 10
diff --git a/core/core-editor.el b/core/core-editor.el
index 72e0aa5e7..71e70e376 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -78,9 +78,7 @@ enable multiple minor modes for the same regexp.")
 (add-hook! python-mode    'electric-indent-local-mode)
 (add-hook! makefile-mode  'narf|enable-tabs) ; Use normal tabs in makefiles
 (add-hook! before-save    'delete-trailing-whitespace)
-(add-hook! eldoc-mode     (diminish 'eldoc-mode " ?"))
 (add-hook! prog-mode      'narf|enable-comment-hard-wrap)
-(add-hook! auto-fill-mode (diminish 'auto-fill-function))
 (add-hook! special-mode   (setq truncate-lines nil))
 (add-hook! change-major-mode-hook
   (when indent-tabs-mode (whitespace-mode +1)))
@@ -121,7 +119,6 @@ enable multiple minor modes for the same regexp.")
 ;; Plugins ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (use-package undo-tree
-  :diminish undo-tree-mode
   :config
   (defalias 'redo #'undo-tree-redo)
   (defalias 'undo #'undo-tree-undo)
@@ -159,7 +156,6 @@ enable multiple minor modes for the same regexp.")
 (use-package smart-forward :commands (smart-up smart-down smart-left smart-right))
 
 (use-package smartparens
-  :diminish smartparens-mode
   :functions sp-insert-pair
   :config
   (setq sp-autowrap-region nil          ; let evil-surround handle this
diff --git a/core/core-evil.el b/core/core-evil.el
index eaf9838ef..bfd2230b6 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -209,7 +209,6 @@
   (define-key evil-outer-text-objects-map "a" #'evil-outer-arg))
 
 (use-package evil-commentary
-  :diminish evil-commentary-mode
   :commands (evil-commentary
              evil-commentary-yank
              evil-commentary-line)
@@ -221,7 +220,6 @@
   (advice-add 'evil-force-normal-state :after 'narf*evil-exchange-off))
 
 (use-package evil-iedit-state
-  :diminish iedit-mode
   :functions (iedit-current-occurrence-string iedit-restrict-region)
   :commands (evil-iedit-state evil-iedit-state/iedit-mode)
   :config
@@ -305,7 +303,6 @@
   (advice-add 'evil-force-normal-state :after 'evil-search-highlight-persist-remove-all))
 
 (use-package evil-snipe
-  :diminish evil-snipe-local-mode
   :init
   (setq-default
    evil-snipe-smart-case t
diff --git a/core/core-flycheck.el b/core/core-flycheck.el
index 2ffe6120f..d3ec612ff 100644
--- a/core/core-flycheck.el
+++ b/core/core-flycheck.el
@@ -2,7 +2,6 @@
 ;; Related to: lib/defuns-flycheck.el
 
 (use-package flycheck
-  :diminish flycheck-mode
   :commands (flycheck-mode flycheck-list-errors flycheck-buffer)
   :init
   (setq flycheck-indication-mode 'right-fringe
diff --git a/core/core-helm.el b/core/core-helm.el
index f6c0161f1..f72aaffe3 100644
--- a/core/core-helm.el
+++ b/core/core-helm.el
@@ -1,7 +1,6 @@
 ;;; core-helm.el
 
 (use-package helm
-  :diminish helm-mode
   :init
   (defvar helm-global-prompt "> ")
   (setq-default
@@ -77,7 +76,6 @@
   (helm-mode 1))
 
 (use-package projectile
-  :diminish projectile-mode
   :config
   (add-hook! kill-emacs 'narf|projectile-invalidate-cache-maybe)
 
diff --git a/core/core-ui.el b/core/core-ui.el
index e65462dba..fbba69f18 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -103,7 +103,6 @@
 
 (use-package hideshow
   :commands (hs-minor-mode hs-toggle-hiding hs-already-hidden-p)
-  :diminish hs-minor-mode
   :config (setq hs-isearch-open t)
   :init
   (after! evil
@@ -146,7 +145,6 @@
       (hl-line-mode (if rainbow-mode -1 1)))))
 
 (use-package volatile-highlights
-  :diminish volatile-highlights-mode
   :config
   (vhl/define-extension 'my-undo-tree-highlights
     'undo-tree-undo 'undo-tree-redo)
@@ -376,7 +374,7 @@ iedit."
      narf-env-version
      narf-buffer-encoding-abbrev
      (narf-major-mode
-      (minor-modes :separator " " :tight t)
+      ;; (minor-modes :separator " " :tight t)
       process :when active)
      (global :when active)
      ("%l·%c" narf-buffer-position)
diff --git a/core/core-workgroups.el b/core/core-workgroups.el
index 4e4ec14d2..960f417fb 100644
--- a/core/core-workgroups.el
+++ b/core/core-workgroups.el
@@ -39,9 +39,7 @@
   (add-hook! (kill-emacs wg-before-switch-to-workgroup) 'popwin:close-popup-window)
 
   ;; Initialize!
-  (add-hook! after-init
-    (workgroups-mode 1)
-    (diminish 'workgroups-mode)))
+  (add-hook! after-init 'workgroups-mode))
 
 (provide 'core-workgroups)
 ;;; core-workgroups.el ends here
diff --git a/core/core-yasnippet.el b/core/core-yasnippet.el
index 6a5fd44cf..f9103f348 100644
--- a/core/core-yasnippet.el
+++ b/core/core-yasnippet.el
@@ -4,7 +4,6 @@
 
 (use-package yasnippet
   :mode ("emacs\\.d/private/\\(snippets\\|templates\\)/.+$" . snippet-mode)
-  :diminish (yas-minor-mode . "Y")
   :commands (yas-minor-mode
              yas-minor-mode-on
              yas-expand
diff --git a/core/core.el b/core/core.el
index 865f7b7c7..35e2369a8 100644
--- a/core/core.el
+++ b/core/core.el
@@ -72,7 +72,7 @@
   (require 'autoloads))
 (require 'core-vars)
 (require 'core-defuns)
-(require 'diminish)
+;; (require 'diminish)
 
 (autoload 'use-package "use-package" "" nil 'macro)
 (eval-when-compile
diff --git a/modules/module-js.el b/modules/module-js.el
index 069c56d15..b035f6d8d 100644
--- a/modules/module-js.el
+++ b/modules/module-js.el
@@ -72,7 +72,6 @@
   (associate! nodejs-mode :files ("package.json") :in (js2-mode)))
 
 (use-package tern
-  :diminish tern-mode
   :commands tern-mode
   :init (add-hook! js2-mode 'tern-mode)
   :config
diff --git a/modules/module-python.el b/modules/module-python.el
index abec95e99..6a2cc2587 100644
--- a/modules/module-python.el
+++ b/modules/module-python.el
@@ -37,7 +37,6 @@
            :n "tV" 'nosetests-pdb-module)))
 
   (use-package anaconda-mode
-    :diminish anaconda-mode
     :defines (anaconda-mode-map anaconda-nav-mode-map)
     :functions (anaconda-mode-running-p)
     :init
diff --git a/modules/module-ruby.el b/modules/module-ruby.el
index 77bd84d98..ddcbd965e 100644
--- a/modules/module-ruby.el
+++ b/modules/module-ruby.el
@@ -88,7 +88,6 @@
     (define-company-backend! inf-ruby-mode (inf-ruby))))
 
 (use-package robe
-  :diminish "R"
   :commands (robe-mode robe-start ruby-load-file)
   :init
   (add-hook! ruby-mode
diff --git a/modules/module-web.el b/modules/module-web.el
index a367ec4be..0b1cc44b1 100644
--- a/modules/module-web.el
+++ b/modules/module-web.el
@@ -80,7 +80,6 @@
 
 (use-package emmet-mode
   :defer t
-  :diminish emmet-mode
   :init
   (add-hook! (scss-mode web-mode html-mode haml-mode nxml-mode) 'emmet-mode)
   (defvar emmet-mode-keymap (make-sparse-keymap))