New upstream version 8.3.0.upstream/8.3.0upstream

33 files changed, 334 insertions, 140 deletions

diff --git a/nikola/data/samplesite/galleries/demo/metadata.sample.yml b/nikola/data/samplesite/galleries/demo/metadata.sample.yml
index f504573..9f89f33 100644
--- a/nikola/data/samplesite/galleries/demo/metadata.sample.yml
+++ b/nikola/data/samplesite/galleries/demo/metadata.sample.yml
@@ -7,7 +7,7 @@ order: 2
 name: tesla4_lg.jpg
 order: 0
 ---
-name: tesla_conducts_lg.jpg
+name: tesla_conducts_lg.webp
 caption: Nikola Tesla conducts electricity
 order: 1
 ---
diff --git a/nikola/data/samplesite/galleries/demo/tesla_conducts_lg.jpg b/nikola/data/samplesite/galleries/demo/tesla_conducts_lg.jpg
deleted file mode 100644
index f47d2ae..0000000
--- a/nikola/data/samplesite/galleries/demo/tesla_conducts_lg.jpg
+++ /dev/null
diff --git a/nikola/data/samplesite/galleries/demo/tesla_conducts_lg.webp b/nikola/data/samplesite/galleries/demo/tesla_conducts_lg.webp
new file mode 100644
index 0000000..084bfb3
--- /dev/null
+++ b/nikola/data/samplesite/galleries/demo/tesla_conducts_lg.webp
diff --git a/nikola/data/themes/base-jinja/templates/base.tmpl b/nikola/data/themes/base-jinja/templates/base.tmpl
index 8b057db..94f3b34 100644
--- a/nikola/data/themes/base-jinja/templates/base.tmpl
+++ b/nikola/data/themes/base-jinja/templates/base.tmpl
@@ -30,7 +30,7 @@
     {% endif %}
     {% block extra_js %}{% endblock %}
     <script>
