diff --git a/apps/frontend/src/RootLayout.tsx b/apps/frontend/src/RootLayout.tsx
index f70b0ca7..d9e11a23 100644
--- a/apps/frontend/src/RootLayout.tsx
+++ b/apps/frontend/src/RootLayout.tsx
@@ -1,6 +1,5 @@
 import { getProgramInfo } from '@onelauncher/client';
 import AnimatedRoutes from '~ui/components/AnimatedRoutes';
-import ErrorBoundary from '~ui/components/ErrorBoundary';
 import { NotificationProvider } from '~ui/hooks/useNotifications';
 import { onMount, type ParentProps } from 'solid-js';
 import { MultiProvider } from './ui/components/MultiProvider';
@@ -19,20 +18,18 @@ function RootLayout(props: ParentProps) {
 	});
 
 	return (
-		<ErrorBoundary>
-			<GlobalContexts>
-				<main class="h-screen max-h-screen min-h-screen w-full flex flex-col overflow-hidden bg-page text-fg-primary">
-					<WindowFrame />
+		<GlobalContexts>
+			<main class="h-screen max-h-screen min-h-screen w-full flex flex-col overflow-hidden bg-page text-fg-primary">
+				<WindowFrame />
 
-					<AnimatedRoutes animation="fade" appear>
-						{props.children}
-					</AnimatedRoutes>
+				<AnimatedRoutes animation="fade" appear>
+					{props.children}
+				</AnimatedRoutes>
 
-					<NotificationOverlay />
-					<ModalRenderer />
-				</main>
-			</GlobalContexts>
-		</ErrorBoundary>
+				<NotificationOverlay />
+				<ModalRenderer />
+			</main>
+		</GlobalContexts>
 	);
 }
 
diff --git a/apps/frontend/src/utils/theming.ts b/apps/frontend/src/utils/theming.ts
index 86ea63ee..3d32012d 100644
--- a/apps/frontend/src/utils/theming.ts
+++ b/apps/frontend/src/utils/theming.ts
@@ -26,7 +26,7 @@ export function splitMergedTheme(merged: string): {
 } {
 	const [name, ...variants] = merged.split('-');
 
-	const foundVariant = THEMES[name as keyof typeof THEMES].variants.find(variant => variant.name === variants.join('-'));
+	const foundVariant = THEMES[name as keyof typeof THEMES]?.variants.find(variant => variant.name === variants.join('-')) ?? undefined;
 
 	if (!name || !foundVariant)
 		return {