diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html
index f275e7e..7743069 100644
--- a/themes/compact/src/compact-html.html
+++ b/themes/compact/src/compact-html.html
@@ -12,16 +12,16 @@
       <header>
         <h1>{{ r.name }}</h1>
         <div id="contact">
-          {% if (r.contact.email) { %}<div class="email"><a href="mailto:{{ r.contact.email }}">{{ r.contact.email }}</a></div>{% } %}
+          {% if (r.contact.email) { %}<div class="email"><a href="mailto:{{ RAW.contact.email }}">{{ RAW.contact.email }}</a></div>{% } %}
           {% if (r.contact.phone) { %}<div class="phone">{{ r.contact.phone }}</div>{% } %}
-          {% if (r.contact.website) { %}<div class="website"><a href="{{ r.contact.website }}">{{ r.contact.website }}</a></div>{% } %}
+          {% if (r.contact.website) { %}<div class="website"><a href="{{ RAW.contact.website }}">{{ RAW.contact.website }}</a></div>{% } %}
         </div>
       </header>
 
 
 {% if ( r.info.brief && r.info.brief.length ) { %}
       <section id="summary">
-        {{ r.info.brief|md }}
+        {{ r.info.brief }}
       </section>
 {% } %}
 
@@ -63,11 +63,11 @@
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
           {% if( idx < 4 ) { %}
             <h3><em>{{ proj.position }}</em>, {{ filt.link( proj.employer, proj.url ) }} <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }} &mdash; {{ proj.safe.end.format('YYYY-MM') }}<span></h3>
-            <p style="clear: both;">{{ proj.summary|md }}</p>
+            <p style="clear: both;">{{ proj.summary }}</p>
             {% if( proj.highlights ) { %}
               <ul>
               {% proj.highlights.forEach( function( high, idx, ar) { %}
-                <li>{{ high|mdin }}</li>
+                <li>{{ high }}</li>
               {% }); %}
               </ul>
             {% } %}
@@ -116,11 +116,11 @@
         </header>
         {% r.service.history.forEach( function( vol, idx, ar ) { %}
           <h3><em>{{ vol.position }}</em>, {{ filt.link(vol.organization, vol.url) }} <span class="tenure">{{ vol.safe.start.format('YYYY') }} &mdash; {{ vol.safe.end.format('YYYY') }}<span></h3>
-          <p style="clear: both;">{{ vol.summary|md }}</p>
+          <p style="clear: both;">{{ vol.summary }}</p>
           {% if( vol.highlights ) { %}
             <ul>
             {% vol.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|md }}</li>
+              <li>{{ high }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -137,7 +137,7 @@
         {% r.writing.forEach( function( pub, idx, ar ) { %}
           <h3><em>{{ filt.link( pub.title, pub.url ) }}</em>, {{ pub.publisher }} <span class="tenure">{{ pub.safe.date.format('YYYY') }}</span></h3>
 
-        {% if (pub.summary) { %}{{ pub.summary|md }}{% } %}
+        {% if (pub.summary) { %}{{ pub.summary }}{% } %}
 
         {% }); %}
       </section>
@@ -150,7 +150,7 @@
         </header>
         {% r.recognition.forEach( function( award, idx, ar) { %}
           <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }} <span class="tenure">{{ award.safe.date.format('YYYY') }}</span></h4>
-          {{ award.summary|md }}
+          {{ award.summary }}
         {% }); %}
       </section>
 {% } %}
diff --git a/themes/compact/src/compact-pdf.html b/themes/compact/src/compact-pdf.html
index e29bc72..44a2c21 100644
--- a/themes/compact/src/compact-pdf.html
+++ b/themes/compact/src/compact-pdf.html
@@ -22,7 +22,7 @@
 
 {% if ( r.info.brief && r.info.brief.length ) { %}
       <section id="summary">
-        {{ r.info.brief|md }}
+        {{ r.info.brief }}
       </section>
 {% } %}
 
@@ -64,11 +64,11 @@
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
           {% if( idx < 4 ) { %}
             <h3><em>{{ proj.position }}</em>, {{ filt.link( proj.employer, proj.url ) }} <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }} &mdash; {{ proj.safe.end.format('YYYY-MM') }}<span></h3>
