diff --git a/config.org b/config.org
index 21e1de1..282dccf 100644
--- a/config.org
+++ b/config.org
@@ -115,7 +115,6 @@ https://blog.d46.us/advanced-emacs-startup/
 (add-to-list 'package-archives '("elpa" . "https://elpa.gnu.org/packages/") t)
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
 (add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t)
-(add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/") t)
 
 ; fix for bug 34341
 (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
@@ -549,6 +548,7 @@ Orderless orders the suggestions by recency. The package prescient orders by fre
   (vertico-mode))
 
 (use-package orderless
+  :ensure t
   :init
   (setq completion-styles '(orderless basic)
         completion-category-defaults nil
@@ -573,7 +573,8 @@ Orderless orders the suggestions by recency. The package prescient orders by fre
    :preview-key '(debounce 0.2 any)
    consult-ripgrep consult-git-grep consult-grep
    consult-bookmark consult-recent-file consult-xref
-   consult--source-file consult--source-project-file consult--source-bookmark
+   consult--source-bookmark consult--source-file-register
+   consult--source-recent-file consult--source-project-file
    :preview-key (kbd "M-.")))
 #+end_src
 * Marginalia
@@ -788,7 +789,8 @@ When moving BAR to archive, it will go to FILENAME.org_archive below the heading
 ** org
 #+BEGIN_SRC emacs-lisp
 (use-package org
-  :ensure org-plus-contrib
+  :ensure org-contrib
+  :pin gnu
   :mode (("\.org$" . org-mode))
   :diminish org-indent-mode
   :defer t
@@ -858,24 +860,24 @@ Another setup, because org-babel-do-load-languages requires eager loading
 #+begin_src emacs-lisp
 (use-package ob-org
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands
   (org-babel-execute:org
    org-babel-expand-body:org))
 
 (use-package ob-python
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands (org-babel-execute:python))
 
 (use-package ob-js
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands (org-babel-execute:js))
 
 (use-package ob-shell
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands
   (org-babel-execute:sh
    org-babel-expand-body:sh
@@ -885,49 +887,49 @@ Another setup, because org-babel-do-load-languages requires eager loading
 
 (use-package ob-emacs-lisp
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands
   (org-babel-execute:emacs-lisp
    org-babel-expand-body:emacs-lisp))
 
 (use-package ob-lisp
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands
   (org-babel-execute:lisp
    org-babel-expand-body:lisp))
 
 (use-package ob-gnuplot
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands
   (org-babel-execute:gnuplot
    org-babel-expand-body:gnuplot))
 
 (use-package ob-sqlite
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands
   (org-babel-execute:sqlite
    org-babel-expand-body:sqlite))
 
 (use-package ob-latex
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands
   (org-babel-execute:latex
    org-babel-expand-body:latex))
 
 (use-package ob-R
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands
   (org-babel-execute:R
    org-babel-expand-body:R))
 
 (use-package ob-scheme
   :defer t
-  :ensure org-plus-contrib
+  :ensure org-contrib
   :commands
   (org-babel-execute:scheme
    org-babel-expand-body:scheme))
@@ -1039,13 +1041,25 @@ Bei Problemen wie unique constraint
 org-roam-db-clear-all
 org-roam-db-sync
 #+BEGIN_SRC emacs-lisp
+(use-package org-roam
+  :if (eq *sys/windows* t)
+  :init
+  (setq exec-path (append exec-path '("P:/Tools/sqlite")))
+  (use-package emacsql-sqlite3
+    :ensure t
+    :init
+    (setq emacsql-sqlite3-binary "P:/Tools/sqlite/sqlite3.exe"))
+  :custom
+  (org-roam-database-connector 'sqlite3))
+
 (use-package org-roam
   :ensure t
+  :defer t
   :init
   (setq org-roam-v2-ack t)
-  (if *sys/windows*
-      (setq org-roam-database-connector 'sqlite3
-            exec-path (append exec-path '("P:/Tools/sqlite"))))'
+  :config
+  (require 'org-roam-dailies) ;; ensure the keymap is available
+  (org-roam-db-autosync-mode)
   :custom
   (org-roam-directory MY--PATH_ORG_ROAM)
   (org-roam-completion-everywhere t)
@@ -1075,10 +1089,8 @@ org-roam-db-sync
          ("Y" . org-roam-dailies-capture-yesterday)
          ("T" . org-roam-dailies-capture-tomorrow))
   :bind-keymap
-  ("C-c n d" . org-roam-dailies-map)
-  :config
-  (require 'org-roam-dailies) ;; ensure the keymap is available
-  (org-roam-db-autosync-mode))
+  ("C-c n d" . org-roam-dailies-map))
+
 #+END_SRC
 
 *** TODO Verzeichnis außerhalb roam zum Archivieren (u.a. für erledigte Monatsmeldungen etc.)