diff --git a/bookmarks b/bookmarks
index 248e00a..3b6d3e2 100644
--- a/bookmarks
+++ b/bookmarks
@@ -3,9 +3,9 @@
 ;;; nevertheless, you probably don't want to edit it.
 ;;; -*- End Of Bookmark File Format Version Stamp -*-
 (("org-capture-last-stored"
- (filename . "~/org/notes/neuer_test.org")
- (front-context-string)
- (rear-context-string . "category: Notes\n")
- (position . 106)
- (last-modified 27091 63383 132609 836000))
+  (filename . "~/org/docs/testest2.org")
+  (front-context-string . ":PROPERTIES:\n:ID")
+  (rear-context-string)
+  (position . 1)
+  (last-modified 27094 24899 601951 629000))
 )
diff --git a/lisp/init-capture.el b/lisp/init-capture.el
index 67e48c7..0767ecf 100644
--- a/lisp/init-capture.el
+++ b/lisp/init-capture.el
@@ -53,6 +53,12 @@
     (setq s (replace-regexp-in-string "\\`-\\|-\\'" "" s))
     s))
 
+
+(defun my/org-new-id ()
+  "Erzeuge eine neue Org-ID."
+  (org-id-new))
+
+
 (defun my/org-ensure-directory (dir)
   (make-directory dir t)
   dir)
@@ -81,24 +87,26 @@
       (let ((my/org-capture-title title))
         (org-capture nil key)))))
 
+
+
 ;; ===== Commands =====
 
