diff --git a/.planning/phases/08-theme-foundation/08-01-PLAN.md b/.planning/phases/08-theme-foundation/08-01-PLAN.md
index 3f84e6d..a399ea7 100644
--- a/.planning/phases/08-theme-foundation/08-01-PLAN.md
+++ b/.planning/phases/08-theme-foundation/08-01-PLAN.md
@@ -144,7 +144,7 @@ Use vanilla JS (no arrow functions) for maximum browser compat in the inline scr
   <done>src/index.css contains @custom-variant, @layer base with :root and .dark blocks (15 token pairs), @theme mapping all tokens. index.html has inline blocking script reading r2b-theme from localStorage. Vite build succeeds with no errors.</done>
 </task>
 
-<task type="auto" tdd="true">
+<task type="tdd">
   <name>Task 2: Create ThemeToggle component with tests and wire into App.tsx</name>
   <files>src/components/ui/ThemeToggle.tsx, src/components/ui/ThemeToggle.test.tsx, src/App.tsx</files>
   <behavior>
diff --git a/.planning/phases/08-theme-foundation/08-02-PLAN.md b/.planning/phases/08-theme-foundation/08-02-PLAN.md
index b06c44c..0dab3ab 100644
--- a/.planning/phases/08-theme-foundation/08-02-PLAN.md
+++ b/.planning/phases/08-theme-foundation/08-02-PLAN.md
@@ -119,8 +119,8 @@ focus:ring-red-300  -> focus:ring-error/50
 text-red-600        -> text-error
 text-red-500        -> text-error
 focus:ring-blue-300 -> focus:ring-primary/50
-text-green-700 bg-green-50 -> text-success bg-on-success (or bg-success/10)
-bg-yellow-50 border-yellow-300 text-yellow-800/900 -> bg-on-warning border-warning text-warning
+text-green-700 bg-green-50 -> text-success bg-success/10
+bg-yellow-50 border-yellow-300 text-yellow-800/900 -> bg-warning/10 border-warning text-warning
 -->
 </context>
 
@@ -200,8 +200,8 @@ Continue the mechanical migration for all wizard components. Do NOT change DOM s
 - `bg-blue-600 text-white ... hover:bg-blue-700` (Next button) -> `bg-primary text-on-primary ... hover:bg-primary`
 
 **ReviewStep.tsx** (6 occurrences):
-- `text-green-700 bg-green-50` (client-side notice) -> `text-success bg-on-success`
-- `bg-yellow-50 border border-yellow-300` (security warning box) -> `bg-on-warning border border-warning`
+- `text-green-700 bg-green-50` (client-side notice) -> `text-success bg-success/10`
+- `bg-yellow-50 border border-yellow-300` (security warning box) -> `bg-warning/10 border border-warning`
 - `text-yellow-800` (warning title) -> `text-warning`
 - `text-yellow-900` (warning label) -> `text-warning`
 - `border border-gray-300 ... hover:bg-gray-50` (Back button) -> `border border-outline ... hover:bg-surface`