diff --git a/src/components/ActiveNavigationCheck.astro b/src/components/ActiveNavigationCheck.astro
new file mode 100644
index 0000000..c9faa3f
--- /dev/null
+++ b/src/components/ActiveNavigationCheck.astro
@@ -0,0 +1,20 @@
+---
+---
+
+<script>
+	function setActiveLink() {
+		const links = document.querySelectorAll('.navigation a');
+		const currentPath = window.location.pathname;
+		console.log(currentPath);
+
+		links.forEach((link) => {
+			if (link.getAttribute('href') === currentPath) {
+				link.classList.add('is-active');
+			} else {
+				link.classList.remove('is-active');
+			}
+		});
+	}
+
+	setActiveLink();
+</script>
diff --git a/src/components/MainNavigation.astro b/src/components/MainNavigation.astro
index 3e44726..0c0489a 100644
--- a/src/components/MainNavigation.astro
+++ b/src/components/MainNavigation.astro
@@ -1,15 +1,11 @@
 ---
-import cx from 'classnames';
-
 import { Link } from '.';
 
 import navigation from '../data/navigation.json';
-
-const currentPath = new URL(Astro.request.url).pathname;
 ---
 
 <nav
-	class="col-span-12 col-start-4 self-center md:col-span-14 md:col-start-3"
+	class="navigation col-span-12 col-start-4 self-center md:col-span-14 md:col-start-3"
 	role="navigation"
 	aria-label="Main"
 >
@@ -18,10 +14,7 @@ const currentPath = new URL(Astro.request.url).pathname;
 			navigation.map(({ title, url }) => (
 				<li class="mie-[10px] xs:mie-[15px]">
 					<Link
-						class={cx(
-							'text-3 font-light decoration-4 underline-offset-auto hover:underline hover:decoration-shibui-900/20 dark:hover:decoration-shibui-100/20',
-							{ 'underline !decoration-accent decoration-4': currentPath === url }
-						)}
+						class="text-3 font-light decoration-4 underline-offset-auto hover:underline hover:decoration-shibui-900/20 dark:hover:decoration-shibui-100/20"
 						href={url}
 					>
 						{title}
diff --git a/src/components/Subnavigation.astro b/src/components/Subnavigation.astro
index 40c33ae..00367e5 100644
--- a/src/components/Subnavigation.astro
+++ b/src/components/Subnavigation.astro
@@ -1,24 +1,17 @@
 ---
-import cx from 'classnames';
-
 import data from '../data/subnavigation.json';
 
 import { Link } from '.';
-
-const currentPath = new URL(Astro.request.url).pathname;
 ---
 
-<nav class="glow flex gap-12" aria-label="Subnavigation">
+<nav class="navigation glow flex gap-12" aria-label="Subnavigation" role="navigation">
 	<ul>
 		{
 			data.main.map(({ title, url }) => (
 				<li>
 					<Link
 						href={url}
-						class={cx(
-							'font-light decoration-4 underline-offset-auto hover:underline hover:decoration-shibui-900/20 dark:hover:decoration-shibui-100/20',
-							{ 'underline !decoration-accent decoration-4': currentPath === url }
-						)}
+						class="font-light decoration-4 underline-offset-auto hover:underline hover:decoration-shibui-900/20 dark:hover:decoration-shibui-100/20"
 					>
 						{title}
 					</Link>
@@ -32,9 +25,7 @@ const currentPath = new URL(Astro.request.url).pathname;
 				<li>
 					<Link
 						href={url}
-						class={`font-light decoration-4 underline-offset-auto hover:underline hover:decoration-shibui-900/20 dark:hover:decoration-shibui-100/20 ${
-							currentPath === url && 'underline !decoration-accent decoration-4'
-						}`}
+						class="font-light decoration-4 underline-offset-auto hover:underline hover:decoration-shibui-900/20 dark:hover:decoration-shibui-100/20"
 					>
 						{title}
 					</Link>
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index fd3b535..e901fee 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -9,6 +9,7 @@ import ThemeProvider from '../components/ThemeProvider.astro';
 import PageHeader from '../components/PageHeader.astro';
 import PageFooter from '../components/PageFooter.astro';
 import Sal from '../components/Sal.astro';
+import ActiveNavigationCheck from '../components/ActiveNavigationCheck.astro';
 
 export interface Props {
 	backLink?: string;
@@ -152,6 +153,7 @@ const webManifest = isProduction && {
 		</script>
 
 		<Sal />
+		<ActiveNavigationCheck />
 
 		<ThemeProvider />
 	</head>
diff --git a/src/styles/global.css b/src/styles/global.css
index 38854ee..d7d25a2 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -166,6 +166,10 @@
 }
 
 @layer components {
+	.navigation .is-active {
+		@apply underline !decoration-accent decoration-4;
+	}
+
 	.image-shadow {
 		@apply relative transition-transform duration-500 ease-in-out;