diff --git a/SiteGenerator/Sources/SiteGenerator/TemplateContext.swift b/SiteGenerator/Sources/SiteGenerator/TemplateContext.swift
index 5254013..d3fbe25 100644
--- a/SiteGenerator/Sources/SiteGenerator/TemplateContext.swift
+++ b/SiteGenerator/Sources/SiteGenerator/TemplateContext.swift
@@ -24,6 +24,10 @@ struct TemplateContext {
     var template: String {
         page.template ?? site.template
     }
+
+    var currentYear: Int {
+        Calendar.current.dateComponents([.year], from: Date()).year!
+    }
 }
 
 // MARK: - Dictionary form
@@ -38,6 +42,7 @@ extension TemplateContext {
             "body": body,
             "styles": site.styles + page.styles,
             "scripts": site.scripts + page.scripts,
+            "currentYear": currentYear,
         ]
     }
 }
diff --git a/public/about.md b/public/about.md
index c2104e9..2acc087 100644
--- a/public/about.md
+++ b/public/about.md
@@ -1,5 +1,6 @@
 ---
 Title: About me
+Template: article
 ---
 
 I'm Sami Samhuri, a software developer and general technology geek. Sometimes
@@ -97,7 +98,6 @@ compiled with [harp][] before [Apache][] serves it up. The header and body font,
 [Museo]: http://www.exljbris.com/museosans.html
 [TypeKit]: https://typekit.com/fonts
 
-Oh, and a shout out to [Font Awesome][fa] for being awesome.
-<i class="fa fa-thumbs-up" style="color: #ccc"></i>
+Oh, and a shout out to [Font Awesome][fa] for being awesome. <i class="fa fa-thumbs-up" style="color: #ccc"></i>
 
 [fa]: http://fontawesome.io
diff --git a/templates/article.html b/templates/article.html
new file mode 100644
index 0000000..a23e3c4
--- /dev/null
+++ b/templates/article.html
@@ -0,0 +1,10 @@
+{% extends "samhuri.net.html" %}
+{% block body %}
+<article class="container">
+  <h2>{{ page.title }}</h2>
+  {{ body }}
+</article>
+<div class="row clearfix">
+  <p class="fin"><i class="fa fa-code"></i></p>
+</div>
+{% endblock %}
diff --git a/templates/samhuri.net.html b/templates/samhuri.net.html
index da6248d..9066de4 100644
--- a/templates/samhuri.net.html
+++ b/templates/samhuri.net.html
@@ -73,7 +73,7 @@
     <div class="clearfix"></div>
   </header>
 
-  {% block body %}footage not found{% endblock %}
+  {% block body %}{{ body }}{% endblock %}
 
   <footer class="container">
     &copy; 2006 - {{ currentYear }} <a href="/about">{{ site.author }}</a>