diff --git a/README.md b/README.md
index 979a3a1..2053460 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<!-- omit from toc -->
 # Terminimal
 
 [![Build Status](https://github.com/pawroman/zola-theme-terminimal/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/pawroman/zola-theme-terminimal/actions/workflows/pages/pages-build-deployment)
@@ -9,9 +8,10 @@
 See the live demo (of the default configuration) here:
 https://pawroman.github.io/zola-theme-terminimal/
 
-Tested with Zola v0.17.2. Please note that earlier versions might not work because of breaking changes across Zola versions.
+Tested with Zola v0.19.2.
+
+Please note that earlier (and older) versions might not work because of breaking changes across Zola versions.
 
-<!-- omit from toc -->
 #### Fork disclaimer
 
 This theme is a fork (not a port) of "Terminal" Hugo theme
@@ -23,37 +23,6 @@ Many thanks for that outstanding original theme, Radek!
 For more information about this fork and the differences to the original theme, please see:
 [Changes compared to the original theme](#changes-compared-to-the-original-theme) below.
 
-<!-- omit from toc -->
-## Table of contents
-
-- [Versioning](#versioning)
-- [How to start](#how-to-start)
-- [Shortcodes](#shortcodes)
-  - [`image`](#image)
-  - [`figure`](#figure)
-- [Features](#features)
-  - [OpenGraph](#opengraph)
-  - [Mastodon](#mastodon)
-- [Configuration](#configuration)
-  - [Only show the post's description](#only-show-the-posts-description)
-  - [Colors](#colors)
-  - [Logo text and link](#logo-text-and-link)
-  - [Author and copyright](#author-and-copyright)
-  - [Menu](#menu)
-  - [Tags](#tags)
-  - [Pagination](#pagination)
-  - [Language code](#language-code)
-  - [Hack font subset](#hack-font-subset)
-  - [Favicon](#favicon)
-  - [Page titles](#page-titles)
-- [Extending](#extending)
-- [How to contribute](#how-to-contribute)
-- [Changes compared to the original theme](#changes-compared-to-the-original-theme)
-  - [New features](#new-features)
-  - [Features retained from the original](#features-retained-from-the-original)
-- [License](#license)
-
-
 ## Versioning
 
 This theme used to be non-versioned, e.g. you'd pull the master branch, and occasionally new features or fixes would
@@ -161,7 +130,7 @@ the following to your `config.toml`:
 
 ```toml
 [extra]
-mastodon_url = "https://hachyderm.io/@opeik"
+mastodon_url = "https://hachyderm.io/@my_username_here"
 ```
 
 ## Configuration
@@ -471,5 +440,3 @@ for more information.
 
 The license for Hack fonts used is included in
 [LICENSE-Hack.md](../master/LICENSE-Hack.md).
-
-[utterances]: https://utteranc.es/
diff --git a/config.toml b/config.toml
index cfcceca..b03451a 100644
--- a/config.toml
+++ b/config.toml
@@ -6,10 +6,10 @@ title = "Zola Terminimal theme"
 compile_sass = true
 
 # The theme supports feeds (RSS and ATOM)
-generate_feed = true
+generate_feeds = true
 
 # Use `rss.xml` for RSS feeds and `atom.xml` for ATOM.
-feed_filename = "atom.xml"
+feed_filenames = ["rss.xml", "atom.xml"]
 
 # Optional: enable tags
 taxonomies = [
diff --git a/templates/index.html b/templates/index.html
index 22f7c4c..d2bf2b0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,14 +13,18 @@
 
     {%- block open_graph %}{{ head_macros::open_graph(config=config) }}{% endblock open_graph -%}
 
-    {%- if config.generate_feed %}
-        {%- if "rss" in config.feed_filename %}
-            {% set feed_type = 'rss+xml' %}
-        {%- else %}
-            {% set feed_type = 'atom+xml' %}
-        {% endif -%}
-        <link rel="alternate" type="application/{{ feed_type }}" title="RSS" href="{{ get_url(path=config.feed_filename) | safe }}">
-    {% endif -%}
+    {%- if config.generate_feeds %}
+        {%- for feed in config.feed_filenames %}
+            {%- if feed is containing('atom') %}
+                <link rel="alternate" type="application/atom+xml" title="{{ config.title }} Atom Feed" href="{{ get_url(path=feed, trailing_slash=false, lang=lang) | safe }}" />
+            {%- endif %}
+
+            {%- if feed is containing('rss') %}
+                <link rel="alternate" type="application/rss+xml" title="{{ config.title }} RSS Feed" href="{{ get_url(path=feed, trailing_slash=false, lang=lang) | safe }}" />
+            {%- endif %}
+
+        {%- endfor %}
+    {%- endif -%}
 
     {%- if config.extra.favicon %}
         <link rel="shortcut icon" type="{{ config.extra.favicon_mimetype | default(value="image/x-icon") | safe }}" href="{{ config.extra.favicon | safe }}">