-(defun my/org-capture-new-task ()
+(defun my/org-new-task ()
   (interactive)
   (let ((title (read-string "Task-Titel: ")))
     (my/org-open-or-capture title "n" #'my/org-task-file-from-title)))
 
-(defun my/org-capture-new-doc ()
+(defun my/org-new-doc ()
   (interactive)
   (let ((title (read-string "Doku-Titel: ")))
     (my/org-open-or-capture title "d" #'my/org-doc-file-from-title)))
 
-(defun my/org-capture-new-kpi ()
+(defun my/org-new-kpi ()
   (interactive)
   (let ((title (read-string "KPI-Titel: ")))
     (my/org-open-or-capture title "k" #'my/org-doc-file-from-title)))
 
-(defun my/org-capture-new-note ()
+(defun my/org-new-note ()
   (interactive)
   (find-file (my/org-today-file))
   (when (= (point-max) 1)
@@ -118,11 +126,11 @@
          :unnarrowed t
          :jump-to-captured t)
 
-        ("d" "Neue Doku-Datei" plain
+        ("d" "Neue Docs-Datei" plain
          (file
           (lambda ()
             (my/org-doc-file-from-title my/org-capture-title)))
-         "#+title: %(or my/org-capture-title \"\")\n#+category: Docs\n\n:PROPERTIES:\n:ART: Analyse\n:END:\n\n* Überblick\n%?\n\n* Details\n\n* Referenzen\n"
+	    (file "~/.emacs.d/templates/org/docs-template.org")
          :unnarrowed t
          :jump-to-captured t)
 
@@ -131,13 +139,15 @@
          (file
           (lambda ()
             (my/org-doc-file-from-title my/org-capture-title)))
-         "#+title: %(or my/org-capture-title \"\")\n#+category: Docs\n\n:PROPERTIES:\n:ART: KPI-Steckbrief\n:VERANTWORTLICH: %^{Verantwortlich}\n:BEREICH: %^{Bereich}\n:END:\n\n* Definition\n%?\n\n* Berechnung\n#+begin_src sql\n\n#+end_src\n\n* Datenquelle\n\n* Interpretation\n\n* Hinweise\n"
+	   (file "~/.emacs.d/templates/org/kpi-steckbrief-template.org")
+         ;; "#+title: %(or my/org-capture-title \"\")\n#+category: Docs\n\n:PROPERTIES:\n:ART: KPI-Steckbrief\n:VERANTWORTLICH: %^{Verantwortlich}\n:BEREICH: %^{Bereich}\n:END:\n\n* Definition\n%?\n\n* Berechnung\n#+begin_src sql\n\n#+end_src\n\n* Datenquelle\n\n* Interpretation\n\n* Hinweise\n"
+	 
          :unnarrowed t
          :jump-to-captured t)))
 
 ;; ===== Agenda =====
 
-(setq org-agenda-files '("~/org/todos/" "~/org/docs/"))
+(setq org-agenda-files '("~/org/todos/"))
 
 (provide 'init-capture)
 ;;; init-capture.el ends here
diff --git a/lisp/init-keybindings.el b/lisp/init-keybindings.el
index 23665dc..ec831b9 100644
--- a/lisp/init-keybindings.el
+++ b/lisp/init-keybindings.el
@@ -2,10 +2,10 @@
 
 ;;; init-keybindings.el --- Keybindings -*- lexical-binding: t; -*-
 
-(global-set-key (kbd "C-c t") #'my/org-capture-new-task)
-(global-set-key (kbd "C-c d") #'my/org-capture-new-doc)
-(global-set-key (kbd "C-c k") #'my/org-capture-new-kpi)
-(global-set-key (kbd "C-c n") #'my/org-capture-new-note)
+(global-set-key (kbd "C-c t") #'my/org-new-task)
+(global-set-key (kbd "C-c d") #'my/org-new-doc)
+(global-set-key (kbd "C-c k") #'my/org-new-kpi)
+(global-set-key (kbd "C-c n") #'my/org-new-note)
 
 
 ;;  org-roam-keybindings
diff --git a/templates/org/docs-template.org b/templates/org/docs-template.org
new file mode 100644
index 0000000..b697447
--- /dev/null
+++ b/templates/org/docs-template.org
@@ -0,0 +1,13 @@
+:PROPERTIES:
+:ID: %(my/org-new-id)
+:ART: doc
+:ZUORDNUNG: %^{Bereich||co|at|ku|sp|pw|ag|us|un}
+:PROJEKT: %^{Projekt|none}
+:END:
+
+#+title: %(or my/org-capture-title"")
+
+* %(or my/org-capture-title"")
+
+
+
diff --git a/templates/org/kpi_steckbrief_template.org b/templates/org/kpi-steckbrief-template.org
similarity index 89%
rename from templates/org/kpi_steckbrief_template.org
rename to templates/org/kpi-steckbrief-template.org
index bcf13c2..d53b157 100644
--- a/templates/org/kpi_steckbrief_template.org
+++ b/templates/org/kpi-steckbrief-template.org
@@ -3,7 +3,7 @@
 :ART: Kpi-Steckbrief
 :VERANTWORTLICH: %^{Verantwortlicher}
 :BEREICH: %^{Bereich}
-:LAYER: strategisch, taktisch, operativ
+:LAYER: %^{Layer||strategisch|taktisch|operativ}
 :END:
 
 #+title: %(or my/org-capture-title"")
diff --git a/templates/org/kpi_steckbrief_template.pdf b/templates/org/kpi_steckbrief_template.pdf
deleted file mode 100644
index 60e5c1b..0000000
Binary files a/templates/org/kpi_steckbrief_template.pdf and /dev/null differ
diff --git a/templates/org/kpi_steckbrief_template.tex b/templates/org/kpi_steckbrief_template.tex
deleted file mode 100644
index 0bfbacc..0000000
--- a/templates/org/kpi_steckbrief_template.tex
+++ /dev/null
@@ -1,55 +0,0 @@
-% Created 2026-04-06 Mo 21:40
-% Intended LaTeX compiler: pdflatex
-\documentclass[11pt]{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{graphicx}
-\usepackage{longtable}
-\usepackage{wrapfig}
-\usepackage{rotating}
-\usepackage[normalem]{ulem}
-\usepackage{amsmath}
-\usepackage{amssymb}
-\usepackage{capt-of}
-\usepackage{hyperref}
-\date{\today}
-\title{\%(or my/org-capture-title"")}
-\hypersetup{
- pdfauthor={},
- pdftitle={\%(or my/org-capture-title"")},
- pdfkeywords={},
- pdfsubject={},
- pdfcreator={Emacs 30.2 (Org mode 9.7.11)}, 
- pdflang={English}}
-\begin{document}
-
-\maketitle
-\tableofcontents
-
-\section{Name}
-\label{sec:org3887b4b}
-
-\section{Ziel / Zweck}
-\label{sec:org88753ba}
-
-\section{Definition}
-\label{sec:orga243ffc}
-
-\section{Formel}
-\label{sec:orgc2995c4}
-
-\section{Inhalt / Abgrenzung}
-\label{sec:orgd457ad1}
-
-\section{Detaildefinitionen / Besonderheiten}
-\label{sec:orgb35097d}
-
-\section{Wirkzusammenhang und Nebenbedingungen}
-\label{sec:org90a57fc}
-
-\section{Guardrail-KPIs (Leitplanken -> Schutzfunktion)}
-\label{sec:orgadbf801}
-
-\section{Contraint-KPIs (Restriktionen -> )}
-\label{sec:orga5afd81}
-\end{document}