diff --git a/app/(dashboard)/settings/page.tsx b/app/(dashboard)/settings/page.tsx
index 96c05dd..43a1b8d 100644
--- a/app/(dashboard)/settings/page.tsx
+++ b/app/(dashboard)/settings/page.tsx
@@ -24,8 +24,10 @@ export default function SettingsPage() {
           {/* Settings Navigation Sidebar */}
           <div className="lg:col-span-1">
             <SettingsSidebar
+              // @ts-ignore
               activeSection={params.settings_tab}
               setActiveSection={(v) =>
+                // @ts-ignore
                 setParams({ ...params, settings_tab: v })
               }
             />
@@ -34,6 +36,7 @@ export default function SettingsPage() {
           {/* Main Content Area */}
           <div className="lg:col-span-3">
             <SettingsContent
+              // @ts-ignore
               activeSection={params.settings_tab}
               hasChanges={hasChanges}
               setHasChanges={setHasChanges}
diff --git a/app/api/settings/profile/route.ts b/app/api/settings/profile/route.ts
index f333642..318ec8b 100644
--- a/app/api/settings/profile/route.ts
+++ b/app/api/settings/profile/route.ts
@@ -19,6 +19,7 @@ export async function GET() {
         image: true,
         showEmail: true,
         showLocation: true,
+        username: true,
       },
     });
 
@@ -31,7 +32,7 @@ export async function GET() {
     console.error("Profile GET error:", error);
     return NextResponse.json(
       { error: "Failed to fetch profile" },
-      { status: 500 },
+      { status: 500 }
     );
   }
 }
@@ -71,7 +72,7 @@ export async function PUT(request: NextRequest) {
     console.error("Profile PUT error:", error);
     return NextResponse.json(
       { error: "Failed to update profile" },
-      { status: 500 },
+      { status: 500 }
     );
   }
 }
diff --git a/app/api/settings/sessions/[sessionId]/route.ts b/app/api/settings/sessions/[sessionId]/route.ts
index c9953ff..4f3bf53 100644
--- a/app/api/settings/sessions/[sessionId]/route.ts
+++ b/app/api/settings/sessions/[sessionId]/route.ts
@@ -1,22 +1,48 @@
 import { NextRequest, NextResponse } from "next/server";
-import { requireAuth } from "@/lib/auth-utils";
+import { auth } from "@/lib/auth";
+import { headers } from "next/headers";
+import { prisma } from "@/lib/prisma";
 
 export async function DELETE(
   request: NextRequest,
-  { params }: { params: { sessionId: string } },
+  { params }: { params: Promise<{ sessionId: string }> }
 ) {
   try {
-    const session = await requireAuth();
+    const session = await auth.api.getSession({ headers: await headers() });
 
-    // For demo purposes, just return success
-    // In production, you'd revoke the specific session
+    if (!session) {
+      return NextResponse.json(
+        { error: "Unauthorized", success: false },
+        { status: 401 }
+      );
+    }
+    const currentToken = session.session.token;
+    const { sessionId } = await params;
+    const sessionToRevoke = await prisma.session.findUnique({
+      where: { id: sessionId },
+    });
+
+    // Prevent revoking current session
+    if (sessionToRevoke?.token === currentToken) {
+      return NextResponse.json(
+        { error: "Cannot revoke current session" },
+        { status: 400 }
+      );
+    }
+
+    await prisma.session.delete({
+      where: {
+        id: sessionId,
+        userId: session.user.id,
+      },
+    });
 
     return NextResponse.json({ message: "Session revoked successfully" });
   } catch (error) {
     console.error("Session revoke error:", error);
     return NextResponse.json(
       { error: "Failed to revoke session" },
-      { status: 500 },
+      { status: 500 }
     );
   }
 }
diff --git a/app/api/settings/sessions/route.ts b/app/api/settings/sessions/route.ts
index 6d5fddf..0a1a956 100644
--- a/app/api/settings/sessions/route.ts
+++ b/app/api/settings/sessions/route.ts
@@ -2,6 +2,8 @@ import { NextRequest, NextResponse } from "next/server";
 import { requireAuth } from "@/lib/auth-utils";
 import { prisma } from "@/lib/prisma";
 import { UAParser } from "ua-parser-js";
