diff --git a/+org.el b/+org.el
new file mode 100644
index 0000000..60eb9f2
--- /dev/null
+++ b/+org.el
@@ -0,0 +1,30 @@
+;;; ~/.doom.d/+org.el -*- lexical-binding: t; -*-
+;; Org mode configuration
+;;
+;; Change Org TODO keywords
+(setq org-todo-keywords '((sequence "TODO" "NEXT" "WAITING" "INACTIVE" "|" "DONE" "CANCELLED")))
+;; Rice Org elements
+(setq org-todo-keyword-faces '(("INACTIVE" . "grey") ("NEXT" . "turquoise") ("WAITING" . ""))
+      org-ellipsis " ▼ "
+      org-bullets-bullet-list '("◉" "⋆" "○" "‣"))
+;; Cycle through Org header visibility and disable completion
+(after! evil-org
+  (remove-hook 'org-tab-first-hook #'+org-cycle-only-current-subtree-h)
+  (remove-hook 'org-mode-hook #'auto-fill-mode))
+;; Turn off line numbers in Org and Markdown
+(add-hook 'org-mode-hook (lambda () (display-line-numbers-mode -1)))
+;; Tailor Org super agenda
+(use-package! org-super-agenda
+  :after org-agenda
+  :init
+  (setq org-super-agenda-groups '((:name "Due today"
+                                          :deadline today)
+                                  (:name "Important"
+                                          :priority "A")
+                                  (:name "Overdue"
+                                          :deadline past)
+                                  (:name "Due soon"
+                                          :deadline future)))
+  :config
+  (org-super-agenda-mode)
+  )
diff --git a/config.el b/config.el
index 11712bb..27a6ff8 100644
--- a/config.el
+++ b/config.el
@@ -24,3 +24,5 @@
 (setq backup-directory-alist `(("." . "~/.cache")))
 (setq auto-save-list-file-prefix
       (concat "~/.cache/emacs"))
+;; Load org configuration
+(after! org (load! "+org"))
diff --git a/packages.el b/packages.el
index c018f75..c9a00e9 100644
--- a/packages.el
+++ b/packages.el
@@ -5,3 +5,4 @@
 ;; (package! some-package)
 ;; (package! another-package :recipe (:host github :repo "username/repo"))
 ;; (package! builtin-package :disable t)
+(package! org-super-agenda)