diff --git a/gtd.el b/gtd.el
index 9c47661..1098a0a 100644
--- a/gtd.el
+++ b/gtd.el
@@ -61,43 +61,42 @@
   (setq org-edna-use-inheritance t)
   (org-edna-mode))
 
-(setq org-agenda-window-setup 'current-window
-      org-agenda-restore-windows-after-quit t
-      org-agenda-block-separator nil
-      org-agenda-compact-blocks t
-      org-agenda-start-with-log-mode t
-      org-agenda-hide-tags-regexp "."
-      org-agenda-custom-commands
-      '(("g" "Get Things Done (GTD)"
-              ((agenda ""
-                      ((org-agenda-skip-function
+(use-package! org-super-agenda
+  :after org
+  :config
+  (setq org-agenda-window-setup 'current-window
+        org-agenda-restore-windows-after-quit t
+        org-agenda-block-separator nil
+        org-agenda-compact-blocks t
+        org-agenda-start-with-log-mode t
+        org-agenda-hide-tags-regexp "."
+        org-super-agenda-header-map (make-sparse-keymap)
+        org-agenda-custom-commands
+        '(("g" "Get Things Done (GTD)"
+           ((agenda ""
+                    ((org-agenda-skip-function
                       '(org-agenda-skip-entry-if 'deadline))
-                      (org-deadline-warning-days 0)))
-              (tags "inbox"
-                      ((org-agenda-prefix-format "  %?-14t% s")
-                      (org-agenda-overriding-header "\nInbox\n")))
-              (todo "NEXT"
-                      (
-                      ;; (org-agenda-skip-function
-                      ;;  '(org-agenda-skip-entry-if 'deadline))
-                      ;; (org-agenda-prefix-format "  %i %-12:c [%e] ")
-                      (org-agenda-prefix-format " %i %-14:c ")
-                      (org-agenda-sorting-strategy '(category-up))
-                      (org-agenda-overriding-header "\nTasks\n")))
-              (todo "WAIT"
-                    ((org-agenda-todo-ignore-with-date t)
-                     (org-agenda-prefix-format " %i %-14:c ")
-                     (org-agenda-overriding-header "\nBlocked/Delegated\n")))
-              ;; (agenda nil
-              ;;         ((org-agenda-entry-types '(:deadline))
-              ;;          (org-agenda-format-date "")
-              ;;          (org-deadline-warning-days 7)
-              ;;          (org-agenda-skip-function
-              ;;           '(org-agenda-skip-entry-if 'notregexp "\\* NEXT"))
-              ;;          (org-agenda-overriding-header "\nDeadlines")))
-              (tags "CLOSED>=\"<today>\""
-                      ((org-agenda-prefix-format " %i %-14:c ")
-                       (org-agenda-overriding-header "\nCompleted today\n")))))))
+                     (org-deadline-warning-days 0)))
+            (tags "inbox" ((org-agenda-overriding-header "")
+                           (org-agenda-prefix-format "  %?-14t% s")
+                           (org-super-agenda-groups
+                            '((:name "Inbox"
+                               :anything t)))))
+            (alltodo "" ((org-agenda-overriding-header "")
+                         (org-agenda-prefix-format " %i %-14:c ")
+                         (org-agenda-sorting-strategy '(category-up))
+                         (org-agenda-skip-function
+                          '(org-agenda-skip-entry-if 'scheduled))
+                          (org-super-agenda-groups
+                           '((:name "Deadlines"
+                              :deadline t)
+                             (:name "Tasks"
+                              :todo "NEXT")
+                             (:name "Blocked/Delegated"
+                              :todo "WAIT")
+                             (:name "Completed today"
+                              :log 'closed)
+                             (:discard (:anything t)))))))))))
 
 ;; Automatically save gtd files after some actions on them
 ;; Taken from: https://www.labri.fr/perso/nrougier/GTD/index.html