diff --git a/assets/css/dark.css b/assets/css/dark.css
index ecb7024..a520c59 100644
--- a/assets/css/dark.css
+++ b/assets/css/dark.css
@@ -28,10 +28,7 @@
 
 --post-info-color: grey;
 
---switcher-color: #333;
---switcher-bg-color: #fff;
---switcher-border-color: #333333
---switcher-border-radius: 5px;
+--switcher-color: #fff;
 
 --svg-color: #ccc;
 --svg-state-color:#ff5858;
diff --git a/assets/css/light.css b/assets/css/light.css
index df05b45..d2f4dcb 100644
--- a/assets/css/light.css
+++ b/assets/css/light.css
@@ -30,10 +30,7 @@
 
     --post-info-color: grey;
 
-    --switcher-color: #fff;
-    --switcher-bg-color: #333; 
-    --switcher-border-color: #eeeeee;
-    --switcher-border-radius: 5px;
+    --switcher-color: #333;
 
     --svg-color: #333;
     --svg-state-color: #a31d1d;
diff --git a/assets/css/main.css b/assets/css/main.css
index e324079..31f82df 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -79,6 +79,11 @@ h1 {
 
 h2 {
     font-size: 1.2em;
+    margin-top: 3em;
+}
+
+h2:first-of-type {
+    margin-top: 0;
 }
 
 h3 {
@@ -229,9 +234,16 @@ header h2 {
     margin-top: 1em;
 }
 
+.header-top-left {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
 .site-title {
     display: inline;
     white-space: nowrap;
+    font-weight: 700;
 }
 
 header nav:not(:empty){
@@ -252,7 +264,7 @@ header nav a {
 /* Social icons */
 .social-icons {
     display: inline;
-    margin: 1em 0 0 3em;
+    margin: 1em 0 0 1em;
     padding: 0;
     list-style-type: none;
 }
@@ -415,9 +427,8 @@ article header h1 a {
 .post h4 a,
 .post h5 a,
 .post h6 a {
-    opacity: 0;
-    position: absolute;
-    left: -1.2rem;
+    opacity: 1;
+    border-bottom: none;
 }
 
 .post h1:hover a,
@@ -481,10 +492,22 @@ article header h1 a {
     stroke: var(--svg-state-color);
 }
 
+.post-list .post-info {
+    color: var(--post-info-color);
+    font-size: 0.75em;
+    margin-top: 1em;
+    margin-bottom: 1em;
+    display: block;
+    gap: 1em;
+}
+
 .post-info {
     color: var(--post-info-color);
     font-size: 0.75em;
     margin-top: 1em;
+    margin-bottom: 1em;
+    display: flex;
+    gap: 1em;
 }
 
 .post-info a {
@@ -629,6 +652,9 @@ code.has-jax {
 
 .read-next-title {
     margin-bottom:  0;
+    margin-top: 3em;
+    padding-top: 1em;
+    border-top: 1px dashed var(--thead-bg-color);
 }
 
 .read-next-posts {
@@ -687,10 +713,11 @@ code.has-jax {
 /* Footer */
 
 .common-footer {
-    border-top: thin solid var(--hr-color);
     padding-top: 1.5em;
     margin-top: 3em;
-    font-size: 16px;
+    font-size: 12px;
+    margin-bottom: 1.5em;
+    color: var(--pagination-link-color);
 }
 
 .common-footer-bottom {
@@ -712,12 +739,9 @@ ul.language-select > li, ul.footer-menu > li {
 
 .theme-switcher {
     color: var(--switcher-color);
-    background: var(--switcher-bg-color);
-    padding: 0.5em 1em;
-    font-size: 16px;
-    border: 1px solid var(--switcher-border-color);
-    border-radius: var(--switcher-border-radius);
-    margin-bottom: 1em;
+    /* padding: 0.5em 1em; */
+    margin: 1em 0 0 1.5em;
+    cursor: pointer;
 }
 
 .h-card {
diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
index d1af727..7c7f3ec 100644
--- a/layouts/_default/_markup/render-heading.html
+++ b/layouts/_default/_markup/render-heading.html
@@ -1,7 +1,8 @@
-<h{{ .Level }} id="{{ .Anchor | safeURL }}" {{ if .Attributes.style }}style="{{ .Attributes.style | safeCSS }}"{{ end }}>{{ .Text | safeHTML }}
-<span>
+<h{{ .Level }} id="{{ .Anchor | safeURL }}" {{ if .Attributes.style }}style="{{ .Attributes.style | safeCSS }}"{{ end }}>
+<div>
     <a href="#{{ .Anchor }}">
-        <svg viewBox="0 0 28 23" height="100%" width="19" xmlns="http://www.w3.org/2000/svg"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71" fill="none" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71" fill="none" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/></svg>
+        {{ range seq 2 .Level}}#{{end}}
     </a>
-</span>
+    {{ .Text | safeHTML }}
+</div>
 </h{{ .Level }}>
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 1ac45f7..5dca863 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -11,17 +11,17 @@
         <div class="post-header">
             <header>
                 <h1 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}">{{ trim .Title  " " | markdownify }}</h1>
-
                 {{ partial "post-language-switcher.html" . }}
             </header>
+            {{ partial "post-info.html" . }}
         </div>
         {{ partial "toc.html" .}}
         <div class="content e-content">
             {{ .Content }}
         </div>
-        {{ partial "post-info.html" . }}
-    </article>
 
+    </article>
+    
     {{ if gt .Site.Params.readNextPosts 0 }}
         {{ $related := .Site.RegularPages.Related . | first .Site.Params.readNextPosts }}
         {{ with $related }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 4ed9a71..f8b3f95 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -13,11 +13,13 @@
             {{ end }}
             </ul>
         {{ end }}
-        <div class="copyright">
-            <p>© {{ if isset .Site.Params "author"}}{{ .Site.Params.author }}, {{end}}{{ now.Year }}<br>
+        
+        <div>
+            © {{ if isset .Site.Params "author"}}{{ .Site.Params.author }}, {{end}}{{ now.Year }}
+        </div>
+        <div>
             {{ i18n "powered" }} <a target="_blank" rel="noopener noreferrer" href="https://gohugo.io/">Hugo</a>, {{ i18n "theme" }} <a target="_blank" rel="noopener noreferrer" href="https://github.com/Junyi-99/hugo-theme-anubis2">Anubis2</a>.<br>
             {{ partial "footer-extra.html" . }}
-            </p>  
         </div> 
     </div>
 
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index b7cbb02..a3a37cf 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,10 +1,11 @@
 <div class="header-top">
     <div class="header-top-left">
         {{ partial "site-title.html" . }}
+        {{ partial "theme-switcher.html" . }}  
         {{ partial "social.html" . }}
     </div>
     <div class="header-top-right">
-        {{ partial "theme-switcher.html" . }}  
+        
     </div>
 </div>
 
diff --git a/layouts/partials/post-info.html b/layouts/partials/post-info.html
index beafc99..641b66a 100644
--- a/layouts/partials/post-info.html
+++ b/layouts/partials/post-info.html
@@ -7,9 +7,9 @@
 <div class="post-info noselect">
     {{ if .Params.date }}
         <div class="post-date dt-published">
-            <a class="u-url" href="{{ .RelPermalink }}"><time datetime="{{ .Params.date.Format $machineDateFormat }}">
+            <time datetime="{{ .Params.date.Format $machineDateFormat }}">
                 {{- .Params.date.Format $dateFormat -}}
-            </time></a>
+            </time>
             {{ if ne .Params.date .Params.lastMod -}}
                 [{{ i18n "lastMod" }} <time datetime="{{ .Params.lastMod.Format $machineDateFormat }}">
                     {{- .Params.lastMod.Format $dateFormat -}}