diff --git a/.gitignore b/.gitignore
index a790081..4b4c065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 www
 tests/*/actual
-/bin/sitegen
\ No newline at end of file
+/bin/sitegen
+node_modules
diff --git a/.tm_properties b/.tm_properties
index 1acefff..c221498 100644
--- a/.tm_properties
+++ b/.tm_properties
@@ -1,2 +1,2 @@
-exclude = "{$exclude,SiteGenerator,www,tweets,wayback,actual}"
+exclude = "{$exclude,SiteGenerator,www,tweets,wayback,actual,node_modules}"
 include = "{$include,.gitignore}"
diff --git a/Readme.md b/Readme.md
index b64e923..36d5bab 100644
--- a/Readme.md
+++ b/Readme.md
@@ -35,11 +35,11 @@ Execution, trying TDD for the first time:
 
     - [ ] Migrate static pages to the new site generator
 
-        - [ ] About
+        - [x] About
 
         - [ ] 404 / missing
 
-        - [ ] cv
+        - [x] cv
 
         - [ ] check and delete _data.json
 
diff --git a/public/cv.md b/public/cv.md
index 7c3a556..b15c3a5 100644
--- a/public/cv.md
+++ b/public/cv.md
@@ -1,12 +1,13 @@
 ---
 Title: Curriculum vitae
+Template: article
 ---
 
 ### Work History
 
-**[1 Second Everyday](https://1se.co)**<br>
-_CTO_<br>
-June 2016 - present
+#### [1 Second Everyday](https://1se.co) / June 2016 - present
+
+_CTO_
 
 As the first tech hire I brought our primary product in-house, an iOS app that was built by contractors. I moved ahead with new features while refactoring the inner parts. This improved the architecture and mode it much more reliable and robust. I modernized the Objective-C code while writing new code in Swift.
 
@@ -22,33 +23,33 @@ As of fall 2019 the tech team has 8 developers across Android, iOS, and services
 
 - 2019: Closed a round of funding with Indie VC
 
-**[Mashable](http://mashable.com)**<br>
-_iOS Engineer_<br>
-March 2014 - April 2016
+#### [Mashable](http://mashable.com) / March 2014 - April 2016
+
+_iOS Engineer_
 
 Worked on a rewrite of the [Mashable iOS app][mashable] and other iOS projects that were cancelled before launch after 2 years of development, and were covered under NDA.
 
 [mashable]: https://itunes.apple.com/ca/app/mashable/id910775754?mt=8
 
-**[Tap for Tap](https://tapfortap.com)**<br>
-_Lead Mobile and Web Developer, System Admin_<br>
-February 2012 - March 2014
+#### [Tap for Tap](https://tapfortap.com) / February 2012 - March 2014
+
+_Lead Mobile and Web Developer, System Admin_
 
 Initially I wrote all of Tap for Tap: our Ruby web & API server, node.js real-time matching system, JavaScript front-end, iOS, and Android SDKs and plugins for various other platforms (PhoneGap, AdMob mediation, etc). I also maintained the servers.
 
 We grew a lot and I offloaded tasks to other developers who helped with overall architecture, and fully maintained the web interface (including some front-end related Ruby) and all of the SDKs and plugins. I focused on the overall architecture, backend Ruby and node.js code, and system administration.
 
-**[Beta Street](http://betastreet.com)**<br>
-_Lead Mobile and Web Developer, System Admin_<br>
+#### [Beta Street](http://betastreet.com)
+_Lead Mobile and Web Developer, System Admin_
 May 2011 - February 2012
 
 Mobile application development for iOS and Android. Websites and web services using node.js, Sinatra, and Redis.
 
 System administration using CentOS on Rackspace cloud.
 
-**[HeavyLifters Network](http://heavylifters.com)**<br>
-_iPhone and Web Developer_<br>
-March 2010 - April 2011
+#### [HeavyLifters Network](http://heavylifters.com) / March 2010 - April 2011
+
+_iPhone and Web Developer_
 
 Worked on the node.js powered server behind SelfServeApps, which unfortunately is no longer public. Also worked on the web-based GUI using Objective-J and Cappuccino.
 
@@ -56,42 +57,44 @@ Developed the Android app that interpreted our custom JSON format for declarativ
 
 System administration using Chef to manage Ubuntu servers on Linode.
 
-**[Brighthouse Labs](https://www.linkedin.com/company/brighthouse-labs)**<br>
-_Mobile App Developer_<br>
-October 2009 – March 2010
+#### [Brighthouse Labs](https://www.linkedin.com/company/brighthouse-labs) / October 2009 – March 2010
+
+_Mobile App Developer_
 
 Developed mobile apps for iPhone, Android, and webOS.
 
 Lots of automation, scraping, and glue code using Ruby, Python, and shell scripts.
 
-**[Guru Logic](https://gurulogic.ca)**<br>
-_Web Developer_<br>
-August 2008 - October 2009
+#### [Guru Logic](https://gurulogic.ca) / August 2008 - October 2009
+
+_Web Developer_
 
 Freelance Ruby on Rails web development.
 
-**Pinnacle Technologies**<br>
-_Embedded and Backend Developer_<br>
-February 2006 – September 2007
+#### Pinnacle Technologies / February 2006 – September 2007
+
+_Embedded and Backend Developer_
 
 Worked on a Ruby on Rails website for a lottery group.
 
-**[Seekport Internet Technologies](https://de.wikipedia.org/wiki/Seekport)**<br>
-_Web Developer_<br>
-June 2006 – August 2006
+#### [Seekport Internet Technologies](https://de.wikipedia.org/wiki/Seekport) / June 2006 – August 2006
+
+_Web Developer_
 
 Programmed an internal config utility for Seekport's search engine using PHP and MySQL.
 
 Developed a cross-platform desktop widget for delivering real-time World Cup scores & events.
 
-<hr>
-
 ### Education
 
-**[Camosun College](http://camosun.ca)**<br>
-_Computer Science_<br>
-2007 - 2008
+#### [Camosun College](http://camosun.ca) / 2007 - 2008
 
-**[University of Victoria](http://www.uvic.ca)**<br>
-_Computer Science_<br>
-2003 - 2006
+_Computer Science_
+
+Did not graduate.
+
+#### [University of Victoria](http://www.uvic.ca) / 2003 - 2006
+
+_Computer Science_
+
+Did not graduate.
diff --git a/templates/article.html b/templates/article.html
index a23e3c4..2059ad5 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,7 +1,7 @@
 {% extends "samhuri.net.html" %}
 {% block body %}
 <article class="container">
-  <h2>{{ page.title }}</h2>
+  <h1>{{ page.title }}</h1>
   {{ body }}
 </article>
 <div class="row clearfix">
diff --git a/templates/misc-PROJECT??.html b/templates/misc-PROJECT??.html
index ed4b552..3f3c94c 100644
--- a/templates/misc-PROJECT??.html
+++ b/templates/misc-PROJECT??.html
@@ -1,7 +1,7 @@
 HANDLED  {% if post.link %} -%>
     <article class="container">
       <header>
-        <h2><a href="<%= post.link %>">&rarr; <%= post.title %></a></h2>
+        <h1><a href="<%= post.link %>">&rarr; <%= post.title %></a></h1>
         <time><%= post.date %></time>
         <a class="permalink" href="<%= post.url %>">&infin;</a>
       </header>
@@ -13,7 +13,7 @@ HANDLED  {% if post.link %} -%>
 HANDLED  <% } else if (typeof date != 'undefined' && date !== null) { -%>
     <article class="container">
       <header>
-        <h2><a href="<%= url %>"><%= title %></a></h2>
+        <h1><a href="<%= url %>"><%= title %></a></h1>
         <time><%= date %></time>
       </header>
       <%- yield %>
@@ -23,7 +23,7 @@ HANDLED  <% } else if (typeof date != 'undefined' && date !== null) { -%>
     </div>
 WTF IS THIS?? MUST BE PROJECTS!  <% } else if (typeof title != 'undefined' && title !== null) { -%>
     <article class="container">
-      <h2><%= title %></h2>
+      <h1><%= title %></h1>
       <%- yield %>
     </article>
     <div class="row clearfix">
diff --git a/templates/post-link.html b/templates/post-link.html
index cd0d07c..738fe0b 100644
--- a/templates/post-link.html
+++ b/templates/post-link.html
@@ -7,7 +7,7 @@
 {% block body %}
 <article class="container">
   <header>
-    <h2><a href="{{ post.link }}">&rarr; {{ post.title }}</a></h2>
+    <h1><a href="{{ post.link }}">&rarr; {{ post.title }}</a></h1>
     <time>{{ post.date }}</time>
     <a class="permalink" href="{{ post.url }}">&infin;</a>
   </header>
diff --git a/templates/post-text.html b/templates/post-text.html
index 1fffd6c..03041db 100644
--- a/templates/post-text.html
+++ b/templates/post-text.html
@@ -7,7 +7,7 @@
 {% block body %}
 <article class="container">
   <header>
-    <h2><a href="{{ post.url }}">{{ post.title }}</a></h2>
+    <h1><a href="{{ post.url }}">{{ post.title }}</a></h1>
     <time>{{ post.date }}</time>
   </header>
   {{ post.body }}