diff --git a/init.el b/init.el
index f9ba282..ad689f6 100644
--- a/init.el
+++ b/init.el
@@ -439,8 +439,8 @@
   (org-refile-use-outline-path t)
   (org-refile-allow-creating-parent-nodes t)
   (org-refile-use-outline-path 'file)
-  (org-refile-targets '((nil . (:maxlevel . 2))
-                        (org-agenda-files . (:maxlevel . 2)))))
+  (org-refile-targets '((nil . (:maxlevel . 3))
+                        (org-agenda-files . (:maxlevel . 3)))))
 
 (use-package org-src
   :after org
@@ -480,29 +480,14 @@
   (("C-c n" . org-capture)
    ("C-c C-n" . org-capture-goto-last-stored))
   :custom
-  (org-capture-templates '(("n" "Note" entry
-                            (file "notes.org")
-                            "* %?"
-                            :prepend t)
-                           ("t" "Todo" entry
-                            (file "tasks.org")
-                            "* TODO [#B] %?"
-                            :prepend t)
-                           ("r" "Reading List")
-                           ("rr" "Simple" entry
-                            (file "reading.org")
-                            "* %?"
-                            :prepend t)
-                           ("ry" "Kill Ring Head" entry
-                            (file "reading.org")
-                            "* %c"
-                            :prepend t
-                            :immediate-finish t)
-                           ("rg" "Group" entry
-                            (file "reading.org")
-                            "* %? [/]"
-                            :prepend t)
-                           )))
+  (org-capture-templates
+   '(("t" "Task")
+     ("tp" "Personal" entry (file+olp "tasks.org" "Personal" "Miscellaneous")
+      "* TODO [#B] %?"
+      :prepend t)
+     ("tw" "Work" entry (file+olp "tasks.org" "Work" "Miscellaneous")
+      "* TODO [#B] %?"
+      :prepend t))))
 
 (use-package org-roam
   :after org
@@ -552,12 +537,11 @@
                               (todo . " %-12:c")
                               (tags . " %-12:c")
                               (search . " %-12:c")))
+  (org-agenda-file-regexp "\\`[^.].*\\.org\\\(\\.gpg\\\)?\\'")
   (org-agenda-files (list
                      (expand-file-name org-directory)
                      (expand-file-name "agenda" org-directory)
-                     (expand-file-name "citar" org-directory)
-                     (expand-file-name "journal" org-directory)
-                     (expand-file-name "roam" org-directory))))
+                     (expand-file-name "journal" org-directory))))
 
 (use-package ox-icalendar
   :after org