diff --git a/README.org b/README.org
index 81ad70d..978b1da 100644
--- a/README.org
+++ b/README.org
@@ -691,13 +691,6 @@ Configure email with iCalendar event support, to integrate with
   :init
   (require 'ispell))
 
-(add-to-list 'package-selected-packages 'flyspell-correct)
-(use-package flyspell-correct
-  :if (package-installed-p 'flyspell-correct)
-  :after flyspell
-  :bind ( :map flyspell-mode-map
-          ("C-;" . flyspell-correct-wrapper)))
-
 (use-package ibuffer
   :defines ibuffer-filter-groups
   :bind (("C-c b" . ibuffer)))
@@ -824,9 +817,9 @@ Configure email with iCalendar event support, to integrate with
           ("<remap> <org-goto>" . consult-org-heading))
   :custom
   (org-directory "~/Documents/org")
-  (org-default-notes-file (expand-file-name "notes.org" org-directory))
-  (org-archive-location (concat (expand-file-name "archive.org" org-directory) "::datetree/"))
-  (org-hide-emphasis-markers t)
+  (org-default-notes-file (expand-file-name "roam/inbox.org" org-directory))
+  (org-archive-default-command #'org-archive-to-archive-sibling)
+  (org-hide-emphasis-markers nil)
   (org-use-sub-superscripts '{})
   (org-pretty-entities t)
   (org-pretty-entities-include-sub-superscripts t)
@@ -915,10 +908,10 @@ Configure email with iCalendar event support, to integrate with
 
 (use-package org-capture
   :after org
-  :bind (("C-c n" . org-capture))
+  :bind (("C-c n n" . org-capture))
   :custom (org-capture-templates
            '(("t" "TODO" entry
-              (file+olp "tasks.org" "Inbox")
+              (file+olp "roam/tasks.org" "Inbox")
               "* TODO %?\nDEADLINE: %t\n %i\n %a")
              ("#" "used by gnus-icalendar-org" entry
               (file+olp "calendar/email.org" "Inbox")
@@ -932,14 +925,11 @@ Configure email with iCalendar event support, to integrate with
     :after org
     :defines org-roam-directory
     :functions org-roam-db-autosync-mode
-    :bind (("C-c r i" . org-roam-node-insert)
-           ("C-c r f" . org-roam-node-find)
-           ("C-c r n" . org-roam-capture)
-           ("C-c r j" . org-roam-dailies-capture-today)
-           ("M-g j" . org-roam-dailies-goto-today)
-           ("M-g C-j" . org-roam-dailies-goto-date)
+    :bind-keymap ("C-c n d" . org-roam-dailies-map)
+    :bind (("C-c n r" . org-roam-capture)
+           ("C-c n f" . org-roam-node-find)
            :map org-mode-map
-           ("C-c r b" . org-roam-buffer-toggle))
+           ("C-c n l" . org-roam-buffer-toggle))
     :custom
     (org-roam-directory (expand-file-name "roam" org-directory))
     (org-roam-completion-everywhere nil)
diff --git a/templates b/templates
index 804b24a..a045caf 100644
--- a/templates
+++ b/templates
@@ -100,7 +100,7 @@ text-mode
 
 org-mode
 
-(title "#+title: " p n "#+author: " p n "#+email: " p n "#+language: en")
+(title "#+title: " p n "#+author: " p n "#+email: ")
 (babel "#+property: header-args:emacs-lisp :tangle yes :mkdirp yes :results output silent")
 (caption "#+caption: ")
 (drawer ":" p ":" n r ":end:")
@@ -118,7 +118,6 @@ org-mode
 (src "#+begin_src " q n r n "#+end_src")
 (gnuplot "#+begin_src gnuplot :var data=" (p "table") " :file " (p "plot.png") n r n "#+end_src" :post (org-edit-src-code))
 (elisp "#+begin_src emacs-lisp" n r n "#+end_src" :post (org-edit-src-code))
-(inlsrc "src_" p "{" q "}")
 
 nix-mode