diff --git a/org/testdata/headlines.html b/org/testdata/headlines.html
index 1c72f22..e598777 100644
--- a/org/testdata/headlines.html
+++ b/org/testdata/headlines.html
@@ -32,14 +32,14 @@ not just where they are actually meant to be - even here &gt; <code class="stati
 </div>
 <div id="outline-container-headline-2" class="outline-2">
 <h2 id="headline-2">
-<span class="todo">TODO</span>
-<span class="priority">[B]</span>
+<span class="todo status-todo">TODO</span>
+<span class="priority priority-b">[B]</span>
 Headline with todo status &amp; priority
 </h2>
 </div>
 <div id="outline-container-this-will-be-the-id-of-the-headline" class="outline-2">
 <h2 id="this-will-be-the-id-of-the-headline">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 Headline with TODO status
 </h2>
 <div id="outline-text-this-will-be-the-id-of-the-headline" class="outline-text-2">
@@ -49,8 +49,8 @@ we can link to headlines that define a custom_id: <a href="#this-will-be-the-id-
 </div>
 <div id="outline-container-headline-4" class="outline-2">
 <h2 id="headline-4">
-<span class="priority">[A]</span>
-Headline with tags &amp; priority&#xa0;&#xa0;&#xa0;<span class="tags"><span>foo</span>&#xa0;<span>bar</span></span>
+<span class="priority priority-a">[A]</span>
+Headline with tags &amp; priority&#xa0;&#xa0;&#xa0;<span class="tags"><span class="tag-foo">foo</span>&#xa0;<span class="tag-bar">bar</span></span>
 </h2>
 <div id="outline-text-headline-4" class="outline-text-2">
 <p>Still outside the drawer</p>
@@ -60,7 +60,7 @@ Headline with tags &amp; priority&#xa0;&#xa0;&#xa0;<span class="tags"><span>foo<
 </div>
 <div id="outline-container-headline-5" class="outline-2">
 <h2 id="headline-5">
-<span class="todo">CUSTOM</span>
+<span class="todo status-custom">CUSTOM</span>
 headline with custom status
 </h2>
 <div id="outline-text-headline-5" class="outline-text-2">
diff --git a/org/testdata/misc.html b/org/testdata/misc.html
index 8043e23..66639ac 100644
--- a/org/testdata/misc.html
+++ b/org/testdata/misc.html
@@ -90,7 +90,7 @@ issues from goorgeous (free test cases, yay!)
 <div id="outline-text-headline-1" class="outline-text-3">
 <div id="outline-container-headline-2" class="outline-4">
 <h4 id="headline-2">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/19">#19</a>: Support #+HTML
 </h4>
 <div id="outline-text-headline-2" class="outline-text-4">
@@ -99,7 +99,7 @@ issues from goorgeous (free test cases, yay!)
 </div>
 <div id="outline-container-headline-3" class="outline-4">
 <h4 id="headline-3">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/29">#29:</a> Support verse block
 </h4>
 <div id="outline-text-headline-3" class="outline-text-4">
@@ -116,7 +116,7 @@ crazy ain&#39;t it?</p>
 </div>
 <div id="outline-container-headline-4" class="outline-4">
 <h4 id="headline-4">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/30">#30</a>: Support #+SETUPFILE
 </h4>
 <div id="outline-text-headline-4" class="outline-text-4">
@@ -125,7 +125,7 @@ crazy ain&#39;t it?</p>
 </div>
 <div id="outline-container-headline-5" class="outline-4">
 <h4 id="headline-5">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/31">#31</a>: Support #+INCLUDE
 </h4>
 <div id="outline-text-headline-5" class="outline-text-4">
@@ -240,7 +240,7 @@ jobs:
 </div>
 <div id="outline-container-headline-6" class="outline-4">
 <h4 id="headline-6">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/33">#33</a>: Wrong output when mixing html with Org mode
 </h4>
 <div id="outline-text-headline-6" class="outline-text-4">
@@ -262,13 +262,13 @@ jobs:
 </div>
 <div id="outline-container-headline-7" class="outline-4">
 <h4 id="headline-7">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/41">#41</a>: Support Table Of Contents
 </h4>
 </div>
 <div id="outline-container-headline-8" class="outline-4">
 <h4 id="headline-8">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/46">#46</a>: Support for symbols like ndash and mdash
 </h4>
 <div id="outline-text-headline-8" class="outline-text-4">
@@ -283,7 +283,7 @@ jobs:
 </div>
 <div id="outline-container-headline-9" class="outline-4">
 <h4 id="headline-9">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/47">#47:</a> Consecutive <code>code</code> wrapped text gets joined
 </h4>
 <div id="outline-text-headline-9" class="outline-text-4">
