diff --git a/src/ClaudeDo.App/App.axaml b/src/ClaudeDo.App/App.axaml
index a2cce75..c5ca83e 100644
--- a/src/ClaudeDo.App/App.axaml
+++ b/src/ClaudeDo.App/App.axaml
@@ -5,30 +5,36 @@
              RequestedThemeVariant="Dark">
 
     <Application.Resources>
-        <!-- Accent: Forest Teal -->
-        <SolidColorBrush x:Key="AccentBrush" Color="#3d9474"/>
-        <SolidColorBrush x:Key="AccentLightBrush" Color="#6bb89e"/>
-        <SolidColorBrush x:Key="AccentSubtleBrush" Color="#1A3D9474"/>
-        <SolidColorBrush x:Key="AccentSelectedBrush" Color="#263D9474"/>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="avares://ClaudeDo.Ui/Design/Tokens.axaml" />
+            </ResourceDictionary.MergedDictionaries>
 
-        <!-- Text -->
-        <SolidColorBrush x:Key="TextPrimaryBrush" Color="#f1f5f9"/>
-        <SolidColorBrush x:Key="TextSecondaryBrush" Color="#c8d0dc"/>
-        <SolidColorBrush x:Key="TextMutedBrush" Color="#8892a2"/>
-        <SolidColorBrush x:Key="TextDimBrush" Color="#6b7688"/>
+            <!-- Accent: Forest Teal -->
+            <SolidColorBrush x:Key="AccentBrush" Color="#3d9474"/>
+            <SolidColorBrush x:Key="AccentLightBrush" Color="#6bb89e"/>
+            <SolidColorBrush x:Key="AccentSubtleBrush" Color="#1A3D9474"/>
+            <SolidColorBrush x:Key="AccentSelectedBrush" Color="#263D9474"/>
 
-        <!-- Borders & Backgrounds -->
-        <SolidColorBrush x:Key="BorderSubtleBrush" Color="#3a3f46"/>
-        <SolidColorBrush x:Key="WindowBgBrush" Color="#1c1e21"/>
-        <SolidColorBrush x:Key="IslandBgBrush" Color="#272a2e"/>
-        <SolidColorBrush x:Key="SidebarBgBrush" Color="#272a2e"/>
-        <SolidColorBrush x:Key="ContentBgBrush" Color="#272a2e"/>
+            <!-- Text -->
+            <SolidColorBrush x:Key="TextPrimaryBrush" Color="#f1f5f9"/>
+            <SolidColorBrush x:Key="TextSecondaryBrush" Color="#c8d0dc"/>
+            <SolidColorBrush x:Key="TextMutedBrush" Color="#8892a2"/>
+            <SolidColorBrush x:Key="TextDimBrush" Color="#6b7688"/>
 
-        <!-- Status colors (for checkboxes) -->
-        <SolidColorBrush x:Key="StatusGrayBrush" Color="#475569"/>
-        <SolidColorBrush x:Key="StatusOrangeBrush" Color="#e67e22"/>
-        <SolidColorBrush x:Key="StatusGreenBrush" Color="#3d9474"/>
-        <SolidColorBrush x:Key="StatusRedBrush" Color="#ef4444"/>
+            <!-- Borders & Backgrounds -->
+            <SolidColorBrush x:Key="BorderSubtleBrush" Color="#3a3f46"/>
+            <SolidColorBrush x:Key="WindowBgBrush" Color="#1c1e21"/>
+            <SolidColorBrush x:Key="IslandBgBrush" Color="#272a2e"/>
+            <SolidColorBrush x:Key="SidebarBgBrush" Color="#272a2e"/>
+            <SolidColorBrush x:Key="ContentBgBrush" Color="#272a2e"/>
+
+            <!-- Status colors (for checkboxes) -->
+            <SolidColorBrush x:Key="StatusGrayBrush" Color="#475569"/>
+            <SolidColorBrush x:Key="StatusOrangeBrush" Color="#e67e22"/>
+            <SolidColorBrush x:Key="StatusGreenBrush" Color="#3d9474"/>
+            <SolidColorBrush x:Key="StatusRedBrush" Color="#ef4444"/>
+        </ResourceDictionary>
     </Application.Resources>
 
     <Application.DataTemplates>
@@ -37,6 +43,7 @@
 
     <Application.Styles>
         <FluentTheme />
+        <StyleInclude Source="avares://ClaudeDo.Ui/Design/IslandStyles.axaml" />
         <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
             <Setter Property="Background" Value="#333d9474"/>
         </Style>