diff --git a/config.org b/config.org
index 3ce0b16..c63df68 100644
--- a/config.org
+++ b/config.org
@@ -1003,8 +1003,6 @@ Define org-capture templates.
 (setq org-capture-templates
       '(("t" "Normal task" entry (file "~/org/inbox.org")
          "* TODO %?\n  :PROPERTIES:\n  :CREATED: %U\n  :END:")
-        ("w" "Work task" entry (file "~/org/work.inbox.org")
-         "* TODO %?\n  :PROPERTIES:\n  :CREATED: %U\n  :END:")
         ("e" "E-Mail needing a reply" entry (file "~/org/emails.org")
          "* TODO Reply: %a\n  :PROPERTIES:\n  :CREATED: %U\n  :END:"
          :immediate-finish t)
@@ -1078,12 +1076,13 @@ Finally define the org-agenda display using [[https://github.com/alphapapa/org-s
                          (org-super-agenda-groups
                           '((:name "High Priority" :priority "A")
                             (:name "Inbox" :file-path ".*/org/inbox\\.org$")
-                            (:name "[Work] Inbox" :file-path ".*/org/work\\.inbox\\.org$")
                             (:name "Emails" :file-path ".*/org/emails\\.org$")
                             (:name "Next" :todo "NEXT")
                             (:name "Started" :todo "STARTED")
-                            (:name "[Work] Projects" :file-path ".*/org/work\\.projects\\.org$")
+                            (:name "Bachelor Thesis" :category "BA")
                             (:name "Study" :and (:file-path ".*/org/study\\.org$" :not(:scheduled future)))
+                            (:name "Öff-Ref" :tag "@oeffref")
+                            (:name "FIN" :tag "@fin")
                             (:name "Reading"  :file-path ".*/org/reading\\.org$")
                             (:name "Projects" :file-path ".*/org/projects\\.org$")
                             (:name "Habits" :habit t :order 100)