diff --git a/config-org.org b/config-org.org
index 3d6d9c3..0b7ffb7 100644
--- a/config-org.org
+++ b/config-org.org
@@ -186,7 +186,7 @@
   (org-edna-load)
 #+end_src
 ** org-brain
-#+begin_src emacs-lisp
+#+begin_src
   (use-package org-brain :ensure t
     :init
     (global-set-key (kbd "M-'") 'org-brain-visualize)
@@ -503,13 +503,6 @@
 
   ;; (pop org-drill-card-type-alist)
 #+end_src
-* Plan module
-#+begin_src emacs-lisp
-  (add-to-list 'org-capture-templates
-               `("P" "The Plan" entry (file+headline ,(my/agenda-file "dev.org") "The plan")
-                 (file ,(my/org-file "templates/daily-plan.org"))))
-#+end_src
-
 * Insert inactive timestamp after last org-datetree--find-create
 #+begin_src emacs-lisp
   (defun org-datetree--find-create-add-timestamp (regex-template year &optional month day insert)
@@ -642,7 +635,6 @@
     :after org
     :hook 
     (after-init . org-roam-mode)
-    :straight (:host github :repo "jethrokuan/org-roam" :branch "develop")
     :custom
     (org-roam-directory "~/big_files/MEGA/org/org-roam/")
     :bind (:map org-roam-mode-map
diff --git a/lisp/org-config/my-org-agenda-commands.el b/lisp/org-config/my-org-agenda-commands.el
index f4e23f4..f668dba 100644
--- a/lisp/org-config/my-org-agenda-commands.el
+++ b/lisp/org-config/my-org-agenda-commands.el
@@ -124,7 +124,7 @@
                   ((org-agenda-tag-filter-preset (quote ("+dev")))
                    (org-super-agenda-groups '((:name "The Plan" :tag "PLAN")
                                               (:name "Overdue" :and (:deadline past :log nil))
-                                              (:name "Upcoming" :deadline future)
+                                              (:name "Upcoming" :and (:not (:scheduled today) :deadline future))
                                               (:name "Should do" :and (:scheduled past :log nil))
                                               (:name "Today" :time-grid t
                                                      :and (:not (:and (:not (:scheduled today)
@@ -153,7 +153,7 @@
                                                  (outline-next-heading))))
                    (org-super-agenda-groups '((:name "The Plan" :and (:tag "PLAN" :log nil) )
                                               (:name "Overdue" :and (:deadline past :log nil))
-                                              (:name "Upcoming" :deadline future)
+                                              (:name "Upcoming" :and (:deadline future :not (:todo "DONE")))
                                               (:name "Should do" :and (:scheduled past :log nil))
                                               (:name "Today" :time-grid t
                                                      :and (:not (:and (:not (:scheduled today)
diff --git a/lisp/org-config/my-org-agenda-misc.el b/lisp/org-config/my-org-agenda-misc.el
index b8156df..961f9cf 100644
--- a/lisp/org-config/my-org-agenda-misc.el
+++ b/lisp/org-config/my-org-agenda-misc.el
@@ -27,7 +27,7 @@
 
 (setq org-agenda-skip-deadline-if-done t
       org-agenda-skip-scheduled-if-done t
-      org-agenda-skip-deadline-prewarning-if-scheduled t)
+      org-agenda-skip-deadline-prewarning-if-scheduled 7)
 (setq org-agenda-start-on-weekday 6)
 
 (setq org-tags-match-list-sublevels 'indented)