-            <p style="clear: both;">{{ proj.summary|md }}</p>
+            <p style="clear: both;">{{ proj.summary }}</p>
             {% if( proj.highlights ) { %}
               <ul>
               {% proj.highlights.forEach( function( high, idx, ar) { %}
-                <li>{{ high|mdin }}</li>
+                <li>{{ high }}</li>
               {% }); %}
               </ul>
             {% } %}
@@ -116,12 +116,12 @@
         <h2><span class="fa fa-child" style="vertical-align: top;"></span> Service</h2><hr>
         </header>
         {% r.service.history.forEach( function( vol, idx, ar ) { %}
-          <h3>{{ filt.link(vol.organization, vol.url) }} <span class="tenure">{{ vol.safe.start.format('YYYY') }} &mdash; {{ vol.safe.end.format('YYYY') }}<span></h3>
-          <p style="clear: both;">{{ vol.summary|md }}</p>
+          <h3><em>{{ vol.position }}</em>, {{ filt.link(vol.organization, vol.url) }} <span class="tenure">{{ vol.safe.start.format('YYYY') }} &mdash; {{ vol.safe.end.format('YYYY') }}<span></h3>
+          <p style="clear: both;">{{ vol.summary }}</p>
           {% if( vol.highlights ) { %}
             <ul>
             {% vol.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|md }}</li>
+              <li>{{ high }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -138,7 +138,7 @@
         {% r.writing.forEach( function( pub, idx, ar ) { %}
           <h3><em>{{ filt.link( pub.title, pub.url ) }}</em>, {{ pub.publisher }} <span class="tenure">{{ pub.safe.date.format('YYYY') }}</span></h3>
 
-        {% if (pub.summary) { %}{{ pub.summary|md }}{% } %}
+        {% if (pub.summary) { %}{{ pub.summary }}{% } %}
 
         {% }); %}
       </section>
@@ -151,7 +151,7 @@
         </header>
         {% r.recognition.forEach( function( award, idx, ar) { %}
           <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }} <span class="tenure">{{ award.safe.date.format('YYYY') }}</span></h4>
-          {{ award.summary|md }}
+          {{ award.summary }}
         {% }); %}
       </section>
 {% } %}
diff --git a/themes/minimist/src/doc.xml b/themes/minimist/src/doc.xml
index 11fe7a2..ac518ed 100644
--- a/themes/minimist/src/doc.xml
+++ b/themes/minimist/src/doc.xml
@@ -10,8 +10,8 @@ engine: Underscore
 <w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
   <w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
   <o:DocumentProperties>
-    <o:Author>{{ r.name|xml }}</o:Author>
-    <o:LastAuthor>{{ r.name|xml }}</o:LastAuthor>
+    <o:Author>{{ XML(r.name) }}</o:Author>
+    <o:LastAuthor>{{ XML(r.name) }}</o:LastAuthor>
     <o:Revision>4</o:Revision>
     <o:TotalTime>14</o:TotalTime>
     <o:Created>2015-08-28T04:22:00Z</o:Created>
@@ -658,7 +658,7 @@ engine: Underscore
                           <w:sz-cs w:val="16"/>
                           <w:u w:val="none"/>
                         </w:rPr>
-                        <w:t>{{ r.contact.email|xml }}</w:t>
+                        <w:t>{{ XML(r.contact.email) }}</w:t>
                       </w:r>
                     </w:hlink>
                   </w:p>
@@ -679,7 +679,7 @@ engine: Underscore
                           <w:sz-cs w:val="16"/>
                           <w:u w:val="none"/>
                         </w:rPr>
-                        <w:t>{{ r.contact.website|xml }}</w:t>
+                        <w:t>{{ XML(r.contact.website) }}</w:t>
                       </w:r>
                     </w:hlink>
                   </w:p>
@@ -698,7 +698,7 @@ engine: Underscore
                         <w:sz-cs w:val="16"/>
                         <w:u w:val="none"/>
                       </w:rPr>
-                      <w:t>{{ r.contact.phone|xml }}</w:t>
+                      <w:t>{{ XML(r.contact.phone) }}</w:t>
                     </w:r>
                   </w:p>
                 </w:txbxContent>
@@ -708,7 +708,7 @@ engine: Underscore
           </w:pict>
         </w:r>
         <w:r wsp:rsidRPr="00C61794">
-          <w:t>{{ r.name|xml }}</w:t>
+          <w:t>{{ XML(r.name) }}</w:t>
         </w:r>
       </w:p>
       <w:p wsp:rsidR="00657B14" wsp:rsidRPr="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00657B14">
