diff --git a/sophora-components/src/routes/highlight-cards/+page.svelte b/sophora-components/src/routes/highlight-cards/+page.svelte
index 33344d6b..bb81f610 100644
--- a/sophora-components/src/routes/highlight-cards/+page.svelte
+++ b/sophora-components/src/routes/highlight-cards/+page.svelte
@@ -1,81 +1,19 @@
 <script>
-    import { DesignTokens, HighlightCard } from '@swr-data-lab/components';
-    import { onMount } from 'svelte';
-
-	let root;
-	let entries = [];
-
-	const getData = (target) => {
-		let url;
-		if (
-			import.meta.env.DEV ||
-			window.location.origin === 'https://static.datenhub.net' ||
-			window.location.href.includes('apidata.googleusercontent.com') ||
-			window.location.href.includes('storage.googleapis.com')
-		) {
-			// Preview mode – use URL of current page
-			url = new URL(window.location.href);
-		} else {
-			// Embedded mode – use URL used to embed the component
-			const parent = target.parentNode.parentNode;
-			url = new URL(parent?.dataset.url);
-		}
-		const params = Object.fromEntries(url.searchParams);
-		return params.data ? JSON.parse(params.data) : [];
-	};
-
-	onMount(() => {
-		entries = getData(root);
-	});
+	import HighlightCards from './HighlightCards.svelte';
+	import { dev } from '$app/environment';
+	import { DevContainer } from '@swr-data-lab/components';
 </script>
 
-<div class="highlight-cards" bind:this={root}>
-	<DesignTokens>
-		{#each entries as entry}
-			<HighlightCard
-				topline={entry.topline}
-				value={entry.value}
-				unit={entry.unit}
-				subline={entry.subline}
-			/>
-		{/each}
-	</DesignTokens>
-</div>
-
-<style>
-	/* 
-     * Fonts need to be loaded in the component to work in the SWR Aktuell app, as no web fonts are present in the context. 
-     * TODO: Move font loading elsewhere?
-     */
-	@font-face {
-		font-family: 'SWR-VAR-Text';
-		src: url('https://www.swr.de/assets/fonts/swr_type/SWR_VAR_WEB/SWR-VAR-Text.woff2')
-			format('woff2');
-	}
-	@font-face {
-		font-family: 'SWR-VAR-Sans';
-		src: url('https://www.swr.de/assets/fonts/swr_type/SWR_VAR_WEB/SWR-VAR-Sans.woff2')
-			format('woff2');
-	}
-
-	.highlight-cards {
-		/* Apply SWR.de default spacing */
-		padding-left: var(--cnt-wdth);
-		padding-right: var(--cnt-wdth);
-		padding-bottom: 1rem;
-
-		@media (min-width: 1200px) {
-			margin: 0 -1rem;
-			display: flex;
-		}
-	}
-
-	:global(.highlight-cards > *) {
-		margin-bottom: 1rem;
-
-		@media (min-width: 1200px) {
-			margin: 0 1rem;
-			flex: 1;
-		}
-	}
-</style>
+{#if dev}
+	<DevContainer
+		theme="auto"
+		showGrid
+		paragraphsAbove={1}
+		paragraphsBelow={1}
+		showArticleHeader={false}
+	>
+		<HighlightCards />
+	</DevContainer>
+{:else}
+	<HighlightCards />
+{/if}
diff --git a/sophora-components/src/routes/highlight-cards/HighlightCards.svelte b/sophora-components/src/routes/highlight-cards/HighlightCards.svelte
new file mode 100644
index 00000000..cd55ba74
--- /dev/null
+++ b/sophora-components/src/routes/highlight-cards/HighlightCards.svelte
@@ -0,0 +1,39 @@
+<script>
+	import getDataFromUrl from '$lib/utils/getDataFromUrl';
+	import { DesignTokens, HighlightCard } from '@swr-data-lab/components';
+	import { onMount } from 'svelte';
+
+	let root;
+	let entries = [];
+
+	onMount(() => {
+		const { data } = getDataFromUrl(root);
+		entries = data ? JSON.parse(data) : [];
+	});
+</script>
+
+<DesignTokens>
+	<div class="highlight-cards" bind:this={root}>
+		{#each entries as entry}
+			<HighlightCard
+				topline={entry.topline}
+				value={entry.value}
+				unit={entry.unit}
+				subline={entry.subline}
+			/>
+		{/each}
+	</div>
+</DesignTokens>
+
+<style>
+	.highlight-cards {
+		display: grid;
+		grid-template-columns: minmax(0, 1fr);
+		gap: 1rem;
+		margin: 0.5rem 0;
+
+		@media (min-width: 1200px) {
+			grid-template-columns: repeat(2, minmax(0, 1fr));
+		}
+	}
+</style>
diff --git a/sophora-components/vite.config.ts b/sophora-components/vite.config.ts
index fa174486..bbf8c7da 100644
--- a/sophora-components/vite.config.ts
+++ b/sophora-components/vite.config.ts
@@ -1,4 +1,3 @@
-import path from 'path';
 import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';