diff --git a/src/Angor/Avalonia/AngorApp/App.axaml b/src/Angor/Avalonia/AngorApp/App.axaml
index 49ed6a7a5..c54c9a4a9 100644
--- a/src/Angor/Avalonia/AngorApp/App.axaml
+++ b/src/Angor/Avalonia/AngorApp/App.axaml
@@ -42,7 +42,7 @@
         </ResourceDictionary>
     </Application.Resources>
     <Application.Styles>
-        <StyleInclude Source="UI/Themes/New/NewTheme.axaml" />
+        <StyleInclude Source="UI/Themes/V2/Theme.axaml" />
     </Application.Styles>
 
     <Application.DataTemplates>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Sections/Home/HomeSectionView.axaml b/src/Angor/Avalonia/AngorApp/UI/Sections/Home/HomeSectionView.axaml
index 088e81da1..a38e270b3 100644
--- a/src/Angor/Avalonia/AngorApp/UI/Sections/Home/HomeSectionView.axaml
+++ b/src/Angor/Avalonia/AngorApp/UI/Sections/Home/HomeSectionView.axaml
@@ -13,7 +13,7 @@
                     <PathIcon Height="96" Width="96" Foreground="{DynamicResource Brand}" Data="{StaticResource BitcoinSymbol}" />
                     <TextBlock Classes="Title Strong Center">Fund Projects</TextBlock>
                     <TextBlock Classes="Subtitle Center">Discover and fund innovative Bitcoin projects on the Angor platform.</TextBlock>
-                    <EnhancedButton Command="{Binding FindProjects}" Icon="{Icon fa-search}" Content="Find Projects" Classes="Center Primary" />
+                    <EnhancedButton HorizontalAlignment="Center" Command="{Binding FindProjects}" Icon="{Icon fa-search}" Content="Find Projects" Classes="Center Primary" />
                 </StackPanel>
             </Border>
             <Border Classes="Panel">
@@ -31,7 +31,7 @@
                     <TextBlock Classes="Title Strong Center">Get Projects Funded</TextBlock>
                     <TextBlock Classes="Subtitle Center">Create and launch your own projects to raise funding.</TextBlock>
                     <WrapGrid RowSpacing="16" ColumnSpacing="16" HorizontalAlignment="Center">
-                        <EnhancedButton Command="{Binding CreateProject}" Content="Launch a Project" Classes="Center Primary" />
+                        <EnhancedButton HorizontalAlignment="Center" Command="{Binding CreateProject}" Content="Launch a Project" Classes="Primary" />
                     </WrapGrid>
                 </StackPanel>
             </Border>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/ClassicTheme.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/ClassicTheme.axaml
