diff --git a/package.json b/package.json
index 1b68de8..ff552b3 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
   "scripts": {
     "build": "next build",
     "check": "next lint && tsc --noEmit",
-    "dev": "next dev",
-    "dev:turbo": "next dev --turbo",
+    "dev": "next dev --turbo",
+    "dev:slow": "next dev",
     "format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,mdx}\" --cache",
     "format:write": "prettier --write \"**/*.{ts,tsx,js,jsx,mdx}\" --cache",
     "lint": "next lint",
diff --git a/src/app/(auth-pages)/auth/success/page.tsx b/src/app/(auth-pages)/auth/success/page.tsx
index b3953ca..e6660ab 100644
--- a/src/app/(auth-pages)/auth/success/page.tsx
+++ b/src/app/(auth-pages)/auth/success/page.tsx
@@ -1,12 +1,12 @@
 'use client';
 
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import { useRouter } from 'next/navigation';
 import { useEffect } from 'react';
 import { Loader2 } from 'lucide-react';
 
 const AuthSuccessPage = () => {
-  const { refreshUserData, isAuthenticated } = useAuth();
+  const { refreshUserData } = useAuth();
   const router = useRouter();
 
   useEffect(() => {
diff --git a/src/app/(auth-pages)/forgot-password/page.tsx b/src/app/(auth-pages)/forgot-password/page.tsx
index ccbbce6..aae4fd2 100644
--- a/src/app/(auth-pages)/forgot-password/page.tsx
+++ b/src/app/(auth-pages)/forgot-password/page.tsx
@@ -19,7 +19,7 @@ import {
 import Link from 'next/link';
 import { forgotPassword } from '@/lib/actions';
 import { useRouter } from 'next/navigation';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import { useEffect, useState } from 'react';
 import { StatusMessage, SubmitButton } from '@/components/default';
 
diff --git a/src/app/(auth-pages)/profile/page.tsx b/src/app/(auth-pages)/profile/page.tsx
index 75c7dc9..9b5ae2f 100644
--- a/src/app/(auth-pages)/profile/page.tsx
+++ b/src/app/(auth-pages)/profile/page.tsx
@@ -1,5 +1,5 @@
 'use client';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import { useRouter } from 'next/navigation';
 import { useEffect } from 'react';
 import {
diff --git a/src/app/(auth-pages)/sign-in/page.tsx b/src/app/(auth-pages)/sign-in/page.tsx
index a6c4fc0..4baa919 100644
--- a/src/app/(auth-pages)/sign-in/page.tsx
+++ b/src/app/(auth-pages)/sign-in/page.tsx
@@ -20,7 +20,7 @@ import {
 import Link from 'next/link';
 import { signIn } from '@/lib/actions';
 import { useRouter } from 'next/navigation';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import { useEffect, useState } from 'react';
 import { StatusMessage, SubmitButton } from '@/components/default';
 import { Separator } from '@/components/ui';
diff --git a/src/app/(auth-pages)/sign-up/page.tsx b/src/app/(auth-pages)/sign-up/page.tsx
index b62894a..6b4af75 100644
--- a/src/app/(auth-pages)/sign-up/page.tsx
+++ b/src/app/(auth-pages)/sign-up/page.tsx
@@ -7,7 +7,7 @@ import Link from 'next/link';
 import { signUp } from '@/lib/actions';
 import { StatusMessage, SubmitButton } from '@/components/default';
 import { useRouter } from 'next/navigation';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import {
   Card,
   CardContent,
diff --git a/src/app/global-error.tsx b/src/app/global-error.tsx
index c7e89c5..3c05a61 100644
--- a/src/app/global-error.tsx
+++ b/src/app/global-error.tsx
@@ -2,8 +2,7 @@
 
 import '@/styles/globals.css';
 import { cn } from '@/lib/utils';
-import { ThemeProvider } from '@/components/context/theme';
-import { AuthProvider } from '@/components/context/auth';
+import { AuthProvider, ThemeProvider } from '@/components/context';
 import Navigation from '@/components/default/navigation';
 import Footer from '@/components/default/footer';
 import { Button, Toaster } from '@/components/ui';
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 2e23e3e..79cfb93 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -2,8 +2,7 @@ import type { Metadata } from 'next';
 import '@/styles/globals.css';
 import { Geist } from 'next/font/google';
 import { cn } from '@/lib/utils';
-import { ThemeProvider } from '@/components/context/theme';
-import { AuthProvider } from '@/components/context/auth';
+import { AuthProvider, ThemeProvider } from '@/components/context';
 import Navigation from '@/components/default/navigation';
 import Footer from '@/components/default/footer';
 import { Toaster } from '@/components/ui';
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 5caff0e..757f905 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -16,7 +16,7 @@ import {
 import {
   SignInSignUp,
   SignInWithApple,
-  SignInWithMicrosoft
+  SignInWithMicrosoft,
 } from '@/components/default/auth';
 
 const HomePage = async () => {
diff --git a/src/components/context/auth.tsx b/src/components/context/Auth.tsx
similarity index 100%
rename from src/components/context/auth.tsx
rename to src/components/context/Auth.tsx
diff --git a/src/components/context/theme.tsx b/src/components/context/Theme.tsx
similarity index 100%
rename from src/components/context/theme.tsx
rename to src/components/context/Theme.tsx
diff --git a/src/components/context/index.tsx b/src/components/context/index.tsx
new file mode 100644
index 0000000..8e8a91c
--- /dev/null
+++ b/src/components/context/index.tsx
@@ -0,0 +1,2 @@
+export { AuthProvider, useAuth } from './Auth';
+export { ThemeProvider, ThemeToggle } from './Theme';
diff --git a/src/components/default/auth/SignInWithApple.tsx b/src/components/default/auth/SignInWithApple.tsx
index 3c3100c..aa9f653 100644
--- a/src/components/default/auth/SignInWithApple.tsx
+++ b/src/components/default/auth/SignInWithApple.tsx
@@ -1,7 +1,7 @@
 'use client';
 import { signInWithApple } from '@/lib/actions';
 import { StatusMessage, SubmitButton } from '@/components/default';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import Image from 'next/image';
diff --git a/src/components/default/auth/SignInWithMicrosoft.tsx b/src/components/default/auth/SignInWithMicrosoft.tsx
index ba16fc7..3a80e05 100644
--- a/src/components/default/auth/SignInWithMicrosoft.tsx
+++ b/src/components/default/auth/SignInWithMicrosoft.tsx
@@ -1,7 +1,7 @@
 'use client';
 import { signInWithMicrosoft } from '@/lib/actions';
 import { StatusMessage, SubmitButton } from '@/components/default';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import { useState } from 'react';
 import Image from 'next/image';
 import { type buttonVariants } from '@/components/ui';
diff --git a/src/components/default/navigation/auth/AvatarDropdown.tsx b/src/components/default/navigation/auth/AvatarDropdown.tsx
index c07ac71..f416da4 100644
--- a/src/components/default/navigation/auth/AvatarDropdown.tsx
+++ b/src/components/default/navigation/auth/AvatarDropdown.tsx
@@ -12,7 +12,7 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@/components/ui';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import { useRouter } from 'next/navigation';
 import { signOut } from '@/lib/actions';
 import { User } from 'lucide-react';
diff --git a/src/components/default/navigation/index.tsx b/src/components/default/navigation/index.tsx
index 947c4df..bc92be7 100644
--- a/src/components/default/navigation/index.tsx
+++ b/src/components/default/navigation/index.tsx
@@ -3,7 +3,7 @@
 import Link from 'next/link';
 import { Button } from '@/components/ui';
 import NavigationAuth from './auth';
-import { ThemeToggle } from '@/components/context/theme';
+import { ThemeToggle } from '@/components/context';
 import Image from 'next/image';
 
 const Navigation = () => {
diff --git a/src/components/default/profile/AvatarUpload.tsx b/src/components/default/profile/AvatarUpload.tsx
index 0063f88..1696a6c 100644
--- a/src/components/default/profile/AvatarUpload.tsx
+++ b/src/components/default/profile/AvatarUpload.tsx
@@ -1,5 +1,5 @@
 import { useFileUpload } from '@/lib/hooks/useFileUpload';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import {
   Avatar,
   AvatarFallback,
diff --git a/src/components/default/profile/ProfileForm.tsx b/src/components/default/profile/ProfileForm.tsx
index 95be91a..3610def 100644
--- a/src/components/default/profile/ProfileForm.tsx
+++ b/src/components/default/profile/ProfileForm.tsx
@@ -13,7 +13,7 @@ import {
   Input,
 } from '@/components/ui';
 import { useEffect } from 'react';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import { SubmitButton } from '@/components/default';
 
 const formSchema = z.object({
diff --git a/src/components/default/profile/ResetPasswordForm.tsx b/src/components/default/profile/ResetPasswordForm.tsx
index f685ebd..14ec06f 100644
--- a/src/components/default/profile/ResetPasswordForm.tsx
+++ b/src/components/default/profile/ResetPasswordForm.tsx
@@ -122,18 +122,15 @@ export const ResetPasswordForm = ({
                 </FormItem>
               )}
             />
-            {statusMessage && (
-              <div
-                className={`text-sm text-center ${
-                  statusMessage.includes('Error') ||
-                  statusMessage.includes('failed')
-                    ? 'text-destructive'
-                    : 'text-green-600'
-                }`}
-              >
-                {statusMessage}
-              </div>
-            )}
+            {statusMessage &&
+              (statusMessage.includes('Error') ||
+              statusMessage.includes('error') ||
+              statusMessage.includes('failed') ||
+              statusMessage.includes('invalid') ? (
+                <StatusMessage message={{ error: statusMessage }} />
+              ) : (
+                <StatusMessage message={{ message: statusMessage }} />
+              ))}
             <div className='flex justify-center'>
               <SubmitButton
                 disabled={isLoading}
diff --git a/src/components/default/profile/SignOut.tsx b/src/components/default/profile/SignOut.tsx
index b9183c2..78327b2 100644
--- a/src/components/default/profile/SignOut.tsx
+++ b/src/components/default/profile/SignOut.tsx
@@ -3,7 +3,7 @@
 import { CardHeader } from '@/components/ui';
 import { SubmitButton } from '@/components/default';
 import { useRouter } from 'next/navigation';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import { signOut } from '@/lib/actions';
 
 export const SignOut = () => {
diff --git a/src/lib/hooks/index.ts b/src/lib/hooks/index.ts
index cd51501..e3a9342 100755
--- a/src/lib/hooks/index.ts
+++ b/src/lib/hooks/index.ts
@@ -1,6 +1,5 @@
 export * from './auth';
 export * from './public';
-//export * from './resizeImage';
 export * from './storage';
 export * from './useFileUpload';
 
diff --git a/src/lib/hooks/useFileUpload.ts b/src/lib/hooks/useFileUpload.ts
index bfcd0c2..a9659c9 100644
--- a/src/lib/hooks/useFileUpload.ts
+++ b/src/lib/hooks/useFileUpload.ts
@@ -3,7 +3,7 @@
 import { useState, useRef } from 'react';
 import { replaceFile, uploadFile } from '@/lib/hooks';
 import { toast } from 'sonner';
-import { useAuth } from '@/components/context/auth';
+import { useAuth } from '@/components/context';
 import { resizeImage } from '@/lib/hooks';
 import type { Result } from '.';