diff --git a/themes/compact/src/compact-doc.xml b/themes/compact/src/compact-doc.xml
index 706dcc4..e79e66c 100644
--- a/themes/compact/src/compact-doc.xml
+++ b/themes/compact/src/compact-doc.xml
@@ -175,7 +175,7 @@
       <w:link w:val="Heading1Char"/>
       <w:rsid w:val="00505903"/>
       <w:pPr>
-        <w:spacing w:before="100" w:before-autospacing="on"/>
+        <w:spacing w:before="100" w:before-autospacing="off"/>
         <w:outlineLvl w:val="0"/>
         <w:pBdr>
           <w:bottom w:val="single" w:sz="6" w:space="1" w:color="auto" />
@@ -198,7 +198,7 @@
       <w:link w:val="Heading2Char"/>
       <w:rsid w:val="00505903"/>
       <w:pPr>
-        <w:spacing w:before="120"/>
+        <w:spacing w:before="60"/>
         <w:outlineLvl w:val="1"/>
       </w:pPr>
       <w:rPr>
@@ -357,6 +357,7 @@
         <w:kern w:val="28"/>
         <w:sz w:val="20"/>
         <w:sz-cs w:val="20"/>
+        <w:caps/>
       </w:rPr>
     </w:style>
     <w:style w:type="character" w:styleId="TitleChar">
@@ -458,14 +459,15 @@
         </w:pPr>
         <w:r>
           <w:rPr>
-            <w:sz w:val="36"/>
+            <w:sz w:val="28"/>
+            <w:b/>
           </w:rPr>
           <w:t>{{ r.name }}</w:t>
         </w:r>
         <w:r>
           <w:tab/>
         </w:r>
-        <w:hlink w:dest="mailto:{{ r.contact.email }}">
+        <w:hlink w:dest="mailto:{{{ r.contact.email }}}">
           <w:r wsp:rsidRPr="003876BF">
             <w:rPr>
               <w:rStyle w:val="Hyperlink"/>
@@ -492,13 +494,13 @@
           </w:rPr>
           <w:t> - </w:t>
         </w:r>
-        <w:hlink w:dest="{{ r.contact.website }}">
+        <w:hlink w:dest="{{{ r.contact.website }}}">
           <w:r wsp:rsidRPr="003876BF">
             <w:rPr>
               <w:rStyle w:val="Hyperlink"/>
               <w:sz-cs w:val="20"/>
             </w:rPr>
-            <w:t>{{ r.contact.website }}</w:t>
+            <w:t>{{trimURL r.contact.website }}</w:t>
           </w:r>
         </w:hlink>
       </w:p>
diff --git a/themes/compact/src/compact-html.css b/themes/compact/src/compact-html.css
index 69064fb..0e1740d 100644
--- a/themes/compact/src/compact-html.css
+++ b/themes/compact/src/compact-html.css
@@ -26,6 +26,11 @@ h3 {
   font-size: 1em;
 }
 
