diff --git a/README.md b/README.md
index f94211a..f7190b9 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ params:
   tocWordCount: 300 # ...when a post is longer than 300 words
   copyCodeButton: true # true by default
   rssAsSocialIcon: true
-  mathjax: false # https://www.mathjax.org/
+  mathjax: false # https://www.mathjax.org/ loading cost 257.4KiB network traffic
   # utteranc.es support
   utterancesRepo: ""  # mandatory
   utterancesTheme: "" # optional
diff --git a/assets/css/dark.css b/assets/css/dark.css
index 40213c5..b1b339f 100644
--- a/assets/css/dark.css
+++ b/assets/css/dark.css
@@ -4,7 +4,6 @@
   
 --card-color: #2e2e33;
 --card-border-color: #333333;
---card-border-radius: 0.5em;
 
 --link-color:#599ada;
 --link-state-color:#ff5858;
diff --git a/assets/css/light.css b/assets/css/light.css
index 04de700..408d806 100644
--- a/assets/css/light.css
+++ b/assets/css/light.css
@@ -5,7 +5,7 @@
     
     --card-color: #fafafa;
     --card-border-color: #eeeeee;
-    --card-border-radius: 0.5em;
+    
 
     --link-color:#1d60a3;
     --link-state-color:rgb(163, 29, 29);
diff --git a/assets/css/main.css b/assets/css/main.css
index ef6683c..6829e28 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -30,6 +30,12 @@
 {{ end }}
 
 /* Basic */
