diff --git a/blog/content/_index.md b/blog/content/_index.md
new file mode 100644
index 00000000..493e0c96
--- /dev/null
+++ b/blog/content/_index.md
@@ -0,0 +1,13 @@
++++
+template = "edition-2/index.html"
++++
+
+<h1 style="visibility: hidden; height: 0px; margin: 0px; padding: 0px;">Writing an OS in Rust</h1>
+
+<div class="front-page-introduction">
+
+This blog series creates a small operating system in the [Rust programming language](https://www.rust-lang.org/). Each post is a small tutorial and includes all needed code, so you can follow along if you like. The source code is also available in the corresponding [Github repository](https://github.com/phil-opp/blog_os).
+
+Latest post: <!-- latest-post -->
+
+</div>
diff --git a/blog/templates/edition-1/index.html b/blog/templates/edition-1/index.html
index 31d4aae7..0d8a68ab 100644
--- a/blog/templates/edition-1/index.html
+++ b/blog/templates/edition-1/index.html
@@ -1,6 +1,6 @@
 {% extends "edition-1/base.html" %}
 
-{% import "macros.html" as macros %}
+{% import "edition-1/macros.html" as macros %}
 
 {% block title %}{{ config.title }}{% endblock title %}
 
diff --git a/blog/templates/edition-1/macros.html b/blog/templates/edition-1/macros.html
new file mode 100644
index 00000000..a6197dad
--- /dev/null
+++ b/blog/templates/edition-1/macros.html
@@ -0,0 +1,39 @@
+{% macro post_link(page) %}
+    {% set translations = page.translations | filter(attribute="lang", value=lang) -%}
+    {%- if translations -%}
+        {%- set post = get_page(path = translations.0.path) -%}
+    {%- else -%}
+        {%- set post = page -%}
+        {%- set not_translated = true -%}
+    {%- endif -%}
+    <div{% if post.extra.rtl %} class="right-to-left"{% endif %}>
+        <h2 class="post-title"><a href="{{ post.path | safe }}">{{ post.title }}</a></h2>
+        <div class="post-summary">
+            {{ post.summary | safe }}
+            <a class="read-more" href="{{ post.path | safe }}"><em>read&nbsp;more&nbsp;»</em></a>
+
+            {%- if lang and not_translated and lang != config.default_language -%}
+            <aside class="no-translation">
+                (This post is not translated yet.)
+            </aside>
+            {%- endif -%}
+        </div>
+    </div>
+{% endmacro post_link %}
+
+{% macro toc(toc) %}
+    <details id = "toc-inline">
+        <summary><b>Table of Contents</b></summary>
+        <ul>
+            {% for h2 in toc %}<li>
+                <a href="#{{h2.id | safe}}">{{ h2.title | safe }}</a>
+                {% if h2.children %}<ul>
+                    {% for h3 in h2.children %}<li>
+                        <a href="#{{h3.id | safe}}">{{ h3.title | safe }}</a>
+                    </li>{% endfor %}
+                </ul>{% endif %}
+            </li>{% endfor %}
+            <li class="toc-comments-link"><a href="#comments">Comments</a></li>
+        </ul>
+    </details>
+{% endmacro toc %}
diff --git a/blog/templates/edition-1/section.html b/blog/templates/edition-1/section.html
index 3bbe0a8a..45d12fa3 100644
--- a/blog/templates/edition-1/section.html
+++ b/blog/templates/edition-1/section.html
@@ -1,6 +1,6 @@
 {% extends "edition-1/base.html" %}
 
-{% import "macros.html" as macros %}
+{% import "edition-1/macros.html" as macros %}
 
 {% block title %}{{ section.title }} | {{ config.title }}{% endblock title %}
 
diff --git a/blog/templates/edition-2/extra.html b/blog/templates/edition-2/extra.html
index bdd5a16a..93c98f59 100644
--- a/blog/templates/edition-2/extra.html
+++ b/blog/templates/edition-2/extra.html
@@ -1,6 +1,6 @@
 {% extends "edition-2/base.html" %}
 
-{% import "macros.html" as macros %}
+{% import "snippets.html" as snippets %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 
@@ -17,6 +17,6 @@
     <hr>
     <section>
         <h2>Comments</h2>
-        {{ macros::utterances() }}
+        {{ snippets::utterances() }}
     </section>
 {% endblock after_main %}
diff --git a/blog/templates/edition-2/index.html b/blog/templates/edition-2/index.html
index b8303d4b..4c893f5c 100644
--- a/blog/templates/edition-2/index.html
+++ b/blog/templates/edition-2/index.html
@@ -1,6 +1,7 @@
 {% extends "edition-2/base.html" %}
 
-{% import "macros.html" as macros %}
+{% import "edition-2/macros.html" as macros %}
+{% import "snippets.html" as snippets %}
 
 {% block title %}{{ config.title }}{% endblock title %}
 
@@ -8,20 +9,10 @@
 {% set posts_section = get_section(path = "edition-2/posts/_index.md") %}
 {% set posts = posts_section.pages %}
 
-<h1 style="visibility: hidden; height: 0px; margin: 0px; padding: 0px;">Writing an OS in Rust</h1>
-
-<div class="front-page-introduction">
-    <p>
-        This blog series creates a small operating system in the
-        <a href="https://www.rust-lang.org/">Rust programming language</a>. Each post is a small tutorial and includes all
-        needed code, so you can follow along if you like. The source code is also available in the corresponding
-        <a href="https://github.com/phil-opp/blog_os">Github repository</a>.
-    </p>
-    <p>Latest post:
-        {% set latest_post = posts|last %}
-        <strong><a href="{{ latest_post.path | safe }}">{{ latest_post.title }}</a></strong>
-    </p>
-</div>
+{{ section.content
+    | replace(from="<!-- latest-post -->", to=macros::latest_post(posts=posts))
+    | safe
+}}
 
 <div>
 {%- set chapter = "none" -%}
@@ -71,7 +62,7 @@
 
 <div class="">
     <h2>Support Me</h2>
-    {% include "support.html" %}
+    {{ snippets::support() }}
 </div>
 {% endblock main %}
 
diff --git a/blog/templates/macros.html b/blog/templates/edition-2/macros.html
similarity index 85%
rename from blog/templates/macros.html
rename to blog/templates/edition-2/macros.html
index a7c700a9..a28a44bb 100644
--- a/blog/templates/macros.html
+++ b/blog/templates/edition-2/macros.html
@@ -1,3 +1,8 @@
+{% macro latest_post(posts) %}
+    {% set post = posts|last %}
+    <strong><a href="{{ post.path | safe }}">{{ post.title }}</a></strong>
+{% endmacro latest_post %}
+
 {% macro post_link(page) %}
     {% set translations = page.translations | filter(attribute="lang", value=lang) -%}
     {%- if translations -%}
@@ -21,16 +26,6 @@
     </div>
 {% endmacro post_link %}
 
-{% macro utterances() %}
-    <script src="https://utteranc.es/client.js"
-        data-repo="phil-opp/blog_os"
-        data-issue-term="url"
-        data-label="comments"
-        crossorigin="anonymous"
-        async>
-    </script>
-{% endmacro utterances %}
-
 {% macro toc(toc) %}
     <details id = "toc-inline">
         <summary><b>Table of Contents</b></summary>
diff --git a/blog/templates/edition-2/page.html b/blog/templates/edition-2/page.html
index ef440314..13a70d79 100644
--- a/blog/templates/edition-2/page.html
+++ b/blog/templates/edition-2/page.html
@@ -1,6 +1,7 @@
 {% extends "edition-2/base.html" %}
 
-{% import "macros.html" as macros %}
+{% import "edition-2/macros.html" as macros %}
+{% import "snippets.html" as snippets %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 {% block header %}
@@ -75,7 +76,7 @@
 
     <div class="post-footer-support">
         <h2>Support Me</h2>
-        {% include "support.html" %}
+        {{ snippets::support() }}
     </div>
 
     <hr>
@@ -98,7 +99,7 @@
         </p>
         {% endif %}
 
-        {{ macros::utterances() }}
+        {{ snippets::utterances() }}
     </section>
 
     <aside class="page-aside-right">
diff --git a/blog/templates/edition-2/section.html b/blog/templates/edition-2/section.html
new file mode 100644
index 00000000..572012b6
--- /dev/null
+++ b/blog/templates/edition-2/section.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+
+{% import "edition-2/macros.html" as macros %}
+
+{% block title %}{{ section.title }} | {{ config.title }}{% endblock title %}
+
+{% block main %}
+
+<h1>{{ section.title }}</h1>
+
+{% block introduction %}{% endblock introduction %}
+
+<div class="posts neutral">
+    {% for page in section.pages %}
+        {{ macros::post_link(page=page) }}
+    {% endfor %}
+</div>
+
+{% endblock main %}
diff --git a/blog/templates/news-page.html b/blog/templates/news-page.html
index de988f7d..0de7b67c 100644
--- a/blog/templates/news-page.html
+++ b/blog/templates/news-page.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% import "macros.html" as macros %}
+{% import "snippets.html" as snippets %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 
@@ -17,7 +17,7 @@
     <hr>
     <section>
         <h2 id="comments">Comments</h2>
-        {{ macros::utterances() }}
+        {{ snippets::utterances() }}
     </section>
 
 {% endblock after_main %}
diff --git a/blog/templates/news-section.html b/blog/templates/news-section.html
index abea315d..2834d277 100644
--- a/blog/templates/news-section.html
+++ b/blog/templates/news-section.html
@@ -1,7 +1,5 @@
 {% extends "base.html" %}
 
-{% import "macros.html" as macros %}
-
 {% block title %}{{ section.title }} | {{ config.title }}{% endblock title %}
 
 {% block main %}
diff --git a/blog/templates/section.html b/blog/templates/section.html
index 3b879148..fc048eab 100644
--- a/blog/templates/section.html
+++ b/blog/templates/section.html
@@ -1,19 +1 @@
-{% extends "base.html" %}
-
-{% import "macros.html" as macros %}
-
-{% block title %}{{ section.title }} | {{ config.title }}{% endblock title %}
-
-{% block main %}
-
-<h1>{{ section.title }}</h1>
-
-{% block introduction %}{% endblock introduction %}
-
-<div class="posts neutral">
-    {% for page in section.pages %}
-        {{ macros::post_link(page=page) }}
-    {% endfor %}
-</div>
-
-{% endblock main %}
+{% extends "edition-2/section.html" %}
diff --git a/blog/templates/support.html b/blog/templates/snippets.html
similarity index 71%
rename from blog/templates/support.html
rename to blog/templates/snippets.html
index b2fbe445..d3057a32 100644
--- a/blog/templates/support.html
+++ b/blog/templates/snippets.html
@@ -1,3 +1,4 @@
+{% macro support() %}
 <p>
     Creating and <a href="{{ get_url(path="@/status-update/_index.md") }}">maintaining</a> this blog and the associated libraries is a lot of work, but I really enjoy doing it. By supporting me, you allow me to invest more time in new content, new features, and continuous maintenance.
 </p>
@@ -6,4 +7,15 @@
 </p>
 <p>
     Thank you!
-</p>
\ No newline at end of file
+</p>
+{% endmacro support %}
+
+{% macro utterances() %}
+    <script src="https://utteranc.es/client.js"
+        data-repo="phil-opp/blog_os"
+        data-issue-term="url"
+        data-label="comments"
+        crossorigin="anonymous"
+        async>
+    </script>
+{% endmacro utterances %}
\ No newline at end of file
diff --git a/blog/templates/status-update-page.html b/blog/templates/status-update-page.html
index 78630e4d..45741e7d 100644
--- a/blog/templates/status-update-page.html
+++ b/blog/templates/status-update-page.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% import "macros.html" as macros %}
+{% import "snippets.html" as snippets %}
 
 {% block title %}{{ page.title }} | {{ config.title }}{% endblock title %}
 
@@ -32,7 +32,7 @@
     <hr>
     <section>
         <h2 id="comments">Comments</h2>
-        {{ macros::utterances() }}
+        {{ snippets::utterances() }}
     </section>
 
 {% endblock after_main %}
diff --git a/blog/templates/status-update-section.html b/blog/templates/status-update-section.html
index dc8b46da..99d66d77 100644
--- a/blog/templates/status-update-section.html
+++ b/blog/templates/status-update-section.html
@@ -1,7 +1,5 @@
 {% extends "base.html" %}
 
-{% import "macros.html" as macros %}
-
 {% block title %}{{ section.title }} | {{ config.title }}{% endblock title %}
 
 {% block main %}