diff --git a/unravel-emacs.org b/unravel-emacs.org
index b39e532..57f797a 100644
--- a/unravel-emacs.org
+++ b/unravel-emacs.org
@@ -3811,7 +3811,34 @@ Org agenda, in particular, provides commands to filter tasks by tag:
   (use-package org
     :ensure nil
     :config
-    (setq org-tag-alist nil)
+    (setq org-tag-alist
+          '((:startgrouptag)
+            ("TaskStatus" . ?S)
+            (:grouptags)
+            ("next" . ?x)
+            ("waiting" . ?w)
+            ("delegated" . ?d)
+            (:endgrouptag)
+            (:startgrouptag)
+            ("Writing" . ?W)
+            (:grouptags)
+            ("notes" . ?n)
+            ("sketch" . ?s)
+            ("feedback" . ?f)
+            ("actionitems" . ?a)
+            (:endgrouptag)
+            (:startgrouptag)
+            ("TaskType" . ?T)
+            (:startgrouptag)
+            ("joy" . ?j)
+            ("errand" . ?e)
+            ("bug" . ?b)
+            ("habit" . ?h)
+            ("goal" . ?g)
+            (:endgrouptag)
+            ("important" . ?i)
+            ("refile" . ?r)
+            ("future" . ?F)))
     (setq org-auto-align-tags nil)
     (setq org-tags-column 0))
 #+end_src
diff --git a/unravel-modules/unravel-org.el b/unravel-modules/unravel-org.el
index bcac1f3..4ed6915 100644
--- a/unravel-modules/unravel-org.el
+++ b/unravel-modules/unravel-org.el
@@ -162,7 +162,34 @@
 (use-package org
   :ensure nil
   :config
-  (setq org-tag-alist nil)
+  (setq org-tag-alist
+        '((:startgrouptag)
+          ("TaskStatus" . ?S)
+          (:grouptags)
+          ("next" . ?x)
+          ("waiting" . ?w)
+          ("delegated" . ?d)
+          (:endgrouptag)
+          (:startgrouptag)
+          ("Writing" . ?W)
+          (:grouptags)
+          ("notes" . ?n)
+          ("sketch" . ?s)
+          ("feedback" . ?f)
+          ("actionitems" . ?a)
+          (:endgrouptag)
+          (:startgrouptag)
+          ("TaskType" . ?T)
+          (:startgrouptag)
+          ("joy" . ?j)
+          ("errand" . ?e)
+          ("bug" . ?b)
+          ("habit" . ?h)
+          ("goal" . ?g)
+          (:endgrouptag)
+          ("important" . ?i)
+          ("refile" . ?r)
+          ("future" . ?F)))
   (setq org-auto-align-tags nil)
   (setq org-tags-column 0))