diff --git a/config.org b/config.org
index d8e2db5..e43ec3d 100644
--- a/config.org
+++ b/config.org
@@ -1231,49 +1231,13 @@ https://github.com/jwiegley/use-package/issues/319
         (if (= pri-value pri-current)
   subtree-end
 nil)))
-;;  (add-to-list 'org-tags-exclude-from-inheritance "agenda") ;;removed in org 9.5
   ;; use inheritance except for "agenda"
   (setq org-use-tag-inheritance
         (lambda (tags) (remove "agenda" tags)))
   :config
-  (when *work_remote*
-    (org-add-link-type "outlook" 'my--org-outlook-open)
-    (org-add-link-type "outlooknewmail" 'my--org-outlook-new-mail)
     (setq org-todo-keywords
      '((sequence "WAIT" "OPEN" "NEXT" "TODO" "|" "DONE" "DROP")))
     (setq org-capture-templates
-              `(("p" "telephone call"
-             entry (file+olp+datetree ,(concat MY--PATH_ORG_FILES "phone_calls.org"))
-             "* call [%<%Y-%m-%d %H:%M>] %?"
-             :empty-lines 0
-             :prepare-finalize (org-id-get-create)
-             :jump-to-captured t)
-                ("t" "simple task"
-                 entry (file+headline ,(concat MY--PATH_ORG_FILES "tasks.org" "Todos"))
-                 "* TODO %?\n :PROPERTIES:\n :CREATED: %U\n :END:\n"
-                 :prepend t
-                 :prepare-finalize (org-id-get-create)
-                 :jump-to-captured t)
-                ("n" "simple note"
-                 entry (file ,(concat MY--PATH_ORG_FILES "notes.org"))
-                 "* %?\n :PROPERTIES:\n :CREATED: %U\n :END:\n"
-                 :prepend t
-                 :prepare-finalize (org-id-get-create)
-                 :jump-to-captured t)
-                ("o" "OP-Verwaltung neuer Eintrag"
-                 entry (file+olp+datetree ,(concat MY--PATH_ORG_FILES "op-verwaltung.org"))
-                 "* OP [%<%Y-%m-%d %H:%M>] %?"
-                 :prepare-finalize (org-id-get-create)
-                 :jump-to-captured t)
-                )))
-  (when *sys/linux*
-    (setq org-capture-templates
-          ;; TODO
-          ;; entry for a journal?
-          ;; entry for a project incl. layout
-          ;; entry for a todo in a todo file
-          ;; add an entry to a new or existing node
-          ;; which is not in the org-node exclusion list
           `(("i" "capture into node"
              entry (function org-node-capture-target) nil
              :jump-to-captured t
@@ -1294,15 +1258,91 @@ nil)))
              "* %?\n :PROPERTIES:\n :CREATED: %U\n :END:\n"
              :prepend t
              :prepare-finalize (org-id-get-create)
-             :jump-to-captured t)
-            ("p" "phone call"
-             entry (file+olp+datetree ,(concat MY--PATH_ORG_FILES "phonecalls.org"))
-             "* call [%<%Y-%m-%d %H:%M>] %?"
-             :empty-lines 0
-             :prepare-finalize (org-id-get-create)
-             :jump-to-captured t)
-            ))
+             :jump-to-captured t)))
+  (when *sys/linux*
     (setq org-pretty-entities t))
