diff --git a/config.el b/config.el
index 58dd13f..0dccbed 100644
--- a/config.el
+++ b/config.el
@@ -147,52 +147,28 @@
   (add-to-list 'org-after-todo-state-change-hook
                (lambda ()
                  (when (equal org-state "DONE")
-                   (org-archive-to-archive-sibling)))))
+                   (org-cut-subtree)))))
 
 (after! org-agenda
   (setq org-agenda-custom-commands
-        '(("d" "Agenda and tasklist for the day"
+        '(("w" "Agenda and tasklist for the week"
            ((agenda "")
-            (todo "TODO"))
-           ((org-agenda-span 'day)
-            (org-agenda-start-day "")
-            (org-deadline-warning-days 0)))
-          ("w" "Agenda and tasklist for the week"
-           ((agenda "")
-            (todo "TODO")
-            (todo "WEEK"))
-           ((org-agenda-start-on-weekday 1)
-            (org-agenda-span 'week)
-            (org-agenda-start-day "")
-            (org-deadline-warning-days 0)))
-          ("p" . "Planning lists")
-          ("pd" "Agenda and tasklist for daily planning"
-           ((agenda "")
-            (todo "WEEK")
-            (todo "TODO"))
-           ((org-agenda-start-on-weekday 1)
-            (org-agenda-span 'week)
-            (org-agenda-start-day "")
-            (org-deadline-warning-days 0)))
-          ("pw" "Agenda and tasklist for weekly planning"
-           ((agenda "")
-            (todo "NEXT")
             (todo "HOLD")
+            (todo "NEXT")
+            (todo "WAIT")
             (todo "WEEK")
             (todo "TODO"))
            ((org-agenda-start-on-weekday 1)
             (org-agenda-span 'fortnight)
             (org-agenda-start-day "")
             (org-deadline-warning-days 0)))
-          ("r" . "Weekly review lists")
-          ("rl" "Tasklist of leftover work"
-           ((todo "TODO")
-            (todo "WEEK")))
-          ("rn" "Agenda and tasklist of upcoming tasks"
+          ("r" "Agenda and tasklist for the weekly review"
            ((agenda "")
-            (todo "WAIT")
+            (todo "HOLD")
             (todo "NEXT")
-            (todo "HOLD"))
+            (todo "WAIT")
+            (todo "WEEK")
+            (todo "TODO"))
            ((org-agenda-start-on-weekday 1)
             (org-agenda-span 'month)
             (org-agenda-start-day "")