diff --git a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
index 0d97d8c..066f2b7 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ButtonDemo.axaml
@@ -84,6 +84,32 @@
                     </MenuFlyout>
                 </SplitButton.Flyout>
             </SplitButton>
+            <SplitButton Classes="Secondary" Content="Submit" />
+            <SplitButton Classes="Tertiary" Content="Submit" />
+            <SplitButton Classes="Warning" Content="Submit" />
+            <SplitButton Classes="Danger" Content="Submit" />
+            <SplitButton
+                Classes="Danger"
+                Content="Submit"
+                IsEnabled="False" />
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <ToggleSplitButton Content="Submit">
+                <ToggleSplitButton.Flyout>
+                    <MenuFlyout Placement="BottomEdgeAlignedRight">
+                        <MenuItem Header="Submit All" />
+                        <MenuItem Header="Submit Updated" />
+                    </MenuFlyout>
+                </ToggleSplitButton.Flyout>
+            </ToggleSplitButton>
+            <ToggleSplitButton Classes="Secondary" Content="Submit" />
+            <ToggleSplitButton Classes="Tertiary" Content="Submit" />
+            <ToggleSplitButton Classes="Warning" Content="Submit" />
+            <ToggleSplitButton Classes="Danger" Content="Submit" />
+            <ToggleSplitButton
+                Classes="Danger"
+                Content="Submit"
+                IsEnabled="False" />
         </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
index 3b44c65..5838836 100644
--- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml
@@ -15,14 +15,6 @@
                 Text="Welcome to Semi Avalonia"
                 Theme="{StaticResource TitleTextBlock}" />
 
-            <StackPanel Orientation="Horizontal" Spacing="20">
-                <Button Classes="Primary">主要按钮</Button>
-                <Button Classes="Secondary">次要按钮</Button>
-                <Button Classes="Tertiary">第三按钮</Button>
-                <Button Classes="Warning">警告按钮</Button>
-                <Button Classes="Danger">危险按钮</Button>
-                <Button Classes="Primary" IsEnabled="False">禁用按钮</Button>
-            </StackPanel>
             <StackPanel Orientation="Horizontal" Spacing="20">
                 <Button Classes="Primary" Theme="{DynamicResource SolidButton}">Primary</Button>
                 <Button Classes="Secondary" Theme="{DynamicResource SolidButton}">Secondary</Button>
@@ -61,8 +53,6 @@
                         <RadioButton Theme="{StaticResource ButtonRadioButton}">选项 2</RadioButton>
                     </StackPanel>
                 </Border>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
                 <RadioButton Margin="4" Theme="{StaticResource CardRadioButton}">
                     <StackPanel>
                         <TextBlock FontWeight="Bold">Option 1</TextBlock>
@@ -79,6 +69,7 @@
                     </StackPanel>
                 </RadioButton>
             </StackPanel>
+            <StackPanel Orientation="Horizontal" />
             <StackPanel Orientation="Horizontal">
                 <CheckBox Margin="0,0,8,0">Avalonia</CheckBox>
                 <CheckBox Margin="0,0,8,0" IsChecked="True">WPF</CheckBox>
@@ -89,6 +80,15 @@
                     Content="Content"
                     OffContent="No"
                     OnContent="Yes" />
+                <ProgressBar
+                    Classes="Right"
+                    ShowProgressText="True"
+                    Value="20" />
+                <Slider
+                    Width="200"
+                    Margin="30,0"
+                    Orientation="Horizontal"
+                    Value="30" />
             </StackPanel>
             <TabControl>
                 <TabItem Header="Tab 1">
@@ -103,7 +103,9 @@
             </TabControl>
             <StackPanel Orientation="Horizontal" Spacing="20">
                 <ComboBox Width="200" PlaceholderText="Please Select" />
-
+                <DatePicker />
+                <TimePicker />
+                <CalendarDatePicker />
             </StackPanel>
             <Grid ColumnDefinitions="* * *">
                 <Border Theme="{StaticResource CardBorder}">
@@ -132,6 +134,7 @@
                     Classes="revealPasswordButton"
                     PasswordChar="*"
                     Text="Avalonia" />
+
             </StackPanel>
 
             <StackPanel Orientation="Horizontal" Spacing="20">
@@ -152,6 +155,7 @@
                     <TextBlock>List Item 4</TextBlock>
                     <TextBlock>List Item 5</TextBlock>
                 </ListBox>
+                <Calendar />
             </StackPanel>
         </StackPanel>
     </ScrollViewer>
