diff --git a/README.org b/README.org
index 591cebf..4f01ad0 100644
--- a/README.org
+++ b/README.org
@@ -1,14 +1,14 @@
-#+TITLE: Emacs Config
-#+AUTHOR: Evie Litherland-Smith
-#+EMAIL: evie@xenia.me.uk
-#+FILETAGS: :emacs:config:org:
-#+PROPERTY: header-args:emacs-lisp :tangle yes :mkdirp yes :results output silent
+#+title: Emacs Config
+#+author: Evie Litherland-Smith
+#+email: evie@xenia.me.uk
+#+filetags: :emacs:config:org:
+#+property: header-args:emacs-lisp :tangle yes :mkdirp yes :results output silent
 
 * Setup
 Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia/nixos/src/branch/main/home/emacs.nix][NixOS config]], otherwise add src_emacs-lisp{(org-babel-load-file "~/.emacs/README.org")} to init file.
 
 * Common defaults
-#+BEGIN_SRC emacs-lisp :results output silent
+#+begin_src emacs-lisp :results output silent
   (setq custom-file (locate-user-emacs-file "custom.el"))
   (when (and custom-file (file-exists-p custom-file))
     (load custom-file nil 'nomessage))
@@ -47,7 +47,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
 
   ;; Make shebang (#!) file executable when saved
   (add-hook 'after-save-hook #'executable-make-buffer-file-executable-if-script-p)
-#+END_SRC
+#+end_src
 
 ** Auto-save file settings
 #+begin_src emacs-lisp :tangle yes
@@ -446,7 +446,7 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
 * Org-mode
 For reference information, see [[https://orgmode.com][Org-mode website]]
 
-#+BEGIN_SRC emacs-lisp :results output silent
+#+begin_src emacs-lisp :results output silent
   (setq org-directory "~/Org"
         org-default-notes-file (expand-file-name "notes.org" org-directory)
         org-pretty-entities-include-sub-superscripts t
@@ -470,7 +470,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     :custom
     (org-babel-load-languages '((emacs-lisp . t)
                                 (python . t))))
-#+END_SRC
+#+end_src
 
 ** Keymaps
 #+begin_src emacs-lisp :results output silent
@@ -505,16 +505,16 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     (org-alert-enable))
 #+end_src
 ** org-journal
-#+BEGIN_SRC emacs-lisp :results output silent
+#+begin_src emacs-lisp :results output silent
   (use-package org-journal
     :bind (("C-c o j" . org-journal-new-entry))
     :custom
     (org-journal-dir (expand-file-name "journal" org-directory))
     (org-journal-file-type 'monthly)
     (org-journal-file-format "%Y-%m.org"))
-#+END_SRC
+#+end_src
 ** Capture templates
-#+BEGIN_SRC emacs-lisp :results output silent
+#+begin_src emacs-lisp :results output silent
   (setq org-capture-templates
         '(("n" "Note" entry
            (file "inbox.org")
@@ -532,7 +532,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
           ("mr" "Read Later" entry (file+olp "mail.org" "Read Later")
            "* TODO Read %:subject\nSCHEDULED:%t\nDEADLINE: %(org-insert-time-stamp (org-read-date nil t \"+2d\"))\n\n%a\n\n%i")
           ))
-#+END_SRC
+#+end_src
 
 ** Citar
 #+begin_src emacs-lisp :results output silent
@@ -601,7 +601,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+end_src
 
 ** TODO Crafted config
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   
 
   ;; Disable auto-pairing of "<" in org-mode with electric-pair-mode
@@ -619,7 +619,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
   ;; no matter when electric-pair-mode is activated.
   (add-hook 'electric-pair-mode-hook #'crafted-org-enhance-electric-pair-inhibit-predicate)
   (add-hook 'org-mode-hook #'crafted-org-enhance-electric-pair-inhibit-predicate)
-#+END_SRC
+#+end_src
 * Password Store
 #+begin_src emacs-lisp
   (use-package password-store
@@ -661,7 +661,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
 #+end_src
 
 * Development Environment
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   (use-package vterm
     :custom
     (vterm-copy-mode-remove-fake-newlines t))
@@ -674,7 +674,7 @@ For reference information, see [[https://orgmode.com][Org-mode website]]
     :ensure t
     :custom (direnv-always-show-summary nil)
     :config (direnv-mode +1))
-#+END_SRC
+#+end_src
 
 ** Tree-sitter
 Set treesit to fontify all elements, default was 3 (out of 4)
@@ -707,7 +707,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
 #+end_src
 
 ** Eglot LSP
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   (use-package eglot
     :ensure t
     :diminish
@@ -735,7 +735,7 @@ Set treesit to fontify all elements, default was 3 (out of 4)
                                                  :procMacro (:enable t)
                                                  :cargo ( :buildScripts (:enable t)
                                                           :features "all"))))))
-#+END_SRC
+#+end_src
 
 ** Apheleia formatting
 #+begin_src emacs-lisp
@@ -767,14 +767,14 @@ Set treesit to fontify all elements, default was 3 (out of 4)
     (global-flymake-popon-mode +1))
 #+end_src
 ** Project
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   (setq project-switch-use-entire-map t
         project-switch-commands '((project-find-file "Find file")
                                   (project-find-regexp "Find regexp")
                                   (project-find-dir "Find directory")
                                   (project-vc-dir "VC-Dir")
                                   (project-eshell "Eshell")))
