diff --git a/src/_includes/layouts/base.vto b/src/_includes/layouts/base.vto
index fa485b7d..ab967f60 100644
--- a/src/_includes/layouts/base.vto
+++ b/src/_includes/layouts/base.vto
@@ -13,15 +13,6 @@
         {{ include "partials/fonts.vto" }}
         <!-- CSS -->
         {{ include "partials/css.vto" }}
-        {{ if hasTooltips }}
-        <link rel="stylesheet" href="/assets/css/tooltips.css">
-        {{ /if }}
-        {{ if externalCss }}
-        {{ for file of externalCss }}
-        <link rel="stylesheet" href="{{ externalCss }}">
-        {{ /for }}
-        {{ /if }}
-        <style>{{ getBundle "css" }}</style>
         <!-- Favicon -->
         {{ favicon }}
         <!-- Verifications -->
@@ -29,16 +20,7 @@
         <link rel="me" href="https://github.com/Leilukin">
         <link rel="authorization_endpoint" href="https://indieauth.com/auth">
         <!-- JavaScript -->
-        <script src="{{ getBundleFileUrl 'js' }}" defer></script>
-        {{ if toc }}
-        <script src="{{'/assets/js/details-utils.js'}}" defer></script>
-        {{ /if }}
-        {{ if hasCodeBlock }}
-        <script src="/assets/js/copycode.js" defer></script>
-        {{ /if }}
-        {{ if hasTooltips }}
-        <script src="/assets/js/tooltips.js" defer></script>
-        {{ /if }}
+        {{ include "partials/js.vto" }}
 
         <title>
             {{- title ? `${title} | ` : '' -}}
diff --git a/src/_includes/partials/css.vto b/src/_includes/partials/css.vto
index 46d4eade..0aa26a5b 100644
--- a/src/_includes/partials/css.vto
+++ b/src/_includes/partials/css.vto
@@ -16,7 +16,7 @@
 {{ /if }}
 {{ if externalCss }}
 {{ for file of externalCss }}
-<link rel="stylesheet" href="{{ externalCss }}">
+<link rel="stylesheet" href="{{ file }}">
 {{ /for }}
 {{ /if }}
 <style>{{ getBundle "css" }}</style>
diff --git a/src/_includes/partials/js.vto b/src/_includes/partials/js.vto
new file mode 100644
index 00000000..3e996347
--- /dev/null
+++ b/src/_includes/partials/js.vto
@@ -0,0 +1,10 @@
+<script src="{{ getBundleFileUrl 'js' }}" defer></script>
+{{ if toc }}
+<script src="{{'/assets/js/details-utils.js'}}" defer></script>
+{{ /if }}
+{{ if hasCodeBlock }}
+<script src="/assets/js/copycode.js" defer></script>
+{{ /if }}
+{{ if hasTooltips }}
+<script src="/assets/js/tooltips.js" defer></script>
+{{ /if }}
diff --git a/src/pages/search.vto b/src/pages/search.vto
index 75ace352..d88131fd 100644
--- a/src/pages/search.vto
+++ b/src/pages/search.vto
@@ -1,6 +1,6 @@
 ---
 title: Search
-externalCss: "/pagefind/pagefind-ui.css"
+externalCss: ["/pagefind/pagefind-ui.css"]
 eleventyComputed:
     desc: Search {{ sitemeta.siteName }}.
 ---