diff --git a/alchemy/static/css/style.css b/alchemy/static/css/style.css
index 53167ad..56b40f6 100644
--- a/alchemy/static/css/style.css
+++ b/alchemy/static/css/style.css
@@ -49,7 +49,7 @@ a:hover {
 }
 
 .header img,
-.header ul {
+.header nav {
   margin-bottom: 20px;
 }
 
diff --git a/alchemy/templates/article.html b/alchemy/templates/article.html
index 862b0cd..00c04dd 100644
--- a/alchemy/templates/article.html
+++ b/alchemy/templates/article.html
@@ -14,8 +14,8 @@
 {% endblock %}
 
 {% block content %}
-<div class="article">
-  <div class="article-header">
+<article class="article">
+  <header>
     <ul class="list-inline">
       <li class="text-muted" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</li>
       <li>&middot;</li>
@@ -33,10 +33,8 @@
       </li>
       {% endif %}
     </ul>
-  </div>
-  <div class="article-main">
-    {{ article.content }}
-  </div>
-</div>
+  </header>
+  {{ article.content }}
+</article>
 {% include 'include/comments.html' %}
 {% endblock %}
diff --git a/alchemy/templates/base.html b/alchemy/templates/base.html
index ede4487..1cb96b7 100644
--- a/alchemy/templates/base.html
+++ b/alchemy/templates/base.html
@@ -55,7 +55,7 @@
 </head>
 
 <body>
-  <div class="header">
+  <header class="header">
     <div class="container">
       <div class="row">
         <div class="col-sm-4">
@@ -68,7 +68,7 @@
           <p>{{ SITE_TAGLINE }}</p>
           <hr>
           {% if HEADER_LINKS or SHOW_HEADER_PAGES or EMAIL_ADDRESS or FACEBOOK_ADDRESS or GITHUB_ADDRESS or GOOGLE_ADDRESS or TWITTER_ADDRESS %}
-          <ul class="list-inline">
+          <nav class="list-inline">
             {% if HEADER_LINKS %}
             {% for title, link in HEADER_LINKS %}
             <li><a href="{{ link }}" target="_blank">{{ title }}</a></li>
@@ -103,12 +103,12 @@
             {% if TWITTER_ADDRESS %}
             <li><a class="fa fa-fw fa-twitter" href="{{ TWITTER_ADDRESS }}" target="_blank"></a></li>
             {% endif %}
-          </ul>
+          </nav>
           {% endif %}
         </div>
       </div>
     </div>
-  </div>
+  </header>
 
   <div class="main">
     <div class="container">
@@ -119,12 +119,12 @@
     </div>
   </div>
 
-  <div class="footer">
+  <footer class="footer">
     <div class="container">
       <div class="row">
         <div class="col-sm-6">
           {% if SHOW_FOOTER_AUTHORS or SHOW_FOOTER_ARCHIVES or SHOW_FOOTER_CATEGORIES or SHOW_FOOTER_TAGS %}
-          <ul class="list-inline">
+          <nav class="list-inline">
             {% if SHOW_ARTICLE_AUTHOR and SHOW_FOOTER_AUTHORS %}
             <li><a href="{{ SITEURL }}/authors.html">Authors</a></li>
             {% endif %}
@@ -137,7 +137,7 @@
             {% if SHOW_FOOTER_TAGS %}
             <li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
             {% endif %}
-          </ul>
+          </nav>
           {% endif %}
         </div>
         <div class="col-sm-6 hidden-xs text-right text-muted">
@@ -145,7 +145,7 @@
         </div>
       </div>
     </div>
-  </div>
-</body> <!-- 42 -->
+  </footer>
+</body>
 
 </html>
diff --git a/alchemy/templates/index.html b/alchemy/templates/index.html
index 7bb10d1..3f6d0a5 100644
--- a/alchemy/templates/index.html
+++ b/alchemy/templates/index.html
@@ -15,21 +15,19 @@ All Articles
 
 {% block content %}
 {% for article in articles_page.object_list %}
-<div class="teaser">
-  <div class="row">
-    <div class="col-sm-4 hidden-xs teaser-header">
-      <div class="text-muted teaser-date" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</div>
-      <div><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></div>
-      {% if article.author and SHOW_ARTICLE_AUTHOR %}
-      <div>By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></div>
-      {% endif %}
-    </div>
-    <div class="col-sm-8 teaser-main">
-      <h2><a href="/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
-      <p>{{ article.summary }}</p>
-    </div>
+<article class="row teaser">
+  <header class="col-sm-4 hidden-xs">
+    <div class="text-muted" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</div>
+    <div><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></div>
+    {% if article.author and SHOW_ARTICLE_AUTHOR %}
+    <div>By <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></div>
+    {% endif %}
+  </header>
+  <div class="col-sm-8">
+    <h3><a href="/{{ article.url }}" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h3>
+    {{ article.summary }}
   </div>
-</div>
+</article>
 {% if not loop.last %}
 <hr>
 {% endif %}
diff --git a/alchemy/templates/page.html b/alchemy/templates/page.html
index 8bc4497..800e2ed 100644
--- a/alchemy/templates/page.html
+++ b/alchemy/templates/page.html
@@ -14,9 +14,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="page">
-  <div class="page-main">
-    {{ page.content }}
-  </div>
-</div>
+<article class="page">
+  {{ page.content }}
+</article>
 {% endblock %}
