diff --git a/.config/doom/config.el b/.config/doom/config.el
index dc13836..5d588dc 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -110,23 +110,32 @@
 
   (add-hook 'org-mode-hook #'org-make-toc-mode)
 
-  ;; Configure custom agenda views
   (setq org-agenda-custom-commands
-        '(("d" "Dashboard"
-           ((agenda "" ((org-deadline-warning-days 7)))
-            (todo "NEXT"
-                  ((org-agenda-overriding-header "Next Tasks")))
-            (tags-todo "agenda/ACTIVE" ((org-agenda-overriding-header "Active Projects")))))
-
-          ("n" "Next Tasks"
-           ((todo "NEXT"
-                  ((org-agenda-overriding-header "Next Tasks")))))
-
-          ;; Low-effort next actions
-          ("e" tags-todo "+TODO=\"NEXT\"+Effort<15&+Effort>0"
-           ((org-agenda-overriding-header "Low Effort Tasks")
-            (org-agenda-max-todos 20)
-            (org-agenda-files org-agenda-files)))))
+        '(("d" "Custom Dashboard"
+           ;; NEXT items for today
+           ((tags "+TODO=\"NEXT\"+SCHEDULED=\"<+0d>\"|+DEADLINE=\"<+0d>\""
+                  ((org-agenda-overriding-header "\nNEXT Items for Today\n")))  ; Show NEXT items scheduled or due today
+            ;; TODO items for today
+            (tags "+TODO=\"TODO\"+SCHEDULED=\"<+0d>\"|+DEADLINE=\"<+0d>\""
+                  ((org-agenda-overriding-header "\nTODO Items for Today\n")))  ; Show TODO items scheduled or due today
+            ;; WORKOUT items for today
+            (tags "+TODO=\"WORKOUT\"+SCHEDULED=\"<+0d>\""
+                  ((org-agenda-overriding-header "\nToday's Workout\n")))  ; Show WORKOUT scheduled for today
+            ;; DONE items for today
+            (tags "+TODO=\"DONE\"+CLOSED>=\"<today>\""
+                  ((org-agenda-overriding-header "\nDone Items for Today\n")))  ; Show DONE items closed today
+            ;; Agenda for today
+            (agenda ""
+                    ((org-agenda-span 1)              ; Show only today
+                     (org-agenda-start-day "0d")      ; Start from today
+                     (org-agenda-show-all-dates t)    ; Ensure all dates are shown
+                     (org-agenda-overriding-header "\nAgenda (Today)\n")))
+            ;; Agenda for next 3 days (no time grid)
+            (agenda ""
+                    ((org-agenda-span 3)              ; Show the next 3 days
+                     (org-agenda-start-day "+1d")     ; Start from tomorrow
+                     (org-agenda-overriding-header "\nAgenda (Next 3 Days)\n")
+                     (org-agenda-time-grid nil))))))) ; Remove time grid
 
   ;; Create capture templates
   (setq org-capture-templates