diff --git a/bundle/bundle--customfile.el b/bundle/bundle--customfile.el
index 2b849e28..a108b83f 100644
--- a/bundle/bundle--customfile.el
+++ b/bundle/bundle--customfile.el
@@ -7,15 +7,14 @@
 (when (eq system-type 'windows-nt)
   ;; (add-to-list 'exec-path "C:/msys64/mingw64/bin")
   ;; (add-to-list 'exec-path "C:/msys64/usr/bin")
+  ;; (setenv "PATH" (concat "C:\\msys64\\mingw64\\bin;" (getenv "PATH")))
 
-  (setq sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe")
-  (setq ispell-program-name "c:/msys64/mingw64/bin/aspell.exe")
-  (setq nov-unzip-program "c:/msys64/usr/bin/unzip.exe")
-
-  (setq custom-file "~/.emacs.d/bundle/custom_win32.el"
-        org-babel-python-command "python")
-
-  (setq sbcl-exe (expand-file-name "C:\\Program Files\\Steel Bank Common Lisp\\sbcl.exe")
+  (setq sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe"
+        ispell-program-name "c:/msys64/mingw64/bin/aspell.exe"
+        nov-unzip-program "c:/msys64/usr/bin/unzip.exe"
+        custom-file "~/.emacs.d/bundle/custom_win32.el"
+        org-babel-python-command "python"
+        sbcl-exe (expand-file-name "C:\\Program Files\\Steel Bank Common Lisp\\sbcl.exe")
         sbcl-core (expand-file-name "C:\\Program Files\\Steel Bank Common Lisp\\sbcl.core")
 	inferior-lisp-program "sbcl"
 	slime-lisp-implementations `((sbcl (,sbcl-exe "--core" ,sbcl-core))))
diff --git a/bundle/bundle--gui.el b/bundle/bundle--gui.el
index bcd0f6a9..76fdc897 100644
--- a/bundle/bundle--gui.el
+++ b/bundle/bundle--gui.el
@@ -1,11 +1,11 @@
-;; (use-package counsel
-;;   :bind (("C-M-j" . 'counsel-switch-buffer)
-;;          :map minibuffer-local-map
-;;          ("C-r" . 'counsel-minibuffer-history))
-;;   :custom
-;;   (counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only)
-;;   :config
-;;   (counsel-mode 1))
+(use-package counsel
+  :bind (("C-M-j" . 'counsel-switch-buffer)
+         :map minibuffer-local-map
+         ("C-r" . 'counsel-minibuffer-history))
+  :custom
+  (counsel-linux-app-format-function #'counsel-linux-app-format-function-name-only)
+  :config
+  (counsel-mode 1))
 
 (use-package all-the-icons
   :if (display-graphic-p)
diff --git a/bundle/bundle--news.el b/bundle/bundle--news.el
index 23d3fe20..80e8e777 100644
--- a/bundle/bundle--news.el
+++ b/bundle/bundle--news.el
@@ -20,6 +20,7 @@
           ("https://planet.emacslife.com/atom.xml" emacs)
           ("https://drewdevault.com/blog/index.xml" coding golang blog)
           ("https://emacsredux.com/atom.xml" emacs blog)
+          ("https://yiming.dev/rss.xml" coding emacs lisp blog)
           ("https://endlessparentheses.com/atom.xml" emacs elisp blog)
           ("https://blog.mozilla.org/en/feed/" browser web)
           ("https://blog.codinghorror.com/rss/" coding blog)
@@ -39,11 +40,10 @@
           ("https://emacsredux.com/atom.xml" emacs blog)
           ("https://marcus3santos.github.io/index.xml" emacs blog)
           ("https://pragdave.me/feed.xml" coding blog)
-          ("https://yiming.dev/rss.xml" coding emacs lisp blog)
 ;;          ("https://feeds.feedburner.com/PythonInsider" security bugs python news)
           ("https://mailbox.org/share/feed-de-mailbox.xml" email mailbox web)
-          ("https://blog.codinghorror.com/rss/" blog coding)
-          ("https://makezine.com/feed/" blog hardware hacking make)
+;;          ("https://blog.codinghorror.com/rss/" blog coding)
+;;          ("https://makezine.com/feed/" blog hardware hacking make)
 ;;          ("https://blog.pythonanywhere.com/index.xml" blog python hosting)
 ;;          ("https://pbpython.com/feeds/all.atom.xml" blog python)
           ("https://feeds.feedburner.com/GoogleWebFonts" fonts blog google)
@@ -54,18 +54,18 @@
 ;;          ("https://www.djangoproject.com/rss/weblog/" django python official news)
 ;;          ("https://realpython.com/atom.xml?format=xml" python blog)
 ;;          ("https://feeds.feedburner.com/PythonSoftwareFoundationNews" python psf news)
-          ("https://appliedgo.net/index.xml" golang blog)
-          ("https://blog.learngoprogramming.com/feed" golang blog)
+;;          ("https://appliedgo.net/index.xml" golang blog)
+;;          ("https://blog.learngoprogramming.com/feed" golang blog)
 ;;          ("https://www.askpython.com/feed" python tutorials docs)
-          ("https://gosamples.dev/index.xml" golang blog)
-          ("https://golangbyexample.com/feed/" golang blog)
-          ("https://go.dev/blog/feed.atom" golang blog official)
-          ("https://golangdocs.com/feed" golang tutorials docs)
-          ("https://golangnews.com/index.xml" golang news)
+;;          ("https://gosamples.dev/index.xml" golang blog)
+;;          ("https://golangbyexample.com/feed/" golang blog)
+;;          ("https://go.dev/blog/feed.atom" golang blog official)
+;;          ("https://golangdocs.com/feed" golang tutorials docs)
+;;          ("https://golangnews.com/index.xml" golang news)
           ("https://metaebene.me/feed/m4a/" podcast)
 ;;          ("https://blog.rust-lang.org/feed.xml" rust blog news)
           )
-        elfeed-search-filter "@2-day-ago +unread"))
+        elfeed-search-filter "@4-day-ago +unread"))
 
 (use-package gnus
   :ensure nil
diff --git a/bundle/bundle--org.el b/bundle/bundle--org.el
index 1e8cd927..397711af 100644
--- a/bundle/bundle--org.el
+++ b/bundle/bundle--org.el
@@ -109,6 +109,8 @@
      (sequence "RECRUIT" "INTERVIEW" "TRANSCRIPT" "QDA" "DOC" "REVIEW")))
   (org-use-property-inheritance nil)
   :config
+  (when (eq system-type 'windows-nt)
+    (setq org-babel-sqlite3-command "c:/msys64/mingw64/bin/sqlite3.exe"))
   (org-babel-do-load-languages
    'org-babel-load-languages
    '((emacs-lisp . t)
@@ -123,43 +125,48 @@
      (typescript . t)
      (http . t))))
 
-;; (use-package org-roam
-;;   :init
-;;   (setq org-roam-v2-ack t)
-;;   (setq org-roam-db-location "~/org-roam.db")
-;;   (require 'org-roam-dailies)
-;;   :bind (("C-c r l" . org-roam-buffer-toggle)
-;;          ("C-c r f" . org-roam-node-find)
-;;          ("C-c r g" . org-roam-graph)
-;;          ("C-c r i" . org-roam-node-insert)
-;;          ("C-c r c" . org-roam-capture)
-;;          ("C-c r j" . org-roam-dailies-map)
-;;          :map org-roam-dailies-map
-;;          ("t" . org-roam-dailies-capture-today)
-;;          ("y" . org-roam-dailies-capture-yesterday)
-;;          ("T" . org-roam-dailies-capture-tomorrow)
-;;          :map org-mode-map
-;;          ("C-M-i" . completion-at-point))
-;;   :custom
-;;   (org-roam-completion-everywhere t)
-;;   (org-roam-dailies-capture-templates
-;;    '(("d" "default" entry "* %<%R> %?"
-;;       :if-new (file+head "%<%F>.org" "#+title: %<%F>\n"))))
-;;   (org-roam-capture-templates
-;;    '(("d" "default" plain
-;;       "%?"
-;;       :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n")
-;;       :unnarrowed t)
 
-;;      ("n" "Note" plain
-;;       "%?"
-;;       :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n%l\n\n%i")
-;;       :unnarrowed t)
+(use-package org-roam
+  :init
+  (setq org-roam-v2-ack t)
+  (setq org-roam-db-location "~/org-roam.db")
+  (when (eq system-type 'windows-nt)
+    (when (string= (system-name) "EVG02667NB")
+      (setq org-roam-directory
+            (expand-file-name "D:\\UserData\\marcus.kammer\\OneDrive - Siemens AG\\org-roam"))))
+  (require 'org-roam-dailies)
+  :bind (("C-c r l" . org-roam-buffer-toggle)
+         ("C-c r f" . org-roam-node-find)
+         ("C-c r g" . org-roam-graph)
+         ("C-c r i" . org-roam-node-insert)
+         ("C-c r c" . org-roam-capture)
+         ("C-c r j" . org-roam-dailies-map)
+         :map org-roam-dailies-map
+         ("t" . org-roam-dailies-capture-today)
+         ("y" . org-roam-dailies-capture-yesterday)
+         ("T" . org-roam-dailies-capture-tomorrow)
+         :map org-mode-map
+         ("C-M-i" . completion-at-point))
+  :custom
+  (org-roam-completion-everywhere t)
+  (org-roam-dailies-capture-templates
+   '(("d" "default" entry "* %<%R> %?"
+      :if-new (file+head "%<%F>.org" "#+title: %<%F>\n"))))
+  (org-roam-capture-templates
+   '(("d" "default" plain
+      "%?"
+      :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n")
+      :unnarrowed t)
 
-;;      ("p" "personas" plain
-;;       "%?"
-;;       :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n* Personality\n* Behaviors\n* Needs & Goals\n")
-;;       :unnarrowed t))))
+     ("n" "Note" plain
+      "%?"
+      :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n%l\n\n%i")
+      :unnarrowed t)
+
+     ("p" "personas" plain
+      "%?"
+      :if-new (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n#+date: %U\n* Personality\n* Behaviors\n* Needs & Goals\n")
+      :unnarrowed t))))
 
 (use-package org-tree-slide
   :bind ("<f5>" . org-tree-slide-mode)
diff --git a/bundle/custom_win32_EVG02667NB.el b/bundle/custom_win32_EVG02667NB.el
index 6609887a..80269ff5 100644
--- a/bundle/custom_win32_EVG02667NB.el
+++ b/bundle/custom_win32_EVG02667NB.el
@@ -61,11 +61,9 @@
    '(ol-bbdb ol-bibtex ol-docview ol-eww ol-gnus ol-info ol-irc ol-mhe ol-rmail org-tempo ol-w3m))
  '(org-plantuml-jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar")
  '(org-roam-db-autosync-mode t)
- '(org-roam-db-location "~/org-roam.db")
- '(org-roam-directory "d:/UserData/marcus.kammer/OneDrive - Siemens AG/org-roam")
  '(org-web-tools-pandoc-sleep-time 1.0)
  '(package-selected-packages
-   '(smartparens elfeed eglot javascript js-mode ob-http plantuml-mode rust-mode org-web-tools emojify erc-image slime-company shrface helpful xref yaml-mode webpaste web-mode use-package typescript-mode slime rainbow-delimiters racket-mode powershell ox-reveal org-tree-slide olivetti ob-typescript ob-rust ob-go nov go-mode geiser-racket elpy eldoc doom-themes doom-modeline counsel all-the-icons-dired ace-window))
+   '(org-roam magit elpher simple-httpd csv-mode markdown-mode yaml nov yaml-mode webpaste web-mode use-package typescript-mode smartparens slime-company shrface rust-mode rainbow-delimiters racket-mode powershell plantuml-mode ox-reveal org-web-tools org-tree-slide olivetti ob-typescript ob-rust ob-http ob-go helpful go-mode geiser-racket erc-image emojify elpy elfeed eglot doom-themes doom-modeline counsel all-the-icons-dired ace-window))
  '(plantuml-default-exec-mode 'jar)
  '(plantuml-jar-path "~/AppData/Local/Programs/plantuml/plantuml.jar")
  '(python-indent-guess-indent-offset nil)
@@ -74,7 +72,7 @@
  '(ring-bell-function 'ignore)
  '(scroll-bar-mode nil)
  '(scroll-step 5)
- '(sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe")
+ '(sql-sqlite-program "c:/msys64/mingw64/bin/sqlite3.exe" t)
  '(tab-bar-mode nil)
  '(tetris-x-colors
    [[229 192 123]