diff --git a/alchemy/static/css/style.css b/alchemy/static/css/style.css
index c3b1456..53167ad 100644
--- a/alchemy/static/css/style.css
+++ b/alchemy/static/css/style.css
@@ -5,19 +5,34 @@ body {
   font-size: 18px;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   font-family: 'Helvetica Neue', 'Helvetica', 'Roboto', 'Arial', sans-serif;
   font-weight: normal;
 }
 
-a:focus, a:hover {
-  color: #ff9800;
-}
-
 .container {
   max-width: 970px;
 }
 
+.pagination > li > a,
+.pagination > li > span {
+  color: #333;
+}
+
+.pagination > li > a:hover,
+.pagination > li > span:hover,
+.pagination > li > a:focus,
+.pagination > li > span:focus,
+a:focus,
+a:hover {
+  color: #ff9800;
+}
+
 .header {
   border-bottom: 1px solid #ddd;
   padding-top: 20px;
@@ -33,12 +48,12 @@ a:focus, a:hover {
   padding: 20px 0;
 }
 
-.header img, .header ul {
+.header img,
+.header ul {
   margin-bottom: 20px;
 }
 
 .header h1 {
-  font-size: 2.0em;
   font-weight: bold;
   margin-top: 0;
 }
@@ -51,31 +66,27 @@ a:focus, a:hover {
   margin-top: 0;
 }
 
-.page-header h1 {
-  font-size: 2.8em;
-}
-
-.teaser h2 {
-  font-size: 1em;;
-  line-height: 1.42857143; /* WTF */
+.teaser h3 {
   margin: 0 0 30px;
-  font-weight: bold;
 }
 
 .teaser p {
   margin: 0;
 }
 
-.teaser-header div {
+.teaser header div {
   margin-bottom: 10px;
 }
 
-.teaser-date {
-  font-family: 'Helvetica Neue', 'Helvetica', 'Roboto', 'Arial', sans-serif;
-  margin: 0 0 30px;
+.article blockquote,
+.article ul,
+.article ol,
+.article .highlight {
+  margin: 30px 0;
 }
 
-.section-heading {
-  font-weight: normal;
-  margin-top: 40px;
+.article blockquote p:first-child,
+.article blockquote ul:first-child,
+.article blockquote ol:first-child {
+  margin-top: 0;
 }
diff --git a/alchemy/templates/article.html b/alchemy/templates/article.html
index b9efedd..862b0cd 100644
--- a/alchemy/templates/article.html
+++ b/alchemy/templates/article.html
@@ -38,6 +38,5 @@
     {{ article.content }}
   </div>
 </div>
-<hr>
 {% include 'include/comments.html' %}
 {% endblock %}
diff --git a/alchemy/templates/base.html b/alchemy/templates/base.html
index c441a36..ede4487 100644
--- a/alchemy/templates/base.html
+++ b/alchemy/templates/base.html
@@ -6,7 +6,6 @@
   <meta charset="utf-8">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-
   <title>{% block title %}&mdash; {{ SITENAME }}{% endblock %}</title>
   <link rel="canonical" href="{{ SITEURL }}/{{ output_file }}">
 
diff --git a/alchemy/templates/include/comments.html b/alchemy/templates/include/comments.html
index bc3235c..36412c7 100644
--- a/alchemy/templates/include/comments.html
+++ b/alchemy/templates/include/comments.html
@@ -1,4 +1,5 @@
 {% if DISQUS_SITENAME %}
+<hr>
 <div id="disqus_thread"></div>
 <script>
   var disqus_config = function () {
diff --git a/alchemy/templates/include/pagination.html b/alchemy/templates/include/pagination.html
index 9eb3052..b2dcf83 100644
--- a/alchemy/templates/include/pagination.html
+++ b/alchemy/templates/include/pagination.html
@@ -1,15 +1,12 @@
 {% if DEFAULT_PAGINATION %}
+<hr>
 <ul class="pagination">
   {% if articles_page.has_previous() %}
   <li><a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&laquo;</a></li>
-  {% else %}
-  <li class="disabled"><span>&laquo;<span></li>
   {% endif %}
   <li><span>{{ articles_page.number }} of {{ articles_paginator.num_pages }}</span></li>
   {% if articles_page.has_next() %}
   <li><a href="{{ SITEURL }}/{{ articles_next_page.url }}">&raquo;</a></li>
-  {% else %}
-  <li class="disabled"><span>&raquo;<span></li>
   {% endif %}
 </ul>
 {% endif %}
diff --git a/alchemy/templates/index.html b/alchemy/templates/index.html
index a03893b..7bb10d1 100644
--- a/alchemy/templates/index.html
+++ b/alchemy/templates/index.html
@@ -30,7 +30,9 @@ All Articles
     </div>
   </div>
 </div>
+{% if not loop.last %}
 <hr>
+{% endif %}
 {% endfor %}
 {% include 'include/pagination.html' %}
 {% endblock %}