diff --git a/templates/article.html b/templates/article.html
index 07c62e9..19806c1 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -12,126 +12,8 @@
 {%- endif -%}
 
 <article>
-	{%- if page.extra.banner -%}
-		<div id="banner-container">
-			<img id="banner" class="full-bleed{% if page.extra.banner_pixels %} pixels{% endif %}" src="{{ current_url ~ page.extra.banner }}" {% if config.markdown.lazy_async_image %}decoding="async" loading="lazy"{% endif %} />
-		</div>
-	{%- endif -%}
-
-	<div id="heading">
-		{%- if page.date -%}
-			<p>
-				<small>
-					<time datetime="{{ page.date | date(format=' %+') }}">
-						{{- macros_translate::translate(key="published", default="Published on", language_strings=language_strings) }}
-						{{ page.date | date(format=date_format, locale=date_locale) -}}
-					</time>
-					{%- if page.updated -%}
-						<span> {{ config.extra.separator | default(value="•") }} </span>
-						<time datetime="{{ page.updated | date(format=' %+') }}">
-							{{- macros_translate::translate(key="updated", default="Updated on", language_strings=language_strings) }}
-							{{ page.updated | date(format=date_format, locale=date_locale) -}}
-						</time>
-					{%- endif -%}
-				</small>
-			</p>
-		{%- endif -%}
-
-		<h1>{{ page.title }}</h1>
-
-		{%- if page.authors or config.extra.show_reading_time -%}
-			<p>
-				<small>
-					{%- if page.authors -%}
-						<span>{% include "partials/authors.html" -%}</span>
-						{%- if config.extra.show_reading_time -%}
-							<span> {{ config.extra.separator | default(value="•") }} </span>
-						{%- endif -%}
-					{%- endif -%}
-
-					{%- if config.extra.show_reading_time -%}
-						<span>{{ macros_translate::translate(key="minutes_read", number=page.reading_time, default="$NUMBER minute read", language_strings=language_strings) }}</span>
-						{%- if page.taxonomies -%}
-							<span> {{ config.extra.separator | default(value="•") }} </span>
-						{%- endif -%}
-					{%- endif -%}
-				</small>
-			</p>
-		{%- endif -%}
-
-		{%- if page.taxonomies -%}
-			{%- for name, taxon in page.taxonomies %}
-				<ul class="tags">
-					{%-for item in taxon -%}
-						<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
-					{%- endfor %}
-				</ul>
-			{%- endfor -%}
-		{%- endif %}
-	</div>
-
-	<div id="buttons-container">
-		{%- if page.extra.toc and page.toc | length > 0 -%}
-			<details id="toc" class="closable">
-				<summary title="{{ macros_translate::translate(key='table_of_contents', default='Table of Contents', language_strings=language_strings) }}"><i class="icon"></i></summary>
-				<div>
-					<strong class="title">{{ macros_translate::translate(key="table_of_contents", default="Table of Contents", language_strings=language_strings) }}</strong>
-					<div>
-						<{{ list_element }}>
-							{%- for h1 in page.toc -%}
-								<li>
-									<a href="{{ h1.permalink | safe }}">{{ h1.title }}</a>
-									{%- if h1.children -%}
-										<{{ list_element }}>
-											{%- for h2 in h1.children -%}
-												<li>
-													<a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
-												</li>
-											{%- endfor -%}
-										</{{ list_element }}>
-									{%- endif -%}
-								</li>
-							{%- endfor -%}
-						</{{ list_element }}>
-					</div>
-				</div>
-			</details>
-		{%- endif -%}
-		{%- if config.extra.show_backlinks and page.backlinks | length > 0 -%}
-			<details id="backlinks" class="closable">
-				<summary title="{{ macros_translate::translate(key='backlinks', default='Backlinks', language_strings=language_strings) }}"><i class="icon"></i></summary>
-				<div>
-					<strong class="title">{{ macros_translate::translate(key="backlinks", default="Backlinks", language_strings=language_strings) }}</strong>
-					<div>
-						<ul>
-							{%- for backlink in page.backlinks -%}
-								<li>
-									<a href="{{ backlink.permalink }}">{{ backlink.title }}</a>
-								</li>
-							{%- endfor -%}
-						</ul>
-					</div>
-				</div>
-			</details>
-		{%- endif -%}
-		<a id="go-to-top" href="#top" title="{{ macros_translate::translate(key='go_to_top', default='Go to Top', language_strings=language_strings) }}"><i class="icon"></i></a>
-		{%- if config.extra.show_share_button -%}
-			<a id="share" href="https://shareopenly.org/share/?url={{ page.permalink }}{% if page.description %}&text={{ page.description | urlencode }}{% endif %}" rel="{{ rel_attributes }}" title="{{ macros_translate::translate(key='share', default='Share', language_strings=language_strings) }}"><i class="icon"></i></a>
-		{%- endif -%}
-		{%- if config.extra.issues_url -%}
-			<a id="issue" href="{{ config.extra.issues_url }}" rel="{{ rel_attributes }}" title="{{ macros_translate::translate(key='file_an_issue', default='File an Issue', language_strings=language_strings) }}"><i class="icon"></i></a>
-		{%- endif -%}
-	</div>
-
-	{%- include "partials/statements.html" -%}
-
-	{%- if page.extra.toc_inline -%}
-		{%- include "partials/toc.html" -%}
-	{%- elif config.extra.toc_inline -%}
-		{%- include "partials/toc.html" -%}
-	{%- endif -%}
-
-	{{ page.content | safe }}
+	{% include "partials/banner.html" %}
+	{% include "partials/article_content.html" %}
 </article>
 
 {%- if page.extra.comments.id -%}