@@ -294,7 +294,7 @@ or <code>that</code> foo.</p>
 </div>
 <div id="outline-container-headline-10" class="outline-4">
 <h4 id="headline-10">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/50">#50</a>: LineBreaks in lists are preserved
 </h4>
 <div id="outline-text-headline-10" class="outline-text-4">
@@ -317,7 +317,7 @@ lists</li>
 </div>
 <div id="outline-container-headline-11" class="outline-4">
 <h4 id="headline-11">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/68">#68</a>: Quote block with inline markup
 </h4>
 <div id="outline-text-headline-11" class="outline-text-4">
@@ -328,7 +328,7 @@ lists</li>
 </div>
 <div id="outline-container-headline-12" class="outline-4">
 <h4 id="headline-12">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/72">#72</a>: Support for #+ATTR_HTML
 </h4>
 <div id="outline-text-headline-12" class="outline-text-4">
@@ -337,7 +337,7 @@ lists</li>
 </div>
 <div id="outline-container-headline-13" class="outline-4">
 <h4 id="headline-13">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/75">#75</a>: Not parsing nested lists correctly
 </h4>
 <div id="outline-text-headline-13" class="outline-text-4">
@@ -353,13 +353,13 @@ lists</li>
 </div>
 <div id="outline-container-headline-14" class="outline-4">
 <h4 id="headline-14">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/77">#77</a>: Recognize <code class="verbatim">code</code>— as code plus dash
 </h4>
 </div>
 <div id="outline-container-headline-15" class="outline-4">
 <h4 id="headline-15">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/78">#78</a>: Emphasis at beginning of line
 </h4>
 <div id="outline-text-headline-15" class="outline-text-4">
@@ -371,7 +371,7 @@ Text
 </div>
 <div id="outline-container-headline-16" class="outline-4">
 <h4 id="headline-16">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/82">#82</a>: Crash on empty headline
 </h4>
 <div id="outline-text-headline-16" class="outline-text-4">
@@ -387,7 +387,7 @@ Text
 </div>
 <div id="outline-container-headline-18" class="outline-4">
 <h4 id="headline-18">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/84">#84</a>: Paragraphs that are not followed by an empty line are not parsed correctly
 </h4>
 <div id="outline-text-headline-18" class="outline-text-4">
@@ -411,7 +411,7 @@ Bar
 </div>
 <div id="outline-container-headline-21" class="outline-4">
 <h4 id="headline-21">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/86">#86</a>: Multiple hyphens not converted to dashes
 </h4>
 <div id="outline-text-headline-21" class="outline-text-4">
@@ -445,7 +445,7 @@ Bar
 </div>
 <div id="outline-container-headline-22" class="outline-4">
 <h4 id="headline-22">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/87">#87</a>: Markup in footnotes is rendered literally
 </h4>
 <div id="outline-text-headline-22" class="outline-text-4">
@@ -454,7 +454,7 @@ Bar
 </div>
 <div id="outline-container-headline-23" class="outline-4">
 <h4 id="headline-23">
-<span class="todo">DONE</span>
+<span class="todo status-done">DONE</span>
 <a href="https://github.com/chaseadamsio/goorgeous/issues/92">#92</a>: src blocks only render in caps
 </h4>
 <div id="outline-text-headline-23" class="outline-text-4">
diff --git a/org/testdata/options.html b/org/testdata/options.html
index 7c04165..dac68ce 100644
--- a/org/testdata/options.html
+++ b/org/testdata/options.html
@@ -1,8 +1,8 @@
 <div id="outline-container-headline-1" class="outline-2">
 <h2 id="headline-1">
-<span class="todo">DONE</span>
-<span class="priority">[A]</span>
-<code class="verbatim">#+OPTIONS:</code> toggles supported by <code class="verbatim">go-org</code>&#xa0;&#xa0;&#xa0;<span class="tags"><span>tag1</span>&#xa0;<span>tag2</span></span>
+<span class="todo status-done">DONE</span>
+<span class="priority priority-a">[A]</span>
+<code class="verbatim">#+OPTIONS:</code> toggles supported by <code class="verbatim">go-org</code>&#xa0;&#xa0;&#xa0;<span class="tags"><span class="tag-tag1">tag1</span>&#xa0;<span class="tag-tag2">tag2</span></span>
 </h2>
 <div id="outline-text-headline-1" class="outline-text-2">
 <p><code class="verbatim">go-org</code> supports multiple export toggles as described in the <a href="https://orgmode.org/manual/Export-settings.html">export settings</a> section of the Org mode manual.