diff --git a/src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml
new file mode 100644
index 0000000..4181245
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml
new file mode 100644
index 0000000..6fdac84
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/HighContrast/Desert.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml
new file mode 100644
index 0000000..fe3d1b4
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/HighContrast/Dusk.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml
new file mode 100644
index 0000000..a337c82
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/HighContrast/NightSky.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/Themes/SemiTheme.axaml
index 77181be..978f91f 100644
--- a/src/Semi.Avalonia/Themes/SemiTheme.axaml
+++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml
@@ -5,10 +5,10 @@
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
                 <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="avares://Semi.Avalonia/Themes/HighContrast/Aquatic.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="avares://Semi.Avalonia/Themes/HighContrast/Desert.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dusk}" Source="avares://Semi.Avalonia/Themes/HighContrast/Dusk.axaml" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="avares://Semi.Avalonia/Themes/HighContrast/NightSky.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="avares://Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="avares://Semi.Avalonia/Themes/Schemes/DesertTheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dusk}" Source="avares://Semi.Avalonia/Themes/Schemes/DuskTheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="avares://Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml
similarity index 74%
rename from src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml
rename to src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml
index 28b911a..a2583be 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Aquatic.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/Aquatic.axaml
@@ -7,7 +7,4 @@
     <Color x:Key="HighlightColor">#8EE3F0</Color>
     <Color x:Key="ButtonTextColor">#FFFFFF</Color>
     <Color x:Key="ButtonFaceColor">#202020</Color>
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
-    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml
similarity index 74%
rename from src/Semi.Avalonia/Themes/HighContrast/Desert.axaml
rename to src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml
index 60c1a26..80bd582 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Desert.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/Desert.axaml
@@ -7,7 +7,4 @@
     <Color x:Key="HighlightColor">#903909</Color>
     <Color x:Key="ButtonTextColor">#202020</Color>
     <Color x:Key="ButtonFaceColor">#FFFAEF</Color>
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
-    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml b/src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml
similarity index 74%
rename from src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml
rename to src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml
index 6d4f033..6474bdf 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/Dusk.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/Dusk.axaml
@@ -7,7 +7,4 @@
     <Color x:Key="HighlightColor">#A1BFDE</Color>
     <Color x:Key="ButtonTextColor">#B6F6F0</Color>
     <Color x:Key="ButtonFaceColor">#2D3236</Color>
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
-    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml b/src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml
similarity index 74%
rename from src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml
rename to src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml
index f62d65c..a2c9c9c 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/NightSky.axaml
+++ b/src/Semi.Avalonia/Tokens/HighContrast/NightSky.axaml
@@ -7,7 +7,4 @@
     <Color x:Key="HighlightColor">#D6B4FD</Color>
     <Color x:Key="ButtonTextColor">#FFEE32</Color>
     <Color x:Key="ButtonFaceColor">#000000</Color>
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/HighContrast/_index.axaml" />
-    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file