diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index f0da4d0..cc6c0bc 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -2,6 +2,7 @@
 <html lang="{{ .Site.LanguageCode }}">
     {{ block "header" . }}{{ end }}
     <body class="{{ .Site.Params.themeColor }} {{if .Site.Params.layoutReverse}}layout-reverse{{end}}">
+    {{ partial "body/custom.html" . }}
     {{ partial "sidebar.html" . }}
         <div class="content container">
             {{ block "content" . }}{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index c1a00bb..4f011a6 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -36,9 +36,5 @@
 {{ end }}
 
 {{ define "footer" }}
-  {{ if .Site.GoogleAnalytics }}
-    <!-- Google Analytics -->
-    {{ template "_internal/google_analytics_async.html" . }}
-  {{ end }}
-  {{ partial "footer/font-awesome-js.html" . }}
+  {{ partial "footer.html" . }}
 {{ end }}
diff --git a/layouts/partials/body/custom.html b/layouts/partials/body/custom.html
new file mode 100644
index 0000000..e69de29
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
new file mode 100644
index 0000000..f83aeac
--- /dev/null
+++ b/layouts/partials/footer.html
@@ -0,0 +1,6 @@
+{{ if .Site.GoogleAnalytics }}
+	<!-- Google Analytics -->
+	{{ template "_internal/google_analytics_async.html" . }}
+{{ end }}
+{{ partial "footer/font-awesome-js.html" . }}
+{{ partial "footer/custom.html" . }}
diff --git a/layouts/partials/footer/custom.html b/layouts/partials/footer/custom.html
new file mode 100644
index 0000000..e69de29
diff --git a/layouts/partials/highlight-js.html b/layouts/partials/highlight-js.html
index 87c347d..361d860 100644
--- a/layouts/partials/highlight-js.html
+++ b/layouts/partials/highlight-js.html
@@ -7,12 +7,12 @@
                 <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/languages/{{.}}.min.js"></script>
             {{ end }}
         {{ end }}
+		<script type="text/javascript">
+		    {{ with $.Scratch.Get "hl_languages" }}
+		    hljs.configure({languages: [{{(delimit . ", ")}}]});
+		    {{ end }}
+		    hljs.initHighlightingOnLoad();
+		</script>
     {{ end }}
-    <script type="text/javascript">
-        {{ with $.Scratch.Get "hl_languages" }}
-        hljs.configure({languages: [{{(delimit . ", ")}}]});
-        {{ end }}
-        hljs.initHighlightingOnLoad();
-    </script>
     {{ $.Scratch.Delete "hl_languages" }}
 {{ end }}
diff --git a/layouts/partials/page-list/footer.html b/layouts/partials/page-list/footer.html
index 2579155..05d6961 100644
--- a/layouts/partials/page-list/footer.html
+++ b/layouts/partials/page-list/footer.html
@@ -1,5 +1 @@
-{{ if .Site.GoogleAnalytics }}
-  <!-- Google Analytics -->
-  {{ template "_internal/google_analytics_async.html" . }}
-{{ end }}
-{{ partial "footer/font-awesome-js.html" . }}
+{{ partial "footer.html" . }}
diff --git a/layouts/partials/page-single/footer.html b/layouts/partials/page-single/footer.html
index 7f23337..6aed250 100644
--- a/layouts/partials/page-single/footer.html
+++ b/layouts/partials/page-single/footer.html
@@ -1,9 +1,6 @@
+{{ partial "footer.html" . }}
+
 {{ $include_toc := .Params.include_toc}}
-{{ if .Site.GoogleAnalytics }}
-  <!-- Google Analytics -->
-  {{ template "_internal/google_analytics_async.html" . }}
-{{ end }}
-{{ partial "footer/font-awesome-js.html" . }}
 {{ partial "highlight-js.html" . }}
 {{ with .Site.Params.toc }}
 {{ if and (eq . "tocbot") (ne $include_toc false) }}
diff --git a/layouts/partials/portfolio/footer.html b/layouts/partials/portfolio/footer.html
index 2579155..05d6961 100644
--- a/layouts/partials/portfolio/footer.html
+++ b/layouts/partials/portfolio/footer.html
@@ -1,5 +1 @@
-{{ if .Site.GoogleAnalytics }}
-  <!-- Google Analytics -->
-  {{ template "_internal/google_analytics_async.html" . }}
-{{ end }}
-{{ partial "footer/font-awesome-js.html" . }}
+{{ partial "footer.html" . }}