@@ -721,7 +721,7 @@ engine: Underscore
           <w:rPr>
             <w:rStyle w:val="IntenseEmphasis"/>
           </w:rPr>
-          <w:t>{{ r.info.brief|xml }}</w:t>
+          <w:t>{{ XML(r.info.brief) }}</w:t>
         </w:r>
       </w:p>
       <wx:sub-section>
@@ -764,7 +764,7 @@ engine: Underscore
               </w:tcPr>
               <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
                 <w:r>
-                  <w:t>{{ set.name|xml }}:</w:t>
+                  <w:t>{{ XML(set.name) }}:</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -775,7 +775,7 @@ engine: Underscore
               </w:tcPr>
               <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
                 <w:r>
-                  <w:t>{{ kwords|xml }}</w:t>
+                  <w:t>{{ XML(kwords) }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -830,7 +830,7 @@ engine: Underscore
                   <w:pStyle w:val="Heading2"/>
                 </w:pPr>
                 <w:r>
-                  <w:t>{{ proj.employer|xml }}</w:t>
+                  <w:t>{{ XML(proj.employer) }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -867,7 +867,7 @@ engine: Underscore
                     <w:sz w:val="28"/>
                     <w:sz-cs w:val="28"/>
                   </w:rPr>
-                  <w:t>{{ proj.safe.start.format('YYYY-MM')|xml }} — {{ proj.safe.end.format('YYYY-MM')|xml }}</w:t>
+                  <w:t>{{ XML(proj.safe.start.format('YYYY-MM')) }} — {{ XML(proj.safe.end.format('YYYY-MM')) }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -887,7 +887,7 @@ engine: Underscore
               </w:tcPr>
               <w:p wsp:rsidR="00C61794" wsp:rsidRDefault="00C61794" wsp:rsidP="00C61794">
                 <w:r>
-                  <w:t>{{ proj.summary|xml }}</w:t>
+                  <w:t>{{ XML(proj.summary) }}</w:t>
                 </w:r>
               </w:p>
               {% proj.highlights.forEach( function( high, idx, ar) { %}
@@ -901,7 +901,7 @@ engine: Underscore
                   </w:listPr>
                 </w:pPr>
                 <w:r>
-                  <w:t>{{ high|xml }}</w:t>
+                  <w:t>{{ XML(high) }}</w:t>
                 </w:r>
               </w:p>
               {% }); %}
@@ -955,7 +955,7 @@ engine: Underscore
                   <w:pStyle w:val="Heading2"/>
                 </w:pPr>
                 <w:r>
-                  <w:t>{{ edu.institution|xml }}</w:t>
+                  <w:t>{{ XML(edu.institution) }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -992,7 +992,7 @@ engine: Underscore
                     <w:sz w:val="28"/>
                     <w:sz-cs w:val="28"/>
                   </w:rPr>
-                  <w:t>{{ edu.safe.start.format('YYYY-MM')|xml }} — {{ edu.safe.end.format('YYYY-MM')|xml }}</w:t>
+                  <w:t>{{ XML(edu.safe.start.format('YYYY-MM')) }} — {{ XML(edu.safe.end.format('YYYY-MM')) }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -1026,7 +1026,7 @@ engine: Underscore
                   </w:listPr>
                 </w:pPr>
                 <w:r>
-                  <w:t>{{ course|xml }}</w:t>
+                  <w:t>{{ XML(course) }}</w:t>
                 </w:r>
               </w:p>
               {% }); %}
diff --git a/themes/minimist/src/html.html b/themes/minimist/src/html.html
index 4fb618d..fa6b920 100644
--- a/themes/minimist/src/html.html
+++ b/themes/minimist/src/html.html
@@ -27,9 +27,9 @@ engine: Underscore
       <header>
         <h1>{{ r.name }}</h1>
         <div id="contact">
-          {% if (r.contact.email) { %}<div class="email">{{ r.contact.email }}</div>{% } %}
-          {% if (r.contact.phone) { %}<div class="phone">{{ r.contact.phone }}</div>{% } %}
-          {% if (r.contact.website) { %}<div class="website"><a href="{{ r.contact.website }}">{{ r.contact.website }}</a></div>{% } %}
+          {% if (r.contact.email) { %}<div class="email">{{ RAW.contact.email }}</div>{% } %}
+          {% if (r.contact.phone) { %}<div class="phone">{{ RAW.contact.phone }}</div>{% } %}
+          {% if (r.contact.website) { %}<div class="website"><a href="{{ RAW.contact.website }}">{{ RAW.contact.website }}</a></div>{% } %}
         </div>
       </header>
 
@@ -38,7 +38,7 @@ engine: Underscore
       <section id="summary">
         <h3>About</h3>
         <span class="fa fa-lg fa-user"></span>
-        {{ r.info.brief|md }}
+        {{ r.info.brief }}
       </section>
 {% } %}
 
@@ -86,16 +86,16 @@ engine: Underscore
         <span class="fa fa-lg fa-building"></span>
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
           {% if( proj.url && proj.url.length ) { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url|raw }}">{{ proj.employer }}</a></h4>
+          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url }}">{{ proj.employer }}</a></h4>
           {% } else { %}
           <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.employer }}</span></h4>
           {% } %}
           <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}</span>
