diff --git a/src/app/(auth)/(center)/layout.tsx b/src/app/(auth)/(center)/layout.tsx
deleted file mode 100644
index a0b4c0d8a1..0000000000
--- a/src/app/(auth)/(center)/layout.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { auth } from '@clerk/nextjs/server';
-import { redirect } from 'next/navigation';
-
-export default async function CenteredLayout(props: {
-  children: React.ReactNode;
-}) {
-  const { userId } = await auth();
-
-  if (userId) {
-    redirect('/dashboard');
-  }
-
-  return (
-    <div className="flex min-h-screen items-center justify-center">
-      {props.children}
-    </div>
-  );
-}
diff --git a/src/app/(auth)/dashboard/page.tsx b/src/app/(auth)/dashboard/page.tsx
deleted file mode 100644
index 003ab79f0e..0000000000
--- a/src/app/(auth)/dashboard/page.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { useTranslations } from 'next-intl';
-
-import { MessageState } from '@/components/dashboard/MessageState';
-import { TitleBar } from '@/components/dashboard/TitleBar';
-
-const DashboardIndexPage = () => {
-  const t = useTranslations('DashboardIndex');
-
-  return (
-    <>
-      <TitleBar
-        title={t('title_bar')}
-        description={t('title_bar_description')}
-      />
-
-      <MessageState
-        icon={
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            fill="none"
-            strokeLinecap="round"
-            strokeLinejoin="round"
-          >
-            <path d="M0 0h24v24H0z" stroke="none" />
-            <path d="M12 3l8 4.5v9L12 21l-8-4.5v-9L12 3M12 12l8-4.5M12 12v9M12 12L4 7.5" />
-          </svg>
-        }
-        title={t('message_state_title')}
-        description={t.rich('message_state_description', {
-          code: (chunks) => (
-            <code className="bg-secondary text-secondary-foreground">
-              {chunks}
-            </code>
-          ),
-        })}
-        button={
-          <div className="mt-2 text-xs font-light text-muted-foreground">
-            {t.rich('message_state_alternative', {
-              url: () => (
-                <a
-                  className="text-blue-500 hover:text-blue-600"
-                  href="https://nextjs-boilerplate.com/pro-saas-starter-kit"
-                >
-                  Next.js Boilerplate SaaS
-                </a>
-              ),
-            })}
-          </div>
-        }
-      />
-    </>
-  );
-};
-
-export default DashboardIndexPage;
diff --git a/src/app/(auth)/layout.tsx b/src/app/(auth)/layout.tsx
deleted file mode 100644
index 2b4f153642..0000000000
--- a/src/app/(auth)/layout.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-'use client';
-
-import { enUS, frFR } from '@clerk/localizations';
-import { ClerkProvider } from '@clerk/nextjs';
-import { useLocale } from 'next-intl';
-
-export default function AuthLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  const locale = useLocale();
-
-  return (
-    <ClerkProvider
-      localization={locale === 'fr' ? frFR : enUS}
-      signInUrl="/sign-in"
-      signUpUrl="/sign-up"
-      signInFallbackRedirectUrl="/dashboard"
-      signUpFallbackRedirectUrl="/dashboard"
-      afterSignOutUrl="/"
-    >
-      {children}
-    </ClerkProvider>
-  );
-}
diff --git a/src/app/(auth)/dashboard/layout.tsx b/src/app/(authenticated)/dashboard/layout.tsx
similarity index 100%
rename from src/app/(auth)/dashboard/layout.tsx
rename to src/app/(authenticated)/dashboard/layout.tsx
diff --git a/src/app/(auth)/dashboard/organization-profile/[[...organization-profile]]/page.tsx b/src/app/(authenticated)/dashboard/organization-profile/[[...organization-profile]]/page.tsx
similarity index 88%
rename from src/app/(auth)/dashboard/organization-profile/[[...organization-profile]]/page.tsx
rename to src/app/(authenticated)/dashboard/organization-profile/[[...organization-profile]]/page.tsx
index a6a582c118..b458d2e6f8 100644
--- a/src/app/(auth)/dashboard/organization-profile/[[...organization-profile]]/page.tsx
+++ b/src/app/(authenticated)/dashboard/organization-profile/[[...organization-profile]]/page.tsx
@@ -3,7 +3,7 @@ import { useTranslations } from 'next-intl';
 
 import { TitleBar } from '@/components/dashboard/TitleBar';
 
