diff --git a/README.org b/README.org
index 6963cf0..ab9e658 100644
--- a/README.org
+++ b/README.org
@@ -106,7 +106,7 @@ Configure the look and feel of Emacs
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
 #+end_src
-*** Theme and Icons
+*** Theme
 #+begin_src emacs-lisp
 (add-to-list 'package-selected-packages 'base16-theme)
 (use-package base16-theme
@@ -116,7 +116,7 @@ Configure the look and feel of Emacs
   (base16-theme-distinct-fringe-background nil)
   (base16-theme-highlight-mode-line 'contrast))
 
-(defvar base16-current-theme-colors nil
+(defvar my/base16-colors nil
   "Set to `base16-*-theme-colors' for currently selected theme.")
 
 (defun my/load-theme-and-configure ()
@@ -124,7 +124,12 @@ Configure the look and feel of Emacs
   (interactive)
   (require 'base16-theme)
   (load-theme 'base16-one-light t)
-  (setq base16-current-theme-colors base16-one-light-theme-colors)
+  (setq my/base16-colors base16-one-light-theme-colors)
+
+  ;; Set some font-lock faces to be italic
+  (set-face-attribute 'font-lock-doc-face nil :slant 'italic)
+  (set-face-attribute 'font-lock-comment-face nil :slant 'italic)
+  (set-face-attribute 'font-lock-comment-delimiter-face nil :slant 'italic)
 
   ;; Change outline headers to follow rainbow order
   (require 'outline)
@@ -138,27 +143,29 @@ Configure the look and feel of Emacs
                      (outline-8 . :base0F)))
     (set-face-attribute (car pairing) nil
                         :foreground
-                        (plist-get base16-current-theme-colors (cdr pairing))))
+                        (plist-get my/base16-colors (cdr pairing))))
 
   (require 'org-faces)
   ;; Lighten `org-agenda-clocking' background to be more legible.
   (set-face-attribute 'org-agenda-clocking nil :background
-                      (plist-get base16-current-theme-colors :base01))
+                      (plist-get my/base16-colors :base01))
   ;; Set `org-hide' face to actually match background colour
   (set-face-attribute 'org-hide nil :foreground
-                      (plist-get base16-current-theme-colors :base00))
+                      (plist-get my/base16-colors :base00))
   (with-eval-after-load 'org-noter
     (set-face-attribute 'org-noter-no-notes-exist-face nil :foreground
-                        (plist-get base16-current-theme-colors :base08))
+                        (plist-get my/base16-colors :base08))
     (set-face-attribute 'org-noter-notes-exist-face nil :foreground
-                        (plist-get base16-current-theme-colors :base0B))))
+                        (plist-get my/base16-colors :base0B))))
 
 (require 'server)
 (add-hook 'after-init-hook
           (lambda () (when (display-graphic-p) (my/load-theme-and-configure))))
 (add-hook 'server-after-make-frame-hook
           (lambda () (when (display-graphic-p) (my/load-theme-and-configure))))
-
+#+end_src
+*** Nerd Icons
+#+begin_src emacs-lisp
 (add-to-list 'package-selected-packages 'nerd-icons)
 (use-package nerd-icons
   :if (package-installed-p 'nerd-icons))