diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 005abd1..389de8f 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <link rel="shortcut icon" href="/favicon.svg" />
     <title>{{ .Title }} - {{ .Site.Title }}</title>
-    {{ partial "head/conditional-css.html" . }}
+    {{ partial "head/conditional-assets.html" . }}
     {{ partial "head/bootstrap5.html" . }}
     {{ partial "head/blockquote.html" . }}
     {{ block "head" . }}{{ end }}
@@ -19,8 +19,6 @@
         {{ block "main" . }}{{ end }}
         {{ partial "footer/footer.html" . }}
     </div>
-    {{ partial "foot/bootstrap5.html" . }}
-    {{ partial "foot/conditional-js.html" . }}
 </body>
 
 </html>
diff --git a/layouts/partials/foot/bootstrap5.html b/layouts/partials/foot/bootstrap5.html
deleted file mode 100644
index 22f03f5..0000000
--- a/layouts/partials/foot/bootstrap5.html
+++ /dev/null
@@ -1 +0,0 @@
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
diff --git a/layouts/partials/head/bootstrap5.html b/layouts/partials/head/bootstrap5.html
index 9a864c3..f43e4b7 100644
--- a/layouts/partials/head/bootstrap5.html
+++ b/layouts/partials/head/bootstrap5.html
@@ -2,4 +2,5 @@
 <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet"
     integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
\ No newline at end of file
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous" defer></script>
diff --git a/layouts/partials/foot/conditional-js.html b/layouts/partials/head/conditional-assets.html
similarity index 59%
rename from layouts/partials/foot/conditional-js.html
rename to layouts/partials/head/conditional-assets.html
index 6e2fb73..781ab7b 100644
--- a/layouts/partials/foot/conditional-js.html
+++ b/layouts/partials/head/conditional-assets.html
@@ -1,6 +1,10 @@
+{{ if .HasShortcode "cfg" }}
+{{ $block := resources.Get "css/cfg.css" }}
+<link rel="stylesheet" href="{{ $block.RelPermalink }}" />
+{{ end }}
 {{ if .HasShortcode "gallery" }}
-<script src="https://cdn.jsdelivr.net/npm/masonry-layout@4.2.2/dist/masonry.pkgd.min.js" integrity="sha384-GNFwBvfVxBkLMJpYMOABq3c+d3KnQxudP/mGPkzpZSTYykLBNsZEnG2D9G/X/+7D" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/imagesloaded@5.0.0/imagesloaded.pkgd.min.js" integrity="sha256-htrLFfZJ6v5udOG+3kNLINIKh2gvoKqwEhHYfTTMICc=" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/masonry-layout@4.2.2/dist/masonry.pkgd.min.js" integrity="sha384-GNFwBvfVxBkLMJpYMOABq3c+d3KnQxudP/mGPkzpZSTYykLBNsZEnG2D9G/X/+7D" crossorigin="anonymous" async></script>
+<script src="https://cdn.jsdelivr.net/npm/imagesloaded@5.0.0/imagesloaded.pkgd.min.js" integrity="sha256-htrLFfZJ6v5udOG+3kNLINIKh2gvoKqwEhHYfTTMICc=" crossorigin="anonymous" async></script>
 {{ $block := resources.Get "js/gallery.js" }}
-<script src="{{ $block.RelPermalink }}"></script>
+<script src="{{ $block.RelPermalink }}" defer></script>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/head/conditional-css.html b/layouts/partials/head/conditional-css.html
deleted file mode 100644
index 98e838c..0000000
--- a/layouts/partials/head/conditional-css.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{{ if .HasShortcode "cfg" }}
-{{ $block := resources.Get "css/cfg.css" }}
-<link rel="stylesheet" href="{{ $block.RelPermalink }}" />
-{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/head/conditional-js.html b/layouts/partials/head/conditional-js.html
new file mode 100644
index 0000000..e69de29