 
  ;; Tags:
  '(org-tag-persistent-alist
-   (quote (("@computer"  . ?c)
+   (quote ((:startgroup  . nil)
+           ("@computer"  . ?c)
            ("@desk"      . ?d)
+           ("@home"      . ?h)
            ("@email"     . ?e)
-           ("@home"      . ?h)
+           ("@phone"     . ?p)
+           ("@errand"    . ?E)
+           (:endgroup    . nil)
+           (:startgroup  . nil)
            ("@online"    . ?o)
-           ("@phone"     . ?p)
-           ("@plane"     . ?P)
-           ("@traveling" . ?t)
+           ("@offline"   . ?O)
+           (:endgroup    . nil)
            (:startgroup  . nil)
            ("5m"         . ?5)
            ("30m"        . ?3)
            ("1h"         . ?1)
+           ("4h"         . ?4)
            (:endgroup    . nil))))
 
  ;; TODO keywords and faces:

           (sequence "NEXT(n)" "WAITING(w)" "DEPENDS(s)" "|" "DONE(d)" "CANCELLED(c)"))))

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

 ;; Stuff for org-agenda.
 '(org-agenda-files

           "~/notes/agenda/calendar.org")))

 '(org-agenda-window-setup (quote current-window))
 '(org-agenda-todo-ignore-with-date nil)
 '(org-agenda-todo-ignore-timestamp nil)
 '(org-agenda-todo-ignore-deadlines (quote near))
 '(org-agenda-todo-ignore-scheduled (quote future))
 '(org-agenda-skip-scheduled-if-done t)
 '(org-agenda-skip-deadline-if-done t)
 '(org-agenda-tags-todo-honor-ignore-options t)
 '(org-agenda-start-with-follow-mode nil)
 '(org-agenda-time-leading-zero t)
 '(org-agenda-show-inherited-tags nil)
 '(org-agenda-span (quote fortnight))
 '(org-deadline-warning-days 14)

 '(org-stuck-projects
   (quote ("+project+LEVEL=3|+tasks+LEVEL=3-inbox"
           ("*") nil "")))

 '(org-agenda-custom-commands
   (quote (("p" "Project Status"
            ((agenda)
             (tags-todo "@phone")
             (tags-todo "@email")
             (todo "WAITING")
             (stuck)
             (tags "+inbox+LEVEL=2"))
            ((org-agenda-todo-ignore-deadlines (quote all))
             (org-agenda-todo-ignore-scheduled (quote all))))
           ("o" "Offline Tasks"
            ((tags-todo "+@offline")))
           ("e" "Tasks by Energy Level"
            ((tags-todo "5m")
             (tags-todo "30m")
             (tags-todo "1h"))
            ((org-agenda-todo-ignore-deadlines nil))))))

 ;; Stuff for org-capture and org-refile:
 '(org-default-notes-file "~/notes/agenda/tasks.org")
