diff --git a/init.el b/init.el
index a8b0213..0c0fec9 100644
--- a/init.el
+++ b/init.el
@@ -382,26 +382,39 @@
   (:option ibuffer-saved-filter-groups
            '(("default"
               ("dired" (mode . dired-mode))
-              ("elpher" (or (mode . elpher-mode)
-                            (mode . gemini-mode)))
               ("emacs" (or (name . "^\\*scratch\\*$")
-                           (name . "^\\*Messages\\*$")))
-              ("gnus" (or (mode . message-mode)
-                          (mode . bbdb-mode)
-                          (mode . mail-mode)
-                          (mode . gnus-group-mode)
-                          (mode . gnus-summary-mode)
-                          (mode . gnus-article-mode)
-                          (name . "^\\.bbdb$")
-                          (name . "^\\.newsrc-dribble")))
+                           (name . "^\\*Messages\\*$")
+                           (name . "^\\*straight-process\\*$")
+                           (name . "^\\*Calendar\\*$")))
+              ("git" (or (name . "^\*magit")
+                         (name . "^\magit")))
               ("help" (or (mode . help-mode)
                           (mode . Info-mode)
-                          (mode . helpful-mode))))))
+                          (mode . helpful-mode)))
+              ("messaging" (or (mode . message-mode)
+                               (mode . bbdb-mode)
+                               (mode . mail-mode)
+                               (mode . gnus-group-mode)
+                               (mode . gnus-summary-mode)
+                               (mode . gnus-article-mode)
+                               (name . "^\\.bbdb$")
+                               (name . "^\\.newsrc-dribble")
+                               (mode . erc-mode)))
+              ("shell" (or (mode . eshell-mode)
+                           (mode . shell-mode)
+                           (mode . vterm-mode)))
+              ("web" (or (mode . elpher-mode)
+                         (mode . gemini-mode)
+                         (mode . eww-mode))))))
   (:global "C-x C-b" ibuffer)
 
   (defun ibuffer-filter-to-default ()
     (ibuffer-switch-to-saved-filter-groups "default"))
-  (:hook ibuffer-filter-to-default))
+  (:hook ibuffer-filter-to-default)
+
+  (:also-load ibuf-ext)
+  (:option ibuffer-show-empty-filter-groups nil
+           ibuffer-expert t))
 
 (setup imenu
   (:option imenu-auto-rescan t))