-#+END_SRC
+#+end_src
 ** Version control
 *** Magit
 #+begin_src emacs-lisp
@@ -999,7 +999,7 @@ Set fill column to 88 and enable display in python buffers
   (setq gnus-select-method '(nnrss "http://www.fsf.org/static/fsforg/rss/news.xml"))
 #+end_src
 ** Email
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   (setq sendmail-program (executable-find "msmtp")
         send-mail-function #'smtpmail-send-it
         message-sendmail-f-is-evil t
@@ -1061,7 +1061,7 @@ Set fill column to 88 and enable display in python buffers
     (setq mu4e-use-fancy-chars t)
 
     )
-#+END_SRC
+#+end_src
 *** Account contexts
 #+begin_src emacs-lisp
   (with-eval-after-load 'mu4e
@@ -1287,7 +1287,7 @@ Set fill column to 88 and enable display in python buffers
 #+end_src
 
 ** TODO Feeds
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   (let ((elfeed-base-directory "~/.elfeed"))
     (setq elfeed-db-directory (expand-file-name "db" elfeed-base-directory)
           elfeed-enclosure-default-dir (expand-file-name "enclosures" elfeed-base-directory)
@@ -1303,10 +1303,10 @@ Set fill column to 88 and enable display in python buffers
     (use-package elfeed-tube
       :ensure t
       :config (elfeed-tube-setup)))
-#+END_SRC
+#+end_src
 * Media
 ** EMMS
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   (setq emms-mode-line-icon-enabled-p nil)
   (use-package emms
     :bind (("C-c e e" . emms-smart-browse)
@@ -1336,7 +1336,7 @@ Set fill column to 88 and enable display in python buffers
     (emms-default-players)
     (emms-mpris-enable)
     (add-hook 'emms-player-started-hook #'emms-show))
-#+END_SRC
+#+end_src
 
 * Writing
 
@@ -1353,7 +1353,7 @@ Set fill column to 88 and enable display in python buffers
 #+end_src
 
 ** TODO Crafted Config
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   ;;; Whitespace
   (defun crafted-writing-configure-whitespace (use-tabs &optional use-globally &rest enabled-modes)
     "Helper function to configure `whitespace' mode.
@@ -1524,4 +1524,4 @@ Set fill column to 88 and enable display in python buffers
     ;; when pdf-tools is loaded, apply settings.
     (with-eval-after-load 'pdf-tools
       (setq-default pdf-view-display-size 'fit-width)))
-#+END_SRC
+#+end_src