diff --git a/templates/base-page.html b/templates/base-page.html
new file mode 100644
index 0000000..49a1661
--- /dev/null
+++ b/templates/base-page.html
@@ -0,0 +1,15 @@
+<h1>{{ page.title }}</h1>
+
+{% if page.toc and page.extra.toc %}
+    {% include "toc.html" %}
+{% endif %}
+
+{{ page.content | safe }}
+
+<p class="tagsData">
+    {% if page.taxonomies.tags %}
+        {% for tag in page.taxonomies.tags %}
+            <a href="/tags/{{ tag | slugify }}">&#47;{{ tag }}&#47;</a>
+        {% endfor %}
+    {% endif %}
+</p>
\ No newline at end of file
diff --git a/templates/blog-page.html b/templates/blog-page.html
index 5bb8d11..324fa66 100644
--- a/templates/blog-page.html
+++ b/templates/blog-page.html
@@ -6,42 +6,7 @@
 {% if config.extra.author and config.extra.display_author == true %}
 <address rel="author">By <span class="metaData">{{config.extra.author}}</span></address>
 {% endif %}
-<h1>{{ page.title }}</h1>
 
-{% if page.toc and page.extra.toc %}
-<h2>Table of contents</h2>
-<ul>
-  {% for h1 in page.toc %}
-  <li>
-    <a href="{{ h1.permalink | safe }}">{{ h1.title }}</a>
-    {% if h1.children %}
-    <ul>
-      {% for h2 in h1.children %}
-      <li>
-        <a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
-        <ul>
-          {% for h3 in h2.children %}
-          <li>
-            <a href="{{ h3.permalink | safe }}">{{ h3.title }}</a>
-          </li>
-          {% endfor %}
-        </ul>
-      </li>
-      {% endfor %}
-    </ul>
-    {% endif %}
-  </li>
-  {% endfor %}
-</ul>
-{% endif %}
+{% include "base-page.html" %}
 
-{{ page.content | safe }}
-
-<p class="tagsData">
-  {% if page.taxonomies.tags %}
-  {% for tag in page.taxonomies.tags %}
-  <a href="/tags/{{ tag | slugify }}">&#47;{{ tag }}&#47;</a>
-  {% endfor %}
-  {% endif %}
-</p>
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/footer.html b/templates/footer.html
index 316e2e3..f3fc5c7 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -2,7 +2,7 @@
 <div class=footContainer>
   <div class="footLeft">
     <p>Licensed under the <a target="_blank" rel="noopener noreferrer" href="https://en.wikipedia.org/wiki/MIT_License">MIT License</a>.<br>
-      Built with <a target="_blank" rel="noopener noreferrer" href="https://www.getzola.org">Zola</a> using <a target="_blank" rel="noopener noreferrer" href="https://github.com/Speyll/anemone">anemone</a> theme &amp; <a target="_blank" rel="noopener noreferrer" href="https://github.com/Speyll/veqev">veqev</a> colors.<br>
+    Built with <a target="_blank" rel="noopener noreferrer" href="https://www.getzola.org">Zola</a> combining the <a target="_blank" rel="noopener noreferrer" href="https://github.com/Speyll/anemone">anemone</a> and <a href="https://github.com/rhazdon/hugo-theme-hello-friend-ng/">hello-friend-ng</a> themes.<br>
     </p>
   </div>
   {% if config.generate_feed %}
diff --git a/templates/head.html b/templates/head.html
index 38555c5..682195c 100644
--- a/templates/head.html
+++ b/templates/head.html
@@ -87,6 +87,7 @@
 {% if image %}
 <link rel="shortcut icon" type="image/x-icon" href="{{ get_url(path=config.extra.favicon, trailing_slash=false) }}">
 {% endif %}
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 {% endblock metatags %}
 {% if config.generate_feed %}
 {% block feed %}
