diff --git a/jekyll_files/_includes/components/footer.html b/jekyll_files/_includes/components/footer.html
index 8cdf185..01b2c23 100644
--- a/jekyll_files/_includes/components/footer.html
+++ b/jekyll_files/_includes/components/footer.html
@@ -1,37 +1,34 @@
-
-
-{% capture footer_custom %}
- {%- include footer_custom.html -%}
-{% endcapture %}
-{% if footer_custom != "" or site.last_edit_timestamp or site.gh_edit_link %}
-
-
-{% endif %}
+{% capture footer_custom %}
+ {%- include footer_custom.html -%}
+{% endcapture %}
+{% if footer_custom != "" or site.last_edit_timestamp or site.gh_edit_link %}
+
+
+{% endif %}
diff --git a/jekyll_files/_includes/components/header.html b/jekyll_files/_includes/components/header.html
index 067687b..f9c3386 100644
--- a/jekyll_files/_includes/components/header.html
+++ b/jekyll_files/_includes/components/header.html
@@ -1,14 +1,11 @@
-
-
-
- {% if site.search_enabled != false %}
- {% include components/search_header.html %}
- {% else %}
-
- {% endif %}
- {% include header_custom.html %}
- {% if site.aux_links %}
- {% include components/aux_nav.html %}
- {% endif %}
-
+
+ {% if site.search_enabled != false %}
+ {% include components/search_header.html %}
+ {% else %}
+
+ {% endif %}
+ {% include header_custom.html %}
+ {% if site.aux_links %}
+ {% include components/aux_nav.html %}
+ {% endif %}
+
diff --git a/jekyll_files/_includes/components/mermaid.html b/jekyll_files/_includes/components/mermaid.html
index 061e70f..a99a563 100644
--- a/jekyll_files/_includes/components/mermaid.html
+++ b/jekyll_files/_includes/components/mermaid.html
@@ -1,48 +1,45 @@
-
-
-{% comment %}
-The complexity of this file comes from a breaking change in Mermaid v10; mermaid.init has been deprecated (and supposedly, didn't work earlier?).
-
-So, we check whether the user's Mermaid version is >= 10; if not, we fall back to the previous init syntax.
-
-If a user is using a custom mermaid file and doesn't specify a version, we default to the < v10 behaviour. Users who use version v10 or above should specify this in the version key.
-{% endcomment %}
-
-{% if site.mermaid.version %}
- {% assign mermaid_major_version = site.mermaid.version | split: "." | first | plus: 0 %}
-{% else %}
- {% assign mermaid_major_version = 9 %}
-{% endif %}
-
-{% if mermaid_major_version > 9 %}
-
-
-
-{% else %}
-
-{% if site.mermaid.path %}
-
-{% else %}
-
-{% endif %}
-
-
-
-{% endif %}
+{% comment %}
+The complexity of this file comes from a breaking change in Mermaid v10; mermaid.init has been deprecated (and supposedly, didn't work earlier?).
+
+So, we check whether the user's Mermaid version is >= 10; if not, we fall back to the previous init syntax.
+
+If a user is using a custom mermaid file and doesn't specify a version, we default to the < v10 behaviour. Users who use version v10 or above should specify this in the version key.
+{% endcomment %}
+
+{% if site.mermaid.version %}
+ {% assign mermaid_major_version = site.mermaid.version | split: "." | first | plus: 0 %}
+{% else %}
+ {% assign mermaid_major_version = 9 %}
+{% endif %}
+
+{% if mermaid_major_version > 9 %}
+
+
+
+{% else %}
+
+{% if site.mermaid.path %}
+
+{% else %}
+
+{% endif %}
+
+
+
+{% endif %}
diff --git a/jekyll_files/_includes/components/search_footer.html b/jekyll_files/_includes/components/search_footer.html
index 70adb29..d448fdb 100644
--- a/jekyll_files/_includes/components/search_footer.html
+++ b/jekyll_files/_includes/components/search_footer.html
@@ -1,10 +1,7 @@
-
-
-{% if site.search.button %}
-
-{% endif %}
-
-
+{% if site.search.button %}
+
+{% endif %}
+
+
diff --git a/jekyll_files/_includes/components/search_header.html b/jekyll_files/_includes/components/search_header.html
index cb7091e..3562124 100644
--- a/jekyll_files/_includes/components/search_header.html
+++ b/jekyll_files/_includes/components/search_header.html
@@ -1,12 +1,9 @@
-
-
-{% capture search_placeholder %}{% include search_placeholder_custom.html %}{% endcapture %}
-
-
+{%- comment -%}
+ Include as: {%- include components/sidebar.html -%}
+ Depends on: page(?), site.
+ Results in: HTML for the side bar.
+ Includes:
+ title.html, nav.html, nav_footer_custom.html
+ Overwrites:
+ pages_top_size, collections_size, collection_entry,
+ collection_key, collection_value, collection, nav_footer_custom.
+ Should not be cached, because nav_footer_custom.html might depend on page.
+{%- endcomment -%}
+
+
diff --git a/jekyll_files/_includes/favicon.html b/jekyll_files/_includes/favicon.html
index 3085779..7d2a53d 100644
--- a/jekyll_files/_includes/favicon.html
+++ b/jekyll_files/_includes/favicon.html
@@ -1,26 +1,23 @@
-
-
-{%- comment -%}
- Include as: {%- include_cached favicon.html -%}
- Depends on: site.static_files.
- Results in: HTML for a link to an existing `favicon.ico` file.
- Overwrites:
- file.
-
- The endoflife.date site has 226 pages and 3410 static files. @marcwrobel pointed
- out that the time taken by evaluating the code in this file on every page when
- building that site was significant, and suggested making it optional. As it is
- page-independent, it can easily be cached. Doing that reduced the time taken by
- rendering `_includes/head.html` from 15.294s to 10.760s, thereby reducing the
- total build time from 26.074s to 21.656s -- a saving of about 17%.
-{%- endcomment -%}
-
-{% for file in site.static_files %}
- {% if file.path == site.favicon_ico or file.path == '/favicon.ico' %}
- {% assign favicon = true %}
- {% endif %}
-{% endfor %}
-{% if favicon %}
-
-{% endif %}
+{%- comment -%}
+ Include as: {%- include_cached favicon.html -%}
+ Depends on: site.static_files.
+ Results in: HTML for a link to an existing `favicon.ico` file.
+ Overwrites:
+ file.
+
+ The endoflife.date site has 226 pages and 3410 static files. @marcwrobel pointed
+ out that the time taken by evaluating the code in this file on every page when
+ building that site was significant, and suggested making it optional. As it is
+ page-independent, it can easily be cached. Doing that reduced the time taken by
+ rendering `_includes/head.html` from 15.294s to 10.760s, thereby reducing the
+ total build time from 26.074s to 21.656s -- a saving of about 17%.
+{%- endcomment -%}
+
+{% for file in site.static_files %}
+ {% if file.path == site.favicon_ico or file.path == '/favicon.ico' %}
+ {% assign favicon = true %}
+ {% endif %}
+{% endfor %}
+{% if favicon %}
+
+{% endif %}
diff --git a/jekyll_files/_includes/fix_linenos.html b/jekyll_files/_includes/fix_linenos.html
index 74dc3ee..6243fb0 100644
--- a/jekyll_files/_includes/fix_linenos.html
+++ b/jekyll_files/_includes/fix_linenos.html
@@ -1,68 +1,65 @@
-
-
-{%- comment -%}
-This file can be used to fix the HTML produced by Jekyll for highlighted
-code with line numbers.
-
-It works with `{% highlight some_language linenos %}...{% endhighlight %}`
-and with the Kramdown option to add line numbers to fenced code.
-
-The implementation was derived from the workaround provided by
-Dmitry Hrabrov (DeXP) at
-https://github.com/penibelst/jekyll-compress-html/issues/71#issuecomment-188144901
-
-EXPLANATION
-
-The HTML produced by Rouge highlighting with lie numbers is of the form
-`code table`. Jekyll (<= 4.1.1) always wraps the highlighted HTML
-with `pre`. This wrapping is not only unnecessary, but also transforms
-the conforming HTML produced by Rouge to non-conforming HTML, which
-results in HTML validation error reports.
-
-The fix removes the outer `pre` tags whenever they contain the pattern
-`
`.
-
-Apart from avoiding HTML validation errors, the fix allows the use of
-the [Jekyll layout for compressing HTML](http://jch.penibelst.de),
-which relies on `pre` tags not being nested, according to
-https://github.com/penibelst/jekyll-compress-html/issues/71#issuecomment-172069842
-
-USAGE
-
-(Any names can be used for `some_var` and `some_language`.)
-
-{% capture some_var %}
-{% highlight some_language linenos %}
-Some code
-{% endhighlight %}
-{% endcapture %}
-{% include fix_linenos.html code=some_var %}
-
-For code fences:
-
-{% capture some_var %}
-```some_language
-Some code
-```
-{% endcapture %}
-{% assign some_var = some_var | markdownify %}
-{% include fix_linenos.html code=some_var %}
-
-CAVEATS
-
-The above does not work when `Some code` happens to contain the matched string
-`
`.
-
-The use of this file overwrites the variable `fix_linenos_code` with `nil`.
-
-{%- endcomment -%}
-
-{% assign fix_linenos_code = include.code %}
-{% if fix_linenos_code contains '
", "" %}
-{% endif %}
-{{ fix_linenos_code }}
-{% assign fix_linenos_code = nil %}
+{%- comment -%}
+This file can be used to fix the HTML produced by Jekyll for highlighted
+code with line numbers.
+
+It works with `{% highlight some_language linenos %}...{% endhighlight %}`
+and with the Kramdown option to add line numbers to fenced code.
+
+The implementation was derived from the workaround provided by
+Dmitry Hrabrov (DeXP) at
+https://github.com/penibelst/jekyll-compress-html/issues/71#issuecomment-188144901
+
+EXPLANATION
+
+The HTML produced by Rouge highlighting with lie numbers is of the form
+`code table`. Jekyll (<= 4.1.1) always wraps the highlighted HTML
+with `pre`. This wrapping is not only unnecessary, but also transforms
+the conforming HTML produced by Rouge to non-conforming HTML, which
+results in HTML validation error reports.
+
+The fix removes the outer `pre` tags whenever they contain the pattern
+`
`.
+
+Apart from avoiding HTML validation errors, the fix allows the use of
+the [Jekyll layout for compressing HTML](http://jch.penibelst.de),
+which relies on `pre` tags not being nested, according to
+https://github.com/penibelst/jekyll-compress-html/issues/71#issuecomment-172069842
+
+USAGE
+
+(Any names can be used for `some_var` and `some_language`.)
+
+{% capture some_var %}
+{% highlight some_language linenos %}
+Some code
+{% endhighlight %}
+{% endcapture %}
+{% include fix_linenos.html code=some_var %}
+
+For code fences:
+
+{% capture some_var %}
+```some_language
+Some code
+```
+{% endcapture %}
+{% assign some_var = some_var | markdownify %}
+{% include fix_linenos.html code=some_var %}
+
+CAVEATS
+
+The above does not work when `Some code` happens to contain the matched string
+`
`.
+
+The use of this file overwrites the variable `fix_linenos_code` with `nil`.
+
+{%- endcomment -%}
+
+{% assign fix_linenos_code = include.code %}
+{% if fix_linenos_code contains '