diff --git a/config.org b/config.org
index 19d1ca7..045dc18 100644
--- a/config.org
+++ b/config.org
@@ -607,7 +607,26 @@ Smooth scrolling. Emacs tends to be jumpy, this should change it.
     Paths need to be different for work and home
 
 #+BEGIN_SRC emacs-lisp
+(if (string-equal 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/"))
+)
 
+(if (string-equal my/whoami "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")))))
+  (if (string-equal my/whoami "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"))))))
 #+END_SRC
 *** Org key bindings
 Set up some global key bindings that integrate with Org mode features
@@ -627,20 +646,16 @@ Org overwrites RET and C-j, so I need to disable the rebinds
 *** Org agenda
 For a more detailed example [[https://github.com/sachac/.emacs.d/blob/83d21e473368adb1f63e582a6595450fcd0e787c/Sacha.org#org-agenda][see here]].
 
-#+BEGIN_SRC emacs-lisp
+BEGIN_SRC emacs-lisp
  (setq org-agenda-files
      (delq nil
          (mapcar (lambda (x) (and (file-exists-p x) x))
                  '("~/Archiv/Dokumente/Agenda"))
      )
  )
-#+END_SRC
+END_SRC
 
 *** Org capture
-#+BEGIN_SRC emacs-lisp
- (setq org-default-notes-file "~/Archiv/Dokumente/Notizen/notes.org")
-#+END_SRC
-
    Speed commands are a nice and quick way to perform certain actions while at the beginning of a heading. It's not activated by default.
 
    See the doc for speed keys by checking out the documentation for speed keys in Org mode.
@@ -657,17 +672,6 @@ For a more detailed example [[https://github.com/sachac/.emacs.d/blob/83d21e4733
    (setq org-hide-emphasis-markers t)
 #+END_SRC
 
-   Setting some environment paths
-
-#+BEGIN_SRC emacs-lisp
-(message my/whoami)
-(if (string-equal 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/"))
-)
-#+END_SRC
 
    Sort org agenda by deadline and priority