         org-export-with-emphasize nil
         org-export-html-style-default ""
         org-export-html-style-extra ""
-        org-export-html-style nil))
+        org-export-html-style nil)
+
+  ;; Tailor whitespace mode
+  (set (make-local-variable 'whitespace-style)
+       '(trailing tabs empty))
+  (whitespace-mode))
+
 (add-hook 'org-mode-hook 'pjones:org-mode-hook)
-(add-hook 'org-mode-hook 'whitespace-mode)
 
 (defun pjones:org-agenda-mode-hook ()
   (define-key org-agenda-mode-map (kbd "q") 'pjones:org-agenda-quit))


;; Silence a compiler warning
(declare-function org-bookmark-jump-unhide "org")

;; General Org Settings
(setq org-log-done t

        ("*" italic "<i>" "</i>")
        ("=" underline "<span style=\"text-decoration:underline;\">" "</span>")
        ("`" org-code "<code>" "</code>" verbatim)
        ("~" org-verbatim "<code>" "</code>" verbatim))

      ;; TODO keyword faces
      org-todo-keyword-faces
      '(("NEXT"    . (:inherit 'mode-line :background "#268bd2"))
        ("DAILY"   . (:inherit 'mode-line :background "#859900"))
        ("WAITING" . (:inherit 'mode-line :background "#d33682"))
        ("DEPENDS" . (:inherit 'mode-line :background "#2aa198"))))

;; Need to tell org-mode to update org-emphasis-alist
(org-set-emph-re 'org-emphasis-alist org-emphasis-alist)
