     ;; set appropriate tags on tasks (used for filtering)
     (setq org-todo-state-tags-triggers
           '(("CANCELLED" ("CANCELLED" . t))
-            ("WAITING" ("WAITING" . t))
-            ("DEFERRED" ("WAITING") ("DEFERRED" . t))
-            (done ("WAITING") ("DEFERRED"))
-            ("TODO" ("WAITING") ("CANCELLED") ("DEFERRED"))
-            ("NEXT" ("WAITING") ("CANCELLED") ("DEFERRED"))
-            ("DONE" ("WAITING") ("CANCELLED") ("DEFERRED"))))
+            ("BLOCKED" ("WAITING" . t))
+            (done ("WAITING"))
+            ("TODO" ("WAITING") ("CANCELLED"))
+            ("DONE" ("WAITING") ("CANCELLED"))))
     
     (setq org-capture-templates
           '(("t" "Todo"
-             entry (file "refile.org" "Tasks")
-             "* TODO [#B] %?")
+             entry (file+headline "todo.org" "Things to do")
+             "* TODO %?")
+            ("m" "Multi-part Todo"
+             entry (file+headline "todo.org" "Things to do")
+             "* TODO %? [/]\n- [ ] ")
             ("n" "Note"
-             entry (file "refile.org" "Notes")
-             "* %? :NOTE:\n%U\n%a\n")
-            ("j" "Journal Entry"
-             entry (file+datetree "journal.org")
-             "* %?"
-             :empty-lines 1)
-            ("p" "Protocol"
-             entry (file+headline "refile.org" "Notes")
-             "* %:description :NOTE:RESEARCH:\n#+BEGIN_QUOTE\n%i\n\n -- %:link %u\n #+END_QUOTE\n\n%?")
-            ("L" "Protocol Link"
-             entry (file+headline "refile.org" "Notes")
-             "* %? [[%:link][%:description]] :NOTE:RESEARCH:\nCaptured On: %u")
-            ("P" "Pandoc Converted Website"
-             entry (file+headline "refile.org" "Notes")
-             "* %a :NOTE:RESEARCH:\n\n%U %?\n\n%:initial")
-            ))
+             entry (file+headline "dump.org" "Notes")
+             "* %? :NOTE:\n%U\n")))
 
     ;;
     ;; Refile config

  :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

             ((org-agenda-overriding-header "Notes")
              (org-tags-match-list-sublevels t)))
            (" " "Agenda"
             ((tags "REFILE"
                    ((org-agenda-overriding-header "Things to Refile")
                     (org-tags-match-list-sublevels nil)))
              (tags-todo "BLOCKED"
                         ((org-agenda-overriding-header "Blocked Tasks")
                          (org-tags-match-list-sublevels nil)))
              (tags-todo "STARTED"
                         ((org-agenda-overriding-header "In Progress")
                          (org-tags-match-list-sublevels nil)))
              nil))))
    ))

(use-package ox-tufte
  :after (org)
  :defer t)

(use-package ox-gfm
  :after (org)
  :defer 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