+import { auth } from "@/lib/auth";
+import { headers } from "next/headers";
 
 // Helper function to parse user agent and get device info
 function parseUserAgent(userAgent: string) {
@@ -59,10 +61,15 @@ function getTimeAgo(date: Date) {
 
 export async function GET(request: NextRequest) {
   try {
-    const session = await requireAuth();
+    const session = await auth.api.getSession({ headers: await headers() });
 
-    // Get current session token from cookie
-    const currentToken = request.cookies.get("session")?.value;
+    if (!session) {
+      return NextResponse.json(
+        { error: "Unauthorized", success: false },
+        { status: 401 }
+      );
+    }
+    const currentToken = session.session.token;
 
     // Fetch all sessions for the user
     const sessions = await prisma.session.findMany({
@@ -96,8 +103,15 @@ export async function GET(request: NextRequest) {
 
 export async function DELETE(request: NextRequest) {
   try {
-    const session = await requireAuth();
-    const currentToken = request.cookies.get("session")?.value;
+    const session = await auth.api.getSession({ headers: await headers() });
+
+    if (!session) {
+      return NextResponse.json(
+        { error: "Unauthorized", success: false },
+        { status: 401 }
+      );
+    }
+    const currentToken = session.session.token;
 
     const { searchParams } = new URL(request.url);
     const sessionId = searchParams.get("sessionId");
diff --git a/components/settings/settings-content.tsx b/components/settings/settings-content.tsx
index 9225201..80a0420 100644
--- a/components/settings/settings-content.tsx
+++ b/components/settings/settings-content.tsx
@@ -56,15 +56,14 @@ import {
   useDisable2FA,
   useRevokeSession,
   useRevokeAllSessions,
-  useSettingsBilling,
-  useUpdateSettingsBilling,
   useSettingsRepositories,
   useDisconnectRepository,
   useDisconnectAllRepositories,
 } from "@/hooks";
+import { useTheme } from "next-themes";
 
 interface SettingsContentProps {
-  activeSection: string;
+  activeSection: SettingsTab;
   hasChanges: boolean;
   setHasChanges: (hasChanges: boolean) => void;
 }
@@ -74,6 +73,7 @@ export function SettingsContent({
   hasChanges,
   setHasChanges,
 }: SettingsContentProps) {
+  const { setTheme } = useTheme();
   // Real data hooks
   const { data: profile, isLoading: profileLoading } = useSettingsProfile();
   const { data: notifications } = useSettingsNotifications();
@@ -93,8 +93,6 @@ export function SettingsContent({
   const disable2FA = useDisable2FA();
   const revokeSession = useRevokeSession();
   const revokeAllSessions = useRevokeAllSessions();
-  const { data: billing } = useSettingsBilling();
-  const updateBilling = useUpdateSettingsBilling();
   const disconnectRepository = useDisconnectRepository();
   const disconnectAllRepositories = useDisconnectAllRepositories();
 
@@ -257,7 +255,8 @@ export function SettingsContent({
         bio: profile.bio || "",
         location: profile.location || "",
         website: profile.website || "",
-        githubUrl: profile.githubUrl || "",
+        githubUrl:
+          profile?.githubUrl || `https://github.com/${profile.username}` || "",
         showEmail: profile.showEmail || false,
         showLocation: profile.showLocation !== false,
       });
@@ -324,7 +323,8 @@ export function SettingsContent({
         bio: profile.bio || "",
         location: profile.location || "",
         website: profile.website || "",
-        githubUrl: profile.githubUrl || "",
+        githubUrl:
+          profile?.githubUrl || `https://github.com/${profile.username}` || "",
         showEmail: profile.showEmail || false,
         showLocation: profile.showLocation !== false,
       });
@@ -358,6 +358,7 @@ export function SettingsContent({
   useEffect(() => {
     if (appearanceSettings) {
       setAppearanceData(appearanceSettings);
+      setTheme(appearanceSettings?.theme);
     }
   }, [appearanceSettings]);
 
@@ -386,7 +387,7 @@ export function SettingsContent({
           <CardHeader>
             <CardTitle>Profile Information</CardTitle>
           </CardHeader>
-          <CardContent className="space-y-4">
+          <CardContent className="space-y-4 ">
             <div className="flex items-center gap-6">
               <Avatar className="h-20 w-20">
                 <AvatarImage src={profile?.image} />
@@ -410,7 +411,7 @@ export function SettingsContent({
                     setProfileData({ ...profileData, name: e.target.value });
                     setHasChanges(true);
                   }}
-                  className="mt-1"
+                  className="mt-1 border-border!"
                 />
               </div>
               <div>
@@ -420,7 +421,7 @@ export function SettingsContent({
                   type="email"
                   value={profile?.email || ""}
                   disabled
-                  className="mt-1"
+                  className="mt-1 border-border!"
                 />
                 <p className="text-xs text-muted-foreground mt-1">
                   Email cannot be changed from profile settings
@@ -437,7 +438,7 @@ export function SettingsContent({
                   setProfileData({ ...profileData, bio: e.target.value });
                   setHasChanges(true);
                 }}
-                className="mt-1"
+                className="mt-1 border-border!"
                 rows={3}
               />
             </div>
@@ -455,7 +456,7 @@ export function SettingsContent({
                     });
                     setHasChanges(true);
                   }}
-                  className="mt-1"
+                  className="mt-1 border-border!"
                 />
               </div>
               <div>
@@ -467,7 +468,7 @@ export function SettingsContent({
                     setProfileData({ ...profileData, website: e.target.value });
                     setHasChanges(true);
                   }}
-                  className="mt-1"
+                  className="mt-1 border-border!"
                 />
               </div>
             </div>
@@ -481,7 +482,7 @@ export function SettingsContent({
                   setProfileData({ ...profileData, githubUrl: e.target.value });
                   setHasChanges(true);
                 }}
-                className="mt-1"
+                className="mt-1 border-border!"
               />
             </div>
           </CardContent>
@@ -759,13 +760,7 @@ export function SettingsContent({
                   <p className="font-medium">{session.device}</p>
                   <p className="text-sm text-muted-foreground">
                     {session.location} •{" "}
-                    {session.current
-                      ? "Active now"
-                      : `${Math.floor(
-                          (Date.now() -
-                            new Date(session.lastActive).getTime()) /
-                            (1000 * 60 * 60)
-                        )} hours ago`}
+                    {session.current ? "Active now" : session.lastActive}
                   </p>
                 </div>
                 {session.current ? (
@@ -810,7 +805,7 @@ export function SettingsContent({
           <CardTitle>Email Notifications</CardTitle>
         </CardHeader>
         <CardContent className="space-y-4">
-          <div className="flex items-center justify-between">
+          <div className="flex items-center justify-between border-border">
             <div>
               <p className="font-medium">Review completed</p>
               <p className="text-sm text-muted-foreground">
@@ -831,7 +826,7 @@ export function SettingsContent({
               }}
             />
           </div>
-          <div className="flex items-center justify-between">
+          <div className="flex items-center justify-between border-border">
             <div>
               <p className="font-medium">Review failed</p>
               <p className="text-sm text-muted-foreground">
@@ -849,7 +844,7 @@ export function SettingsContent({
               }}
             />
           </div>
-          <div className="flex items-center justify-between">
+          <div className="flex items-center justify-between border-border">
             <div>
               <p className="font-medium">New repository added</p>
               <p className="text-sm text-muted-foreground">
@@ -867,7 +862,7 @@ export function SettingsContent({
               }}
             />
           </div>
-          <div className="flex items-center justify-between">
+          <div className="flex items-center justify-between border-border">
             <div>
               <p className="font-medium">Weekly summary</p>
               <p className="text-sm text-muted-foreground">
@@ -893,7 +888,7 @@ export function SettingsContent({
           <CardTitle>In-App Notifications</CardTitle>
         </CardHeader>
         <CardContent className="space-y-4">
-          <div className="flex items-center justify-between">
+          <div className="flex items-center justify-between border-border!">
             <div>
               <p className="font-medium">AI insights available</p>
               <p className="text-sm text-muted-foreground">
@@ -911,7 +906,7 @@ export function SettingsContent({
               }}
             />
           </div>
-          <div className="flex items-center justify-between">
+          <div className="flex items-center justify-between border-border!">
             <div>
               <p className="font-medium">Team mentions</p>
               <p className="text-sm text-muted-foreground">
@@ -973,7 +968,7 @@ export function SettingsContent({
             <div>
               <Label htmlFor="ai-max-tokens">Max Tokens</Label>
               <Select
-                value={aiSettingsData.maxTokens.toString()}
+                value={aiSettingsData?.maxTokens?.toString()}
                 onValueChange={(value) => {
                   setAiSettingsData({
                     ...aiSettingsData,
@@ -1134,6 +1129,7 @@ export function SettingsContent({
               value={appearanceData.theme}
               onValueChange={(value) => {
                 setAppearanceData({ ...appearanceData, theme: value });
+                setTheme(value);
                 setHasChanges(true);
               }}
             >
@@ -1370,21 +1366,20 @@ export function SettingsContent({
                         <DialogHeader>
                           <DialogTitle>Disconnect repository?</DialogTitle>
                           <DialogDescription>
-                            This will disconnect <strong>{repo.fullName}</strong> from
-                            CodeReverb. New pull requests in this repository will no
-                            longer be automatically reviewed, and webhooks/indexing
+                            This will disconnect{" "}
+                            <strong>{repo.fullName}</strong> from CodeReverb.
+                            New pull requests in this repository will no longer
+                            be automatically reviewed, and webhooks/indexing
                             related to this repository may be disabled. Existing
-                            historical reviews will remain in analytics but will not
-                            be updated.
+                            historical reviews will remain in analytics but will
+                            not be updated.
                           </DialogDescription>
                         </DialogHeader>
                         <DialogFooter>
                           <Button variant="outline">Cancel</Button>
                           <Button
                             variant="destructive"
-                            onClick={() =>
-                              disconnectRepository.mutate(repo.id)
-                            }
+                            onClick={() => disconnectRepository.mutate(repo.id)}
                             disabled={disconnectRepository.isPending}
                           >
                             {disconnectRepository.isPending ? (
@@ -1400,8 +1395,8 @@ export function SettingsContent({
               </div>
             ) : (
               <p className="text-sm text-muted-foreground">
-                No repositories are currently connected. Connect a repository from
-                the Repositories page.
+                No repositories are currently connected. Connect a repository
+                from the Repositories page.
               </p>
             )}
 
@@ -1423,10 +1418,10 @@ export function SettingsContent({
                   <DialogTitle>Disconnect all repositories?</DialogTitle>
                   <DialogDescription>
                     This will disconnect all repositories currently connected to
-                    CodeReverb for this account or organization. New pull requests
-                    will no longer be automatically reviewed until repositories are
-                    reconnected. Existing reviews and analytics will remain but will
-                    not be updated.
+                    CodeReverb for this account or organization. New pull
+                    requests will no longer be automatically reviewed until
+                    repositories are reconnected. Existing reviews and analytics
+                    will remain but will not be updated.
                   </DialogDescription>
                 </DialogHeader>
                 <DialogFooter>
diff --git a/components/settings/settings-sidebar.tsx b/components/settings/settings-sidebar.tsx
index 12742bb..21fad1a 100644
--- a/components/settings/settings-sidebar.tsx
+++ b/components/settings/settings-sidebar.tsx
@@ -15,6 +15,7 @@ import {
   Building,
   Search,
 } from "lucide-react";
+import { cn } from "@/lib/utils";
 
 const settingsSections = [
   {
@@ -83,14 +84,6 @@ const settingsSections = [
   },
 ];
 
-type SettingsTab =
-  | "profile"
-  | "notifications"
-  | "ai"
-  | "privacy"
-  | "appearance"
-  | "organization"
-  | "repositories";
 interface SettingsSidebarProps {
   activeSection: SettingsTab;
   setActiveSection: (section: SettingsTab) => void;
@@ -148,7 +141,12 @@ export function SettingsSidebar({
               <Button
                 key={section.id}
                 variant={activeSection === section.id ? "secondary" : "ghost"}
-                className="w-full justify-start h-auto p-3"
+                className={cn(
+                  "w-full justify-start h-auto p-3",
+                  activeSection === section.id
+                    ? "text-accent-foreground! bg-accent!"
+                    : ""
+                )}
                 onClick={() => setActiveSection(section.id as SettingsTab)}
               >
                 <section.icon className="h-4 w-4 mr-3 shrink-0" />
@@ -175,7 +173,12 @@ export function SettingsSidebar({
               <Button
                 key={section.id}
                 variant={activeSection === section.id ? "secondary" : "ghost"}
-                className="w-full justify-start h-auto p-3"
+                className={cn(
+                  "w-full justify-start h-auto p-3",
+                  activeSection === section.id
+                    ? "text-accent-foreground! bg-accent!"
+                    : ""
+                )}
                 onClick={() => setActiveSection(section.id as SettingsTab)}
               >
                 <section.icon className="h-4 w-4 mr-3 shrink-0" />
@@ -202,7 +205,12 @@ export function SettingsSidebar({
               <Button
                 key={section.id}
                 variant={activeSection === section.id ? "secondary" : "ghost"}
-                className="w-full justify-start h-auto p-3"
+                className={cn(
+                  "w-full justify-start h-auto p-3",
+                  activeSection === section.id
+                    ? "text-accent-foreground! bg-accent!"
+                    : ""
+                )}
                 onClick={() => setActiveSection(section.id as SettingsTab)}
               >
                 <section.icon className="h-4 w-4 mr-3 shrink-0" />
diff --git a/components/ui/input.tsx b/components/ui/input.tsx
index d476c18..154937b 100644
--- a/components/ui/input.tsx
+++ b/components/ui/input.tsx
@@ -1,6 +1,6 @@
-import * as React from "react"
+import * as React from "react";
 
-import { cn } from '@/lib/utils'
+import { cn } from "@/lib/utils";
 
 function Input({ className, type, ...props }: React.ComponentProps<"input">) {
   return (
@@ -10,12 +10,12 @@ function Input({ className, type, ...props }: React.ComponentProps<"input">) {
       className={cn(
         "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
         "focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]",
-        "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
+        "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive border-border!",
         className
       )}
       {...props}
     />
-  )
+  );
 }
 
-export { Input }
+export { Input };
diff --git a/components/ui/switch.tsx b/components/ui/switch.tsx
index 6a2b524..e5c911d 100644
--- a/components/ui/switch.tsx
+++ b/components/ui/switch.tsx
@@ -1,9 +1,9 @@
-"use client"
+"use client";
 
-import * as React from "react"
-import * as SwitchPrimitive from "@radix-ui/react-switch"
+import * as React from "react";
+import * as SwitchPrimitive from "@radix-ui/react-switch";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 function Switch({
   className,
@@ -13,7 +13,7 @@ function Switch({
     <SwitchPrimitive.Root
       data-slot="switch"
       className={cn(
-        "peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",
+        "peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50  border-border!",
         className
       )}
       {...props}
@@ -21,11 +21,11 @@ function Switch({
       <SwitchPrimitive.Thumb
         data-slot="switch-thumb"
         className={cn(
-          "bg-background dark:data-[state=unchecked]:bg-foreground dark:data-[state=checked]:bg-primary-foreground pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0"
+          "bg-background dark:data-[state=unchecked]:bg-foreground dark:data-[state=checked]:bg-primary-foreground pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0 border-border!"
         )}
       />
     </SwitchPrimitive.Root>
-  )
+  );
 }
 
-export { Switch }
+export { Switch };
diff --git a/components/ui/textarea.tsx b/components/ui/textarea.tsx
index 7f21b5e..9daeec7 100644
--- a/components/ui/textarea.tsx
+++ b/components/ui/textarea.tsx
@@ -1,18 +1,18 @@
-import * as React from "react"
+import * as React from "react";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {
   return (
     <textarea
       data-slot="textarea"
       className={cn(
-        "border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
+        "placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm border-border!",
         className
       )}
       {...props}
     />
-  )
+  );
 }
 
-export { Textarea }
+export { Textarea };
diff --git a/lib/api-client.ts b/lib/api-client.ts
index 2974196..2322f1a 100644
--- a/lib/api-client.ts
+++ b/lib/api-client.ts
@@ -64,7 +64,7 @@ export const api = {
         apiRequest(`/users`, { method: "GET" }),
     },
     settings: {
-      getProfile: (): Promise<any> =>
+      getProfile: (): Promise<UserProfile | null> =>
         apiRequest("/settings/profile", { method: "GET" }),
       getNotifications: (): Promise<any> =>
         apiRequest("/settings/notifications", { method: "GET" }),
diff --git a/nuqs/index.ts b/nuqs/index.ts
index ad22914..41febd6 100644
--- a/nuqs/index.ts
+++ b/nuqs/index.ts
@@ -18,6 +18,9 @@ export const searchParamsSchema = {
   settings_tab: parseAsStringEnum([
     "profile",
     "notifications",
+    "account",
+    "secutiry",
+    "repositories",
     "ai",
     "privacy",
     "appearance",
diff --git a/types.d.ts b/types.d.ts
index 257a0d6..ec9e20b 100644
--- a/types.d.ts
+++ b/types.d.ts
@@ -27,3 +27,27 @@ interface ContributionData {
     };
   };
 }
+
+interface UserProfile {
+  name: string;
+  email: string;
+  bio: string;
+  location: string;
+  website: string;
+  githubUrl: string;
+  username: string;
+  showEmail: boolean;
+  showLocation: boolean;
+  image?: string;
+}
+
+type SettingsTab =
+  | "profile"
+  | "notifications"
+  | "account"
+  | "security"
+  | "ai"
+  | "privacy"
+  | "appearance"
+  | "organization"
+  | "repositories";