diff --git a/src/Semi.Avalonia/Controls/TreeView.axaml b/src/Semi.Avalonia/Controls/TreeView.axaml
index 658ad7b..bccadae 100644
--- a/src/Semi.Avalonia/Controls/TreeView.axaml
+++ b/src/Semi.Avalonia/Controls/TreeView.axaml
@@ -23,10 +23,10 @@
     </Design.PreviewWith>
 
     <ControlTheme x:Key="{x:Type TreeView}" TargetType="TreeView">
-        <Setter Property="TreeView.Background" Value="Transparent" />
-        <Setter Property="TreeView.BorderBrush" Value="Transparent" />
-        <Setter Property="TreeView.BorderThickness" Value="0" />
-        <Setter Property="TreeView.Padding" Value="8 0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="8 0" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="True" />
@@ -94,11 +94,11 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type TreeViewItem}" TargetType="TreeViewItem">
-        <Setter Property="TreeViewItem.Background" Value="{DynamicResource TreeViewItemDefaultBackground}" />
-        <Setter Property="TreeViewItem.Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" />
-        <Setter Property="TreeViewItem.CornerRadius" Value="3" />
-        <Setter Property="TreeViewItem.VerticalAlignment" Value="Center" />
-        <Setter Property="TreeViewItem.Template">
+        <Setter Property="Background" Value="{DynamicResource TreeViewItemDefaultBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource TreeViewItemDefaultForeground}" />
+        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
             <ControlTemplate TargetType="TreeViewItem">
                 <StackPanel>
                     <Border
@@ -112,17 +112,14 @@
                         TemplatedControl.IsTemplateFocusTarget="True">
                         <Grid
                             Name="PART_Header"
-                            Margin="{TemplateBinding Level,
-                                                     Mode=OneWay,
-                                                     Converter={StaticResource TreeViewItemLeftMarginConverter}}"
+                            Margin="{TemplateBinding Level, Mode=OneWay, Converter={StaticResource TreeViewItemLeftMarginConverter}}"
                             ColumnDefinitions="Auto, *">
                             <ToggleButton
                                 Name="PART_ExpandCollapseChevron"
                                 Grid.Column="0"
                                 Padding="{DynamicResource TreeViewItemIconMargin}"
                                 Focusable="False"
-                                IsChecked="{TemplateBinding IsExpanded,
-                                                            Mode=TwoWay}"
+                                IsChecked="{TemplateBinding IsExpanded, Mode=TwoWay}"
                                 Theme="{StaticResource ToggleButtonTreeViewItemIconButton}" />
                             <ContentPresenter
                                 Name="PART_HeaderPresenter"
@@ -167,6 +164,9 @@
         <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
             <Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedBackground}" />
         </Style>
+        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+            <Setter Property="Foreground" Value="{DynamicResource TreeViewItemSelectedForeground}" />
+        </Style>
 
         <!--  Disabled Selected state  -->
         <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot">
diff --git a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
index 22802dd..4ecbd61 100644
--- a/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TreeView.axaml
@@ -5,8 +5,10 @@
     <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TreeViewItemPointeroverForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.04" Color="#E6E8EA" />
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml
index 2717583..686cf75 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Base.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/Base.axaml
@@ -259,7 +259,7 @@
     <SolidColorBrush x:Key="ListBoxItemSelectedBackground" Color="{StaticResource HighlightColor}" />
     <SolidColorBrush x:Key="ListBoxItemSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
     <SolidColorBrush x:Key="ListBoxItemDisabledBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ListBoxItemSelectedDisabledBackground" Color="{StaticResource HighlightTextColor}" />
 
     <!-- RadioGroupListBox -->
     <SolidColorBrush x:Key="ListBoxItemRadioGroupDisabledForeground" Color="{StaticResource GrayTextColor}" />
@@ -373,36 +373,19 @@
 
     <!--Notification-->
     <SolidColorBrush x:Key="NotificationCardBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="NotificationCardBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="NotificationCardInformationIconForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardWarningIconForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardErrorIconForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="NotificationCardBackground" Color="{StaticResource HighlightTextColor}" />
     <SolidColorBrush x:Key="NotificationCardTitleForeground" Color="{StaticResource WindowTextColor}" />
     <SolidColorBrush x:Key="NotificationCardMessageForeground" Color="{StaticResource WindowTextColor}" />
 
     <SolidColorBrush x:Key="NotificationCardLightBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBackground" Opacity="0.2" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBackground" Opacity="0.2" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBorderBrush" Color="#FC725A" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBackground" Opacity="0.2" Color="#FC725A" />
 
     <!--  ProgressBar  -->
-    <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ProgressBarBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ProgressBarBackground" Color="{StaticResource HighlightTextColor}" />
     <SolidColorBrush x:Key="ProgressBarTextForeground" Color="{StaticResource WindowTextColor}" />
     <SolidColorBrush x:Key="ProgressBarOuterTextForeground" Color="{StaticResource WindowTextColor}" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ProgressBarPrimaryForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ProgressBarSecondaryForeground" Color="#40B4F3" />
