diff --git a/README.org b/README.org
index 60ba0b1..2adec3f 100644
--- a/README.org
+++ b/README.org
@@ -5,6 +5,34 @@
 Personal Emacs configuration. Clone to =~/.config/emacs/= (or
 =~/.emacs.d/=) and install specified plugins.
 * Config
+** Package management
+Setup custom file
+
+#+begin_src emacs-lisp
+  (setq custom-file (locate-user-emacs-file "custom.el"))
+
+  (when (and custom-file (file-exists-p custom-file))
+    (load custom-file nil 'nomessage))
+#+end_src
+
+Customise =use-package= before first time it's used.
+
+#+begin_src emacs-lisp
+  (setopt use-package-check-before-init t
+          use-package-enable-imenu-support t)
+#+end_src
+
+Configure package archives and initialise.
+
+#+begin_src emacs-lisp
+  (use-package package
+    :config
+    (add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/"))
+    (package-initialize))
+
+  ;; Plugins that still need adding / configuring: `auctex' `htmlize'
+  ;; `password-store'
+#+end_src
 ** Defaults
 Set some useful defaults. Some of these should be moved to relevant
 section of configuration.
@@ -12,28 +40,12 @@ section of configuration.
 #+begin_src emacs-lisp
   (setq user-full-name "Evie Litherland-Smith"
         user-mail-address "evie@xenia.me.uk"
-        custom-file (locate-user-emacs-file "custom.el")
         use-short-answers t
         kill-do-not-save-duplicates t)
 
-  (when (and custom-file (file-exists-p custom-file))
-    (load custom-file nil 'nomessage))
-
   (set-default-coding-systems 'utf-8)
   (global-auto-revert-mode +1)
   (delete-selection-mode +1)
-
-  ;; Bind normal forward/back buttons on mouse to next/previous buffer respectively
-  (keymap-global-set "<mouse-8>" #'previous-buffer)
-  (keymap-global-set "<mouse-9>" #'next-buffer)
-#+end_src
-
-Customise =use-package= separately as configuration must be set before
-first time it's used.
-
-#+begin_src emacs-lisp
-  (setopt use-package-check-before-init t
-          use-package-enable-imenu-support t)
 #+end_src
 
 Filter warning messages from causing popups. Keep in log, but only
@@ -43,18 +55,11 @@ show for error or emergency.
   (setq warning-minimum-level :error)
 #+end_src
 
-Configure package archives and initialise.
+Bind mouse keys to expected movement commands
 
 #+begin_src emacs-lisp
-  (use-package package
-    :custom
-    (package-install-upgrade-built-in t)
-    :config
-    (add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/"))
-    (package-initialize))
-
-  ;; Plugins that still need adding / configuring: `auctex' `htmlize'
-  ;; `password-store'
+  (keymap-global-set "<mouse-8>" #'previous-buffer)
+  (keymap-global-set "<mouse-9>" #'next-buffer)
 #+end_src
 ** UI and Appearance
 Configure the look and feel of Emacs