+hr {
+  border: none;
+  border-top: 1px solid #B3B3B3;
+}
+
 main {
   padding: 15px;
   max-width: 700px;
@@ -59,16 +64,22 @@ thead {
 main > header {
   width: 100%;
   float: left;
-  margin-bottom: 1em;
+  margin-bottom: 0;
+  position: relative;
 }
 
 
 main > header > h1 {
   float: left;
   font-size: 1.5em;
+  text-transform: uppercase;
+  line-height: 1;
 }
 #contact {
   float: right;
+  position: absolute;
+  right: 0;
+  bottom: 0;
 }
 
 #contact > div {
diff --git a/themes/compact/src/compact-html.html b/themes/compact/src/compact-html.html
index 1ba3ca0..3e15d4f 100644
--- a/themes/compact/src/compact-html.html
+++ b/themes/compact/src/compact-html.html
@@ -2,25 +2,25 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>{{ r.name }}</title>
+    <title>{{ RAW.name }}</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
     <link href="compact-html.css" rel="stylesheet" type="text/css">
   </head>
   <body>
     <main>
       <header>
-        <h1>{{ r.name }}</h1>
+        <h1>{{{ r.name }}}</h1>
         <div id="contact">
-          {{#if r.contact.email}}<div class="email"><a href="mailto:{{ RAW.contact.email }}">{{ r.contact.email }}</a></div>{{/if}}
-          {{#if r.contact.phone}}<div class="phone">{{ r.contact.phone }}</div>{{/if}}
-          {{#if r.contact.website}}<div class="website"><a href="{{ RAW.contact.website }}">{{ r.contact.website }}</a></div>{{/if}}
+          {{#if r.contact.email}}<div class="email"><a href="mailto:{{{ RAW.contact.email }}}">{{ RAW.contact.email }}</a></div>{{/if}}
+          {{#if r.contact.phone}}<div class="phone">{{ RAW.contact.phone }}</div>{{/if}}
+          {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{trimURL RAW.contact.website }}</a></div>{{/if}}
         </div>
       </header>
 
 
 {{#if r.info.brief}}
       <section id="summary">
-        {{ r.info.brief }}
+        {{{ r.info.brief }}}
       </section>
 {{/if}}
 
@@ -57,7 +57,7 @@
         <h2><span class="fa fa-building" style="vertical-align: top;"></span> Employment</h2><hr>
         </header>
 
-        {{#each r.employment.history }}
+        {{#each r.employment.history}}
           {{#compare @index 4 operator="<"}}
             <h3><em>{{ position }}</em>,
               {{#if url }}
@@ -66,11 +66,11 @@
               {{ employer }}
               {{/if}}
               <span class="tenure">{{formatDate safe.start 'YYYY-MM' }} &mdash; {{formatDate safe.end 'YYYY-MM' }}<span></h3>
-            <p style="clear: both;">{{ summary }}</p>
+            <p style="clear: both;">{{{ summary }}}</p>
             {{#if highlights}}
               <ul>
               {{#each highlights}}
-                <li>{{ this }}</li>
+                <li>{{{ this }}}</li>
               {{/each}}
               </ul>
             {{/if}}
@@ -83,7 +83,7 @@
             <ul>
             {{/compare}}
 
-            <li>{{ position }}, {{ employer }}</li>
+            <li>{{{ position }}}, {{{ employer }}}</li>
 
             {{#if @last}}
             </ul>
@@ -100,7 +100,7 @@
         <h2><span class="fa fa-mortar-board"></span> Education</h2><hr>
         </header>
         {{#each r.education.history}}
-          <h3>{{ institution }} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
+          <h3>{{{ institution }}} <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
         {{/each}}
 
       </section>
@@ -119,11 +119,11 @@
             {{ organization }}
             {{/if}}
             <span class="tenure">{{formatDate safe.start 'YYYY' }} &mdash; {{formatDate safe.end 'YYYY' }}<span></h3>
-          <p style="clear: both;">{{ summary }}</p>
+          <p style="clear: both;">{{{ summary }}}</p>
           {{#if highlights}}
             <ul>
             {{#each highlights}}
-              <li>{{ this }}</li>
+              <li>{{{ this }}}</li>
             {{/each}}
             </ul>
           {{/if}}
@@ -138,9 +138,9 @@
         <h2><span class="fa fa-book"></span> Writing</h2><hr>
         </header>
         {{#each r.writing }}
-          <h3><em>{{#if url}}<a href="{{ url }}">{{ title }}</a>{{else}}{{ title }}{{/if}}</em>,
+          <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
             {{ publisher }} <span class="tenure">{{formatDate safe.date 'YYYY'}}</span></h3>
-        {{# if summary}}{{ summary }}{{/if}}
+        {{# if summary}}{{{ summary }}}{{/if}}
         {{/each}}
       </section>
 {{/if}}
