diff --git a/modules/home-manager/emacs/emacs/init.el b/modules/home-manager/emacs/emacs/init.el
index 2f2442e..8bb7075 100644
--- a/modules/home-manager/emacs/emacs/init.el
+++ b/modules/home-manager/emacs/emacs/init.el
@@ -92,7 +92,7 @@
   (doom-themes-enable-bold t)   ; if nil, bold is universally disabled
   (doom-themes-enable-italic t) ; if nil, italics is universally disabled
   :config
-  (load-theme 'doom-one t)
+  (load-theme 'modus-operandi t)
 
   ;; Enable flashing mode-line on errors
   (doom-themes-visual-bell-config)
@@ -117,8 +117,9 @@
   (org-hide-emphasis-markers t)
   (org-log-into-drawer t)
   (org-log-done 'time)
+  (org-agenda-span 'day)
   (org-todo-keywords
-   '((sequence "TODO(t)" "NEXT(n)" "PROG(p)" "INTR(i)" "|" "DONE(d)" "CANCELLED(c)")))
+   '((sequence "TODO(t)" "NEXT(n)" "PROG(p)" "INTR(i)" "WAIT(w)" "SOMEDAY(s)" "|" "DONE(d)" "CANCELLED(c)")))
   (org-capture-templates
         `(("i" "Inbox" entry  (file+headline "todo.org" "Inbox")
            ,(concat "* TODO %?\n"
@@ -134,6 +135,13 @@
   (org-outline-path-complete-in-steps nil)
   (org-refile-targets '((nil :maxlevel . 9)
 						(org-agenda-files :maxlevel . 9)))
+  (org-agenda-skip-scheduled-if-done t)
+  (org-agenda-skip-deadline-if-done t)
+  (org-agenda-include-deadlines t)
+  (org-agenda-include-diary t)
+  (org-agenda-block-separator nil)
+  (org-agenda-compact-blocks t)
+  (org-agenda-start-with-log-mode t)
   :config
   (setq org-directory "~/org")
   (setq org-agenda-files (list "todo.org"))
@@ -142,6 +150,16 @@
   :init
   (require 'org-tempo))
 
+(use-package org-modern
+  :ensure t
+  :straight t
+  :hook
+  (org-mode . global-org-modern-mode)
+  :custom
+  (org-modern-keyword nil)
+  (org-modern-checkbox nil)
+  (org-modern-table nil))
+
 (use-package toc-org
   :ensure t
   :straight t
@@ -185,11 +203,48 @@
   (setq denote-journal-keyword "journal")
   (setq denote-journal-title-format 'day-date-month-year))
 
-(use-package org-superstar
+;; (use-package org-superstar
+;;   :ensure t
+;;   :straight t
+;;   :hook
+;;   (org-mode . org-superstar-mode))
+
+(use-package org-super-agenda
   :ensure t
   :straight t
-  :hook
-  (org-mode . org-superstar-mode))
+  :custom
+  (org-super-agenda-groups
+   '(
+     (:name "Today"
+            :time-grid t
+            :date today
+            :todo "TODAY"
+            :scheduled today
+            :order 1)
+     (:name "Next Items"
+            :todo "NEXT"
+            :order 2)
+     (:name "Due Today"
+            :deadline today
+            :order 3)
+     (:name "Due Soon"
+            :deadline future
+            :order 4)
+     (:name "Overdue"
+            :deadline past
+            :order 5)
+     (:name "Scheduled Soon"
+            :scheduled future
+            :order 6)
+     (:name "Waiting"
+            :todo "WAIT"
+            :order 7)
+     (:habit t
+             :order 8)
+     (:name "Project"
+            :category "Project"
+            :order 9)
+	 )))
 
 (use-package which-key
   :ensure nil