diff --git a/templates/article_list.html b/templates/article_list.html
index a623199..559b707 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -43,24 +43,6 @@
 </p>
 
 {% include "partials/articles.html" %}
+{% include "partials/paginator.html" %}
 
-{%- if paginator.pages -%}
-	<nav id="paginator">
-		{%- if paginator.previous -%}
-			<a id="paginator-previous" href="{{ paginator.previous }}">
-				<i class="icon"></i>
-				<div>{{ macros_translate::translate(key='previous', default='Previous', language_strings=language_strings) }}</div>
-			</a>
-		{%- endif -%}
-
-		<div></div>
-
-		{%- if paginator.next -%}
-			<a id="paginator-next" href="{{ paginator.next }}">
-				<div>{{ macros_translate::translate(key='next', default='Next', language_strings=language_strings) }}</div>
-				<i class="icon"></i>
-			</a>
-		{%- endif -%}
-	</nav>
-{%- endif -%}
 {% endblock content %}
diff --git a/templates/documentation_page.html b/templates/documentation_page.html
index 6b2878a..bea4b00 100644
--- a/templates/documentation_page.html
+++ b/templates/documentation_page.html
@@ -19,103 +19,7 @@ expand-main
 	{% include "partials/docs_toc.html" %}
 
 	<article>
