diff --git a/src/markup/engine/__tests__/remarkup/headers.txt b/src/markup/engine/__tests__/remarkup/headers.txt
index e3c2567..0c3768a 100644
--- a/src/markup/engine/__tests__/remarkup/headers.txt
+++ b/src/markup/engine/__tests__/remarkup/headers.txt
@@ -1,57 +1,57 @@
 @nolint (UTF8)
 
 =a=
 
 blah blah blah
 
 
 = b =
 
 Markdown-Style Large Header
 ====
 
 Markdown-Style Small Header
 ----
 
 === Remarkup-Style Smaller Header
 
 
 = ☃☃☃ UTF8 Header ☃☃☃ =
 ~~~~~~~~~~
 <p>@nolint (UTF8)</p>
 
-<h2>a</h2>
+<h2 class="remarkup-header">a</h2>
 
 <p>blah blah blah</p>
 
-<h2>b</h2>
+<h2 class="remarkup-header">b</h2>
 
-<h2>Markdown-Style Large Header</h2>
+<h2 class="remarkup-header">Markdown-Style Large Header</h2>
 
-<h3>Markdown-Style Small Header</h3>
+<h3 class="remarkup-header">Markdown-Style Small Header</h3>
 
-<h4>Remarkup-Style Smaller Header</h4>
+<h4 class="remarkup-header">Remarkup-Style Smaller Header</h4>
 
-<h2>☃☃☃ UTF8 Header ☃☃☃</h2>
+<h2 class="remarkup-header">☃☃☃ UTF8 Header ☃☃☃</h2>
 ~~~~~~~~~~
 @nolint (UTF8)
 
 a
 =
 
 blah blah blah
 
 b
 =
 
 Markdown-Style Large Header
 ===========================
 
 Markdown-Style Small Header
 ---------------------------
 
 Remarkup-Style Smaller Header
 -----------------------------
 
 ☃☃☃ UTF8 Header ☃☃☃
 ===================
diff --git a/src/markup/engine/__tests__/remarkup/horizonal-rule.txt b/src/markup/engine/__tests__/remarkup/horizonal-rule.txt
index b0ddc2f..93bc397 100644
--- a/src/markup/engine/__tests__/remarkup/horizonal-rule.txt
+++ b/src/markup/engine/__tests__/remarkup/horizonal-rule.txt
@@ -1,35 +1,35 @@
 ___
 
 _____
 
 ***
 
 * * * * * * *
 
 ---
 
 - - - - - - -
 ~~~~~~~~~~
-<hr />
+<hr class="remarkup-hr" />
 
-<hr />
+<hr class="remarkup-hr" />
 
-<hr />
+<hr class="remarkup-hr" />
 
-<hr />
+<hr class="remarkup-hr" />
 
-<hr />
+<hr class="remarkup-hr" />
 
-<hr />
+<hr class="remarkup-hr" />
 ~~~~~~~~~~
-<hr />
+<hr class="remarkup-hr" />
 
-<hr />
+<hr class="remarkup-hr" />
 
-<hr />
+<hr class="remarkup-hr" />
 
-<hr />
+<hr class="remarkup-hr" />
 
-<hr />
+<hr class="remarkup-hr" />
 
