diff --git a/apps/frontend/src/RootLayout.tsx b/apps/frontend/src/RootLayout.tsx
index d9e11a23..f70b0ca7 100644
--- a/apps/frontend/src/RootLayout.tsx
+++ b/apps/frontend/src/RootLayout.tsx
@@ -1,5 +1,6 @@
 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';
@@ -18,18 +19,20 @@ function RootLayout(props: ParentProps) {
 	});
 
 	return (
-		<GlobalContexts>
-			<main class="h-screen max-h-screen min-h-screen w-full flex flex-col overflow-hidden bg-page text-fg-primary">
-				<WindowFrame />
+		<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 />
 
-				<AnimatedRoutes animation="fade" appear>
-					{props.children}
-				</AnimatedRoutes>
+					<AnimatedRoutes animation="fade" appear>
+						{props.children}
+					</AnimatedRoutes>
 
-				<NotificationOverlay />
-				<ModalRenderer />
-			</main>
-		</GlobalContexts>
+					<NotificationOverlay />
+					<ModalRenderer />
+				</main>
+			</GlobalContexts>
+		</ErrorBoundary>
 	);
 }
 
diff --git a/apps/frontend/src/ui/pages/onboarding/Onboarding.tsx b/apps/frontend/src/ui/pages/onboarding/Onboarding.tsx
index 2baf6bf3..6435673f 100644
--- a/apps/frontend/src/ui/pages/onboarding/Onboarding.tsx
+++ b/apps/frontend/src/ui/pages/onboarding/Onboarding.tsx
@@ -93,7 +93,7 @@ function Onboarding(props: ParentProps) {
 			saveSettings({
 				...settings(),
 				onboarding_completed: true,
-			}).then(() => navigate('/'));
+			}).finally(() => navigate('/'));
 		else
 			navigate(basePath + OnboardingSteps[step() + 1]![0]);
 	};
diff --git a/apps/frontend/src/ui/pages/settings/launcher/SettingsAppearance.tsx b/apps/frontend/src/ui/pages/settings/launcher/SettingsAppearance.tsx
index 8b34a603..0f10992e 100644
--- a/apps/frontend/src/ui/pages/settings/launcher/SettingsAppearance.tsx
+++ b/apps/frontend/src/ui/pages/settings/launcher/SettingsAppearance.tsx
@@ -52,7 +52,7 @@ function SettingsAppearance() {
 					<div class="grid grid-cols-3 h-full gap-4">
 						<For each={Object.keys(THEMES) as (keyof typeof THEMES)[]}>
 							{theme => (
-								<For each={THEMES[theme].variants}>
+								<For each={THEMES[theme ?? 'OneLauncher'].variants}>
 									{variant => (
 										<ThemeCard
 											setTheme={setTheme}