diff --git a/pelicanconf_lite.py b/pelicanconf_lite.py
index 13e24c5..35fa18a 100644
--- a/pelicanconf_lite.py
+++ b/pelicanconf_lite.py
@@ -26,10 +26,10 @@ MARKDOWN = {
         'markdown.extensions.codehilite': {'css_class': 'highlight'},
         'markdown.extensions.extra': {},
         'markdown.extensions.meta': {},
-        #'markdown.extensions.toc': {
-        #    'toc_depth': '2-3',
-        #    'anchorlink': True,
-        #},
+        'markdown.extensions.toc': {
+            'toc_depth': '2-3',
+            'anchorlink': True,
+        },
     },
     'output_format': 'html5',
 }
diff --git a/publishconf_lite.py b/publishconf_lite.py
index cd64335..913e535 100644
--- a/publishconf_lite.py
+++ b/publishconf_lite.py
@@ -26,10 +26,10 @@ MARKDOWN = {
         'markdown.extensions.codehilite': {'css_class': 'highlight'},
         'markdown.extensions.extra': {},
         'markdown.extensions.meta': {},
-        #'markdown.extensions.toc': {
-        #    'toc_depth': '2-3',
-        #    'anchorlink': True,
-        #},
+        'markdown.extensions.toc': {
+            'toc_depth': '2-3',
+            'anchorlink': True,
+        },
     },
     'output_format': 'html5',
 }
@@ -56,8 +56,10 @@ TAGS_SAVE_AS = ''
 
 INDEX_SAVE_AS = 'index.html'
 ARTICLE_URL = '{slug}/'
-ARTICLE_SAVE_AS = '{slug}/index.html'
+ARTICLE_SAVE_AS = '{category}/{slug}/index.html'
 PAGE_URL = '{slug}/'
 PAGE_SAVE_AS = '{slug}/index.html'
+CATEGORY_URL = '{slug}/'
+CATEGORY_SAVE_AS = '{slug}/index.html'
 
 PROD = True
diff --git a/themes/lite/templates/article.html b/themes/lite/templates/article.html
index 5a44cd8..c3994ff 100644
--- a/themes/lite/templates/article.html
+++ b/themes/lite/templates/article.html
@@ -1,62 +1,56 @@
 {% extends "base.html" %}
 
-{% block title %}{{ SITENAME }} - {{ article.title|striptags  }}{% endblock %}
-
-{% block head %}
-	{{ super() }}
-
-	{% if article.date %}
-		<meta name="date" content="{{article.date}}" />
-	{% endif %}
-
-	{% if article.summary %}
-		<meta name="description" content="{{article.summary|striptags}}" />
-		<meta name="summary" content="{{article.summary|striptags}}" />
-	{% endif %}
-
-	{% if article.category %}
-		<meta name="category" content="{{article.category}}" />
-	{% endif %}
-
-	{% for tag in article.tags %}
-		<meta name="tags" content="{{tag}}" />
-	{% endfor %}
-
-{% endblock %}
-
-{% block info %}
-	Tanner Collin
-	<p class="contact-icons">
-		<a href="mailto:site2@tannercollin.com" rel="noreferrer noopener"><img alt="email" src="/theme/mail.svg" width="20" height="20" /></a>
-		<a href="https://t.me/tannercollin" target="_blank" rel="noreferrer noopener"><img alt="telegram" src="/theme/telegram.svg" width="20" height="20" /></a>
-		<a href="https://github.com/tannercollin" target="_blank" rel="noreferrer noopener"><img alt="github" src="/theme/github.svg" width="20" height="20" /></a>
-	</p>
+{% block style %}
+.summary {
+	font-style: italic;
+}
+.metadata {
+	color: #555;
+}
+pre {
+	font-size: 0.9rem;
+	line-height: 1.2;
+	padding: 1rem;
+	overflow-x: auto;
+	background-color: #ddd;
+}
+:not(pre)>code {
+	padding: 0 2px;
+	font-size: 0.8rem;
+	background-color: #ddd;
+}
+.aside {
+	display: inline;
+	float: left;
+	position: relative;
+	width: 8rem;
+	margin-left: -9rem;
+	font-size: 0.9rem;
+}
+img {
+	width: 100%;
+	height: auto;
+}
 {% endblock %}
 
 {% block content %}
+	<h2>{{ article.title }}</h2>
 
-	{% if article.wide %}
-		<div class="content content-wide">
-	{% else %}
-		<div class="content">
-	{% endif %}
+	<header>
+		<div class="summary">
+			{{ article.summary }}
+		</div>
+		<p class="metadata">
+			{{ article.locale_date }}
+			{% if article.modified %}
+				— updated {{ article.locale_modified }}
+			{% endif %}
+		</p>
+	</header>
 
-		<p><a href="/">← Return to Home</a></p>
-		<header>
-			<h1>{{ article.title }}</h1>
-			<div class="summary">
-				{{ article.summary }}
-			</div>
-			<p class="metadata">
-				{{ article.locale_date }}
-				{% if article.modified %}
-					— updated {{ article.locale_modified }}
-				{% endif %}
-			</p>
-		</header>
-		<hr />
-		<article>
-			{{ article.content }}
-		</article>
-	</div>
+	<hr />
+
+	<article>
+		{{ article.content }}
+	</article>
 {% endblock %}
diff --git a/themes/lite/templates/base.html b/themes/lite/templates/base.html
index 89be862..0cff80d 100644
--- a/themes/lite/templates/base.html
+++ b/themes/lite/templates/base.html
@@ -1,8 +1,12 @@
 <meta charset="UTF-8"/>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="icon" href="data:;base64,=">
 <style>
-body {background: #eee; font: 1.1rem/1.5 serif;}
-h1, h2 {margin-left: -24; font-family: sans-serif;}
+body {font: 1.1rem/1.5 serif; overflow-y: scroll;}
+h1, h2 {font-family: sans-serif;}
 a {text-decoration: none; color: #000; border-bottom: 1px solid #000;}
+{% block style %}
+{% endblock %}
 </style>
 <div style="max-width: 600; margin: auto">
 	<h1>Tanner Collin</h1>
diff --git a/themes/lite/templates/category.html b/themes/lite/templates/category.html
index 5d22ca9..6b71af2 100644
--- a/themes/lite/templates/category.html
+++ b/themes/lite/templates/category.html
@@ -1,6 +1,10 @@
 {% extends "base.html" %}
 
 {% block content %}
-	<h2>{{ category.title }}</h2>
+	<h2>{{ category }}</h2>
+	{% for article in articles_page.object_list if article.category == category %}
+	<h3><a href="{{ article.url }}">{{ article.title }}</a></h3>
+	{{ article.summary }}
+	{% endfor %}
 {% endblock %}