diff --git a/src/Semi.Avalonia/Controls/SplitButton.axaml b/src/Semi.Avalonia/Controls/SplitButton.axaml
index 5281171..f4cf5ae 100644
--- a/src/Semi.Avalonia/Controls/SplitButton.axaml
+++ b/src/Semi.Avalonia/Controls/SplitButton.axaml
@@ -18,67 +18,102 @@
         <Setter Property="SplitButton.MinHeight" Value="12" />
         <Setter Property="Template">
             <ControlTemplate TargetType="SplitButton">
-                <Border
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    ClipToBounds="True"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <Grid ColumnDefinitions="*,Auto,Auto">
-                        <Button
-                            x:Name="PART_PrimaryButton"
-                            Grid.Column="0"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Command="{TemplateBinding Command}"
-                            CommandParameter="{TemplateBinding CommandParameter}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            CornerRadius="3 0 0 3"
-                            Focusable="False"
-                            FontFamily="{TemplateBinding FontFamily}"
-                            FontSize="{TemplateBinding FontSize}"
-                            FontWeight="{TemplateBinding FontWeight}"
-                            Foreground="{TemplateBinding Foreground}"
-                            KeyboardNavigation.IsTabStop="False" />
+                <Grid ColumnDefinitions="*,Auto,Auto">
+                    <Button
+                        x:Name="PART_PrimaryButton"
+                        Grid.Column="0"
+                        Padding="{TemplateBinding Padding}"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Command="{TemplateBinding Command}"
+                        CommandParameter="{TemplateBinding CommandParameter}"
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        CornerRadius="3 0 0 3"
+                        Focusable="False"
+                        FontFamily="{TemplateBinding FontFamily}"
+                        FontSize="{TemplateBinding FontSize}"
+                        FontWeight="{TemplateBinding FontWeight}"
+                        Foreground="{TemplateBinding Foreground}"
+                        KeyboardNavigation.IsTabStop="False" />
 
-                        <Border
-                            x:Name="SeparatorBorder"
-                            Grid.Column="1"
-                            Width="{DynamicResource SplitButtonSeparatorWidth}"
-                            Background="White"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="0.5" />
+                    <Border
+                        x:Name="SeparatorBorder"
+                        Grid.Column="1"
+                        Width="{DynamicResource SplitButtonSeparatorWidth}"
+                        Background="White"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="0.5" />
 
-                        <Button
-                            x:Name="PART_SecondaryButton"
-                            Grid.Column="2"
-                            Padding="4,0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
-                            HorizontalContentAlignment="Center"
-                            VerticalContentAlignment="Center"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="0 3 3 0"
-                            Focusable="False"
-                            KeyboardNavigation.IsTabStop="False">
-                            <PathIcon
-                                Width="12"
-                                Height="12"
-                                Data="{DynamicResource SplitButtonIconGlyph}"
-                                Foreground="{TemplateBinding Foreground}" />
-                        </Button>
-                    </Grid>
-                </Border>
+                    <Button
+                        x:Name="PART_SecondaryButton"
+                        Grid.Column="2"
+                        Padding="4,0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="0 3 3 0"
+                        Focusable="False"
+                        Foreground="{TemplateBinding Foreground}"
+                        KeyboardNavigation.IsTabStop="False">
+                        <PathIcon
+                            Width="12"
+                            Height="12"
+                            Data="{DynamicResource SplitButtonIconGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                </Grid>
             </ControlTemplate>
         </Setter>
+
+
+        <Style Selector="^.Secondary /template/ Button">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultSecondaryForeground}" />
+        </Style>
+        <Style Selector="^.Tertiary /template/ Button">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" />
+        </Style>
+        <Style Selector="^.Warning /template/ Button">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultWarningForeground}" />
+        </Style>
+        <Style Selector="^.Danger /template/ Button">
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDangerForeground}" />
+        </Style>
+        <Style Selector="^:checked">
+            <Style Selector="^ /template/ Button">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidPrimaryBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            </Style>
+            <Style Selector="^.Secondary /template/ Button">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidSecondaryBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            </Style>
+            <Style Selector="^.Tertiary /template/ Button">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidTertiaryBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            </Style>
+            <Style Selector="^.Warning /template/ Button">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidWarningBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            </Style>
+            <Style Selector="^.Danger /template/ Button">
+                <Setter Property="Background" Value="{DynamicResource ButtonSolidDangerBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource ButtonSolidForeground}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:disabled /template/ Button">
+            <Setter Property="Background" Value="{DynamicResource ButtonDefaultDisabledBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" />
+        </Style>
     </ControlTheme>
 </ResourceDictionary>