-		<div id="heading">
-
-			<h1>{{ page.title }}</h1>
-
-			{%- if page.authors or config.extra.show_reading_time -%}
-				<p>
-					<small>
-						{%- if page.authors -%}
-							<span>{% include "partials/authors.html" -%}</span>
-							{%- if config.extra.show_reading_time -%}
-								<span> {{ config.extra.separator | default(value="•") }} </span>
-							{%- endif -%}
-						{%- endif -%}
-
-						{%- if config.extra.show_reading_time -%}
-							<span>{{ macros_translate::translate(key="minutes_read", number=page.reading_time, default="$NUMBER minute read", language_strings=language_strings) }}</span>
-							{%- if page.taxonomies -%}
-								<span> {{ config.extra.separator | default(value="•") }} </span>
-							{%- endif -%}
-						{%- endif -%}
-					</small>
-				</p>
-			{%- endif -%}
-
-			{%- if page.taxonomies -%}
-				{%- for name, taxon in page.taxonomies %}
-					<ul class="tags">
-						{%-for item in taxon -%}
-							<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
-						{%- endfor %}
-					</ul>
-				{%- endfor -%}
-			{%- endif %}
-		</div>
-
-		<div id="buttons-container">
-			{%- if page.extra.toc and page.toc | length > 0 -%}
-				<details id="toc" class="closable">
-					<summary title="{{ macros_translate::translate(key='table_of_contents', default='Table of Contents', language_strings=language_strings) }}"><i class="icon"></i></summary>
-					<div>
-						<strong class="title">{{ macros_translate::translate(key="table_of_contents", default="Table of Contents", language_strings=language_strings) }}</strong>
-						<div>
-							<{{ list_element }}>
-								{%- for h1 in page.toc -%}
-									<li>
-										<a href="{{ h1.permalink | safe }}">{{ h1.title }}</a>
-										{%- if h1.children -%}
-											<{{ list_element }}>
-												{%- for h2 in h1.children -%}
-													<li>
-														<a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
-													</li>
-												{%- endfor -%}
-											</{{ list_element }}>
-										{%- endif -%}
-									</li>
-								{%- endfor -%}
-							</{{ list_element }}>
-						</div>
-					</div>
-				</details>
-			{%- endif -%}
-			{%- if config.extra.show_backlinks and page.backlinks | length > 0 -%}
-				<details id="backlinks" class="closable">
-					<summary title="{{ macros_translate::translate(key='backlinks', default='Backlinks', language_strings=language_strings) }}"><i class="icon"></i></summary>
-					<div>
-						<strong class="title">{{ macros_translate::translate(key="backlinks", default="Backlinks", language_strings=language_strings) }}</strong>
-						<div>
-							<ul>
-								{%- for backlink in page.backlinks -%}
-									<li>
-										<a href="{{ backlink.permalink }}">{{ backlink.title }}</a>
-									</li>
-								{%- endfor -%}
-							</ul>
-						</div>
-					</div>
-				</details>
-			{%- endif -%}
-			<a id="go-to-top" href="#top" title="{{ macros_translate::translate(key='go_to_top', default='Go to Top', language_strings=language_strings) }}"><i class="icon"></i></a>
-			{%- if config.extra.show_share_button -%}
-				<a id="share" href="https://shareopenly.org/share/?url={{ page.permalink }}{% if page.description %}&text={{ page.description | urlencode }}{% endif %}" rel="{{ rel_attributes }}" title="{{ macros_translate::translate(key='share', default='Share', language_strings=language_strings) }}"><i class="icon"></i></a>
-			{%- endif -%}
-			{%- if config.extra.issues_url -%}
-				<a id="issue" href="{{ config.extra.issues_url }}" rel="{{ rel_attributes }}" title="{{ macros_translate::translate(key='file_an_issue', default='File an Issue', language_strings=language_strings) }}"><i class="icon"></i></a>
-			{%- endif -%}
-		</div>
-
-		{%- include "partials/statements.html" -%}
-
-		{%- if page.extra.toc_inline -%}
-			{%- include "partials/toc.html" -%}
-		{%- elif config.extra.toc_inline -%}
-			{%- include "partials/toc.html" -%}
-		{%- endif -%}
-
-		{{ page.content | safe }}
+		{% include "partials/article_content.html" %}
 	</article>
 
 	<div id="toc-hidden">