-    baguetteBox.run('div#content', {
+    baguetteBox.run('main#content', {
         ignoreClass: 'islink',
         captions: function(element){var i=element.getElementsByTagName('img')[0];return i===undefined?'':i.alt;}});
     </script>
diff --git a/nikola/data/themes/base-jinja/templates/base_helper.tmpl b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
index 2d8c0c8..30faac6 100644
--- a/nikola/data/themes/base-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/base-jinja/templates/base_helper.tmpl
@@ -82,7 +82,7 @@ lang="{{ lang }}">
             <script src="https://polyfill.io/v3/polyfill.js?features=Intl.RelativeTimeFormat.%7Elocale.{{ luxon_locales[lang] }}"></script>
         {% endif %}
         {% if use_cdn %}
-            <script src="https://cdn.jsdelivr.net/npm/luxon@1.28.0/build/global/luxon.min.js" integrity="sha256-l1u7Y5ze+ENf/T9ORPa3E642/uMgHUFa1KnqzFCcWEY=" crossorigin="anonymous"></script>
+            <script src="https://cdn.jsdelivr.net/npm/luxon@3.3.0/build/global/luxon.min.js" integrity="sha256-Nn+JGDrq3PuTxcDfJmmI0Srj5LpfOFlKqEiPwQK7y40=" crossorigin="anonymous"></script>
         {% else %}
             <script src="/assets/js/luxon.min.js"></script>
         {% endif %}
diff --git a/nikola/data/themes/base-jinja/templates/comments_helper_discourse.tmpl b/nikola/data/themes/base-jinja/templates/comments_helper_discourse.tmpl
new file mode 100644
index 0000000..d02b0ee
--- /dev/null
+++ b/nikola/data/themes/base-jinja/templates/comments_helper_discourse.tmpl
@@ -0,0 +1,27 @@
+{#  -*- coding: utf-8 -*- #}
+
+{% macro comment_form(url, title, identifier) %}
+    {% if comment_system_id %}
+        <div id="discourse-comments"></div>
+        <script type="text/javascript">
+            DiscourseEmbed = { discourseUrl: '{{ comment_system_id }}',
+            discourseEmbedUrl: '{{ url }}' };
+
+            (function() {
+                var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+                d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+            })();
+        </script>
+    {% endif %}
+{% endmacro %}
+
+{% macro comment_link(link, identifier) %}
+    {% if comment_system_id %}
+    <a href="{{ link }}#discourse-comments">{{ messages("Comments") }}</a>
+    {% endif %}
+{% endmacro %}
+
+
+{% macro comment_link_script() %}
+{% endmacro %}
diff --git a/nikola/data/themes/base-jinja/templates/gallery.tmpl b/nikola/data/themes/base-jinja/templates/gallery.tmpl
index d425106..40252ff 100644
--- a/nikola/data/themes/base-jinja/templates/gallery.tmpl
+++ b/nikola/data/themes/base-jinja/templates/gallery.tmpl
@@ -32,7 +32,7 @@
         {% else %}
             <ul>
             {% for folder, ftitle in folders %}
-                <li><a href="{{ folder }}">📂&nbsp;{{ ftitle|e }}</a></li>
+                <li><a href="{{ folder }}">&#x1f4c2;&nbsp;{{ ftitle|e }}</a></li>
             {% endfor %}
             </ul>
         {% endif %}
diff --git a/nikola/data/themes/base/assets/css/rst_base.css b/nikola/data/themes/base/assets/css/rst_base.css
index fcd7318..d5aa552 100644
--- a/nikola/data/themes/base/assets/css/rst_base.css
+++ b/nikola/data/themes/base/assets/css/rst_base.css
@@ -1,8 +1,8 @@
 /* Minimal style sheet for the HTML output of Docutils.                    */
 /*                                                                         */
 /* :Author: Günter Milde, based on html4css1.css by David Goodger          */
-/* :Id: $Id: minimal.css 8642 2021-03-26 13:51:14Z milde $               */
-/* :Copyright: © 2015 Günter Milde.                                        */
+/* :Id: $Id: minimal.css 9079 2022-06-19 14:00:56Z milde $                                                               */
+/* :Copyright: © 2015, 2021 Günter Milde.                                  */
 /* :License: Released under the terms of the `2-Clause BSD license`_,      */
 /*    in short:                                                            */
 /*                                                                         */
@@ -14,11 +14,10 @@
 /*                                                                         */
 /* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause     */
 
-/* This CSS2.1_ stylesheet defines rules for Docutils elements without    */
-/* HTML equivalent. It is required to make the document semantic visible. */
-/*                                                                        */
-/* .. _CSS2.1: http://www.w3.org/TR/CSS2                                  */
-/* .. _validates: http://jigsaw.w3.org/css-validator/validator$link       */
+/* This CSS3 stylesheet defines rules for Docutils elements without        */
+/* HTML equivalent. It is required to make the document semantics visible. */
+/*                                                                         */
+/* .. _validates: http://jigsaw.w3.org/css-validator/validator$link        */
 
 /* titles */
 p.topic-title,
@@ -43,8 +42,8 @@ p.sidebar-subtitle {
 h1 + p.subtitle {
   font-size: 1.6em;
 }
-h2 + p.section-subtitle, a.toc-backref {
-  color: black;
+a.toc-backref {
+  color: inherit;
   text-decoration: none;
 }
 
@@ -73,12 +72,15 @@ span.problematic {
   margin-top: 0;
   margin-bottom: 0;
 }
+/* Nested Paragraphs
+p:first-child { margin-top: 0; }
+p:last-child { margin-bottom: 0; }
+details > p:last-child { margin-bottom: 1em; }
+ */
 
 /* Table of Contents */
-.topic.contents { margin: 0.5em 0; }
-.topic.contents ul.auto-toc {
+.contents ul.auto-toc { /* section numbers present */
   list-style-type: none;
-  padding-left: 1.5em;
 }
 
 /* Enumerated Lists */
@@ -97,6 +99,13 @@ dt .classifier:before {
 }
 /* Field Lists and similar */
 /* bold field name, content starts on the same line */
+dl.field-list,
+dl.option-list,
+dl.docinfo,
+dl.footnote,
+dl.citation {
+  display: flow-root;
+}
 dl.field-list > dt,
 dl.option-list > dt,
 dl.docinfo > dt,
@@ -107,7 +116,7 @@ dl.citation > dt {
   float: left;
   margin: 0;
   padding: 0;
-  padding-right: 0.5em;
+  padding-right: 0.2em;
 }
 /* Offset for field content (corresponds to the --field-name-limit option) */
 dl.field-list > dd,
@@ -115,6 +124,12 @@ dl.option-list > dd,
 dl.docinfo > dd {
   margin-left:  9em; /* ca. 14 chars in the test examples, fit all Docinfo fields */
 }
+/* start nested lists on new line */
+dd > dl:first-child,
+dd > ul:first-child,
+dd > ol:first-child {
+  clear: left;
+}
 /* start field-body on a new line after long field names */
 dl.field-list > dd > *:first-child,
 dl.option-list > dd > *:first-child
@@ -135,7 +150,6 @@ dl.docinfo > dd.authors > p { margin: 0; }
 dl.option-list > dt { font-weight: normal; }
 span.option { white-space: nowrap; }
 
-
 /* Footnotes and Citations  */
 
 .footnote, .citation { margin: 1em 0; } /* default paragraph skip (Firefox) */
@@ -209,7 +223,6 @@ dt.label > span.fn-backref > a { font-style: italic; }
   margin-right: auto;
 }
 .align-center {
-  clear: both;
   text-align: center;
   margin-left: auto;
   margin-right: auto;
@@ -222,6 +235,12 @@ dt.label > span.fn-backref > a { font-style: italic; }
 .align-middle { vertical-align: middle; }
 .align-bottom { vertical-align: bottom; }
 
+img.align-left, img.align-center, img.align-right,
+.figure.align-left, .figure.align-center, .figure.align-right,
+object.align-left, object.align-center, object.align-right {
+  display: block;
+}
+
 /* reset inner alignment in figures and tables */
 figure.align-left, figure.align-right,
 table.align-left, table.align-center, table.align-right {
@@ -229,24 +248,14 @@ table.align-left, table.align-center, table.align-right {
 }
 
 /* Text Blocks */
-blockquote,
-div.topic,
-aside.topic {
-  margin: 1em 2em;
-}
+.topic { margin: 1em 2em; }
 .sidebar,
 .admonition,
 .system-message {
-  border: thin solid;
   margin: 1em 2em;
+  border: thin solid;
   padding: 0.5em 1em;
 }
-.sidebar {
-  width: 30%;
-  max-width: 26em;
-  float: right;
-  clear: right;
-}
 div.line-block { display: block; }
 div.line-block div.line-block, pre { margin-left: 2em; }
 
@@ -258,7 +267,6 @@ pre.code code:before {
 }
 
 /* Tables */
-
 td > p:first-child, th > p:first-child { margin-top: 0; }
 td > p, th > p { margin-bottom: 0; }
 
@@ -268,11 +276,20 @@ td > p, th > p { margin-bottom: 0; }
   padding-right: 0.5em /* separate table cells */
 }
 
+table > caption {
+  text-align: left;
+  margin-top: 0.2em;
+  margin-bottom: 0.2em;
+}
+table.captionbelow {
+  caption-side: bottom;
+}
+
 /* CSS31_ style sheet for the output of Docutils HTML writers.             */
 /* Rules for easy reading and pre-defined style variants.                  */
 /*                                                                         */
 /* :Author: Günter Milde, based on html4css1.css by David Goodger          */
-/* :Id: $Id: plain.css 8636 2021-03-19 00:23:33Z milde $                                                               */
+/* :Id: $Id: plain.css 9081 2022-06-19 20:23:12Z milde $                                                               */
 /* :Copyright: © 2015 Günter Milde.                                        */
 /* :License: Released under the terms of the `2-Clause BSD license`_,      */
 /*    in short:                                                            */
@@ -284,12 +301,27 @@ td > p, th > p { margin-bottom: 0; }
 /*    This file is offered as-is, without any warranty.                    */
 /*                                                                         */
 /* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause     */
-/* .. _CSS3: http://www.w3.org/TR/CSS3                                     */
+/* .. _CSS3: https://www.w3.org/Style/CSS/                                 */
 
 
 /* Document Structure */
 /* ****************** */
 
+/* Table of Contents */
+ul.auto-toc > li > p {
+  padding-left: 1em;
+  text-indent: -1em;
+}
+nav.contents ul {
+  padding-left: 1em;
+}
+main > nav.contents ul ul ul ul:not(.auto-toc) {
+  list-style-type: '\2B29\ ';
+}
+main > nav.contents ul ul ul ul ul:not(.auto-toc) {
+  list-style-type: '\2B1D\ ';
+}
+
 /* Transitions */
 hr.docutils {
   width: 80%;
@@ -305,30 +337,39 @@ dl > dd {
 /* Lists */
 /* ===== */
 
-/* Separate list entries in compound lists */
-dl > dd, ol > li,
-
 /* Definition Lists */
 /* Indent lists nested in definition lists */
-/* (:only-child is new in CSS 3)           */
 dd > ul:only-child, dd > ol:only-child { padding-left: 1em; }
 
 /* Description Lists */
 /* styled like in most dictionaries, encyclopedias etc. */
+dl.description {
+  display: flow-root;
+}
 dl.description > dt {
   font-weight: bold;
   clear: left;
   float: left;
   margin: 0;
   padding: 0;
-  padding-right: 0.5em;
+  padding-right: 0.3em;
+}
+dl.description > dd:after {
+  display: table;
+  content: "";
+  clear: left; /* clearfix for empty descriptions */
 }
 
 /* Field Lists */
 
+dl.field-list > dd,
+dl.docinfo > dd {
+  margin-left: var(--field-indent); /* adapted in media queries or HTML */
+}
+
 /* example for custom field-name width */
 dl.field-list.narrow > dd {
-  margin-left: 5em;
+  --field-indent: 5em;
 }
 /* run-in: start field-body on same line after long field names */
 dl.field-list.run-in > dd p {
@@ -337,8 +378,8 @@ dl.field-list.run-in > dd p {
 
 /* Bibliographic Fields */
 
-/* generally, bibliographic fields use special definition list dl.docinfo */
-/* but dedication and abstract are placed into "topic" divs */
+/* generally, bibliographic fields use dl.docinfo */
+/* but dedication and abstract are placed into divs */
 div.abstract p.topic-title {
   text-align: center;
 }
@@ -351,6 +392,10 @@ div.dedication p.topic-title {
   font-style: normal;
 }
 
+/* disclosures */
+details { padding-left: 1em; }
+summary { margin-left: -1em; }
+
 /* Text Blocks */
 /* =========== */
 
@@ -360,14 +405,9 @@ pre.math, pre.code {
   font-family: monospace;
 }
 
-/* Block Quotes */
-blockquote > table,
-div.topic > table {
-  margin-top: 0;
-  margin-bottom: 0;
-}
+/* Block Quotes and Topics */
 blockquote p.attribution,
-div.topic p.attribution {
+.topic p.attribution {
   text-align: right;
   margin-left: 20%;
 }
@@ -468,7 +508,9 @@ div.error {
 aside.sidebar {
   width: 30%;
   max-width: 26em;
+  float: right;
+  clear: right;
   margin-left: 1em;
-  margin-right: -2%;
-  background-color: #ffffee;
+  margin-right: -1%;
+  background-color: #fffffa;
 }
diff --git a/nikola/data/themes/base/assets/css/theme.css b/nikola/data/themes/base/assets/css/theme.css
index b198c2c..cd09792 100644
--- a/nikola/data/themes/base/assets/css/theme.css
+++ b/nikola/data/themes/base/assets/css/theme.css
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 /*
-	Copyright © 2014-2022 Daniel Aleksandersen and others.
+	Copyright © 2014-2024 Daniel Aleksandersen and others.
 
 	Permission is hereby granted, free of charge, to any
 	person obtaining a copy of this software and associated
diff --git a/nikola/data/themes/base/messages/messages_bn.py b/nikola/data/themes/base/messages/messages_bn.py
new file mode 100644
index 0000000..316e4ec
--- /dev/null
+++ b/nikola/data/themes/base/messages/messages_bn.py
@@ -0,0 +1,49 @@
+# -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit. Submit translations on Transifex."""
+
+MESSAGES = {
+    "%d min remaining to read": "",
+    "(active)": "",
+    "Also available in:": "",
+    "Archive": "",
+    "Atom feed": "",
+    "Authors": "",
+    "Categories": "",
+    "Comments": "",
+    "LANGUAGE": "",
+    "Languages:": "",
+    "More posts about %s": "",
+    "Newer posts": "",
+    "Next post": "",
+    "Next": "",
+    "No posts found.": "",
+    "Nothing found.": "",
+    "Older posts": "",
+    "Original site": "",
+    "Posted:": "",
+    "Posts about %s": "",
+    "Posts by %s": "",
+    "Posts for year %s": "",
+    "Posts for {month_day_year}": "",
+    "Posts for {month_year}": "",
+    "Previous post": "",
+    "Previous": "",
+    "Publication date": "",
+    "RSS feed": "",
+    "Read in English": "",
+    "Read more": "",
+    "Skip to main content": "",
+    "Source": "",
+    "Subcategories:": "",
+    "Tags and Categories": "",
+    "Tags": "",
+    "Toggle navigation": "",
+    "Uncategorized": "",
+    "Up": "",
+    "Updates": "",
+    "Write your page here.": "",
+    "Write your post here.": "",
+    "old posts, page %d": "",
+    "page %d": "",
+    "updated": "",
+}
diff --git a/nikola/data/themes/base/messages/messages_el.py b/nikola/data/themes/base/messages/messages_el.py
index 7021d84..3cba21a 100644
--- a/nikola/data/themes/base/messages/messages_el.py
+++ b/nikola/data/themes/base/messages/messages_el.py
@@ -2,12 +2,12 @@
 """Autogenerated file, do not edit. Submit translations on Transifex."""
 
 MESSAGES = {
-    "%d min remaining to read": "",
-    "(active)": "",
+    "%d min remaining to read": "%dmin απομένουν για ανάγνωση",
+    "(active)": "(ενεργό)",
     "Also available in:": "Διαθέσιμο και στα:",
     "Archive": "Αρχείο",
-    "Atom feed": "",
-    "Authors": "",
+    "Atom feed": "Ροή Atom",
+    "Authors": "Συγγραφείς",
     "Categories": "Κατηγορίες",
     "Comments": "Σχόλια",
     "LANGUAGE": "Ελληνικά",
@@ -15,35 +15,35 @@ MESSAGES = {
     "More posts about %s": "Περισσότερες αναρτήσεις για %s",
     "Newer posts": "Νεότερες αναρτήσεις",
     "Next post": "Επόμενη ανάρτηση",
-    "Next": "",
+    "Next": "Επόμενο",
     "No posts found.": "Δε βρέθηκαν αναρτήσεις",
     "Nothing found.": "Δε βρέθηκε περιεχόμενο",
     "Older posts": "Παλαιότερες αναρτήσεις",
     "Original site": "Ιστοσελίδα αρχικής ανάρτησης",
     "Posted:": "Αναρτήθηκε:",
     "Posts about %s": "Αναρτήσεις για %s",
-    "Posts by %s": "",
+    "Posts by %s": "Αναρτήσεις από %s",
     "Posts for year %s": "Αναρτήσεις για το έτος %s",
     "Posts for {month_day_year}": "Αναρτήσεις στις {month_day_year}",
     "Posts for {month_year}": "Αναρτήσεις για τον {month_year}",
     "Previous post": "Προηγούμενη ανάρτηση",
-    "Previous": "",
+    "Previous": "Προηγούμενο",
     "Publication date": "Ημερομηνία δημοσίευσης",
-    "RSS feed": "",
+    "RSS feed": "Ροή RSS",
     "Read in English": "Διαβάστε στα Ελληνικά",
     "Read more": "Διαβάστε περισσότερα",
-    "Skip to main content": "",
+    "Skip to main content": "Παράλειψη στο κυρίως περιεχόμενο",
     "Source": "Πηγαίος κώδικας",
-    "Subcategories:": "",
+    "Subcategories:": "Υποκατηγορίες:",
     "Tags and Categories": "Ετικέτες και κατηγορίες",
     "Tags": "Ετικέτες",
-    "Toggle navigation": "",
-    "Uncategorized": "",
-    "Up": "",
-    "Updates": "",
-    "Write your page here.": "",
-    "Write your post here.": "",
+    "Toggle navigation": "Εναλλαγή πλοήγησης",
+    "Uncategorized": "Χωρίς κατηγορία.",
+    "Up": "Επάνω",
+    "Updates": "Ενημερώσεις",
+    "Write your page here.": "Γράψτε τη σελίδα σας εδώ.",
+    "Write your post here.": "Γράψτε τις αναρτήσεις σας εδώ.",
     "old posts, page %d": "σελίδα παλαιότερων αναρτήσεων %d",
     "page %d": "σελίδα %d",
-    "updated": "",
+    "updated": "ενημερωμένο",
 }
diff --git a/nikola/data/themes/base/messages/messages_eo.py b/nikola/data/themes/base/messages/messages_eo.py
index 2793ff5..a2ecf65 100644
--- a/nikola/data/themes/base/messages/messages_eo.py
+++ b/nikola/data/themes/base/messages/messages_eo.py
@@ -24,7 +24,7 @@ MESSAGES = {
     "Posts about %s": "Artikoloj pri %s",
     "Posts by %s": "Artikoloj de %s",
     "Posts for year %s": "Artikoloj de la jaro %s",
-    "Posts for {month_day_year}": "Artikoloj de la {month_day_year}",
+    "Posts for {month_day_year}": "Artikoloj de {month_day_year}",
     "Posts for {month_year}": "Artikoloj de {month_year}",
     "Previous post": "Antaŭa artikolo",
     "Previous": "Antaŭa",
@@ -45,5 +45,5 @@ MESSAGES = {
     "Write your post here.": "Skribu tie vian artikolon.",
     "old posts, page %d": "%da paĝo de malnovaj artikoloj",
     "page %d": "paĝo %d",
-    "updated": "",
+    "updated": "ĝisdatigita",
 }
diff --git a/nikola/data/themes/base/messages/messages_es.py b/nikola/data/themes/base/messages/messages_es.py
index bb58c82..3bbb9d8 100644
--- a/nikola/data/themes/base/messages/messages_es.py
+++ b/nikola/data/themes/base/messages/messages_es.py
@@ -45,5 +45,5 @@ MESSAGES = {
     "Write your post here.": "Escriba su publicación aquí.",
     "old posts, page %d": "publicaciones antiguas, página %d",
     "page %d": "página %d",
-    "updated": "",
+    "updated": "actualizado",
 }
diff --git a/nikola/data/themes/base/messages/messages_he.py b/nikola/data/themes/base/messages/messages_he.py
index 2de9796..1ae7051 100644
--- a/nikola/data/themes/base/messages/messages_he.py
+++ b/nikola/data/themes/base/messages/messages_he.py
@@ -10,7 +10,7 @@ MESSAGES = {
     "Authors": "מחברים",
     "Categories": "קטגוריות",
     "Comments": "הערות",
-    "LANGUAGE": "אנגלית",
+    "LANGUAGE": "עברית",
     "Languages:": "שפות:",
     "More posts about %s": "עוד פוסטים אודות %s",
     "Newer posts": "פוסטים חדשים",
diff --git a/nikola/data/themes/base/messages/messages_ja.py b/nikola/data/themes/base/messages/messages_ja.py
index fd563ad..dbd38e3 100644
--- a/nikola/data/themes/base/messages/messages_ja.py
+++ b/nikola/data/themes/base/messages/messages_ja.py
@@ -4,43 +4,43 @@
 MESSAGES = {
     "%d min remaining to read": "残りを読むのに必要な時間は%d分",
     "(active)": "(有効)",
-    "Also available in:": "他の言語で読む:",
+    "Also available in:": "他の言語で読む：",
     "Archive": "過去記事一覧",
     "Atom feed": "Atomフィード",
     "Authors": "著者一覧",
-    "Categories": "カテゴリ",
+    "Categories": "カテゴリー",
     "Comments": "コメント",
     "LANGUAGE": "日本語",
-    "Languages:": "言語:",
+    "Languages:": "言語：",
     "More posts about %s": "%sに関する記事一覧",
     "Newer posts": "新しい記事",
     "Next post": "次の記事",
-    "Next": "次",
+    "Next": "次へ",
     "No posts found.": "記事はありません。",
     "Nothing found.": "なにも見つかりませんでした。",
     "Older posts": "過去の記事",
-    "Original site": "翻訳元のサイト",
-    "Posted:": "公開日時:",
+    "Original site": "元のサイト",
+    "Posted:": "公開日時：",
     "Posts about %s": "%sについての記事",
     "Posts by %s": "%sの記事一覧",
     "Posts for year %s": "%s年の記事",
     "Posts for {month_day_year}": "{month_day_year}の記事",
     "Posts for {month_year}": "{month_year}の記事",
     "Previous post": "一つ前の記事",
-    "Previous": "前",
+    "Previous": "前へ",
     "Publication date": "公開日",
     "RSS feed": "RSSフィード",
     "Read in English": "日本語で読む",
     "Read more": "続きを読む",
     "Skip to main content": "本文を読み飛ばす",
     "Source": "ソース",
-    "Subcategories:": "サブカテゴリ",
-    "Tags and Categories": "カテゴリおよびタグ一覧",
+    "Subcategories:": "サブカテゴリー",
+    "Tags and Categories": "カテゴリーおよびタグ一覧",
     "Tags": "タグ",
     "Toggle navigation": "ナビゲーションを隠す",
-    "Uncategorized": "カテゴリなし",
-    "Up": "上",
-    "Updates": "フィード",
+    "Uncategorized": "カテゴリーなし",
+    "Up": "上へ",
+    "Updates": "更新",
     "Write your page here.": "ここに記事を記述してください。",
     "Write your post here.": "ここに記事を記述してください。",
     "old posts, page %d": "過去の記事 %dページ目",
diff --git a/nikola/data/themes/base/messages/messages_ko.py b/nikola/data/themes/base/messages/messages_ko.py
index 57b6cb9..bc33e9f 100644
--- a/nikola/data/themes/base/messages/messages_ko.py
+++ b/nikola/data/themes/base/messages/messages_ko.py
@@ -6,7 +6,7 @@ MESSAGES = {
     "(active)": "(활성됨)",
     "Also available in:": "이곳에서도 가능함:",
     "Archive": "저장소",
-    "Atom feed": "",
+    "Atom feed": "아톰 피드",
     "Authors": "작성자",
     "Categories": "분류",
     "Comments": "댓글",
@@ -22,7 +22,7 @@ MESSAGES = {
     "Original site": "출처",
     "Posted:": "작성됨:",
     "Posts about %s": "%s에 대한 포스트",
-    "Posts by %s": "%s에 의해 작성된 글",
+    "Posts by %s": "%s의 작성된 포스트",
     "Posts for year %s": "%s년도 포스트",
     "Posts for {month_day_year}": "{month_day_year}에 작성된 포스트",
     "Posts for {month_year}": "{month_year}에 쓴 포스트",
@@ -34,16 +34,16 @@ MESSAGES = {
     "Read more": "더 읽기",
     "Skip to main content": "주 콘텐츠로 바로가기",
     "Source": "원문",
-    "Subcategories:": "서브 카테고리",
+    "Subcategories:": "서브 카테고리:",
     "Tags and Categories": "태그와 분류",
     "Tags": "태그",
-    "Toggle navigation": "",
+    "Toggle navigation": "네비게이션 켜고 끄기",
     "Uncategorized": "카테고리 없음",
-    "Up": "",
+    "Up": "상위",
     "Updates": "업데이트",
     "Write your page here.": "여기에 페이지를 작성하세요.",
     "Write your post here.": "이곳에 글을 작성하세요.",
     "old posts, page %d": "이전 포스트, 페이지 %d",
     "page %d": "페이지 %d",
-    "updated": "",
+    "updated": "업데이트됨",
 }
diff --git a/nikola/data/themes/base/messages/messages_mi.py b/nikola/data/themes/base/messages/messages_mi.py
index 853744a..f9ed574 100644
--- a/nikola/data/themes/base/messages/messages_mi.py
+++ b/nikola/data/themes/base/messages/messages_mi.py
@@ -10,7 +10,7 @@ MESSAGES = {
     "Authors": "Kaituhi",
     "Categories": "Kāwai",
     "Comments": "Nga korero",
-    "LANGUAGE": " Māori",
+    "LANGUAGE": "Māori",
     "Languages:": "Reo",
     "More posts about %s": "Ētahi atu pou e pā ana ki %s",
     "Newer posts": "Nga pou hou",
diff --git a/nikola/data/themes/base/messages/messages_ml.py b/nikola/data/themes/base/messages/messages_ml.py
index a818320..e663d6a 100644
--- a/nikola/data/themes/base/messages/messages_ml.py
+++ b/nikola/data/themes/base/messages/messages_ml.py
@@ -2,7 +2,7 @@
 """Autogenerated file, do not edit. Submit translations on Transifex."""
 
 MESSAGES = {
-    "%d min remaining to read": "%d മിനിട്ട് കൂടി വായിച്ചു തീരാന്‍  ",
+    "%d min remaining to read": "വായിച്ചു തീരാന്‍ %dമിനിട്ട് കൂടി",
     "(active)": "(സജീവം)",
     "Also available in:": "ലഭ്യമായ ഭാഷകള്‍:",
     "Archive": "ആര്‍കൈവ്",
@@ -12,7 +12,7 @@ MESSAGES = {
     "Comments": "കമന്റുകള്‍",
     "LANGUAGE": "മലയാളം",
     "Languages:": "ഭാഷകള്‍:",
-    "More posts about %s": "%s-നെ കുറിച്ചുള്ള കൂടുതല്‍ രചനകള്‍",
+    "More posts about %s": "%s -നെ കുറിച്ചുള്ള കൂടുതല്‍ രചനകള്‍",
     "Newer posts": "പുതിയ രചനകള്‍",
     "Next post": "അടുത്ത രചന",
     "Next": "അടുത്തത്",
@@ -34,7 +34,7 @@ MESSAGES = {
     "Read more": "കൂടുതല്‍ വായിക്കുക",
     "Skip to main content": "പ്രധാന ഉള്ളടക്കത്തിലേക്ക് നേരെ പോവുക",
     "Source": "സ്രോതസ്സ്‌",
-    "Subcategories:": "ഉപവിഭാഗങ്ങള്‍:",
+    "Subcategories:": "ഉപവിഭാഗങ്ങള്‍",
     "Tags and Categories": "ടാഗുകളും വിഭാഗങ്ങളും",
     "Tags": "ടാഗുകള്‍",
     "Toggle navigation": "നാവിഗേഷൻ മാറ്റുക",
diff --git a/nikola/data/themes/base/messages/messages_ta.py b/nikola/data/themes/base/messages/messages_ta.py
new file mode 100644
index 0000000..316e4ec
--- /dev/null
+++ b/nikola/data/themes/base/messages/messages_ta.py
@@ -0,0 +1,49 @@
+# -*- encoding:utf-8 -*-
+"""Autogenerated file, do not edit. Submit translations on Transifex."""
+
+MESSAGES = {
+    "%d min remaining to read": "",
+    "(active)": "",
+    "Also available in:": "",
+    "Archive": "",
+    "Atom feed": "",
+    "Authors": "",
+    "Categories": "",
+    "Comments": "",
+    "LANGUAGE": "",
+    "Languages:": "",
+    "More posts about %s": "",
+    "Newer posts": "",
+    "Next post": "",
+    "Next": "",
+    "No posts found.": "",
+    "Nothing found.": "",
+    "Older posts": "",
+    "Original site": "",
+    "Posted:": "",
+    "Posts about %s": "",
+    "Posts by %s": "",
+    "Posts for year %s": "",
+    "Posts for {month_day_year}": "",
+    "Posts for {month_year}": "",
+    "Previous post": "",
+    "Previous": "",
+    "Publication date": "",
+    "RSS feed": "",
+    "Read in English": "",
+    "Read more": "",
+    "Skip to main content": "",
+    "Source": "",
+    "Subcategories:": "",
+    "Tags and Categories": "",
+    "Tags": "",
+    "Toggle navigation": "",
+    "Uncategorized": "",
+    "Up": "",
+    "Updates": "",
+    "Write your page here.": "",
+    "Write your post here.": "",
+    "old posts, page %d": "",
+    "page %d": "",
+    "updated": "",
+}
diff --git a/nikola/data/themes/base/messages/messages_tr.py b/nikola/data/themes/base/messages/messages_tr.py
index 8249f42..1b81b37 100644
--- a/nikola/data/themes/base/messages/messages_tr.py
+++ b/nikola/data/themes/base/messages/messages_tr.py
@@ -6,7 +6,7 @@ MESSAGES = {
     "(active)": "(etkin)",
     "Also available in:": "Şu dilde de mevcut:",
     "Archive": "Arşiv",
-    "Atom feed": "",
+    "Atom feed": "Atom besleme",
     "Authors": "Yazarlar",
     "Categories": "Kategoriler",
     "Comments": "Yorumlar",
@@ -15,7 +15,7 @@ MESSAGES = {
     "More posts about %s": "%s hakkında diğer yazılar",
     "Newer posts": "Daha yeni yazılar",
     "Next post": "Sonraki yazı",
-    "Next": "",
+    "Next": "Sonraki",
     "No posts found.": "Yazı bulunamadı.",
     "Nothing found.": "Hiçbir şey bulunamadı.",
     "Older posts": "Daha eski yazılar",
@@ -27,7 +27,7 @@ MESSAGES = {
     "Posts for {month_day_year}": "{month_day_year} tarihinden itibaren yazılar",
     "Posts for {month_year}": "{month_year} göre yazılar",
     "Previous post": "Önceki yazı",
-    "Previous": "",
+    "Previous": "Önceki",
     "Publication date": "Yayınlanma tarihi",
     "RSS feed": "RSS kaynağı",
     "Read in English": "Türkçe olarak oku",
@@ -37,13 +37,13 @@ MESSAGES = {
     "Subcategories:": "Alt kategoriler:",
     "Tags and Categories": "Etiketler ve Kategoriler",
     "Tags": "Etiketler",
-    "Toggle navigation": "",
+    "Toggle navigation": "Gezinme aç / kapa",
     "Uncategorized": "Kategorisiz",
-    "Up": "",
+    "Up": "Yukarı",
     "Updates": "Güncellemeler",
     "Write your page here.": "Sayfanızı buraya yazın.",
     "Write your post here.": "Yazınızı buraya yazın.",
     "old posts, page %d": "eski yazılar, sayfa %d",
     "page %d": "sayfa %d",
-    "updated": "",
+    "updated": "güncellendi",
 }
diff --git a/nikola/data/themes/base/messages/messages_zh_cn.py b/nikola/data/themes/base/messages/messages_zh_cn.py
index df8570b..c8bf3fc 100644
--- a/nikola/data/themes/base/messages/messages_zh_cn.py
+++ b/nikola/data/themes/base/messages/messages_zh_cn.py
@@ -3,8 +3,8 @@
 
 MESSAGES = {
     "%d min remaining to read": "剩余阅读时间 %d 分钟",
-    "(active)": "(活跃)",
-    "Also available in:": "也可用于：",
+    "(active)": "（活跃）",
+    "Also available in:": "其他语言版本：",
     "Archive": "文章归档",
     "Atom feed": "Atom 源",
     "Authors": "作者",
@@ -15,22 +15,22 @@ MESSAGES = {
     "More posts about %s": "关于%s 的更多文章 ",
     "Newer posts": "较新的文章",
     "Next post": "下一篇文章",
-    "Next": "项下",
-    "No posts found.": "没有找到文章",
+    "Next": "下一篇",
+    "No posts found.": "沒有找到文章。",
     "Nothing found.": "没有找到。",
     "Older posts": "以前的文章",
     "Original site": "原文地址",
     "Posted:": "发表于：",
-    "Posts about %s": "关于文章 %s",
-    "Posts by %s": "文章有%s发布",
-    "Posts for year %s": "%s年文章",
-    "Posts for {month_day_year}": "{month_day_year}文章",
-    "Posts for {month_year}": "{month_year}文章",
+    "Posts about %s": "关于 %s 的文章",
+    "Posts by %s": "由 %s 发布的文章",
+    "Posts for year %s": "%s 年的文章",
+    "Posts for {month_day_year}": "{month_day_year}的文章",
+    "Posts for {month_year}": "{month_year}的文章",
     "Previous post": "上一篇文章",
     "Previous": "以前",
     "Publication date": "发布日期",
     "RSS feed": "RSS 源",
-    "Read in English": "阅读简体中文",
+    "Read in English": "阅读简体中文版",
     "Read more": "阅读更多",
     "Skip to main content": "跳到主内容",
     "Source": "源文件",
@@ -43,7 +43,7 @@ MESSAGES = {
     "Updates": "更新",
     "Write your page here.": "在这里书写你的页面。",
     "Write your post here.": "在这里书写你的文章。",
-    "old posts, page %d": "旧文章页 %d",
+    "old posts, page %d": "旧文章，第 %d 页",
     "page %d": "第 %d 页",
-    "updated": "更新",
+    "updated": "已更新",
 }
diff --git a/nikola/data/themes/base/templates/base.tmpl b/nikola/data/themes/base/templates/base.tmpl
index f071c95..ae9570a 100644
--- a/nikola/data/themes/base/templates/base.tmpl
+++ b/nikola/data/themes/base/templates/base.tmpl
@@ -30,7 +30,7 @@ ${template_hooks['extra_head']()}
     % endif
     <%block name="extra_js"></%block>
     <script>
-    baguetteBox.run('div#content', {
+    baguetteBox.run('main#content', {
         ignoreClass: 'islink',
         captions: function(element){var i=element.getElementsByTagName('img')[0];return i===undefined?'':i.alt;}});
     </script>
diff --git a/nikola/data/themes/base/templates/base_helper.tmpl b/nikola/data/themes/base/templates/base_helper.tmpl
index 684165d..a03ae50 100644
--- a/nikola/data/themes/base/templates/base_helper.tmpl
+++ b/nikola/data/themes/base/templates/base_helper.tmpl
@@ -82,7 +82,7 @@ lang="${lang}">
             <script src="https://polyfill.io/v3/polyfill.js?features=Intl.RelativeTimeFormat.%7Elocale.${luxon_locales[lang]}"></script>
         % endif
         % if use_cdn:
-            <script src="https://cdn.jsdelivr.net/npm/luxon@1.28.0/build/global/luxon.min.js" integrity="sha256-l1u7Y5ze+ENf/T9ORPa3E642/uMgHUFa1KnqzFCcWEY=" crossorigin="anonymous"></script>
+            <script src="https://cdn.jsdelivr.net/npm/luxon@3.3.0/build/global/luxon.min.js" integrity="sha256-Nn+JGDrq3PuTxcDfJmmI0Srj5LpfOFlKqEiPwQK7y40=" crossorigin="anonymous"></script>
         % else:
             <script src="/assets/js/luxon.min.js"></script>
         % endif
diff --git a/nikola/data/themes/base/templates/comments_helper_discourse.tmpl b/nikola/data/themes/base/templates/comments_helper_discourse.tmpl
new file mode 100644
index 0000000..0f92ea2
--- /dev/null
+++ b/nikola/data/themes/base/templates/comments_helper_discourse.tmpl
@@ -0,0 +1,27 @@
+## -*- coding: utf-8 -*-
+
+<%def name="comment_form(url, title, identifier)">
+    %if comment_system_id:
+        <div id="discourse-comments"></div>
+        <script type="text/javascript">
+            DiscourseEmbed = { discourseUrl: '${comment_system_id}',
+            discourseEmbedUrl: '${url}' };
+
+            (function() {
+                var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+                d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+            })();
+        </script>
+    %endif
+</%def>
+
+<%def name="comment_link(link, identifier)">
+    %if comment_system_id:
+    <a href="${link}#discourse-comments">${messages("Comments")}</a>
+    %endif
+</%def>
+
+
+<%def name="comment_link_script()">
+</%def>
diff --git a/nikola/data/themes/base/templates/gallery.tmpl b/nikola/data/themes/base/templates/gallery.tmpl
index fef3a86..a32f234 100644
--- a/nikola/data/themes/base/templates/gallery.tmpl
+++ b/nikola/data/themes/base/templates/gallery.tmpl
@@ -32,7 +32,7 @@
         % else:
             <ul>
             % for folder, ftitle in folders:
-                <li><a href="${folder}">📂&nbsp;${ftitle|h}</a></li>
+                <li><a href="${folder}">&#x1f4c2;&nbsp;${ftitle|h}</a></li>
             % endfor
             </ul>
         % endif
diff --git a/nikola/data/themes/bootblog4-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootblog4-jinja/templates/base_helper.tmpl
index b35c8d2..be87913 100644
--- a/nikola/data/themes/bootblog4-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootblog4-jinja/templates/base_helper.tmpl
@@ -64,9 +64,9 @@ lang="{{ lang }}">
 
 {% macro late_load_js() %}
     {% if use_cdn %}
-        <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+        <script src="https://code.jquery.com/jquery-3.6.4.min.js" integrity="sha256-oP6HI9z1XaZNBrJURtCoUT5SUnxFr8s3BzRl+cbzUq8=" crossorigin="anonymous"></script>
         <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js" integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.11.1/baguetteBox.min.js" integrity="sha256-ULQV01VS9LCI2ePpLsmka+W0mawFpEA0rtxnezUj4A4=" crossorigin="anonymous"></script>
     {% endif %}
     {% if use_bundles and use_cdn %}
@@ -86,7 +86,7 @@ lang="{{ lang }}">
             <script src="https://polyfill.io/v3/polyfill.js?features=Intl.RelativeTimeFormat.%7Elocale.{{ luxon_locales[lang] }}"></script>
         {% endif %}
         {% if use_cdn %}
-            <script src="https://cdn.jsdelivr.net/npm/luxon@1.28.0/build/global/luxon.min.js" integrity="sha256-l1u7Y5ze+ENf/T9ORPa3E642/uMgHUFa1KnqzFCcWEY=" crossorigin="anonymous"></script>
+            <script src="https://cdn.jsdelivr.net/npm/luxon@3.3.0/build/global/luxon.min.js" integrity="sha256-Nn+JGDrq3PuTxcDfJmmI0Srj5LpfOFlKqEiPwQK7y40=" crossorigin="anonymous"></script>
         {% else %}
             <script src="/assets/js/luxon.min.js"></script>
         {% endif %}
@@ -100,7 +100,7 @@ lang="{{ lang }}">
 
 {% macro html_stylesheets() %}
     {% if use_cdn %}
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.11.1/baguetteBox.min.css" integrity="sha256-cLMYWYYutHkt+KpNqjg7NVkYSQ+E2VbrXsEvOqU7mL0=" crossorigin="anonymous">
     {% endif %}
     {% if use_bundles and use_cdn %}
diff --git a/nikola/data/themes/bootblog4/templates/base_helper.tmpl b/nikola/data/themes/bootblog4/templates/base_helper.tmpl
index 33414d8..7ba4e92 100644
--- a/nikola/data/themes/bootblog4/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootblog4/templates/base_helper.tmpl
@@ -64,9 +64,9 @@ lang="${lang}">
 
 <%def name="late_load_js()">
     %if use_cdn:
-        <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+        <script src="https://code.jquery.com/jquery-3.6.4.min.js" integrity="sha256-oP6HI9z1XaZNBrJURtCoUT5SUnxFr8s3BzRl+cbzUq8=" crossorigin="anonymous"></script>
         <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js" integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.11.1/baguetteBox.min.js" integrity="sha256-ULQV01VS9LCI2ePpLsmka+W0mawFpEA0rtxnezUj4A4=" crossorigin="anonymous"></script>
     % endif
     %if use_bundles and use_cdn:
@@ -86,7 +86,7 @@ lang="${lang}">
             <script src="https://polyfill.io/v3/polyfill.js?features=Intl.RelativeTimeFormat.%7Elocale.${luxon_locales[lang]}"></script>
         %endif
         %if use_cdn:
-            <script src="https://cdn.jsdelivr.net/npm/luxon@1.28.0/build/global/luxon.min.js" integrity="sha256-l1u7Y5ze+ENf/T9ORPa3E642/uMgHUFa1KnqzFCcWEY=" crossorigin="anonymous"></script>
+            <script src="https://cdn.jsdelivr.net/npm/luxon@3.3.0/build/global/luxon.min.js" integrity="sha256-Nn+JGDrq3PuTxcDfJmmI0Srj5LpfOFlKqEiPwQK7y40=" crossorigin="anonymous"></script>
         %else:
             <script src="/assets/js/luxon.min.js"></script>
         %endif
@@ -100,7 +100,7 @@ lang="${lang}">
 
 <%def name="html_stylesheets()">
     % if use_cdn:
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.11.1/baguetteBox.min.css" integrity="sha256-cLMYWYYutHkt+KpNqjg7NVkYSQ+E2VbrXsEvOqU7mL0=" crossorigin="anonymous">
     % endif
     %if use_bundles and use_cdn:
diff --git a/nikola/data/themes/bootstrap4-jinja/README.md b/nikola/data/themes/bootstrap4-jinja/README.md
index bb1b484..8cb5f56 100644
--- a/nikola/data/themes/bootstrap4-jinja/README.md
+++ b/nikola/data/themes/bootstrap4-jinja/README.md
@@ -6,5 +6,5 @@ content layout. For a more blog-style layout, check out `bootblog4`.
 Note that unlike previous versions of Bootstrap, icon fonts are not built-in.
 You can use Font Awesome for this.
 
-This theme supports Bootswatch font/color schemes through the `nikola
-bootwatch_theme` command.
+This theme supports Bootswatch and HackerThemes font/color schemes
+through the `nikola subtheme` command.
diff --git a/nikola/data/themes/bootstrap4-jinja/templates/base_helper.tmpl b/nikola/data/themes/bootstrap4-jinja/templates/base_helper.tmpl
index ff1bfa2..167e8df 100644
--- a/nikola/data/themes/bootstrap4-jinja/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap4-jinja/templates/base_helper.tmpl
@@ -64,9 +64,9 @@ lang="{{ lang }}">
 
 {% macro late_load_js() %}
     {% if use_cdn %}
-        <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+        <script src="https://code.jquery.com/jquery-3.6.4.min.js" integrity="sha256-oP6HI9z1XaZNBrJURtCoUT5SUnxFr8s3BzRl+cbzUq8=" crossorigin="anonymous"></script>
         <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js" integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.11.1/baguetteBox.min.js" integrity="sha256-ULQV01VS9LCI2ePpLsmka+W0mawFpEA0rtxnezUj4A4=" crossorigin="anonymous"></script>
     {% endif %}
     {% if use_bundles and use_cdn %}
@@ -86,7 +86,7 @@ lang="{{ lang }}">
             <script src="https://polyfill.io/v3/polyfill.js?features=Intl.RelativeTimeFormat.%7Elocale.{{ luxon_locales[lang] }}"></script>
         {% endif %}
         {% if use_cdn %}
-            <script src="https://cdn.jsdelivr.net/npm/luxon@1.28.0/build/global/luxon.min.js" integrity="sha256-l1u7Y5ze+ENf/T9ORPa3E642/uMgHUFa1KnqzFCcWEY=" crossorigin="anonymous"></script>
+            <script src="https://cdn.jsdelivr.net/npm/luxon@3.3.0/build/global/luxon.min.js" integrity="sha256-Nn+JGDrq3PuTxcDfJmmI0Srj5LpfOFlKqEiPwQK7y40=" crossorigin="anonymous"></script>
         {% else %}
             <script src="/assets/js/luxon.min.js"></script>
         {% endif %}
@@ -100,7 +100,7 @@ lang="{{ lang }}">
 
 {% macro html_stylesheets() %}
     {% if use_cdn %}
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.11.1/baguetteBox.min.css" integrity="sha256-cLMYWYYutHkt+KpNqjg7NVkYSQ+E2VbrXsEvOqU7mL0=" crossorigin="anonymous">
     {% endif %}
     {% if use_bundles and use_cdn %}
diff --git a/nikola/data/themes/bootstrap4-jinja/templates/listing.tmpl b/nikola/data/themes/bootstrap4-jinja/templates/listing.tmpl
index 56a1b4f..f76b560 100644
--- a/nikola/data/themes/bootstrap4-jinja/templates/listing.tmpl
+++ b/nikola/data/themes/bootstrap4-jinja/templates/listing.tmpl
@@ -6,10 +6,10 @@
 {% if folders or files %}
 <ul>
 {% for name in folders %}
-    <li><a href="{{ name|e }}">📂&nbsp;{{ name|e }}</a>
+    <li><a href="{{ name|e }}">&#x1f4c2;&nbsp;{{ name|e }}</a>
 {% endfor %}
 {% for name in files %}
-    <li><a href="{{ name|e }}.html">📄&nbsp;{{ name|e }}</a>
+    <li><a href="{{ name|e }}.html">&#x1f4c4;&nbsp;{{ name|e }}</a>
 {% endfor %}
 </ul>
 {% endif %}
diff --git a/nikola/data/themes/bootstrap4/README.md b/nikola/data/themes/bootstrap4/README.md
index bb1b484..8cb5f56 100644
--- a/nikola/data/themes/bootstrap4/README.md
+++ b/nikola/data/themes/bootstrap4/README.md
@@ -6,5 +6,5 @@ content layout. For a more blog-style layout, check out `bootblog4`.
 Note that unlike previous versions of Bootstrap, icon fonts are not built-in.
 You can use Font Awesome for this.
 
-This theme supports Bootswatch font/color schemes through the `nikola
-bootwatch_theme` command.
+This theme supports Bootswatch and HackerThemes font/color schemes
+through the `nikola subtheme` command.
diff --git a/nikola/data/themes/bootstrap4/templates/base_helper.tmpl b/nikola/data/themes/bootstrap4/templates/base_helper.tmpl
index 32ca42b..c5895cd 100644
--- a/nikola/data/themes/bootstrap4/templates/base_helper.tmpl
+++ b/nikola/data/themes/bootstrap4/templates/base_helper.tmpl
@@ -64,9 +64,9 @@ lang="${lang}">
 
 <%def name="late_load_js()">
     %if use_cdn:
-        <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+        <script src="https://code.jquery.com/jquery-3.6.4.min.js" integrity="sha256-oP6HI9z1XaZNBrJURtCoUT5SUnxFr8s3BzRl+cbzUq8=" crossorigin="anonymous"></script>
         <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js" integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.11.1/baguetteBox.min.js" integrity="sha256-ULQV01VS9LCI2ePpLsmka+W0mawFpEA0rtxnezUj4A4=" crossorigin="anonymous"></script>
     % endif
     %if use_bundles and use_cdn:
@@ -86,7 +86,7 @@ lang="${lang}">
             <script src="https://polyfill.io/v3/polyfill.js?features=Intl.RelativeTimeFormat.%7Elocale.${luxon_locales[lang]}"></script>
         %endif
         %if use_cdn:
-            <script src="https://cdn.jsdelivr.net/npm/luxon@1.28.0/build/global/luxon.min.js" integrity="sha256-l1u7Y5ze+ENf/T9ORPa3E642/uMgHUFa1KnqzFCcWEY=" crossorigin="anonymous"></script>
+            <script src="https://cdn.jsdelivr.net/npm/luxon@3.3.0/build/global/luxon.min.js" integrity="sha256-Nn+JGDrq3PuTxcDfJmmI0Srj5LpfOFlKqEiPwQK7y40=" crossorigin="anonymous"></script>
         %else:
             <script src="/assets/js/luxon.min.js"></script>
         %endif
@@ -100,7 +100,7 @@ lang="${lang}">
 
 <%def name="html_stylesheets()">
     %if use_cdn:
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.11.1/baguetteBox.min.css" integrity="sha256-cLMYWYYutHkt+KpNqjg7NVkYSQ+E2VbrXsEvOqU7mL0=" crossorigin="anonymous">
     % endif
     %if use_bundles and use_cdn:
diff --git a/nikola/data/themes/bootstrap4/templates/listing.tmpl b/nikola/data/themes/bootstrap4/templates/listing.tmpl
index d9a4c56..6d22642 100644
--- a/nikola/data/themes/bootstrap4/templates/listing.tmpl
+++ b/nikola/data/themes/bootstrap4/templates/listing.tmpl
@@ -6,10 +6,10 @@ ${ui.breadcrumbs(crumbs)}
 %if folders or files:
 <ul>
 % for name in folders:
-    <li><a href="${name|h}">📂&nbsp;${name|h}</a>
+    <li><a href="${name|h}">&#x1f4c2;&nbsp;${name|h}</a>
 % endfor
 % for name in files:
-    <li><a href="${name|h}.html">📄&nbsp;${name|h}</a>
+    <li><a href="${name|h}.html">&#x1f4c4;&nbsp;${name|h}</a>
 % endfor
 </ul>
 %endif