diff --git a/src/Semi.Avalonia/Controls/TreeView.axaml b/src/Semi.Avalonia/Controls/TreeView.axaml
index 44d2b03..d278dbd 100644
--- a/src/Semi.Avalonia/Controls/TreeView.axaml
+++ b/src/Semi.Avalonia/Controls/TreeView.axaml
@@ -52,7 +52,7 @@
 
     <converters:MarginMultiplierConverter
         x:Key="TreeViewItemLeftMarginConverter"
-        Indent="{StaticResource SizeTreeViewItemIndent}"
+        Indent="{StaticResource TreeViewItemIndent}"
         Left="True" />
     <ControlTheme x:Key="ToggleButtonTreeViewItemIconButton" TargetType="ToggleButton">
         <Setter Property="Margin" Value="0" />
@@ -66,10 +66,10 @@
                     Background="Transparent">
                     <PathIcon
                         Name="PART_ExpandIconPath"
-                        Width="{DynamicResource SizeTreeViewItemIconSize}"
-                        Height="{DynamicResource SizeTreeViewItemIconSize}"
+                        Width="{DynamicResource TreeViewItemIconSize}"
+                        Height="{DynamicResource TreeViewItemIconSize}"
                         Data="{DynamicResource ExpanderIconData}"
-                        Foreground="{DynamicResource ColorTreeViewItemIconDefaultForeground}">
+                        Foreground="{DynamicResource TreeViewItemIconDefaultForeground}">
                         <PathIcon.Transitions>
                             <Transitions>
                                 <TransformOperationsTransition Property="RenderTransform" Duration="0.1" />
@@ -84,14 +84,14 @@
             <Setter Property="PathIcon.RenderTransform" Value="rotate(90deg)" />
         </Style>
         <Style Selector="^:pointerover /template/ PathIcon#PART_ExpandIconPath">
-            <Setter Property="PathIcon.Foreground" Value="{DynamicResource ColorTreeViewItemIconHoverForeground}" />
+            <Setter Property="PathIcon.Foreground" Value="{DynamicResource TreeViewItemIconHoverForeground}" />
         </Style>
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type TreeViewItem}" TargetType="TreeViewItem">
         <Setter Property="TreeViewItem.Padding" Value="0" />
-        <Setter Property="TreeViewItem.Background" Value="{DynamicResource ColorTreeViewItemDefaultBackground}" />
-        <Setter Property="TreeViewItem.Foreground" Value="{DynamicResource ColorTreeViewItemDefaultForeground}" />
+        <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">
@@ -100,7 +100,7 @@
                     <Border
                         Name="PART_LayoutRoot"
                         MinHeight="{TemplateBinding MinHeight}"
-                        Padding="{DynamicResource ThicknessTreeViewItemPadding}"
+                        Padding="{DynamicResource TreeViewItemPadding}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
@@ -114,7 +114,7 @@
                             ColumnDefinitions="Auto, *">
                             <Panel
                                 Name="PART_ExpandCollapseChevronContainer" Grid.Column="0"
-                                Margin="{StaticResource ThicknessTreeViewItemIconMargin}">
+                                Margin="{StaticResource TreeViewItemIconMargin}">
                                 <ToggleButton
                                     Name="PART_ExpandCollapseChevron" Focusable="False"
                                     IsChecked="{TemplateBinding IsExpanded,
@@ -142,30 +142,30 @@
 
         <!--  PointerOver state  -->
         <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ColorTreeViewItemPointerOverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemPointerOverBackground}" />
         </Style>
 
         <!--  Pressed state  -->
         <Style Selector="^:pressed /template/ Border#PART_LayoutRoot:pointerover">
-            <Setter Property="Background" Value="{DynamicResource ColorTreeViewItemPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemPressedBackground}" />
         </Style>
 
         <!--  Disabled state  -->
         <Style Selector="^:disabled /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource ColorTreeViewItemDisabledBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemDisabledBackground}" />
         </Style>
         <Style Selector="^:disabled /template/ ContentPresenter#PART_HeaderPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource ColorTreeViewItemDisabledForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource TreeViewItemDisabledForeground}" />
         </Style>
 
         <!--  Selected state  -->
         <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource ColorTreeViewItemSelectedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedBackground}" />
         </Style>
 
         <!--  Disabled Selected state  -->
         <Style Selector="^:disabled:selected /template/ Border#PART_LayoutRoot">
-            <Setter Property="Background" Value="{DynamicResource ColorTreeViewItemSelectedDisabledBackground}" />
+            <Setter Property="Background" Value="{DynamicResource TreeViewItemSelectedDisabledBackground}" />
         </Style>
 
         <Style Selector="^:empty /template/ ToggleButton#PART_ExpandCollapseChevron">
diff --git a/src/Semi.Avalonia/Themes/Light/TreeView.axaml b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
index 7210326..ebd9289 100644
--- a/src/Semi.Avalonia/Themes/Light/TreeView.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TreeView.axaml
@@ -1,24 +1,24 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <sys:Double x:Key="SizeTreeViewItemIndent">20</sys:Double>
-    <sys:Double x:Key="SizeTreeViewItemIconSize">8</sys:Double>
+    <sys:Double x:Key="TreeViewItemIndent">20</sys:Double>
+    <sys:Double x:Key="TreeViewItemIconSize">8</sys:Double>
     <Thickness x:Key="TreeViewItemExpandCollapseChevronMargin">12, 0, 12, 0</Thickness>
 
     <StreamGeometry x:Key="ExpanderIconData">M9.65618 3.44015L18.6322 11.2454C19.0906 11.644 19.0906 12.356 18.6322 12.7546L9.65618 20.5598C9.00895 21.1226 8 20.6629 8 19.8052V4.19475C8 3.33705 9.00895 2.87734 9.65618 3.44015Z</StreamGeometry>
 
-    <SolidColorBrush x:Key="ColorTreeViewItemDefaultForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ColorTreeViewItemIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ColorTreeViewItemIconHoverForeground" Color="#1C1F23" />
-    <SolidColorBrush x:Key="ColorTreeViewItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="TreeViewItemDefaultForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="TreeViewItemIconDefaultForeground" Opacity="0.62" Color="#1C1F23" />
+    <SolidColorBrush x:Key="TreeViewItemIconHoverForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="TreeViewItemDisabledForeground" Opacity="0.35" Color="#1C1F23" />
 
-    <SolidColorBrush x:Key="ColorTreeViewItemDefaultBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ColorTreeViewItemPointerOverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="ColorTreeViewItemPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="ColorTreeViewItemSelectedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="ColorTreeViewItemDisabledBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="ColorTreeViewItemSelectedDisabledBackground" Opacity="0.04" Color="#2E3238" />
+    <SolidColorBrush x:Key="TreeViewItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TreeViewItemPointerOverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="TreeViewItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedBackground" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="TreeViewItemDisabledBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="TreeViewItemSelectedDisabledBackground" Opacity="0.04" Color="#2E3238" />
 
-    <Thickness x:Key="ThicknessTreeViewItemIconMargin">0 0 8 0</Thickness>
-    <Thickness x:Key="ThicknessTreeViewItemPadding">8 4 0 4</Thickness>
+    <Thickness x:Key="TreeViewItemIconMargin">0 0 8 0</Thickness>
+    <Thickness x:Key="TreeViewItemPadding">8 4 0 4</Thickness>
 </ResourceDictionary>