-          {{ proj.summary|md }}
+          {{ proj.summary }}
           {% if( proj.highlights ) { %}
             <ul>
             {% proj.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|mdin }}</li>
+              <li>{{ high }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -119,7 +119,7 @@ engine: Underscore
           {% if( edu.courses ) { %}
             <ul>
             {% edu.courses.forEach( function( course, idx, ar) { %}
-              <li>{{ course|mdin }}</li>
+              <li>{{ course }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -138,7 +138,7 @@ engine: Underscore
         {% r.recognition.forEach( function( award, idx, ar) { %}
           <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
           <span class="tenure">{{ award.date }}</span>
-          {{ award.summary|md }}
+          {{ award.summary }}
         {% }); %}
       </section>
 {% } %}
@@ -149,14 +149,10 @@ engine: Underscore
         <header>
         <h3>Publications</h3>
         </header>
-        <span class="fa fa-lg fa-trophy"></span>
+        <span class="fa fa-lg fa-pencil"></span>
         {% r.writing.forEach( function( pub, idx, ar) { %}
           <h4>
-            {% if( pub.url ) { %}
-              <span class="res-label"><a href="{{ pub.link[0].url }}" ></span>{{ pub.title }}</a>,&nbsp;{{ pub.publisher }}
-            {% } else { %}
-              <span class="res-label">{{ pub.name }}</span>,&nbsp;{{ pub.publisher }}
-            {% } %}
+            <span class="res-label">{{ filt.link(pub.title, pub.url) }}</span>&nbsp;{{ pub.publisher }}
           </h4>
         <span class="tenure">Published on: {{ pub.safe.date.format('YYYY-MM') }}</span>
 
@@ -175,16 +171,16 @@ engine: Underscore
         <span class="fa fa-lg fa-child"></span>
         {% r.service.history.forEach( function( vol, idx, ar) { %}
           {% if( vol.url && vol.url.length ) { %}
-          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website|raw }}">{{ vol.organization }}</a></h4>
+          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website }}">{{ vol.organization }}</a></h4>
           {% } else { %}
           <h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
           {% } %}
           <span class="tenure">{{ vol.safe.start.format('YYYY-MM') }}&mdash;{{ vol.safe.end.format('YYYY-MM') }}</span>
-          {{ vol.summary|md }}
+          {{ vol.summary }}
           {% if( vol.highlights ) { %}
             <ul>
             {% vol.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|mdin }}</li>
+              <li>{{ high }}</li>
             {% }); %}
             </ul>
           {% } %}
diff --git a/themes/minimist/src/pdf.html b/themes/minimist/src/pdf.html
index bc3b90f..d7c1a32 100644
--- a/themes/minimist/src/pdf.html
+++ b/themes/minimist/src/pdf.html
@@ -23,9 +23,9 @@ engine: Underscore
       <header>
         <h1>{{ r.name }}</h1>
         <div id="contact">
-          {% if (r.contact.email) { %}<div class="email">{{ r.contact.email }}</div>{% } %}
-          {% if (r.contact.phone) { %}<div class="phone">{{ r.contact.phone }}</div>{% } %}
-          {% if (r.contact.website) { %}<div class="website"><a href="{{ r.contact.website }}">{{ r.contact.website }}</a></div>{% } %}
+          {% if (r.contact.email) { %}<div class="email">{{ RAW.contact.email }}</div>{% } %}
+          {% if (r.contact.phone) { %}<div class="phone">{{ RAW.contact.phone }}</div>{% } %}
+          {% if (r.contact.website) { %}<div class="website"><a href="{{ RAW.contact.website }}">{{ RAW.contact.website }}</a></div>{% } %}
         </div>
       </header>
 
@@ -34,7 +34,7 @@ engine: Underscore
       <section id="summary">
         <h3>About</h3>
         <span class="fa fa-lg fa-user"></span>
-        {{ r.info.brief|md }}
+        {{ r.info.brief }}
       </section>
 {% } %}
 
