              ((org-agenda-overriding-header "Notes")
               (org-tags-match-list-sublevels t)))
             (" " "Agenda"
-             ((agenda "" nil)
-              (tags "REFILE"
-                    ((org-agenda-overriding-header "Tasks to Refile")
+             ((tags "REFILE"
+                    ((org-agenda-overriding-header "Things to Refile")
                      (org-tags-match-list-sublevels nil)))
-              (tags-todo "WORK/NEXT"
-                         ((org-agenda-overriding-header "Work Next Tasks")
+              (tags-todo "BLOCKED"
+                         ((org-agenda-overriding-header "Blocked Tasks")
                           (org-tags-match-list-sublevels nil)))
-              (tags-todo "PERSONAL/NEXT"
-                         ((org-agenda-overriding-header "Personal Next Tasks")
+              (tags-todo "STARTED"
+                         ((org-agenda-overriding-header "In Progress")
                           (org-tags-match-list-sublevels nil)))
               nil))))
-    ;;
-    ;; General Config
-    ;;
-    ;; actually emphasise text (e.g. show as italic instead of /italic/)
-    (setq org-hide-emphasis-markers t)
-
-    ;; syntax highlight code blocks
-    (setq org-src-fontify-natively t)
-
-    ;; replace list indicators with bullet points
-    (font-lock-add-keywords 'org-mode
-                            '(("^ +\\([-*]\\) "
-                               (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
-    
-
-    
-    ;; (add-hook 'org-mode-hook
-    ;;           '(lambda ()
-    ;;              (variable-pitch-mode 1)
-    ;;              ((mapc function )
-    ;;               (lambda (face)
-    ;;                 (set-face-attribute face nil :inherit 'fixed-pitch))
-    ;;               (list 'org-code
-    ;;                     'org-link
-    ;;                     'org-block
-    ;;                     'org-table
-    ;;                     'org-block-begin-line
-    ;;                     'org-block-end-line
-    ;;                     'org-src-block
-    ;;                     'org-verbatim
-    ;;                     'org-date
-    ;;                     'org-meta-line
-    ;;                     'org-document-info-keyword))))
     ))
 
-;; (eval-after-load "org"
-;;   '(progn
-;;      (defun gp/adjoin-to-list-or-symbol (element list-or-symbol)
-;;        (let ((list (if (not (listp list-or-symbol))
-;;                        (list list-or-symbol)
-;;                      list-or-symbol)))
-;;          (require 'cl-lib)
-;;          (cl-adjoin element list)))
+(use-package ox-tufte
+  :after (org)
+  :defer t)
 
+(use-package ox-gfm
+  :after (org)
+  :defer t)
 
-;;      (mapc
-;;       (lambda (face)
-;;         (set-face-attribute
-;;          face nil
-;;          :inherit
-;;          (gp/adjoin-to-list-or-symbol
-;;           'fixed-pitch
-;;           (face-attribute face :inherit))))
-;;       (list 'org-code 'org-block 'org-block-begin-line 'org-block-end-line 'org-verbatim 'org-macro 'org-table 'org-link 'org-footnote 'org-date))
-;;      )
-;;   )
-
-;; TODO: Figure out where the odt schema files live so I can include them in the config
-;; These live in ~/.emacs.d/elpa/org-YYYYMMDD/etc/ but I'm not sure if I need to specify them now
-;; Require OpenDocument Text export mode
-;;  (setq org-odt-schema-dir "~/.emacs.d/org-mode/etc/schema")
-;;  (setq org-odt-styles-dir "~/.emacs.d/org-mode/etc/styles")
-;;  (require 'ox-odt nil t)
+(use-package org-bullets
+  :after (org)
+  :config
+  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
 
 (provide 'init-org)
 ;;; init-org.el ends here

  :preface
  ;; hook to run when org-mode is started, to turn on certain modes etc.
  (defun gp/org-mode-hook ()
    ;;set variable pitch font for org, but keep fixed width for code etc.
    ;;(variable-pitch-mode t)

    ;; disable linum
    (linum-mode -1)

    ;; enable on the fly spell checking
    (flyspell-mode 1))
  :init
  (use-package ox-tufte
    :defer t)
  (use-package ox-gfm
    :defer t)
  (use-package org-gcal)
  :config
  (progn
    (require 'ox-md)
    (require 'ox-gfm)
    (require 'ox-html)
    (require 'ox-tufte)
    (require 'org-protocol)

    ;; This functionality isn't in a package yet.
    ;; I installed it into ~/.emacs.d/site-lisp with wget https://raw.githubusercontent.com/alphapapa/org-protocol-capture-html/master/org-protocol-capture-html.el
    (require 'org-protocol-capture-html)
    
    (add-hook 'org-mode-hook 'gp/org-mode-hook)
    
    ;; configuration
    (setq org-directory "~/Documents/Dropbox/org")
    (setq cal-directory "~/Documents/Dropbox/org/calendars")
    
    (setq line-spacing 3)
    (setq org-startup-with-inline-images t)
    
    ;;
    ;; Agenda config

    ;; All the agenda/capture/refile stuff is heavily influenced by http://doc.norang.ca/org-mode.html
    (setq org-agenda-window-setup (quote current-window))
    (setq org-agenda-files (list (expand-file-name "todo.org" org-directory)
                                 (expand-file-name "dump.org" org-directory)
                                 (expand-file-name "projects/" org-directory)))
    
    ;; (add-hook 'org-mode-hook 'turn-on-auto-fill)
    
    (setq org-todo-keywords '((sequence "TODO(t)" "STARTED(s)" "BLOCKED(b!)" "|" "DONE(d)" "CANCELLED(c)")))
    
    (setq org-todo-keyword-faces
          (quote
           (("DONE" . success)
            ("CANCELLED" . default)
            ("STARTED" . underline)
            ("BLOCKED" . warning)
            ("TODO" . error))))

    ;; allow changing from any task todo state to another by selecting appropriate key from the menu
    ;; C-c C-t KEY