diff --git a/templates/index.html b/templates/index.html
index e68bfa3..d36a724 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8,10 +8,23 @@
     <h1>{{ config.title }}</h1>
     {% endif %}
     {% if config.extra.home_subtitle %}
-        <p>{{ config.extra.home_subtitle }}</p>
+        <p>{{ config.extra.home_subtitle }}<span id="subtitleRand"></span></p>
     {% elif config.description %}
-        <p>{{ config.description }}</p>
+        <p>{{ config.description }}<span id="subtitleRand"></span></p>
     {% endif %}
     {% include "svg.html" %}
 </div>
+{% if config.extra.home_subtitle_suffixes %}
+
+<script>
+const suffixes = [
+    {% for s in config.extra.home_subtitle_suffixes %}
+    "{{ s }}",
+    {% endfor %}
+]
+var current = suffixes[Math.floor(Math.random() * suffixes.length)];
+var span = document.getElementById("subtitleRand");
+span.textContent = current;
+</script>
+{% endif %}
 {% endblock content %}
diff --git a/templates/page.html b/templates/page.html
index a823465..60bfc60 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,42 +1,5 @@
 {% extends "base.html" %}
 
 {% block content %}
-<h1>{{ page.title }}</h1>
-
-{% if page.toc and page.extra.toc %}
-<h2>Table of contents</h2>
-<ul>
-{% for h1 in page.toc %}
-  <li>
-  <a href="{{ h1.permalink | safe }}">{{ h1.title }}</a>
-  {% if h1.children %}
-    <ul>
-      {% for h2 in h1.children %}
-        <li>
-        <a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
-          <ul>
-          {% for h3 in h2.children %}
-            <li>
-            <a href="{{ h3.permalink | safe }}">{{ h3.title }}</a>
-            </li>
-          {% endfor %}
-          </ul>
-        </li>
-      {% endfor %}
-    </ul>
-  {% endif %}
-  </li>
-{% endfor %}
-</ul>
-{% endif %}
-
-{{ page.content | safe }}
-
-<p class="tagsData">
-{% if page.taxonomies.tags %}
-{% for tag in page.taxonomies.tags %}
-<a href="/tags/{{ tag | slugify }}">&#47;{{ tag }}&#47;</a>
-{% endfor %}
-{% endif %}
-</p>
+    {% include "base-page.html" %}
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/shortcodes/image.html b/templates/shortcodes/image.html
deleted file mode 100644
index 616cc2b..0000000
--- a/templates/shortcodes/image.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% if src %}
-  {# If the image's URL is internal to the site... #}
-  {% if src is not starting_with("http") %}
-    {# ... then prepend the site's base URL to the image's URL. #}
-    {% set src = config.base_url ~ src %}
-  {% endif %}
-  <center><img src="{{ src | safe }}"{% if alt %} alt="{{ alt }}"{% endif %} class="{% if position %}{{ position }}{% else -%} center {%- endif %}" {%- if style %} style="border-radius: 8px; {{ style | safe }}" {%- endif %} /></center>
-{% endif %}
diff --git a/templates/toc.html b/templates/toc.html
new file mode 100644
index 0000000..2dda25b
--- /dev/null
+++ b/templates/toc.html
@@ -0,0 +1,26 @@
+<div class="toc">
+<h2>Table of contents</h2>
+<ul>
+  {% for h1 in page.toc %}
+  <li>
+    <a href="{{ h1.permalink | safe }}">{{ h1.title }}</a>
+    {% if h1.children %}
+    <ul>
+      {% for h2 in h1.children %}
+      <li>
+        <a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
+        <ul>
+          {% for h3 in h2.children %}
+          <li>
+            <a href="{{ h3.permalink | safe }}">{{ h3.title }}</a>
+          </li>
+          {% endfor %}
+        </ul>
+      </li>
+      {% endfor %}
+    </ul>
+    {% endif %}
+  </li>
+  {% endfor %}
+</ul>
+</div>
\ No newline at end of file