@@ -82,16 +82,16 @@ engine: Underscore
         <span class="fa fa-lg fa-building"></span>
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
           {% if( proj.url && proj.url.length ) { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url|raw }}">{{ proj.employer }}</a></h4>
+          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url }}">{{ proj.employer }}</a></h4>
           {% } else { %}
           <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.employer }}</span></h4>
           {% } %}
           <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}</span>
-          {{ proj.summary|md }}
+          {{ proj.summary }}
           {% if( proj.highlights ) { %}
             <ul>
             {% proj.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|mdin }}</li>
+              <li>{{ high }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -115,7 +115,7 @@ engine: Underscore
           {% if( edu.courses ) { %}
             <ul>
             {% edu.courses.forEach( function( course, idx, ar) { %}
-              <li>{{ course|mdin }}</li>
+              <li>{{ course }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -134,7 +134,7 @@ engine: Underscore
         {% r.recognition.forEach( function( award, idx, ar) { %}
           <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
           <span class="tenure">{{ award.date }}</span>
-          {{ award.summary|md }}
+          {{ award.summary }}
         {% }); %}
       </section>
 {% } %}
@@ -145,14 +145,10 @@ engine: Underscore
         <header>
         <h3>Publications</h3>
         </header>
-        <span class="fa fa-lg fa-trophy"></span>
+        <span class="fa fa-lg fa-pencil"></span>
         {% r.writing.forEach( function( pub, idx, ar) { %}
           <h4>
-            {% if( pub.url ) { %}
-              <span class="res-label"><a href="{{ pub.link[0].url }}" ></span>{{ pub.title }}</a>,&nbsp;{{ pub.publisher }}
-            {% } else { %}
-              <span class="res-label">{{ pub.name }}</span>,&nbsp;{{ pub.publisher }}
-            {% } %}
+            <span class="res-label">{{ filt.link(pub.title, pub.url) }}</span>&nbsp;{{ pub.publisher }}
           </h4>
         <span class="tenure">Published on: {{ pub.safe.date.format('YYYY-MM') }}</span>
 
@@ -171,16 +167,16 @@ engine: Underscore
         <span class="fa fa-lg fa-child"></span>
         {% r.service.history.forEach( function( vol, idx, ar) { %}
           {% if( vol.url && vol.url.length ) { %}
-          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website|raw }}">{{ vol.organization }}</a></h4>
+          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website }}">{{ vol.organization }}</a></h4>
           {% } else { %}
           <h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
           {% } %}
           <span class="tenure">{{ vol.safe.start.format('YYYY-MM') }}&mdash;{{ vol.safe.end.format('YYYY-MM') }}</span>
-          {{ vol.summary|md }}
+          {{ vol.summary }}
           {% if( vol.highlights ) { %}
             <ul>
             {% vol.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|mdin }}</li>
+              <li>{{ high }}</li>
             {% }); %}
             </ul>
           {% } %}
diff --git a/themes/modern/src/doc.xml b/themes/modern/src/doc.xml
index d1d10e9..5a47f17 100644
--- a/themes/modern/src/doc.xml
+++ b/themes/modern/src/doc.xml
@@ -10,8 +10,8 @@ engine: Underscore
 <w:wordDocument xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" w:macrosPresent="no" w:embeddedObjPresent="no" w:ocxPresent="no" xml:space="preserve">
   <w:ignoreSubtree w:val="http://schemas.microsoft.com/office/word/2003/wordml/sp2"/>
   <o:DocumentProperties>
-    <o:Author>{{ r.name|xml }}</o:Author>
-    <o:LastAuthor>{{ r.name|xml }}</o:LastAuthor>
+    <o:Author>{{ XML(r.name) }}</o:Author>
+    <o:LastAuthor>{{ XML(r.name) }}</o:LastAuthor>
     <o:Revision>4</o:Revision>
     <o:TotalTime>14</o:TotalTime>
     <o:Created>2015-08-28T04:22:00Z</o:Created>
@@ -658,7 +658,7 @@ engine: Underscore
                           <w:sz-cs w:val="16"/>
                           <w:u w:val="none"/>
                         </w:rPr>
-                        <w:t>{{ r.contact.email|xml }}</w:t>
+                        <w:t>{{ XML(r.contact.email) }}</w:t>
                       </w:r>
                     </w:hlink>
                   </w:p>
@@ -679,7 +679,7 @@ engine: Underscore
                           <w:sz-cs w:val="16"/>
                           <w:u w:val="none"/>
                         </w:rPr>
-                        <w:t>{{ r.contact.website|xml }}</w:t>
+                        <w:t>{{ XML(r.contact.website) }}</w:t>
                       </w:r>
                     </w:hlink>
                   </w:p>
@@ -698,7 +698,7 @@ engine: Underscore
                         <w:sz-cs w:val="16"/>
                         <w:u w:val="none"/>
                       </w:rPr>
-                      <w:t>{{ r.contact.phone|xml }}</w:t>
+                      <w:t>{{ XML(r.contact.phone) }}</w:t>
                     </w:r>
                   </w:p>
                 </w:txbxContent>
@@ -708,7 +708,7 @@ engine: Underscore
           </w:pict>
         </w:r>
         <w:r wsp:rsidRPr="00C61794">
-          <w:t>{{ r.name|xml }}</w:t>
+          <w:t>{{ XML(r.name) }}</w:t>
         </w:r>
       </w:p>
       <w:p wsp:rsidR="00657B14" wsp:rsidRPr="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00657B14">
@@ -721,7 +721,7 @@ engine: Underscore
           <w:rPr>
             <w:rStyle w:val="IntenseEmphasis"/>
           </w:rPr>
-          <w:t>{{ r.info.brief|xml }}</w:t>
+          <w:t>{{ XML(r.info.brief) }}</w:t>
         </w:r>
       </w:p>
       <wx:sub-section>
@@ -764,7 +764,7 @@ engine: Underscore
               </w:tcPr>
               <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
                 <w:r>
-                  <w:t>{{ set.name|xml }}:</w:t>
+                  <w:t>{{ XML(set.name) }}:</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -775,7 +775,7 @@ engine: Underscore
               </w:tcPr>
               <w:p wsp:rsidR="00427ECC" wsp:rsidRDefault="00427ECC" wsp:rsidP="00427ECC">
                 <w:r>
-                  <w:t>{{ kwords|xml }}</w:t>
+                  <w:t>{{ XML(kwords) }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -830,7 +830,7 @@ engine: Underscore
                   <w:pStyle w:val="Heading2"/>
                 </w:pPr>
                 <w:r>
-                  <w:t>{{ proj.employer|xml }}</w:t>
+                  <w:t>{{ XML(proj.employer) }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -867,7 +867,7 @@ engine: Underscore
                     <w:sz w:val="28"/>
                     <w:sz-cs w:val="28"/>
                   </w:rPr>
-                  <w:t>{{ proj.safe.start.format('YYYY-MM')|xml }} — {{ proj.safe.end.format('YYYY-MM')|xml }}</w:t>
+                  <w:t>{{ XML(proj.safe.start.format('YYYY-MM')) }} — {{ XML(proj.safe.end.format('YYYY-MM')) }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -887,7 +887,7 @@ engine: Underscore
               </w:tcPr>
               <w:p wsp:rsidR="00C61794" wsp:rsidRDefault="00C61794" wsp:rsidP="00C61794">
                 <w:r>
-                  <w:t>{{ proj.summary|xml }}</w:t>
+                  <w:t>{{ XML(proj.summary) }}</w:t>
                 </w:r>
               </w:p>
               {% proj.highlights.forEach( function( high, idx, ar) { %}
@@ -901,7 +901,7 @@ engine: Underscore
                   </w:listPr>
                 </w:pPr>
                 <w:r>
-                  <w:t>{{ high|xml }}</w:t>
+                  <w:t>{{ XML(high) }}</w:t>
                 </w:r>
               </w:p>
               {% }); %}
@@ -955,7 +955,7 @@ engine: Underscore
                   <w:pStyle w:val="Heading2"/>
                 </w:pPr>
                 <w:r>
-                  <w:t>{{ edu.institution|xml }}</w:t>
+                  <w:t>{{ XML(edu.institution) }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -992,7 +992,7 @@ engine: Underscore
                     <w:sz w:val="28"/>
                     <w:sz-cs w:val="28"/>
                   </w:rPr>
-                  <w:t>{{ edu.safe.start.format('YYYY-MM')|xml }} — {{ edu.safe.end.format('YYYY-MM')|xml }}</w:t>
+                  <w:t>{{ XML(edu.safe.start.format('YYYY-MM')) }} — {{ XML(edu.safe.end.format('YYYY-MM')) }}</w:t>
                 </w:r>
               </w:p>
             </w:tc>
@@ -1026,7 +1026,7 @@ engine: Underscore
                   </w:listPr>
                 </w:pPr>
                 <w:r>
-                  <w:t>{{ course|xml }}</w:t>
+                  <w:t>{{ XML(course) }}</w:t>
                 </w:r>
               </w:p>
               {% }); %}
diff --git a/themes/modern/src/html.html b/themes/modern/src/html.html
index f493542..5530bf9 100644
--- a/themes/modern/src/html.html
+++ b/themes/modern/src/html.html
@@ -27,9 +27,9 @@ engine: Underscore
       <header>
         <h1>{{ r.name }}</h1>
         <div id="contact">
-          {% if (r.contact.email) { %}<div class="email">{{ r.contact.email }}</div>{% } %}
-          {% if (r.contact.phone) { %}<div class="phone">{{ r.contact.phone }}</div>{% } %}
-          {% if (r.contact.website) { %}<div class="website"><a href="{{ r.contact.website }}">{{ r.contact.website }}</a></div>{% } %}
+          {% if (r.contact.email) { %}<div class="email">{{ RAW.contact.email }}</div>{% } %}
+          {% if (r.contact.phone) { %}<div class="phone">{{ RAW.contact.phone }}</div>{% } %}
+          {% if (r.contact.website) { %}<div class="website"><a href="{{ RAW.contact.website }}">{{ RAW.contact.website }}</a></div>{% } %}
         </div>
       </header>
 
@@ -38,7 +38,7 @@ engine: Underscore
       <section id="summary">
         <h3>About</h3>
         <span class="fa fa-lg fa-user"></span>
-        {{ r.info.brief|md }}
+        {{ r.info.brief }}
       </section>
 {% } %}
 
@@ -86,16 +86,16 @@ engine: Underscore
         <span class="fa fa-lg fa-building"></span>
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
           {% if( proj.url && proj.url.length ) { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url|raw }}">{{ proj.employer }}</a></h4>
+          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url }}">{{ proj.employer }}</a></h4>
           {% } else { %}
           <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.employer }}</span></h4>
           {% } %}
           <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}</span>
