diff --git a/home/pure_emacs/.emacs.d/config.org b/home/pure_emacs/.emacs.d/config.org
index c0eff07..d640cb1 100755
--- a/home/pure_emacs/.emacs.d/config.org
+++ b/home/pure_emacs/.emacs.d/config.org
@@ -660,13 +660,13 @@
 
      ;; My state/contexts
      ("s" . "My State and contexts")
-     ("st" "Tired 🥱" tags "+@tired"    ((org-agenda-overriding-header "Tired 🥱")))
-     ("sh" "At home🏠" tags "+@home"     ((org-agenda-overriding-header "At home🏠")))
-     ("sc" "By a computer 💻" tags "+@computer" ((org-agenda-overriding-header "By a computer 💻")))
-     ("ss" "On studies 🏫" tags "+@school"   ((org-agenda-overriding-header "On studies 🏫")))
-     ("so" "Online 🌐" tags "+@online"   ((org-agenda-overriding-header "Online 🌐")))
-     ("sO" "‍Outdoors🚶‍" tags "+@outdoors" ((org-agenda-overriding-header "‍Outdoors🚶‍")))
-     ("sT" "To takeaway 👝 " tags "+takeaway"  ((org-agenda-overriding-header "To takeaway 👝 ")))
+     ("st" "Tired 🥱" tags-todo "+@tired/NEXT"    ((org-agenda-overriding-header "Tired 🥱")))
+     ("sh" "At home🏠" tags-todo "+@home/NEXT"     ((org-agenda-overriding-header "At home🏠")))
+     ("sc" "By a computer 💻" tags-todo "+@computer/NEXT" ((org-agenda-overriding-header "By a computer 💻")))
+     ("ss" "On studies 🏫" tags-todo "+@school/NEXT"   ((org-agenda-overriding-header "On studies 🏫")))
+     ("so" "Online 🌐" tags-todo "+@online/NEXT"   ((org-agenda-overriding-header "Online 🌐")))
+     ("sO" "‍Outdoors🚶‍" tags-todo "+@outdoors/NEXT" ((org-agenda-overriding-header "‍Outdoors🚶‍")))
+     ("sT" "To takeaway 👝 " tags-todo "+takeaway"  ((org-agenda-overriding-header "To takeaway 👝 ")))
    )
   )
 #+end_src
diff --git a/home/pure_emacs/.emacs.d/init.el b/home/pure_emacs/.emacs.d/init.el
index 2872965..6565357 100644
--- a/home/pure_emacs/.emacs.d/init.el
+++ b/home/pure_emacs/.emacs.d/init.el
@@ -538,13 +538,13 @@
 
    ;; My state/contexts
    ("s" . "My State and contexts")
-   ("st" "Tired 🥱" tags "+@tired"    ((org-agenda-overriding-header "Tired 🥱")))
-   ("sh" "At home🏠" tags "+@home"     ((org-agenda-overriding-header "At home🏠")))
-   ("sc" "By a computer 💻" tags "+@computer" ((org-agenda-overriding-header "By a computer 💻")))
-   ("ss" "On studies 🏫" tags "+@school"   ((org-agenda-overriding-header "On studies 🏫")))
-   ("so" "Online 🌐" tags "+@online"   ((org-agenda-overriding-header "Online 🌐")))
-   ("sO" "‍Outdoors🚶‍" tags "+@outdoors" ((org-agenda-overriding-header "‍Outdoors🚶‍")))
-   ("sT" "To takeaway 👝 " tags "+takeaway"  ((org-agenda-overriding-header "To takeaway 👝 ")))
+   ("st" "Tired 🥱" tags-todo "+@tired/NEXT"    ((org-agenda-overriding-header "Tired 🥱")))
+   ("sh" "At home🏠" tags-todo "+@home/NEXT"     ((org-agenda-overriding-header "At home🏠")))
+   ("sc" "By a computer 💻" tags-todo "+@computer/NEXT" ((org-agenda-overriding-header "By a computer 💻")))
+   ("ss" "On studies 🏫" tags-todo "+@school/NEXT"   ((org-agenda-overriding-header "On studies 🏫")))
+   ("so" "Online 🌐" tags-todo "+@online/NEXT"   ((org-agenda-overriding-header "Online 🌐")))
+   ("sO" "‍Outdoors🚶‍" tags-todo "+@outdoors/NEXT" ((org-agenda-overriding-header "‍Outdoors🚶‍")))
+   ("sT" "To takeaway 👝 " tags-todo "+takeaway"  ((org-agenda-overriding-header "To takeaway 👝 ")))
  )
 )