intentuilabs
diff --git a/‎app/root.tsx
+10-9 b/‎app/root.tsx
+10-9
diff --git a/‎package.json
+5-2 b/‎package.json
+5-2
diff --git a/‎public/_redirects
-1 b/‎public/_redirects
-1
diff --git a/‎remix.config.js
-9 b/‎remix.config.js
-9
@@ -1,7 +1,6 @@
 import type { LinksFunction, LoaderFunctionArgs } from "@remix-run/node";
 import {
   Links,
-  LiveReload,
   Meta,
   Scripts,
   ScrollRestoration,
@@ -30,35 +29,37 @@ export default function AppWithProviders() {
   return (
     <RouterProvider>
       <ThemeProvider specifiedTheme={data.theme} themeAction="/action/set-theme">
-        <App />
+        <RootLayout theme={data.theme} />
       </ThemeProvider>
     </RouterProvider>
   );
 }
 
-function App() {
-  const data = useLoaderData<typeof loader>();
-  const [theme] = useTheme();
+function RootLayout({ theme }: { theme: string | null }) {
+  const [currentTheme] = useTheme();
   const location = useLocation();
 
   const guestRoutes = ["/login", "/signup", "/forgot-password"];
-  const isGuestRoute = guestRoutes.includes(location.pathname);
+  const isGuestRoute = guestRoutes.some((route) => location.pathname.startsWith(route));
 
   return (
-    <html lang="en" data-theme={theme ?? ""} className={theme ?? ""}>
+    <html
+      lang="en"
+      data-theme={currentTheme ?? theme ?? ""}
+      className={currentTheme ?? theme ?? ""}
+    >
       <head>
         <meta charSet="utf-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1" />
         <Meta />
-        <PreventFlashOnWrongTheme ssrTheme={Boolean(data.theme)} />
+        <PreventFlashOnWrongTheme ssrTheme={Boolean(theme)} />
         <Links />
       </head>
       <body className="font-sans antialiased min-h-svh bg-tertiary">
         <Toast />
         {isGuestRoute ? <GuestLayout /> : <AppLayout />}
         <ScrollRestoration />
         <Scripts />
-        {process.env.NODE_ENV === "development" && <LiveReload />}
       </body>
     </html>
   );
 
@@ -9,8 +9,11 @@
     "dev": "remix vite:dev",
     "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
     "start": "wrangler pages dev ./build/client",
-    "typecheck": "react-router typegen && tsc",
-    "tailwind:format": "rustywind --write .",
+    "typecheck": "tsc",
+    "typegen": "wrangler types",
+    "preview": "bun run build && wrangler pages dev",
+    "cf-typegen": "wrangler types",
+    "tailwind:format": "rustywind --write ./app",
     "format": "bun run tailwind:format && biome check --write",
     "format:unsafe": "biome check --unsafe --write"
   },