-          {{ proj.summary|md }}
+          {{ proj.summary }}
           {% if( proj.highlights ) { %}
             <ul>
             {% proj.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|mdin }}</li>
+              <li>{{ high }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -119,7 +119,7 @@ engine: Underscore
           {% if( edu.courses ) { %}
             <ul>
             {% edu.courses.forEach( function( course, idx, ar) { %}
-              <li>{{ course|mdin }}</li>
+              <li>{{ course }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -138,7 +138,7 @@ engine: Underscore
         {% r.recognition.forEach( function( award, idx, ar) { %}
           <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
           <span class="tenure">{{ award.date }}</span>
-          {{ award.summary|md }}
+          {{ award.summary }}
         {% }); %}
       </section>
 {% } %}
@@ -171,16 +171,16 @@ engine: Underscore
         <span class="fa fa-lg fa-child"></span>
         {% r.service.history.forEach( function( vol, idx, ar) { %}
           {% if( vol.url && vol.url.length ) { %}
-          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website|raw }}">{{ vol.organization }}</a></h4>
+          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website }}">{{ vol.organization }}</a></h4>
           {% } else { %}
           <h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
           {% } %}
           <span class="tenure">{{ vol.safe.start.format('YYYY-MM') }}&mdash;{{ vol.safe.end.format('YYYY-MM') }}</span>
-          {{ vol.summary|md }}
+          {{ vol.summary }}
           {% if( vol.highlights ) { %}
             <ul>
             {% vol.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|mdin }}</li>
+              <li>{{ high }}</li>
             {% }); %}
             </ul>
           {% } %}
