diff --git a/app/src/components/ui/markdown.tsx b/app/src/components/ui/markdown.tsx
index 84473624..5a080e4b 100644
--- a/app/src/components/ui/markdown.tsx
+++ b/app/src/components/ui/markdown.tsx
@@ -10,7 +10,7 @@ interface MarkdownProps {
 
 /**
  * Reusable Markdown component for rendering markdown content
- * Styled for dark mode with proper typography
+ * Theme-aware styling that adapts to all predefined themes
  */
 export function Markdown({ children, className }: MarkdownProps) {
   return (
@@ -18,27 +18,27 @@ export function Markdown({ children, className }: MarkdownProps) {
       className={cn(
         "prose prose-sm prose-invert max-w-none",
         // Headings
-        "[&_h1]:text-xl [&_h1]:text-zinc-200 [&_h1]:font-semibold [&_h1]:mt-4 [&_h1]:mb-2",
-        "[&_h2]:text-lg [&_h2]:text-zinc-200 [&_h2]:font-semibold [&_h2]:mt-4 [&_h2]:mb-2",
-        "[&_h3]:text-base [&_h3]:text-zinc-200 [&_h3]:font-semibold [&_h3]:mt-3 [&_h3]:mb-2",
-        "[&_h4]:text-sm [&_h4]:text-zinc-200 [&_h4]:font-semibold [&_h4]:mt-2 [&_h4]:mb-1",
+        "[&_h1]:text-xl [&_h1]:text-foreground [&_h1]:font-semibold [&_h1]:mt-4 [&_h1]:mb-2",
+        "[&_h2]:text-lg [&_h2]:text-foreground [&_h2]:font-semibold [&_h2]:mt-4 [&_h2]:mb-2",
+        "[&_h3]:text-base [&_h3]:text-foreground [&_h3]:font-semibold [&_h3]:mt-3 [&_h3]:mb-2",
+        "[&_h4]:text-sm [&_h4]:text-foreground [&_h4]:font-semibold [&_h4]:mt-2 [&_h4]:mb-1",
         // Paragraphs
-        "[&_p]:text-zinc-300 [&_p]:leading-relaxed [&_p]:my-2",
+        "[&_p]:text-foreground-secondary [&_p]:leading-relaxed [&_p]:my-2",
         // Lists
         "[&_ul]:my-2 [&_ul]:pl-4 [&_ol]:my-2 [&_ol]:pl-4",
-        "[&_li]:text-zinc-300 [&_li]:my-0.5",
+        "[&_li]:text-foreground-secondary [&_li]:my-0.5",
         // Code
-        "[&_code]:text-cyan-400 [&_code]:bg-zinc-800/50 [&_code]:px-1.5 [&_code]:py-0.5 [&_code]:rounded [&_code]:text-sm",
-        "[&_pre]:bg-zinc-900/80 [&_pre]:border [&_pre]:border-white/10 [&_pre]:rounded-lg [&_pre]:my-2 [&_pre]:p-3 [&_pre]:overflow-x-auto",
+        "[&_code]:text-chart-2 [&_code]:bg-muted [&_code]:px-1.5 [&_code]:py-0.5 [&_code]:rounded [&_code]:text-sm",
+        "[&_pre]:bg-card [&_pre]:border [&_pre]:border-border [&_pre]:rounded-lg [&_pre]:my-2 [&_pre]:p-3 [&_pre]:overflow-x-auto",
         "[&_pre_code]:bg-transparent [&_pre_code]:p-0",
         // Strong/Bold
-        "[&_strong]:text-zinc-200 [&_strong]:font-semibold",
+        "[&_strong]:text-foreground [&_strong]:font-semibold",
         // Links
-        "[&_a]:text-blue-400 [&_a]:no-underline hover:[&_a]:underline",
+        "[&_a]:text-brand-500 [&_a]:no-underline hover:[&_a]:underline",
         // Blockquotes
-        "[&_blockquote]:border-l-2 [&_blockquote]:border-zinc-600 [&_blockquote]:pl-4 [&_blockquote]:text-zinc-400 [&_blockquote]:italic [&_blockquote]:my-2",
+        "[&_blockquote]:border-l-2 [&_blockquote]:border-border [&_blockquote]:pl-4 [&_blockquote]:text-muted-foreground [&_blockquote]:italic [&_blockquote]:my-2",
         // Horizontal rules
-        "[&_hr]:border-zinc-700 [&_hr]:my-4",
+        "[&_hr]:border-border [&_hr]:my-4",
         className
       )}
     >