2 files changed, 35 insertions, 8 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index c6d3b69..cae4c08 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,9 +1,11 @@
 {{ define "main" -}}
+<h1 class="page-title">{{ .Title }}</h1>
 <ul class="posts">
 {{ range .Data.Pages -}}
   <li>
-    <span><a href="{{ .Permalink }}">{{ .Title }}</a> <time class="pull-right post-list">{{ .Date.Format "Mon, Jan 2, 2006" }}</time></span>
+    <a class="post-title u-url" href="{{ .RelPermalink }}">{{ .Title }}</a>
+    <time class="post-date" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>
   </li>
 {{- end }}
 </ul>
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index a9f5d33..fb048a2 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,37 @@
 {{ define "main" -}}
-<div class="post">
-  <h1>{{ .Title }}</h1>
-  <span class="post-date">{{ .Date.Format "Mon, Jan 2, 2006" }}</span>
-  {{ .Content }}
-</div>
+<article class="post h-entry">
+  <header>
+    <a class="u-url" href="{{ .Permalink | replaceRE "/$" "" }}">
+      <h1 class="post-title p-name">{{ .Title }}</h1>
+    </a>
+    <time class="post-date dt-published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z" }}">{{ .Date.Format "Monday, 2 January 2006" }}</time>
+  </header>
+  <main class="post-content e-content">
+    {{ .Content }}
+  </main>
+  <footer class="footer">
+    {{ if .Params.categories }}
+    <span>
+      Category:
+      {{ range .Params.categories }}
+      <a class="p-category" href="/categories/{{ . | lower | urlize }}/">{{ . }}</a>
+      {{ end }}
+    </span>
+    {{ end }}
+    {{ if .Params.tags }}
+    <p>
+      Tags:
+      {{ range .Params.tags }}
+      <a class="p-category" href="/tags/{{ . | urlize }}/">{{ . }}</a>
+      {{ end }}
+
+    </p>
+    {{ end }}
+  </footer>
+</article>
 
 {{ if .Site.DisqusShortname -}}
 <h2>Comments</h2>
 {{ template "_internal/disqus.html" . }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}