diff --git a/themes/modern/src/pdf.html b/themes/modern/src/pdf.html
index 41a3654..f04929f 100644
--- a/themes/modern/src/pdf.html
+++ b/themes/modern/src/pdf.html
@@ -23,9 +23,9 @@ engine: Underscore
       <header>
         <h1>{{ r.name }}</h1>
         <div id="contact">
-          {% if (r.contact.email) { %}<div class="email">{{ r.contact.email }}</div>{% } %}
-          {% if (r.contact.phone) { %}<div class="phone">{{ r.contact.phone }}</div>{% } %}
-          {% if (r.contact.website) { %}<div class="website"><a href="{{ r.contact.website }}">{{ r.contact.website }}</a></div>{% } %}
+          {% if (r.contact.email) { %}<div class="email">{{ RAW.contact.email }}</div>{% } %}
+          {% if (r.contact.phone) { %}<div class="phone">{{ RAW.contact.phone }}</div>{% } %}
+          {% if (r.contact.website) { %}<div class="website"><a href="{{ RAW.contact.website }}">{{ RAW.contact.website }}</a></div>{% } %}
         </div>
       </header>
 
@@ -34,7 +34,7 @@ engine: Underscore
       <section id="summary">
         <h3>About</h3>
         <span class="fa fa-lg fa-user"></span>