diff --git a/templates/partials/article_content.html b/templates/partials/article_content.html
new file mode 100644
index 0000000..9bccb27
--- /dev/null
+++ b/templates/partials/article_content.html
@@ -0,0 +1,114 @@
+<div id="heading">
+	{%- if page.date -%}
+		<p>
+			<small>
+				<time datetime="{{ page.date | date(format=' %+') }}">
+					{{- macros_translate::translate(key="published", default="Published on", language_strings=language_strings) }}
+					{{ page.date | date(format=date_format, locale=date_locale) -}}
+				</time>
+				{%- if page.updated -%}
+					<span> {{ config.extra.separator | default(value="•") }} </span>
+					<time datetime="{{ page.updated | date(format=' %+') }}">
+						{{- macros_translate::translate(key="updated", default="Updated on", language_strings=language_strings) }}
+						{{ page.updated | date(format=date_format, locale=date_locale) -}}
+					</time>
+				{%- endif -%}
+			</small>
+		</p>
+	{%- endif -%}
+
+	<h1>{{ page.title }}</h1>
+
+	{%- if page.authors or config.extra.show_reading_time -%}
+		<p>
+			<small>
+				{%- if page.authors -%}
+					<span>{% include "partials/authors.html" -%}</span>
+					{%- if config.extra.show_reading_time -%}
+						<span> {{ config.extra.separator | default(value="•") }} </span>
+					{%- endif -%}
+				{%- endif -%}
+
+				{%- if config.extra.show_reading_time -%}
+					<span>{{ macros_translate::translate(key="minutes_read", number=page.reading_time, default="$NUMBER minute read", language_strings=language_strings) }}</span>
+					{%- if page.taxonomies -%}
+						<span> {{ config.extra.separator | default(value="•") }} </span>
+					{%- endif -%}
+				{%- endif -%}
+			</small>
+		</p>
+	{%- endif -%}
+
+	{%- if page.taxonomies -%}
+		{%- for name, taxon in page.taxonomies %}
+			<ul class="tags">
+				{%-for item in taxon -%}
+					<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
+				{%- endfor %}
+			</ul>
+		{%- endfor -%}
+	{%- endif %}
+</div>
+
+<div id="buttons-container">
+	{%- if page.extra.toc and page.toc | length > 0 -%}
+		<details id="toc" class="closable">
+			<summary title="{{ macros_translate::translate(key='table_of_contents', default='Table of Contents', language_strings=language_strings) }}"><i class="icon"></i></summary>
+			<div>
+				<strong class="title">{{ macros_translate::translate(key="table_of_contents", default="Table of Contents", language_strings=language_strings) }}</strong>
+				<div>
+					<{{ list_element }}>
+						{%- for h1 in page.toc -%}
+							<li>
+								<a href="{{ h1.permalink | safe }}">{{ h1.title }}</a>
+								{%- if h1.children -%}
+									<{{ list_element }}>
+										{%- for h2 in h1.children -%}
+											<li>
+												<a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
+											</li>
+										{%- endfor -%}
+									</{{ list_element }}>
+								{%- endif -%}
+							</li>
+						{%- endfor -%}
+					</{{ list_element }}>
+				</div>
+			</div>
+		</details>
+	{%- endif -%}
+	{%- if config.extra.show_backlinks and page.backlinks | length > 0 -%}
+		<details id="backlinks" class="closable">
+			<summary title="{{ macros_translate::translate(key='backlinks', default='Backlinks', language_strings=language_strings) }}"><i class="icon"></i></summary>
+			<div>
+				<strong class="title">{{ macros_translate::translate(key="backlinks", default="Backlinks", language_strings=language_strings) }}</strong>
+				<div>
+					<ul>
+						{%- for backlink in page.backlinks -%}
+							<li>
+								<a href="{{ backlink.permalink }}">{{ backlink.title }}</a>
+							</li>
+						{%- endfor -%}
+					</ul>
+				</div>
+			</div>
+		</details>
+	{%- endif -%}
+	<a id="go-to-top" href="#top" title="{{ macros_translate::translate(key='go_to_top', default='Go to Top', language_strings=language_strings) }}"><i class="icon"></i></a>
+	{%- if config.extra.show_share_button -%}
+		<a id="share" href="https://shareopenly.org/share/?url={{ page.permalink }}{% if page.description %}&text={{ page.description | urlencode }}{% endif %}" rel="{{ rel_attributes }}" title="{{ macros_translate::translate(key='share', default='Share', language_strings=language_strings) }}"><i class="icon"></i></a>
+	{%- endif -%}
+	{%- if config.extra.issues_url -%}
+		<a id="issue" href="{{ config.extra.issues_url }}" rel="{{ rel_attributes }}" title="{{ macros_translate::translate(key='file_an_issue', default='File an Issue', language_strings=language_strings) }}"><i class="icon"></i></a>
+	{%- endif -%}
+</div>
+
+{%- include "partials/statements.html" -%}
+
+{%- if page.extra.toc_inline -%}
+	{%- include "partials/toc.html" -%}
+{%- elif config.extra.toc_inline -%}
+	{%- include "partials/toc.html" -%}
+{%- endif -%}
+
+{{ page.content | safe }}
diff --git a/templates/partials/banner.html b/templates/partials/banner.html
new file mode 100644
index 0000000..f69d726
--- /dev/null
+++ b/templates/partials/banner.html
@@ -0,0 +1,5 @@
+{%- if page.extra.banner -%}
+	<div id="banner-container">
+		<img id="banner" class="full-bleed{% if page.extra.banner_pixels %} pixels{% endif %}" src="{{ current_url ~ page.extra.banner }}" {% if config.markdown.lazy_async_image %}decoding="async" loading="lazy"{% endif %} />
+	</div>
+{%- endif -%}
diff --git a/templates/partials/paginator.html b/templates/partials/paginator.html
new file mode 100644
index 0000000..a55f792
--- /dev/null
+++ b/templates/partials/paginator.html
@@ -0,0 +1,19 @@
+{%- if paginator.pages -%}
+	<nav id="paginator">
+		{%- if paginator.previous -%}
+			<a id="paginator-previous" href="{{ paginator.previous }}">
+				<i class="icon"></i>
+				<div>{{ macros_translate::translate(key='previous', default='Previous', language_strings=language_strings) }}</div>
+			</a>
+		{%- endif -%}
+
+		<div></div>
+
+		{%- if paginator.next -%}
+			<a id="paginator-next" href="{{ paginator.next }}">
+				<div>{{ macros_translate::translate(key='next', default='Next', language_strings=language_strings) }}</div>
+				<i class="icon"></i>
+			</a>
+		{%- endif -%}
+	</nav>
+{%- endif -%}
diff --git a/templates/subproject.html b/templates/subproject.html
index e932137..cc0f3a4 100644
--- a/templates/subproject.html
+++ b/templates/subproject.html
@@ -12,109 +12,8 @@
 {%- set section = get_section(path=page.ancestors | last) -%}
 
 <article>
