diff --git a/_config.yml b/_config.yml
index bc19a8c..eba548b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -13,6 +13,25 @@ pagination:
   sort_field: 'date'
   sort_reverse: true
 
+autopages:
+  enabled: true
+
+  categories:
+    layouts:
+      - pagination.html
+    title: "Category: :cat"
+    permalink: /categories/:cat
+
+  tags:
+    layouts:
+      - pagination.html
+    title: "Posts tagged with :tag"
+    permalink: /tags/:tag
+
+  collections:
+    enabled: false
+
+
 defaults:
   - scope:
       path: ""
diff --git a/_includes/header.html b/_includes/header.html
index ceb9880..6716901 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -3,9 +3,9 @@
 		<img id='header-logo' src='/favicon.png' alt=''>
 		<h1><a href='/'>Bune City Blog</a></h1>
 		<nav>
-			<a href='/'>Categories</a>
-			<a href='/'>Tags</a>
-			<a href='/'>lynnesbian.space</a>
+			<a href='/categories.html'>Categories</a>
+			<a href='/tags.html'>Tags</a>
+			<a href='https://lynnesbian.space'>lynnesbian.space</a>
 		</nav>
 	</div>
 </header>
\ No newline at end of file
diff --git a/_layouts/pagination.html b/_layouts/pagination.html
new file mode 100644
index 0000000..a0f3cbf
--- /dev/null
+++ b/_layouts/pagination.html
@@ -0,0 +1,36 @@
+---
+layout: default
+---
+{% include header.html %}
+<h1 id='logo'>{{ site.title }}</h1>
+{%- if page.autopages %}
+<div id='subheading'>Posts in category "{{ page.autopages.display_name }}"</div>
+{% endif -%}
+<main>
+	<div id='posts'>
+		{% for post in paginator.posts %}
+		<div class='post'>
+			<h2><a href='{{ post.url }}'>{{ post.title }}</a></h2>
+			<div id='post-info'>
+				<i class='material-icons'>access_time</i> {{ post.date | date_to_string: "ordinal" }}
+				<i class='material-icons'>group_work</i>
+				{{ " " }}{%- for category in post.categories -%}
+				<a href='/categories/{{ category | downcase }}'>{{ category }}</a>
+				{%- unless category == post.categories.last %}, {% endunless %}
+				{%- endfor %} <br>
+			</div>
+			<div class='post-excerpt'>
+				<p>{{ post.summary | default: post.excerpt }}</p>
+			</div>
+		</div>
+		{% endfor %}
+
+		{%- if paginator.total_pages > 1 %}
+		<div id='pagination'>
+			<a {%- if paginator.previous_page %} href='{{ paginator.previous_page_path | absolute_url }}' {%- endif %}>Newer</a>
+			Page {{ paginator.page }} of {{ paginator.total_pages }}
+			<a {%- if paginator.next_page %} href='{{ paginator.next_page_path | absolute_url }}' {%- endif %}>Older</a>
+		</div>
+		{%- endif %}
+	</div>
+</main>
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index 546a55e..a75cf6f 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -9,12 +9,12 @@ layout: default
 			<i class='material-icons'>access_time</i> Published {{ page.date | date_to_long_string: "ordinal" }} <br>
 			<i class='material-icons'>group_work</i> Categories:
 			{{ " " }}{%- for category in page.categories -%}
-			<a href='/categories/{{ category }}'>{{ category }}</a>
+			<a href='/categories/{{ category | downcase }}'>{{ category }}</a>
 			{%- unless category == page.categories.last %}, {% endunless %}
 			{%- endfor %} <br>
 			<i class='material-icons'>label</i> Tags:
 			{{ " " }}{%- for tag in page.tags -%}
-			<a href='/tags/{{ category }}'>{{ tag }}</a>
+			<a href='/tags/{{ tag | downcase }}'>{{ tag }}</a>
 			{%- unless tag == page.tags.last %}, {% endunless %}
 			{%- endfor %}
 		</section>
@@ -43,7 +43,8 @@ layout: default
 			{%- unless summary %}
 			{%- assign summary = page.excerpt | summarise | truncate: 150 %}
 			{%- endunless %}
-			<a class='post-share mastodon' target='_blank' href='/mastodon-share.html#Bune City Blog - {{ page.title }}%0A%0A{{ summary }}%0A{{ page.url | absolute_url }}%0A%23BuneCityBlog'></a>
+			{%- assign summary = summary | escape %}
+			<a class='post-share mastodon' target='_blank' href='/mastodon-share.html#Bune City Blog - {{ page.title }}%0A%0A{{ summary }}%0A%0A{{ page.url | absolute_url }} %23BuneCityBlog'></a>
 			<a class='post-share email' target='_blank' href="mailto:?subject={{ page.title }} - Bune City Blog&amp;body=An interesting article I read on the Bune City Blog: {{ summary }} Read more: {{ page.url }}"></a>
 		</section>
 		<section id='post-comments'>
diff --git a/assets/style.css b/assets/style.css
index 0d62e14..4b97f97 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -13,6 +13,13 @@ h1#logo {
 	font-family: "Playfair Display", serif;
 }
 
+#subheading {
+	text-align: center;
+	font-family: serif;
+	font-size: 1.3em;
+	margin-top: -20px;
+}
+
 header {
 	font-family: sans-serif;
 	background: #fafafa;
diff --git a/index.html b/index.html
index ebfcf00..d12c0c3 100644
--- a/index.html
+++ b/index.html
@@ -1,36 +1,6 @@
 ---
-layout: default
+layout: pagination
 title: "bune.city - Home"
 pagination:
   enabled: true
 ---
-{% include header.html %}
-<h1 id='logo'>{{ site.title }}</h1>
-<main>
-	<div id='posts'>
-		{% for post in paginator.posts %}
-		<div class='post'>
-			<h2><a href='{{ post.url }}'>{{ post.title }}</a></h2>
-			<div id='post-info'>
-				<i class='material-icons'>access_time</i> {{ post.date | date_to_string: "ordinal" }}
-				<i class='material-icons'>group_work</i> 
-				{{ " " }}{%- for category in post.categories -%}
-				<a href='/categories/{{ category }}'>{{ category }}</a>
-				{%- unless category == post.categories.last %}, {% endunless %}
-				{%- endfor %} <br>
-			</div>
-			<div class='post-excerpt'>
-				<p>{{ post.summary | default: post.excerpt }}</p>
-			</div>
-		</div>
-		{% endfor %}
-
-		{%- if paginator.total_pages > 1 %}
-		<div id='pagination'>
-			<a {%- if paginator.previous_page %} href='{{ paginator.previous_page_path | absolute_url }}' {%- endif %}>Newer</a>
-			Page {{ paginator.page }} of {{ paginator.total_pages }}
-			<a {%- if paginator.next_page %} href='{{ paginator.next_page_path | absolute_url }}' {%- endif %}>Older</a>
-		</div>
-		{%- endif %}
-	</div>
-</main>
\ No newline at end of file