diff --git a/apps/dashboard/src/app/forgot-password/ForgotPasswordPageClient.tsx b/apps/dashboard/src/app/forgot-password/ForgotPasswordPageClient.tsx
index 5b2c148..368e290 100644
--- a/apps/dashboard/src/app/forgot-password/ForgotPasswordPageClient.tsx
+++ b/apps/dashboard/src/app/forgot-password/ForgotPasswordPageClient.tsx
@@ -85,32 +85,32 @@ export default function ForgotPasswordPageClient({ embedded = false }: { embedde
                   width={104}
                   height={104}
                   priority
-                  className="h-24 w-24 rounded-[1.75rem] border border-blue-100 bg-white p-1.5 shadow-sm transition-colors dark:border-slate-700 dark:bg-slate-900"
+                  className="h-24 w-24 rounded-[1.75rem] border border-stone-200 bg-white p-1.5 shadow-sm transition-colors dark:border-stone-700 dark:bg-stone-900"
                 />
               </a>
             </div>
-            <h1 className="mt-4 text-3xl font-black tracking-tight text-slate-900 dark:text-slate-100">{dict.title}</h1>
-            <p className="mt-2 text-sm text-slate-500 dark:text-slate-400">{dict.subtitle}</p>
+            <h1 className="mt-4 text-3xl font-black tracking-tight text-stone-900 dark:text-stone-100">{dict.title}</h1>
+            <p className="mt-2 text-sm text-stone-500 dark:text-stone-400">{dict.subtitle}</p>
           </div>
 
-          <section className="rounded-[2rem] border border-slate-200 bg-white p-8 shadow-sm transition-colors dark:border-slate-800 dark:bg-slate-900/90">
+          <section className="rounded-[2rem] border border-stone-200 bg-white p-8 shadow-sm transition-colors dark:border-stone-800 dark:bg-stone-900">
             {sent ? (
               <div className="space-y-4 text-center">
-                <div className="mx-auto flex h-14 w-14 items-center justify-center rounded-full bg-green-100">
-                  <svg className="h-7 w-7 text-green-600" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
+                <div className="mx-auto flex h-14 w-14 items-center justify-center rounded-full bg-emerald-100 dark:bg-emerald-950/50">
+                  <svg className="h-7 w-7 text-emerald-600 dark:text-emerald-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
                     <path strokeLinecap="round" strokeLinejoin="round" d="M5 13l4 4L19 7" />
                   </svg>
                 </div>
-                <h2 className="text-xl font-bold text-slate-900 dark:text-slate-100">{dict.successTitle}</h2>
-                <p className="text-sm text-slate-500 dark:text-slate-400">{dict.successBody}</p>
+                <h2 className="text-xl font-bold text-stone-900 dark:text-stone-100">{dict.successTitle}</h2>
+                <p className="text-sm text-stone-500 dark:text-stone-400">{dict.successBody}</p>
               </div>
             ) : (
               <form onSubmit={handleSubmit} className="space-y-5">
                 {error && (
-                  <div className="rounded-2xl border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700">{error}</div>
+                  <div className="rounded-2xl border border-rose-200 bg-rose-50 px-4 py-3 text-sm text-rose-700 dark:border-rose-800 dark:bg-rose-950/40 dark:text-rose-400">{error}</div>
                 )}
                 <div>
-                  <label className="mb-1.5 block text-sm font-medium text-slate-700 dark:text-slate-300">{dict.email}</label>
+                  <label className="mb-1.5 block text-sm font-medium text-stone-700 dark:text-stone-300">{dict.email}</label>
                   <input
                     type="email"
                     required
@@ -130,8 +130,8 @@ export default function ForgotPasswordPageClient({ embedded = false }: { embedde
               </form>
             )}
 
-            <div className="mt-6 border-t border-slate-200 pt-6 text-center text-sm text-slate-500 dark:border-slate-800 dark:text-slate-400">
-              <Link href="/sign-in" className="font-semibold text-slate-900 underline decoration-slate-300 underline-offset-4 dark:text-slate-100 dark:decoration-slate-700">
+            <div className="mt-6 border-t border-stone-200 pt-6 text-center text-sm text-stone-500 dark:border-stone-800 dark:text-stone-400">
+              <Link href="/sign-in" className="font-semibold text-stone-900 underline decoration-stone-300 underline-offset-4 dark:text-stone-100 dark:decoration-stone-700">
                 {dict.backToLogin}
               </Link>
             </div>
diff --git a/apps/dashboard/src/app/forgot-password/page.tsx b/apps/dashboard/src/app/forgot-password/page.tsx
index 31b1d5f..8e6e404 100644
--- a/apps/dashboard/src/app/forgot-password/page.tsx
+++ b/apps/dashboard/src/app/forgot-password/page.tsx
@@ -1,12 +1,5 @@
 import ForgotPasswordPageClient from './ForgotPasswordPageClient'
 
-export default async function ForgotPasswordPage({
-  searchParams,
-}: {
-  searchParams: Promise<Record<string, string | string[] | undefined>>
-}) {
-  const params = await searchParams
-  const embedded = params.embedded === '1'
-
-  return <ForgotPasswordPageClient embedded={embedded} />
+export default function ForgotPasswordPage() {
+  return <ForgotPasswordPageClient embedded={true} />
 }
diff --git a/apps/dashboard/src/app/reset-password/ResetPasswordPageClient.tsx b/apps/dashboard/src/app/reset-password/ResetPasswordPageClient.tsx
index 19efd49..8aa469a 100644
--- a/apps/dashboard/src/app/reset-password/ResetPasswordPageClient.tsx
+++ b/apps/dashboard/src/app/reset-password/ResetPasswordPageClient.tsx
@@ -111,7 +111,7 @@ function ResetPasswordContent({ embedded = false }: { embedded?: boolean }) {
   if (!token) {
     return (
       <ResetShell embedded={embedded} title={dict.title}>
-        <p className="text-center text-sm text-slate-500">{dict.noToken}</p>
+        <p className="text-center text-sm text-stone-500 dark:text-stone-400">{dict.noToken}</p>
         <div className="mt-4 text-center">
           <Link href="/forgot-password" className="btn-primary inline-flex">{dict.requestNew}</Link>
         </div>
@@ -123,13 +123,13 @@ function ResetPasswordContent({ embedded = false }: { embedded?: boolean }) {
     return (
       <ResetShell embedded={embedded} title={dict.title}>
         <div className="space-y-4 text-center">
-          <div className="mx-auto flex h-14 w-14 items-center justify-center rounded-full bg-green-100">
-            <svg className="h-7 w-7 text-green-600" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
+          <div className="mx-auto flex h-14 w-14 items-center justify-center rounded-full bg-emerald-100 dark:bg-emerald-950/50">
+            <svg className="h-7 w-7 text-emerald-600 dark:text-emerald-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
               <path strokeLinecap="round" strokeLinejoin="round" d="M5 13l4 4L19 7" />
             </svg>
           </div>
-          <h2 className="text-xl font-bold text-slate-900">{dict.successTitle}</h2>
-          <p className="text-sm text-slate-500">{dict.successBody}</p>
+          <h2 className="text-xl font-bold text-stone-900 dark:text-stone-100">{dict.successTitle}</h2>
+          <p className="text-sm text-stone-500 dark:text-stone-400">{dict.successBody}</p>
           <Link href="/sign-in" className="btn-primary inline-flex justify-center">{dict.signIn}</Link>
         </div>
       </ResetShell>
@@ -140,10 +140,10 @@ function ResetPasswordContent({ embedded = false }: { embedded?: boolean }) {
     <ResetShell embedded={embedded} title={dict.title} subtitle={dict.subtitle}>
       <form onSubmit={handleSubmit} className="space-y-5">
         {error && (
-          <div className="rounded-2xl border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700">{error}</div>
+          <div className="rounded-2xl border border-rose-200 bg-rose-50 px-4 py-3 text-sm text-rose-700 dark:border-rose-800 dark:bg-rose-950/40 dark:text-rose-400">{error}</div>
         )}
         <div>
-          <label className="mb-1.5 block text-sm font-medium text-slate-700">{dict.newPassword}</label>
+          <label className="mb-1.5 block text-sm font-medium text-stone-700 dark:text-stone-300">{dict.newPassword}</label>
           <input
             type="password"
             required
@@ -155,7 +155,7 @@ function ResetPasswordContent({ embedded = false }: { embedded?: boolean }) {
           />
         </div>
         <div>
-          <label className="mb-1.5 block text-sm font-medium text-slate-700">{dict.confirmPassword}</label>
+          <label className="mb-1.5 block text-sm font-medium text-stone-700 dark:text-stone-300">{dict.confirmPassword}</label>
           <input
             type="password"
             required
@@ -175,8 +175,8 @@ function ResetPasswordContent({ embedded = false }: { embedded?: boolean }) {
         </button>
       </form>
 
-      <div className="mt-6 border-t border-slate-200 pt-6 text-center text-sm text-slate-500">
-        <Link href="/sign-in" className="font-semibold text-slate-900 underline decoration-slate-300 underline-offset-4">
+      <div className="mt-6 border-t border-stone-200 pt-6 text-center text-sm text-stone-500 dark:border-stone-800 dark:text-stone-400">
+        <Link href="/sign-in" className="font-semibold text-stone-900 underline decoration-stone-300 underline-offset-4 dark:text-stone-100 dark:decoration-stone-700">
           {dict.backToLogin}
         </Link>
       </div>
@@ -200,11 +200,11 @@ function ResetShell({
       <main className="flex min-h-[calc(100vh-80px)] items-center justify-center px-4 py-12">
         <div className="w-full max-w-md">
           <div className="mb-8 text-center">
-            <span className="text-xs font-semibold uppercase tracking-[0.24em] text-blue-600">RentalDriveGo</span>
-            <h1 className="mt-3 text-3xl font-black tracking-tight text-slate-900">{title}</h1>
-            {subtitle && <p className="mt-2 text-sm text-slate-500">{subtitle}</p>}
+            <span className="text-xs font-semibold uppercase tracking-[0.24em] text-amber-700 dark:text-amber-400">RentalDriveGo</span>
+            <h1 className="mt-3 text-3xl font-black tracking-tight text-stone-900 dark:text-stone-100">{title}</h1>
+            {subtitle && <p className="mt-2 text-sm text-stone-500 dark:text-stone-400">{subtitle}</p>}
           </div>
-          <section className="rounded-[2rem] border border-slate-200 bg-white p-8 shadow-sm">
+          <section className="rounded-[2rem] border border-stone-200 bg-white p-8 shadow-sm transition-colors dark:border-stone-800 dark:bg-stone-900">
             {children}
           </section>
         </div>
diff --git a/apps/dashboard/src/app/reset-password/page.tsx b/apps/dashboard/src/app/reset-password/page.tsx
index 9dbfe8e..664c994 100644
--- a/apps/dashboard/src/app/reset-password/page.tsx
+++ b/apps/dashboard/src/app/reset-password/page.tsx
@@ -1,12 +1,5 @@
 import ResetPasswordPageClient from './ResetPasswordPageClient'
 
-export default async function ResetPasswordPage({
-  searchParams,
-}: {
-  searchParams: Promise<Record<string, string | string[] | undefined>>
-}) {
-  const params = await searchParams
-  const embedded = params.embedded === '1'
-
-  return <ResetPasswordPageClient embedded={embedded} />
+export default function ResetPasswordPage() {
+  return <ResetPasswordPageClient embedded={true} />
 }