-const OrganizationProfilePage = () => {
+export default function Page() {
   const t = useTranslations('OrganizationProfile');
 
   return (
@@ -26,6 +26,4 @@ const OrganizationProfilePage = () => {
       />
     </>
   );
-};
-
-export default OrganizationProfilePage;
+}
diff --git a/src/app/(authenticated)/dashboard/page.tsx b/src/app/(authenticated)/dashboard/page.tsx
new file mode 100644
index 0000000000..7b2c42d5bd
--- /dev/null
+++ b/src/app/(authenticated)/dashboard/page.tsx
@@ -0,0 +1,37 @@
+import { useTranslations } from 'next-intl';
+
+import { TitleBar } from '@/components/dashboard/TitleBar';
+
+const DashboardIndexPage = () => {
+  const t = useTranslations('DashboardIndex');
+
+  return (
+    <>
+      <TitleBar
+        title={t('title_bar')}
+        description={t('title_bar_description')}
+      />
+      <div className="flex h-[600px] flex-col items-center justify-center rounded-md bg-card p-5">
+        <div className="size-16 rounded-full bg-muted p-3 [&_svg]:stroke-muted-foreground [&_svg]:stroke-2">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 24 24"
+            fill="none"
+            strokeLinecap="round"
+            strokeLinejoin="round"
+          >
+            <path d="M0 0h24v24H0z" stroke="none" />
+            <path d="M12 3l8 4.5v9L12 21l-8-4.5v-9L12 3M12 12l8-4.5M12 12v9M12 12L4 7.5" />
+          </svg>
+        </div>
+        <div className="mt-3 text-center">
+          <div className="text-xl font-semibold">
+            {t('message_state_title')}
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default DashboardIndexPage;
diff --git a/src/app/(auth)/dashboard/user-profile/[[...user-profile]]/page.tsx b/src/app/(authenticated)/dashboard/user-profile/[[...user-profile]]/page.tsx
similarity index 67%
rename from src/app/(auth)/dashboard/user-profile/[[...user-profile]]/page.tsx
rename to src/app/(authenticated)/dashboard/user-profile/[[...user-profile]]/page.tsx
index 981c618f43..e10967b15d 100644
--- a/src/app/(auth)/dashboard/user-profile/[[...user-profile]]/page.tsx
+++ b/src/app/(authenticated)/dashboard/user-profile/[[...user-profile]]/page.tsx
@@ -3,7 +3,7 @@ import { useTranslations } from 'next-intl';
 
 import { TitleBar } from '@/components/dashboard/TitleBar';
 
-const UserProfilePage = () => {
+export default function Page() {
   const t = useTranslations('UserProfile');
 
   return (
@@ -12,19 +12,11 @@ const UserProfilePage = () => {
         title={t('title_bar')}
         description={t('title_bar_description')}
       />
-
       <UserProfile
         routing="path"
         path="/dashboard/user-profile"
-        appearance={{
-          elements: {
-            rootBox: 'w-full',
-            cardBox: 'w-full flex',
-          },
-        }}
+        appearance={{ elements: { rootBox: 'w-full', cardBox: 'w-full flex' } }}
       />
     </>
   );
-};
-
-export default UserProfilePage;
+}
diff --git a/src/app/(authenticated)/layout.tsx b/src/app/(authenticated)/layout.tsx
new file mode 100644
index 0000000000..5abcbb091f
--- /dev/null
+++ b/src/app/(authenticated)/layout.tsx
@@ -0,0 +1,16 @@
+import { redirect } from 'next/navigation';
+import { auth as clerkAuth } from '@clerk/nextjs/server';
+
+export default async function CenteredLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const auth = await clerkAuth();
+
+  if (!auth.userId) {
+    redirect('/');
+  }
+
+  return children;
+}
diff --git a/src/app/(auth)/onboarding/organization-selection/page.tsx b/src/app/(authenticated)/onboarding/organization-selection/page.tsx
similarity index 100%
rename from src/app/(auth)/onboarding/organization-selection/page.tsx
rename to src/app/(authenticated)/onboarding/organization-selection/page.tsx
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 904f5bde22..0f74245c78 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,6 +3,8 @@ import '@/styles/globals.css';
 import type { Metadata } from 'next';
 import { NextIntlClientProvider } from 'next-intl';
 import { getLocale } from 'next-intl/server';
+import { enUS, frFR } from '@clerk/localizations';
+import { ClerkProvider } from '@clerk/nextjs';
 
 import { ThemeProvider } from '@/components/ThemeProvider';
 
@@ -45,7 +47,9 @@ export default async function RootLayout({
             enableSystem
             disableTransitionOnChange
           >
-            {children}
+            <ClerkProvider localization={locale === 'fr' ? frFR : enUS}>
+              {children}
+            </ClerkProvider>
           </ThemeProvider>
         </NextIntlClientProvider>
       </body>
diff --git a/src/app/(unauth)/page.tsx b/src/app/page.tsx
similarity index 70%
rename from src/app/(unauth)/page.tsx
rename to src/app/page.tsx
index 71c5fdb064..bc2affdd11 100644
--- a/src/app/(unauth)/page.tsx
+++ b/src/app/page.tsx
@@ -1,9 +1,11 @@
+import { auth as clerkAuth } from '@clerk/nextjs/server';
 import { getLocale, getTranslations, setRequestLocale } from 'next-intl/server';
 
 import { Features } from '@/components/templates/Features';
 import { Footer } from '@/components/templates/Footer';
 import { Hero } from '@/components/templates/Hero';
 import { Navbar } from '@/components/templates/Navbar';
+import { redirect } from 'next/navigation';
 
 export async function generateMetadata() {
   const locale = await getLocale();
@@ -15,9 +17,14 @@ export async function generateMetadata() {
   };
 }
 
-const IndexPage = async () => {
-  const locale = await getLocale();
-  setRequestLocale(locale);
+export default async function Page() {
+  const auth = await clerkAuth();
+
+  if (auth.userId) {
+    redirect('/dashboard');
+  }
+
+  setRequestLocale(await getLocale());
 
   return (
     <>
@@ -27,6 +34,4 @@ const IndexPage = async () => {
       <Footer />
     </>
   );
-};
-
-export default IndexPage;
+}
diff --git a/src/app/(auth)/(center)/sign-in/[[...sign-in]]/page.tsx b/src/app/sign-in/[[...sign-in]]/page.tsx
similarity index 68%
rename from src/app/(auth)/(center)/sign-in/[[...sign-in]]/page.tsx
rename to src/app/sign-in/[[...sign-in]]/page.tsx
index 9a613d5c7d..d1e79a8204 100644
--- a/src/app/(auth)/(center)/sign-in/[[...sign-in]]/page.tsx
+++ b/src/app/sign-in/[[...sign-in]]/page.tsx
@@ -7,6 +7,10 @@ export async function generateMetadata() {
   return { title: t('meta_title'), description: t('meta_description') };
 }
 
-const SignInPage = () => <SignIn path="/sign-in" />;
-
-export default SignInPage;
+export default function Page() {
+  return (
+    <div className="flex h-screen w-full items-center justify-center">
+      <SignIn />
+    </div>
+  );
+}
diff --git a/src/app/(auth)/(center)/sign-up/[[...sign-up]]/page.tsx b/src/app/sign-up/[[...sign-up]]/page.tsx
similarity index 68%
rename from src/app/(auth)/(center)/sign-up/[[...sign-up]]/page.tsx
rename to src/app/sign-up/[[...sign-up]]/page.tsx
index 4ba1d65d37..a689bbf2dd 100644
--- a/src/app/(auth)/(center)/sign-up/[[...sign-up]]/page.tsx
+++ b/src/app/sign-up/[[...sign-up]]/page.tsx
@@ -7,6 +7,10 @@ export async function generateMetadata() {
   return { title: t('meta_title'), description: t('meta_description') };
 }
 
-const SignUpPage = () => <SignUp path="/sign-up" />;
-
-export default SignUpPage;
+export default function Page() {
+  return (
+    <div className="flex h-screen w-full items-center justify-center">
+      <SignUp />
+    </div>
+  );
+}
diff --git a/src/components/dashboard/DashboardHeader.tsx b/src/components/dashboard/DashboardHeader.tsx
index 47f4dac7df..647fec969f 100644
--- a/src/components/dashboard/DashboardHeader.tsx
+++ b/src/components/dashboard/DashboardHeader.tsx
@@ -5,6 +5,7 @@ import Link from 'next/link';
 
 import { ActiveLink } from '@/components/ActiveLink';
 import { LocaleSwitcher } from '@/components/LocaleSwitcher';
+import { ThemeSwitcher } from '@/components/ThemeSwitcher';
 import { ToggleMenuButton } from '@/components/ToggleMenuButton';
 import {
   DropdownMenu,
@@ -80,6 +81,9 @@ export const DashboardHeader = (props: DashboardHeaderProps) => (
         <li data-fade>
           <LocaleSwitcher />
         </li>
+        <li data-fade>
+          <ThemeSwitcher />
+        </li>
         <li>
           <Separator orientation="vertical" className="h-4" />
         </li>
diff --git a/src/components/dashboard/MessageState.tsx b/src/components/dashboard/MessageState.tsx
deleted file mode 100644
index 936ca16e4c..0000000000
--- a/src/components/dashboard/MessageState.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-
-export const MessageState = (props: {
-  icon: React.ReactNode;
-  title: React.ReactNode;
-  description: React.ReactNode;
-  button: React.ReactNode;
-}) => (
-  <div className="flex h-[600px] flex-col items-center justify-center rounded-md bg-card p-5">
-    <div className="size-16 rounded-full bg-muted p-3 [&_svg]:stroke-muted-foreground [&_svg]:stroke-2">
-      {props.icon}
-    </div>
-
-    <div className="mt-3 text-center">
-      <div className="text-xl font-semibold">{props.title}</div>
-      <div className="mt-1 text-sm font-medium text-muted-foreground">
-        {props.description}
-      </div>
-
-      <div className="mt-5">{props.button}</div>
-    </div>
-  </div>
-);
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 5e217dfe84..42ccfc6980 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -59,10 +59,7 @@
   "DashboardIndex": {
     "title_bar": "Dashboard",
     "title_bar_description": "Welcome to your dashboard",
-    "message_state_title": "Let's get started",
-    "message_state_description": "You can customize this page by editing the file at <code>dashboard/page.tsx</code>",
-    "message_state_button": "Star on GitHub",
-    "message_state_alternative": "Want more features using the same stack? Try <url></url>."
+    "message_state_title": "Let's get started"
   },
   "UserProfile": {
     "title_bar": "User Profile",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 6fd2bd378b..eb003fe4bd 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -59,10 +59,7 @@
   "DashboardIndex": {
     "title_bar": "Tableau de bord",
     "title_bar_description": "Bienvenue sur votre tableau de bord",
-    "message_state_title": "C'est parti",
-    "message_state_description": "Vous pouvez personnaliser cette page en modifiant le fichier dans <code>dashboard/page.tsx</code>",
-    "message_state_button": "Mettez une étoile sur GitHub",
-    "message_state_alternative": "Vous voulez plus de fonctionnalités en utilisant la même stack ? Essayez <url></url>."
+    "message_state_title": "C'est parti"
   },
   "UserProfile": {
     "title_bar": "Profil utilisateur",