-	{%- if page.extra.banner -%}
-		<div id="banner-container">
-			<img id="banner" class="full-bleed{% if page.extra.banner_pixels %} pixels{% endif %}" src="{{ current_url ~ page.extra.banner }}" {% if config.markdown.lazy_async_image %}decoding="async" loading="lazy"{% endif %} />
-		</div>
-	{%- endif -%}
-
-	<div id="heading">
-
-		<h1>{{ page.title }}</h1>
-
-		{%- if page.authors or config.extra.show_reading_time -%}
-			<p>
-				<small>
-					{%- if page.authors -%}
-						<span>{% include "partials/authors.html" -%}</span>
-						{%- if config.extra.show_reading_time -%}
-							<span> {{ config.extra.separator | default(value="•") }} </span>
-						{%- endif -%}
-					{%- endif -%}
-
-					{%- if config.extra.show_reading_time -%}
-						<span>{{ macros_translate::translate(key="minutes_read", number=page.reading_time, default="$NUMBER minute read", language_strings=language_strings) }}</span>
-						{%- if page.taxonomies -%}
-							<span> {{ config.extra.separator | default(value="•") }} </span>
-						{%- endif -%}
-					{%- endif -%}
-				</small>
-			</p>
-		{%- endif -%}
-
-		{%- if page.taxonomies -%}
-			{%- for name, taxon in page.taxonomies %}
-				<ul class="tags">
-					{%-for item in taxon -%}
-						<li><a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a></li>
-					{%- endfor %}
-				</ul>
-			{%- endfor -%}
-		{%- endif %}
-	</div>
-
-	<div id="buttons-container">
-		{%- if page.extra.toc and page.toc | length > 0 -%}
-			<details id="toc" class="closable">
-				<summary title="{{ macros_translate::translate(key='table_of_contents', default='Table of Contents', language_strings=language_strings) }}"><i class="icon"></i></summary>
-				<div>
-					<strong class="title">{{ macros_translate::translate(key="table_of_contents", default="Table of Contents", language_strings=language_strings) }}</strong>
-					<div>
-						<{{ list_element }}>
-							{%- for h1 in page.toc -%}
-								<li>
-									<a href="{{ h1.permalink | safe }}">{{ h1.title }}</a>
-									{%- if h1.children -%}
-										<{{ list_element }}>
-											{%- for h2 in h1.children -%}
-												<li>
-													<a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
-												</li>
-											{%- endfor -%}
-										</{{ list_element }}>
-									{%- endif -%}
-								</li>
-							{%- endfor -%}
-						</{{ list_element }}>
-					</div>
-				</div>
-			</details>
-		{%- endif -%}
-		{%- if config.extra.show_backlinks and page.backlinks | length > 0 -%}
-			<details id="backlinks" class="closable">
-				<summary title="{{ macros_translate::translate(key='backlinks', default='Backlinks', language_strings=language_strings) }}"><i class="icon"></i></summary>
-				<div>
-					<strong class="title">{{ macros_translate::translate(key="backlinks", default="Backlinks", language_strings=language_strings) }}</strong>
-					<div>
-						<ul>
-							{%- for backlink in page.backlinks -%}
-								<li>
-									<a href="{{ backlink.permalink }}">{{ backlink.title }}</a>
-								</li>
-							{%- endfor -%}
-						</ul>
-					</div>
-				</div>
-			</details>
-		{%- endif -%}
-		<a id="go-to-top" href="#top" title="{{ macros_translate::translate(key='go_to_top', default='Go to Top', language_strings=language_strings) }}"><i class="icon"></i></a>
-		{%- if config.extra.show_share_button -%}
-			<a id="share" href="https://shareopenly.org/share/?url={{ page.permalink }}{% if page.description %}&text={{ page.description | urlencode }}{% endif %}" rel="{{ rel_attributes }}" title="{{ macros_translate::translate(key='share', default='Share', language_strings=language_strings) }}"><i class="icon"></i></a>
-		{%- endif -%}
-		{%- if config.extra.issues_url -%}
-			<a id="issue" href="{{ config.extra.issues_url }}" rel="{{ rel_attributes }}" title="{{ macros_translate::translate(key='file_an_issue', default='File an Issue', language_strings=language_strings) }}"><i class="icon"></i></a>
-		{%- endif -%}
-	</div>
-
-	{%- include "partials/statements.html" -%}
-
-	{%- if page.extra.toc_inline -%}
-		{%- include "partials/toc.html" -%}
-	{%- elif config.extra.toc_inline -%}
-		{%- include "partials/toc.html" -%}
-	{%- endif -%}
-
-	{{ page.content | safe }}
+	{% include "partials/banner.html" %}
+    {% include "partials/article_content.html" %}
 </article>
 
 {%- if page.extra.comments.id -%}
diff --git a/templates/subproject_list.html b/templates/subproject_list.html
index cbe2155..67920e3 100644
--- a/templates/subproject_list.html
+++ b/templates/subproject_list.html
@@ -43,24 +43,6 @@
 </p>
 
 {% include "partials/subprojects.html" %}
+{% include "partials/paginator.html" %}
 
-{%- if paginator.pages -%}
-	<nav id="paginator">
-		{%- if paginator.previous -%}
-			<a id="paginator-previous" href="{{ paginator.previous }}">
-				<i class="icon"></i>
-				<div>{{ macros_translate::translate(key='previous', default='Previous', language_strings=language_strings) }}</div>
-			</a>
-		{%- endif -%}
-
-		<div></div>
-
-		{%- if paginator.next -%}
-			<a id="paginator-next" href="{{ paginator.next }}">
-				<div>{{ macros_translate::translate(key='next', default='Next', language_strings=language_strings) }}</div>
-				<i class="icon"></i>
-			</a>
-		{%- endif -%}
-	</nav>
-{%- endif -%}
 {% endblock content %}