-        {{ r.info.brief|md }}
+        {{ r.info.brief }}
       </section>
 {% } %}
 
@@ -82,16 +82,16 @@ engine: Underscore
         <span class="fa fa-lg fa-building"></span>
         {% r.employment.history.forEach( function( proj, idx, ar) { %}
           {% if( proj.url && proj.url.length ) { %}
-          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ proj.url|raw }}">{{ proj.employer }}</a></h4>
+          <h4><span class="res-label">{{ proj.position }}</span>, <a href="{{ RAW.employment.history[idx].url }}">{{ proj.employer }}</a></h4>
           {% } else { %}
           <h4><span class="res-label">{{ proj.position }}</span>, <span class="defunct">{{ proj.employer }}</span></h4>
           {% } %}
           <span class="tenure">{{ proj.safe.start.format('YYYY-MM') }}&mdash;{{ proj.safe.end.format('YYYY-MM') }}</span>
-          {{ proj.summary|md }}
+          {{ proj.summary }}
           {% if( proj.highlights ) { %}
             <ul>
             {% proj.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|mdin }}</li>
+              <li>{{ high }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -115,7 +115,7 @@ engine: Underscore
           {% if( edu.courses ) { %}
             <ul>
             {% edu.courses.forEach( function( course, idx, ar) { %}
-              <li>{{ course|mdin }}</li>
+              <li>{{ course }}</li>
             {% }); %}
             </ul>
           {% } %}
@@ -134,7 +134,7 @@ engine: Underscore
         {% r.recognition.forEach( function( award, idx, ar) { %}
           <h4><span class="res-label">{{ award.title }}</span>, {{ award.from }}</h4>
           <span class="tenure">{{ award.date }}</span>
-          {{ award.summary|md }}
+          {{ award.summary }}
         {% }); %}
       </section>
 {% } %}
@@ -167,16 +167,16 @@ engine: Underscore
         <span class="fa fa-lg fa-child"></span>
         {% r.service.history.forEach( function( vol, idx, ar) { %}
           {% if( vol.url && vol.url.length ) { %}
-          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website|raw }}">{{ vol.organization }}</a></h4>
+          <h4><span class="res-label">{{ vol.position }}</span>, <a href="{{ vol.website }}">{{ vol.organization }}</a></h4>
           {% } else { %}
           <h4><span class="res-label">{{ vol.position }}</span>, <span class="defunct">{{ vol.organization }}</span></h4>
           {% } %}
           <span class="tenure">{{ vol.safe.start.format('YYYY-MM') }}&mdash;{{ vol.safe.end.format('YYYY-MM') }}</span>
-          {{ vol.summary|md }}
+          {{ vol.summary }}
           {% if( vol.highlights ) { %}
             <ul>
             {% vol.highlights.forEach( function( high, idx, ar) { %}
-              <li>{{ high|mdin }}</li>
+              <li>{{ high }}</li>
             {% }); %}
             </ul>
           {% } %}