diff --git a/layouts/partials/body.html b/layouts/partials/body.html
index 37ceffc..15c444a 100644
--- a/layouts/partials/body.html
+++ b/layouts/partials/body.html
@@ -1,2 +1,10 @@
-{{- $script := partialCached "va/script" . | fingerprint "sha512" -}}
-<script src="{{ $script.RelPermalink | absURL }}" async defer></script>
+{{- with partialCached "va/script" . -}}
+  <script
+    async
+    crossorigin="anonymous"
+    defer
+    integrity="{{ .Data.Integrity }}"
+    src="{{ .RelPermalink | absURL }}"
+    type="{{ .MediaType.String }}">
+  </script>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index c65e106..ac66cef 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,4 +1,22 @@
-{{- $style := partialCached "va/style" . | fingerprint "sha512" -}}
-<link rel="preload stylesheet" as="style" href="{{ $style.RelPermalink | absURL }}" type="text/css" integrity="{{ $style.Data.Integrity }}" importance="high">
-{{- $script := partialCached "va/script" . | fingerprint "sha512" -}}
-<link rel="preload" as="script" href="{{ $script.RelPermalink | absURL }}" type="text/javascript" integrity="{{ $script.Data.Integrity }}" importance="high">
+{{ with partialCached "va/style" . }}
+  <link
+    as="style"
+    crossorigin="anonymous"
+    href="{{ .RelPermalink | absURL }}"
+    importance="high"
+    integrity="{{ .Data.Integrity }}"
+    referrerpolicy="no-referrer-when-downgrade"
+    rel="preload stylesheet"
+    type="{{ .MediaType.String }}">
+{{ end }}
+{{ with partialCached "va/script" . }}
+  <link
+    as="script"
+    crossorigin="anonymous"
+    href="{{ .RelPermalink | absURL }}"
+    importance="high"
+    integrity="{{ .Data.Integrity }}"
+    referrerpolicy="no-referrer-when-downgrade"
+    rel="preload"
+    type="{{ .MediaType.String }}">
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/script.html b/layouts/partials/script.html
index ad06bd1..dd4cca9 100644
--- a/layouts/partials/script.html
+++ b/layouts/partials/script.html
@@ -5,8 +5,8 @@
 -}}
   {{- $scripts = $scripts | append (resources.Get (printf "va/js/%s.js" $name)) -}}
 {{- end -}}
-{{- $script := $scripts | resources.Concat "va.js" -}}
-{{- if ne $.Site.IsServer true -}}
-  {{- $script = $script | minify -}}
+{{- $script := $scripts | resources.Concat "va.js" | js.Build "va.js" -}}
+{{- if hugo.IsProduction -}}
+  {{- $script = $script | minify | fingerprint "sha512" -}}
 {{- end -}}
 {{- return $script -}}
diff --git a/layouts/partials/style.html b/layouts/partials/style.html
index 2b2747b..713f673 100644
--- a/layouts/partials/style.html
+++ b/layouts/partials/style.html
@@ -20,7 +20,7 @@
   {{- $styles = $styles | append (resources.Get (printf "va/css/%s.css" $name)) -}}
 {{- end -}}
 {{- $style := $styles | resources.Concat "va.css" -}}
-{{- if ne $.Site.IsServer true -}}
-  {{- $style = $style | minify -}}
+{{- if hugo.IsProduction -}}
+  {{- $style = $style | minify | fingerprint "sha512" -}}
 {{- end -}}
 {{- return $style -}}