diff --git a/README.md b/README.md
index a831b75..68a9ba1 100644
--- a/README.md
+++ b/README.md
@@ -48,9 +48,9 @@ dotnet add package Semi.Avalonia.TreeDataGrid
 
 ```xaml
 <Application.Styles>
-    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-    <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-    <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
+    <semi:ColorPickerSemiTheme />
+    <semi:DataGridSemiTheme />
+    <semi:TreeDataGridSemiTheme />
 </Application.Styles>
 ```
 
diff --git a/README_CN.md b/README_CN.md
index 7033b88..ce4ac0a 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -48,9 +48,9 @@ dotnet add package Semi.Avalonia.TreeDataGrid
 
 ```xaml
 <Application.Styles>
-    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-    <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-    <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
+    <semi:ColorPickerSemiTheme />
+    <semi:DataGridSemiTheme />
+    <semi:TreeDataGridSemiTheme />
 </Application.Styles>
 ```
 
diff --git a/demo/Semi.Avalonia.Demo/App.axaml b/demo/Semi.Avalonia.Demo/App.axaml
index 3f18920..8ef2cca 100644
--- a/demo/Semi.Avalonia.Demo/App.axaml
+++ b/demo/Semi.Avalonia.Demo/App.axaml
@@ -7,19 +7,16 @@
     xmlns:semi="https://irihi.tech/semi"
     xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels">
     <Application.Styles>
-        <!-- You can still reference in old way.  -->
-        <!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
         <semi:SemiTheme Locale="zh-CN" />
         <semi:SemiPopupAnimations />
-        <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
-        <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
+        <semi:ColorPickerSemiTheme />
+        <semi:DataGridSemiTheme />
+        <semi:TreeDataGridSemiTheme />
     </Application.Styles>
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude
-                    Source="Themes/_index.axaml" />
+                <ResourceInclude Source="Themes/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
index 2f43e32..c8b89e3 100644
--- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
@@ -14,8 +14,6 @@ public partial class Overview : UserControl
     public string MainStyle { get; set; } =
         """
         <Application.Styles>
-        <!-- You can still reference in old way.  -->
-        <!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
             <semi:SemiTheme Locale="zh-CN" />
         </Application.Styles>
         """;
@@ -25,7 +23,7 @@ public partial class Overview : UserControl
     public string ColorPickerStyle { get; set; } =
         """
         <Application.Styles>
-            <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
+            <semi:ColorPickerSemiTheme />
         </Application.Styles>
         """;
 
@@ -34,7 +32,7 @@ public partial class Overview : UserControl
     public string DataGridStyle { get; set; } =
         """
         <Application.Styles>
-            <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
+            <semi:DataGridSemiTheme />
         </Application.Styles>
         """;
 
@@ -43,7 +41,7 @@ public partial class Overview : UserControl
     public string TreeDataGridStyle { get; set; } =
         """
         <Application.Styles>
-            <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
+            <semi:TreeDataGridSemiTheme />
         </Application.Styles>
         """;
 }
\ No newline at end of file
diff --git a/src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml b/src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml
new file mode 100644
index 0000000..42887da
--- /dev/null
+++ b/src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml
@@ -0,0 +1,17 @@
+<Styles
+    x:Class="Semi.Avalonia.ColorPicker.ColorPickerSemiTheme"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceInclude x:Key="Default" Source="Light.axaml" />
+                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
+            </ResourceDictionary.ThemeDictionaries>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="Controls/_index.axaml" />
+                <ResourceInclude Source="Shared.axaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+</Styles>
\ No newline at end of file
diff --git a/src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml.cs b/src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml.cs
new file mode 100644
index 0000000..20fbfed
--- /dev/null
+++ b/src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml.cs
@@ -0,0 +1,7 @@
+using Avalonia.Styling;
+
+namespace Semi.Avalonia.ColorPicker;
+
+public class ColorPickerSemiTheme : Styles
+{
+}
\ No newline at end of file
diff --git a/src/Semi.Avalonia.DataGrid/AssemblyInfo.cs b/src/Semi.Avalonia.DataGrid/AssemblyInfo.cs
new file mode 100644
index 0000000..5b968af
--- /dev/null
+++ b/src/Semi.Avalonia.DataGrid/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("https://irihi.tech/semi", "Semi.Avalonia.DataGrid")]
\ No newline at end of file
diff --git a/src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml b/src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml
new file mode 100644
index 0000000..dffe25f
--- /dev/null
+++ b/src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml
@@ -0,0 +1,17 @@
+<Styles
+    x:Class="Semi.Avalonia.DataGrid.DataGridSemiTheme"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceInclude x:Key="Default" Source="Light.axaml" />
+                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
+            </ResourceDictionary.ThemeDictionaries>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="DataGrid.axaml" />
+                <ResourceInclude Source="Shared.axaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+</Styles>
\ No newline at end of file
diff --git a/src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml.cs b/src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml.cs
new file mode 100644
index 0000000..4ed8a2d
--- /dev/null
+++ b/src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml.cs
@@ -0,0 +1,7 @@
+using Avalonia.Styling;
+
+namespace Semi.Avalonia.DataGrid;
+
+public class DataGridSemiTheme : Styles
+{
+}
\ No newline at end of file
diff --git a/src/Semi.Avalonia.TreeDataGrid/AssemblyInfo.cs b/src/Semi.Avalonia.TreeDataGrid/AssemblyInfo.cs
new file mode 100644
index 0000000..93f1ad2
--- /dev/null
+++ b/src/Semi.Avalonia.TreeDataGrid/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using Avalonia.Metadata;
+
+[assembly: XmlnsDefinition("https://irihi.tech/semi", "Semi.Avalonia.TreeDataGrid")]
\ No newline at end of file
diff --git a/src/Semi.Avalonia.TreeDataGrid/TreeDataGridSemiTheme.axaml b/src/Semi.Avalonia.TreeDataGrid/TreeDataGridSemiTheme.axaml
new file mode 100644
index 0000000..802d367
--- /dev/null
+++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGridSemiTheme.axaml
@@ -0,0 +1,17 @@
+<Styles
+    x:Class="Semi.Avalonia.TreeDataGrid.TreeDataGridSemiTheme"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Styles.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceInclude x:Key="Default" Source="Light.axaml" />
+                <ResourceInclude x:Key="Dark" Source="Dark.axaml" />
+            </ResourceDictionary.ThemeDictionaries>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceInclude Source="TreeDataGrid.axaml" />
+                <ResourceInclude Source="Shared.axaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Styles.Resources>
+</Styles>
\ No newline at end of file
diff --git a/src/Semi.Avalonia.TreeDataGrid/TreeDataGridSemiTheme.axaml.cs b/src/Semi.Avalonia.TreeDataGrid/TreeDataGridSemiTheme.axaml.cs
new file mode 100644
index 0000000..518e8af
--- /dev/null
+++ b/src/Semi.Avalonia.TreeDataGrid/TreeDataGridSemiTheme.axaml.cs
@@ -0,0 +1,7 @@
+using Avalonia.Styling;
+
+namespace Semi.Avalonia.TreeDataGrid;
+
+public class TreeDataGridSemiTheme : Styles
+{
+}
\ No newline at end of file