diff --git a/templates/index.html b/templates/index.html
index f976ef6..f0fd607 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,31 +1,59 @@
 {% extends "base.html" %}
 
+{% import "macros.html" as macros %}
+
 {% block content %}
-{% for page in section.pages | reverse %}
-<h1><a href="{{ page.permalink }}" class="stealth">{{ page.title }}</a></h1>
-{% if page.date %}
-<span>{{ page.date | date(format="%Y-%m-%d") }}</span>
-{% endif %}
-{% if page.summary %}
-<p>{{ page.summary | safe }}</p>
-{% endif %}
-{% if not loop.last %}<hr>{% endif %}
-{% endfor %}
+    {% for page in section.pages | reverse %}
+        <h1><a href="{{ page.permalink }}" class="stealth">{{ page.title }}</a></h1>
+        {% if page.date %}
+            <span>{{ page.date | date(format="%Y-%m-%d") }}{% if page.extra.author %}, by {{ page.extra.author }}{% endif %}</span>
+        {% endif %}
+        {% if page.summary %}
+            {% if config.extra.summary_max_length %}
+                {% set sum = page.summary | safe | truncate(length=config.extra.summary_max_length) %}
+            {% else %}
+                {% set sum = page.summary | safe %}
+            {% endif %}
+            <p>{{ sum | safe }}</p>
+        {% endif %}
+        {% if not loop.last %}<hr>{% endif %}
+    {% endfor %}
 {% endblock %}
 
+{% block nav %}
+    <span>{{ config.extra.index_nav_text | default(value="") }}</span>
+    <noscript id="theme-toggle-placeholder"></noscript>
+{% endblock nav %}
+
 {% block footer %}
-<span>
-    &copy; {{ now() | date(format='%Y') }}
-    {% if section.extra.author %}
-    {{ section.extra.author }}
-    {% elif config.extra.author %}
-    {{ config.extra.author }}
-    {% endif %}
-</span>
+    <span>
+        &copy; {{ now() | date(format='%Y') }}
+        {% if section.extra.author %}
+        {{ section.extra.author }}
+        {% elif config.extra.author %}
+        {{ config.extra.author }}
+        {% endif %}
+    </span>
 {% endblock %}
 
 {% block aside %}
-{% for k, thing in section %}
-{{ k }}: {{ thing }}<br>
-{% endfor %}
+    {% if section.title %}
+        <h1>{{ section.title }}</h1>
+    {% endif %}
+    {% if section.content %}
+        {{ section.content | safe }}
+    {% endif %}
+    {% if section.subsections %}
+        {{ config.extra.subsections_string | default(value="Subsections:") }}
+        <ul>
+            {% for sub in section.subsections %}
+                {% set dom = sub | trim_end_matches(pat="/_index.md") %}
+                <li><a class="stealth" href="{{ dom }}">{{ dom }}</a></li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+    {% if config.extra.xscratch_debug_info %}
+    <span><strong>Debug info:</strong></span>
+    {{ macros::debug(thing=section, label="section", recurse=1) }}
+    {% endif %}
 {% endblock %}
\ No newline at end of file