diff --git a/README.org b/README.org
index 7bbf353..bf9dc5b 100644
--- a/README.org
+++ b/README.org
@@ -606,24 +606,6 @@ Configure the default capture template for daily entries.
          :head "#+TITLE: %<%Y-%m-%d>\n")))
 #+end_src
 
-** Agenda
-
-Configure agenda sources.
-+ Dailies ~~/.local/source/brain/daily/~
-+ Secrets ~~/.local/source/secrets/org/~
-  
-#+begin_src emacs-lisp
-(setq org-agenda-files '("~/.local/source/brain/daily/"
-                         "~/.local/source/secrets/org/"))
-#+end_src
-
-Open an agenda buffer with =SPC a=.
-
-#+begin_src emacs-lisp
-(dotfiles/leader
-  "a" '(org-agenda :which-key "Agenda"))
-#+end_src
-
 ** Blogging
 
 I use [[https://gohugo.io][Hugo]] for my personal [[https://chrishayward.xyz][website]], which I write in =Org-mode= before compiling to =hugo-markdown=.
@@ -642,7 +624,25 @@ Creaate a capture template for blog posts in the =posts= sub directory.
              '("b" "Blogging" plain (function org-roam-capture--get-point)
                "%?"
                :file-name "posts/${slug}"
-               :head "#+TITLE: ${title}\n#+HUGO_BASE_DIR: ../\n#+HUGO_SECTION: ./\n"))
+               :head "#+TITLE: ${title}\n#+HUGO_BASE_DIR: ~/.local/source/website\n#+HUGO_SECTION: posts\n"))
+#+end_src
+
+** Agenda
+
+Configure agenda sources.
++ Dailies ~~/.local/source/brain/daily/~
++ Secrets ~~/.local/source/secrets/org/~
+  
+#+begin_src emacs-lisp
+(setq org-agenda-files '("~/.local/source/brain/daily/"
+                         "~/.local/source/secrets/org/"))
+#+end_src
+
+Open an agenda buffer with =SPC a=.
+
+#+begin_src emacs-lisp
+(dotfiles/leader
+  "a" '(org-agenda :which-key "Agenda"))
 #+end_src
 
 ** Screencasts
diff --git a/init.el b/init.el
index b683872..aca0e84 100644
--- a/init.el
+++ b/init.el
@@ -101,7 +101,7 @@
 
 (dotfiles/leader
   "." '(find-file :which-key "Files")
-  "," '(switch-to-buffer :which-key "Buffer")
+  "," '(switch-to-buffer :which-key "Buffers")
   "c" '(kill-buffer-and-window :which-key "Close"))
 
 (dotfiles/leader
@@ -264,12 +264,6 @@
          :file-name "daily/%<%Y-%m-%d>"
          :head "#+TITLE: %<%Y-%m-%d>\n")))
 
-(setq org-agenda-files '("~/.local/source/brain/daily/"
-                         "~/.local/source/secrets/org/"))
-
-(dotfiles/leader
-  "a" '(org-agenda :which-key "Agenda"))
-
 (use-package ox-hugo 
   :after ox)
 
@@ -277,7 +271,13 @@
              '("b" "Blogging" plain (function org-roam-capture--get-point)
                "%?"
                :file-name "posts/${slug}"
-               :head "#+TITLE: ${title}\n#+HUGO_BASE_DIR: ../\n#+HUGO_SECTION: ./\n"))
+               :head "#+TITLE: ${title}\n#+HUGO_BASE_DIR: ~/.local/source/website\n#+HUGO_SECTION: posts\n"))
+
+(setq org-agenda-files '("~/.local/source/brain/daily/"
+                         "~/.local/source/secrets/org/"))
+
+(dotfiles/leader
+  "a" '(org-agenda :which-key "Agenda"))
 
 (use-package gif-screencast
   :custom