+  
+  (when *work_remote*
+    (org-add-link-type "outlook" 'my--org-outlook-open)
+    (org-add-link-type "outlooknewmail" 'my--org-outlook-new-mail)
+    (add-to-list 'org-capture-templates
+                 `("p" "telephone call"
+                   entry (file+olp+datetree ,(concat MY--PATH_ORG_FILES "phone_calls.org"))
+                  "* call [%<%Y-%m-%d %H:%M>] %?"
+                  :empty-lines 0
+                  :prepare-finalize (org-id-get-create)
+                  :jump-to-captured t))
+    (add-to-list 'org-capture-templates
+                 `("o" "OP-Verwaltung neuer Eintrag"
+                   entry (file+olp+datetree ,(concat MY--PATH_ORG_FILES "op-verwaltung.org"))
+                   "* OP [%<%Y-%m-%d %H:%M>] %?"
+                   :prepare-finalize (org-id-get-create)
+                   :jump-to-captured t)))
+                 
+;    (setq org-todo-keywords
+;     '((sequence "WAIT" "OPEN" "NEXT" "TODO" "|" "DONE" "DROP")))
+    ;; (setq org-capture-templates
+    ;;           `(("p" "telephone call"
+    ;;          entry (file+olp+datetree ,(concat MY--PATH_ORG_FILES "phone_calls.org"))
+    ;;          "* call [%<%Y-%m-%d %H:%M>] %?"
+    ;;          :empty-lines 0
+    ;;          :prepare-finalize (org-id-get-create)
+    ;;          :jump-to-captured t)
+    ;;             ("t" "simple task"
+    ;;              entry (file+headline ,(concat MY--PATH_ORG_FILES "tasks.org" "Todos"))
+    ;;              "* TODO %?\n :PROPERTIES:\n :CREATED: %U\n :END:\n"
+    ;;              :prepend t
+    ;;              :prepare-finalize (org-id-get-create)
+    ;;              :jump-to-captured t)
+    ;;             ("n" "simple note"
+    ;;              entry (file ,(concat MY--PATH_ORG_FILES "notes.org"))
+    ;;              "* %?\n :PROPERTIES:\n :CREATED: %U\n :END:\n"
+    ;;              :prepend t
+    ;;              :prepare-finalize (org-id-get-create)
+    ;;              :jump-to-captured t)
+    ;;             ("o" "OP-Verwaltung neuer Eintrag"
+    ;;              entry (file+olp+datetree ,(concat MY--PATH_ORG_FILES "op-verwaltung.org"))
+    ;;              "* OP [%<%Y-%m-%d %H:%M>] %?"
+    ;;              :prepare-finalize (org-id-get-create)
+    ;;              :jump-to-captured t)
+    ;;             )))
+;;  (when *sys/linux*
+    ;; (setq org-capture-templates
+          ;; TODO
+          ;; entry for a journal?
+          ;; entry for a project incl. layout
+          ;; entry for a todo in a todo file
+          ;; add an entry to a new or existing node
+          ;; which is not in the org-node exclusion list
+          ;; `(("i" "capture into node"
+          ;;    entry (function org-node-capture-target) nil
+          ;;    :jump-to-captured t
+          ;;    :empty-lines-after 1)
+          ;;   ;; jump to an existing org-node
+          ;;   ("j" "jumo to node"
+          ;;    plain (function org-node-capture-target) nil
+          ;;    :jump-to-captured t
+          ;;    :immediate-finish t)
+          ;;   ("t" "simple task"
+          ;;    entry (file ,(concat MY--PATH_ORG_FILES "tasks.org"))
+          ;;    "* TODO %?\n :PROPERTIES:\n :CREATED: %U\n :END:\n"
+          ;;    :prepend t
+          ;;    :prepare-finalize (org-id-get-create)
+          ;;    :jump-to-captured t)
+          ;;   ("n" "simple note"
+          ;;    entry (file ,(concat MY--PATH_ORG_FILES "notes.org"))
+          ;;    "* %?\n :PROPERTIES:\n :CREATED: %U\n :END:\n"
+          ;;    :prepend t
+          ;;    :prepare-finalize (org-id-get-create)
+          ;;    :jump-to-captured t)
+          ;;   ("p" "phone call"
+          ;;    entry (file+olp+datetree ,(concat MY--PATH_ORG_FILES "phonecalls.org"))
+          ;;    "* call [%<%Y-%m-%d %H:%M>] %?"
+          ;;    :empty-lines 0
+          ;;    :prepare-finalize (org-id-get-create)
+          ;;    :jump-to-captured t)
+          ;;   ))
+;;    (setq org-pretty-entities t))
   :custom
   (org-tag-faces '(("@bag" . (:foreground "blue" :weight bold))
                    ("@cor" . (:foreground "blue" :weight bold))