diff --git a/frontend/src/pages/TreeNavigationPage.tsx b/frontend/src/pages/TreeNavigationPage.tsx
index 3cfa9402..d4a7414f 100644
--- a/frontend/src/pages/TreeNavigationPage.tsx
+++ b/frontend/src/pages/TreeNavigationPage.tsx
@@ -516,7 +516,7 @@ export function TreeNavigationPage() {
   if (isLoading) {
     return (
       <div className="flex h-64 items-center justify-center">
-        <div className="h-8 w-8 animate-spin rounded-full border-4 border-white/20 border-t-white" />
+        <div className="h-8 w-8 animate-spin rounded-full border-4 border-border border-t-foreground" />
       </div>
     )
   }
@@ -529,7 +529,7 @@ export function TreeNavigationPage() {
         </div>
         <button
           onClick={() => navigate('/trees')}
-          className="mt-4 text-white/50 hover:text-white hover:underline"
+          className="mt-4 text-muted-foreground hover:text-foreground hover:underline"
         >
           Back to trees
         </button>
@@ -541,17 +541,17 @@ export function TreeNavigationPage() {
   if (showMetadataForm) {
     return (
       <div className="container mx-auto max-w-lg px-4 py-8">
-        <h1 className="mb-2 text-2xl font-bold text-white">{tree.name}</h1>
-        <p className="mb-6 text-white/40">{tree.description}</p>
+        <h1 className="mb-2 text-2xl font-bold font-heading text-foreground">{tree.name}</h1>
+        <p className="mb-6 text-muted-foreground">{tree.description}</p>
 
-        <div className="glass-card rounded-2xl space-y-4 p-6">
-          <h2 className="font-semibold text-white">Session Details</h2>
-          <p className="text-sm text-white/40">
+        <div className="bg-card border border-border rounded-xl space-y-4 p-6">
+          <h2 className="font-semibold text-foreground">Session Details</h2>
+          <p className="text-sm text-muted-foreground">
             Optional: Add ticket and client info for easier tracking
           </p>
 
           <div>
-            <label className="block text-sm font-medium text-white">
+            <label className="block text-sm font-medium text-foreground">
               Ticket Number
             </label>
             <input
@@ -560,15 +560,15 @@ export function TreeNavigationPage() {
               onChange={(e) => setTicketNumber(e.target.value)}
               placeholder="e.g., INC0012345"
               className={cn(
-                'mt-1 block w-full rounded-md border border-white/10 bg-black/50 px-3 py-2',
-                'text-white placeholder:text-white/40',
-                'focus:border-white/30 focus:outline-none focus:ring-1 focus:ring-white/20'
+                'mt-1 block w-full rounded-md border border-border bg-card px-3 py-2',
+                'text-foreground placeholder:text-muted-foreground',
+                'focus:border-primary focus:outline-none focus:ring-1 focus:ring-primary/20'
               )}
             />
           </div>
 
           <div>
-            <label className="block text-sm font-medium text-white">
+            <label className="block text-sm font-medium text-foreground">
               Client Name
             </label>
             <input
@@ -577,9 +577,9 @@ export function TreeNavigationPage() {
               onChange={(e) => setClientName(e.target.value)}
               placeholder="e.g., Acme Corp"
               className={cn(
-                'mt-1 block w-full rounded-md border border-white/10 bg-black/50 px-3 py-2',
-                'text-white placeholder:text-white/40',
-                'focus:border-white/30 focus:outline-none focus:ring-1 focus:ring-white/20'
+                'mt-1 block w-full rounded-md border border-border bg-card px-3 py-2',
+                'text-foreground placeholder:text-muted-foreground',
+                'focus:border-primary focus:outline-none focus:ring-1 focus:ring-primary/20'
               )}
             />
           </div>
@@ -587,8 +587,8 @@ export function TreeNavigationPage() {
           <button
             onClick={startSession}
             className={cn(
-              'w-full rounded-md bg-white px-4 py-2 text-sm font-medium text-black',
-              'hover:bg-white/90'
+              'w-full rounded-md bg-gradient-brand px-4 py-2 text-sm font-medium text-white shadow-lg shadow-primary/20',
+              'hover:opacity-90'
             )}
           >
             Start Troubleshooting
@@ -617,9 +617,9 @@ export function TreeNavigationPage() {
       <div className="mb-6 flex items-center justify-between">
         <div>
           <div className="flex items-center gap-3">
-            <h1 className="text-xl font-bold text-white">{tree.name}</h1>
+            <h1 className="text-xl font-bold font-heading text-foreground">{tree.name}</h1>
             {timerDisplay && (
-              <span className="flex items-center gap-1.5 rounded-full bg-white/10 px-2.5 py-0.5 text-sm text-white/60">
+              <span className="flex items-center gap-1.5 rounded-full bg-accent px-2 py-0.5 text-[0.6875rem] font-label text-muted-foreground">
                 <Clock className="h-4 w-4" />
                 {timerDisplay}
               </span>
@@ -627,14 +627,14 @@ export function TreeNavigationPage() {
             <button
               type="button"
               onClick={() => setShortcutsModalOpen(true)}
-              className="flex items-center justify-center rounded-full p-1 text-white/30 hover:bg-white/10 hover:text-white/60"
+              className="flex items-center justify-center rounded-full p-1 text-muted-foreground hover:bg-accent hover:text-foreground"
               title="Keyboard shortcuts"
             >
               <HelpCircle className="h-4 w-4" />
             </button>
           </div>
           {(ticketNumber || clientName) && (
-            <p className="text-sm text-white/40">
+            <p className="text-sm text-muted-foreground">
               {ticketNumber && `Ticket: ${ticketNumber}`}
               {ticketNumber && clientName && ' · '}
               {clientName && `Client: ${clientName}`}
@@ -647,8 +647,8 @@ export function TreeNavigationPage() {
             <button
               onClick={() => setShowSharePopover(!showSharePopover)}
               className={cn(
-                'flex items-center gap-1.5 rounded-md border border-white/10 px-3 py-1.5 text-xs font-medium text-white/60',
-                'hover:bg-white/10 hover:text-white transition-colors'
+                'flex items-center gap-1.5 rounded-md border border-border px-3 py-1.5 text-xs font-medium text-muted-foreground',
+                'hover:bg-accent hover:text-foreground transition-colors'
               )}
             >
               <Copy className="h-3.5 w-3.5" />
@@ -656,7 +656,7 @@ export function TreeNavigationPage() {
               <ChevronDown className="h-3 w-3" />
             </button>
             {showSharePopover && (
-              <div className="absolute right-0 mt-1 z-50 glass-card rounded-lg p-1 min-w-[220px]">
+              <div className="absolute right-0 mt-1 z-50 bg-card border border-border rounded-xl p-1 min-w-[220px]">
                 {/* Copy Progress Summary */}
                 <button
                   onClick={() => {
@@ -665,8 +665,8 @@ export function TreeNavigationPage() {
                   }}
                   disabled={isCopyingForTicket}
                   className={cn(
-                    'flex items-center gap-2 rounded-md px-3 py-2 text-sm text-white/70 w-full text-left cursor-pointer transition-colors',
-                    'hover:bg-white/10 hover:text-white disabled:opacity-50'
+                    'flex items-center gap-2 rounded-md px-3 py-2 text-sm text-muted-foreground w-full text-left cursor-pointer transition-colors',
+                    'hover:bg-accent hover:text-foreground disabled:opacity-50'
                   )}
                 >
                   {copiedForTicket ? <Check className="h-4 w-4 text-emerald-400" /> : <Clipboard className="h-4 w-4" />}
@@ -680,15 +680,15 @@ export function TreeNavigationPage() {
                   }}
                   disabled={isCopyingShareLink}
                   className={cn(
-                    'flex items-center gap-2 rounded-md px-3 py-2 text-sm text-white/70 w-full text-left cursor-pointer transition-colors',
-                    'hover:bg-white/10 hover:text-white disabled:opacity-50'
+                    'flex items-center gap-2 rounded-md px-3 py-2 text-sm text-muted-foreground w-full text-left cursor-pointer transition-colors',
+                    'hover:bg-accent hover:text-foreground disabled:opacity-50'
                   )}
                 >
                   {copiedShareLink ? <Check className="h-4 w-4 text-emerald-400" /> : <Link2 className="h-4 w-4" />}
                   {isCopyingShareLink ? 'Loading...' : copiedShareLink ? 'Copied!' : 'Copy Share Link'}
                 </button>
                 {/* Divider */}
-                <div className="border-t border-white/[0.06] my-1" />
+                <div className="border-t border-border my-1" />
                 {/* Manage Share Links */}
                 <button
                   onClick={() => {
@@ -696,8 +696,8 @@ export function TreeNavigationPage() {
                     setShowShareModal(true)
                   }}
                   className={cn(
-                    'flex items-center gap-2 rounded-md px-3 py-2 text-sm text-white/70 w-full text-left cursor-pointer transition-colors',
-                    'hover:bg-white/10 hover:text-white'
+                    'flex items-center gap-2 rounded-md px-3 py-2 text-sm text-muted-foreground w-full text-left cursor-pointer transition-colors',
+                    'hover:bg-accent hover:text-foreground'
                   )}
                 >
                   <Settings className="h-4 w-4" />
@@ -708,7 +708,7 @@ export function TreeNavigationPage() {
           </div>
           <button
             onClick={() => navigate('/sessions')}
-            className="rounded-md px-3 py-1.5 text-sm text-white/50 hover:bg-white/[0.06] hover:text-white"
+            className="rounded-md px-3 py-1.5 text-sm text-muted-foreground hover:bg-accent hover:text-foreground"
           >
             Exit
           </button>
@@ -724,17 +724,17 @@ export function TreeNavigationPage() {
           const truncatedLabel = label.length > 30 ? `${label.slice(0, 30)}...` : label
           return (
             <span key={nodeId} className="flex items-center gap-2 whitespace-nowrap">
-              {index > 0 && <span className="text-white/40">→</span>}
+              {index > 0 && <span className="text-muted-foreground">→</span>}
               {index < pathTaken.length - 1 ? (
                 <button
                   type="button"
                   onClick={() => handleBreadcrumbJump(nodeId, index)}
-                  className="text-white/40 hover:text-white/70 hover:underline"
+                  className="text-muted-foreground hover:text-foreground hover:underline"
                 >
                   {truncatedLabel}
                 </button>
               ) : (
-                <span className="font-medium text-white">
+                <span className="font-medium text-foreground">
                   {truncatedLabel}
                 </span>
               )}
@@ -744,15 +744,15 @@ export function TreeNavigationPage() {
       </div>
 
       {/* Current Node */}
-      <div className="glass-card rounded-2xl p-6 shadow-sm">
+      <div className="bg-card border border-border rounded-xl p-6 shadow-sm">
         {/* Decision Node */}
         {currentNode && currentNode.type === 'decision' && (
           <>
-            <h2 className="mb-2 text-xl font-semibold text-white">
+            <h2 className="mb-2 text-xl font-semibold font-heading text-foreground">
               {currentNode.question}
             </h2>
             {currentNode.help_text && (
-              <div className="mb-4 text-sm text-white/50">
+              <div className="mb-4 text-sm text-muted-foreground">
                 <MarkdownContent content={currentNode.help_text} />
               </div>
             )}
@@ -763,8 +763,8 @@ export function TreeNavigationPage() {
                   onClick={() => handleSelectOption(option.id, option.label, option.next_node_id)}
                   disabled={!!selectingOption}
                   className={cn(
-                    'w-full rounded-md border border-white/10 p-3 text-left text-white transition-colors',
-                    'hover:border-white/30 hover:bg-white/[0.06]',
+                    'w-full rounded-md border border-border p-3 text-left text-foreground transition-colors',
+                    'hover:border-primary/30 hover:bg-accent',
                     'flex items-center gap-3',
                     selectingOption && selectingOption !== option.id && 'opacity-50 pointer-events-none'
                   )}
@@ -772,10 +772,10 @@ export function TreeNavigationPage() {
                   {index < 9 && (
                     selectingOption === option.id ? (
                       <span className="flex h-6 w-6 shrink-0 items-center justify-center">
-                        <span className="h-4 w-4 animate-spin rounded-full border-2 border-white/20 border-t-white" />
+                        <span className="h-4 w-4 animate-spin rounded-full border-2 border-border border-t-foreground" />
                       </span>
                     ) : (
-                      <span className="flex h-6 w-6 shrink-0 items-center justify-center rounded bg-white/10 text-xs font-medium text-white/50">
+                      <span className="flex h-6 w-6 shrink-0 items-center justify-center rounded bg-accent text-xs font-medium text-muted-foreground">
                         {index + 1}
                       </span>
                     )
@@ -787,7 +787,7 @@ export function TreeNavigationPage() {
             {/* Previously-created custom steps at this node */}
             {customStepFlow.customSteps.filter(cs => cs.inserted_after_node_id === currentNodeId).length > 0 && (
               <div className="mt-2 space-y-2">
-                <p className="text-xs font-medium uppercase tracking-wide text-white/40">
+                <p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
                   Your Custom Steps
                 </p>
                 {customStepFlow.customSteps
@@ -798,12 +798,12 @@ export function TreeNavigationPage() {
                       key={cs.id}
                       onClick={() => customStepFlow.handleNavigateToCustomStep(cs)}
                       className={cn(
-                        'w-full rounded-md border border-purple-700 bg-purple-900/20 p-3 text-left text-white transition-colors',
-                        'hover:border-purple-500 hover:bg-purple-900/40',
+                        'w-full rounded-md border border-primary/30 bg-primary/10 p-3 text-left text-foreground transition-colors',
+                        'hover:border-primary/50 hover:bg-primary/20',
                         'flex items-center gap-3'
                       )}
                     >
-                      <span className="flex-shrink-0 rounded-full bg-purple-900 px-2 py-0.5 text-xs font-medium text-purple-100">
+                      <span className="flex-shrink-0 rounded-full bg-primary/20 px-2 py-0.5 text-xs font-medium text-primary">
                         Custom
                       </span>
                       <span>{cs.step_data.title}</span>
@@ -815,7 +815,7 @@ export function TreeNavigationPage() {
             {/* Add Custom Step Button */}
             <button
               onClick={() => customStepFlow.setShowCustomStepModal(true)}
-              className="mt-2 inline-flex items-center gap-1 rounded-md px-2 py-1.5 text-sm text-white/50 hover:bg-white/10 hover:text-white"
+              className="mt-2 inline-flex items-center gap-1 rounded-md px-2 py-1.5 text-sm text-muted-foreground hover:bg-accent hover:text-foreground"
             >
               <Plus className="h-3.5 w-3.5" />
               Add Custom Step
@@ -825,18 +825,18 @@ export function TreeNavigationPage() {
 
         {/* Custom Step Node */}
         {currentCustomStep && (
-          <div className="rounded-lg border border-purple-800 bg-purple-900/20 p-4">
+          <div className="rounded-lg border border-primary/30 bg-primary/10 p-4">
             {/* Custom Step Badge */}
-            <span className="mb-2 inline-block rounded-full bg-purple-900 px-2 py-1 text-xs font-medium text-purple-100">
+            <span className="mb-2 inline-block rounded-full bg-primary/20 px-2 py-1 text-xs font-medium text-primary">
               Custom Step
             </span>
 
-            <h2 className="mb-2 text-xl font-semibold text-white">
+            <h2 className="mb-2 text-xl font-semibold font-heading text-foreground">
               {currentCustomStep.step_data.title}
             </h2>
 
             {currentCustomStep.step_data.content.instructions && (
-              <div className="mb-4 text-white/60">
+              <div className="mb-4 text-muted-foreground">
                 <MarkdownContent content={currentCustomStep.step_data.content.instructions} />
               </div>
             )}
@@ -849,13 +849,13 @@ export function TreeNavigationPage() {
 
             {currentCustomStep.step_data.content.commands && currentCustomStep.step_data.content.commands.length > 0 && (
               <div className="mb-4">
-                <p className="mb-2 text-sm font-medium text-white">Commands:</p>
+                <p className="mb-2 text-sm font-medium text-foreground">Commands:</p>
                 <div className="space-y-2">
                   {currentCustomStep.step_data.content.commands.map((cmd, index) => (
                     <div key={index}>
-                      <p className="mb-1 text-xs text-white/40">{cmd.label}</p>
+                      <p className="mb-1 text-xs text-muted-foreground">{cmd.label}</p>
                       <div className="group relative">
-                        <code className="block rounded bg-white/10 p-2 pr-8 text-sm font-mono">
+                        <code className="block rounded bg-accent p-2 pr-8 text-sm font-mono">
                           {cmd.command}
                         </code>
                         <button
@@ -867,7 +867,7 @@ export function TreeNavigationPage() {
                           {copiedCommand === cmd.command ? (
                             <Check className="h-3.5 w-3.5 text-green-400" />
                           ) : (
-                            <Clipboard className="h-3.5 w-3.5 text-white/40 hover:text-white" />
+                            <Clipboard className="h-3.5 w-3.5 text-muted-foreground hover:text-foreground" />
                           )}
                         </button>
                       </div>
@@ -879,7 +879,7 @@ export function TreeNavigationPage() {
                   <button
                     type="button"
                     onClick={() => setCommandOutputOpen(!commandOutputOpen)}
-                    className="flex items-center gap-1.5 text-sm text-white/50 hover:text-white"
+                    className="flex items-center gap-1.5 text-sm text-muted-foreground hover:text-foreground"
                   >
                     <Terminal className="h-3.5 w-3.5" />
                     <span>Paste Output (Optional)</span>
@@ -894,12 +894,12 @@ export function TreeNavigationPage() {
                         rows={4}
                         maxLength={10000}
                         className={cn(
-                          'block w-full rounded-md border border-white/10 bg-white/10 px-3 py-2',
-                          'font-mono text-sm text-white placeholder:text-white/40',
-                          'focus:border-white/30 focus:outline-none focus:ring-1 focus:ring-white/20'
+                          'block w-full rounded-md border border-border bg-accent px-3 py-2',
+                          'font-mono text-sm text-foreground placeholder:text-muted-foreground',
+                          'focus:border-primary focus:outline-none focus:ring-1 focus:ring-primary/20'
                         )}
                       />
-                      <p className="mt-1 text-right text-xs text-white/30">
+                      <p className="mt-1 text-right text-xs text-muted-foreground">
                         {commandOutput.length.toLocaleString()} / 10,000
                       </p>
                     </div>
@@ -913,13 +913,13 @@ export function TreeNavigationPage() {
               const targetNode = findNode(customStepFlow.pendingContinuationNodeId, tree?.tree_structure)
               const targetLabel = targetNode?.question || targetNode?.title || 'next step'
               return (
-                <div className="mt-6 border-t border-purple-700 pt-4">
+                <div className="mt-6 border-t border-primary/30 pt-4">
                   <button
                     type="button"
                     onClick={handleCustomContinueToDescendant}
                     className={cn(
-                      'flex w-full items-center justify-between rounded-md bg-white px-4 py-3 text-sm font-medium text-black',
-                      'hover:bg-white/90'
+                      'flex w-full items-center justify-between rounded-md bg-gradient-brand px-4 py-3 text-sm font-medium text-white shadow-lg shadow-primary/20',
+                      'hover:opacity-90'
                     )}
                   >
                     <span>Continue to: {targetLabel.length > 50 ? `${targetLabel.slice(0, 50)}...` : targetLabel}</span>
@@ -931,7 +931,7 @@ export function TreeNavigationPage() {
 
             {/* Custom Branch Controls */}
             {customStepFlow.customBranchMode && (
-              <div className="mt-6 border-t border-purple-700 pt-4">
+              <div className="mt-6 border-t border-primary/30 pt-4">
                 <p className="mb-3 text-sm text-amber-400">
                   Building custom branch - add steps until the issue is resolved
                 </p>
@@ -939,8 +939,8 @@ export function TreeNavigationPage() {
                   <button
                     onClick={() => customStepFlow.setShowCustomStepModal(true)}
                     className={cn(
-                      'flex items-center gap-2 rounded-md border border-white/10 px-4 py-2 text-sm font-medium text-white/60',
-                      'hover:bg-white/10 hover:text-white'
+                      'flex items-center gap-2 rounded-md border border-border px-4 py-2 text-sm font-medium text-muted-foreground',
+                      'hover:bg-accent hover:text-foreground'
                     )}
                   >
                     <Plus className="h-4 w-4" />
@@ -966,21 +966,21 @@ export function TreeNavigationPage() {
         {/* Action Node */}
         {currentNode && currentNode.type === 'action' && (
           <>
-            <h2 className="mb-2 text-xl font-semibold text-white">
+            <h2 className="mb-2 text-xl font-semibold font-heading text-foreground">
               {currentNode.title}
             </h2>
             {currentNode.description && (
-              <div className="mb-4 text-white/60">
+              <div className="mb-4 text-muted-foreground">
                 <MarkdownContent content={currentNode.description} />
               </div>
             )}
             {currentNode.commands && currentNode.commands.length > 0 && (
               <div className="mb-4">
-                <p className="mb-2 text-sm font-medium text-white">Commands:</p>
+                <p className="mb-2 text-sm font-medium text-foreground">Commands:</p>
                 <div className="space-y-1">
                   {currentNode.commands.map((cmd, index) => (
                     <div key={index} className="group relative">
-                      <code className="block rounded bg-white/10 p-2 pr-8 text-sm font-mono">
+                      <code className="block rounded bg-accent p-2 pr-8 text-sm font-mono">
                         {cmd}
                       </code>
                       <button
@@ -992,7 +992,7 @@ export function TreeNavigationPage() {
                         {copiedCommand === cmd ? (
                           <Check className="h-3.5 w-3.5 text-green-400" />
                         ) : (
-                          <Clipboard className="h-3.5 w-3.5 text-white/40 hover:text-white" />
+                          <Clipboard className="h-3.5 w-3.5 text-muted-foreground hover:text-foreground" />
                         )}
                       </button>
                     </div>
@@ -1003,7 +1003,7 @@ export function TreeNavigationPage() {
                   <button
                     type="button"
                     onClick={() => setCommandOutputOpen(!commandOutputOpen)}
-                    className="flex items-center gap-1.5 text-sm text-white/50 hover:text-white"
+                    className="flex items-center gap-1.5 text-sm text-muted-foreground hover:text-foreground"
                   >
                     <Terminal className="h-3.5 w-3.5" />
                     <span>Paste Output (Optional)</span>
@@ -1018,12 +1018,12 @@ export function TreeNavigationPage() {
                         rows={4}
                         maxLength={10000}
                         className={cn(
-                          'block w-full rounded-md border border-white/10 bg-white/10 px-3 py-2',
-                          'font-mono text-sm text-white placeholder:text-white/40',
-                          'focus:border-white/30 focus:outline-none focus:ring-1 focus:ring-white/20'
+                          'block w-full rounded-md border border-border bg-accent px-3 py-2',
+                          'font-mono text-sm text-foreground placeholder:text-muted-foreground',
+                          'focus:border-primary focus:outline-none focus:ring-1 focus:ring-primary/20'
                         )}
                       />
-                      <p className="mt-1 text-right text-xs text-white/30">
+                      <p className="mt-1 text-right text-xs text-muted-foreground">
                         {commandOutput.length.toLocaleString()} / 10,000
                       </p>
                     </div>
@@ -1032,7 +1032,7 @@ export function TreeNavigationPage() {
               </div>
             )}
             {currentNode.expected_outcome && (
-              <p className="mb-4 text-sm text-white/40">
+              <p className="mb-4 text-sm text-muted-foreground">
                 <strong>Expected outcome:</strong> {currentNode.expected_outcome}
               </p>
             )}
@@ -1040,8 +1040,8 @@ export function TreeNavigationPage() {
               <button
                 onClick={() => handleContinue()}
                 className={cn(
-                  'rounded-md bg-white px-4 py-2 text-sm font-medium text-black',
-                  'hover:bg-white/90'
+                  'rounded-md bg-gradient-brand px-4 py-2 text-sm font-medium text-white shadow-lg shadow-primary/20',
+                  'hover:opacity-90'
                 )}
               >
                 Continue
@@ -1058,18 +1058,18 @@ export function TreeNavigationPage() {
                 Solution
               </span>
             </div>
-            <h2 className="mb-2 text-xl font-semibold text-white">
+            <h2 className="mb-2 text-xl font-semibold font-heading text-foreground">
               {currentNode.title}
             </h2>
             {currentNode.description && (
-              <div className="mb-4 text-white/60">
+              <div className="mb-4 text-muted-foreground">
                 <MarkdownContent content={currentNode.description} />
               </div>
             )}
             {currentNode.resolution_steps && currentNode.resolution_steps.length > 0 && (
               <div className="mb-4">
-                <p className="mb-2 text-sm font-medium text-white">Resolution steps:</p>
-                <ol className="list-inside list-decimal space-y-1 text-sm text-white/40">
+                <p className="mb-2 text-sm font-medium text-foreground">Resolution steps:</p>
+                <ol className="list-inside list-decimal space-y-1 text-sm text-muted-foreground">
                   {currentNode.resolution_steps.map((step, index) => (
                     <li key={index}>{step}</li>
                   ))}
@@ -1090,8 +1090,8 @@ export function TreeNavigationPage() {
         )}
 
         {/* Notes */}
-        <div className="mt-6 border-t border-white/[0.06] pt-4">
-          <label className="block text-sm font-medium text-white">
+        <div className="mt-6 border-t border-border pt-4">
+          <label className="block text-sm font-medium text-foreground">
             Notes (optional)
           </label>
           <textarea
@@ -1101,9 +1101,9 @@ export function TreeNavigationPage() {
             placeholder="Add any notes for this step..."
             rows={2}
             className={cn(
-              'mt-1 block w-full rounded-md border border-white/10 bg-black/50 px-3 py-2',
-              'text-white placeholder:text-white/40',
-              'focus:border-white/30 focus:outline-none focus:ring-1 focus:ring-white/20'
+              'mt-1 block w-full rounded-md border border-border bg-card px-3 py-2',
+              'text-foreground placeholder:text-muted-foreground',
+              'focus:border-primary focus:outline-none focus:ring-1 focus:ring-primary/20'
             )}
           />
         </div>
@@ -1112,15 +1112,15 @@ export function TreeNavigationPage() {
         {pathTaken.length > 1 && (
           <button
             onClick={handleGoBack}
-            className="mt-4 text-sm text-white/50 hover:text-white"
+            className="mt-4 text-sm text-muted-foreground hover:text-foreground"
           >
-            ← Go back <span className="text-xs text-white/30">[Esc]</span>
+            ← Go back <span className="text-xs text-muted-foreground">[Esc]</span>
           </button>
         )}
 
         {/* Keyboard Shortcuts Hint */}
         {currentNode && (
-          <div className="mt-4 border-t border-white/[0.06] pt-3 text-xs text-white/40">
+          <div className="mt-4 border-t border-border pt-3 text-xs text-muted-foreground">
             <span className="font-medium">Keyboard:</span>{' '}
             {currentNode.type === 'decision' && currentOptions.length > 0 && (
               <span>1-{Math.min(currentOptions.length, 9)} select option</span>
@@ -1189,24 +1189,24 @@ export function TreeNavigationPage() {
       >
         <div className="space-y-3 text-sm">
           <div className="flex items-center justify-between">
-            <span className="text-white/60">Select option</span>
-            <span className="rounded bg-white/10 px-2 py-0.5 font-mono text-xs text-white/80">1-9</span>
+            <span className="text-muted-foreground">Select option</span>
+            <span className="rounded bg-accent px-2 py-0.5 font-mono text-xs text-foreground">1-9</span>
           </div>
           <div className="flex items-center justify-between">
-            <span className="text-white/60">Go back</span>
-            <span className="rounded bg-white/10 px-2 py-0.5 font-mono text-xs text-white/80">Esc</span>
+            <span className="text-muted-foreground">Go back</span>
+            <span className="rounded bg-accent px-2 py-0.5 font-mono text-xs text-foreground">Esc</span>
           </div>
           <div className="flex items-center justify-between">
-            <span className="text-white/60">Continue / Complete</span>
-            <span className="rounded bg-white/10 px-2 py-0.5 font-mono text-xs text-white/80">Enter</span>
+            <span className="text-muted-foreground">Continue / Complete</span>
+            <span className="rounded bg-accent px-2 py-0.5 font-mono text-xs text-foreground">Enter</span>
           </div>
           <div className="flex items-center justify-between">
-            <span className="text-white/60">Focus notes</span>
-            <span className="rounded bg-white/10 px-2 py-0.5 font-mono text-xs text-white/80">Tab</span>
+            <span className="text-muted-foreground">Focus notes</span>
+            <span className="rounded bg-accent px-2 py-0.5 font-mono text-xs text-foreground">Tab</span>
           </div>
           <div className="flex items-center justify-between">
-            <span className="text-white/60">Show shortcuts</span>
-            <span className="rounded bg-white/10 px-2 py-0.5 font-mono text-xs text-white/80">?</span>
+            <span className="text-muted-foreground">Show shortcuts</span>
+            <span className="rounded bg-accent px-2 py-0.5 font-mono text-xs text-foreground">?</span>
           </div>
         </div>
       </Modal>