diff --git a/config.org b/config.org
index 35e531d..2aa0d7c 100644
--- a/config.org
+++ b/config.org
@@ -728,24 +728,23 @@ echo 'cleaned .elc from package directory'
 
 #+BEGIN_SRC emacs-lisp
 (pcase my/whoami
-  "work_remote"
-  (progn
-    (defvar PATH_ORG_FILES   "p:/Eigene Dateien/Notizen/")
-    (defvar PATH_ORG_JOURNAL "p:/Eigene Dateien/Notizen/Journal/")
-    (defvar PATH_START       "p:/Eigene Dateien/Notizen/"))
-  "home"
-  (progn
-    (setq org-default-notes-file "~/Archiv/Dokumente/Notizen/notes.org")
-    (setq org-agenda-files
-          (delq nil
-                (mapcar (lambda (x) (and (file-exists-p x) x))
-                        '("~/Archiv/Dokumente/Agenda")))))
-  "work_remote"
-  (progn
-    (setq org-default-notes-file (concat PATH_ORG_FILES "notes.org"))
-    (setq org-agenda-files (list(concat PATH_ORG_FILES "notes.org")
-                                (concat PATH_ORG_FILES "projects.org")
-                                (concat PATH_ORG_FILES "todo.org"))))
+  ("work_remote"
+   (progn
+     (defvar PATH_ORG_FILES   "p:/Eigene Dateien/Notizen/")
+     (defvar PATH_ORG_JOURNAL "p:/Eigene Dateien/Notizen/Journal/")
+     (defvar PATH_START       "p:/Eigene Dateien/Notizen/"))
+     (setq org-default-notes-file (concat PATH_ORG_FILES "notes.org"))
+     (setq org-agenda-files (list(concat PATH_ORG_FILES "notes.org")
+                                 (concat PATH_ORG_FILES "projects.org")
+                                 (concat PATH_ORG_FILES "todo.org"))))
+  ("home"
+   (progn
+     (defvar PATH_ORG_FILES   "~/Archiv/Organisieren/Todo/")
+     (defvar PATH_ORG_JOURNAL "~/Archiv/Organisieren/Journal/")
+     (defvar PATH_START       "~/Archiv/Organisieren/")
+     (setq org-default-notes-file (concat PATH_ORG_FILES "notes.org"))
+     ;; includes subdirectories, too
+     (setq org-agenda-files (list PATH_ORG_FILES))))
 )
 
 (setq org-id-locations-file (concat PATH_USER_LOCAL ".org-id-locations"))