diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 285e3b3..f9b74ee 100755
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -7,7 +7,7 @@
     <title>{{ block "title" . }}{{ .Site.Title }} {{ with .Title }} | {{ . }}{{ end }}{{ end }}</title>
     <meta name="HandheldFriendly" content="True">
     <meta name="MobileOptimized" content="320">
-    
+
     <meta name="viewport" content="width=device-width,minimum-scale=1">
      {{ .Hugo.Generator }}
       {{/* NOTE: For Production make sure you add `HUGO_ENV="production"` before your build command */}}
@@ -16,7 +16,7 @@
       {{ else }}
         <META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
       {{ end }}
-
+        {{/* By formatting your URL with absURL you will get the full URL of your site  */}}
      <link href='{{ "dist/main.css" | absURL }}' rel='stylesheet' type="text/css" />
 
       {{/* NOTE: These Hugo Internal Templates can be found starting at https://github.com/spf13/hugo/blob/master/tpl/tplimpl/template_embedded.go#L158 */}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 9f7d553..14229c8 100755
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -9,7 +9,7 @@
         {{ .Title }}
       </h1>
       <section class="nested-copy-line-height lh-copy f4 nested-links nested-img mid-gray">
-        {{ .Content | markdownify }}
+        {{ .Content }}
       </section>
     </article>
     <div class="ph3 mt2 mt6-ns">
diff --git a/layouts/post/single.html b/layouts/post/single.html
index 8e9f3c1..324c743 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -1,19 +1,25 @@
-{{ define "header" }}{{ partial "page-header.html" . }}{{ end }}
+{{ define "header" }}
+   {{/* We can overide any block in the baseof file be defining it in the template */}}
+  {{ partial "page-header.html" . }}
+{{ end }}
+
 {{ define "main" }}
   <div class="flex-l mt2 mw8 center">
     <article class="center cf pv5 ph3 ph4-ns mw7">
       <p class="f6 b helvetica tracked">
+        {{/* Humanize removes hyphens and capitalizes the first word */}}
         {{ humanize .Section | upper  }}
       </p>
       <h1 class="f1 athelas">
         {{ .Title }}
       </h1>
         {{/* TODO: Add Hugo author  */}}
+        {{/* Hugo uses Go's date formatting is set by example. Here are two formats */}}
       <time class="f6 mv4 dib tracked" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">
         {{ .Date.Format "January 2, 2006" }}
       </time>
       <section class="nested-copy-line-height lh-copy serif f4 nested-links nested-img mid-gray">
-        {{ .Content | markdownify }}
+        {{ .Content }}
       </section>
       {{ partial "tags.html" . }}
     </article>
diff --git a/layouts/post/summary.html b/layouts/post/summary.html
index 4bde92e..e60ef18 100644
--- a/layouts/post/summary.html
+++ b/layouts/post/summary.html
@@ -1,4 +1,3 @@
-
   <div class="mb3 pa4 mid-gray overflow-hidden">
     {{ if .Date }}
       <date class="f6">
diff --git a/layouts/shortcodes/form-contact.html b/layouts/shortcodes/form-contact.html
index b820a16..ea732b5 100644
--- a/layouts/shortcodes/form-contact.html
+++ b/layouts/shortcodes/form-contact.html
@@ -1,18 +1,3 @@
-{{/* <form class="black-80" accept-charset="UTF-8" action="{{ .Get "action" }}" method="POST">
-  <div class="measure">
-    <label for="name" class="f6 b db mb2">Name <span class="normal black-60">(optional)</span></label>
-    <input id="name" class="input-reset ba b--black-20 pa2 mb2 db w-100" type="text" aria-describedby="name-desc">
-    <small id="name-desc" class="f6 black-60 db mb2">Helper text for the form control.</small>
-
-    <label for="email" class="f6 b db mb2">Email Address</label>
-    <input id="email" class="input-reset ba b--black-20 pa2 mb2 db w-100" type="text" aria-describedby="email-desc">
-    <small id="email-desc" class="f6 black-60 db mb2">Helper text for the form control.</small>
-
-    <label for="email" class="f6 b db mb2">Name <span class="normal black-60">(optional)</span></label>
-    <input id="name" class="input-reset ba b--black-20 pa2 mb2 db w-100" type="text" aria-describedby="name-desc">
-    <small id="name-desc" class="f6 black-60 db mb2">Helper text for the form control.</small>
-  </div>
-</form> */}}
 {{ $.Scratch.Add "labelClasses" "f6 b db mb1 mt3 sans-serif mid-gray" }}
 {{ $.Scratch.Add "inputClasses" "w-100 f5 pv3 ph3 bg-light-gray bn" }}
 
@@ -21,20 +6,15 @@
     <label class="{{ $.Scratch.Get "labelClasses" }}"  for="first_name">Your Name</label>
     <input type="text" id="first_name" name="first_name" class="{{ $.Scratch.Get "inputClasses" }}"  required placeholder=" " />
 
-
-
     <label class="{{ $.Scratch.Get "labelClasses" }}" for="last_name">Organization Name</label>
     <input type="text" id="last_name" name="last_name" class="{{ $.Scratch.Get "inputClasses" }}"  required placeholder=" " />
 
-
-
     <label class="{{ $.Scratch.Get "labelClasses" }}" for="email">Email Address</label>
     <input type="email" id="email" name="email" class="{{ $.Scratch.Get "inputClasses" }}"  required placeholder=" " />
     <div class="requirements f6 gray glow i ph3 overflow-hidden TK">
       Must be a valid email address.
     </div>
 
-
     <label class="{{ $.Scratch.Get "labelClasses" }}" for="message">Message</label>
     <textarea id="message" name="message" class="{{ $.Scratch.Get "inputClasses" }} h4" aria-describedby="comment-desc"></textarea>
 
diff --git a/readme.md b/readme.md
index fff9af7..e2d8201 100644
--- a/readme.md
+++ b/readme.md
@@ -1,33 +1,35 @@
-HUGO Default theme readme
+### A Base theme for [Hugo](http://gohugo.io/), a framework for building websites.
 
-
-### [wip] A Base theme for [Hugo](http://gohugo.io/), a framework for building websites.
+[DEMO](http://gohugo-default-theme.surge.sh/)
 
 The intent of this theme is to provide a solid starting place for Hugo sites and include best practices for performance, accessibility, and rapid development.
 
 
 Features
+- Responsive
+- Accessible
 
-- Automated Robots.txt (changes values based on environment)
-
-includes examples of
-
-- internal templates for meta data and google analytics
-- pagination (internal template)
-- with
-- HUGO_ENV
-- first
-- after
-- sort
-- site LanguageCode
-- where
+Includes examples of
+- Custom Robots.txt (changes values based on environment)
+- Internal templates for meta data and google analytics
+- Pagination (internal template)
+- Archetypes
+- Custom shortcode
+- Hugo built-in menu
+- `with`
+- `HUGO_ENV`
+- `first`
+- `after`
+- `sort`
+- Site LanguageCode
+- `where`
 - Content Views
-- partials
-- template layouts (type "article" uses a special list template, single template,  and a content view)
-- tags
-- len
-- conditionals
-- ge (greater than or equal to)
+- Partials
+- Template layouts (type "article" uses a special list template, single template,  and a content view)
+- Tags
+- `len`
+- Conditionals
+- `ge` (greater than or equal to)
 
 
 This theme uses the "Tachyons" CSS library. This will allow you to manipulate the design of the theme by changing class names in HTML without touching the original CSS files. For more information see the [Tachyons website](http://tachyons.io/).
diff --git a/sitemap.xml b/sitemap.xml
deleted file mode 100755
index 64a6613..0000000
--- a/sitemap.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-    {{ range .Data.Pages }}
-    <url>
-        <loc>{{ .Permalink }}</loc>
-        <lastmod>{{ safeHTML ( .Date.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ with .Sitemap.ChangeFreq }}
-        <changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}
-        <priority>{{ .Sitemap.Priority }}</priority>{{ end }}
-    </url>
-    {{ end }}
-</urlset>