diff --git a/nikola/conf.py.in b/nikola/conf.py.in
index fb43e8cfb..64cc5a3be 100644
--- a/nikola/conf.py.in
+++ b/nikola/conf.py.in
@@ -1026,9 +1026,15 @@ PRETTY_URLS = ${PRETTY_URLS}
 # delimiters: [
 #     {left: "$$", right: "$$", display: true},
 #     {left: "\\\\[", right: "\\\\]", display: true},
+#     {left: "\\\\begin{equation}", right: "\\\\end{equation}", display: true},
 #     {left: "\\\\begin{equation*}", right: "\\\\end{equation*}", display: true},
+#     {left: "\\\\begin{align}", right: "\\\\end{align}", display: true},
+#     {left: "\\\\begin{align*}", right: "\\\\end{align*}", display: true},
+#     {left: "\\\\begin{alignat}", right: "\\\\end{alignat}", display: true},
+#     {left: "\\\\begin{gather}", right: "\\\\end{gather}", display: true},
+#     {left: "\\\\begin{CD}", right: "\\\\end{CD}", display: true},
 #     {left: "$", right: "$", display: false},
-#     {left: "\\\\(", right: "\\\\)", display: false}
+#     {left: "\\\\(", right: "\\\\)", display: false},
 # ]
 # """
 
