diff --git a/README.md b/README.md
index 6941af2..d15b14a 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,12 @@ This is production ready setup for Convex and Next SaaS.
 First, run the development server:
 
 ```bash
-pnpm dev
+pnpm dev --webpack
 ```
 
+> [!NOTE]
+> As of Next.js@16.2.1  turbopack is broken ant it spikes CPU usage by 900% and 8-9GiB of RAM usage, thus why we use webpack. Wait for 16.3.0 to migrate to turbopack
+
 ### Convex
 
 [Source of truth](https://github.com/get-convex/convex-backend/blob/main/self-hosted/README.md)
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 720d6a9..93ab1ea 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -14,8 +14,8 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en" className="h-full antialiased">
-      <body className="min-h-full flex flex-col" suppressHydrationWarning>
+    <html lang="en" className="h-full antialiased" suppressHydrationWarning>
+      <body className="min-h-full flex flex-col">
         <NextIntlClientProvider>
           <ThemeProvider>{children}</ThemeProvider>
         </NextIntlClientProvider>
diff --git a/src/components/core/ThemeChanger.tsx b/src/components/core/ThemeChanger.tsx
index fccc20a..2c96c1d 100644
--- a/src/components/core/ThemeChanger.tsx
+++ b/src/components/core/ThemeChanger.tsx
@@ -1,14 +1,28 @@
 "use client";
 import { useTheme } from "next-themes";
+import { useEffect, useState } from "react";
 
 export const ThemeChanger = () => {
   const { theme, setTheme } = useTheme();
+  const [mounted, setMounted] = useState(false);
+
+  useEffect(() => {
+    setMounted(true);
+  }, []);
+
+  if (!mounted) {
+    return <p>Loading theme...</p>;
+  }
 
   return (
     <div>
-      The current theme is: {theme}
-      <button onClick={() => setTheme("light")}>Light Mode</button>
-      <button onClick={() => setTheme("dark")}>Dark Mode</button>
+      <p>The current theme is: {theme}</p>
+      <button type="button" onClick={() => setTheme("light")}>
+        Light Mode
+      </button>
+      <button type="button" onClick={() => setTheme("dark")}>
+        Dark Mode
+      </button>
     </div>
   );
 };
diff --git a/tmuxi.template.yml b/tmuxi.template.yml
index d5a8e5c..0494cff 100644
--- a/tmuxi.template.yml
+++ b/tmuxi.template.yml
@@ -12,4 +12,4 @@ windows:
         - nvim ~/vaults/mentat/<project-name>
   - frontend:
       panes:
-        - pnpm dev
+        - pnpm dev --webpack
