diff --git a/src/components/ActiveNavigationCheck.astro b/src/components/ActiveNavigationCheck.astro
deleted file mode 100644
index c9faa3f..0000000
--- a/src/components/ActiveNavigationCheck.astro
+++ /dev/null
@@ -1,20 +0,0 @@
----
----
-
-<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/EmailLink.astro b/src/components/EmailLink.astro
index 4a9fdb3..b628698 100644
--- a/src/components/EmailLink.astro
+++ b/src/components/EmailLink.astro
@@ -25,23 +25,3 @@ const { text = 'Email', icon = true, ...props } = Astro.props;
 		)
 	}
 </TextLink>
-
-<script>
-	function handleClick(event: Event) {
-		event.preventDefault();
-		const currentTarget = event.currentTarget;
-		if (currentTarget instanceof HTMLElement) {
-			const { name, domain, tld } = currentTarget.dataset;
-			if (name && domain && tld) {
-				const mailto = `mailto:${name}@${domain}.${tld}`;
-				window.open(mailto, '_blank');
-			}
-		}
-	}
-
-	const links = document.querySelectorAll('[data-email-link]');
-
-	links.forEach((link) => {
-		link.addEventListener('click', handleClick);
-	});
-</script>
diff --git a/src/components/Scripts.astro b/src/components/Scripts.astro
index f5be23b..6a097f8 100644
--- a/src/components/Scripts.astro
+++ b/src/components/Scripts.astro
@@ -48,6 +48,8 @@ import '../styles/sal.css';
 			});
 
 			setActiveLink();
+			setUpLink();
+			setEmailLink();
 		}
 	});
 
@@ -64,7 +66,41 @@ import '../styles/sal.css';
 		});
 	}
 
+	function setUpLink() {
+		const button = document.getElementById('up-link');
+		button?.addEventListener('click', (event) => {
+			event.preventDefault();
+			window.scrollTo({
+				top: 0,
+				left: 0,
+				behavior: 'smooth',
+			});
+		});
+	}
+
+	function handleEmailClick(event: Event) {
+		event.preventDefault();
+		const currentTarget = event.currentTarget;
+		if (currentTarget instanceof HTMLElement) {
+			const { name, domain, tld } = currentTarget.dataset;
+			if (name && domain && tld) {
+				const mailto = `mailto:${name}@${domain}.${tld}`;
+				window.open(mailto, '_blank');
+			}
+		}
+	}
+
+	function setEmailLink() {
+		const links = document.querySelectorAll('[data-email-link]');
+
+		links.forEach((link) => {
+			link.addEventListener('click', handleEmailClick);
+		});
+	}
+
 	setActiveLink();
+	setUpLink();
+	setEmailLink();
 </script>
 
 <style is:global>
diff --git a/src/components/UpLink.astro b/src/components/UpLink.astro
index 898a728..33586ef 100644
--- a/src/components/UpLink.astro
+++ b/src/components/UpLink.astro
@@ -17,16 +17,4 @@ import { Link } from '.';
 			<Sprite name="ri:arrow-up-line" class="h-icon-small w-icon-small" />
 		</button>
 	</Link>
-
-	<script>
-		const button = document.getElementById('up-link');
-		button?.addEventListener('click', (event) => {
-			event.preventDefault();
-			window.scrollTo({
-				top: 0,
-				left: 0,
-				behavior: 'smooth',
-			});
-		});
-	</script>
 </div>
diff --git a/types/swup.d.ts b/types/swup.d.ts
index c69dab7..23cbae8 100644
--- a/types/swup.d.ts
+++ b/types/swup.d.ts
@@ -1,5 +1,6 @@
+declare module '@swup/a11y-plugin';
 declare module '@swup/fade-theme';
 declare module '@swup/head-plugin';
-declare module '@swup/a11y-plugin';
 declare module '@swup/preload-plugin';
+declare module '@swup/scripts-plugin';
 declare module '@swup/scroll-plugin';