diff --git a/nikola/data/themes/base-jinja/templates/math_helper.tmpl b/nikola/data/themes/base-jinja/templates/math_helper.tmpl
index c16f9b859..d5be54ffc 100644
--- a/nikola/data/themes/base-jinja/templates/math_helper.tmpl
+++ b/nikola/data/themes/base-jinja/templates/math_helper.tmpl
@@ -1,28 +1,36 @@
 {#  Note: at present, MathJax and KaTeX do not respect the USE_CDN configuration option #}
 {% macro math_scripts() %}
     {% if use_katex %}
-        <script src="https://cdn.jsdelivr.net/npm/katex@0.10.2/dist/katex.min.js" integrity="sha384-9Nhn55MVVN0/4OFx7EE5kpFBPsEMZxKTCnA+4fqDmg12eCTqGi6+BB2LjY8brQxJ" crossorigin="anonymous"></script>
-        <script src="https://cdn.jsdelivr.net/npm/katex@0.10.2/dist/contrib/auto-render.min.js" integrity="sha384-kWPLUVMOks5AQFrykwIup5lo0m3iMkkHrD0uJ4H5cjeGihAutqP0yW0J6dpFiVkI" crossorigin="anonymous"></script>
+        <script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.44/dist/katex.min.js" integrity="sha384-m/s9umSlhJbqEdA/j7pQVdGCMx2fHf7GXtgCVhNGOwLuu+1qJQES5AzIE8pn3nKQ" crossorigin="anonymous"></script>
+        <script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.44/dist/contrib/auto-render.min.js" integrity="sha384-bjyGPfbij8/NDKJhSGZNP/khQVgtHUE5exjm4Ydllo42FwIgYsdLO2lXGmRBf5Mz" crossorigin="anonymous"></script>
         {% if katex_auto_render %}
             <script>
-                renderMathInElement(document.body,
-                    {
-                        {{ katex_auto_render }}
-                    }
-                );
+                document.addEventListener("DOMContentLoaded", function() {
+                    renderMathInElement(document.body,
+                        {
+                            {{ katex_auto_render }}
+                        }
+                    );
+                });
             </script>
         {% else %}
             <script>
-                renderMathInElement(document.body,
-                    {
-                        delimiters: [
-                            {left: "$$", right: "$$", display: true},
-                            {left: "\\[", right: "\\]", display: true},
-                            {left: "\\begin{equation*}", right: "\\end{equation*}", display: true},
-                            {left: "\\(", right: "\\)", display: false}
-                        ]
-                    }
-                );
+                document.addEventListener("DOMContentLoaded", function() {
+                    renderMathInElement(document.body,
+                        {
+                            delimiters: [
+                                {left: "$$", right: "$$", display: true},
+                                {left: "\\(", right: "\\)", display: false},
+                                {left: "\\begin{equation*}", right: "\\end{equation*}", display: true},
+                                {left: "\\begin{align*}", right: "\\end{align*}", display: true},
+                                {left: "\\begin{alignat}", right: "\\end{alignat}", display: true},
+                                {left: "\\begin{gather}", right: "\\end{gather}", display: true},
+                                {left: "\\begin{CD}", right: "\\end{CD}", display: true},
+                                {left: "\\[", right: "\\]", display: true}
+                            ]
+                        }
+                    );
+                });
             </script>
         {% endif %}
     {% else %}
@@ -40,7 +48,7 @@
 
 {% macro math_styles() %}
     {% if use_katex %}
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.10.2/dist/katex.min.css" integrity="sha384-yFRtMMDnQtDRO8rLpMIKrtPCD5jdktao2TV19YiZYWMDkUR5GQZR/NOVTdquEx1j" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.44/dist/katex.min.css" integrity="sha384-irXK0JiCGinqGL+slwVklbhJetrjczNwaP2lANewD8lKAs9n61SbQ3As28iSqXUE" crossorigin="anonymous">
     {% endif %}
 {% endmacro %}
 
diff --git a/nikola/data/themes/base/templates/math_helper.tmpl b/nikola/data/themes/base/templates/math_helper.tmpl
index 961b7ced2..7f4342739 100644
--- a/nikola/data/themes/base/templates/math_helper.tmpl
+++ b/nikola/data/themes/base/templates/math_helper.tmpl
@@ -1,28 +1,36 @@
 ### Note: at present, MathJax and KaTeX do not respect the USE_CDN configuration option
 <%def name="math_scripts()">
     %if use_katex:
-        <script src="https://cdn.jsdelivr.net/npm/katex@0.10.2/dist/katex.min.js" integrity="sha384-9Nhn55MVVN0/4OFx7EE5kpFBPsEMZxKTCnA+4fqDmg12eCTqGi6+BB2LjY8brQxJ" crossorigin="anonymous"></script>
-        <script src="https://cdn.jsdelivr.net/npm/katex@0.10.2/dist/contrib/auto-render.min.js" integrity="sha384-kWPLUVMOks5AQFrykwIup5lo0m3iMkkHrD0uJ4H5cjeGihAutqP0yW0J6dpFiVkI" crossorigin="anonymous"></script>
+        <script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.44/dist/katex.min.js" integrity="sha384-m/s9umSlhJbqEdA/j7pQVdGCMx2fHf7GXtgCVhNGOwLuu+1qJQES5AzIE8pn3nKQ" crossorigin="anonymous"></script>
+        <script defer src="https://cdn.jsdelivr.net/npm/katex@0.16.44/dist/contrib/auto-render.min.js" integrity="sha384-bjyGPfbij8/NDKJhSGZNP/khQVgtHUE5exjm4Ydllo42FwIgYsdLO2lXGmRBf5Mz" crossorigin="anonymous"></script>
         % if katex_auto_render:
             <script>
-                renderMathInElement(document.body,
-                    {
-                        ${katex_auto_render}
-                    }
-                );
+                document.addEventListener("DOMContentLoaded", function() {
+                    renderMathInElement(document.body,
+                        {
+                            ${katex_auto_render}
+                        }
+                    );
+                });
             </script>
         % else:
             <script>
-                renderMathInElement(document.body,
-                    {
-                        delimiters: [
-                            {left: "$$", right: "$$", display: true},
-                            {left: "\\[", right: "\\]", display: true},
-                            {left: "\\begin{equation*}", right: "\\end{equation*}", display: true},
-                            {left: "\\(", right: "\\)", display: false}
-                        ]
-                    }
-                );
+                document.addEventListener("DOMContentLoaded", function() {
+                    renderMathInElement(document.body,
+                        {
+                            delimiters: [
+                                {left: "$$", right: "$$", display: true},
+                                {left: "\\(", right: "\\)", display: false},
+                                {left: "\\begin{equation*}", right: "\\end{equation*}", display: true},
+                                {left: "\\begin{align*}", right: "\\end{align*}", display: true},
+                                {left: "\\begin{alignat}", right: "\\end{alignat}", display: true},
+                                {left: "\\begin{gather}", right: "\\end{gather}", display: true},
+                                {left: "\\begin{CD}", right: "\\end{CD}", display: true},
+                                {left: "\\[", right: "\\]", display: true}
+                            ]
+                        }
+                    );
+                });
             </script>
         % endif
     %else:
@@ -40,7 +48,7 @@
 
 <%def name="math_styles()">
     % if use_katex:
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.10.2/dist/katex.min.css" integrity="sha384-yFRtMMDnQtDRO8rLpMIKrtPCD5jdktao2TV19YiZYWMDkUR5GQZR/NOVTdquEx1j" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.16.44/dist/katex.min.css" integrity="sha384-irXK0JiCGinqGL+slwVklbhJetrjczNwaP2lANewD8lKAs9n61SbQ3As28iSqXUE" crossorigin="anonymous">
     % endif
 </%def>