diff --git a/oni-org/oni-org.el b/oni-org/oni-org.el
index b385727..5fa4b8b 100644
--- a/oni-org/oni-org.el
+++ b/oni-org/oni-org.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2022.0824.204055
+;; Version: 2022.0913.145533
 ;; Package-Requires: (oni-yasnippet oni-alert oni-hydra org org-contrib org-bullets org-edna diminish all-the-icons olivetti form-feed)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -586,13 +586,20 @@ also move point to the start of the heading."
 (setq org-agenda-window-setup 'only-window)
 
 (setq org-agenda-custom-commands
-      `(("t" "Todo at this computer" tags-todo ,(format "@%s|@computer|@emacs/TODO" (system-name))
+      `(("t" . "Things to do")
+        ("tt" "Todo at this computer" tags-todo ,(format "@%s|@computer|@emacs/TODO" (system-name))
          ((org-overriding-columns-format "%TODO %46ITEM %1BLOCKED %Effort")))
-        ("r" "Reading list" tags-todo "TODO=\"READ\"+SCHEDULED=\"\"-Effort=\"\""
-         ((org-overriding-columns-format "%8CATEGORY %ITEM %3EFFORT")
-          (org-agenda-sorting-strategy '(priority-down effort-up))
-          (org-agenda-prefix-format " (%3e) %i %-12:c")))
-        ("R" "Reading list (requires estimating)" tags-todo "TODO=\"READ\"+Effort=\"\"")
+        ("tf" "Fun things to do" tags-todo "+fun")
+        ;; ("r" "Reading list" tags-todo "TODO=\"READ\"+SCHEDULED=\"\"-Effort=\"\""
+        ;;  ((org-overriding-columns-format "%8CATEGORY %ITEM %3EFFORT")
+        ;;   (org-agenda-sorting-strategy '(priority-down effort-up))
+        ;;   (org-agenda-prefix-format " (%3e) %i %-12:c")))
+        ;; ("R" "Reading list (requires estimating)" tags-todo
+        ;; "TODO=\"READ\"+Effort=\"\"")
+        ("r" . "Reading")
+        ("rc" "Casual reading" tags-todo "TODO=\"READ\"+casual")
+        ("rn" "Noteworthy reading" tags-todo "TODO=\"READ\"+note")
+        ("ru" "Uncategorized" tags-todo "TODO=\"READ\"-note-casual")
         ("s" "Someday" tags-todo "TODO=\"TODO\"-CATEGORY=\"inbox\"")
         ("p" "Projects & ideas" tags "CATEGORY=\"project\"|CATEGORY=\"idea\"")
         ("c" "Today's (Current) tasks" tags "SCHEDULED=\"<today>\"")
@@ -612,7 +619,8 @@ also move point to the start of the heading."
           (tags-todo "TODO=\"WATCH\"-CATEGORY=\"inbox\"")
           (tags-todo "TODO=\"LISTEN\"-CATEGORY=\"inbox\""))
          ((org-agenda-max-todos 10)))
-        ("v" "Review" tags "CLOSED>=\"<-1w>\"")))
+        ("v" "Review" tags "CLOSED>=\"<-1w>\"")
+        ("l" "Listen" tags-todo "TODO=\"LISTEN\"")))
 
 (add-hook 'org-mode-hook #'oni-org-initialize-agenda-category-icons)