diff --git a/gtd.el b/gtd.el
index a6fba12..69169bf 100644
--- a/gtd.el
+++ b/gtd.el
@@ -3,11 +3,15 @@
 (after! org
   (setq org-return-follows-link t
         org-complete-tags-always-offer-all-agenda-tags t
-        org-agenda-files (mapcar 'file-truename
-                                         (file-expand-wildcards (concat org-directory "gtd/*.org"))))
-        ;; org-agenda-files (append (mapcar 'file-truename
-        ;;                                  (file-expand-wildcards (concat org-directory "gtd/*.org")))
-        ;;                          (list (expand-file-name (funcall #'gtd-get-current-journal) org-directory))))
+        org-agenda-files (mapcar (lambda (filename) (expand-file-name filename org-directory))
+                                 '("gtd/inbox.org"
+                                   "gtd/tasks.org"
+                                   "gtd/journal.org"
+                                   "gtd/calendar.org")))
+  ;; (file-expand-wildcards (concat org-directory "gtd/*.org"))))
+  ;; org-agenda-files (append (mapcar 'file-truename
+  ;;                                  (file-expand-wildcards (concat org-directory "gtd/*.org")))
+  ;;                          (list (expand-file-name (funcall #'gtd-get-current-journal) org-directory))))
   (setq org-capture-templates
         `(("i" "Inbox" entry (file "gtd/inbox.org")
            ,(concat "* %?\n"
@@ -25,27 +29,27 @@
         org-refile-target-verify-function (lambda (&rest _) (null (org-get-todo-state)))
         ;; org-refile-target-verify-function nil
         ;; org-refile-targets '(("tasks.org" . (:maxlevel . 2))))
-        org-refile-targets '(("tasks.org" . (:maxlevel . 2))
-                             ("someday.org" . (:level . 0)))))
+        org-refile-targets `(("tasks.org" . (:maxlevel . 2))
+                             (,(expand-file-name "gtd/someday.org" org-directory) . (:maxlevel . 1)))))
 
 
 
-;; Getting the following on capture:
-;;
-;; Greedy org-protocol handler.  Killing client.
-;; No server buffers remain to edit
-;;
-;; See https://github.com/alphapapa/org-protocol-capture-html/issues/40
-;; (use-package! org-protocol-capture-html
-;;   :after org-protocol
-;;   :config
-;;   (add-to-list 'org-capture-templates
-;;                '("w" "Website" entry (file "")
-;;                  "* %a :website:\n\n%U %?\n\n%:initial"))
+  ;; Getting the following on capture:
+  ;;
+  ;; Greedy org-protocol handler.  Killing client.
+  ;; No server buffers remain to edit
+  ;;
+  ;; See https://github.com/alphapapa/org-protocol-capture-html/issues/40
+  ;; (use-package! org-protocol-capture-html
+  ;;   :after org-protocol
+  ;;   :config
+  ;;   (add-to-list 'org-capture-templates
+  ;;                '("w" "Website" entry (file "")
+  ;;                  "* %a :website:\n\n%U %?\n\n%:initial"))
 
-(defun gtd-capture-inbox ()
-  (interactive)
-  (org-capture nil "i"))
+  (defun gtd-capture-inbox ()
+    (interactive)
+    (org-capture nil "i"))
 
 (map! "C-c i" #'gtd-capture-inbox)