+
+:root {
+    --card-border-radius: 0.5em;
+    --card-margin: 1.5em;
+}
+
 html {
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
     /* 1 */
@@ -280,12 +286,13 @@ header h2 {
 
 header nav:not(:empty){
     background: var(--nav-bg-color);
-    margin-top: 1em;
+    margin-top: var(--card-margin);
     max-width: 100%;
     text-align: center;
     padding: 0.5em 0;
     border: 1px solid var(--card-border-color);
     border-radius: var(--card-border-radius);
+    font-size: 14px;
 }
 
 header nav a {
@@ -343,7 +350,7 @@ main h1 {
 }
 
 article:not(:last-of-type) {
-    margin-bottom: 1.5em;
+    margin-bottom: var(--card-margin);
 }
 
 .post-short-list:first-of-type {
@@ -408,19 +415,19 @@ article:not(:last-of-type) {
 }
 
 .post-title.favorite::after {
-    content: "☆";
+    content: "🌟";
     display: inline-block;
     margin-left: 0.2em;
 }
 
 .post-title.draft::after {
-    content: "✎";
+    content: "✏️";
     display: inline-block;
     margin-left: 0.2em;
 }
 
 .post-title.favorite.draft::after {
-    content: "☆ ✎";
+    content: "🌟 ✏️";
     display: inline-block;
     margin-left: 0.2em;
 }
diff --git a/exampleSiteMultilingual/hugo.toml b/exampleSiteMultilingual/hugo.toml
index ee8365f..7a5facf 100644
--- a/exampleSiteMultilingual/hugo.toml
+++ b/exampleSiteMultilingual/hugo.toml
@@ -2,7 +2,7 @@ baseURL = "https://example.com"
 languageCode = "en-us"
 defaultContentLanguage = "en"
 title = "Anubis2"
-theme = "anubis"
+theme = "anubis2"
 paginate = 3
 
 disqusShortname = ""
@@ -17,12 +17,13 @@ description = "Anubis2 is another simple minimalist theme for Hugo blog engine."
 dateFormat = "2006-01-02"
 paginationSinglePost = true
 style = "auto"
-readMore = false
+readMore = true
 readNextPosts = 2
 copyCodeButton = true
 rssAsSocialIcon = true
 locale = "en-us"
 mathjax = false
+toc = true
 
 # Graphcomment support
 graphcommentId = ""
@@ -44,44 +45,57 @@ url = "https://github.com/Junyi-99/hugo-theme-anubis2"
 [languages.en]
 languageName = "English"
 
+[[menu.main]]
+identifier = "home"
+name = "Home"
+url = "/"
+weight = 1
+
 [[menu.main]]
 identifier = "about"
 name = "About"
 url = "/about/"
-weight = 1
+weight = 2
 
 [[menu.main]]
 identifier = "tags"
 name = "Tags"
 url = "/tags/"
-weight = 2
+weight = 3
 
 [[menu.main]]
 name = "Archive"
 identifier = "archive"
 url = "/posts/"
-weight = 3
+weight = 4
 
 [languages.pl]
 languageName = "Polski"
 
+
+[[languages.pl.menu.main]]
+identifier = "home"
+name = "Strona Główna"
+url = "/"
+weight = 1
+
 [[languages.pl.menu.main]]
 identifier = "about"
 name = "O Hugo"
 url = "/about/"
-weight = 1
+weight = 2
 
 [[languages.pl.menu.main]]
 identifier = "tags"
 name = "Tagi"
 url = "/tags/"
-weight = 2
+weight = 3
 
 [[languages.pl.menu.main]]
 identifier = "archive"
 name = "Archiwum"
 url = "/posts/"
-weight = 3
+weight = 4
 
 [languages.pl.params]
 languageCode = "pl-pl"
@@ -89,23 +103,29 @@ languageCode = "pl-pl"
 [languages.zh]
 languageName = "Chinese"
 
+[[languages.zh.menu.main]]
+identifier = "home"
+name = "首页"
+url = "/"
+weight = 1
+
 [[languages.zh.menu.main]]
 identifier = "about"
 name = "关于"
 url = "/about/"
-weight = 1
+weight = 2
 
 [[languages.zh.menu.main]]
 identifier = "tags"
 name = "标签"
 url = "/tags/"
-weight = 2
+weight = 3
 
 [[languages.zh.menu.main]]
 identifier = "archive"
 name = "归档"
 url = "/posts/"
-weight = 3
+weight = 4
 
 [languages.zh.params]
 languageCode = "zh-cn"
diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html
index d69fa77..c770f73 100644
--- a/layouts/partials/toc.html
+++ b/layouts/partials/toc.html
@@ -1,10 +1,21 @@
-{{ $toc := and ($.Site.Params.toc) (ge .WordCount $.Site.Params.tocWordCount) }} {{ if isset .Params "toc" }} {{ $toc = .Params.toc }} {{ end }} {{ if $toc }}
-<details class="toc noselect">
-  <summary>Table of Contents</summary>
-  <div class="inner">{{ .TableOfContents }}</div>
-</details>
+{{ $toc := and ($.Site.Params.toc) (ge .WordCount $.Site.Params.tocWordCount) }} 
+{{ if isset .Params "toc" }} 
+  {{ $toc = .Params.toc }}
+{{ end }} 
+
+
+{{ if $toc }}
+  {{ $tocContent := .TableOfContents }}
+  {{ if findRE "<li>" $tocContent }}
+  <!-- we show the toc only if we have element in .TableOfContents -->
+  <details class="toc noselect">
+    <summary>Table of Contents</summary>
+    <div class="inner">{{ .TableOfContents }}</div>
+  </details>
+  {{ end }}
 {{ end }}
 
+
 <script>
   document.querySelector(".toc").addEventListener("click", function () {
     if (event.target.tagName !== "A") {
diff --git a/theme.toml b/theme.toml
index 454fa81..c62cfd2 100644
--- a/theme.toml
+++ b/theme.toml
@@ -1,9 +1,9 @@
-name = "Anubis"
+name = "Anubis2"
 license = "MIT"
 licenselink = "https://github.com/Junyi-99/hugo-theme-anubis2/blob/master/LICENSE"
 description = "A minimal Hugo theme"
 homepage = "https://github.com/Junyi-99/hugo-theme-anubis2"
-demosite = "https://hugo-theme-anubis.netlify.app/"
+demosite = "https://hugo-theme-anubis2.netlify.app/"
 tags = [
     "blog", 
     "responsive",