deleted file mode 100644
index aa902f7c1..000000000
--- a/src/Angor/Avalonia/AngorApp/UI/Themes/ClassicTheme.axaml
+++ /dev/null
@@ -1,64 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <FluentTheme>
-        <FluentTheme.Palettes>
-            <ColorPaletteResources x:Key="Light"
-                                   Accent="#086c81"
-                                   AltHigh="White"
-                                   AltLow="White"
-                                   AltMedium="White"
-                                   AltMediumHigh="White"
-                                   AltMediumLow="White"
-                                   BaseHigh="#FF022229"
-                                   BaseLow="#FFE6F1F2"
-                                   BaseMedium="#FF93BCC1"
-                                   BaseMediumHigh="#3E686D"
-                                   BaseMediumLow="#FFBAD5D9"
-                                   ChromeAltLow="#FF669CA1"
-                                   ChromeBlackHigh="Black"
-                                   ChromeBlackLow="#FFE6F1F2"
-                                   ChromeBlackMedium="#FF669CA1"
-                                   ChromeBlackMediumLow="#FF93BCC1"
-                                   ChromeDisabledHigh="#FFE6F1F2"
-                                   ChromeDisabledLow="#FF93BCC1"
-                                   ChromeGray="#FFBAD5D9"
-                                   ChromeHigh="#FFE6F1F2"
-                                   ChromeLow="#FFF2F8F9"
-                                   ChromeMedium="#FFEAF2F3"
-                                   ChromeMediumLow="#FFF2F8F9"
-                                   ChromeWhite="White"
-                                   ListLow="#FFEAF2F3"
-                                   ListMedium="#FFE6F1F2"
-                                   RegionColor="#CBDDE1" />
-
-            <ColorPaletteResources x:Key="Dark"
-                                   Accent="#85B9C4"
-                                   AltHigh="#ff0a0e0f"
-                                   AltLow="#ff151d20"
-                                   AltMedium="#ff1f2a2e"
-                                   AltMediumHigh="#ff293539"
-                                   AltMediumLow="#ff334044"
-                                   BaseHigh="#ffecf4f6"
-                                   BaseLow="#007179"
-                                   BaseMedium="#ff75b5c2"
-                                   BaseMediumHigh="#ff91c9d4"
-                                   BaseMediumLow="#ff3c8c9d"
-                                   ChromeAltLow="#ff91c9d4"
-                                   ChromeBlackHigh="#ff0a0e0f"
-                                   ChromeBlackLow="#ff91c9d4"
-                                   ChromeBlackMedium="#ff1f2a2e"
-                                   ChromeBlackMediumLow="#ff293539"
-                                   ChromeDisabledHigh="#ff046479"
-                                   ChromeDisabledLow="#ff75b5c2"
-                                   ChromeGray="#ff59a1b0"
-                                   ChromeHigh="#08c7e0"
-                                   ChromeLow="#083B46"
-                                   ChromeMedium="#ff023e54"
-                                   ChromeMediumLow="#ff083B46"
-                                   ChromeWhite="#ffe8f2f4"
-                                   ListLow="#ff083B46"
-                                   ListMedium="#ff046479"
-                                   RegionColor="#ff022229" />
-        </FluentTheme.Palettes>
-    </FluentTheme>
-</Styles>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Containers.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/New/Containers.axaml
deleted file mode 100644
index ac0af58ea..000000000
--- a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Containers.axaml
+++ /dev/null
@@ -1,78 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Design.PreviewWith>
-        <StackPanel Spacing="10">
-            <Border Padding="20">
-                <HeaderedContainer Classes="BlueThreshold" Header="Header">
-                    <EdgePanel StartContent="Label" EndContent="Value"></EdgePanel>
-                </HeaderedContainer>
-            </Border>
-            <ThemeVariantScope RequestedThemeVariant="Dark">
-                <Border Classes="BlueThreshold" Padding="20">
-                    <HeaderedContainer Classes="BlueThreshold" Header="Header">
-                        <EdgePanel StartContent="Label" EndContent="Value" />
-                    </HeaderedContainer>
-                </Border>
-            </ThemeVariantScope>
-        </StackPanel>
-    </Design.PreviewWith>
-
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-
-                <!-- Light -->
-                <ResourceDictionary x:Key="Light">
-                    <SolidColorBrush x:Key="BlueThreshold.ContainerBorderBrush" Color="#bfdbfe" />
-
-                    <LinearGradientBrush x:Key="BlueThreshold.ContainerBackground" StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Offset="0" Color="#eff6ff" />
-                        <GradientStop Offset="1" Color="#e0e7ff" />
-                    </LinearGradientBrush>
-
-                    <SolidColorBrush x:Key="BlueThreshold.IconBackground" Color="#2563eb" />
-                    <SolidColorBrush x:Key="BlueThreshold.LabelForeground" Color="#1e40af" />
-                    <SolidColorBrush x:Key="BlueThreshold.HelpForeground" Color="#1e40af" />
-                </ResourceDictionary>
-
-                <!-- Dark -->
-                <ResourceDictionary x:Key="Dark">
-                    <SolidColorBrush x:Key="BlueThreshold.ContainerBorderBrush" Color="#4a5a6a" />
-
-                    <LinearGradientBrush x:Key="BlueThreshold.ContainerBackground" StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Offset="0" Color="#1A2A3A" />
-                        <GradientStop Offset="1" Color="#2A1A3A" />
-                    </LinearGradientBrush>
-
-                    <SolidColorBrush x:Key="BlueThreshold.IconBackground" Color="#3b82f6" />
-
-                    <SolidColorBrush x:Key="BlueThreshold.LabelForeground" Color="#60a5fa" />
-                    <SolidColorBrush x:Key="BlueThreshold.HelpForeground" Color="#60a5fa" />
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-
-    <Style Selector="HeaderedContainer.BlueThreshold">
-        <Setter Property="CornerRadius" Value="12" />
-        <Setter Property="HeaderPadding" Value="24" />
-        <Setter Property="ContentPadding" Value="24 0 24 24" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BlueThreshold.ContainerBorderBrush}" />
-        <Setter Property="Background" Value="{DynamicResource BlueThreshold.ContainerBackground}" />
-    </Style>
-
-    <Style Selector="HeaderedContainer.Blue /template/ ContentPresenter#Header">
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Background" Value="{DynamicResource BlueThreshold.IconBackground}" />
-    </Style>
-
-    <Style Selector="HeaderedContainer.Blue EdgePanel ContentControl#StartContent">
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="FontWeight" Value="Medium" />
-        <Setter Property="Foreground" Value="{DynamicResource BlueThreshold.LabelForeground}" />
-    </Style>
-
-   
-</Styles>
\ No newline at end of file
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/Buttons.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/Buttons.axaml
deleted file mode 100644
index 3b3086691..000000000
--- a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/Buttons.axaml
+++ /dev/null
@@ -1,35 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <Styles.Resources>
-        <SolidColorBrush x:Key="ToggleButtonBackgroundChecked" Color="{DynamicResource Surface}" />
-        <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver" Color="{DynamicResource Stroke}" />
-        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="{DynamicResource Stroke}" />
-        <SolidColorBrush x:Key="ToggleButtonBackgroundIndeterminatePressed" Color="{DynamicResource Stroke}" />
-        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="{DynamicResource Stroke}" />
-        <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked" Color="{DynamicResource Stroke}" />
-    </Styles.Resources>
-
-    <Style Selector="ToggleButton.Widget">
-        <Setter Property="Height" Value="42" />
-        <Setter Property="Width" Value="42" />
-        <Setter Property="CornerRadius" Value="10" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Background" Value="{DynamicResource Surface}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
-    </Style>
-
-    <Design.PreviewWith>
-        <ThemeVariantScope RequestedThemeVariant="Dark">
-            <Border Padding="20" Background="{DynamicResource RegionBrush}" >
-                <ToggleButton Classes="Widget" IsChecked="True">
-                    <ToggleButton.Content>
-                        <PathIcon Foreground="{DynamicResource TextMuted}" Data="{DynamicResource Sun}" />
-                    </ToggleButton.Content>
-                </ToggleButton>
-            </Border>
-        </ThemeVariantScope>
-    </Design.PreviewWith>
-
-
-</Styles>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/NewTheme.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/New/NewTheme.axaml
deleted file mode 100644
index 0f70ede97..000000000
--- a/src/Angor/Avalonia/AngorApp/UI/Themes/New/NewTheme.axaml
+++ /dev/null
@@ -1,666 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-        xmlns:templates="clr-namespace:AngorApp.UI.Themes.New.Templates">
-
-    <FluentTheme />
-    <StyleInclude Source="avares://Zafiro.Avalonia/Styles.axaml" />
-    <StyleInclude Source="avares://Zafiro.Avalonia.Dialogs/Styles.axaml" />
-    <StyleInclude Source="avares://AsyncImageLoader.Avalonia/AdvancedImage.axaml" />
-
-    <StyleInclude Source="Custom/EnhancedButton.axaml" />
-    <StyleInclude Source="Custom/Buttons.axaml" />
-    <StyleInclude Source="Custom/ListBox.axaml" />
-    <StyleInclude Source="Custom/Wizard.axaml" />
-    <StyleInclude Source="Custom/CalendarPicker.axaml" />
-    <StyleInclude Source="Custom/NumericUpDown.axaml" />
-
-    <StyleInclude Source="/UI/Shared/Styles/Styles.axaml" />
-    <StyleInclude Source="/UI/Shared/Controls/Pane.axaml" />
-    <StyleInclude Source="/UI/Shared/Controls/AmountControl.axaml" />
-    <StyleInclude Source="/UI/Shared/Controls/List.axaml" />
-    <StyleInclude Source="/UI/Shared/Controls/IconLabel.axaml" />
-    <StyleInclude Source="/UI/Shared/Controls/ProjectCard.axaml" />
-    <StyleInclude Source="/UI/Shared/Controls/Feerate/FeerateSelector.axaml" />
-    <StyleInclude Source="/UI/Shared/Controls/ErrorSummary.axaml" />
-    <StyleInclude Source="/UI/Sections/Wallet/CreateAndImport/Steps/SeedWordsGeneration/SeedWordList.axaml" />
-    <StyleInclude Source="/UI/Shared/Controls/PageContainer.axaml" />
-    <StyleInclude Source="/UI/Shared/Controls/ScrollableView.axaml" />
-    <StyleInclude Source="/UI/Shared/Controls/Badge.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/Cards.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/OverlayBorder.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/TextBlock.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/ToggleButton.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/FlyoutPresenter.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/Button.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/Automation.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/SlimDataGrid.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/HeaderedContainer.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/EdgePanel.axaml" />
-    <StyleInclude Source="/UI/Shared/Styles/Border.axaml" />
-    <StyleInclude Source="Containers.axaml" />
-
-    <Styles.Resources>
-        <ResourceDictionary>
-
-            <Color x:Key="Accent">#2D5A3D</Color>
-            <Color x:Key="Dimmed">#9ca3af</Color>
-
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <Color x:Key="AppBackground">#faf9f6</Color>
-                    <Color x:Key="Surface">White</Color>
-                    <Color x:Key="Stroke">#19000000</Color>
-                    <Color x:Key="TextMuted">#6B7280</Color>
-                    <Color x:Key="TextStrong">#0A0A0A</Color>
-                    <Color x:Key="Brand">#2D5A3D</Color>
-                    <Color x:Key="Highlight">#2D5A3D</Color>
-                    <Color x:Key="BitcoinAccent">#F7931A</Color>
-                    <Color x:Key="SurfaceHover">#E9E9E9</Color>
-                    <Color x:Key="SurfaceSelected">White</Color>
-                    <Color x:Key="CardSurface">White</Color>
-                    <Color x:Key="SurfaceSubtle">#E5E7EB</Color>
-                    <Color x:Key="SurfaceSubtler">#FAF9F6</Color>
-                    <Color x:Key="DashColorHighlight">#606060</Color>
-
-                    <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush">#ef4444</SolidColorBrush>
-                    <SolidColorBrush x:Key="ErrorSoft" Color="#fee2e2" />
-                    <SolidColorBrush x:Key="ErrorHard" Color="#fecaca" />
-                    <SolidColorBrush x:Key="ErrorForeground" Color="#dc2626" />
-
-                    <BoxShadows x:Key="SectionShadow">0 0 30 0 LightGray</BoxShadows>
-                    <BoxShadows x:Key="ItemShadow">0 0 20 0 LightGray</BoxShadows>
-                    <BoxShadows x:Key="ItemShadowBig">0 5 25 0 LightGray</BoxShadows>
-
-                    <SolidColorBrush x:Key="PrimaryButtonForeground" Color="{StaticResource SurfaceHover}" />
-                    <SolidColorBrush x:Key="PrimaryButtonBackground" Color="{StaticResource TextStrong}" />
-                    <SolidColorBrush x:Key="PrimaryButtonBorder" Color="{StaticResource TextStrong}" />
-
-                    <SolidColorBrush x:Key="SecondaryButtonForeground" Color="{StaticResource TextStrong}" />
-                    <SolidColorBrush x:Key="SecondaryButtonBackground" Color="{StaticResource SurfaceHover}" />
-                    <SolidColorBrush x:Key="SecondaryButtonBorder" Color="{StaticResource TextStrong}" />
-
-                    <VisualBrush x:Key="TiledLogoBrush" Opacity="0.05" DestinationRect="0,0,72,72" Stretch="UniformToFill" TileMode="Tile">
-                        <VisualBrush.Visual>
-                            <Svg Path="/Assets/pattern.svg" />
-                        </VisualBrush.Visual>
-                    </VisualBrush>
-
-                    <LinearGradientBrush x:Key="Translucid" Opacity="0.5">
-                        <GradientStops>
-                            <GradientStop Color="#1A2D5A3D" Offset="0" />
-                            <GradientStop Color="#0D2D5A3D" Offset="1" />
-                        </GradientStops>
-                    </LinearGradientBrush>
-
-                    <LinearGradientBrush x:Key="TranslucidOrange" StartPoint="0%,0%" EndPoint="100%,100%">
-                        <GradientStops>
-                            <GradientStop Offset="0" Color="#fff7ed" />
-                            <GradientStop Offset="1" Color="#fff7ed" />
-                        </GradientStops>
-                    </LinearGradientBrush>
-
-
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Dark">
-                    <Color x:Key="AppBackground">#0A0A0A</Color>
-                    <Color x:Key="Surface">#B31A1A1A</Color>
-                    <Color x:Key="Stroke">#19FFFFFF</Color>
-                    <Color x:Key="TextMuted">#A0A0A0</Color>
-                    <Color x:Key="TextStrong">#FAFAFA</Color>
-                    <Color x:Key="Brand">#5FAF78</Color>
-                    <Color x:Key="Highlight">#E5E8E1</Color>
-                    <Color x:Key="BitcoinAccent">#F7931A</Color>
-                    <Color x:Key="SurfaceHover">#3A3A3A</Color>
-                    <Color x:Key="SurfaceSelected">#202020</Color>
-                    <Color x:Key="CardSurface">#2A2A2A</Color>
-                    <Color x:Key="SurfaceSubtle">#333333</Color>
-                    <Color x:Key="SurfaceSubtler">#0A0A0A</Color>
-                    <Color x:Key="DashColorHighlight">#FBBF24</Color>
-
-                    <SolidColorBrush x:Key="SystemControlErrorTextForegroundBrush">#ef4444</SolidColorBrush>
-                    <SolidColorBrush x:Key="ErrorSoft" Color="#667f1d1d" />
-                    <SolidColorBrush x:Key="ErrorHard" Color="#80991b1b" />
-                    <SolidColorBrush x:Key="ErrorForeground" Color="#80991b1b" />
-
-                    <SolidColorBrush x:Key="Translucid" Color="#0A0A0A" />
-
-                    <LinearGradientBrush x:Key="TranslucidOrange" StartPoint="0%,0%" EndPoint="100%,100%">
-                        <GradientStops>
-                            <GradientStop Offset="0" Color="#0EF7931A" />
-                            <GradientStop Offset="1" Color="#1AF7931A" />
-                        </GradientStops>
-                    </LinearGradientBrush>
-
-                    <LinearGradientBrush x:Key="ProgressBrush">
-                        <GradientStops>
-                            <GradientStop Offset="0" Color="{StaticResource Brand}" />
-                            <GradientStop Offset="1" Color="#7DCE96" />
-                        </GradientStops>
-                    </LinearGradientBrush>
-
-                    <BoxShadows x:Key="SectionShadow">0 0 0 0 Transparent</BoxShadows>
-                    <BoxShadows x:Key="ItemShadow">0 0 0 0 LightGray</BoxShadows>
-                    <BoxShadows x:Key="ItemShadowBig">0 0 0 0 LightGray</BoxShadows>
-
-                    <SolidColorBrush x:Key="PrimaryButtonForeground" Color="{StaticResource TextStrong}" />
-                    <LinearGradientBrush x:Key="PrimaryButtonBackground" Opacity="0.5">
-                        <GradientStops>
-                            <GradientStop Offset="0" Color="{StaticResource Stroke}" />
-                            <GradientStop Offset="1" Color="{StaticResource Surface}" />
-                        </GradientStops>
-                    </LinearGradientBrush>
-                    <SolidColorBrush x:Key="PrimaryButtonBorder" Color="{StaticResource Stroke}" />
-
-                    <SolidColorBrush x:Key="AccentButtonForeground" Color="{StaticResource SurfaceHover}" />
-                    <SolidColorBrush x:Key="AccentButtonBackground" Color="{StaticResource Accent}" />
-                    <SolidColorBrush x:Key="AccentButtonBorder" Color="{StaticResource Stroke}" />
-
-                    <SolidColorBrush x:Key="SecondaryButtonForeground" Color="{StaticResource TextStrong}" />
-                    <SolidColorBrush x:Key="SecondaryButtonBackground" Color="{StaticResource Surface}" />
-                    <SolidColorBrush x:Key="SecondaryButtonBorder" Color="{StaticResource Stroke}" />
-
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-            
-            <StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="Accent" />
-            <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" ResourceKey="Accent" />
-            <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="Accent" />
-            <Thickness x:Key="CheckBoxBorderThemeThickness">2</Thickness>
-            <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="Stroke" />
-            <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="Accent" />
-
-            <LinearGradientBrush x:Key="ProgressBrush">
-                <GradientStops>
-                    <GradientStop Offset="0" Color="#2D5A3D" />
-                    <GradientStop Offset="1" Color="#4A8F5F" />
-                </GradientStops>
-            </LinearGradientBrush>
-
-            <SolidColorBrush x:Key="AccentButtonForeground" Color="{StaticResource SurfaceHover}" />
-            <SolidColorBrush x:Key="AccentButtonBackground" Color="{StaticResource Accent}" />
-            <SolidColorBrush x:Key="AccentButtonBorder" Color="{StaticResource Accent}" />
-
-            <LinearGradientBrush x:Key="TranslucidBackground" StartPoint="0,0" EndPoint="1,1">
-                <GradientStop Color="#192D5A3D" Offset="0" />
-                <GradientStop Color="#102D5A3D" Offset="1" />
-            </LinearGradientBrush>
-
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="Icons.axaml" />
-                <ResourceInclude Source="Custom/ErrorSummary.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-
-            <ControlTheme x:Key="{x:Type TextBox}"
-                          TargetType="TextBox"
-                          BasedOn="{StaticResource {x:Type TextBox}}">
-                <Setter Property="CornerRadius" Value="8" />
-                <Setter Property="BorderThickness" Value="1" />
-                <Setter Property="BorderBrush" Value="{DynamicResource SurfaceSubtle}" />
-                <Setter Property="Background" Value="{DynamicResource Surface}" />
-                <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
-                <Setter Property="Padding" Value="14 12" />
-                <Style Selector="^ /template/ Border#PART_BorderElement">
-                    <Setter Property="Transitions">
-                        <Transitions>
-                            <BrushTransition Property="BorderBrush" Duration="0:0:0.2" />
-                            <BrushTransition Property="Background" Duration="0:0:0.2" />
-                        </Transitions>
-                    </Setter>
-                </Style>
-            </ControlTheme>
-
-            <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="{DynamicResource BitcoinAccent}" />
-            <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="{DynamicResource SurfaceHover}" />
-            <Thickness x:Key="TextControlBorderThemeThicknessFocused">1</Thickness>
-
-        </ResourceDictionary>
-    </Styles.Resources>
-
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
-        <Setter Property="IconOptions.Fill" Value="{DynamicResource TextMuted}" />
-    </Style>
-
-    <Style Selector="Border.Panel">
-        <Setter Property="CornerRadius" Value="20" />
-        <Setter Property="Padding" Value="20" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Background" Value="{DynamicResource Surface}" />
-    </Style>
-
-    <Style Selector="OverlayBorder.Panel">
-        <Setter Property="CornerRadius" Value="20" />
-        <Setter Property="Padding" Value="20" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Background" Value="{DynamicResource Surface}" />
-    </Style>
-
-    <Style Selector="SectionStrip.Nav SectionStripGroupHeader">
-        <Setter Property="Foreground" Value="{DynamicResource Brand}" />
-        <Setter Property="FontFamily" Value="Sans Serif" />
-        <Setter Property="FontWeight" Value="SemiLight" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="Margin" Value="10" />
-    </Style>
-
-    <Style Selector="SectionStrip.Nav SectionStripItem">
-        <Setter Property="CornerRadius" Value="10" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Padding" Value="8" />
-        <Setter Property="IconOptions.Fill" Value="{Binding $self.Foreground}" />
-        <Setter Property="Margin" Value="10" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
-        <Setter Property="ClipToBounds" Value="False" />
-        <Setter Property="BorderThickness" Value="1" />
-    </Style>
-
-    <Style Selector="SectionStrip.Nav SectionStripItem:pointerover">
-        <Setter Property="Background" Value="{DynamicResource SurfaceHover}" />
-    </Style>
-
-    <Style Selector="SectionStrip.Nav SectionStripItem:selected">
-        <Setter Property="Background" Value="{DynamicResource SurfaceSelected}" />
-        <Setter Property="Foreground" Value="{DynamicResource Highlight}" />
-    </Style>
-
-    <Style Selector="SectionStrip.Nav SectionStripItem:selected Border">
-        <Setter Property="BoxShadow" Value="{DynamicResource SectionShadow}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
-    </Style>
-
-    <Style Selector="TextBlock">
-        <Setter Property="TextWrapping" Value="Wrap" />
-    </Style>
-
-    <Style Selector="Run.Label">
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
-    </Style>
-
-    <Style Selector="Run.Thin">
-        <Setter Property="FontWeight" Value="SemiLight" />
-        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
-    </Style>
-
-    <Style Selector=":is(TemplatedControl).Center">
-        <Setter Property="HorizontalAlignment" Value="Center" />
-    </Style>
-
-    <!-- ═══════════════════════════════════════════════════════════════════════
-         TEXT STYLES - Atomic Classes (combinable, single responsibility)
-         Usage: <TextBlock Classes="Size-L Weight-Bold Text-Strong" />
-         ═══════════════════════════════════════════════════════════════════════ -->
-
-    <!-- Atomic: Size (FontSize only) -->
-    <Style Selector="TextBlock.Size-XXS">
-        <Setter Property="FontSize" Value="11" />
-    </Style>
-    <Style Selector="TextBlock.Size-XS">
-        <Setter Property="FontSize" Value="12" />
-    </Style>
-    <Style Selector="TextBlock.Size-S">
-        <Setter Property="FontSize" Value="14" />
-    </Style>
-    <Style Selector="TextBlock.Size-M">
-        <Setter Property="FontSize" Value="16" />
-    </Style>
-    <Style Selector="TextBlock.Size-L">
-        <Setter Property="FontSize" Value="18" />
-    </Style>
-    <Style Selector="TextBlock.Size-XL">
-        <Setter Property="FontSize" Value="25" />
-    </Style>
-    <Style Selector="TextBlock.Size-XXL">
-        <Setter Property="FontSize" Value="32" />
-    </Style>
-
-    <!-- Atomic: Weight (FontWeight only) -->
-    <Style Selector="TextBlock.Weight-Light">
-        <Setter Property="FontWeight" Value="SemiLight" />
-    </Style>
-    <Style Selector="TextBlock.Weight-Bold">
-        <Setter Property="FontWeight" Value="Bold" />
-    </Style>
-
-    <!-- Atomic: Color (Foreground only) -->
-    <Style Selector="TextBlock.Text-Strong">
-        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
-    </Style>
-    <Style Selector="TextBlock.Text-Muted">
-        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
-    </Style>
-    <Style Selector="TextBlock.Text-Dimmed">
-        <Setter Property="Foreground" Value="{DynamicResource Dimmed}" />
-    </Style>
-
-    <!-- ═══════════════════════════════════════════════════════════════════════
-         TEXT STYLES - Semantic Presets (convenience combos)
-         These are shortcuts for common combinations of atomic classes.
-         ═══════════════════════════════════════════════════════════════════════ -->
-
-    <!-- Title: Size-XL + Weight-Bold -->
-    <Style Selector="TextBlock.Title">
-        <Setter Property="FontSize" Value="25" />
-        <Setter Property="FontWeight" Value="Bold" />
-    </Style>
-
-    <!-- Subtitle: Size-L + Weight-Light -->
-    <Style Selector="TextBlock.Subtitle">
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="FontWeight" Value="SemiLight" />
-    </Style>
-
-    <!-- Header: Size-L + Weight-Bold + Text-Strong + NoWrap + Ellipsis -->
-    <Style Selector="TextBlock.Header">
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="TextWrapping" Value="NoWrap" />
-        <Setter Property="TextTrimming" Value="{x:Static TextTrimming.CharacterEllipsis}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
-    </Style>
-
-    <!-- Regular: Size-M + Weight-Light (body text) -->
-    <Style Selector="TextBlock.Regular">
-        <Setter Property="FontSize" Value="16" />
-        <Setter Property="FontWeight" Value="SemiLight" />
-    </Style>
-
-    <!-- Strong: Weight-Bold + Text-Strong (emphasis without size change) -->
-    <Style Selector="TextBlock.Strong">
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
-    </Style>
-
-    <!-- ═══════════════════════════════════════════════════════════════════════
-         TEXT STYLES - Legacy/Aliases (for backward compatibility)
-         Consider migrating to atomic classes over time.
-         ═══════════════════════════════════════════════════════════════════════ -->
-
-    <!-- Bold: Weight-Bold only -->
-    <Style Selector="TextBlock.Bold">
-        <Setter Property="FontWeight" Value="Bold" />
-    </Style>
-
-    <!-- Tiny: Size-XS only (prefer Size-XS) -->
-    <Style Selector="TextBlock.Tiny">
-        <Setter Property="FontSize" Value="11" />
-    </Style>
-
-    <!-- Thin: Weight very light -->
-    <Style Selector="TextBlock.Thin">
-        <Setter Property="FontWeight" Value="Thin" />
-    </Style>
-
-    <!-- Big: Size-L + Weight-Bold (prefer Size-L Weight-Bold) -->
-    <Style Selector="TextBlock.Big">
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="FontWeight" Value="Bold" />
-    </Style>
-
-    <Style Selector="EnhancedButton">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource PrimaryButtonBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryButtonBorder}" />
-        <Setter Property="IconOptions.Fill" Value="{Binding $self.Foreground}" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="CornerRadius" Value="10" />
-        <Setter Property="BorderThickness" Value="2" />
-    </Style>
-
-    <Style Selector="EnhancedButton.Primary">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource PrimaryButtonBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryButtonBorder}" />
-        <Setter Property="Padding" Value="24 12" />
-    </Style>
-
-    <Style Selector="EnhancedButton.Accent">
-        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorder}" />
-        <Setter Property="Padding" Value="24 12" />
-    </Style>
-
-    <Style Selector="EnhancedButton.Secondary">
-        <Setter Property="Foreground" Value="{DynamicResource SecondaryButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource SecondaryButtonBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryButtonBorder}" />
-        <Setter Property="Padding" Value="24 12" />
-    </Style>
-
-    <Style Selector="EnhancedButton.White">
-        <Setter Property="Padding" Value="24 12" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="Foreground" Value="{DynamicResource SecondaryButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource Surface}" />
-    </Style>
-
-    <Style Selector="EnhancedButton.Outline">
-        <Setter Property="Padding" Value="24 12" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Accent}" />
-        <Setter Property="BorderThickness" Value="2" />
-        <Setter Property="Foreground" Value="{DynamicResource Accent}" />
-        <Setter Property="Background" Value="Transparent" />
-    </Style>
-
-    <Style Selector="controls|ProgressRing">
-        <Setter Property="Foreground" Value="{DynamicResource Brand}" />
-    </Style>
-
-    <Style Selector="Border.Elevated">
-        <Setter Property="Background" Value="{DynamicResource CardSurface}" />
-        <Setter Property="BoxShadow" Value="{DynamicResource ItemShadow}" />
-        <Setter Property="Transitions">
-            <Transitions>
-                <BoxShadowsTransition Property="BoxShadow" Duration="0:0:1" />
-            </Transitions>
-        </Setter>
-    </Style>
-    <Style Selector="Border.Elevated:pointerover">
-        <Setter Property="BoxShadow" Value="{DynamicResource ItemShadowBig}" />
-    </Style>
-    <Style Selector="Border.Interactive">
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="Transitions">
-            <Transitions>
-                <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.125" />
-            </Transitions>
-        </Setter>
-        <Setter Property="RenderTransform" Value="translate(0px, 0px)" />
-    </Style>
-    <Style Selector="Border.Interactive:pointerover">
-        <Setter Property="RenderTransform" Value="translate(0px, -3px)" />
-    </Style>
-
-    <Style Selector="HeaderedContainer.Title /template/ ContentControl#Header">
-        <Setter Property="FontSize" Value="25" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
-    </Style>
-
-    <Style Selector="Frame">
-        <Setter Property="Template">
-            <ControlTemplate>
-                <DockPanel VerticalSpacing="25">
-                    <EnhancedButton Command="{Binding $parent[Frame].Navigator.Back}"
-                                    Margin="20"
-                                    x:Name="BackButton"
-                                    Classes="Outline"
-                                    DockPanel.Dock="Top"
-                                    Content="{TemplateBinding BackButtonContent}">
-                        <Button.IsVisible>
-                            <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                <Binding Path="$parent[Frame].IsBackButtonVisible" />
-                                <Binding Path="$self.IsEffectivelyEnabled" />
-                            </MultiBinding>
-                        </Button.IsVisible>
-                    </EnhancedButton>
-                    <ContentControl Margin="{TemplateBinding Padding}" Content="{Binding $parent[Frame].Navigator.Content^,  FallbackValue='No content', TargetNullValue='Navigator.Content is a null'}" />
-                </DockPanel>
-            </ControlTemplate>
-        </Setter>
-        <Setter Property="BackButtonContent">
-            <Setter.Value>
-                <Template>
-                    <DockPanel HorizontalSpacing="8">
-                        <ContentControl Content="{Icon fa-angle-left}" />
-                        <TextBlock VerticalAlignment="Center">Back</TextBlock>
-                    </DockPanel>
-                </Template>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- Wizard HeaderedContainer Styles -->
-    <Style Selector="HeaderedContainer.WizardSection">
-        <Setter Property="CornerRadius" Value="10" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
-        <Setter Property="HeaderBackground" Value="{DynamicResource SurfaceSubtler}" />
-        <Setter Property="Background" Value="{DynamicResource Surface}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
-        <Setter Property="HeaderPadding" Value="24 12" />
-        <Setter Property="ContentPadding" Value="24" />
-    </Style>
-
-    <Style Selector="HeaderedContainer.Translucid">
-        <Setter Property="ContentPadding" Value="24 0 24 24" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Accent}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="HeaderPadding" Value="24" />
-        <Setter Property="CornerRadius" Value="10" />
-        <Setter Property="Foreground" Value="{DynamicResource Accent}" />
-        <Setter Property="Background" Value="{StaticResource TranslucidBackground}" />
-    </Style>
-
-    <Style Selector="HeaderedContainer.Translucid /template/ ContentPresenter#Header EdgePanel /template/ ContentControl#StartContent">
-        <Setter Property="IconOptions.Background" Value="{DynamicResource Accent}" />
-    </Style>
-
-    <Style Selector="HeaderedContainer.WizardSection /template/ ContentPresenter#Header EdgePanel /template/ ContentControl#StartContent">
-        <Setter Property="IconOptions.Background" Value="{DynamicResource Accent}" />
-    </Style>
-
-    <Style Selector="HeaderedContainer /template/ ContentPresenter#Header EdgePanel /template/ ContentControl#StartContent">
-        <Setter Property="IconOptions.Size" Value="20" />
-        <Setter Property="IconOptions.Fill" Value="White" />
-        <Setter Property="IconOptions.Padding" Value="10" />
-        <Setter Property="IconOptions.CornerRadius" Value="10" />
-    </Style>
-
-    <Style Selector="Border.Translucid">
-        <Setter Property="Padding" Value="20" />
-        <Setter Property="CornerRadius" Value="10" />
-        <Setter Property="BorderBrush" Value="#3F22005A" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Background" Value="{StaticResource TranslucidBackground}" />
-    </Style>
-
-    <Style Selector="HeaderedContainer.WizardHighlight">
-        <Setter Property="CornerRadius" Value="12" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BitcoinAccent}" />
-        <Setter Property="Background" Value="{DynamicResource TranslucidOrange}" />
-        <Setter Property="HeaderPadding" Value="24" />
-        <Setter Property="ContentPadding" Value="24 0 24 24" />
-        <Setter Property="Foreground" Value="{DynamicResource BitcoinAccent}" />
-    </Style>
-
-    <Style Selector="HeaderedContainer.WizardHighlight /template/ ContentPresenter#Header EdgePanel /template/ ContentControl#StartContent">
-        <Setter Property="IconOptions.Background" Value="{DynamicResource BitcoinAccent}" />
-    </Style>
-
-    <Style Selector="HeaderedContainer.WizardHighlight EdgePanel ContentControl#EndContent">
-        <Setter Property="Foreground" Value="{DynamicResource BitcoinAccent}" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="HorizontalAlignment" Value="Right" />
-    </Style>
-
-    <Style Selector="EnhancedButton.Widget">
-        <Setter Property="Background" Value="{DynamicResource Surface}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
-        <Setter Property="Padding" Value="10" />
-    </Style>
-    <Style Selector="ComboBox">
-        <Setter Property="Background" Value="{DynamicResource Surface}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
-        <Setter Property="CornerRadius" Value="10" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
-        <Setter Property="Padding" Value="12" />
-        <Setter Property="FontWeight" Value="Bold"></Setter>
-    </Style>
-    <Style Selector="ComboBox:pointerover /template/ Border">
-        <Setter Property="Background" Value="{DynamicResource Surface}" />
-    </Style>
-
-    <Style Selector="CheckBox">
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Grid x:Name="RootGrid" ColumnDefinitions="24,*">
-                    <Border x:Name="PART_Border"
-                            Grid.ColumnSpan="2"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}" />
-
-                    <Grid VerticalAlignment="Top" Height="{DynamicResource CheckBoxMinHeight}">
-                        <Border x:Name="NormalRectangle"
-                                BorderBrush="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}"
-                                Background="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}"
-                                BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                UseLayoutRounding="False"
-                                Height="24"
-                                Width="24" />
-
-                        <Viewbox UseLayoutRounding="False">
-                            <Panel>
-                                <Panel Height="16" Width="16" />
-                                <Path x:Name="CheckGlyph"
-                                      Opacity="0"
-                                      Fill="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}"
-                                      Stretch="Uniform"
-                                      VerticalAlignment="Center"
-                                      FlowDirection="LeftToRight" />
-                            </Panel>
-                        </Viewbox>
-                    </Grid>
-                    <ContentPresenter x:Name="PART_ContentPresenter"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}"
-                                      Content="{TemplateBinding Content}"
-                                      Margin="{TemplateBinding Padding}"
-                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      TextWrapping="Wrap"
-                                      Grid.Column="1" />
-                </Grid>
-            </ControlTemplate>
-        </Setter>
-    </Style>
-
-    <Style Selector=":is(Control).Padded">
-        <Setter Property="Margin" Value="20 0" />
-    </Style>
-
-    <Design.PreviewWith>
-        <WrapPanel ItemWidth="800">
-            <ThemeVariantScope RequestedThemeVariant="Light">
-                <templates:Showcase Background="{DynamicResource AppBackground}" />
-            </ThemeVariantScope>
-            <ThemeVariantScope RequestedThemeVariant="Dark">
-                <templates:Showcase Background="{DynamicResource AppBackground}" />
-            </ThemeVariantScope>
-            <controls:ProgressRing />
-        </WrapPanel>
-    </Design.PreviewWith>
-
-</Styles>
\ No newline at end of file
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/ButtonStylesTemplate.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/ButtonStylesTemplate.axaml
deleted file mode 100644
index 6b8547d44..000000000
--- a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/ButtonStylesTemplate.axaml
+++ /dev/null
@@ -1,105 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia">
-
-    <StyleInclude Source="NewTheme.LocalOnly.axaml" />
-
-    <Style Selector="WrapPanel">
-        <Setter Property="ItemSpacing" Value="12" />
-    </Style>
-    
-    <Design.PreviewWith>
-        <WrapPanel ItemWidth="620">
-            <ThemeVariantScope RequestedThemeVariant="Light">
-                <Border Padding="24" Background="{DynamicResource AppBackground}">
-                    <StackPanel Spacing="16">
-                        <TextBlock Classes="Title">Buttons</TextBlock>
-                        <TextBlock Classes="Subtitle">NewTheme (local-only) – style classes</TextBlock>
-
-                        <Border Classes="Panel">
-                            <StackPanel Spacing="16">
-                                <TextBlock Classes="Header">EnhancedButton</TextBlock>
-                                <WrapPanel>
-                                    <StackPanel Spacing="6">
-                                        <TextBlock Classes="Strong">Default</TextBlock>
-                                        <EnhancedButton Content="Primary (default)" />
-                                        <EnhancedButton Content="Primary (disabled)" IsEnabled="False" />
-                                    </StackPanel>
-
-                                    <StackPanel Spacing="6">
-                                        <TextBlock Classes="Strong">Accent</TextBlock>
-                                        <EnhancedButton Content="Accent" Classes="Accent" />
-                                        <EnhancedButton Content="Accent (disabled)" Classes="Accent" IsEnabled="False" />
-                                    </StackPanel>
-
-                                    <StackPanel Spacing="6">
-                                        <TextBlock Classes="Strong">Secondary</TextBlock>
-                                        <EnhancedButton Content="Secondary" Classes="Secondary" />
-                                        <EnhancedButton Content="Secondary (disabled)" Classes="Secondary" IsEnabled="False" />
-                                    </StackPanel>
-
-                                    <StackPanel Spacing="6">
-                                        <TextBlock Classes="Strong">Outline</TextBlock>
-                                        <EnhancedButton Content="Outline" Classes="Outline" />
-                                        <EnhancedButton Content="Outline (disabled)" Classes="Outline" IsEnabled="False" />
-                                    </StackPanel>
-                                </WrapPanel>
-
-                                <TextBlock Classes="Header">ToggleButton</TextBlock>
-                                <WrapPanel>
-                                    <StackPanel Spacing="6">
-                                        <TextBlock Classes="Strong">Widget (unchecked)</TextBlock>
-                                        <ToggleButton Classes="Widget">
-                                            <PathIcon Foreground="{DynamicResource TextMuted}" Data="{DynamicResource Sun}" />
-                                        </ToggleButton>
-                                    </StackPanel>
-
-                                    <StackPanel Spacing="6">
-                                        <TextBlock Classes="Strong">Widget (checked)</TextBlock>
-                                        <ToggleButton Classes="Widget" IsChecked="True">
-                                            <PathIcon Foreground="{DynamicResource TextMuted}" Data="{DynamicResource Sun}" />
-                                        </ToggleButton>
-                                    </StackPanel>
-
-                                    <StackPanel Spacing="6">
-                                        <TextBlock Classes="Strong">Widget (disabled)</TextBlock>
-                                        <ToggleButton Classes="Widget" IsEnabled="False">
-                                            <PathIcon Foreground="{DynamicResource TextMuted}" Data="{DynamicResource Sun}" />
-                                        </ToggleButton>
-                                    </StackPanel>
-                                </WrapPanel>
-
-                                <TextBlock Classes="Header">ProgressRing</TextBlock>
-                                <controls:ProgressRing Width="32" Height="32" />
-                            </StackPanel>
-                        </Border>
-                    </StackPanel>
-                </Border>
-            </ThemeVariantScope>
-
-            <ThemeVariantScope RequestedThemeVariant="Dark">
-                <Border Padding="24" Background="{DynamicResource AppBackground}">
-                    <StackPanel Spacing="16">
-                        <TextBlock Classes="Title">Buttons</TextBlock>
-                        <TextBlock Classes="Subtitle">Dark variant preview</TextBlock>
-
-                        <Border Classes="Panel">
-                            <StackPanel Spacing="12">
-                                <WrapPanel>
-                                    <EnhancedButton Content="Primary" />
-                                    <EnhancedButton Content="Accent" Classes="Accent" />
-                                    <EnhancedButton Content="Secondary" Classes="Secondary" />
-                                    <EnhancedButton Content="Outline" Classes="Outline" />
-                                    <ToggleButton Classes="Widget" IsChecked="True">
-                                        <PathIcon Foreground="{DynamicResource TextMuted}" Data="{DynamicResource Sun}" />
-                                    </ToggleButton>
-                                </WrapPanel>
-                                <controls:ProgressRing Width="32" Height="32" />
-                            </StackPanel>
-                        </Border>
-                    </StackPanel>
-                </Border>
-            </ThemeVariantScope>
-        </WrapPanel>
-    </Design.PreviewWith>
-</Styles>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/ColorsAndBrushesTemplate.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/ColorsAndBrushesTemplate.axaml
deleted file mode 100644
index 2c7bf558a..000000000
--- a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/ColorsAndBrushesTemplate.axaml
+++ /dev/null
@@ -1,191 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <StyleInclude Source="NewTheme.LocalOnly.axaml" />
-    
-    <Style Selector="WrapPanel">
-        <Setter Property="ItemSpacing" Value="12" />
-    </Style>
-
-    <Design.PreviewWith>
-        <WrapPanel ItemWidth="760">
-            <ThemeVariantScope RequestedThemeVariant="Light">
-                <Border Padding="24" Background="{DynamicResource AppBackground}">
-                    <StackPanel Spacing="16">
-                        <TextBlock Classes="Title">Colors &amp; Brushes</TextBlock>
-                        <TextBlock Classes="Subtitle">NewTheme (local-only) – resource keys</TextBlock>
-
-                        <Border Classes="Panel">
-                            <StackPanel Spacing="18">
-                                <TextBlock Classes="Header">Colors (Color resources)</TextBlock>
-                                <Grid ColumnDefinitions="220,80,*"
-                                      RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"
-                                      ColumnSpacing="16" RowSpacing="10">
-
-                                    <TextBlock Grid.Row="0" Grid.Column="0" Classes="Strong">Key</TextBlock>
-                                    <TextBlock Grid.Row="0" Grid.Column="1" Classes="Strong">Swatch</TextBlock>
-                                    <TextBlock Grid.Row="0" Grid.Column="2" Classes="Strong">Typical usage</TextBlock>
-
-                                    <TextBlock Grid.Row="1" Grid.Column="0" Classes="Strong">AppBackground</TextBlock>
-                                    <Border Grid.Row="1" Grid.Column="1" CornerRadius="6" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" Height="24">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource AppBackground}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <TextBlock Grid.Row="1" Grid.Column="2" Classes="Regular">App/page background.</TextBlock>
-
-                                    <TextBlock Grid.Row="2" Grid.Column="0" Classes="Strong">Surface</TextBlock>
-                                    <Border Grid.Row="2" Grid.Column="1" CornerRadius="6" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" Height="24">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource Surface}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <TextBlock Grid.Row="2" Grid.Column="2" Classes="Regular">Panels, cards, containers.</TextBlock>
-
-                                    <TextBlock Grid.Row="3" Grid.Column="0" Classes="Strong">CardSurface</TextBlock>
-                                    <Border Grid.Row="3" Grid.Column="1" CornerRadius="6" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" Height="24">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource CardSurface}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <TextBlock Grid.Row="3" Grid.Column="2" Classes="Regular">Elevated surfaces and cards.</TextBlock>
-
-                                    <TextBlock Grid.Row="4" Grid.Column="0" Classes="Strong">SurfaceHover</TextBlock>
-                                    <Border Grid.Row="4" Grid.Column="1" CornerRadius="6" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" Height="24">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource SurfaceHover}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <TextBlock Grid.Row="4" Grid.Column="2" Classes="Regular">Hover background states.</TextBlock>
-
-                                    <TextBlock Grid.Row="5" Grid.Column="0" Classes="Strong">SurfaceSelected</TextBlock>
-                                    <Border Grid.Row="5" Grid.Column="1" CornerRadius="6" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" Height="24">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource SurfaceSelected}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <TextBlock Grid.Row="5" Grid.Column="2" Classes="Regular">Selected items, active surfaces.</TextBlock>
-
-                                    <TextBlock Grid.Row="6" Grid.Column="0" Classes="Strong">SurfaceSubtle</TextBlock>
-                                    <Border Grid.Row="6" Grid.Column="1" CornerRadius="6" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" Height="24">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource SurfaceSubtle}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <TextBlock Grid.Row="6" Grid.Column="2" Classes="Regular">Subtle separators and neutral fills.</TextBlock>
-
-                                    <TextBlock Grid.Row="7" Grid.Column="0" Classes="Strong">Stroke</TextBlock>
-                                    <Border Grid.Row="7" Grid.Column="1" CornerRadius="6" BorderThickness="2" Height="24">
-                                        <Border.BorderBrush>
-                                            <SolidColorBrush Color="{DynamicResource Stroke}" />
-                                        </Border.BorderBrush>
-                                    </Border>
-                                    <TextBlock Grid.Row="7" Grid.Column="2" Classes="Regular">Borders, separators, outlines.</TextBlock>
-
-                                    <TextBlock Grid.Row="8" Grid.Column="0" Classes="Strong">TextMuted</TextBlock>
-                                    <Border Grid.Row="8" Grid.Column="1" CornerRadius="6" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" Height="24">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource TextMuted}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <TextBlock Grid.Row="8" Grid.Column="2" Classes="Regular">Secondary text, hints, metadata.</TextBlock>
-
-                                    <TextBlock Grid.Row="9" Grid.Column="0" Classes="Strong">TextStrong</TextBlock>
-                                    <Border Grid.Row="9" Grid.Column="1" CornerRadius="6" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" Height="24">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource TextStrong}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <TextBlock Grid.Row="9" Grid.Column="2" Classes="Regular">Primary text and emphasis.</TextBlock>
-
-                                    <TextBlock Grid.Row="10" Grid.Column="0" Classes="Strong">Accent / Brand</TextBlock>
-                                    <Border Grid.Row="10" Grid.Column="1" CornerRadius="6" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" Height="24">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource Brand}" />
-                                        </Border.Background>
-                                    </Border>
-                                    <TextBlock Grid.Row="10" Grid.Column="2" Classes="Regular">Brand highlights, accents, progress.</TextBlock>
-                                </Grid>
-
-                                <TextBlock Classes="Header">Brushes</TextBlock>
-                                <Grid ColumnDefinitions="220,160,*"
-                                      RowDefinitions="Auto,Auto,Auto,Auto,Auto"
-                                      ColumnSpacing="16" RowSpacing="10">
-                                    <TextBlock Grid.Row="0" Grid.Column="0" Classes="Strong">Key</TextBlock>
-                                    <TextBlock Grid.Row="0" Grid.Column="1" Classes="Strong">Swatch</TextBlock>
-                                    <TextBlock Grid.Row="0" Grid.Column="2" Classes="Strong">Typical usage</TextBlock>
-
-                                    <TextBlock Grid.Row="1" Grid.Column="0" Classes="Strong">ProgressBrush</TextBlock>
-                                    <Border Grid.Row="1" Grid.Column="1" CornerRadius="6" Height="24" Background="{DynamicResource ProgressBrush}" />
-                                    <TextBlock Grid.Row="1" Grid.Column="2" Classes="Regular">Progress indicators / gradients.</TextBlock>
-
-                                    <TextBlock Grid.Row="2" Grid.Column="0" Classes="Strong">PrimaryButton*</TextBlock>
-                                    <Border Grid.Row="2" Grid.Column="1" CornerRadius="6" Height="24" Background="{DynamicResource PrimaryButtonBackground}" BorderBrush="{DynamicResource PrimaryButtonBorder}" BorderThickness="1" />
-                                    <TextBlock Grid.Row="2" Grid.Column="2" Classes="Regular">Primary buttons (default EnhancedButton).</TextBlock>
-
-                                    <TextBlock Grid.Row="3" Grid.Column="0" Classes="Strong">AccentButton*</TextBlock>
-                                    <Border Grid.Row="3" Grid.Column="1" CornerRadius="6" Height="24" Background="{DynamicResource AccentButtonBackground}" BorderBrush="{DynamicResource AccentButtonBorder}" BorderThickness="1" />
-                                    <TextBlock Grid.Row="3" Grid.Column="2" Classes="Regular">Accent buttons (EnhancedButton.Classes=&quot;Accent&quot;).</TextBlock>
-
-                                    <TextBlock Grid.Row="4" Grid.Column="0" Classes="Strong">SecondaryButton*</TextBlock>
-                                    <Border Grid.Row="4" Grid.Column="1" CornerRadius="6" Height="24" Background="{DynamicResource SecondaryButtonBackground}" BorderBrush="{DynamicResource SecondaryButtonBorder}" BorderThickness="1" />
-                                    <TextBlock Grid.Row="4" Grid.Column="2" Classes="Regular">Secondary buttons (EnhancedButton.Classes=&quot;Secondary&quot;).</TextBlock>
-                                </Grid>
-
-                                <TextBlock Classes="Header">Shadows (BoxShadows)</TextBlock>
-                                <WrapPanel>
-                                    <Border Width="180" Height="70" CornerRadius="12" Background="{DynamicResource CardSurface}" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" BoxShadow="{DynamicResource SectionShadow}">
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Classes="Regular">SectionShadow</TextBlock>
-                                    </Border>
-                                    <Border Width="180" Height="70" CornerRadius="12" Background="{DynamicResource CardSurface}" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" BoxShadow="{DynamicResource ItemShadow}">
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Classes="Regular">ItemShadow</TextBlock>
-                                    </Border>
-                                    <Border Width="180" Height="70" CornerRadius="12" Background="{DynamicResource CardSurface}" BorderBrush="{DynamicResource Stroke}" BorderThickness="1" BoxShadow="{DynamicResource ItemShadowBig}">
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Classes="Regular">ItemShadowBig</TextBlock>
-                                    </Border>
-                                </WrapPanel>
-                            </StackPanel>
-                        </Border>
-                    </StackPanel>
-                </Border>
-            </ThemeVariantScope>
-
-            <ThemeVariantScope RequestedThemeVariant="Dark">
-                <Border Padding="24" Background="{DynamicResource AppBackground}">
-                    <StackPanel Spacing="16">
-                        <TextBlock Classes="Title">Colors &amp; Brushes</TextBlock>
-                        <TextBlock Classes="Subtitle">Dark variant preview</TextBlock>
-
-                        <Border Classes="Panel">
-                            <StackPanel Spacing="12">
-                                <TextBlock Classes="Header">Primary surfaces</TextBlock>
-                                <WrapPanel>
-                                    <Border Width="140" Height="60" CornerRadius="12">
-                                        <Border.Background>
-                                            <SolidColorBrush Color="{DynamicResource Surface}" />
-                                        </Border.Background>
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Classes="Regular">Surface</TextBlock>
-                                    </Border>
-                                    <Border Width="140" Height="60" CornerRadius="12" Background="{DynamicResource SurfaceHover}">
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Classes="Regular">SurfaceHover</TextBlock>
-                                    </Border>
-                                    <Border Width="140" Height="60" CornerRadius="12" Background="{DynamicResource ProgressBrush}">
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Classes="Regular">ProgressBrush</TextBlock>
-                                    </Border>
-                                </WrapPanel>
-
-                                <TextBlock Classes="Header">Buttons</TextBlock>
-                                <WrapPanel>
-                                    <EnhancedButton Content="Primary" />
-                                    <EnhancedButton Content="Accent" Classes="Accent" />
-                                    <EnhancedButton Content="Secondary" Classes="Secondary" />
-                                    <EnhancedButton Content="Outline" Classes="Outline" />
-                                </WrapPanel>
-                            </StackPanel>
-                        </Border>
-                    </StackPanel>
-                </Border>
-            </ThemeVariantScope>
-        </WrapPanel>
-    </Design.PreviewWith>
-</Styles>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/NewTheme.LocalOnly.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/NewTheme.LocalOnly.axaml
deleted file mode 100644
index c447b4411..000000000
--- a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/NewTheme.LocalOnly.axaml
+++ /dev/null
@@ -1,192 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia">
-
-    <FluentTheme />
-
-    <StyleInclude Source="../Custom/EnhancedButton.axaml" />
-    <StyleInclude Source="../Custom/Buttons.axaml" />
-
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <Color x:Key="AppBackground">#F9F9F9</Color>
-                    <Color x:Key="Surface">White</Color>
-                    <Color x:Key="Stroke">#19000000</Color>
-                    <Color x:Key="TextMuted">#6B7280</Color>
-                    <Color x:Key="TextStrong">#0A0A0A</Color>
-                    <Color x:Key="Accent">#2D5A3D</Color>
-                    <Color x:Key="Brand">#2D5A3D</Color>
-                    <Color x:Key="BitcoinAccent">#F7931A</Color>
-                    <Color x:Key="SurfaceHover">#E9E9E9</Color>
-                    <Color x:Key="SurfaceSelected">White</Color>
-                    <Color x:Key="CardSurface">White</Color>
-                    <Color x:Key="SurfaceSubtle">#E5E7EB</Color>
-
-                    <LinearGradientBrush x:Key="ProgressBrush">
-                        <GradientStops>
-                            <GradientStop Offset="0" Color="#2D5A3D" />
-                            <GradientStop Offset="1" Color="#4A8F5F" />
-                        </GradientStops>
-                    </LinearGradientBrush>
-
-                    <BoxShadows x:Key="SectionShadow">0 0 30 0 LightGray</BoxShadows>
-                    <BoxShadows x:Key="ItemShadow">0 0 20 0 LightGray</BoxShadows>
-                    <BoxShadows x:Key="ItemShadowBig">0 5 25 0 LightGray</BoxShadows>
-
-                    <SolidColorBrush x:Key="PrimaryButtonForeground" Color="{StaticResource SurfaceHover}" />
-                    <SolidColorBrush x:Key="PrimaryButtonBackground" Color="{StaticResource TextStrong}" />
-                    <SolidColorBrush x:Key="PrimaryButtonBorder" Color="{StaticResource TextStrong}" />
-
-                    <SolidColorBrush x:Key="AccentButtonForeground" Color="{StaticResource SurfaceHover}" />
-                    <SolidColorBrush x:Key="AccentButtonBackground" Color="{StaticResource Accent}" />
-                    <SolidColorBrush x:Key="AccentButtonBorder" Color="{StaticResource Accent}" />
-
-                    <SolidColorBrush x:Key="SecondaryButtonForeground" Color="{StaticResource TextStrong}" />
-                    <SolidColorBrush x:Key="SecondaryButtonBackground" Color="{StaticResource SurfaceHover}" />
-                    <SolidColorBrush x:Key="SecondaryButtonBorder" Color="{StaticResource TextStrong}" />
-                </ResourceDictionary>
-
-                <ResourceDictionary x:Key="Dark">
-                    <Color x:Key="AppBackground">#0A0A0A</Color>
-                    <Color x:Key="Surface">#B31A1A1A</Color>
-                    <Color x:Key="Stroke">#19FFFFFF</Color>
-                    <Color x:Key="TextMuted">#A0A0A0</Color>
-                    <Color x:Key="TextStrong">#FAFAFA</Color>
-                    <Color x:Key="Accent">#E5E8E1</Color>
-                    <Color x:Key="Brand">#5FAF78</Color>
-                    <Color x:Key="BitcoinAccent">#F7931A</Color>
-                    <Color x:Key="SurfaceHover">#3A3A3A</Color>
-                    <Color x:Key="SurfaceSelected">#202020</Color>
-                    <Color x:Key="CardSurface">#2A2A2A</Color>
-                    <Color x:Key="SurfaceSubtle">#333333</Color>
-
-                    <LinearGradientBrush x:Key="ProgressBrush">
-                        <GradientStops>
-                            <GradientStop Offset="0" Color="{StaticResource Brand}" />
-                            <GradientStop Offset="1" Color="#7DCE96" />
-                        </GradientStops>
-                    </LinearGradientBrush>
-
-                    <BoxShadows x:Key="SectionShadow">0 0 0 0 Transparent</BoxShadows>
-                    <BoxShadows x:Key="ItemShadow">0 0 0 0 LightGray</BoxShadows>
-                    <BoxShadows x:Key="ItemShadowBig">0 0 0 0 LightGray</BoxShadows>
-
-                    <SolidColorBrush x:Key="PrimaryButtonForeground" Color="{StaticResource TextStrong}" />
-                    <LinearGradientBrush x:Key="PrimaryButtonBackground" Opacity="0.5">
-                        <GradientStops>
-                            <GradientStop Offset="0" Color="{StaticResource Stroke}" />
-                            <GradientStop Offset="1" Color="{StaticResource Surface}" />
-                        </GradientStops>
-                    </LinearGradientBrush>
-                    <SolidColorBrush x:Key="PrimaryButtonBorder" Color="{StaticResource Stroke}" />
-
-                    <SolidColorBrush x:Key="AccentButtonForeground" Color="{StaticResource SurfaceHover}" />
-                    <SolidColorBrush x:Key="AccentButtonBackground" Color="{StaticResource Accent}" />
-                    <SolidColorBrush x:Key="AccentButtonBorder" Color="{StaticResource Stroke}" />
-
-                    <SolidColorBrush x:Key="SecondaryButtonForeground" Color="{StaticResource TextStrong}" />
-                    <SolidColorBrush x:Key="SecondaryButtonBackground" Color="{StaticResource Surface}" />
-                    <SolidColorBrush x:Key="SecondaryButtonBorder" Color="{StaticResource Stroke}" />
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="../Icons.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-
-    <Style Selector="TextBlock">
-        <Setter Property="TextWrapping" Value="Wrap" />
-    </Style>
-
-    <Style Selector="Run.Label">
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
-    </Style>
-
-    <Style Selector="Run.Thin">
-        <Setter Property="FontWeight" Value="SemiLight" />
-        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
-    </Style>
-
-    <Style Selector="TextBlock.Title">
-        <Setter Property="FontSize" Value="25" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
-    </Style>
-
-    <Style Selector="TextBlock.Regular">
-        <Setter Property="FontSize" Value="16" />
-        <Setter Property="FontWeight" Value="SemiLight" />
-    </Style>
-
-    <Style Selector="TextBlock.Big">
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
-    </Style>
-
-    <Style Selector="TextBlock.Subtitle">
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="FontWeight" Value="SemiLight" />
-    </Style>
-
-    <Style Selector="TextBlock.Strong">
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
-    </Style>
-
-    <Style Selector="TextBlock.Header">
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="TextWrapping" Value="NoWrap" />
-        <Setter Property="TextTrimming" Value="{x:Static TextTrimming.CharacterEllipsis}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
-    </Style>
-
-    <Style Selector="Border.Panel">
-        <Setter Property="CornerRadius" Value="20" />
-        <Setter Property="Padding" Value="20" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Background" Value="{DynamicResource Surface}" />
-    </Style>
-
-    <Style Selector="EnhancedButton">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource PrimaryButtonBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryButtonBorder}" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="CornerRadius" Value="10" />
-        <Setter Property="BorderThickness" Value="2" />
-    </Style>
-
-    <Style Selector="EnhancedButton.Accent">
-        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorder}" />
-        <Setter Property="Padding" Value="24 12" />
-    </Style>
-
-    <Style Selector="EnhancedButton.Secondary">
-        <Setter Property="Foreground" Value="{DynamicResource SecondaryButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource SecondaryButtonBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryButtonBorder}" />
-        <Setter Property="Padding" Value="24 12" />
-    </Style>
-
-    <Style Selector="EnhancedButton.Outline">
-        <Setter Property="Padding" Value="24 12" />
-        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Foreground" Value="{DynamicResource SecondaryButtonForeground}" />
-        <Setter Property="Background" Value="{DynamicResource Surface}" />
-    </Style>
-
-    <Style Selector="controls|ProgressRing">
-        <Setter Property="Foreground" Value="{DynamicResource Brand}" />
-    </Style>
-</Styles>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/Showcase.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/Showcase.axaml
deleted file mode 100644
index b6ebfe0d9..000000000
--- a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/Showcase.axaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:collections="clr-namespace:System.Collections;assembly=System.Runtime"
-             xmlns:generic="clr-namespace:System.Collections.Generic;assembly=System.Collections"
-             mc:Ignorable="d" d:DesignWidth="800"
-             x:Class="AngorApp.UI.Themes.New.Templates.Showcase">
-
-    <Border Padding="20">
-        <StackPanel Spacing="20">
-            <Border Classes="Panel" Width="200" Height="200">
-                <TextBlock>HOLA</TextBlock>
-            </Border>
-            <EnhancedButton Content="Primary" Classes="Primary" />
-            <EnhancedButton Content="Secondary" Classes="Secondary" />
-            <EnhancedButton Content="Accent" Classes="Accent" />
-            <EnhancedButton Content="White" Classes="White" />
-            <EnhancedButton Content="Outline" Classes="Outline" />
-            <TextBox Text="SOMETHING" />
-            <TextBox Text="SOMETHING">
-                <!-- <DataValidationErrors.Errors> -->
-                <!--     <generic:List -->
-                <!--         x:TypeArguments="x:String"> -->
-                <!--         hola -->
-                <!--     </generic:List> -->
-                <!-- </DataValidationErrors.Errors> -->
-            </TextBox>
-            <HeaderedContainer Header="Regular" Content="Content" Classes="WizardSection" />
-            <HeaderedContainer Header="Translucid" Content="Content" Classes="Translucid" />
-            <HeaderedContainer Header="Header" Content="Content" Classes="WizardHighlight" />
-            <HeaderedContainer Content="Content" Classes="WizardSection">
-                <HeaderedContainer.Header>
-                    <EdgePanel StartContent="{Icon fa-wallet}" Content="Content" EndContent="Some content" />
-                </HeaderedContainer.Header>
-            </HeaderedContainer>
-            <HeaderedContainer Content="Content" Classes="WizardHighlight">
-                <HeaderedContainer.Header>
-                    <EdgePanel StartContent="{Icon fa-wallet}" Content="Content" EndContent="Some content" />
-                </HeaderedContainer.Header>
-            </HeaderedContainer>
-            <CheckBox></CheckBox>
-            <Border BorderThickness="1" BorderBrush="Pink" Width="300" Height="300" Background="{DynamicResource TiledLogoBrush}" />
-            <Border BorderThickness="1" BorderBrush="Pink" Width="300" Height="300" Background="{DynamicResource TiledLogoBrush}" />
-        </StackPanel>
-
-    </Border>
-
-</UserControl>
\ No newline at end of file
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/Showcase.axaml.cs b/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/Showcase.axaml.cs
deleted file mode 100644
index fe592b663..000000000
--- a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/Showcase.axaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace AngorApp.UI.Themes.New.Templates
-{
-    public partial class Showcase : UserControl
-    {
-        public Showcase()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/TextStylesTemplate.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/TextStylesTemplate.axaml
deleted file mode 100644
index a28ff0513..000000000
--- a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Templates/TextStylesTemplate.axaml
+++ /dev/null
@@ -1,85 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <StyleInclude Source="NewTheme.LocalOnly.axaml" />
-
-    <Style Selector="WrapPanel">
-        <Setter Property="ItemSpacing" Value="12" />
-    </Style>
-    
-    <Design.PreviewWith>
-        <WrapPanel ItemWidth="1024">
-            <ThemeVariantScope RequestedThemeVariant="Light">
-                <Border Padding="24" Background="{DynamicResource AppBackground}">
-                    <StackPanel Spacing="16">
-                        <TextBlock Classes="Title">Text Styles</TextBlock>
-                        <TextBlock Classes="Subtitle">NewTheme (local-only) – reference sheet</TextBlock>
-
-                        <Border Classes="Panel">
-                            <StackPanel Spacing="16">
-                                <Grid ColumnDefinitions="200,*,260" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"
-                                      ColumnSpacing="16" RowSpacing="12">
-
-                                    <TextBlock Grid.Row="0" Grid.Column="0" Classes="Strong">Style</TextBlock>
-                                    <TextBlock Grid.Row="0" Grid.Column="1" Classes="Strong">Example</TextBlock>
-                                    <TextBlock Grid.Row="0" Grid.Column="2" Classes="Strong">Usage</TextBlock>
-
-                                    <TextBlock Grid.Row="1" Grid.Column="0" Classes="Strong">TextBlock.Title</TextBlock>
-                                    <TextBlock Grid.Row="1" Grid.Column="1" Classes="Title">Page Title</TextBlock>
-                                    <TextBlock Grid.Row="1" Grid.Column="2" Classes="Regular">Top-level headings (pages, screens, dialogs).</TextBlock>
-
-                                    <TextBlock Grid.Row="2" Grid.Column="0" Classes="Strong">TextBlock.Header</TextBlock>
-                                    <TextBlock Grid.Row="2" Grid.Column="1" Classes="Header" Width="260">Section header with a long title that trims</TextBlock>
-                                    <TextBlock Grid.Row="2" Grid.Column="2" Classes="Regular">Section titles inside a page; use when space is limited.</TextBlock>
-
-                                    <TextBlock Grid.Row="3" Grid.Column="0" Classes="Strong">TextBlock.Big</TextBlock>
-                                    <TextBlock Grid.Row="3" Grid.Column="1" Classes="Big">Emphasized text</TextBlock>
-                                    <TextBlock Grid.Row="3" Grid.Column="2" Classes="Regular">Primary emphasis (key values, totals, callouts).</TextBlock>
-
-                                    <TextBlock Grid.Row="4" Grid.Column="0" Classes="Strong">TextBlock.Subtitle</TextBlock>
-                                    <TextBlock Grid.Row="4" Grid.Column="1" Classes="Subtitle">Supporting subtitle</TextBlock>
-                                    <TextBlock Grid.Row="4" Grid.Column="2" Classes="Regular">Secondary headings, intro lines, or brief summaries.</TextBlock>
-
-                                    <TextBlock Grid.Row="5" Grid.Column="0" Classes="Strong">TextBlock.Regular</TextBlock>
-                                    <TextBlock Grid.Row="5" Grid.Column="1" Classes="Regular">Body text paragraph example.</TextBlock>
-                                    <TextBlock Grid.Row="5" Grid.Column="2" Classes="Regular">Default body copy for descriptions and longer content.</TextBlock>
-
-                                    <TextBlock Grid.Row="6" Grid.Column="0" Classes="Strong">TextBlock.Strong</TextBlock>
-                                    <TextBlock Grid.Row="6" Grid.Column="1" Classes="Strong">Strong emphasis</TextBlock>
-                                    <TextBlock Grid.Row="6" Grid.Column="2" Classes="Regular">Inline emphasis inside regular text (labels, key parts).</TextBlock>
-
-                                    <TextBlock Grid.Row="7" Grid.Column="0" Classes="Strong">Run.Label / Run.Thin</TextBlock>
-                                    <TextBlock Grid.Row="7" Grid.Column="1">
-                                        <Run Classes="Label" Text="Label: " />
-                                        <Run Classes="Thin" Text="Value or helper text (inline runs)." />
-                                    </TextBlock>
-                                    <TextBlock Grid.Row="7" Grid.Column="2" Classes="Regular">Inline styling within a single TextBlock sentence.</TextBlock>
-                                </Grid>
-                            </StackPanel>
-                        </Border>
-                    </StackPanel>
-                </Border>
-            </ThemeVariantScope>
-
-            <ThemeVariantScope RequestedThemeVariant="Dark">
-                <Border Padding="24" Background="{DynamicResource AppBackground}">
-                    <StackPanel Spacing="16">
-                        <TextBlock Classes="Title">Text Styles</TextBlock>
-                        <TextBlock Classes="Subtitle">Dark variant preview</TextBlock>
-
-                        <Border Classes="Panel">
-                            <StackPanel Spacing="12">
-                                <TextBlock Classes="Header">Header</TextBlock>
-                                <TextBlock Classes="Regular">
-                                    <Run Classes="Label" Text="Label: " />
-                                    <Run Classes="Thin" Text="Body copy can mix inline runs for emphasis." />
-                                </TextBlock>
-                                <TextBlock Classes="Strong">Strong text uses TextStrong color.</TextBlock>
-                            </StackPanel>
-                        </Border>
-                    </StackPanel>
-                </Border>
-            </ThemeVariantScope>
-        </WrapPanel>
-    </Design.PreviewWith>
-</Styles>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/CalendarPicker.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/CalendarPicker.axaml
similarity index 100%
rename from src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/CalendarPicker.axaml
rename to src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/CalendarPicker.axaml
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/EnhancedButton.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/EnhancedButton.axaml
similarity index 100%
rename from src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/EnhancedButton.axaml
rename to src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/EnhancedButton.axaml
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/ErrorSummary.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/ErrorSummary.axaml
similarity index 100%
rename from src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/ErrorSummary.axaml
rename to src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/ErrorSummary.axaml
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/ListBox.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/ListBox.axaml
similarity index 100%
rename from src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/ListBox.axaml
rename to src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/ListBox.axaml
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/NumericUpDown.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/NumericUpDown.axaml
similarity index 100%
rename from src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/NumericUpDown.axaml
rename to src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/NumericUpDown.axaml
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/Wizard.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/Wizard.axaml
similarity index 100%
rename from src/Angor/Avalonia/AngorApp/UI/Themes/New/Custom/Wizard.axaml
rename to src/Angor/Avalonia/AngorApp/UI/Themes/V2/Controls/Wizard.axaml
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Resources/Colors.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Resources/Colors.axaml
new file mode 100644
index 000000000..34bde4769
--- /dev/null
+++ b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Resources/Colors.axaml
@@ -0,0 +1,223 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!-- ═════════════════════════════════════════════════════════════════════
+         BRAND COLORS - Official Angor Design System
+         Reference: angor.tx1138.com/storybook/?path=/docs/brand-colors
+         ═════════════════════════════════════════════════════════════════════ -->
+
+    <!-- Primary Colors -->
+    <Color x:Key="PrimaryGreen">#4B7C5A</Color>
+    <Color x:Key="PrimaryGreenHover">#3D6448</Color>
+    <Color x:Key="PrimaryGreenDark">#2D5A3D</Color>
+    <Color x:Key="PrimaryBlack">#1A1A1A</Color>
+    <Color x:Key="PrimaryBlackHover">#0A0A0A</Color>
+
+    <!-- Secondary Colors -->
+    <Color x:Key="Success">#22C55E</Color>
+    <Color x:Key="Error">#EF4444</Color>
+    <Color x:Key="Warning">#F59E0B</Color>
+    <Color x:Key="Info">#3B82F6</Color>
+
+    <!-- Bitcoin -->
+    <Color x:Key="BitcoinOrange">#F7931A</Color>
+
+    <!-- Legacy aliases (for backward compatibility) -->
+    <Color x:Key="Accent">#2D5A3D</Color>
+    <Color x:Key="Dimmed">#9ca3af</Color>
+
+    <ResourceDictionary.ThemeDictionaries>
+        
+        <!-- ═══════════════════════════════════════════════════════════════════════
+             LIGHT THEME
+             Reference: Storybook Light Mode
+             ═══════════════════════════════════════════════════════════════════════ -->
+        <ResourceDictionary x:Key="Default">
+            
+            <!-- Background Colors (from Storybook) -->
+            <Color x:Key="PageBackground">#FFFFFF</Color>
+            <Color x:Key="CardBackground">#F9FAFB</Color>
+            <Color x:Key="Border">#E5E7EB</Color>
+
+            <!-- Text Colors (from Storybook) -->
+            <Color x:Key="BodyText">#1A1A1A</Color>
+            <Color x:Key="Values">#1A1A1A</Color>
+            <Color x:Key="Labels">#6B7280</Color>
+
+            <!-- Legacy/Extended Colors -->
+            <Color x:Key="AppBackground">#faf9f6</Color>
+            <Color x:Key="Surface">White</Color>
+            <Color x:Key="Stroke">#19000000</Color>
+            <Color x:Key="TextMuted">#6B7280</Color>           <!-- = Labels -->
+            <Color x:Key="TextStrong">#0A0A0A</Color>          <!-- ≈ PrimaryBlackHover -->
+            <Color x:Key="Brand">#2D5A3D</Color>               <!-- = PrimaryGreenDark -->
+            <Color x:Key="Highlight">#2D5A3D</Color>           <!-- = PrimaryGreenDark -->
+            <Color x:Key="BitcoinAccent">#F7931A</Color>       <!-- = BitcoinOrange -->
+            <Color x:Key="SurfaceHover">#E9E9E9</Color>
+            <Color x:Key="SurfaceSelected">White</Color>
+            <Color x:Key="CardSurface">White</Color>
+            <Color x:Key="SurfaceSubtle">#E5E7EB</Color>       <!-- = Border -->
+            <Color x:Key="SurfaceSubtler">#FAF9F6</Color>
+            <Color x:Key="DashColorHighlight">#606060</Color>
+
+            <!-- Error Colors -->
+            <StaticResource x:Key="SystemControlErrorTextForegroundBrush" ResourceKey="Error" />
+            <SolidColorBrush x:Key="ErrorSoft" Color="#fee2e2" />
+            <SolidColorBrush x:Key="ErrorHard" Color="#fecaca" />
+            <SolidColorBrush x:Key="ErrorForeground" Color="#dc2626" />
+
+            <!-- Shadows -->
+            <BoxShadows x:Key="SectionShadow">0 0 30 0 LightGray</BoxShadows>
+            <BoxShadows x:Key="ItemShadow">0 0 20 0 LightGray</BoxShadows>
+            <BoxShadows x:Key="ItemShadowBig">0 5 25 0 LightGray</BoxShadows>
+
+            <!-- Button Brushes -->
+            <SolidColorBrush x:Key="PrimaryButtonForeground" Color="{StaticResource SurfaceHover}" />
+            <SolidColorBrush x:Key="PrimaryButtonBackground" Color="{StaticResource TextStrong}" />
+            <SolidColorBrush x:Key="PrimaryButtonBorder" Color="{StaticResource TextStrong}" />
+
+            <SolidColorBrush x:Key="SecondaryButtonForeground" Color="{StaticResource TextStrong}" />
+            <SolidColorBrush x:Key="SecondaryButtonBackground" Color="{StaticResource SurfaceHover}" />
+            <SolidColorBrush x:Key="SecondaryButtonBorder" Color="{StaticResource TextStrong}" />
+
+            <!-- Decorative Brushes -->
+            <VisualBrush x:Key="TiledLogoBrush" Opacity="0.05" DestinationRect="0,0,72,72" Stretch="UniformToFill" TileMode="Tile">
+                <VisualBrush.Visual>
+                    <Svg Path="/Assets/pattern.svg" />
+                </VisualBrush.Visual>
+            </VisualBrush>
+
+            <LinearGradientBrush x:Key="Translucid" Opacity="0.5">
+                <GradientStops>
+                    <GradientStop Color="#1A2D5A3D" Offset="0" />
+                    <GradientStop Color="#0D2D5A3D" Offset="1" />
+                </GradientStops>
+            </LinearGradientBrush>
+
+            <LinearGradientBrush x:Key="TranslucidOrange" StartPoint="0%,0%" EndPoint="100%,100%">
+                <GradientStops>
+                    <GradientStop Offset="0" Color="#fff7ed" />
+                    <GradientStop Offset="1" Color="#fff7ed" />
+                </GradientStops>
+            </LinearGradientBrush>
+
+        </ResourceDictionary>
+
+        <!-- ═══════════════════════════════════════════════════════════════════════
+             DARK THEME
+             Reference: Storybook Dark Mode
+             ═══════════════════════════════════════════════════════════════════════ -->
+        <ResourceDictionary x:Key="Dark">
+            
+            <!-- Background Colors (from Storybook) -->
+            <Color x:Key="PageBackground">#1A1A1A</Color>      <!-- = PrimaryBlack -->
+            <Color x:Key="CardBackground">#0A0A0A</Color>      <!-- = PrimaryBlackHover -->
+            <Color x:Key="Border">#404040</Color>
+
+            <!-- Text Colors (from Storybook) -->
+            <Color x:Key="BodyText">#FAFAFA</Color>
+            <Color x:Key="Values">#9CA3AF</Color>
+            <Color x:Key="Labels">#888888</Color>
+
+            <!-- Legacy/Extended Colors -->
+            <Color x:Key="AppBackground">#0A0A0A</Color>       <!-- = CardBackground (Dark) -->
+            <Color x:Key="Surface">#B31A1A1A</Color>
+            <Color x:Key="Stroke">#19FFFFFF</Color>
+            <Color x:Key="TextMuted">#A0A0A0</Color>
+            <Color x:Key="TextStrong">#FAFAFA</Color>          <!-- = BodyText (Dark) -->
+            <Color x:Key="Brand">#5FAF78</Color>
+            <Color x:Key="Highlight">#E5E8E1</Color>
+            <Color x:Key="BitcoinAccent">#F7931A</Color>       <!-- = BitcoinOrange -->
+            <Color x:Key="SurfaceHover">#3A3A3A</Color>
+            <Color x:Key="SurfaceSelected">#202020</Color>
+            <Color x:Key="CardSurface">#2A2A2A</Color>
+            <Color x:Key="SurfaceSubtle">#333333</Color>
+            <Color x:Key="SurfaceSubtler">#0A0A0A</Color>
+            <Color x:Key="DashColorHighlight">#FBBF24</Color>
+
+            <!-- Error Colors -->
+            <StaticResource x:Key="SystemControlErrorTextForegroundBrush" ResourceKey="Error" />
+            <SolidColorBrush x:Key="ErrorSoft" Color="#667f1d1d" />
+            <SolidColorBrush x:Key="ErrorHard" Color="#80991b1b" />
+            <SolidColorBrush x:Key="ErrorForeground" Color="#80991b1b" />
+
+            <!-- Decorative Brushes -->
+            <SolidColorBrush x:Key="Translucid" Color="#0A0A0A" />
+
+            <LinearGradientBrush x:Key="TranslucidOrange" StartPoint="0%,0%" EndPoint="100%,100%">
+                <GradientStops>
+                    <GradientStop Offset="0" Color="#0EF7931A" />
+                    <GradientStop Offset="1" Color="#1AF7931A" />
+                </GradientStops>
+            </LinearGradientBrush>
+
+            <LinearGradientBrush x:Key="ProgressBrush">
+                <GradientStops>
+                    <GradientStop Offset="0" Color="{StaticResource Brand}" />
+                    <GradientStop Offset="1" Color="#7DCE96" />
+                </GradientStops>
+            </LinearGradientBrush>
+
+            <!-- Shadows (disabled for dark theme) -->
+            <BoxShadows x:Key="SectionShadow">0 0 0 0 Transparent</BoxShadows>
+            <BoxShadows x:Key="ItemShadow">0 0 0 0 LightGray</BoxShadows>
+            <BoxShadows x:Key="ItemShadowBig">0 0 0 0 LightGray</BoxShadows>
+
+            <!-- Button Brushes -->
+            <SolidColorBrush x:Key="PrimaryButtonForeground" Color="{StaticResource TextStrong}" />
+            <LinearGradientBrush x:Key="PrimaryButtonBackground" Opacity="0.5">
+                <GradientStops>
+                    <GradientStop Offset="0" Color="{StaticResource Stroke}" />
+                    <GradientStop Offset="1" Color="{StaticResource Surface}" />
+                </GradientStops>
+            </LinearGradientBrush>
+            <SolidColorBrush x:Key="PrimaryButtonBorder" Color="{StaticResource Stroke}" />
+
+            <SolidColorBrush x:Key="AccentButtonForeground" Color="{StaticResource SurfaceHover}" />
+            <SolidColorBrush x:Key="AccentButtonBackground" Color="{StaticResource Accent}" />
+            <SolidColorBrush x:Key="AccentButtonBorder" Color="{StaticResource Stroke}" />
+
+            <SolidColorBrush x:Key="SecondaryButtonForeground" Color="{StaticResource TextStrong}" />
+            <SolidColorBrush x:Key="SecondaryButtonBackground" Color="{StaticResource Surface}" />
+            <SolidColorBrush x:Key="SecondaryButtonBorder" Color="{StaticResource Stroke}" />
+
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <!-- ═══════════════════════════════════════════════════════════════════════
+         SHARED RESOURCES (theme-independent)
+         ═══════════════════════════════════════════════════════════════════════ -->
+    
+    <!-- CheckBox overrides -->
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillChecked" ResourceKey="Accent" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundFillCheckedPointerOver" ResourceKey="Accent" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeCheckedPointerOver" ResourceKey="Accent" />
+    <Thickness x:Key="CheckBoxBorderThemeThickness">2</Thickness>
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUnchecked" ResourceKey="Stroke" />
+    <StaticResource x:Key="CheckBoxCheckBackgroundStrokeUncheckedPointerOver" ResourceKey="Accent" />
+
+    <!-- Progress -->
+    <LinearGradientBrush x:Key="ProgressBrush">
+        <GradientStops>
+            <GradientStop Offset="0" Color="{StaticResource PrimaryGreenDark}" />
+            <GradientStop Offset="1" Color="#4A8F5F" />
+        </GradientStops>
+    </LinearGradientBrush>
+
+    <!-- Accent Button (fallback) -->
+    <SolidColorBrush x:Key="AccentButtonForeground" Color="{StaticResource SurfaceHover}" />
+    <SolidColorBrush x:Key="AccentButtonBackground" Color="{StaticResource Accent}" />
+    <SolidColorBrush x:Key="AccentButtonBorder" Color="{StaticResource Accent}" />
+
+    <!-- Translucid Background -->
+    <LinearGradientBrush x:Key="TranslucidBackground" StartPoint="0,0" EndPoint="1,1">
+        <GradientStop Color="#192D5A3D" Offset="0" />
+        <GradientStop Color="#102D5A3D" Offset="1" />
+    </LinearGradientBrush>
+
+    <!-- TextBox overrides -->
+    <StaticResource x:Key="TextControlBorderBrushFocused" ResourceKey="BitcoinOrange" />
+    <StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey=" SurfaceHover" />
+    <Thickness x:Key="TextControlBorderThemeThicknessFocused">1</Thickness>
+
+</ResourceDictionary>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/New/Icons.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Resources/Icons.axaml
similarity index 100%
rename from src/Angor/Avalonia/AngorApp/UI/Themes/New/Icons.axaml
rename to src/Angor/Avalonia/AngorApp/UI/Themes/V2/Resources/Icons.axaml
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/Buttons.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/Buttons.axaml
new file mode 100644
index 000000000..de123e536
--- /dev/null
+++ b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/Buttons.axaml
@@ -0,0 +1,90 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <StackPanel Spacing="10" HorizontalAlignment="Center">
+            <ThemeVariantScope RequestedThemeVariant="Light">
+                <Border Padding="20" Background="{DynamicResource AppBackground}">
+                    <StackPanel Spacing="10">
+                        <EnhancedButton Content="Default" />
+                        <EnhancedButton Classes="Primary" Content="Primary" />
+                        <EnhancedButton Classes="Accent" Content="Accent" />
+                        <EnhancedButton Classes="Secondary" Content="Secondary" />
+                        <EnhancedButton Classes="White" Content="White" />
+                        <EnhancedButton Classes="Outline" Content="Outline" />
+                        <EnhancedButton Classes="Widget" Content="Widget" />
+                    </StackPanel>
+                </Border>
+            </ThemeVariantScope>
+            <ThemeVariantScope RequestedThemeVariant="Dark">
+                <Border Padding="20" Background="{DynamicResource AppBackground}">
+                    <StackPanel Spacing="10">
+                        <EnhancedButton Content="Default" />
+                        <EnhancedButton Classes="Primary" Content="Primary" />
+                        <EnhancedButton Classes="Accent" Content="Accent" />
+                        <EnhancedButton Classes="Secondary" Content="Secondary" />
+                        <EnhancedButton Classes="White" Content="White" />
+                        <EnhancedButton Classes="Outline" Content="Outline" />
+                        <EnhancedButton Classes="Widget" Content="Widget" />
+                    </StackPanel>
+                </Border>
+            </ThemeVariantScope>
+        </StackPanel>
+    </Design.PreviewWith>
+
+    <!-- Base EnhancedButton Style -->
+    <Style Selector="EnhancedButton">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryButtonForeground}" />
+        <Setter Property="Background" Value="{DynamicResource PrimaryButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryButtonBorder}" />
+        <Setter Property="IconOptions.Fill" Value="{Binding $self.Foreground}" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="CornerRadius" Value="10" />
+        <Setter Property="BorderThickness" Value="2" />
+    </Style>
+
+    <Style Selector="EnhancedButton.Primary">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryButtonForeground}" />
+        <Setter Property="Background" Value="{DynamicResource PrimaryButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryButtonBorder}" />
+        <Setter Property="Padding" Value="24 12" />
+    </Style>
+
+    <Style Selector="EnhancedButton.Accent">
+        <Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
+        <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorder}" />
+        <Setter Property="Padding" Value="24 12" />
+    </Style>
+
+    <Style Selector="EnhancedButton.Secondary">
+        <Setter Property="Foreground" Value="{DynamicResource SecondaryButtonForeground}" />
+        <Setter Property="Background" Value="{DynamicResource SecondaryButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryButtonBorder}" />
+        <Setter Property="Padding" Value="24 12" />
+    </Style>
+
+    <Style Selector="EnhancedButton.White">
+        <Setter Property="Padding" Value="24 12" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="Foreground" Value="{DynamicResource SecondaryButtonForeground}" />
+        <Setter Property="Background" Value="{DynamicResource Surface}" />
+    </Style>
+
+    <Style Selector="EnhancedButton.Outline">
+        <Setter Property="Padding" Value="24 12" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Accent}" />
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="Foreground" Value="{DynamicResource Accent}" />
+        <Setter Property="Background" Value="Transparent" />
+    </Style>
+
+    <Style Selector="EnhancedButton.Widget">
+        <Setter Property="Background" Value="{DynamicResource Surface}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
+        <Setter Property="Padding" Value="10" />
+    </Style>
+
+</Styles>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/Containers.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/Containers.axaml
new file mode 100644
index 000000000..1f318c707
--- /dev/null
+++ b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/Containers.axaml
@@ -0,0 +1,199 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    
+    <Design.PreviewWith>
+        <ScrollViewer>
+            <StackPanel Spacing="20" Width="500">
+                <!-- Light Theme -->
+                <ThemeVariantScope RequestedThemeVariant="Light">
+                    <Border Padding="20" Background="{DynamicResource AppBackground}">
+                        <StackPanel Spacing="15">
+                            <TextBlock FontWeight="Bold" FontSize="16">Light Theme</TextBlock>
+                            
+                            <HeaderedContainer Header="WizardSection" Content="Default section style" Classes="WizardSection" />
+                            
+                            <HeaderedContainer Header="Translucid" Content="Accent translucent style" Classes="Translucid" />
+                            
+                            <HeaderedContainer Header="WizardHighlight" Content="Bitcoin accent style" Classes="WizardHighlight" />
+                            
+                            <HeaderedContainer Header="BlueThreshold" Classes="BlueThreshold">
+                                <EdgePanel StartContent="Label" EndContent="Value" />
+                            </HeaderedContainer>
+                            
+                            <HeaderedContainer Classes="WizardSection">
+                                <HeaderedContainer.Header>
+                                    <EdgePanel StartContent="{Icon fa-wallet}" Content="With Icon" EndContent="$1,234" />
+                                </HeaderedContainer.Header>
+                            </HeaderedContainer>
+                            
+                            <Border Classes="Translucid">
+                                <TextBlock>Border.Translucid</TextBlock>
+                            </Border>
+                        </StackPanel>
+                    </Border>
+                </ThemeVariantScope>
+                
+                <!-- Dark Theme -->
+                <ThemeVariantScope RequestedThemeVariant="Dark">
+                    <Border Padding="20" Background="{DynamicResource AppBackground}">
+                        <StackPanel Spacing="15">
+                            <TextBlock FontWeight="Bold" FontSize="16" Foreground="White">Dark Theme</TextBlock>
+                            
+                            <HeaderedContainer Header="WizardSection" Content="Default section style" Classes="WizardSection" />
+                            
+                            <HeaderedContainer Header="Translucid" Content="Accent translucent style" Classes="Translucid" />
+                            
+                            <HeaderedContainer Header="WizardHighlight" Content="Bitcoin accent style" Classes="WizardHighlight" />
+                            
+                            <HeaderedContainer Header="BlueThreshold" Classes="BlueThreshold">
+                                <EdgePanel StartContent="Label" EndContent="Value" />
+                            </HeaderedContainer>
+                        </StackPanel>
+                    </Border>
+                </ThemeVariantScope>
+            </StackPanel>
+        </ScrollViewer>
+    </Design.PreviewWith>
+
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+
+                <!-- Light -->
+                <ResourceDictionary x:Key="Light">
+                    <SolidColorBrush x:Key="BlueThreshold.ContainerBorderBrush" Color="#bfdbfe" />
+
+                    <LinearGradientBrush x:Key="BlueThreshold.ContainerBackground" StartPoint="0,0" EndPoint="1,1">
+                        <GradientStop Offset="0" Color="#eff6ff" />
+                        <GradientStop Offset="1" Color="#e0e7ff" />
+                    </LinearGradientBrush>
+
+                    <SolidColorBrush x:Key="BlueThreshold.IconBackground" Color="#2563eb" />
+                    <SolidColorBrush x:Key="BlueThreshold.LabelForeground" Color="#1e40af" />
+                    <SolidColorBrush x:Key="BlueThreshold.HelpForeground" Color="#1e40af" />
+                </ResourceDictionary>
+
+                <!-- Dark -->
+                <ResourceDictionary x:Key="Dark">
+                    <SolidColorBrush x:Key="BlueThreshold.ContainerBorderBrush" Color="#4a5a6a" />
+
+                    <LinearGradientBrush x:Key="BlueThreshold.ContainerBackground" StartPoint="0,0" EndPoint="1,1">
+                        <GradientStop Offset="0" Color="#1A2A3A" />
+                        <GradientStop Offset="1" Color="#2A1A3A" />
+                    </LinearGradientBrush>
+
+                    <SolidColorBrush x:Key="BlueThreshold.IconBackground" Color="#3b82f6" />
+
+                    <SolidColorBrush x:Key="BlueThreshold.LabelForeground" Color="#60a5fa" />
+                    <SolidColorBrush x:Key="BlueThreshold.HelpForeground" Color="#60a5fa" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+
+    <!-- ═══════════════════════════════════════════════════════════════════════
+         HeaderedContainer Styles
+         ═══════════════════════════════════════════════════════════════════════ -->
+
+    <!-- Base HeaderedContainer icon styling -->
+    <Style Selector="HeaderedContainer /template/ ContentPresenter#Header EdgePanel /template/ ContentControl#StartContent">
+        <Setter Property="IconOptions.Size" Value="20" />
+        <Setter Property="IconOptions.Fill" Value="White" />
+        <Setter Property="IconOptions.Padding" Value="10" />
+        <Setter Property="IconOptions.CornerRadius" Value="10" />
+    </Style>
+
+    <!-- Title Style -->
+    <Style Selector="HeaderedContainer.Title /template/ ContentControl#Header">
+        <Setter Property="FontSize" Value="25" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
+    </Style>
+
+    <!-- WizardSection Style -->
+    <Style Selector="HeaderedContainer.WizardSection">
+        <Setter Property="CornerRadius" Value="10" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
+        <Setter Property="HeaderBackground" Value="{DynamicResource SurfaceSubtler}" />
+        <Setter Property="Background" Value="{DynamicResource Surface}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
+        <Setter Property="HeaderPadding" Value="24 12" />
+        <Setter Property="ContentPadding" Value="24" />
+    </Style>
+
+    <Style Selector="HeaderedContainer.WizardSection /template/ ContentPresenter#Header EdgePanel /template/ ContentControl#StartContent">
+        <Setter Property="IconOptions.Background" Value="{DynamicResource Accent}" />
+    </Style>
+
+    <!-- Translucid Style -->
+    <Style Selector="HeaderedContainer.Translucid">
+        <Setter Property="ContentPadding" Value="24 0 24 24" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Accent}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="HeaderPadding" Value="24" />
+        <Setter Property="CornerRadius" Value="10" />
+        <Setter Property="Foreground" Value="{DynamicResource Accent}" />
+        <Setter Property="Background" Value="{StaticResource TranslucidBackground}" />
+    </Style>
+
+    <Style Selector="HeaderedContainer.Translucid /template/ ContentPresenter#Header EdgePanel /template/ ContentControl#StartContent">
+        <Setter Property="IconOptions.Background" Value="{DynamicResource Accent}" />
+    </Style>
+
+    <!-- WizardHighlight Style (Bitcoin/Orange accent) -->
+    <Style Selector="HeaderedContainer.WizardHighlight">
+        <Setter Property="CornerRadius" Value="12" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource BitcoinAccent}" />
+        <Setter Property="Background" Value="{DynamicResource TranslucidOrange}" />
+        <Setter Property="HeaderPadding" Value="24" />
+        <Setter Property="ContentPadding" Value="24 0 24 24" />
+        <Setter Property="Foreground" Value="{DynamicResource BitcoinAccent}" />
+    </Style>
+
+    <Style Selector="HeaderedContainer.WizardHighlight /template/ ContentPresenter#Header EdgePanel /template/ ContentControl#StartContent">
+        <Setter Property="IconOptions.Background" Value="{DynamicResource BitcoinAccent}" />
+    </Style>
+
+    <Style Selector="HeaderedContainer.WizardHighlight EdgePanel ContentControl#EndContent">
+        <Setter Property="Foreground" Value="{DynamicResource BitcoinAccent}" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+    </Style>
+
+    <!-- BlueThreshold Style -->
+    <Style Selector="HeaderedContainer.BlueThreshold">
+        <Setter Property="CornerRadius" Value="12" />
+        <Setter Property="HeaderPadding" Value="24" />
+        <Setter Property="ContentPadding" Value="24 0 24 24" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource BlueThreshold.ContainerBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource BlueThreshold.ContainerBackground}" />
+    </Style>
+
+    <Style Selector="HeaderedContainer.BlueThreshold /template/ ContentPresenter#Header">
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Background" Value="{DynamicResource BlueThreshold.IconBackground}" />
+    </Style>
+
+    <Style Selector="HeaderedContainer.BlueThreshold EdgePanel ContentControl#StartContent">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontWeight" Value="Medium" />
+        <Setter Property="Foreground" Value="{DynamicResource BlueThreshold.LabelForeground}" />
+    </Style>
+
+    <!-- ═══════════════════════════════════════════════════════════════════════
+         Border Styles
+         ═══════════════════════════════════════════════════════════════════════ -->
+
+    <Style Selector="Border.Translucid">
+        <Setter Property="Padding" Value="20" />
+        <Setter Property="CornerRadius" Value="10" />
+        <Setter Property="BorderBrush" Value="#3F22005A" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="{StaticResource TranslucidBackground}" />
+    </Style>
+
+</Styles>
\ No newline at end of file
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/ToggleButtons.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/ToggleButtons.axaml
new file mode 100644
index 000000000..be3fa55e3
--- /dev/null
+++ b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/ToggleButtons.axaml
@@ -0,0 +1,58 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Styles.Resources>
+        <SolidColorBrush x:Key="ToggleButtonBackgroundChecked" Color="{DynamicResource Surface}" />
+        <SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver" Color="{DynamicResource Stroke}" />
+        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="{DynamicResource Stroke}" />
+        <SolidColorBrush x:Key="ToggleButtonBackgroundIndeterminatePressed" Color="{DynamicResource Stroke}" />
+        <SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="{DynamicResource Stroke}" />
+        <SolidColorBrush x:Key="ToggleButtonBorderBrushChecked" Color="{DynamicResource Stroke}" />
+    </Styles.Resources>
+
+    <Style Selector="ToggleButton.Widget">
+        <Setter Property="Height" Value="42" />
+        <Setter Property="Width" Value="42" />
+        <Setter Property="CornerRadius" Value="10" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Background" Value="{DynamicResource Surface}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
+    </Style>
+
+    <Design.PreviewWith>
+        <StackPanel Spacing="20">
+            <ThemeVariantScope RequestedThemeVariant="Light">
+                <Border Padding="20" Background="{DynamicResource AppBackground}">
+                    <StackPanel Spacing="10">
+                        <TextBlock FontWeight="Bold">Light Theme</TextBlock>
+                        <StackPanel Orientation="Horizontal" Spacing="10">
+                            <ToggleButton Classes="Widget" IsChecked="False">
+                                <PathIcon Data="{DynamicResource Sun}" />
+                            </ToggleButton>
+                            <ToggleButton Classes="Widget" IsChecked="True">
+                                <PathIcon Data="{DynamicResource Sun}" />
+                            </ToggleButton>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+            </ThemeVariantScope>
+            <ThemeVariantScope RequestedThemeVariant="Dark">
+                <Border Padding="20" Background="{DynamicResource AppBackground}">
+                    <StackPanel Spacing="10">
+                        <TextBlock FontWeight="Bold" Foreground="White">Dark Theme</TextBlock>
+                        <StackPanel Orientation="Horizontal" Spacing="10">
+                            <ToggleButton Classes="Widget" IsChecked="False">
+                                <PathIcon Foreground="{DynamicResource TextMuted}" Data="{DynamicResource Sun}" />
+                            </ToggleButton>
+                            <ToggleButton Classes="Widget" IsChecked="True">
+                                <PathIcon Foreground="{DynamicResource TextMuted}" Data="{DynamicResource Sun}" />
+                            </ToggleButton>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+            </ThemeVariantScope>
+        </StackPanel>
+    </Design.PreviewWith>
+
+
+</Styles>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/Typography.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/Typography.axaml
new file mode 100644
index 000000000..52b59bbb9
--- /dev/null
+++ b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Styles/Typography.axaml
@@ -0,0 +1,191 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <ScrollViewer>
+            <StackPanel Spacing="20" Width="400">
+                <!-- Light Theme -->
+                <ThemeVariantScope RequestedThemeVariant="Light">
+                    <Border Padding="20" Background="{DynamicResource AppBackground}">
+                        <StackPanel Spacing="15">
+                            <TextBlock FontWeight="Bold" FontSize="16">Light Theme</TextBlock>
+                            
+                            <StackPanel Spacing="3">
+                                <TextBlock FontWeight="Bold" FontSize="12" Foreground="Gray">SEMANTIC PRESETS</TextBlock>
+                                <TextBlock Classes="Title" Text="Title (25px Bold)" />
+                                <TextBlock Classes="Subtitle" Text="Subtitle (18px Light)" />
+                                <TextBlock Classes="Header" Text="Header (Bold + Strong + Ellipsis)" />
+                                <TextBlock Classes="Regular" Text="Regular (16px Light)" />
+                                <TextBlock Classes="Strong" Text="Strong (Bold + Strong)" />
+                            </StackPanel>
+                            
+                            <StackPanel Spacing="3">
+                                <TextBlock FontWeight="Bold" FontSize="12" Foreground="Gray">SIZE SCALE</TextBlock>
+                                <TextBlock Classes="Size-XXS" Text="Size-XXS (11px)" />
+                                <TextBlock Classes="Size-XS" Text="Size-XS (12px)" />
+                                <TextBlock Classes="Size-S" Text="Size-S (14px)" />
+                                <TextBlock Classes="Size-M" Text="Size-M (16px)" />
+                                <TextBlock Classes="Size-L" Text="Size-L (18px)" />
+                                <TextBlock Classes="Size-XL" Text="Size-XL (25px)" />
+                                <TextBlock Classes="Size-XXL" Text="Size-XXL (32px)" />
+                            </StackPanel>
+                            
+                            <StackPanel Spacing="3">
+                                <TextBlock FontWeight="Bold" FontSize="12" Foreground="Gray">WEIGHT + COLOR</TextBlock>
+                                <TextBlock Classes="Weight-Light" Text="Weight-Light" />
+                                <TextBlock Classes="Weight-Bold" Text="Weight-Bold" />
+                                <TextBlock Classes="Text-Strong" Text="Text-Strong" />
+                                <TextBlock Classes="Text-Muted" Text="Text-Muted" />
+                                <TextBlock Classes="Text-Dimmed" Text="Text-Dimmed" />
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+                </ThemeVariantScope>
+                
+                <!-- Dark Theme -->
+                <ThemeVariantScope RequestedThemeVariant="Dark">
+                    <Border Padding="20" Background="{DynamicResource AppBackground}">
+                        <StackPanel Spacing="15">
+                            <TextBlock FontWeight="Bold" FontSize="16" Foreground="White">Dark Theme</TextBlock>
+                            
+                            <StackPanel Spacing="3">
+                                <TextBlock Classes="Title" Text="Title" />
+                                <TextBlock Classes="Subtitle" Text="Subtitle" />
+                                <TextBlock Classes="Header" Text="Header" />
+                                <TextBlock Classes="Regular" Text="Regular" />
+                                <TextBlock Classes="Strong" Text="Strong" />
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+                </ThemeVariantScope>
+            </StackPanel>
+        </ScrollViewer>
+    </Design.PreviewWith>
+
+    <!-- Base TextBlock Style -->
+    <Style Selector="TextBlock">
+        <Setter Property="TextWrapping" Value="Wrap" />
+    </Style>
+
+    <!-- Run Styles -->
+    <Style Selector="Run.Label">
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
+    </Style>
+
+    <Style Selector="Run.Thin">
+        <Setter Property="FontWeight" Value="SemiLight" />
+        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
+    </Style>
+
+    <!-- ═══════════════════════════════════════════════════════════════════════
+         TEXT STYLES - Atomic Classes (combinable, single responsibility)
+         Usage: <TextBlock Classes="Size-L Weight-Bold Text-Strong" />
+         ═══════════════════════════════════════════════════════════════════════ -->
+
+    <!-- Atomic: Size (FontSize only) -->
+    <Style Selector="TextBlock.Size-XXS">
+        <Setter Property="FontSize" Value="11" />
+    </Style>
+    <Style Selector="TextBlock.Size-XS">
+        <Setter Property="FontSize" Value="12" />
+    </Style>
+    <Style Selector="TextBlock.Size-S">
+        <Setter Property="FontSize" Value="14" />
+    </Style>
+    <Style Selector="TextBlock.Size-M">
+        <Setter Property="FontSize" Value="16" />
+    </Style>
+    <Style Selector="TextBlock.Size-L">
+        <Setter Property="FontSize" Value="18" />
+    </Style>
+    <Style Selector="TextBlock.Size-XL">
+        <Setter Property="FontSize" Value="25" />
+    </Style>
+    <Style Selector="TextBlock.Size-XXL">
+        <Setter Property="FontSize" Value="32" />
+    </Style>
+
+    <!-- Atomic: Weight (FontWeight only) -->
+    <Style Selector="TextBlock.Weight-Light">
+        <Setter Property="FontWeight" Value="SemiLight" />
+    </Style>
+    <Style Selector="TextBlock.Weight-Bold">
+        <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+
+    <!-- Atomic: Color (Foreground only) -->
+    <Style Selector="TextBlock.Text-Strong">
+        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
+    </Style>
+    <Style Selector="TextBlock.Text-Muted">
+        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
+    </Style>
+    <Style Selector="TextBlock.Text-Dimmed">
+        <Setter Property="Foreground" Value="{DynamicResource Dimmed}" />
+    </Style>
+
+    <!-- ═══════════════════════════════════════════════════════════════════════
+         TEXT STYLES - Semantic Presets (convenience combos)
+         These are shortcuts for common combinations of atomic classes.
+         ═══════════════════════════════════════════════════════════════════════ -->
+
+    <!-- Title: Size-XL + Weight-Bold -->
+    <Style Selector="TextBlock.Title">
+        <Setter Property="FontSize" Value="25" />
+        <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+
+    <!-- Subtitle: Size-L + Weight-Light -->
+    <Style Selector="TextBlock.Subtitle">
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="FontWeight" Value="SemiLight" />
+    </Style>
+
+    <!-- Header: Size-L + Weight-Bold + Text-Strong + NoWrap + Ellipsis -->
+    <Style Selector="TextBlock.Header">
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="TextTrimming" Value="{x:Static TextTrimming.CharacterEllipsis}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
+    </Style>
+
+    <!-- Regular: Size-M + Weight-Light (body text) -->
+    <Style Selector="TextBlock.Regular">
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="FontWeight" Value="SemiLight" />
+    </Style>
+
+    <!-- Strong: Weight-Bold + Text-Strong (emphasis without size change) -->
+    <Style Selector="TextBlock.Strong">
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
+    </Style>
+
+    <!-- ═══════════════════════════════════════════════════════════════════════
+         TEXT STYLES - Legacy/Aliases (for backward compatibility)
+         Consider migrating to atomic classes over time.
+         ═══════════════════════════════════════════════════════════════════════ -->
+
+    <!-- Bold: Weight-Bold only -->
+    <Style Selector="TextBlock.Bold">
+        <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+
+    <!-- Tiny: Size-XS only (prefer Size-XS) -->
+    <Style Selector="TextBlock.Tiny">
+        <Setter Property="FontSize" Value="11" />
+    </Style>
+
+    <!-- Thin: Weight very light -->
+    <Style Selector="TextBlock.Thin">
+        <Setter Property="FontWeight" Value="Thin" />
+    </Style>
+
+    <!-- Big: Size-L + Weight-Bold (prefer Size-L Weight-Bold) -->
+    <Style Selector="TextBlock.Big">
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="FontWeight" Value="Bold" />
+    </Style>
+
+</Styles>
diff --git a/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Theme.axaml b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Theme.axaml
new file mode 100644
index 000000000..dac98e0f8
--- /dev/null
+++ b/src/Angor/Avalonia/AngorApp/UI/Themes/V2/Theme.axaml
@@ -0,0 +1,268 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+        xmlns:templates="clr-namespace:AngorApp.UI.Themes.V2.Templates">
+
+    <FluentTheme />
+    <StyleInclude Source="avares://Zafiro.Avalonia/Styles.axaml" />
+    <StyleInclude Source="avares://Zafiro.Avalonia.Dialogs/Styles.axaml" />
+    <StyleInclude Source="avares://AsyncImageLoader.Avalonia/AdvancedImage.axaml" />
+
+    <StyleInclude Source="Controls/EnhancedButton.axaml" />
+    <StyleInclude Source="Styles/ToggleButtons.axaml" />
+    <StyleInclude Source="Controls/ListBox.axaml" />
+    <StyleInclude Source="Controls/Wizard.axaml" />
+    <StyleInclude Source="Controls/CalendarPicker.axaml" />
+    <StyleInclude Source="Controls/NumericUpDown.axaml" />
+
+    <StyleInclude Source="/UI/Shared/Styles/Styles.axaml" />
+    <StyleInclude Source="/UI/Shared/Controls/Pane.axaml" />
+    <StyleInclude Source="/UI/Shared/Controls/AmountControl.axaml" />
+    <StyleInclude Source="/UI/Shared/Controls/List.axaml" />
+    <StyleInclude Source="/UI/Shared/Controls/IconLabel.axaml" />
+    <StyleInclude Source="/UI/Shared/Controls/ProjectCard.axaml" />
+    <StyleInclude Source="/UI/Shared/Controls/Feerate/FeerateSelector.axaml" />
+    <StyleInclude Source="/UI/Shared/Controls/ErrorSummary.axaml" />
+    <StyleInclude Source="/UI/Sections/Wallet/CreateAndImport/Steps/SeedWordsGeneration/SeedWordList.axaml" />
+    <StyleInclude Source="/UI/Shared/Controls/PageContainer.axaml" />
+    <StyleInclude Source="/UI/Shared/Controls/ScrollableView.axaml" />
+    <StyleInclude Source="/UI/Shared/Controls/Badge.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/Cards.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/OverlayBorder.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/TextBlock.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/ToggleButton.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/FlyoutPresenter.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/Button.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/Automation.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/SlimDataGrid.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/HeaderedContainer.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/EdgePanel.axaml" />
+    <StyleInclude Source="/UI/Shared/Styles/Border.axaml" />
+    <StyleInclude Source="Styles/Containers.axaml" />
+    <StyleInclude Source="Styles/Buttons.axaml" />
+    <StyleInclude Source="Styles/Typography.axaml" />
+
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="Resources/Colors.axaml" />
+                <ResourceInclude Source="Resources/Icons.axaml" />
+                <ResourceInclude Source="Controls/ErrorSummary.axaml" />
+            </ResourceDictionary.MergedDictionaries>
+
+            <ControlTheme x:Key="{x:Type TextBox}"
+                          TargetType="TextBox"
+                          BasedOn="{StaticResource {x:Type TextBox}}">
+                <Setter Property="CornerRadius" Value="8" />
+                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="BorderBrush" Value="{DynamicResource SurfaceSubtle}" />
+                <Setter Property="Background" Value="{DynamicResource Surface}" />
+                <Setter Property="Foreground" Value="{DynamicResource TextStrong}" />
+                <Setter Property="Padding" Value="14 12" />
+                <Style Selector="^ /template/ Border#PART_BorderElement">
+                    <Setter Property="Transitions">
+                        <Transitions>
+                            <BrushTransition Property="BorderBrush" Duration="0:0:0.2" />
+                            <BrushTransition Property="Background" Duration="0:0:0.2" />
+                        </Transitions>
+                    </Setter>
+                </Style>
+            </ControlTheme>
+
+        </ResourceDictionary>
+    </Styles.Resources>
+
+    <Style Selector=":is(UserControl)">
+        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
+        <Setter Property="IconOptions.Fill" Value="{DynamicResource TextMuted}" />
+    </Style>
+
+    <Style Selector="Border.Panel">
+        <Setter Property="CornerRadius" Value="20" />
+        <Setter Property="Padding" Value="20" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="{DynamicResource Surface}" />
+    </Style>
+
+    <Style Selector="OverlayBorder.Panel">
+        <Setter Property="CornerRadius" Value="20" />
+        <Setter Property="Padding" Value="20" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="{DynamicResource Surface}" />
+    </Style>
+
+    <Style Selector="SectionStrip.Nav SectionStripGroupHeader">
+        <Setter Property="Foreground" Value="{DynamicResource Brand}" />
+        <Setter Property="FontFamily" Value="Sans Serif" />
+        <Setter Property="FontWeight" Value="SemiLight" />
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Margin" Value="10" />
+    </Style>
+
+    <Style Selector="SectionStrip.Nav SectionStripItem">
+        <Setter Property="CornerRadius" Value="10" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Padding" Value="8" />
+        <Setter Property="IconOptions.Fill" Value="{Binding $self.Foreground}" />
+        <Setter Property="Margin" Value="10" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
+        <Setter Property="ClipToBounds" Value="False" />
+        <Setter Property="BorderThickness" Value="1" />
+    </Style>
+
+    <Style Selector="SectionStrip.Nav SectionStripItem:pointerover">
+        <Setter Property="Background" Value="{DynamicResource SurfaceHover}" />
+    </Style>
+
+    <Style Selector="SectionStrip.Nav SectionStripItem:selected">
+        <Setter Property="Background" Value="{DynamicResource SurfaceSelected}" />
+        <Setter Property="Foreground" Value="{DynamicResource Highlight}" />
+    </Style>
+
+    <Style Selector="SectionStrip.Nav SectionStripItem:selected Border">
+        <Setter Property="BoxShadow" Value="{DynamicResource SectionShadow}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
+    </Style>
+
+    <Style Selector="controls|ProgressRing">
+        <Setter Property="Foreground" Value="{DynamicResource Brand}" />
+    </Style>
+
+    <Style Selector="Border.Elevated">
+        <Setter Property="Background" Value="{DynamicResource CardSurface}" />
+        <Setter Property="BoxShadow" Value="{DynamicResource ItemShadow}" />
+        <Setter Property="Transitions">
+            <Transitions>
+                <BoxShadowsTransition Property="BoxShadow" Duration="0:0:1" />
+            </Transitions>
+        </Setter>
+    </Style>
+    <Style Selector="Border.Elevated:pointerover">
+        <Setter Property="BoxShadow" Value="{DynamicResource ItemShadowBig}" />
+    </Style>
+    <Style Selector="Border.Interactive">
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Transitions">
+            <Transitions>
+                <TransformOperationsTransition Property="RenderTransform" Duration="0:0:.125" />
+            </Transitions>
+        </Setter>
+        <Setter Property="RenderTransform" Value="translate(0px, 0px)" />
+    </Style>
+    <Style Selector="Border.Interactive:pointerover">
+        <Setter Property="RenderTransform" Value="translate(0px, -3px)" />
+    </Style>
+
+
+    <Style Selector="Frame">
+        <Setter Property="Template">
+            <ControlTemplate>
+                <DockPanel VerticalSpacing="25">
+                    <EnhancedButton Command="{Binding $parent[Frame].Navigator.Back}"
+                                    Margin="20"
+                                    x:Name="BackButton"
+                                    Classes="Outline"
+                                    DockPanel.Dock="Top"
+                                    Content="{TemplateBinding BackButtonContent}">
+                        <Button.IsVisible>
+                            <MultiBinding Converter="{x:Static BoolConverters.And}">
+                                <Binding Path="$parent[Frame].IsBackButtonVisible" />
+                                <Binding Path="$self.IsEffectivelyEnabled" />
+                            </MultiBinding>
+                        </Button.IsVisible>
+                    </EnhancedButton>
+                    <ContentControl Margin="{TemplateBinding Padding}" Content="{Binding $parent[Frame].Navigator.Content^,  FallbackValue='No content', TargetNullValue='Navigator.Content is a null'}" />
+                </DockPanel>
+            </ControlTemplate>
+        </Setter>
+        <Setter Property="BackButtonContent">
+            <Setter.Value>
+                <Template>
+                    <DockPanel HorizontalSpacing="8">
+                        <ContentControl Content="{Icon fa-angle-left}" />
+                        <TextBlock VerticalAlignment="Center">Back</TextBlock>
+                    </DockPanel>
+                </Template>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style Selector="ComboBox">
+        <Setter Property="Background" Value="{DynamicResource Surface}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource Stroke}" />
+        <Setter Property="CornerRadius" Value="10" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource TextMuted}" />
+        <Setter Property="Padding" Value="12" />
+        <Setter Property="FontWeight" Value="Bold"></Setter>
+    </Style>
+    <Style Selector="ComboBox:pointerover /template/ Border">
+        <Setter Property="Background" Value="{DynamicResource Surface}" />
+    </Style>
+
+    <Style Selector="CheckBox">
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid x:Name="RootGrid" ColumnDefinitions="24,*">
+                    <Border x:Name="PART_Border"
+                            Grid.ColumnSpan="2"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}" />
+
+                    <Grid VerticalAlignment="Top" Height="{DynamicResource CheckBoxMinHeight}">
+                        <Border x:Name="NormalRectangle"
+                                BorderBrush="{DynamicResource CheckBoxCheckBackgroundStrokeUnchecked}"
+                                Background="{DynamicResource CheckBoxCheckBackgroundFillUnchecked}"
+                                BorderThickness="{DynamicResource CheckBoxBorderThemeThickness}"
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                UseLayoutRounding="False"
+                                Height="24"
+                                Width="24" />
+
+                        <Viewbox UseLayoutRounding="False">
+                            <Panel>
+                                <Panel Height="16" Width="16" />
+                                <Path x:Name="CheckGlyph"
+                                      Opacity="0"
+                                      Fill="{DynamicResource CheckBoxCheckGlyphForegroundUnchecked}"
+                                      Stretch="Uniform"
+                                      VerticalAlignment="Center"
+                                      FlowDirection="LeftToRight" />
+                            </Panel>
+                        </Viewbox>
+                    </Grid>
+                    <ContentPresenter x:Name="PART_ContentPresenter"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}"
+                                      Content="{TemplateBinding Content}"
+                                      Margin="{TemplateBinding Padding}"
+                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      TextWrapping="Wrap"
+                                      Grid.Column="1" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+    <Style Selector=":is(Control).Padded">
+        <Setter Property="Margin" Value="20 0" />
+    </Style>
+
+    <Design.PreviewWith>
+        <WrapPanel ItemWidth="800">
+            <ThemeVariantScope RequestedThemeVariant="Light">
+                <templates:Showcase Background="{DynamicResource AppBackground}" />
+            </ThemeVariantScope>
+            <ThemeVariantScope RequestedThemeVariant="Dark">
+                <templates:Showcase Background="{DynamicResource AppBackground}" />
+            </ThemeVariantScope>
+            <controls:ProgressRing />
+        </WrapPanel>
+    </Design.PreviewWith>
+
+</Styles>
\ No newline at end of file