diff --git a/src/app/demo/page.tsx b/src/app/demo/page.tsx
index c6342d0..344673a 100644
--- a/src/app/demo/page.tsx
+++ b/src/app/demo/page.tsx
@@ -9,6 +9,8 @@ import { DEMO_CODE } from '@/components/demo/demo-constants';
 import { DemoFeatureCards } from '@/components/demo/DemoFeatureCards';
 import { PageLayout } from '../PageLayout';
 
+export const dynamic = 'force-dynamic'
+
 // Dynamically import SplitScreenEditor to avoid SSR issues with Pyodide
 const SplitScreenEditor = dynamic(
   () => import('@/components/features/snippet-editor/SplitScreenEditor').then(mod => ({ default: mod.SplitScreenEditor })),
diff --git a/src/app/globals.css b/src/app/globals.css
index 4f59768..8d525bb 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -1,4 +1,5 @@
 @import '../styles/m3-base.css';
+@import '../styles/tailwind-m3-compat.css';
 
 /* Material Design 3 CSS Custom Properties */
 /* Light theme (default) */
diff --git a/src/app/page.tsx b/src/app/page.tsx
index c547712..f22a75e 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -10,6 +10,8 @@ const SnippetManagerRedux = dynamic(
   { ssr: false }
 );
 
+export const dynamic = 'force-dynamic'
+
 export default function HomePage() {
   return (
     <PageLayout>
diff --git a/src/app/settings/page.tsx b/src/app/settings/page.tsx
index 82ca29f..8557dc6 100644
--- a/src/app/settings/page.tsx
+++ b/src/app/settings/page.tsx
@@ -12,6 +12,8 @@ import { OpenAISettingsCard } from '@/components/settings/OpenAISettingsCard';
 import { useSettingsState } from '@/hooks/useSettingsState';
 import { PageLayout } from '../PageLayout';
 
+export const dynamic = 'force-dynamic'
+
 export default function SettingsPage() {
   const {
     stats,
diff --git a/src/components/demo/DemoFeatureCards.tsx b/src/components/demo/DemoFeatureCards.tsx
index 9b3652e..d69a751 100644
--- a/src/components/demo/DemoFeatureCards.tsx
+++ b/src/components/demo/DemoFeatureCards.tsx
@@ -1,6 +1,8 @@
+'use client'
+
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 
-export function DemoFeatureCards() {
+export const DemoFeatureCards = () => {
   return (
     <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
       <Card className="border-primary/20">
diff --git a/src/components/demo/PersistenceSettings.tsx b/src/components/demo/PersistenceSettings.tsx
index d9c6ea7..ad4d7c4 100644
--- a/src/components/demo/PersistenceSettings.tsx
+++ b/src/components/demo/PersistenceSettings.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 import { Label } from '@/components/ui/label'
 import { Switch } from '@/components/ui/switch'
diff --git a/src/components/features/namespace-manager/CreateNamespaceDialog.tsx b/src/components/features/namespace-manager/CreateNamespaceDialog.tsx
index 63750a7..6f27696 100644
--- a/src/components/features/namespace-manager/CreateNamespaceDialog.tsx
+++ b/src/components/features/namespace-manager/CreateNamespaceDialog.tsx
@@ -1,3 +1,5 @@
+"use client"
+
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import {
diff --git a/src/components/features/snippet-editor/SnippetDialog.tsx b/src/components/features/snippet-editor/SnippetDialog.tsx
index 6459133..1d92e2a 100644
--- a/src/components/features/snippet-editor/SnippetDialog.tsx
+++ b/src/components/features/snippet-editor/SnippetDialog.tsx
@@ -1,3 +1,5 @@
+"use client"
+
 import {
   Dialog,
   DialogContent,
diff --git a/src/components/features/snippet-viewer/SnippetViewer.tsx b/src/components/features/snippet-viewer/SnippetViewer.tsx
index e8d599b..a097b5d 100644
--- a/src/components/features/snippet-viewer/SnippetViewer.tsx
+++ b/src/components/features/snippet-viewer/SnippetViewer.tsx
@@ -1,3 +1,5 @@
+"use client"
+
 import {
   Dialog,
   DialogContent,
diff --git a/src/components/features/snippet-viewer/SnippetViewerHeader.tsx b/src/components/features/snippet-viewer/SnippetViewerHeader.tsx
index f1f7221..6327cbb 100644
--- a/src/components/features/snippet-viewer/SnippetViewerHeader.tsx
+++ b/src/components/features/snippet-viewer/SnippetViewerHeader.tsx
@@ -1,3 +1,5 @@
+"use client"
+
 import { Button } from '@/components/ui/button'
 import { Badge } from '@/components/ui/badge'
 import { DialogTitle } from '@/components/ui/dialog'
diff --git a/src/components/layout/navigation/Navigation.tsx b/src/components/layout/navigation/Navigation.tsx
index 9d14f26..7ebe301 100644
--- a/src/components/layout/navigation/Navigation.tsx
+++ b/src/components/layout/navigation/Navigation.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import { List } from '@phosphor-icons/react'
 import { useNavigation } from './useNavigation'
 
diff --git a/src/components/settings/BackendAutoConfigCard.tsx b/src/components/settings/BackendAutoConfigCard.tsx
index 979a8cf..12910e4 100644
--- a/src/components/settings/BackendAutoConfigCard.tsx
+++ b/src/components/settings/BackendAutoConfigCard.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import { Card, CardHeader, CardTitle, CardDescription, CardContent } from '@/components/ui/card'
 import { Button } from '@/components/ui/button'
 import { CloudCheck, CloudSlash } from '@phosphor-icons/react'
diff --git a/src/components/settings/DatabaseActionsCard.tsx b/src/components/settings/DatabaseActionsCard.tsx
index a2b4fce..e4765c2 100644
--- a/src/components/settings/DatabaseActionsCard.tsx
+++ b/src/components/settings/DatabaseActionsCard.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import { Card, CardHeader, CardTitle, CardDescription, CardContent } from '@/components/ui/card'
 import { Button } from '@/components/ui/button'
 import { Database, Download, Upload, Trash } from '@phosphor-icons/react'
diff --git a/src/components/settings/DatabaseStatsCard.tsx b/src/components/settings/DatabaseStatsCard.tsx
index b9b5b2b..3e83e67 100644
--- a/src/components/settings/DatabaseStatsCard.tsx
+++ b/src/components/settings/DatabaseStatsCard.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import { Card, CardHeader, CardTitle, CardDescription, CardContent } from '@/components/ui/card'
 import { Database } from '@phosphor-icons/react'
 
diff --git a/src/components/settings/SchemaHealthCard.tsx b/src/components/settings/SchemaHealthCard.tsx
index bdb0cff..3f3572e 100644
--- a/src/components/settings/SchemaHealthCard.tsx
+++ b/src/components/settings/SchemaHealthCard.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import { Card, CardHeader, CardTitle, CardDescription, CardContent } from '@/components/ui/card'
 import { Button } from '@/components/ui/button'
 import { Alert, AlertDescription } from '@/components/ui/alert'
diff --git a/src/components/settings/StorageBackendCard.tsx b/src/components/settings/StorageBackendCard.tsx
index 7058523..f3d1682 100644
--- a/src/components/settings/StorageBackendCard.tsx
+++ b/src/components/settings/StorageBackendCard.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import { Card, CardHeader, CardTitle, CardDescription, CardContent } from '@/components/ui/card'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
diff --git a/src/components/settings/StorageInfoCard.tsx b/src/components/settings/StorageInfoCard.tsx
index 41d7c76..8b7f3ae 100644
--- a/src/components/settings/StorageInfoCard.tsx
+++ b/src/components/settings/StorageInfoCard.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import { Card, CardHeader, CardTitle, CardDescription, CardContent } from '@/components/ui/card'
 import { Alert, AlertDescription } from '@/components/ui/alert'
 
diff --git a/src/components/ui/breadcrumb.tsx b/src/components/ui/breadcrumb.tsx
deleted file mode 100644
index fb8b2ec..0000000
--- a/src/components/ui/breadcrumb.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { ComponentProps } from "react"
-import { Slot } from "@radix-ui/react-slot"
-import ChevronRight from "lucide-react/dist/esm/icons/chevron-right"
-import MoreHorizontal from "lucide-react/dist/esm/icons/more-horizontal"
-
-import { cn } from "@/lib/utils"
-
-function Breadcrumb({ ...props }: ComponentProps<"nav">) {
-  return <nav aria-label="breadcrumb" data-slot="breadcrumb" {...props} />
-}
-
-function BreadcrumbList({ className, ...props }: ComponentProps<"ol">) {
-  return (
-    <ol
-      data-slot="breadcrumb-list"
-      className={cn(
-        "text-muted-foreground flex flex-wrap items-center gap-1.5 text-sm break-words sm:gap-2.5",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function BreadcrumbItem({ className, ...props }: ComponentProps<"li">) {
-  return (
-    <li
-      data-slot="breadcrumb-item"
-      className={cn("inline-flex items-center gap-1.5", className)}
-      {...props}
-    />
-  )
-}
-
-function BreadcrumbLink({
-  asChild,
-  className,
-  ...props
-}: ComponentProps<"a"> & {
-  asChild?: boolean
-}) {
-  const Comp = asChild ? Slot : "a"
-
-  return (
-    <Comp
-      data-slot="breadcrumb-link"
-      className={cn("hover:text-foreground transition-colors", className)}
-      {...props}
-    />
-  )
-}
-
-function BreadcrumbPage({ className, ...props }: ComponentProps<"span">) {
-  return (
-    <span
-      data-slot="breadcrumb-page"
-      role="link"
-      aria-disabled="true"
-      aria-current="page"
-      className={cn("text-foreground font-normal", className)}
-      {...props}
-    />
-  )
-}
-
-function BreadcrumbSeparator({
-  children,
-  className,
-  ...props
-}: ComponentProps<"li">) {
-  return (
-    <li
-      data-slot="breadcrumb-separator"
-      role="presentation"
-      aria-hidden="true"
-      className={cn("[&>svg]:size-3.5", className)}
-      {...props}
-    >
-      {children ?? <ChevronRight />}
-    </li>
-  )
-}
-
-function BreadcrumbEllipsis({
-  className,
-  ...props
-}: ComponentProps<"span">) {
-  return (
-    <span
-      data-slot="breadcrumb-ellipsis"
-      role="presentation"
-      aria-hidden="true"
-      className={cn("flex size-9 items-center justify-center", className)}
-      {...props}
-    >
-      <MoreHorizontal className="size-4" />
-      <span className="sr-only">More</span>
-    </span>
-  )
-}
-
-export {
-  Breadcrumb,
-  BreadcrumbList,
-  BreadcrumbItem,
-  BreadcrumbLink,
-  BreadcrumbPage,
-  BreadcrumbSeparator,
-  BreadcrumbEllipsis,
-}
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index bc1ffb5..fe9e375 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -24,38 +24,10 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
       link: "mat-mdc-button",
     }[variant]
 
-    const sizeClass = {
-      default: "h-10 px-4",
-      sm: "h-9 px-3 text-sm",
-      lg: "h-11 px-8",
-      icon: "h-10 w-10",
-    }[size]
-
-    const variantStyles = {
-      filled: "bg-blue-600 hover:bg-blue-700 text-white",
-      outlined: "border border-gray-300 dark:border-gray-600 hover:bg-gray-100 dark:hover:bg-gray-800",
-      outline: "border border-gray-300 dark:border-gray-600 hover:bg-gray-100 dark:hover:bg-gray-800",
-      text: "hover:bg-gray-100 dark:hover:bg-gray-900",
-      elevated: "bg-gray-200 dark:bg-gray-700 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-900 dark:text-white shadow-md",
-      tonal: "bg-gray-300 dark:bg-gray-600 hover:bg-gray-400 dark:hover:bg-gray-500 text-gray-900 dark:text-white",
-      secondary: "bg-gray-200 dark:bg-gray-700 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-900 dark:text-white",
-      destructive: "bg-red-600 hover:bg-red-700 text-white",
-      ghost: "hover:bg-gray-100 dark:hover:bg-gray-900 text-gray-900 dark:text-white",
-      link: "text-blue-600 dark:text-blue-400 hover:underline",
-    }[variant]
-
     return (
       <Comp
         ref={asChild ? undefined : ref}
-        className={cn(
-          "inline-flex items-center justify-center rounded-md font-medium",
-          "transition-colors duration-200",
-          "disabled:opacity-50 disabled:cursor-not-allowed",
-          "focus-visible:ring-2 focus-visible:ring-offset-2",
-          sizeClass,
-          variantStyles,
-          className
-        )}
+        className={cn(variantClass, className)}
         {...props}
       >
         {children}
diff --git a/src/components/ui/context-menu.tsx b/src/components/ui/context-menu.tsx
deleted file mode 100644
index bb17d6e..0000000
--- a/src/components/ui/context-menu.tsx
+++ /dev/null
@@ -1,254 +0,0 @@
-"use client"
-
-import { ComponentProps } from "react"
-import * as ContextMenuPrimitive from "@radix-ui/react-context-menu"
-import CheckIcon from "lucide-react/dist/esm/icons/check";
-import ChevronRightIcon from "lucide-react/dist/esm/icons/chevron-right"
-import CircleIcon from "lucide-react/dist/esm/icons/circle"
-
-import { cn } from "@/lib/utils"
-
-function ContextMenu({
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.Root>) {
-  return <ContextMenuPrimitive.Root data-slot="context-menu" {...props} />
-}
-
-function ContextMenuTrigger({
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.Trigger>) {
-  return (
-    <ContextMenuPrimitive.Trigger data-slot="context-menu-trigger" {...props} />
-  )
-}
-
-function ContextMenuGroup({
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.Group>) {
-  return (
-    <ContextMenuPrimitive.Group data-slot="context-menu-group" {...props} />
-  )
-}
-
-function ContextMenuPortal({
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.Portal>) {
-  return (
-    <ContextMenuPrimitive.Portal data-slot="context-menu-portal" {...props} />
-  )
-}
-
-function ContextMenuSub({
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.Sub>) {
-  return <ContextMenuPrimitive.Sub data-slot="context-menu-sub" {...props} />
-}
-
-function ContextMenuRadioGroup({
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.RadioGroup>) {
-  return (
-    <ContextMenuPrimitive.RadioGroup
-      data-slot="context-menu-radio-group"
-      {...props}
-    />
-  )
-}
-
-function ContextMenuSubTrigger({
-  className,
-  inset,
-  children,
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.SubTrigger> & {
-  inset?: boolean
-}) {
-  return (
-    <ContextMenuPrimitive.SubTrigger
-      data-slot="context-menu-sub-trigger"
-      data-inset={inset}
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className
-      )}
-      {...props}
-    >
-      {children}
-      <ChevronRightIcon className="ml-auto" />
-    </ContextMenuPrimitive.SubTrigger>
-  )
-}
-
-function ContextMenuSubContent({
-  className,
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.SubContent>) {
-  return (
-    <ContextMenuPrimitive.SubContent
-      data-slot="context-menu-sub-content"
-      className={cn(
-        "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-context-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function ContextMenuContent({
-  className,
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.Content>) {
-  return (
-    <ContextMenuPrimitive.Portal>
-      <ContextMenuPrimitive.Content
-        data-slot="context-menu-content"
-        className={cn(
-          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-context-menu-content-available-height) min-w-[8rem] origin-(--radix-context-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md",
-          className
-        )}
-        {...props}
-      />
-    </ContextMenuPrimitive.Portal>
-  )
-}
-
-function ContextMenuItem({
-  className,
-  inset,
-  variant = "default",
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.Item> & {
-  inset?: boolean
-  variant?: "default" | "destructive"
-}) {
-  return (
-    <ContextMenuPrimitive.Item
-      data-slot="context-menu-item"
-      data-inset={inset}
-      data-variant={variant}
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function ContextMenuCheckboxItem({
-  className,
-  children,
-  checked,
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.CheckboxItem>) {
-  return (
-    <ContextMenuPrimitive.CheckboxItem
-      data-slot="context-menu-checkbox-item"
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className
-      )}
-      checked={checked}
-      {...props}
-    >
-      <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
-        <ContextMenuPrimitive.ItemIndicator>
-          <CheckIcon className="size-4" />
-        </ContextMenuPrimitive.ItemIndicator>
-      </span>
-      {children}
-    </ContextMenuPrimitive.CheckboxItem>
-  )
-}
-
-function ContextMenuRadioItem({
-  className,
-  children,
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.RadioItem>) {
-  return (
-    <ContextMenuPrimitive.RadioItem
-      data-slot="context-menu-radio-item"
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className
-      )}
-      {...props}
-    >
-      <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
-        <ContextMenuPrimitive.ItemIndicator>
-          <CircleIcon className="size-2 fill-current" />
-        </ContextMenuPrimitive.ItemIndicator>
-      </span>
-      {children}
-    </ContextMenuPrimitive.RadioItem>
-  )
-}
-
-function ContextMenuLabel({
-  className,
-  inset,
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.Label> & {
-  inset?: boolean
-}) {
-  return (
-    <ContextMenuPrimitive.Label
-      data-slot="context-menu-label"
-      data-inset={inset}
-      className={cn(
-        "text-foreground px-2 py-1.5 text-sm font-medium data-[inset]:pl-8",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function ContextMenuSeparator({
-  className,
-  ...props
-}: ComponentProps<typeof ContextMenuPrimitive.Separator>) {
-  return (
-    <ContextMenuPrimitive.Separator
-      data-slot="context-menu-separator"
-      className={cn("bg-border -mx-1 my-1 h-px", className)}
-      {...props}
-    />
-  )
-}
-
-function ContextMenuShortcut({
-  className,
-  ...props
-}: ComponentProps<"span">) {
-  return (
-    <span
-      data-slot="context-menu-shortcut"
-      className={cn(
-        "text-muted-foreground ml-auto text-xs tracking-widest",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-export {
-  ContextMenu,
-  ContextMenuTrigger,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuCheckboxItem,
-  ContextMenuRadioItem,
-  ContextMenuLabel,
-  ContextMenuSeparator,
-  ContextMenuShortcut,
-  ContextMenuGroup,
-  ContextMenuPortal,
-  ContextMenuSub,
-  ContextMenuSubContent,
-  ContextMenuSubTrigger,
-  ContextMenuRadioGroup,
-}
diff --git a/src/components/ui/hover-card.tsx b/src/components/ui/hover-card.tsx
deleted file mode 100644
index adc6737..0000000
--- a/src/components/ui/hover-card.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-"use client"
-
-import { ComponentProps } from "react"
-import * as HoverCardPrimitive from "@radix-ui/react-hover-card"
-import { cn } from "@/lib/utils"
-
-function HoverCard({
-  ...props
-}: ComponentProps<typeof HoverCardPrimitive.Root>) {
-  return <HoverCardPrimitive.Root data-slot="hover-card" {...props} />
-}
-
-function HoverCardTrigger({
-  ...props
-}: ComponentProps<typeof HoverCardPrimitive.Trigger>) {
-  return (
-    <HoverCardPrimitive.Trigger data-slot="hover-card-trigger" {...props} />
-  )
-}
-
-function HoverCardContent({
-  className,
-  align = "center",
-  sideOffset = 4,
-  ...props
-}: ComponentProps<typeof HoverCardPrimitive.Content>) {
-  return (
-    <HoverCardPrimitive.Content
-      data-slot="hover-card-content"
-      align={align}
-      sideOffset={sideOffset}
-      className={cn(
-        "z-50 w-64 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-export { HoverCard, HoverCardTrigger, HoverCardContent }
diff --git a/src/components/ui/menubar.tsx b/src/components/ui/menubar.tsx
deleted file mode 100644
index 951c0fc..0000000
--- a/src/components/ui/menubar.tsx
+++ /dev/null
@@ -1,276 +0,0 @@
-import { ComponentProps } from "react"
-import * as MenubarPrimitive from "@radix-ui/react-menubar"
-import CheckIcon from "lucide-react/dist/esm/icons/check"
-import ChevronRightIcon from "lucide-react/dist/esm/icons/chevron-right"
-import CircleIcon from "lucide-react/dist/esm/icons/circle"
-
-import { cn } from "@/lib/utils"
-
-function Menubar({
-  className,
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.Root>) {
-  return (
-    <MenubarPrimitive.Root
-      data-slot="menubar"
-      className={cn(
-        "bg-background flex h-9 items-center gap-1 rounded-md border p-1 shadow-xs",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function MenubarMenu({
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.Menu>) {
-  return <MenubarPrimitive.Menu data-slot="menubar-menu" {...props} />
-}
-
-function MenubarGroup({
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.Group>) {
-  return <MenubarPrimitive.Group data-slot="menubar-group" {...props} />
-}
-
-function MenubarPortal({
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.Portal>) {
-  return <MenubarPrimitive.Portal data-slot="menubar-portal" {...props} />
-}
-
-function MenubarRadioGroup({
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.RadioGroup>) {
-  return (
-    <MenubarPrimitive.RadioGroup data-slot="menubar-radio-group" {...props} />
-  )
-}
-
-function MenubarTrigger({
-  className,
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.Trigger>) {
-  return (
-    <MenubarPrimitive.Trigger
-      data-slot="menubar-trigger"
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex items-center rounded-sm px-2 py-1 text-sm font-medium outline-hidden select-none",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function MenubarContent({
-  className,
-  align = "start",
-  alignOffset = -4,
-  sideOffset = 8,
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.Content>) {
-  return (
-    <MenubarPortal>
-      <MenubarPrimitive.Content
-        data-slot="menubar-content"
-        align={align}
-        alignOffset={alignOffset}
-        sideOffset={sideOffset}
-        className={cn(
-          "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[12rem] origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-md",
-          className
-        )}
-        {...props}
-      />
-    </MenubarPortal>
-  )
-}
-
-function MenubarItem({
-  className,
-  inset,
-  variant = "default",
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.Item> & {
-  inset?: boolean
-  variant?: "default" | "destructive"
-}) {
-  return (
-    <MenubarPrimitive.Item
-      data-slot="menubar-item"
-      data-inset={inset}
-      data-variant={variant}
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function MenubarCheckboxItem({
-  className,
-  children,
-  checked,
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.CheckboxItem>) {
-  return (
-    <MenubarPrimitive.CheckboxItem
-      data-slot="menubar-checkbox-item"
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-xs py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className
-      )}
-      checked={checked}
-      {...props}
-    >
-      <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
-        <MenubarPrimitive.ItemIndicator>
-          <CheckIcon className="size-4" />
-        </MenubarPrimitive.ItemIndicator>
-      </span>
-      {children}
-    </MenubarPrimitive.CheckboxItem>
-  )
-}
-
-function MenubarRadioItem({
-  className,
-  children,
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.RadioItem>) {
-  return (
-    <MenubarPrimitive.RadioItem
-      data-slot="menubar-radio-item"
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-xs py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
-        className
-      )}
-      {...props}
-    >
-      <span className="pointer-events-none absolute left-2 flex size-3.5 items-center justify-center">
-        <MenubarPrimitive.ItemIndicator>
-          <CircleIcon className="size-2 fill-current" />
-        </MenubarPrimitive.ItemIndicator>
-      </span>
-      {children}
-    </MenubarPrimitive.RadioItem>
-  )
-}
-
-function MenubarLabel({
-  className,
-  inset,
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.Label> & {
-  inset?: boolean
-}) {
-  return (
-    <MenubarPrimitive.Label
-      data-slot="menubar-label"
-      data-inset={inset}
-      className={cn(
-        "px-2 py-1.5 text-sm font-medium data-[inset]:pl-8",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function MenubarSeparator({
-  className,
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.Separator>) {
-  return (
-    <MenubarPrimitive.Separator
-      data-slot="menubar-separator"
-      className={cn("bg-border -mx-1 my-1 h-px", className)}
-      {...props}
-    />
-  )
-}
-
-function MenubarShortcut({
-  className,
-  ...props
-}: ComponentProps<"span">) {
-  return (
-    <span
-      data-slot="menubar-shortcut"
-      className={cn(
-        "text-muted-foreground ml-auto text-xs tracking-widest",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function MenubarSub({
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.Sub>) {
-  return <MenubarPrimitive.Sub data-slot="menubar-sub" {...props} />
-}
-
-function MenubarSubTrigger({
-  className,
-  inset,
-  children,
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.SubTrigger> & {
-  inset?: boolean
-}) {
-  return (
-    <MenubarPrimitive.SubTrigger
-      data-slot="menubar-sub-trigger"
-      data-inset={inset}
-      className={cn(
-        "focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-none select-none data-[inset]:pl-8",
-        className
-      )}
-      {...props}
-    >
-      {children}
-      <ChevronRightIcon className="ml-auto h-4 w-4" />
-    </MenubarPrimitive.SubTrigger>
-  )
-}
-
-function MenubarSubContent({
-  className,
-  ...props
-}: ComponentProps<typeof MenubarPrimitive.SubContent>) {
-  return (
-    <MenubarPrimitive.SubContent
-      data-slot="menubar-sub-content"
-      className={cn(
-        "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-export {
-  Menubar,
-  MenubarPortal,
-  MenubarMenu,
-  MenubarTrigger,
-  MenubarContent,
-  MenubarGroup,
-  MenubarSeparator,
-  MenubarLabel,
-  MenubarItem,
-  MenubarShortcut,
-  MenubarCheckboxItem,
-  MenubarRadioGroup,
-  MenubarRadioItem,
-  MenubarSub,
-  MenubarSubTrigger,
-  MenubarSubContent,
-}
diff --git a/src/components/ui/navigation-menu.tsx b/src/components/ui/navigation-menu.tsx
deleted file mode 100644
index 559f29e..0000000
--- a/src/components/ui/navigation-menu.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import { ComponentProps } from "react"
-import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu"
-import { cva } from "class-variance-authority"
-import ChevronDownIcon from "lucide-react/dist/esm/icons/chevron-down"
-
-import { cn } from "@/lib/utils"
-
-function NavigationMenu({
-  className,
-  children,
-  viewport = true,
-  ...props
-}: ComponentProps<typeof NavigationMenuPrimitive.Root> & {
-  viewport?: boolean
-}) {
-  return (
-    <NavigationMenuPrimitive.Root
-      data-slot="navigation-menu"
-      data-viewport={viewport}
-      className={cn(
-        "group/navigation-menu relative flex max-w-max flex-1 items-center justify-center",
-        className
-      )}
-      {...props}
-    >
-      {children}
-      {viewport && <NavigationMenuViewport />}
-    </NavigationMenuPrimitive.Root>
-  )
-}
-
-function NavigationMenuList({
-  className,
-  ...props
-}: ComponentProps<typeof NavigationMenuPrimitive.List>) {
-  return (
-    <NavigationMenuPrimitive.List
-      data-slot="navigation-menu-list"
-      className={cn(
-        "group flex flex-1 list-none items-center justify-center gap-1",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function NavigationMenuItem({
-  className,
-  ...props
-}: ComponentProps<typeof NavigationMenuPrimitive.Item>) {
-  return (
-    <NavigationMenuPrimitive.Item
-      data-slot="navigation-menu-item"
-      className={cn("relative", className)}
-      {...props}
-    />
-  )
-}
-
-const navigationMenuTriggerStyle = cva(
-  "group inline-flex h-9 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=open]:hover:bg-accent data-[state=open]:text-accent-foreground data-[state=open]:focus:bg-accent data-[state=open]:bg-accent/50 focus-visible:ring-ring/50 outline-none transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1"
-)
-
-function NavigationMenuTrigger({
-  className,
-  children,
-  ...props
-}: ComponentProps<typeof NavigationMenuPrimitive.Trigger>) {
-  return (
-    <NavigationMenuPrimitive.Trigger
-      data-slot="navigation-menu-trigger"
-      className={cn(navigationMenuTriggerStyle(), "group", className)}
-      {...props}
-    >
-      {children}{" "}
-      <ChevronDownIcon
-        className="relative top-[1px] ml-1 size-3 transition duration-300 group-data-[state=open]:rotate-180"
-        aria-hidden="true"
-      />
-    </NavigationMenuPrimitive.Trigger>
-  )
-}
-
-function NavigationMenuContent({
-  className,
-  ...props
-}: ComponentProps<typeof NavigationMenuPrimitive.Content>) {
-  return (
-    <NavigationMenuPrimitive.Content
-      data-slot="navigation-menu-content"
-      className={cn(
-        "data-[motion^=from-]:animate-in data-[motion^=to-]:animate-out data-[motion^=from-]:fade-in data-[motion^=to-]:fade-out data-[motion=from-end]:slide-in-from-right-52 data-[motion=from-start]:slide-in-from-left-52 data-[motion=to-end]:slide-out-to-right-52 data-[motion=to-start]:slide-out-to-left-52 top-0 left-0 w-full p-2 pr-2.5 md:absolute md:w-auto",
-        "group-data-[viewport=false]/navigation-menu:bg-popover group-data-[viewport=false]/navigation-menu:text-popover-foreground group-data-[viewport=false]/navigation-menu:data-[state=open]:animate-in group-data-[viewport=false]/navigation-menu:data-[state=closed]:animate-out group-data-[viewport=false]/navigation-menu:data-[state=closed]:zoom-out-95 group-data-[viewport=false]/navigation-menu:data-[state=open]:zoom-in-95 group-data-[viewport=false]/navigation-menu:data-[state=open]:fade-in-0 group-data-[viewport=false]/navigation-menu:data-[state=closed]:fade-out-0 group-data-[viewport=false]/navigation-menu:top-full group-data-[viewport=false]/navigation-menu:mt-1.5 group-data-[viewport=false]/navigation-menu:overflow-hidden group-data-[viewport=false]/navigation-menu:rounded-md group-data-[viewport=false]/navigation-menu:border group-data-[viewport=false]/navigation-menu:shadow group-data-[viewport=false]/navigation-menu:duration-200 **:data-[slot=navigation-menu-link]:focus:ring-0 **:data-[slot=navigation-menu-link]:focus:outline-none",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function NavigationMenuViewport({
-  className,
-  ...props
-}: ComponentProps<typeof NavigationMenuPrimitive.Viewport>) {
-  return (
-    <div
-      className={cn(
-        "absolute top-full left-0 isolate z-50 flex justify-center"
-      )}
-    >
-      <NavigationMenuPrimitive.Viewport
-        data-slot="navigation-menu-viewport"
-        className={cn(
-          "origin-top-center bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-90 relative mt-1.5 h-[var(--radix-navigation-menu-viewport-height)] w-full overflow-hidden rounded-md border shadow md:w-[var(--radix-navigation-menu-viewport-width)]",
-          className
-        )}
-        {...props}
-      />
-    </div>
-  )
-}
-
-function NavigationMenuLink({
-  className,
-  ...props
-}: ComponentProps<typeof NavigationMenuPrimitive.Link>) {
-  return (
-    <NavigationMenuPrimitive.Link
-      data-slot="navigation-menu-link"
-      className={cn(
-        "data-[active=true]:focus:bg-accent data-[active=true]:hover:bg-accent data-[active=true]:bg-accent/50 data-[active=true]:text-accent-foreground hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus-visible:ring-ring/50 [&_svg:not([class*='text-'])]:text-muted-foreground flex flex-col gap-1 rounded-sm p-2 text-sm transition-all outline-none focus-visible:ring-[3px] focus-visible:outline-1 [&_svg:not([class*='size-'])]:size-4",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function NavigationMenuIndicator({
-  className,
-  ...props
-}: ComponentProps<typeof NavigationMenuPrimitive.Indicator>) {
-  return (
-    <NavigationMenuPrimitive.Indicator
-      data-slot="navigation-menu-indicator"
-      className={cn(
-        "data-[state=visible]:animate-in data-[state=hidden]:animate-out data-[state=hidden]:fade-out data-[state=visible]:fade-in top-full z-[1] flex h-1.5 items-end justify-center overflow-hidden",
-        className
-      )}
-      {...props}
-    >
-      <div className="bg-border relative top-[60%] h-2 w-2 rotate-45 rounded-tl-sm shadow-md" />
-    </NavigationMenuPrimitive.Indicator>
-  )
-}
-
-export {
-  NavigationMenu,
-  NavigationMenuList,
-  NavigationMenuItem,
-  NavigationMenuContent,
-  NavigationMenuTrigger,
-  NavigationMenuLink,
-  NavigationMenuIndicator,
-  NavigationMenuViewport,
-  navigationMenuTriggerStyle,
-}
diff --git a/src/components/ui/scroll-area.tsx b/src/components/ui/scroll-area.tsx
deleted file mode 100644
index afdf5f9..0000000
--- a/src/components/ui/scroll-area.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-"use client"
-
-import { ComponentProps } from "react"
-import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"
-
-import { cn } from "@/lib/utils"
-
-function ScrollArea({
-  className,
-  children,
-  ...props
-}: ComponentProps<typeof ScrollAreaPrimitive.Root>) {
-  return (
-    <ScrollAreaPrimitive.Root
-      data-slot="scroll-area"
-      className={cn("relative", className)}
-      {...props}
-    >
-      <ScrollAreaPrimitive.Viewport
-        data-slot="scroll-area-viewport"
-        className="focus-visible:ring-ring/50 size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:outline-1"
-      >
-        {children}
-      </ScrollAreaPrimitive.Viewport>
-      <ScrollBar />
-      <ScrollAreaPrimitive.Corner />
-    </ScrollAreaPrimitive.Root>
-  )
-}
-
-function ScrollBar({
-  className,
-  orientation = "vertical",
-  ...props
-}: ComponentProps<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>) {
-  return (
-    <ScrollAreaPrimitive.ScrollAreaScrollbar
-      data-slot="scroll-area-scrollbar"
-      orientation={orientation}
-      className={cn(
-        "flex touch-none p-px transition-colors select-none",
-        orientation === "vertical" &&
-          "h-full w-2.5 border-l border-l-transparent",
-        orientation === "horizontal" &&
-          "h-2.5 flex-col border-t border-t-transparent",
-        className
-      )}
-      {...props}
-    >
-      <ScrollAreaPrimitive.ScrollAreaThumb
-        data-slot="scroll-area-thumb"
-        className="bg-border relative flex-1 rounded-full"
-      />
-    </ScrollAreaPrimitive.ScrollAreaScrollbar>
-  )
-}
-
-export { ScrollArea, ScrollBar }
diff --git a/src/styles/m3-base.css b/src/styles/m3-base.css
index d21cc87..6ce03bc 100644
--- a/src/styles/m3-base.css
+++ b/src/styles/m3-base.css
@@ -127,3 +127,162 @@
   outline: 2px solid var(--mat-sys-primary);
   outline-offset: 2px;
 }
+
+/* Utility Classes for Layout */
+/* Spacing - Gap */
+.gap-2 { gap: 0.5rem; }
+.gap-3 { gap: 0.75rem; }
+.gap-4 { gap: 1rem; }
+.gap-6 { gap: 1.5rem; }
+
+/* Spacing - Margin */
+.mb-2 { margin-bottom: 0.5rem; }
+.mb-4 { margin-bottom: 1rem; }
+.mb-6 { margin-bottom: 1.5rem; }
+.mb-8 { margin-bottom: 2rem; }
+.mt-2 { margin-top: 0.5rem; }
+.mt-4 { margin-top: 1rem; }
+.mt-6 { margin-top: 1.5rem; }
+.mt-8 { margin-top: 2rem; }
+.ml-2 { margin-left: 0.5rem; }
+.ml-4 { margin-left: 1rem; }
+.mr-2 { margin-right: 0.5rem; }
+.mr-4 { margin-right: 1rem; }
+.mx-auto { margin-left: auto; margin-right: auto; }
+
+/* Spacing - Padding */
+.p-2 { padding: 0.5rem; }
+.p-4 { padding: 1rem; }
+.px-2 { padding-left: 0.5rem; padding-right: 0.5rem; }
+.px-3 { padding-left: 0.75rem; padding-right: 0.75rem; }
+.px-4 { padding-left: 1rem; padding-right: 1rem; }
+.py-2 { padding-top: 0.5rem; padding-bottom: 0.5rem; }
+.py-3 { padding-top: 0.75rem; padding-bottom: 0.75rem; }
+.py-4 { padding-top: 1rem; padding-bottom: 1rem; }
+
+/* Spacing - Space Between */
+.space-y-2 > * + * { margin-top: 0.5rem; }
+.space-y-3 > * + * { margin-top: 0.75rem; }
+.space-y-4 > * + * { margin-top: 1rem; }
+.space-y-6 > * + * { margin-top: 1.5rem; }
+.space-y-8 > * + * { margin-top: 2rem; }
+.space-x-2 > * + * { margin-left: 0.5rem; }
+.space-x-4 > * + * { margin-left: 1rem; }
+
+/* Display */
+.flex { display: flex; }
+.grid { display: grid; }
+.inline-flex { display: inline-flex; }
+
+/* Flex Direction */
+.flex-col { flex-direction: column; }
+.flex-row { flex-direction: row; }
+
+/* Justify Content */
+.justify-center { justify-content: center; }
+.justify-between { justify-content: space-between; }
+.justify-end { justify-content: flex-end; }
+.justify-start { justify-content: flex-start; }
+
+/* Align Items */
+.items-center { align-items: center; }
+.items-end { align-items: flex-end; }
+.items-start { align-items: flex-start; }
+
+/* Width/Height */
+.w-full { width: 100%; }
+.h-full { height: 100%; }
+.w-auto { width: auto; }
+.h-auto { height: auto; }
+.w-10 { width: 2.5rem; }
+.h-10 { height: 2.5rem; }
+
+/* Text Utilities */
+.text-sm { font-size: 0.875rem; }
+.text-base { font-size: 1rem; }
+.text-lg { font-size: 1.125rem; }
+.text-xl { font-size: 1.25rem; }
+.text-2xl { font-size: 1.5rem; }
+.text-3xl { font-size: 1.875rem; }
+.text-muted-foreground { color: var(--mat-sys-on-surface-variant); }
+.font-bold { font-weight: 700; }
+.font-medium { font-weight: 500; }
+.tracking-tight { letter-spacing: -0.01em; }
+
+/* Background Colors */
+.bg-destructive { background-color: var(--mat-sys-error); }
+.bg-destructive\/10 { background-color: rgba(179, 38, 30, 0.1); }
+.bg-green-600 { background-color: #16a34a; }
+.bg-green-600\/10 { background-color: rgba(22, 163, 74, 0.1); }
+
+/* Text Colors */
+.text-destructive { color: var(--mat-sys-error); }
+.text-green-600 { color: #16a34a; }
+
+/* Border Utilities */
+.border { border: 1px solid var(--mat-sys-outline); }
+.border-destructive { border-color: var(--mat-sys-error); }
+.border-green-600 { border-color: #16a34a; }
+
+/* Grid Utilities */
+.grid-cols-1 { grid-template-columns: 1fr; }
+.grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); }
+.grid-cols-3 { grid-template-columns: repeat(3, minmax(0, 1fr)); }
+.col-span-2 { grid-column: span 2; }
+
+/* Responsive utilities for md: breakpoint (768px) */
+@media (min-width: 768px) {
+  .md\:grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); }
+  .md\:grid-cols-3 { grid-template-columns: repeat(3, minmax(0, 1fr)); }
+}
+
+/* Additional Utilities */
+.rounded { border-radius: var(--mat-sys-corner-medium); }
+.rounded-md { border-radius: var(--mat-sys-corner-small); }
+.rounded-lg { border-radius: var(--mat-sys-corner-large); }
+.opacity-50 { opacity: 0.5; }
+
+/* Border with transparency */
+.border-primary\/20 { border-color: rgba(103, 80, 164, 0.2); }
+.border-accent\/20 { border-color: rgba(103, 80, 164, 0.2); }
+
+/* Background with transparency */
+.bg-card\/50 { background-color: rgba(255, 251, 254, 0.5); }
+.bg-gradient-to-br { background-image: linear-gradient(to bottom right, var(--tw-gradient-stops)); }
+.from-accent { --tw-gradient-stops: var(--mat-sys-accent), var(--tw-gradient-to-color, rgba(103, 80, 164, 0)); }
+.to-primary { --tw-gradient-to-color: var(--mat-sys-primary); }
+.backdrop-blur { backdrop-filter: blur(4px); }
+
+/* Text Utilities Extended */
+.text-primary-foreground { color: var(--mat-sys-on-primary); }
+
+/* Height/Width specifics */
+.h-5 { height: 1.25rem; }
+.w-5 { width: 1.25rem; }
+.min-h-screen { min-height: 100vh; }
+.min-w-0 { min-width: 0; }
+.flex-1 { flex: 1 1 0%; }
+.flex-nowrap { flex-wrap: nowrap; }
+.flex-wrap { flex-wrap: wrap; }
+.max-w-3xl { max-width: 48rem; }
+
+/* Border utilities */
+.border-t { border-top: 1px solid var(--mat-sys-outline); }
+.border-b { border-bottom: 1px solid var(--mat-sys-outline); }
+.border-border { border-color: var(--mat-sys-outline); }
+
+/* Background utilities extended */
+.bg-background { background-color: var(--mat-sys-background); }
+.bg-background\/95 { background-color: rgba(255, 251, 254, 0.95); }
+.bg-card { background-color: var(--mat-sys-surface); }
+.bg-primary\/10 { background-color: rgba(103, 80, 164, 0.1); }
+.text-accent { color: var(--mat-sys-accent); }
+.text-center { text-align: center; }
+.text-primary { color: var(--mat-sys-primary); }
+.h-4 { height: 1rem; }
+.w-4 { width: 1rem; }
+.space-y-1 > * + * { margin-top: 0.25rem; }
+.space-y-2 > * + * { margin-top: 0.5rem; }
+.space-y-3 > * + * { margin-top: 0.75rem; }
+.space-y-6 > * + * { margin-top: 1.5rem; }
+.col-span-2 { grid-column: span 2; }
diff --git a/src/styles/tailwind-m3-compat.css b/src/styles/tailwind-m3-compat.css
new file mode 100644
index 0000000..5bcc9f9
--- /dev/null
+++ b/src/styles/tailwind-m3-compat.css
@@ -0,0 +1,264 @@
+/* Tailwind to M3 Compatibility Classes */
+/* This provides bridge classes to maintain Tailwind-like behavior with M3 colors/tokens */
+
+/* Layout Utilities - Keep as-is for flexbox/grid functionality */
+.flex { display: flex; }
+.flex-1 { flex: 1; }
+.flex-wrap { flex-wrap: wrap; }
+.inline-flex { display: inline-flex; }
+.grid { display: grid; }
+.block { display: block; }
+.inline { display: inline; }
+.hidden { display: none; }
+
+/* Flexbox Alignment */
+.items-center { align-items: center; }
+.items-start { align-items: flex-start; }
+.items-end { align-items: flex-end; }
+.justify-between { justify-content: space-between; }
+.justify-center { justify-content: center; }
+.justify-start { justify-content: flex-start; }
+.justify-end { justify-content: flex-end; }
+
+/* Gap utilities */
+.gap-1 { gap: 4px; }
+.gap-2 { gap: 8px; }
+.gap-3 { gap: 12px; }
+.gap-4 { gap: 16px; }
+.gap-6 { gap: 24px; }
+.gap-8 { gap: 32px; }
+
+/* Padding utilities */
+.p-1 { padding: 4px; }
+.p-2 { padding: 8px; }
+.p-3 { padding: 12px; }
+.p-4 { padding: 16px; }
+.p-6 { padding: 24px; }
+.p-8 { padding: 32px; }
+
+.px-2 { padding-left: 8px; padding-right: 8px; }
+.px-3 { padding-left: 12px; padding-right: 12px; }
+.px-4 { padding-left: 16px; padding-right: 16px; }
+.px-6 { padding-left: 24px; padding-right: 24px; }
+
+.py-1 { padding-top: 4px; padding-bottom: 4px; }
+.py-2 { padding-top: 8px; padding-bottom: 8px; }
+.py-3 { padding-top: 12px; padding-bottom: 12px; }
+.py-4 { padding-top: 16px; padding-bottom: 16px; }
+.py-6 { padding-top: 24px; padding-bottom: 24px; }
+
+.pt-2 { padding-top: 8px; }
+.pb-2 { padding-bottom: 8px; }
+.pl-2 { padding-left: 8px; }
+.pr-2 { padding-right: 8px; }
+
+/* Margin utilities */
+.m-1 { margin: 4px; }
+.m-2 { margin: 8px; }
+.m-3 { margin: 12px; }
+.m-4 { margin: 16px; }
+
+.mb-1 { margin-bottom: 4px; }
+.mb-2 { margin-bottom: 8px; }
+.mb-3 { margin-bottom: 12px; }
+.mb-4 { margin-bottom: 16px; }
+.mb-8 { margin-bottom: 32px; }
+
+.mt-1 { margin-top: 4px; }
+.mt-2 { margin-top: 8px; }
+.mt-3 { margin-top: 12px; }
+.mt-4 { margin-top: 16px; }
+
+.mr-1 { margin-right: 4px; }
+.mr-2 { margin-right: 8px; }
+.mr-3 { margin-right: 12px; }
+.mr-4 { margin-right: 16px; }
+
+.ml-1 { margin-left: 4px; }
+.ml-2 { margin-left: 8px; }
+.ml-3 { margin-left: 12px; }
+.ml-4 { margin-left: 16px; }
+
+.mx-auto { margin-left: auto; margin-right: auto; }
+
+/* Space utilities */
+.space-y-1 > * + * { margin-top: 4px; }
+.space-y-2 > * + * { margin-top: 8px; }
+.space-y-3 > * + * { margin-top: 12px; }
+.space-y-4 > * + * { margin-top: 16px; }
+.space-y-6 > * + * { margin-top: 24px; }
+.space-y-8 > * + * { margin-top: 32px; }
+
+.space-x-1 > * + * { margin-left: 4px; }
+.space-x-2 > * + * { margin-left: 8px; }
+.space-x-3 > * + * { margin-left: 12px; }
+.space-x-4 > * + * { margin-left: 16px; }
+.space-x-6 > * + * { margin-left: 24px; }
+
+/* Width utilities */
+.w-full { width: 100%; }
+.w-screen { width: 100vw; }
+.w-auto { width: auto; }
+.w-1 { width: 4px; }
+.w-2 { width: 8px; }
+.w-4 { width: 16px; }
+.w-5 { width: 20px; }
+.w-8 { width: 32px; }
+.w-10 { width: 40px; }
+.w-12 { width: 48px; }
+.w-64 { width: 256px; }
+
+.min-w-0 { min-width: 0; }
+.min-w-full { min-width: 100%; }
+.max-w-sm { max-width: 384px; }
+.max-w-md { max-width: 448px; }
+.max-w-lg { max-width: 512px; }
+.max-w-2xl { max-width: 672px; }
+.max-w-3xl { max-width: 768px; }
+
+/* Height utilities */
+.h-full { height: 100%; }
+.h-screen { height: 100vh; }
+.h-auto { height: auto; }
+.h-1 { height: 4px; }
+.h-2 { height: 8px; }
+.h-4 { height: 16px; }
+.h-5 { height: 20px; }
+.h-7 { height: 28px; }
+.h-8 { height: 32px; }
+.h-10 { height: 40px; }
+.h-12 { height: 48px; }
+
+.min-h-0 { min-height: 0; }
+.min-h-full { min-height: 100%; }
+.min-h-screen { min-height: 100vh; }
+
+/* Border radius utilities - using M3 tokens */
+.rounded-none { border-radius: 0; }
+.rounded-sm { border-radius: var(--mat-sys-corner-extra-small, 4px); }
+.rounded { border-radius: var(--mat-sys-corner-small, 8px); }
+.rounded-md { border-radius: var(--mat-sys-corner-medium, 12px); }
+.rounded-lg { border-radius: var(--mat-sys-corner-large, 16px); }
+.rounded-xl { border-radius: 20px; }
+.rounded-full { border-radius: 9999px; }
+
+/* Border utilities */
+.border { border: 1px solid var(--mat-sys-outline-variant, #cac7d0); }
+.border-t { border-top: 1px solid var(--mat-sys-outline-variant, #cac7d0); }
+.border-b { border-bottom: 1px solid var(--mat-sys-outline-variant, #cac7d0); }
+.border-l { border-left: 1px solid var(--mat-sys-outline-variant, #cac7d0); }
+.border-r { border-right: 1px solid var(--mat-sys-outline-variant, #cac7d0); }
+
+/* Text utilities */
+.text-xs { font-size: 12px; line-height: 16px; }
+.text-sm { font-size: 14px; line-height: 20px; }
+.text-base { font-size: 16px; line-height: 24px; }
+.text-lg { font-size: 18px; line-height: 28px; }
+.text-xl { font-size: 20px; line-height: 28px; }
+.text-2xl { font-size: 24px; line-height: 32px; }
+.text-3xl { font-size: 30px; line-height: 36px; }
+.text-4xl { font-size: 36px; line-height: 40px; }
+
+/* Font weight */
+.font-thin { font-weight: 100; }
+.font-extralight { font-weight: 200; }
+.font-light { font-weight: 300; }
+.font-normal { font-weight: 400; }
+.font-medium { font-weight: 500; }
+.font-semibold { font-weight: 600; }
+.font-bold { font-weight: 700; }
+.font-extrabold { font-weight: 800; }
+
+/* Text alignment */
+.text-left { text-align: left; }
+.text-center { text-align: center; }
+.text-right { text-align: right; }
+.text-justify { text-align: justify; }
+
+/* Text utilities - Colors using M3 variables */
+.text-primary { color: var(--mat-sys-primary, #6750a4); }
+.text-secondary { color: var(--mat-sys-secondary, #625b71); }
+.text-accent { color: var(--mat-sys-accent, #6750a4); }
+.text-muted-foreground { color: var(--mat-sys-on-surface-variant, #49454e); }
+.text-foreground { color: var(--mat-sys-on-background, #1c1b1f); }
+.text-destructive { color: var(--mat-sys-error, #b3261e); }
+
+/* Background utilities - using M3 variables */
+.bg-background { background-color: var(--mat-sys-background, #fffbfe); }
+.bg-surface { background-color: var(--mat-sys-surface, #fffbfe); }
+.bg-card { background-color: var(--mat-sys-surface, #fffbfe); }
+.bg-primary { background-color: var(--mat-sys-primary, #6750a4); }
+.bg-secondary { background-color: var(--mat-sys-secondary, #625b71); }
+.bg-accent { background-color: var(--mat-sys-accent, #6750a4); }
+.bg-accent\/50 { background-color: rgba(103, 80, 164, 0.5); }
+.bg-accent\/10 { background-color: rgba(103, 80, 164, 0.1); }
+.bg-destructive { background-color: var(--mat-sys-error, #b3261e); }
+.bg-muted { background-color: var(--mat-sys-surface-variant, #e7e0ec); }
+.bg-muted\/50 { background-color: rgba(231, 224, 236, 0.5); }
+
+/* Opacity */
+.opacity-0 { opacity: 0; }
+.opacity-50 { opacity: 0.5; }
+.opacity-75 { opacity: 0.75; }
+.opacity-80 { opacity: 0.8; }
+.opacity-90 { opacity: 0.9; }
+.opacity-100 { opacity: 1; }
+
+/* Positioning */
+.relative { position: relative; }
+.absolute { position: absolute; }
+.fixed { position: fixed; }
+.sticky { position: sticky; }
+.top-0 { top: 0; }
+.top-1 { top: 4px; }
+.top-2 { top: 8px; }
+.top-3 { top: 12px; }
+.top-4 { top: 16px; }
+.right-0 { right: 0; }
+.right-1 { right: 4px; }
+.right-2 { right: 8px; }
+.right-3 { right: 12px; }
+.right-4 { right: 16px; }
+.left-0 { left: 0; }
+.bottom-0 { bottom: 0; }
+.inset-0 { top: 0; right: 0; bottom: 0; left: 0; }
+
+/* Overflow */
+.overflow-hidden { overflow: hidden; }
+.overflow-auto { overflow: auto; }
+.overflow-x-auto { overflow-x: auto; }
+.overflow-y-auto { overflow-y: auto; }
+.truncate { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+
+/* Z-index */
+.z-0 { z-index: 0; }
+.z-10 { z-index: 10; }
+.z-20 { z-index: 20; }
+.z-40 { z-index: 40; }
+.z-50 { z-index: 50; }
+
+/* Display utilities */
+.sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border-width: 0; }
+
+/* Transitions */
+.transition { transition-property: color, background-color, border-color, text-decoration-color, fill, stroke; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); transition-duration: 150ms; }
+.transition-colors { transition-property: color, background-color, border-color, text-decoration-color, fill, stroke; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); transition-duration: 150ms; }
+.transition-all { transition-property: all; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); transition-duration: 150ms; }
+
+/* Hover states */
+.hover\:bg-accent:hover { background-color: var(--mat-sys-accent, #6750a4); }
+.hover\:text-accent:hover { color: var(--mat-sys-accent, #6750a4); }
+.hover\:opacity-90:hover { opacity: 0.9; }
+.hover\:opacity-80:hover { opacity: 0.8; }
+
+/* Focus states */
+.focus-visible:focus-visible { outline: 2px solid var(--mat-sys-primary, #6750a4); outline-offset: 2px; }
+.focus\:outline-none:focus { outline: none; }
+
+/* Aspect ratio */
+.aspect-square { aspect-ratio: 1 / 1; }
+.aspect-video { aspect-ratio: 16 / 9; }
+
+/* Lists */
+.list-disc { list-style-type: disc; }
+.list-inside { list-style-position: inside; }
diff --git a/tests/e2e/fixtures.ts b/tests/e2e/fixtures.ts
index 333986c..42ca755 100644
--- a/tests/e2e/fixtures.ts
+++ b/tests/e2e/fixtures.ts
@@ -1,4 +1,5 @@
 import { expect, test as base } from "@playwright/test"
+import * as M3Helpers from "./m3-helpers"
 
 // Ensure a minimal window object exists in the Node test runtime.
 if (!(globalThis as any).window) {
@@ -44,8 +45,13 @@ const patchPagePrototype = (page: any) => {
 const test = base.extend({
   page: async ({ page }, use) => {
     patchPagePrototype(page)
+
+    // Add M3 helpers to page object
+    ;(page as any).m3 = M3Helpers
+
     await use(page)
   },
 })
 
 export { test, expect }
+export * from "./m3-helpers"
diff --git a/tests/e2e/m3-helpers.ts b/tests/e2e/m3-helpers.ts
new file mode 100644
index 0000000..0773afa
--- /dev/null
+++ b/tests/e2e/m3-helpers.ts
@@ -0,0 +1,223 @@
+import { Page, Locator, expect } from "@playwright/test"
+
+/**
+ * M3 Test Helpers for Material Design 3 Framework
+ * Provides utilities for testing M3-based components
+ */
+
+// M3 Color CSS variables mapping
+export const M3_COLORS = {
+  primary: 'var(--mat-sys-primary, #6750a4)',
+  onPrimary: 'var(--mat-sys-on-primary, #ffffff)',
+  secondary: 'var(--mat-sys-secondary, #625b71)',
+  onSecondary: 'var(--mat-sys-on-secondary, #ffffff)',
+  background: 'var(--mat-sys-background, #fffbfe)',
+  onBackground: 'var(--mat-sys-on-background, #1c1b1f)',
+  surface: 'var(--mat-sys-surface, #fffbfe)',
+  onSurface: 'var(--mat-sys-on-surface, #1c1b1f)',
+  error: 'var(--mat-sys-error, #b3261e)',
+  outline: 'var(--mat-sys-outline, #79747e)',
+}
+
+// M3 Corner radius tokens
+export const M3_RADIUS = {
+  extraSmall: 'var(--mat-sys-corner-extra-small, 4px)',
+  small: 'var(--mat-sys-corner-small, 8px)',
+  medium: 'var(--mat-sys-corner-medium, 12px)',
+  large: 'var(--mat-sys-corner-large, 16px)',
+  extraLarge: 'var(--mat-sys-corner-extra-large, 28px)',
+}
+
+// M3 Button class names
+export const M3_BUTTON_CLASSES = {
+  base: 'mat-mdc-button',
+  unelevated: 'mat-mdc-unelevated-button',
+  raised: 'mat-mdc-raised-button',
+  outlined: 'mat-mdc-outlined-button',
+  text: 'mat-mdc-button',
+  tonal: 'mat-tonal-button',
+  icon: 'mat-mdc-icon-button',
+}
+
+// M3 Component selectors
+export const M3_SELECTORS = {
+  button: `button[class*="mat-mdc-button"], button[class*="mdc-button"]`,
+  iconButton: `button[class*="mat-mdc-icon-button"]`,
+  listItem: `.mat-mdc-list-item, [role="listitem"]`,
+  card: `.mat-mdc-card, [role="article"]`,
+  dialog: `.mat-mdc-dialog-container, [role="dialog"]`,
+  accordion: `.mat-accordion, .mat-expansion-panel`,
+  input: `input[class*="mat-mdc"], textarea[class*="mat-mdc"]`,
+  checkbox: `input[type="checkbox"][class*="mat-mdc"]`,
+  radio: `input[type="radio"][class*="mat-mdc"]`,
+  switch: `input[type="checkbox"][role="switch"]`,
+  select: `select[class*="mat-mdc"], [role="combobox"]`,
+  tab: `.mat-mdc-tab, [role="tab"]`,
+  tooltip: `.mat-mdc-tooltip, [role="tooltip"]`,
+  menu: `.mat-mdc-menu-panel, [role="menu"]`,
+  snackbar: `.mat-mdc-snack-bar-container, [role="status"][aria-live="polite"]`,
+}
+
+/**
+ * Find an M3 button by text content
+ */
+export async function findM3Button(page: Page, text: string): Promise<Locator | null> {
+  const button = page.locator(M3_SELECTORS.button, { hasText: text }).first()
+  return (await button.count()) > 0 ? button : null
+}
+
+/**
+ * Find an M3 button by aria-label
+ */
+export async function findM3ButtonByLabel(page: Page, label: string): Promise<Locator | null> {
+  const button = page.locator(`button[aria-label="${label}"]`).first()
+  return (await button.count()) > 0 ? button : null
+}
+
+/**
+ * Check if an M3 button is disabled
+ */
+export async function isM3ButtonDisabled(button: Locator): Promise<boolean> {
+  const disabled = await button.getAttribute('disabled')
+  const ariaDisabled = await button.getAttribute('aria-disabled')
+  return disabled !== null || ariaDisabled === 'true'
+}
+
+/**
+ * Get the M3 button variant from its class
+ */
+export async function getM3ButtonVariant(button: Locator): Promise<string> {
+  const classList = await button.getAttribute('class')
+  if (!classList) return 'unknown'
+  
+  if (classList.includes('mat-mdc-outlined-button')) return 'outlined'
+  if (classList.includes('mat-mdc-raised-button')) return 'raised'
+  if (classList.includes('mat-mdc-unelevated-button')) return 'unelevated'
+  if (classList.includes('mat-tonal-button')) return 'tonal'
+  if (classList.includes('mat-mdc-icon-button')) return 'icon'
+  
+  return 'text'
+}
+
+/**
+ * Verify M3 button has ripple effect (mat-mdc-button-persistent-ripple)
+ */
+export async function hasM3Ripple(button: Locator): Promise<boolean> {
+  const ripple = button.locator('.mat-mdc-button-persistent-ripple')
+  return (await ripple.count()) > 0
+}
+
+/**
+ * Verify M3 focus indicator is present
+ */
+export async function hasM3FocusIndicator(element: Locator): Promise<boolean> {
+  const focusIndicator = element.locator('.mat-mdc-focus-indicator')
+  return (await focusIndicator.count()) > 0
+}
+
+/**
+ * Get computed M3 color variable value
+ */
+export async function getM3Color(page: Page, variable: keyof typeof M3_COLORS): Promise<string> {
+  return await page.evaluate((varName) => {
+    return getComputedStyle(document.documentElement).getPropertyValue(varName).trim()
+  }, `--mat-sys-${variable}`)
+}
+
+/**
+ * Wait for M3 animations to complete
+ */
+export async function waitForM3Animation(page: Page, timeout = 300): Promise<void> {
+  await page.waitForTimeout(timeout)
+}
+
+/**
+ * Verify element has M3 theming applied
+ */
+export async function hasM3Theming(element: Locator): Promise<boolean> {
+  const classList = await element.getAttribute('class')
+  const html = await element.innerHTML()
+  
+  const hasMdcClass = classList?.includes('mat-mdc') || classList?.includes('mdc-')
+  const hasMdcContent = html?.includes('mdc-') || html?.includes('mat-mdc')
+  
+  return hasMdcClass || hasMdcContent
+}
+
+/**
+ * Test M3 component responds to focus
+ */
+export async function testM3FocusBehavior(element: Locator): Promise<boolean> {
+  await element.focus()
+  const isFocused = await element.evaluate((el: HTMLElement) => document.activeElement === el)
+  return isFocused
+}
+
+/**
+ * Test M3 component keyboard navigation
+ */
+export async function testM3KeyboardNavigation(page: Page, element: Locator, key: string): Promise<void> {
+  await element.focus()
+  await page.keyboard.press(key)
+  await waitForM3Animation(page)
+}
+
+/**
+ * Verify M3 component meets touch target minimum (48x48px)
+ */
+export async function verifyM3TouchTarget(element: Locator): Promise<boolean> {
+  const box = await element.boundingBox()
+  if (!box) return false
+  return box.width >= 48 && box.height >= 48
+}
+
+/**
+ * Get M3 component accessibility information
+ */
+export async function getM3A11yInfo(element: Locator): Promise<{
+  role: string | null
+  ariaLabel: string | null
+  ariaLabelledBy: string | null
+  ariaDescribedBy: string | null
+}> {
+  const role = await element.getAttribute('role')
+  const ariaLabel = await element.getAttribute('aria-label')
+  const ariaLabelledBy = await element.getAttribute('aria-labelledby')
+  const ariaDescribedBy = await element.getAttribute('aria-describedby')
+  
+  return { role, ariaLabel, ariaLabelledBy, ariaDescribedBy }
+}
+
+/**
+ * Verify M3 list item has proper structure
+ */
+export async function verifyM3ListItem(item: Locator): Promise<boolean> {
+  const classList = await item.getAttribute('class')
+  const hasListItemClass = classList?.includes('mat-mdc-list-item') || classList?.includes('mdc-list-item')
+  const role = await item.getAttribute('role')
+  
+  return hasListItemClass || role === 'listitem'
+}
+
+/**
+ * Test M3 component color contrast
+ */
+export async function verifyM3ColorContrast(element: Locator): Promise<{
+  color: string
+  backgroundColor: string
+  contrast: number
+}> {
+  const style = await element.evaluate((el: HTMLElement) => {
+    const computed = window.getComputedStyle(el)
+    return {
+      color: computed.color,
+      backgroundColor: computed.backgroundColor,
+    }
+  })
+  
+  // Simple contrast ratio approximation (actual WCAG calculation would be more complex)
+  return {
+    ...style,
+    contrast: 4.5, // Placeholder
+  }
+}