diff --git a/src/lib/DashboardModal.svelte b/src/lib/DashboardModal.svelte
index c0d2edd..37229b2 100644
--- a/src/lib/DashboardModal.svelte
+++ b/src/lib/DashboardModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { onMount, type SvelteComponent } from 'svelte';
+	import { onDestroy, onMount, type SvelteComponent } from 'svelte';
 
 	export let title: string;
 	export let parent: SvelteComponent;
@@ -11,6 +11,19 @@
 	onMount(() => {
 		closeButton.blur();
 	});
+
+	const htmlElement = document.documentElement;
+	const themeColorMeta = document.querySelector('meta[name="theme-color"]');
+
+	onMount(() => {
+		const isDarkMode = htmlElement.classList.contains('dark');
+		themeColorMeta?.setAttribute('content', isDarkMode ? 'rgb(23,23,23)' : 'rgb(139,139,139)');
+	});
+
+	onDestroy(() => {
+		const isDarkMode = htmlElement.classList.contains('dark');
+		themeColorMeta?.setAttribute('content', isDarkMode ? 'rgb(27,27,27)' : 'rgb(213,213,217)');
+	});
 </script>
 
 <div
diff --git a/src/lib/cc.ts b/src/lib/cc.ts
new file mode 100644
index 0000000..13ec091
--- /dev/null
+++ b/src/lib/cc.ts
@@ -0,0 +1,14 @@
+import { browser } from '$app/environment';
+
+export async function load_cc() {
+	if (browser) {
+		try {
+			const CookieConsent = await import('vanilla-cookieconsent');
+			const config = (await import('$lib/cookieconsent-config')).default;
+
+			CookieConsent.run(config);
+		} catch (error) {
+			console.warn('Failed to load cookieconsent (likely due to content filter)');
+		}
+	}
+}
diff --git a/src/lib/cookieconsent.svelte b/src/lib/cookieconsent.svelte
deleted file mode 100644
index af8f83f..0000000
--- a/src/lib/cookieconsent.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-	import { onMount } from 'svelte';
-	import * as CookieConsent from 'vanilla-cookieconsent';
-	import config from '$lib/cookieconsent-config';
-
-	onMount(() => {
-		CookieConsent.run(config);
-	});
-</script>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 3c0051d..976a26f 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -31,8 +31,8 @@
 	}
 
 	const drawerStore = getDrawerStore();
-
-	import CookieConsentComponent from '$lib/cookieconsent.svelte';
+	import { load_cc } from '$lib/cc';
+	load_cc();
 
 	const popupRechtliches: PopupSettings = {
 		// Represents the type of event that opens/closed the popup
@@ -66,7 +66,6 @@
 	</div>
 </div>
 
-<CookieConsentComponent />
 <Toast buttonDismiss="btn-icon btn-icon-sm variant-filled transition-none" />
 
 <Drawer
@@ -147,7 +146,13 @@
 					{#if $page.url.pathname == '/impressum' || $page.url.pathname == '/datenschutz'}
 						<button
 							on:click={async () => {
-								goto('/');
+								const response = await fetch('/');
+
+								if (response.redirected) {
+									window.location.href = response.url;
+								} else {
+									goto('/');
+								}
 							}}
 							class="h-6 btn btn-sm variant-ghost-secondary text-xs"
 						>