diff --git a/_config.yml b/_config.yml
index 0f49acb..3496bf1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -504,6 +504,8 @@ math:
 
   mathjax:
     enable: false
+    # Available values: none | ams | all
+    tags: none
 
   katex:
     enable: false
diff --git a/layout/_macro/sidebar.njk b/layout/_macro/sidebar.njk
index bcf62ce..1e5ceec 100644
--- a/layout/_macro/sidebar.njk
+++ b/layout/_macro/sidebar.njk
@@ -8,7 +8,7 @@
   <aside class="sidebar">
     {%- set display_toc = page.toc.enable and display_toc %}
     {%- if display_toc %}
-      {%- set toc = toc(page.content, { class: "nav", list_number: page.toc.number, max_depth: page.toc.max_depth }) %}
+      {%- set toc = toc(page.content, {class: 'nav', list_number: page.toc.number, max_depth: page.toc.max_depth}) %}
       {%- set display_toc = toc.length > 1 and display_toc %}
     {%- endif %}
 
diff --git a/layout/_partials/header/menu-item.njk b/layout/_partials/header/menu-item.njk
index 4513eb3..a0243b8 100644
--- a/layout/_partials/header/menu-item.njk
+++ b/layout/_partials/header/menu-item.njk
@@ -24,7 +24,7 @@
       {%- endfor %}
     {%- endif %}
 
-    {{ next_url(itemURL, menuIcon + menuText + menuBadge, {rel: 'section'}) }}
+    {{- next_url(itemURL, menuIcon + menuText + menuBadge, {rel: 'section'}) -}}
 
   </li>
 
diff --git a/layout/_third-party/comments/gitalk.njk b/layout/_third-party/comments/gitalk.njk
index 4f54907..a66fcee 100644
--- a/layout/_third-party/comments/gitalk.njk
+++ b/layout/_third-party/comments/gitalk.njk
@@ -12,7 +12,7 @@ NexT.utils.loadComments('#gitalk-container', () => {
       admin       : ['{{ theme.gitalk.admin_user }}'],
       id          : '{{ gitalk_md5(page.path) }}',
       {%- if theme.gitalk.language == '' %}
-        language: window.navigator.language || window.navigator.userLanguage,
+        language: window.navigator.language,
       {% else %}
         language: '{{ theme.gitalk.language }}',
       {%- endif %}
diff --git a/layout/_third-party/math/mathjax.njk b/layout/_third-party/math/mathjax.njk
index 34489b5..c41a54d 100644
--- a/layout/_third-party/math/mathjax.njk
+++ b/layout/_third-party/math/mathjax.njk
@@ -3,21 +3,10 @@
     window.MathJax = {
       tex: {
         inlineMath: {'[+]': [['$', '$']]},
-        tags: 'ams'
+        tags: '{{ theme.math.mathjax.tags }}'
       },
       options: {
         renderActions: {
-          findScript: [10, doc => {
-            document.querySelectorAll('script[type^="math/tex"]').forEach(node => {
-              const display = !!node.type.match(/; *mode=display/);
-              const math = new doc.options.MathItem(node.textContent, doc.inputJax[0], display);
-              const text = document.createTextNode('');
-              node.parentNode.replaceChild(text, node);
-              math.start = {node: text, delim: '', n: 0};
-              math.end = {node: text, delim: '', n: 0};
-              doc.math.push(math);
-            });
-          }, '', false],
           insertedScript: [200, () => {
             document.querySelectorAll('mjx-container').forEach(node => {
               const target = node.parentNode;