-    <SolidColorBrush x:Key="ProgressBarTertiaryForeground" Color="#888D92" />
-    <SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#5DC264" />
-    <SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FFAE43" />
-    <SolidColorBrush x:Key="ProgressBarDangerForeground" Color="#FC725A" />
+    <SolidColorBrush x:Key="ProgressBarPrimaryForeground" Color="{StaticResource HighlightColor}" />
 
     <!-- RadioButton -->
     <SolidColorBrush x:Key="RadioButtonDisabledForeground" Color="{StaticResource GrayTextColor}" />
@@ -453,39 +436,39 @@
     <SolidColorBrush x:Key="RadioButtonCardUncheckPressedBackground" Color="{StaticResource WindowColor}" />
 
     <!-- RefreshContainer -->
-    <SolidColorBrush x:Key="RefreshVisualizerIconForeground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="RefreshVisualizerIconForeground" Color="{StaticResource HighlightColor}" />
     <SolidColorBrush x:Key="RefreshVisualizerIconBackground" Color="Transparent" />
 
     <!-- ScrollViewer -->
-    <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="ScrollBarThumbForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="ScrollBarThumbPointeroverForeground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="ScrollBarButtonDefaultForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ScrollBarButtonPointeroverForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ScrollBarThumbForeground" Color="{StaticResource ButtonTextColor}" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointeroverForeground" Color="{StaticResource HighlightColor}" />
     <SolidColorBrush x:Key="ScrollBarBackground" Color="Transparent" />
 
     <!-- Slider -->
-    <SolidColorBrush x:Key="SliderTrackForeground" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="SliderTrackBackground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SliderTrackForeground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="SliderTrackBackground" Color="{StaticResource HighlightTextColor}" />
 
-    <SolidColorBrush x:Key="SliderTickForeground" Color="{StaticResource WindowTextColor}" />
-    <SolidColorBrush x:Key="SliderThumbBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SliderTickForeground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="SliderThumbBackground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SliderThumbBorderBrush" Color="{StaticResource HighlightColor}" />
     <SolidColorBrush x:Key="SliderThumbPointeroverBorderBrush" Color="{StaticResource HotlightColor}" />
-    <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="SliderThumbPressedBorderBrush" Color="{StaticResource HighlightColor}" />
 
     <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="{StaticResource GrayTextColor}" />
     <SolidColorBrush x:Key="SliderThumbDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
     <SolidColorBrush x:Key="SliderTrackDisabledBackground" Color="{StaticResource WindowColor}" />
 
     <!-- SplitView -->
-    <SolidColorBrush x:Key="SplitViewSeparatorBackground" Color="{StaticResource WindowTextColor}" />
+    <SolidColorBrush x:Key="SplitViewSeparatorBackground" Color="{StaticResource HighlightTextColor}" />
     <SolidColorBrush x:Key="SplitViewMaskBrush" Color="Transparent" />
     <SolidColorBrush x:Key="SplitViewPaneBackground" Color="{StaticResource WindowColor}" />
 
     <!-- TabItem -->
     <SolidColorBrush x:Key="TabItemLinePipeBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TabItemLinePipeSelectedBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="TabItemLinePipePointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
     <SolidColorBrush x:Key="TabItemLinePipePressedBorderBrush" Color="{StaticResource HotlightColor}" />
 
     <SolidColorBrush x:Key="TabItemLineHeaderForeground" Color="{StaticResource WindowTextColor}" />
@@ -613,15 +596,15 @@
     <SolidColorBrush x:Key="ToggleButtonIndeterminateDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
 
     <!-- ToggleSwitch -->
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Color="{StaticResource WindowColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDefaultBackground" Color="{StaticResource HighlightTextColor}" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPointeroverBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedPressedBackground" Color="{StaticResource HighlightColor}" />
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBackground" Color="{StaticResource WindowColor}" />
 
     <SolidColorBrush x:Key="ToggleSwitchContainerUnCheckedDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
 
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDefaultBackground" Color="{StaticResource HighlightColor}" />
-    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointeroverBackground" Color="{StaticResource HighlightColor}" />
+    <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPointeroverBackground" Color="{StaticResource HotlightColor}" />
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedPressedBackground" Color="{StaticResource HighlightColor}" />
     <SolidColorBrush x:Key="ToggleSwitchContainerCheckedDisabledBackground" Color="{StaticResource GrayTextColor}" />
 
@@ -635,8 +618,10 @@
     <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Color="{StaticResource GrayTextColor}" />
 
     <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="{StaticResource WindowColor}" />
+    <SolidColorBrush x:Key="TreeViewItemPointeroverForeground" Color="{StaticResource HighlightTextColor}" />
     <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Color="{StaticResource HotlightColor}" />
     <SolidColorBrush x:Key="TreeViewItemPressedBackground" Color="{StaticResource HotlightColor}" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedForeground" Color="{StaticResource HighlightTextColor}" />
     <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="{StaticResource HotlightColor}" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="{StaticResource WindowColor}" />
     <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Color="{StaticResource WindowColor}" />
diff --git a/src/Semi.Avalonia/Themes/Light/TreeView.axaml b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
index 96e61d4..c4cc03c 100644
--- a/src/Semi.Avalonia/Themes/Light/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
@@ -5,8 +5,10 @@
     <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
     <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TreeViewItemPointeroverForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="TreeViewItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
     <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.02" Color="#2E3238" />