diff --git a/src/components/Header.astro b/src/components/Header.astro
index 2cbd21b..8d1f8af 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -22,23 +22,19 @@ import Image from "astro/components/Image.astro";
   <div class="hidden md:flex gap-2">
     <a
       title="View a list of plugins you can download for gameflow"
-      data-active={Astro.url.pathname.startsWith(
-        `${import.meta.env.BASE_URL}/plugins`,
-      )}
+      data-active={/\/plugins/g.test(Astro.url.pathname)}
       class="flex group gap-2 bg-base-300 data-[active=true]:cursor-default rounded-full p-1 px-3 text-xl hover:bg-accent hover:text-accent-content data-[active=true]:bg-accent data-[active=true]:text-accent-content items-center"
-      href={`${import.meta.env.BASE_URL}/plugins`}
-      ><Puzzle />Plugins<span
+      href={`plugins`}
+      ><Puzzle />Plugins <span
         class="bg-base-100 px-2 text-sm font-semibold rounded-full group-hover:bg-accent-content group-hover:text-accent in-data-[active=true]:bg-accent-content in-data-[active=true]:text-accent"
         >{plugins.total}</span
       >
     </a>
     <a
       title="View a list of free games you can download for gameflow"
-      data-active={Astro.url.pathname.startsWith(
-        `${import.meta.env.BASE_URL}/games`,
-      )}
+      data-active={/\/games/g.test(Astro.url.pathname)}
       class="flex group gap-2 bg-base-300 data-[active=true]:cursor-default rounded-full p-1 px-3 text-xl hover:bg-accent hover:text-accent-content data-[active=true]:bg-accent data-[active=true]:text-accent-content items-center"
-      href={`${import.meta.env.BASE_URL}/games`}
+      href={`games`}
       ><Gamepad2 />Games<span
         class="bg-base-100 px-2 text-sm font-semibold rounded-full group-hover:bg-accent-content group-hover:text-accent in-data-[active=true]:bg-accent-content in-data-[active=true]:text-accent"
         >{games.length}</span
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 27dcfdc..281ab90 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -22,6 +22,7 @@ const { title } = Astro.props;
     <meta property="og:image" content={previewHref} />
     <meta property="og:url" content={Astro.url} />
     <meta property="og:type" content="website" />
+    <base href={import.meta.env.BASE_URL} />
 
     <!-- Twitter/X -->
     <meta name="twitter:card" content="summary_large_image" />