diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 6784f2be..9610585c 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -6,28 +6,12 @@
 </head>
 
 <body class="{{ if eq .Kind `page` }}single{{ else }}list{{ if .IsHome }} home{{ end }}{{ end }}">
-    {{- if $.Site.Params.SetThemeAuto -}}
-    <script>
-        setTheme();
-    </script>
-    {{- end -}}
-    <header class="header">
-        {{- partial "header.html" . }}
-    </header>
-
+    {{- partial "header.html" . }}
     <main class="main">
         {{- block "main" . }}
         {{end }}
     </main>
-
-    <footer class="footer">
-        {{- partial "footer.html" . }}
-    </footer>
-    {{ $highlight := resources.Get "js/highlight.min.js" | minify | fingerprint}}
-    <script src="{{ $highlight.Permalink }}" integrity="{{ $highlight.Data.Integrity }}"></script>
-    <script>
-        hljs.initHighlightingOnLoad();
-    </script>
+    {{- partial "footer.html" . }}
 </body>
 
 </html>
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 1062c079..38f6d30e 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,5 +1,13 @@
-<span>&copy; {{ now.Year }} <a href="{{ "" | absURL }}">{{ .Site.Title }}</a></span>
-<span>&middot;</span>
-<span>Powered by <a href="https://gohugo.io/" rel="noopener" target="_blank">Hugo️️</a>️</span>
-<span>&middot;</span>
-<span>Theme️ <a href="https://github.com/adityatelange/hugo-PaperMod" rel="noopener" target="_blank">PaperMod</a></span>
\ No newline at end of file
+<footer class="footer">
+    <span>&copy; {{ now.Year }} <a href="{{ "" | absURL }}">{{ .Site.Title }}</a></span>
+    <span>&middot;</span>
+    <span>Powered by <a href="https://gohugo.io/" rel="noopener" target="_blank">Hugo️️</a>️</span>
+    <span>&middot;</span>
+    <span>Theme️ <a href="https://github.com/adityatelange/hugo-PaperMod" rel="noopener"
+            target="_blank">PaperMod</a></span>
+</footer>
+{{ $highlight := resources.Get "js/highlight.min.js" | minify | fingerprint}}
+<script src="{{ $highlight.Permalink }}" integrity="{{ $highlight.Data.Integrity }}"></script>
+<script>
+    hljs.initHighlightingOnLoad();
+</script>
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index c1cc59e8..a72672a5 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,16 +1,28 @@
-<nav class="nav">
-    {{- if .IsHome }}
-    <h1 class="logo"><a href="{{ "" | absURL }}">{{ .Site.Title }}</a></h1>
-    {{- else }}
-    <p class="logo"><a href="{{ "" | absURL }}">{{ .Site.Title }}</a></p>
-    {{- end }}
-    {{- if .Site.Menus.main }}
-    <ul class="menu">
-        {{- range .Site.Menus.main }}
-        <li>
-            <a href="{{ .URL }}">{{ .Name }}</a>
-        </li>
+{{- if $.Site.Params.SetThemeAuto -}}
+<script>
+    setTheme();
+</script>
+{{- end -}}
+<header class="header">
+    {{- if $.Site.Params.SetThemeAuto -}}
+    <script>
+        setTheme();
+    </script>
+    {{- end -}}
+    <nav class="nav">
+        {{- if .IsHome }}
+        <h1 class="logo"><a href="{{ "" | absURL }}">{{ .Site.Title }}</a></h1>
+        {{- else }}
+        <p class="logo"><a href="{{ "" | absURL }}">{{ .Site.Title }}</a></p>
         {{- end }}
-    </ul>
-    {{- end }}
-</nav>
\ No newline at end of file
+        {{- if .Site.Menus.main }}
+        <ul class="menu">
+            {{- range .Site.Menus.main }}
+            <li>
+                <a href="{{ .URL }}">{{ .Name }}</a>
+            </li>
+            {{- end }}
+        </ul>
+        {{- end }}
+    </nav>
+</header>
\ No newline at end of file
