diff --git a/app/api/chat/route.ts b/app/api/chat/route.ts
index 1866dcf..0de4e36 100644
--- a/app/api/chat/route.ts
+++ b/app/api/chat/route.ts
@@ -1,4 +1,4 @@
-import { streamText } from '@ai-sdk/react';
+import { streamText, UIMessage, convertToModelMessages } from 'ai';
 import { google } from '@ai-sdk/google';
 import { cookies } from 'next/headers';
 import { NodeSuggestionSchema } from '@/lib/ai-schemas';
@@ -15,14 +15,14 @@ export async function POST(req: Request) {
     return new Response('Unauthorized', { status: 401 });
   }
 
-  const { messages, data } = await req.json();
+  const { messages, data }: { messages: UIMessage[]; data?: { persona?: string } } = await req.json();
 
   // Get the 'persona' from the custom 'data' object
   const { persona } = z
     .object({
       persona: z.string().optional().default('Socratic'),
     })
-    .parse(data);
+    .parse(data || {});
 
   // Dynamically create the system prompt based on persona
   const systemPrompt = `You are a ${persona} thought partner.
@@ -33,10 +33,10 @@ idea is fully formed.
 For all other conversation, just respond as a helpful AI.`;
 
   // Use the Vercel AI SDK's streamText function with tools
-  const result = await streamText({
+  const result = streamText({
     model: google('gemini-1.5-flash'),
     system: systemPrompt,
-    messages: messages,
+    messages: convertToModelMessages(messages),
 
     // Provide the schema as a 'tool' to the model
     tools: {
@@ -47,6 +47,6 @@ For all other conversation, just respond as a helpful AI.`;
     },
   });
 
-  // Return the streaming response
-  return result.toAIStreamResponse();
+  // Return the streaming response (v5 API)
+  return result.toUIMessageStreamResponse();
 }
diff --git a/app/chat/page.tsx b/app/chat/page.tsx
index ae2d316..56f09cf 100644
--- a/app/chat/page.tsx
+++ b/app/chat/page.tsx
@@ -13,44 +13,18 @@ import {
   Text,
 } from '@mantine/core';
 import { useRouter } from 'next/navigation';
-import { useEffect, useRef } from 'react';
-import { NodeSuggestion } from '@/lib/ai-schemas';
+import { useEffect, useRef, useState } from 'react';
 import { MicrophoneRecorder } from '@/components/MicrophoneRecorder';
 
 export default function ChatPage() {
   const router = useRouter();
   const viewport = useRef<HTMLDivElement>(null);
+  const [input, setInput] = useState('');
 
-  const {
-    messages,
-    input,
-    handleInputChange,
-    handleSubmit,
-    setInput,
-    isLoading,
-  } = useChat({
+  const { messages, sendMessage, isLoading } = useChat({
     api: '/api/chat',
-    // Send the persona in the 'data' property
-    data: {
-      persona: 'Socratic', // This could be a <Select> value
-    },
-    // The 'experimental_onToolCall' handler is fired when
-    // the AI returns the structured JSON 'suggest_node' tool.
-    experimental_onToolCall: (toolCall, appendToolResult) => {
-      if (toolCall.toolName === 'suggest_node') {
-        const { title, body } = toolCall.args as NodeSuggestion;
-
-        // Redirect to the editor with the AI-generated draft
-        const query = new URLSearchParams({ title, body }).toString();
-        router.push(`/editor/new?${query}`);
-
-        // Return a message to display in the chat
-        return appendToolResult({
-          toolName: 'suggest_node',
-          args: { title, body },
-          result: `Drafting node: "${title}"`,
-        });
-      }
+    body: {
+      persona: 'Socratic',
     },
   });
 
@@ -62,6 +36,14 @@ export default function ChatPage() {
     });
   }, [messages]);
 
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    if (!input.trim() || isLoading) return;
+
+    sendMessage({ text: input });
+    setInput('');
+  };
+
   return (
     <Container size="md" h="100vh" style={{ display: 'flex', flexDirection: 'column' }}>
       <Title order={2} py="md">
@@ -74,11 +56,6 @@ export default function ChatPage() {
         viewportRef={viewport}
       >
         <Stack gap="md" pb="xl">
-          {messages.length === 0 && (
-            <Text c="dimmed" ta="center" mt="xl">
-              Start a conversation by typing or speaking...
-            </Text>
-          )}
           {messages.map((m) => (
             <Paper
               key={m.id}
@@ -94,7 +71,16 @@ export default function ChatPage() {
               w="80%"
             >
               <Text fw={700} size="sm">{m.role === 'user' ? 'You' : 'AI'}</Text>
-              <Text style={{ whiteSpace: 'pre-wrap' }}>{m.content}</Text>
+              {m.parts.map((part, i) => {
+                if (part.type === 'text') {
+                  return (
+                    <Text key={i} style={{ whiteSpace: 'pre-wrap' }}>
+                      {part.text}
+                    </Text>
+                  );
+                }
+                return null;
+              })}
             </Paper>
           ))}
         </Stack>
@@ -105,9 +91,15 @@ export default function ChatPage() {
           <Group>
             <TextInput
               value={input}
-              onChange={handleInputChange}
+              onChange={(e) => setInput(e.currentTarget.value)}
               placeholder="Speak or type your thoughts..."
               style={{ flex: 1 }}
+              styles={{
+                input: {
+                  paddingLeft: '1rem',
+                  paddingRight: '0.5rem',
+                },
+              }}
               variant="unstyled"
               disabled={isLoading}
             />
diff --git a/app/layout.tsx b/app/layout.tsx
index bf13adf..5fa0388 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -19,13 +19,13 @@ export default function RootLayout({
   children: React.ReactNode;
 }>) {
   return (
-    <html lang="en">
+    <html lang="en" suppressHydrationWarning>
       <head>
         {/* Enforce dark scheme as per our theme */}
-        <ColorSchemeScript forceColorScheme="dark" />
+        <ColorSchemeScript defaultColorScheme="dark" />
       </head>
-      <body className={inter.className}>
-        <MantineProvider theme={theme} forceColorScheme="dark">
+      <body className={inter.className} suppressHydrationWarning>
+        <MantineProvider theme={theme} defaultColorScheme="dark">
           <Notifications />
           {children}
         </MantineProvider>