-<hr />
+<hr class="remarkup-hr" />
diff --git a/src/markup/engine/__tests__/remarkup/link-alternate.txt b/src/markup/engine/__tests__/remarkup/link-alternate.txt
index 2abcb4a..8e61291 100644
--- a/src/markup/engine/__tests__/remarkup/link-alternate.txt
+++ b/src/markup/engine/__tests__/remarkup/link-alternate.txt
@@ -1,12 +1,12 @@
 [Example](http://www.example.com/)
 
 x[0][1](**ptr);
 
 ~~~~~~~~~~
-<p><a href="http://www.example.com/" target="_blank" rel="noreferrer">Example</a></p>
+<p><a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">Example</a></p>
 
 <p>x[0][1](**ptr);</p>
 ~~~~~~~~~~
 Example <http://www.example.com/>
 
 x[0][1](**ptr);
diff --git a/src/markup/engine/__tests__/remarkup/link-brackets.txt b/src/markup/engine/__tests__/remarkup/link-brackets.txt
index b2f48f1..3808aa9 100644
--- a/src/markup/engine/__tests__/remarkup/link-brackets.txt
+++ b/src/markup/engine/__tests__/remarkup/link-brackets.txt
@@ -1,5 +1,5 @@
 <http://www.zany.com/omg/weird_url,,,>
 ~~~~~~~~~~
-<p><a href="http://www.zany.com/omg/weird_url,,," target="_blank" rel="noreferrer">http://www.zany.com/omg/weird_url,,,</a></p>
+<p><a href="http://www.zany.com/omg/weird_url,,," class="remarkup-link" target="_blank" rel="noreferrer">http://www.zany.com/omg/weird_url,,,</a></p>
 ~~~~~~~~~~
 http://www.zany.com/omg/weird_url,,,
diff --git a/src/markup/engine/__tests__/remarkup/link-edge-cases.txt b/src/markup/engine/__tests__/remarkup/link-edge-cases.txt
index 2ee5ec3..64c93ea 100644
--- a/src/markup/engine/__tests__/remarkup/link-edge-cases.txt
+++ b/src/markup/engine/__tests__/remarkup/link-edge-cases.txt
@@ -1,35 +1,35 @@
 http://www.example.com/
 
 (http://www.example.com/)
 
 <http://www.example.com/>
 
 http://www.example.com/wiki/example_(disambiguation)
 
 (example http://www.example.com/)
 
 Quick! http://www.example.com/!
 ~~~~~~~~~~
-<p><a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a></p>
+<p><a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a></p>
 
-<p>(<a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a>)</p>
+<p>(<a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a>)</p>
 
-<p><a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a></p>
+<p><a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a></p>
 
-<p><a href="http://www.example.com/wiki/example_(disambiguation)" target="_blank" rel="noreferrer">http://www.example.com/wiki/example_(disambiguation)</a></p>
+<p><a href="http://www.example.com/wiki/example_(disambiguation)" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/wiki/example_(disambiguation)</a></p>
 
-<p>(example <a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a>)</p>
+<p>(example <a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a>)</p>
 
-<p>Quick! <a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a>!</p>
+<p>Quick! <a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a>!</p>
 ~~~~~~~~~~
 http://www.example.com/
 
 (http://www.example.com/)
 
 http://www.example.com/
 
 http://www.example.com/wiki/example_(disambiguation)
 
 (example http://www.example.com/)
 
 Quick! http://www.example.com/!
diff --git a/src/markup/engine/__tests__/remarkup/link-mailto.txt b/src/markup/engine/__tests__/remarkup/link-mailto.txt
index 95a1eb9..e449c15 100644
--- a/src/markup/engine/__tests__/remarkup/link-mailto.txt
+++ b/src/markup/engine/__tests__/remarkup/link-mailto.txt
@@ -1,18 +1,18 @@
 [[ mailto:alincoln@example.com | mail me ]]
 
 [ mail me ]( mailto:alincoln@example.com )
 
 [[mailto:alincoln@example.com]]
 
 ~~~~~~~~~~
-<p><a href="mailto:alincoln@example.com" target="_blank" rel="noreferrer">mail me</a></p>
+<p><a href="mailto:alincoln@example.com" class="remarkup-link" target="_blank" rel="noreferrer">mail me</a></p>
 
-<p><a href="mailto:alincoln@example.com" target="_blank" rel="noreferrer">mail me</a></p>
+<p><a href="mailto:alincoln@example.com" class="remarkup-link" target="_blank" rel="noreferrer">mail me</a></p>
 
-<p><a href="mailto:alincoln@example.com" target="_blank" rel="noreferrer">alincoln@example.com</a></p>
+<p><a href="mailto:alincoln@example.com" class="remarkup-link" target="_blank" rel="noreferrer">alincoln@example.com</a></p>
 ~~~~~~~~~~
 mail me <alincoln@example.com>
 
 mail me <alincoln@example.com>
 
 alincoln@example.com
diff --git a/src/markup/engine/__tests__/remarkup/link-mixed.txt b/src/markup/engine/__tests__/remarkup/link-mixed.txt
index 7281f89..bf433e9 100644
--- a/src/markup/engine/__tests__/remarkup/link-mixed.txt
+++ b/src/markup/engine/__tests__/remarkup/link-mixed.txt
@@ -1,18 +1,18 @@
 [[http://www.example.com/ | Example]](http://www.alternate.org/)
 
 (http://www.alternate.org/)[[http://www.example.com/ | Example]]
 
 <http://www.example.com/ [[http://www.example.net/ | Example]]>
 
 ~~~~~~~~~~
-<p><a href="http://www.example.com/" target="_blank" rel="noreferrer">Example</a>(<a href="http://www.alternate.org/" target="_blank" rel="noreferrer">http://www.alternate.org/</a>)</p>
+<p><a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">Example</a>(<a href="http://www.alternate.org/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.alternate.org/</a>)</p>
 
-<p>(<a href="http://www.alternate.org/" target="_blank" rel="noreferrer">http://www.alternate.org/</a>)<a href="http://www.example.com/" target="_blank" rel="noreferrer">Example</a></p>
+<p>(<a href="http://www.alternate.org/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.alternate.org/</a>)<a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">Example</a></p>
 
-<p>&lt;<a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a> <a href="http://www.example.net/" target="_blank" rel="noreferrer">Example</a>&gt;</p>
+<p>&lt;<a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a> <a href="http://www.example.net/" class="remarkup-link" target="_blank" rel="noreferrer">Example</a>&gt;</p>
 ~~~~~~~~~~
 Example <http://www.example.com/>(http://www.alternate.org/)
 
 (http://www.alternate.org/)Example <http://www.example.com/>
 
 <http://www.example.com/ Example <http://www.example.net/>>
diff --git a/src/markup/engine/__tests__/remarkup/link-square.txt b/src/markup/engine/__tests__/remarkup/link-square.txt
index dc143cd..91d85f3 100644
--- a/src/markup/engine/__tests__/remarkup/link-square.txt
+++ b/src/markup/engine/__tests__/remarkup/link-square.txt
@@ -1,29 +1,29 @@
 [[http://www.example.com/]]
 
 [[http://www.example.com/ | example.com]]
 
 [[/]]
 
 [[#anchor]]
 
 [[#anchor | Anchors ]]
 ~~~~~~~~~~
-<p><a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a></p>
+<p><a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a></p>
 
-<p><a href="http://www.example.com/" target="_blank" rel="noreferrer">example.com</a></p>
+<p><a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">example.com</a></p>
 
-<p><a href="/" target="_blank">/</a></p>
+<p><a href="/" class="remarkup-link" target="_blank">/</a></p>
 
-<p><a href="#anchor">#anchor</a></p>
+<p><a href="#anchor" class="remarkup-link">#anchor</a></p>
 
-<p><a href="#anchor">Anchors</a></p>
+<p><a href="#anchor" class="remarkup-link">Anchors</a></p>
 ~~~~~~~~~~
 http://www.example.com/
 
 example.com <http://www.example.com/>
 
 http://www.example.com/
 
 http://www.example.com/#anchor
 
 Anchors <http://www.example.com/#anchor>
diff --git a/src/markup/engine/__tests__/remarkup/link-with-punctuation.txt b/src/markup/engine/__tests__/remarkup/link-with-punctuation.txt
index 33cb6fa..c187b16 100644
--- a/src/markup/engine/__tests__/remarkup/link-with-punctuation.txt
+++ b/src/markup/engine/__tests__/remarkup/link-with-punctuation.txt
@@ -1,9 +1,9 @@
 http://www.example.com/,
 http://www.example.com/..
 http://www.example.com/!!!
 ~~~~~~~~~~
-<p><a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a>,
-<a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a>..
-<a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a>!!!</p>
+<p><a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a>,
+<a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a>..
+<a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a>!!!</p>
 ~~~~~~~~~~
 http://www.example.com/, http://www.example.com/.. http://www.example.com/!!!
diff --git a/src/markup/engine/__tests__/remarkup/link-with-tilde.txt b/src/markup/engine/__tests__/remarkup/link-with-tilde.txt
index 5b22225..9f48f60 100644
--- a/src/markup/engine/__tests__/remarkup/link-with-tilde.txt
+++ b/src/markup/engine/__tests__/remarkup/link-with-tilde.txt
@@ -1,5 +1,5 @@
 http://www.example.com/~
 ~~~~~~~~~~
-<p><a href="http://www.example.com/~" target="_blank" rel="noreferrer">http://www.example.com/~</a></p>
+<p><a href="http://www.example.com/~" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/~</a></p>
 ~~~~~~~~~~
 http://www.example.com/~
diff --git a/src/markup/engine/__tests__/remarkup/link.txt b/src/markup/engine/__tests__/remarkup/link.txt
index 112e7c0..903ab48 100644
--- a/src/markup/engine/__tests__/remarkup/link.txt
+++ b/src/markup/engine/__tests__/remarkup/link.txt
@@ -1,5 +1,5 @@
 http://www.example.com/
 ~~~~~~~~~~
-<p><a href="http://www.example.com/" target="_blank" rel="noreferrer">http://www.example.com/</a></p>
+<p><a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com/</a></p>
 ~~~~~~~~~~
 http://www.example.com/
diff --git a/src/markup/engine/__tests__/remarkup/list-alternate-style.txt b/src/markup/engine/__tests__/remarkup/list-alternate-style.txt
index e92272b..420cd89 100644
--- a/src/markup/engine/__tests__/remarkup/list-alternate-style.txt
+++ b/src/markup/engine/__tests__/remarkup/list-alternate-style.txt
@@ -1,15 +1,15 @@
 - a
 -- b
 --- c
 ~~~~~~~~~~
-<ul>
-<li>a<ul>
-<li>b<ul>
-<li>c</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">b<ul class="remarkup-list">
+<li class="remarkup-list-item">c</li>
 </ul></li>
 </ul></li>
 </ul>
 ~~~~~~~~~~
 - a
   - b
     - c
diff --git a/src/markup/engine/__tests__/remarkup/list-blow-stack.txt b/src/markup/engine/__tests__/remarkup/list-blow-stack.txt
index 24e1732..c5b1631 100644
--- a/src/markup/engine/__tests__/remarkup/list-blow-stack.txt
+++ b/src/markup/engine/__tests__/remarkup/list-blow-stack.txt
@@ -1,138 +1,138 @@
 - a
   - a
     - a
       - a
         - a
           - a
             - a
               - a
                 - a
                   - a
                     - a
                       - a
                         - a
                           - a
                             - a
                               - a
                                 - a
                                   - a
                                     - a
                                       - a
                                         - a
                                           - a
                                             - a
                                               - a
                                                 - a
                                                   - a
                                                     - a
                                                       - a
                                                         - a
                                                           - a
                                                             - a
                                                               - a
                                                                 - a
                                                                   - a
                                                                     - a
                                                                       - a
                                                                         - a
                                                                           - a
 
 
 derp
 ~~~~~~~~~~
-<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a<ul>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
-<li>a</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
+<li class="remarkup-list-item">a</li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul></li>
 </ul>
 
 <p>derp</p>
 ~~~~~~~~~~
 - a
   - a
     - a
       - a
         - a
           - a
             - a
               - a
                 - a
                   - a
                     - a
                       - a
                         - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
                           - a
 
 derp
diff --git a/src/markup/engine/__tests__/remarkup/list-checkboxes.txt b/src/markup/engine/__tests__/remarkup/list-checkboxes.txt
index 02b29fa..c48cbf6 100644
--- a/src/markup/engine/__tests__/remarkup/list-checkboxes.txt
+++ b/src/markup/engine/__tests__/remarkup/list-checkboxes.txt
@@ -1,35 +1,35 @@
 - [] a
 - [ ] b
 - [X] c
 - d
 
 [ ] A
 [X] B
   [ ] C
   [ ] D
 
 ~~~~~~~~~~
-<ul class="remarkup-list-with-checkmarks">
-<li class="remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> a</li>
-<li class="remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> b</li>
-<li class="remarkup-checked-item"><input type="checkbox" checked="checked" disabled="disabled" /> c</li>
-<li>d</li>
+<ul class="remarkup-list remarkup-list-with-checkmarks">
+<li class="remarkup-list-item remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> a</li>
+<li class="remarkup-list-item remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> b</li>
+<li class="remarkup-list-item remarkup-checked-item"><input type="checkbox" checked="checked" disabled="disabled" /> c</li>
+<li class="remarkup-list-item">d</li>
 </ul>
 
-<ul class="remarkup-list-with-checkmarks">
-<li class="remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> A</li>
-<li class="remarkup-checked-item"><input type="checkbox" checked="checked" disabled="disabled" /> B<ul class="remarkup-list-with-checkmarks">
-<li class="remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> C</li>
-<li class="remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> D</li>
+<ul class="remarkup-list remarkup-list-with-checkmarks">
+<li class="remarkup-list-item remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> A</li>
+<li class="remarkup-list-item remarkup-checked-item"><input type="checkbox" checked="checked" disabled="disabled" /> B<ul class="remarkup-list remarkup-list-with-checkmarks">
+<li class="remarkup-list-item remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> C</li>
+<li class="remarkup-list-item remarkup-unchecked-item"><input type="checkbox" disabled="disabled" /> D</li>
 </ul></li>
 </ul>
 ~~~~~~~~~~
 [ ] a
 [ ] b
 [X] c
 - d
 
 [ ] A
 [X] B
   [ ] C
   [ ] D
diff --git a/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt b/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt
index be1050f..55bd4c5 100644
--- a/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt
+++ b/src/markup/engine/__tests__/remarkup/list-first-style-wins.txt
@@ -1,19 +1,19 @@
 # item
 - item
 - item
 
 derp
 ~~~~~~~~~~
-<ol>
-<li>item</li>
-<li>item</li>
-<li>item</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
 </ol>
 
 <p>derp</p>
 ~~~~~~~~~~
 1. item
 2. item
 3. item
 
 derp
diff --git a/src/markup/engine/__tests__/remarkup/list-hash.txt b/src/markup/engine/__tests__/remarkup/list-hash.txt
index 92de420..d132309 100644
--- a/src/markup/engine/__tests__/remarkup/list-hash.txt
+++ b/src/markup/engine/__tests__/remarkup/list-hash.txt
@@ -1,19 +1,19 @@
 # item
 # item
 # item
 
 derp
 ~~~~~~~~~~
-<ol>
-<li>item</li>
-<li>item</li>
-<li>item</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
 </ol>
 
 <p>derp</p>
 ~~~~~~~~~~
 1. item
 2. item
 3. item
 
 derp
diff --git a/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt b/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt
index 0164f18..dcd6732 100644
--- a/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt
+++ b/src/markup/engine/__tests__/remarkup/list-mixed-styles.txt
@@ -1,15 +1,15 @@
   - a
   -- b
   --- c
 ~~~~~~~~~~
-<ul>
-<li>a<ul>
-<li>b<ul>
-<li>c</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">b<ul class="remarkup-list">
+<li class="remarkup-list-item">c</li>
 </ul></li>
 </ul></li>
 </ul>
 ~~~~~~~~~~
 - a
   - b
     - c
diff --git a/src/markup/engine/__tests__/remarkup/list-multi.txt b/src/markup/engine/__tests__/remarkup/list-multi.txt
index 8227664..ee7b307 100644
--- a/src/markup/engine/__tests__/remarkup/list-multi.txt
+++ b/src/markup/engine/__tests__/remarkup/list-multi.txt
@@ -1,14 +1,14 @@
 - a
   -- b
   -- c
 ~~~~~~~~~~
-<ul>
-<li>a<ul>
-<li>b</li>
-<li>c</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a<ul class="remarkup-list">
+<li class="remarkup-list-item">b</li>
+<li class="remarkup-list-item">c</li>
 </ul></li>
 </ul>
 ~~~~~~~~~~
 - a
   - b
   - c
diff --git a/src/markup/engine/__tests__/remarkup/list-multiline.txt b/src/markup/engine/__tests__/remarkup/list-multiline.txt
index 4942765..362133a 100644
--- a/src/markup/engine/__tests__/remarkup/list-multiline.txt
+++ b/src/markup/engine/__tests__/remarkup/list-multiline.txt
@@ -1,16 +1,16 @@
 - a
   a
 - b
 b
 ~~~~~~~~~~
-<ul>
-<li>a a</li>
-<li>b</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a a</li>
+<li class="remarkup-list-item">b</li>
 </ul>
 
 <p>b</p>
 ~~~~~~~~~~
 - a a
 - b
 
 b
diff --git a/src/markup/engine/__tests__/remarkup/list-nest.txt b/src/markup/engine/__tests__/remarkup/list-nest.txt
index adcbf8a..9ce4719 100644
--- a/src/markup/engine/__tests__/remarkup/list-nest.txt
+++ b/src/markup/engine/__tests__/remarkup/list-nest.txt
@@ -1,30 +1,30 @@
 - item
   - sub
 - item
   # sub
   # sub
 - item
 
 derp
 ~~~~~~~~~~
-<ul>
-<li>item<ul>
-<li>sub</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">item<ul class="remarkup-list">
+<li class="remarkup-list-item">sub</li>
 </ul></li>
-<li>item<ol>
-<li>sub</li>
-<li>sub</li>
+<li class="remarkup-list-item">item<ol class="remarkup-list">
+<li class="remarkup-list-item">sub</li>
+<li class="remarkup-list-item">sub</li>
 </ol></li>
-<li>item</li>
+<li class="remarkup-list-item">item</li>
 </ul>
 
 <p>derp</p>
 ~~~~~~~~~~
 - item
   - sub
 - item
   1. sub
   2. sub
 - item
 
 derp
diff --git a/src/markup/engine/__tests__/remarkup/list-staircase.txt b/src/markup/engine/__tests__/remarkup/list-staircase.txt
index 7253136..841122c 100644
--- a/src/markup/engine/__tests__/remarkup/list-staircase.txt
+++ b/src/markup/engine/__tests__/remarkup/list-staircase.txt
@@ -1,25 +1,25 @@
     - top
   - mid
 # bot
 
 derp
 ~~~~~~~~~~
-<ol>
-<li class="phantom-item"><ul>
-<li class="phantom-item"><ul>
-<li>top</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item phantom-item"><ul class="remarkup-list">
+<li class="remarkup-list-item phantom-item"><ul class="remarkup-list">
+<li class="remarkup-list-item">top</li>
 </ul></li>
-<li>mid</li>
+<li class="remarkup-list-item">mid</li>
 </ul></li>
-<li>bot</li>
+<li class="remarkup-list-item">bot</li>
 </ol>
 
 <p>derp</p>
 ~~~~~~~~~~
 1.
   -
     - top
   - mid
 2. bot
 
 derp
diff --git a/src/markup/engine/__tests__/remarkup/list-star.txt b/src/markup/engine/__tests__/remarkup/list-star.txt
index af0b430..f86e489 100644
--- a/src/markup/engine/__tests__/remarkup/list-star.txt
+++ b/src/markup/engine/__tests__/remarkup/list-star.txt
@@ -1,19 +1,19 @@
 * item
 * item
 * item
 
 derp
 ~~~~~~~~~~
-<ul>
-<li>item</li>
-<li>item</li>
-<li>item</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
+<li class="remarkup-list-item">item</li>
 </ul>
 
 <p>derp</p>
 ~~~~~~~~~~
 - item
 - item
 - item
 
 derp
diff --git a/src/markup/engine/__tests__/remarkup/list-then-a-list.txt b/src/markup/engine/__tests__/remarkup/list-then-a-list.txt
index 1e8ac6f..f774f54 100644
--- a/src/markup/engine/__tests__/remarkup/list-then-a-list.txt
+++ b/src/markup/engine/__tests__/remarkup/list-then-a-list.txt
@@ -1,15 +1,15 @@
 # one
 
 - a
 ~~~~~~~~~~
-<ol>
-<li>one</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">one</li>
 </ol>
 
-<ul>
-<li>a</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">a</li>
 </ul>
 ~~~~~~~~~~
 1. one
 
 - a
diff --git a/src/markup/engine/__tests__/remarkup/list-vs-codeblock.txt b/src/markup/engine/__tests__/remarkup/list-vs-codeblock.txt
index 5d9f37c..1b51134 100644
--- a/src/markup/engine/__tests__/remarkup/list-vs-codeblock.txt
+++ b/src/markup/engine/__tests__/remarkup/list-vs-codeblock.txt
@@ -1,17 +1,17 @@
 This should be a list:
 
   - apple
   - banana
 
 ~~~~~~~~~~
 <p>This should be a list:</p>
 
-<ul>
-<li>apple</li>
-<li>banana</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">apple</li>
+<li class="remarkup-list-item">banana</li>
 </ul>
 ~~~~~~~~~~
 This should be a list:
 
 - apple
 - banana
diff --git a/src/markup/engine/__tests__/remarkup/list.txt b/src/markup/engine/__tests__/remarkup/list.txt
index 8f22b84..eda8781 100644
--- a/src/markup/engine/__tests__/remarkup/list.txt
+++ b/src/markup/engine/__tests__/remarkup/list.txt
@@ -1,13 +1,13 @@
   - < > & "
 
 text block
 ~~~~~~~~~~
-<ul>
-<li>&lt; &gt; &amp; &quot;</li>
+<ul class="remarkup-list">
+<li class="remarkup-list-item">&lt; &gt; &amp; &quot;</li>
 </ul>
 
 <p>text block</p>
 ~~~~~~~~~~
 - < > & "
 
 text block
diff --git a/src/markup/engine/__tests__/remarkup/monospaced-in-monospaced.txt b/src/markup/engine/__tests__/remarkup/monospaced-in-monospaced.txt
index 45ae1dd..c081b52 100644
--- a/src/markup/engine/__tests__/remarkup/monospaced-in-monospaced.txt
+++ b/src/markup/engine/__tests__/remarkup/monospaced-in-monospaced.txt
@@ -1,18 +1,18 @@
 ##SELECT * FROM `table`##
 
 `SELECT * FROM ##table##`
 
 `**x**`
 
 ~~~~~~~~~~
-<p><tt>SELECT * FROM `table`</tt></p>
+<p><tt class="remarkup-monospaced">SELECT * FROM `table`</tt></p>
 
-<p><tt>SELECT * FROM ##table##</tt></p>
+<p><tt class="remarkup-monospaced">SELECT * FROM ##table##</tt></p>
 
-<p><tt>**x**</tt></p>
+<p><tt class="remarkup-monospaced">**x**</tt></p>
 ~~~~~~~~~~
 ##SELECT * FROM `table`##
 
 `SELECT * FROM ##table##`
 
 `**x**`
diff --git a/src/markup/engine/__tests__/remarkup/monospaced-plural.txt b/src/markup/engine/__tests__/remarkup/monospaced-plural.txt
index 4cb4124..cb78ae9 100644
--- a/src/markup/engine/__tests__/remarkup/monospaced-plural.txt
+++ b/src/markup/engine/__tests__/remarkup/monospaced-plural.txt
@@ -1,11 +1,11 @@
 `Zebra`s
 
 I can`t and I won`t.
 ~~~~~~~~~~
-<p><tt>Zebra</tt>s</p>
+<p><tt class="remarkup-monospaced">Zebra</tt>s</p>
 
 <p>I can`t and I won`t.</p>
 ~~~~~~~~~~
 `Zebra`s
 
 I can`t and I won`t.
diff --git a/src/markup/engine/__tests__/remarkup/monospaced.txt b/src/markup/engine/__tests__/remarkup/monospaced.txt
index 94b809d..4ddc9ae 100644
--- a/src/markup/engine/__tests__/remarkup/monospaced.txt
+++ b/src/markup/engine/__tests__/remarkup/monospaced.txt
@@ -1,5 +1,5 @@
 ##ls --color > /dev/null##
 ~~~~~~~~~~
-<p><tt>ls --color &gt; /dev/null</tt></p>
+<p><tt class="remarkup-monospaced">ls --color &gt; /dev/null</tt></p>
 ~~~~~~~~~~
 ##ls --color > /dev/null##
diff --git a/src/markup/engine/__tests__/remarkup/ordered-list-with-numbers.txt b/src/markup/engine/__tests__/remarkup/ordered-list-with-numbers.txt
index c00cd66..601feca 100644
--- a/src/markup/engine/__tests__/remarkup/ordered-list-with-numbers.txt
+++ b/src/markup/engine/__tests__/remarkup/ordered-list-with-numbers.txt
@@ -1,48 +1,48 @@
 # aasdx
 # asdf
 
 1. asa
  # asdf
 234) asdf
 
 234) asd
 
 1. asd
 234) asd
 
 1/ This explicitly should not be formatted as a list.
 ~~~~~~~~~~
-<ol>
-<li>aasdx</li>
-<li>asdf</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">aasdx</li>
+<li class="remarkup-list-item">asdf</li>
 </ol>
 
-<ol>
-<li>asa<ol>
-<li>asdf</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">asa<ol class="remarkup-list">
+<li class="remarkup-list-item">asdf</li>
 </ol></li>
-<li>asdf</li>
+<li class="remarkup-list-item">asdf</li>
 </ol>
 
 <p>234) asd</p>
 
-<ol>
-<li>asd</li>
-<li>asd</li>
+<ol class="remarkup-list">
+<li class="remarkup-list-item">asd</li>
+<li class="remarkup-list-item">asd</li>
 </ol>
 
 <p>1/ This explicitly should not be formatted as a list.</p>
 ~~~~~~~~~~
 1. aasdx
 2. asdf
 
 1. asa
   1. asdf
 2. asdf
 
 234) asd
 
 1. asd
 2. asd
 
 1/ This explicitly should not be formatted as a list.
diff --git a/src/markup/engine/__tests__/remarkup/percent-block-multiline.txt b/src/markup/engine/__tests__/remarkup/percent-block-multiline.txt
index f19ad47..889bb55 100644
--- a/src/markup/engine/__tests__/remarkup/percent-block-multiline.txt
+++ b/src/markup/engine/__tests__/remarkup/percent-block-multiline.txt
@@ -1,21 +1,21 @@
 **foo**
 %%%- first
 - second
 - third%%%
 [[http://hello | world]]
 ~~~~~~~~~~
 <p><strong>foo</strong></p>
 
 - first
 <br />- second
 <br />- third
 
-<p><a href="http://hello" target="_blank" rel="noreferrer">world</a></p>
+<p><a href="http://hello" class="remarkup-link" target="_blank" rel="noreferrer">world</a></p>
 ~~~~~~~~~~
 **foo**
 
 - first
 - second
 - third
 
 world <http://hello>
diff --git a/src/markup/engine/__tests__/remarkup/reply-nested.txt b/src/markup/engine/__tests__/remarkup/reply-nested.txt
index 1c0e34e..f77ceac 100644
--- a/src/markup/engine/__tests__/remarkup/reply-nested.txt
+++ b/src/markup/engine/__tests__/remarkup/reply-nested.txt
@@ -1,50 +1,50 @@
 >>! Previously, fruit:
 >
 > - Apple
 > - Banana
 > - Cherry
 >
 >>>! More previously, vegetables:
 >>
 >> - Potato
 >> - Potato
 >> - Potato
 >
 > The end.
 
 ~~~~~~~~~~
 <blockquote class="remarkup-reply-block">
 <div class="remarkup-reply-head">Previously, fruit:</div>
-<div class="remarkup-reply-body"><ul>
-<li>Apple</li>
-<li>Banana</li>
-<li>Cherry</li>
+<div class="remarkup-reply-body"><ul class="remarkup-list">
+<li class="remarkup-list-item">Apple</li>
+<li class="remarkup-list-item">Banana</li>
+<li class="remarkup-list-item">Cherry</li>
 </ul>
 
 <blockquote class="remarkup-reply-block">
 <div class="remarkup-reply-head">More previously, vegetables:</div>
-<div class="remarkup-reply-body"><ul>
-<li>Potato</li>
-<li>Potato</li>
-<li>Potato</li>
+<div class="remarkup-reply-body"><ul class="remarkup-list">
+<li class="remarkup-list-item">Potato</li>
+<li class="remarkup-list-item">Potato</li>
+<li class="remarkup-list-item">Potato</li>
 </ul></div>
 </blockquote>
 
 <p>The end.</p></div>
 </blockquote>
 ~~~~~~~~~~
 Previously, fruit:
 
 > - Apple
 > - Banana
 > - Cherry
 >
 > More previously, vegetables:
 >
 > > - Potato
 > > - Potato
 > > - Potato
 >
 >
 > The end.
 
diff --git a/src/markup/engine/__tests__/remarkup/simple-table-with-link.txt b/src/markup/engine/__tests__/remarkup/simple-table-with-link.txt
index 35df4d5..da07098 100644
--- a/src/markup/engine/__tests__/remarkup/simple-table-with-link.txt
+++ b/src/markup/engine/__tests__/remarkup/simple-table-with-link.txt
@@ -1,7 +1,7 @@
 | [[ http://example.com | name ]] | [x] |
 ~~~~~~~~~~
 <table class="remarkup-table">
-<tr><td><a href="http://example.com" target="_blank" rel="noreferrer">name</a></td><td>[x]</td></tr>
+<tr><td><a href="http://example.com" class="remarkup-link" target="_blank" rel="noreferrer">name</a></td><td>[x]</td></tr>
 </table>
 ~~~~~~~~~~
 | name <http://example.com> | [x] |
diff --git a/src/markup/engine/__tests__/remarkup/table.txt b/src/markup/engine/__tests__/remarkup/table.txt
index 091f548..33a462d 100644
--- a/src/markup/engine/__tests__/remarkup/table.txt
+++ b/src/markup/engine/__tests__/remarkup/table.txt
@@ -1,16 +1,16 @@
 <table>
 <tr><th>Table</th><th>Storage</th></tr>
 <tr><td>`differential_diff`</td><td>InnoDB</td></tr>
 <tr><td>`edge`</td><td>?</td></tr>
 </table>
 ~~~~~~~~~~
 <table class="remarkup-table">
 <tr><th>Table</th><th>Storage</th></tr>
-<tr><td><tt>differential_diff</tt></td><td>InnoDB</td></tr>
-<tr><td><tt>edge</tt></td><td>?</td></tr>
+<tr><td><tt class="remarkup-monospaced">differential_diff</tt></td><td>InnoDB</td></tr>
+<tr><td><tt class="remarkup-monospaced">edge</tt></td><td>?</td></tr>
 </table>
 ~~~~~~~~~~
 | Table               | Storage |
 | ------------------- | ------- |
 | `differential_diff` | InnoDB  |
 | `edge`              | ?       |
diff --git a/src/markup/engine/__tests__/remarkup/toc.txt b/src/markup/engine/__tests__/remarkup/toc.txt
index a4d7de6..43448f7 100644
--- a/src/markup/engine/__tests__/remarkup/toc.txt
+++ b/src/markup/engine/__tests__/remarkup/toc.txt
@@ -1,29 +1,29 @@
 = [[ http://www.example.com/ | link_name ]] =
 
 == **bold** ==
 
 = http://www.example.com =
 
 ~~~~~~~~~~
 <ul>
 <li><a href="#http-www-example-com-lin">link_name</a></li>
 <ul>
 <li><a href="#bold"><strong>bold</strong></a></li>
 </ul>
 <li><a href="#http-www-example-com">http://www.example.com</a></li>
 </ul>
 
-<h2><a name="http-www-example-com-lin"></a><a href="http://www.example.com/" target="_blank" rel="noreferrer">link_name</a></h2>
+<h2 class="remarkup-header"><a name="http-www-example-com-lin"></a><a href="http://www.example.com/" class="remarkup-link" target="_blank" rel="noreferrer">link_name</a></h2>
 
-<h3><a name="bold"></a><strong>bold</strong></h3>
+<h3 class="remarkup-header"><a name="bold"></a><strong>bold</strong></h3>
 
-<h2><a name="http-www-example-com"></a><a href="http://www.example.com" target="_blank" rel="noreferrer">http://www.example.com</a></h2>
+<h2 class="remarkup-header"><a name="http-www-example-com"></a><a href="http://www.example.com" class="remarkup-link" target="_blank" rel="noreferrer">http://www.example.com</a></h2>
 ~~~~~~~~~~
 [[ http://www.example.com/ | link_name ]]
 =========================================
 
 **bold**
 --------
 
 http://www.example.com
 ======================
diff --git a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHeaderBlockRule.php b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHeaderBlockRule.php
index b9b09a1..fdfc34f 100644
--- a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHeaderBlockRule.php
+++ b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHeaderBlockRule.php
@@ -1,164 +1,166 @@
 <?php
 
 /**
  * @group markup
  */
 final class PhutilRemarkupEngineRemarkupHeaderBlockRule
   extends PhutilRemarkupEngineBlockRule {
 
   public function getMatchingLineCount(array $lines, $cursor) {
     $num_lines = 0;
     if (preg_match('/^(={1,5}).*+$/', $lines[$cursor])) {
       $num_lines = 1;
     } else {
       if (isset($lines[$cursor + 1])) {
         $line = $lines[$cursor].$lines[$cursor + 1];
         if (preg_match('/^([^\n]+)\n[-=]{2,}\s*$/', $line)) {
           $num_lines = 2;
           $cursor++;
         }
       }
     }
 
     if ($num_lines) {
       $cursor++;
       while (isset($lines[$cursor]) && !strlen(trim($lines[$cursor]))) {
         $num_lines++;
         $cursor++;
       }
     }
 
     return $num_lines;
   }
 
   const KEY_HEADER_TOC = 'headers.toc';
 
   public function markupText($text, $children) {
     $text = trim($text);
 
     $lines = phutil_split_lines($text);
     if (count($lines) > 1) {
       $level = ($lines[1][0] == '=') ? 1 : 2;
       $text = trim($lines[0]);
     } else {
       $level = 0;
       for ($ii = 0; $ii < min(5, strlen($text)); $ii++) {
         if ($text[$ii] == '=') {
           ++$level;
         } else {
           break;
         }
       }
       $text = trim($text, ' =');
     }
 
     $engine = $this->getEngine();
 
     if ($engine->isTextMode()) {
       $char = ($level == 1) ? '=' : '-';
       return $text."\n".str_repeat($char, phutil_utf8_strlen($text));
     }
 
     $use_anchors = $engine->getConfig('header.generate-toc');
 
     $anchor = null;
     if ($use_anchors) {
       $anchor = $this->generateAnchor($level, $text);
     }
 
     $text = phutil_tag(
       'h'.($level + 1),
-      array(),
+      array(
+        'class' => 'remarkup-header',
+      ),
       array($anchor, $this->applyRules($text)));
 
     return $text;
   }
 
   private function generateAnchor($level, $text) {
     $anchor = strtolower($text);
     $anchor = preg_replace('/[^a-z0-9]/', '-', $anchor);
     $anchor = preg_replace('/--+/', '-', $anchor);
     $anchor = trim($anchor, '-');
     $anchor = substr($anchor, 0, 24);
     $anchor = trim($anchor, '-');
     $base = $anchor;
 
     $key = self::KEY_HEADER_TOC;
     $engine = $this->getEngine();
     $anchors = $engine->getTextMetadata($key, array());
 
     $suffix = 1;
     while (!strlen($anchor) || isset($anchors[$anchor])) {
       $anchor = $base.'-'.$suffix;
       $anchor = trim($anchor, '-');
       $suffix++;
     }
 
     // When a document contains a link inside a header, like this:
     //
     //  = [[ http://wwww.example.com/ | example ]] =
     //
     // ...we want to generate a TOC entry with just "example", but link the
     // header itself. We push the 'toc' state so all the link rules generate
     // just names.
     $engine->pushState('toc');
       $text = $this->applyRules($text);
       $text = $engine->restoreText($text);
 
       $anchors[$anchor] = array($level, $text);
     $engine->popState('toc');
 
     $engine->setTextMetadata($key, $anchors);
 
     return phutil_tag(
       'a',
       array(
         'name' => $anchor,
       ),
       '');
   }
 
   public static function renderTableOfContents(PhutilRemarkupEngine $engine) {
 
     $key = self::KEY_HEADER_TOC;
     $anchors = $engine->getTextMetadata($key, array());
 
     if (count($anchors) < 2) {
       // Don't generate a TOC if there are no headers, or if there's only
       // one header (since such a TOC would be silly).
       return null;
     }
 
     $depth = 0;
     $toc = array();
     foreach ($anchors as $anchor => $info) {
       list($level, $name) = $info;
 
       while ($depth < $level) {
         $toc[] = hsprintf('<ul>');
         $depth++;
       }
       while ($depth > $level) {
         $toc[] = hsprintf('</ul>');
         $depth--;
       }
 
       $toc[] = phutil_tag(
         'li',
         array(),
         phutil_tag(
           'a',
           array(
             'href' => '#'.$anchor,
           ),
           $name));
     }
     while ($depth > 0) {
       $toc[] = hsprintf('</ul>');
       $depth--;
     }
 
     return phutil_implode_html("\n", $toc);
   }
 
 }
diff --git a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule.php b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule.php
index fa447c7..7343339 100644
--- a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule.php
+++ b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule.php
@@ -1,37 +1,37 @@
 <?php
 
 /**
  * @group markup
  */
 final class PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule
   extends PhutilRemarkupEngineBlockRule {
 
   /**
    * This rule executes at priority `300`, so it can preempt the list block
    * rule and claim blocks which begin `---`.
    */
   public function getPriority() {
     return 300;
   }
 
   public function getMatchingLineCount(array $lines, $cursor) {
     $num_lines = 0;
     $pattern = '/^_{3,}$|^\*\s?\*\s?\*(\s|\*)*$|^\-\s?\-\s?\-(\s|\-)*$/';
     if (preg_match($pattern, rtrim($lines[$cursor], "\n\r"))) {
       $num_lines++;
       $cursor++;
       while (isset($lines[$cursor]) && !strlen(trim($lines[$cursor]))) {
         $num_lines++;
         $cursor++;
       }
     }
 
     return $num_lines;
   }
 
   public function markupText($text, $children) {
-    return phutil_tag('hr', array());
+    return phutil_tag('hr', array('class' => 'remarkup-hr'));
   }
 
 
 }
diff --git a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php
index 741d5bc..ad2cc90 100644
--- a/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php
+++ b/src/markup/engine/remarkup/blockrule/PhutilRemarkupEngineRemarkupListBlockRule.php
@@ -1,479 +1,485 @@
 <?php
 
 /**
  * @group markup
  */
 final class PhutilRemarkupEngineRemarkupListBlockRule
   extends PhutilRemarkupEngineBlockRule {
 
   /**
    * This rule must apply before the Code block rule because it needs to
    * win blocks which begin `  - Lorem ipsum`.
    */
   public function getPriority() {
     return 400;
   }
 
   public function getMatchingLineCount(array $lines, $cursor) {
     $num_lines = 0;
 
     while (isset($lines[$cursor])) {
       if (!$num_lines) {
         if (preg_match(self::START_BLOCK_PATTERN, $lines[$cursor])) {
           $num_lines++;
           $cursor++;
           continue;
         }
       } else {
         if (preg_match(self::CONT_BLOCK_PATTERN, $lines[$cursor])) {
           $num_lines++;
           $cursor++;
           continue;
         }
 
         if (strlen(trim($lines[$cursor]))
           && strlen($lines[$cursor]) !== strlen(ltrim($lines[$cursor]))) {
           $num_lines++;
           $cursor++;
           continue;
         }
 
         if (!strlen(trim($lines[$cursor]))) {
           $num_lines++;
         }
       }
 
       break;
     }
 
     return $num_lines;
   }
 
   /**
    * The maximum sub-list depth you can nest to. Avoids silliness and blowing
    * the stack.
    */
   const MAXIMUM_LIST_NESTING_DEPTH = 12;
   const START_BLOCK_PATTERN = '@^\s*(?:[-*#]+|1[.)]|\[.?\])\s+@';
   const CONT_BLOCK_PATTERN = '@^\s*(?:[-*#]+|[0-9]+[.)]|\[.?\])\s+@';
   const STRIP_BLOCK_PATTERN = '@^\s*(?:[-*#]+|[0-9]+[.)])\s*@';
 
   public function markupText($text, $children) {
 
     $items = array();
     $lines = explode("\n", $text);
 
     // We allow users to delimit lists using either differing indentation
     // levels:
     //
     //   - a
     //     - b
     //
     // ...or differing numbers of item-delimiter characters:
     //
     //   - a
     //   -- b
     //
     // If they use the second style but block-indent the whole list, we'll
     // get the depth counts wrong for the first item. To prevent this,
     // un-indent every item by the minimum indentation level for the whole
     // block before we begin parsing.
 
     $regex = self::START_BLOCK_PATTERN;
     $min_space = PHP_INT_MAX;
     foreach ($lines as $ii => $line) {
       $matches = null;
       if (preg_match($regex, $line)) {
         $regex = self::CONT_BLOCK_PATTERN;
         if (preg_match('/^(\s+)/', $line, $matches)) {
           $space = strlen($matches[1]);
         } else {
           $space = 0;
         }
         $min_space = min($min_space, $space);
       }
     }
 
     $regex = self::START_BLOCK_PATTERN;
     if ($min_space) {
       foreach ($lines as $key => $line) {
         if (preg_match($regex, $line)) {
           $regex = self::CONT_BLOCK_PATTERN;
           $lines[$key] = substr($line, $min_space);
         }
       }
     }
 
 
     // The input text may have linewraps in it, like this:
     //
     //   - derp derp derp derp
     //     derp derp derp derp
     //   - blarp blarp blarp blarp
     //
     // Group text lines together into list items, stored in $items. So the
     // result in the above case will be:
     //
     //   array(
     //     array(
     //       "- derp derp derp derp",
     //       "  derp derp derp derp",
     //     ),
     //     array(
     //       "- blarp blarp blarp blarp",
     //     ),
     //   );
 
     $item = array();
     $regex = self::START_BLOCK_PATTERN;
     foreach ($lines as $line) {
       if (preg_match($regex, $line)) {
         $regex = self::CONT_BLOCK_PATTERN;
         if ($item) {
           $items[] = $item;
           $item = array();
         }
       }
       $item[] = $line;
     }
     if ($item) {
       $items[] = $item;
     }
 
 
     // Process each item to normalize the text, remove line wrapping, and
     // determine its depth (indentation level) and style (ordered vs unordered).
     //
     // Given the above example, the processed array will look like:
     //
     //   array(
     //     array(
     //       'text'  => 'derp derp derp derp derp derp derp derp',
     //       'depth' => 0,
     //       'style' => '-',
     //     ),
     //     array(
     //       'text'  => 'blarp blarp blarp blarp',
     //       'depth' => 0,
     //       'style' => '-',
     //     ),
     //   );
 
     $has_marks = false;
     foreach ($items as $key => $item) {
       $item = preg_replace('/\s*\n\s*/', ' ', implode("\n", $item));
       $item = rtrim($item);
 
       if (!strlen($item)) {
         unset($items[$key]);
         continue;
       }
 
       $matches = null;
       if (preg_match('/^\s*([-*#]{2,})/', $item, $matches)) {
         // Alternate-style indents; use number of list item symbols.
         $depth = strlen($matches[1]) - 1;
       } else if (preg_match('/^(\s+)/', $item, $matches)) {
         // Markdown-style indents; use indent depth.
         $depth = strlen($matches[1]);
       } else {
         $depth = 0;
       }
 
       if (preg_match('/^\s*(?:#|[0-9])/', $item)) {
         $style = '#';
       } else {
         $style = '-';
       }
 
       // Strip leading indicators off the item.
       $text = preg_replace(self::STRIP_BLOCK_PATTERN, '', $item);
 
       // Look for "[]", "[ ]", "[*]", "[x]", etc., which we render as a
       // checkbox.
       $mark = null;
       $matches = null;
       if (preg_match('/^\s*\[(.?)\]\s*/', $text, $matches)) {
         if (strlen(trim($matches[1]))) {
           $mark = true;
         } else {
           $mark = false;
         }
         $has_marks = true;
         $text = substr($text, strlen($matches[0]));
       }
 
       $items[$key] = array(
         'text'  => $text,
         'depth' => $depth,
         'style' => $style,
         'mark'  => $mark,
       );
     }
     $items = array_values($items);
 
 
     // Users can create a sub-list by indenting any deeper amount than the
     // previous list, so these are both valid:
     //
     //   - a
     //     - b
     //
     //   - a
     //       - b
     //
     // In the former case, we'll have depths (0, 2). In the latter case, depths
     // (0, 4). We don't actually care about how many spaces there are, only
     // how many list indentation levels (that is, we want to map both of
     // those cases to (0, 1), indicating "outermost list" and "first sublist").
     //
     // This is made more complicated because lists at two different indentation
     // levels might be at the same list level:
     //
     //   - a
     //     - b
     //   - c
     //       - d
     //
     // Here, 'b' and 'd' are at the same list level (2) but different indent
     // levels (2, 4).
     //
     // Users can also create "staircases" like this:
     //
     //       - a
     //     - b
     //   # c
     //
     // While this is silly, we'd like to render it as faithfully as possible.
     //
     // In order to do this, we convert the list of nodes into a tree,
     // normalizing indentation levels and inserting dummy nodes as necessary to
     // make the tree well-formed. See additional notes at buildTree().
     //
     // In the case above, the result is a tree like this:
     //
     //   - <null>
     //     - <null>
     //       - a
     //     - b
     //   # c
 
     $l = 0;
     $r = count($items);
     $tree = $this->buildTree($items, $l, $r, $cur_level = 0);
 
 
     // We may need to open a list on a <null> node, but they do not have
     // list style information yet. We need to propagate list style inforamtion
     // backward through the tree. In the above example, the tree now looks
     // like this:
     //
     //   - <null (style=#)>
     //     - <null (style=-)>
     //       - a
     //     - b
     //   # c
 
     $this->adjustTreeStyleInformation($tree);
 
     // Finally, we have enough information to render the tree.
 
     $out = $this->renderTree($tree, 0, $has_marks);
 
     if ($this->getEngine()->isTextMode()) {
       $out = implode('', $out);
       $out = rtrim($out, "\n");
       $out = preg_replace('/ +$/m', '', $out);
       return $out;
     }
 
     return phutil_implode_html('', $out);
   }
 
   /**
    * See additional notes in markupText().
    */
   private function buildTree(array $items, $l, $r, $cur_level) {
     if ($l == $r) {
       return array();
     }
 
     if ($cur_level > self::MAXIMUM_LIST_NESTING_DEPTH) {
       // This algorithm is recursive and we don't need you blowing the stack
       // with your oh-so-clever 50,000-item-deep list. Cap indentation levels
       // at a reasonable number and just shove everything deeper up to this
       // level.
       $nodes = array();
       for ($ii = $l; $ii < $r; $ii++) {
         $nodes[] = array(
           'level' => $cur_level,
           'items' => array(),
         ) + $items[$ii];
       }
       return $nodes;
     }
 
     $min = $l;
     for ($ii = $r - 1; $ii >= $l; $ii--) {
       if ($items[$ii]['depth'] < $items[$min]['depth']) {
         $min = $ii;
       }
     }
 
     $min_depth = $items[$min]['depth'];
 
     $nodes = array();
     if ($min != $l) {
       $nodes[] = array(
         'text'    => null,
         'level'   => $cur_level,
         'style'   => null,
         'mark'    => null,
         'items'   => $this->buildTree($items, $l, $min, $cur_level + 1),
       );
     }
 
     $last = $min;
     for ($ii = $last + 1; $ii < $r; $ii++) {
       if ($items[$ii]['depth'] == $min_depth) {
         $nodes[] = array(
           'level' => $cur_level,
           'items' => $this->buildTree($items, $last + 1, $ii, $cur_level + 1),
         ) + $items[$last];
         $last = $ii;
       }
     }
     $nodes[] = array(
       'level' => $cur_level,
       'items' => $this->buildTree($items, $last + 1, $r, $cur_level + 1),
     ) + $items[$last];
 
     return $nodes;
   }
 
 
   /**
    * See additional notes in markupText().
    */
   private function adjustTreeStyleInformation(array &$tree) {
 
     // The effect here is just to walk backward through the nodes at this level
     // and apply the first style in the list to any empty nodes we inserted
     // before it. As we go, also recurse down the tree.
 
     $style = '-';
     for ($ii = count($tree) - 1; $ii >= 0; $ii--) {
       if ($tree[$ii]['style'] !== null) {
         // This is the earliest node we've seen with style, so set the
         // style to its style.
         $style = $tree[$ii]['style'];
       } else {
         // This node has no style, so apply the current style.
         $tree[$ii]['style'] = $style;
       }
       if ($tree[$ii]['items']) {
         $this->adjustTreeStyleInformation($tree[$ii]['items']);
       }
     }
   }
 
 
   /**
    * See additional notes in markupText().
    */
   private function renderTree(array $tree, $level, $has_marks) {
     $style = idx(head($tree), 'style');
 
     $out = array();
 
     if (!$this->getEngine()->isTextMode()) {
       switch ($style) {
         case '#':
           $tag = 'ol';
           break;
         case '-':
           $tag = 'ul';
           break;
       }
 
       if ($has_marks) {
-        $out[] = hsprintf('<%s class="remarkup-list-with-checkmarks">', $tag);
+        $out[] = hsprintf(
+          '<%s class="remarkup-list remarkup-list-with-checkmarks">',
+          $tag);
       } else {
-        $out[] = hsprintf('<%s>', $tag);
+        $out[] = hsprintf(
+          '<%s class="remarkup-list">',
+          $tag);
       }
 
       $out[] = "\n";
     }
 
     $number = 1;
     foreach ($tree as $item) {
       if ($this->getEngine()->isTextMode()) {
         $out[] = str_repeat(' ', 2 * $level);
         if ($item['mark'] !== null) {
           if ($item['mark']) {
             $out[] = '[X] ';
           } else {
             $out[] = '[ ] ';
           }
         } else {
           switch ($style) {
             case '#':
               $out[] = $number.'. ';
               $number++;
               break;
             case '-':
               $out[] = '- ';
               break;
           }
         }
         $out[] = $this->applyRules($item['text'])."\n";
       } else if ($item['text'] === null) {
-        $out[] = hsprintf('<li class="phantom-item">');
+        $out[] = hsprintf('<li class="remarkup-list-item phantom-item">');
       } else {
         if ($item['mark'] !== null) {
           if ($item['mark'] == true) {
-            $out[] = hsprintf('<li class="remarkup-checked-item">');
+            $out[] = hsprintf(
+              '<li class="remarkup-list-item remarkup-checked-item">');
           } else {
-            $out[] = hsprintf('<li class="remarkup-unchecked-item">');
+            $out[] = hsprintf(
+              '<li class="remarkup-list-item remarkup-unchecked-item">');
           }
           $out[] = phutil_tag(
             'input',
             array(
               'type' => 'checkbox',
               'checked' => ($item['mark'] ? 'checked' : null),
               'disabled' => 'disabled',
             ));
           $out[] = ' ';
         } else {
-          $out[] = hsprintf('<li>');
+          $out[] = hsprintf('<li class="remarkup-list-item">');
         }
 
         $out[] = $this->applyRules($item['text']);
       }
       if ($item['items']) {
         $subitems = $this->renderTree($item['items'], $level + 1, $has_marks);
         foreach ($subitems as $i) {
           $out[] = $i;
         }
       }
       if (!$this->getEngine()->isTextMode()) {
         $out[] = hsprintf("</li>\n");
       }
     }
 
     if (!$this->getEngine()->isTextMode()) {
       switch ($style) {
         case '#':
           $out[] = hsprintf('</ol>');
           break;
         case '-':
           $out[] = hsprintf('</ul>');
           break;
       }
     }
 
     return $out;
   }
 
 
 }
diff --git a/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleDocumentLink.php b/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleDocumentLink.php
index ee33577..7ff0f23 100644
--- a/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleDocumentLink.php
+++ b/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleDocumentLink.php
@@ -1,126 +1,127 @@
 <?php
 
 /**
  * @group markup
  */
 final class PhutilRemarkupRuleDocumentLink
   extends PhutilRemarkupRule {
 
   public function getPriority() {
     return 300.0;
   }
 
   public function apply($text) {
 
     // Handle mediawiki-style links: [[ href | name ]]
     $text = preg_replace_callback(
       '@\B\\[\\[([^|\\]]+)(?:\\|([^\\]]+))?\\]\\]\B@U',
       array($this, 'markupDocumentLink'),
       $text);
 
     // Handle markdown-style links: [name](href)
     $text = preg_replace_callback(
       '@\B\\[([^\\]]+)\\]\\(([^\\)]+)\\)\B@U',
       array($this, 'markupAlternateLink'),
       $text);
 
     return $text;
   }
 
   protected function renderHyperlink($link, $name) {
     if ($this->getEngine()->isTextMode()) {
       $text = $link;
       if (strncmp($link, '/', 1) == 0 || strncmp($link, '#', 1) == 0) {
         $base = $this->getEngine()->getConfig('uri.prefix');
         if (strncmp($link, '/', 1) == 0) {
           $base = rtrim($base, '/');
         }
         $text = $base.$text;
       }
 
       // If present, strip off "mailto:".
       $text = preg_replace('/^mailto:/', '', $text);
 
       if ($link == $name) {
         return $text;
       }
       return $name.' <'.$text.'>';
     }
 
     // By default, we open links in a new window or tab. For anchors on the same
     // page, just jump normally.
     $target = '_blank';
     if (strncmp($link, '#', 1) == 0) {
       $target = null;
     }
 
     $name = preg_replace('/^mailto:/', '', $name);
 
     if ($this->getEngine()->getState('toc')) {
       return $name;
     } else {
       return phutil_tag(
         'a',
         array(
           'href'    => $link,
+          'class'   => 'remarkup-link',
           'target'  => $target,
         ),
         $name);
     }
   }
 
   public function markupAlternateLink($matches) {
     $uri = trim($matches[2]);
 
     // NOTE: We apply some special rules to avoid false positives here. The
     // major concern is that we do not want to convert `x[0][1](y)` in a
     // discussion about C source code into a link. To this end, we:
     //
     //   - Don't match at word boundaries;
     //   - require the URI to contain a "/" character or "@" character; and
     //   - reject URIs which being with a quote character.
 
     if ($uri[0] == '"' || $uri[0] == "'" || $uri[0] == '`') {
       return $matches[0];
     }
 
     if (strpos($uri, '/') === false &&
         strpos($uri, '@') === false) {
       return $matches[0];
     }
 
     return $this->markupDocumentLink(
       array(
         $matches[0],
         $matches[2],
         $matches[1],
       ));
   }
 
   public function markupDocumentLink($matches) {
     $uri = trim($matches[1]);
     $name = trim(idx($matches, 2, $uri));
 
     // If whatever is being linked to begins with "/" or "#", or has "://",
     // or is "mailto:", treat it as a URI instead of a wiki page.
     $is_uri = preg_match('@(^/)|(://)|(^#)|(^mailto:)@', $uri);
 
     if ($is_uri && strncmp('/', $uri, 1) && strncmp('#', $uri, 1)) {
       $protocols = $this->getEngine()->getConfig(
         'uri.allowed-protocols',
         array());
       $protocol = id(new PhutilURI($uri))->getProtocol();
       if (!idx($protocols, $protocol)) {
         // Don't treat this as a URI if it's not an allowed protocol.
         $is_uri = false;
       }
     }
 
     if (!$is_uri) {
       return $matches[0];
     }
 
     return $this->getEngine()->storeText($this->renderHyperlink($uri, $name));
   }
 
 }
diff --git a/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleHyperlink.php b/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleHyperlink.php
index 5f2b956..7eb1d06 100644
--- a/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleHyperlink.php
+++ b/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleHyperlink.php
@@ -1,105 +1,106 @@
 <?php
 
 /**
  * @group markup
  * @concrete-extensible (TODO only needed by Facebook at the moment)
  */
 class PhutilRemarkupRuleHyperlink
   extends PhutilRemarkupRule {
 
   public function getPriority() {
     return 400.0;
   }
 
   public function apply($text) {
 
     // Hyperlinks with explicit "<>" around them get linked exactly, without
     // the "<>". Angle brackets are basically special and mean "this is a URL
     // with weird characters". This is assumed to be reasonable because they
     // don't appear in normal text or normal URLs.
     $text = preg_replace_callback(
       '@<(\w{3,}://[^\s'.PhutilRemarkupBlockStorage::MAGIC_BYTE.']+?)>@',
       array($this, 'markupHyperlink'),
       $text);
 
     // Anything else we match "ungreedily", which means we'll look for
     // stuff that's probably puncutation or otherwise not part of the URL and
     // not link it. This lets someone write "QuicK! Go to
     // http://www.example.com/!". We also apply some paren balancing rules.
 
     // NOTE: We're explicitly avoiding capturing stored blocks, so text like
     // `http://www.example.com/[[x | y]]` doesn't get aggressively captured.
     $text = preg_replace_callback(
       '@(\w{3,}://[^\s'.PhutilRemarkupBlockStorage::MAGIC_BYTE.']+)@',
       array($this, 'markupHyperlinkUngreedy'),
       $text);
 
     return $text;
   }
 
   protected function markupHyperlink($matches) {
 
     $protocols = $this->getEngine()->getConfig(
       'uri.allowed-protocols',
       array());
 
     $protocol = id(new PhutilURI($matches[1]))->getProtocol();
     if (!idx($protocols, $protocol)) {
       // If this URI doesn't use a whitelisted protocol, don't link it. This
       // is primarily intended to prevent javascript:// silliness.
       return $this->getEngine()->storeText($matches[1]);
     }
 
     return $this->storeRenderedHyperlink($matches[1]);
   }
 
   protected function storeRenderedHyperlink($link) {
     return $this->getEngine()->storeText($this->renderHyperlink($link));
   }
 
   protected function renderHyperlink($link) {
     if ($this->getEngine()->isTextMode()) {
       return $link;
     }
 
     if ($this->getEngine()->getState('toc')) {
       return $link;
     } else {
       return phutil_tag(
         'a',
         array(
           'href'    => $link,
+          'class'   => 'remarkup-link',
           'target'  => '_blank',
         ),
         $link);
     }
   }
 
   protected function markupHyperlinkUngreedy($matches) {
     $match = $matches[1];
     $tail = null;
     $trailing = null;
     if (preg_match('/[;,.:!?]+$/', $match, $trailing)) {
       $tail = $trailing[0];
       $match = substr($match, 0, -strlen($tail));
     }
 
     // If there's a closing paren at the end but no balancing open paren in
     // the URL, don't link the close paren. This is an attempt to gracefully
     // handle the two common paren cases, Wikipedia links and English language
     // parentheticals, e.g.:
     //
     //  http://en.wikipedia.org/wiki/Noun_(disambiguation)
     //  (see also http://www.example.com)
     //
     // We could apply a craftier heuristic here which tries to actually balance
     // the parens, but this is probably sufficient.
     if (preg_match('/\\)$/', $match) && !preg_match('/\\(/', $match)) {
       $tail = ')'.$tail;
       $match = substr($match, 0, -1);
     }
 
     return hsprintf('%s%s', $this->markupHyperlink(array(null, $match)), $tail);
   }
 
 }
diff --git a/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleMonospace.php b/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleMonospace.php
index 9376f98..43ecfe6 100644
--- a/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleMonospace.php
+++ b/src/markup/engine/remarkup/markuprule/PhutilRemarkupRuleMonospace.php
@@ -1,38 +1,43 @@
 <?php
 
 /**
  * @group markup
  */
 final class PhutilRemarkupRuleMonospace
   extends PhutilRemarkupRule {
 
   public function getPriority() {
     return 100.0;
   }
 
   public function apply($text) {
     // NOTE: We don't require a trailing non-boundary on the backtick syntax,
     // to permit the use case of naming and pluralizing a class, like
     // "Load all the `PhutilArray`s and then iterate over them." In theory, the
     // required \B on the leading backtick should protect us from most
     // collateral damage.
 
     return preg_replace_callback(
       '@##([\s\S]+?)##|\B`(.+?)`@',
       array($this, 'markupMonospacedText'),
       $text);
   }
 
   protected function markupMonospacedText($matches) {
     if ($this->getEngine()->isTextMode()) {
       $result = $matches[0];
 
     } else {
       $match = isset($matches[2]) ? $matches[2] : $matches[1];
-      $result = phutil_tag('tt', array(), $match);
+      $result = phutil_tag(
+        'tt',
+        array(
+          'class' => 'remarkup-monospaced',
+        ),
+        $match);
     }
 
     return $this->getEngine()->storeText($result);
   }
 
 }